Skip to content

feat(mcp): support stateless and stateful clients via session-id routing #26857

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mateo-berri merged 48 commits into from
May 30, 2026
Merged

feat(mcp): support stateless and stateful clients via session-id routing #26857

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
ad887c9
feat(mcp): support stateless and stateful clients via session-id routing
Sameerlite Mar 13, 2026
1a2aa62
fix(mcp): respect stateful routing and harden initialize detection
Sameerlite Apr 30, 2026
c245cae
test(mcp): patch stateless/stateful managers in concurrency init test
Sameerlite Apr 30, 2026
31fb2b0
Fix tests
Sameerlite Apr 30, 2026
6b470bc
Fix tests
Sameerlite Apr 30, 2026
6d13264
Merge pull request #27037 from BerriAI/litellm_internal_staging
Sameerlite May 2, 2026
cf986ff
Fix MCP stateful routing edge cases
cursoragent May 5, 2026
17c34f6
Fix stateful MCP auth context refresh
cursoragent May 5, 2026
6ea4046
Fix MCP stateful session cleanup
cursoragent May 5, 2026
8912feb
fix(mcp): bind stateful sessions to creator and reject hijacks
mateo-berri May 5, 2026
50931e4
fix(mcp): serialize concurrent requests on same stateful session
mateo-berri May 5, 2026
89f774c
fix(mcp): include OAuth2 bearer in stateful session owner fingerprint
mateo-berri May 5, 2026
979a061
fix(mcp): don't hold stateful session lock for streaming GETs
mateo-berri May 5, 2026
cda5b45
Merge remote-tracking branch 'origin/litellm_internal_staging' into l…
mateo-berri May 5, 2026
3717a58
Merge remote-tracking branch 'origin/litellm_internal_staging' into l…
cursoragent May 5, 2026
79580aa
fix(mcp): allow None user_api_key_auth in MCPAuthenticatedUser
cursoragent May 5, 2026
356b8af
style: replace with new alias
mateo-berri May 5, 2026
ea0a12f
fix(mcp): fall back to client_ip in stateful session owner fingerprint
cursoragent May 6, 2026
6cd7bb4
Fix active stateful MCP session cleanup
cursoragent May 6, 2026
e5c458d
test(mcp): cancel leaked stateful auth-context cleanup task
cursoragent May 6, 2026
33425cb
Fix stateful MCP session fingerprinting
cursoragent May 11, 2026
c6a41a5
Hash MCP session user owner fingerprints
cursoragent May 11, 2026
a40e054
Fix stale MCP session DELETE cleanup
cursoragent May 11, 2026
ea432f2
Merge pull request #27650 from BerriAI/litellm_internal_staging
Sameerlite May 11, 2026
342adcd
fix(mcp): harden owner fingerprint hashing for non-str api keys
Sameerlite May 11, 2026
f71c9f7
Fix MCP stateful cleanup loop resilience
cursoragent May 11, 2026
ac6986b
Fix stateful MCP initialize auth capture
cursoragent May 11, 2026
8125c50
fix(mcp): drop orphan per-session lock when auth context absent
cursoragent May 11, 2026
70b1cc0
chore(mcp): trim verbose comment on lock cleanup
cursoragent May 11, 2026
24c55fb
Fix stateful MCP delete failure tracking
cursoragent May 11, 2026
9d60219
fix test
Sameerlite May 13, 2026
7dbeb65
fix(mcp): cap routing-peek body size to bound pre-dispatch memory
Sameerlite May 13, 2026
28d0a0e
test: replace dall-e-3 with gpt-image-1 in health check and router te…
yuneng-berri May 13, 2026
dd4af19
fix(tests): drop dall-e-only test classes; route live image tests via…
yuneng-berri May 12, 2026
eaf99ed
Fix MCP initialize session active tracking
cursoragent May 13, 2026
225c11c
Merge remote-tracking branch 'origin/litellm_internal_staging' into l…
claude May 13, 2026
897aaa5
Fix MCP reinitialize session tracking
cursoragent May 13, 2026
6ee5907
Fix MCP reinitialize auth context aliasing
cursoragent May 13, 2026
38af29f
Merge branch 'litellm_internal_staging' into litellm_fix_stateful_sta…
mateo-berri May 13, 2026
929efed
Apply black formatting after merge
mateo-berri May 13, 2026
6f96095
Run owner-binding 403 before consuming POST body
mateo-berri May 13, 2026
4b3521e
Harden MCP routing peek bound and stateful purge race
mateo-berri May 13, 2026
78d04f6
Remove inadvertently committed Next.js build artifacts
mateo-berri May 13, 2026
ca47179
Run owner check before stale MCP session cleanup
mateo-berri May 13, 2026
57a3c7a
fix(mcp): reverse cleanup ordering to terminate transport before clea…
cursoragent May 14, 2026
dde7126
test(mcp): fully reset stateful session tracking in auth-context refr…
mateo-berri May 30, 2026
5117a10
fix(mcp): cap concurrent stateful sessions per caller to bound memory
mateo-berri May 30, 2026
28f8cac
Merge branch 'litellm_internal_staging' into litellm_fix_stateful_sta…
mateo-berri May 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion litellm/proxy/_experimental/mcp_server/auth/litellm_auth_handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class MCPAuthenticatedUser(AuthenticatedUser):

def __init__(
self,
user_api_key_auth: UserAPIKeyAuth,
user_api_key_auth: Optional[UserAPIKeyAuth],
mcp_auth_header: Optional[str] = None,
mcp_servers: Optional[List[str]] = None,
mcp_server_auth_headers: Optional[Dict[str, Dict[str, str]]] = None,
Expand Down
Loading
Loading