Skip to content

fix(aibridge): check x-session-affinity header for OpenCode sessions #26140

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
dannykopping merged 1 commit into from
Jun 8, 2026
+18 −1
Merged

fix(aibridge): check x-session-affinity header for OpenCode sessions #26140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion aibridge/session.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,12 @@ func GuessSessionID(client Client, r *http.Request) *string {
case ClientCoderAgents:
return cleanRef(r.Header.Get("X-Coder-Chat-Id"))
case ClientOpenCode:
return cleanRef(r.Header.Get("X-OpenCode-Session"))
// Prefer X-OpenCode-Session (set by the OpenCode "Zen" provider).
if sid := cleanRef(r.Header.Get("X-OpenCode-Session")); sid != nil {
return sid
}
// Fall back to x-session-affinity (set by other providers).
return cleanRef(r.Header.Get("x-session-affinity"))
case ClientCrush:
return nil // Crush does not send a session ID header.
case ClientRoo:
Expand Down
12 changes: 12 additions & 0 deletions aibridge/session_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,18 @@ func TestGuessSessionID(t *testing.T) {
headers: map[string]string{"X-OpenCode-Session": " ses_15a48edefffe7oY0YcIHRv29dD "},
sessionID: utils.PtrTo("ses_15a48edefffe7oY0YcIHRv29dD"),
},
{
name: "opencode_zen_header_takes_precedence_over_session_affinity",
client: aibridge.ClientOpenCode,
headers: map[string]string{"X-OpenCode-Session": "zen-session", "x-session-affinity": "other-session"},
sessionID: utils.PtrTo("zen-session"),
},
{
name: "opencode_session_affinity_fallback",
client: aibridge.ClientOpenCode,
headers: map[string]string{"x-session-affinity": "affinity-session-123"},
sessionID: utils.PtrTo("affinity-session-123"),
},
{
name: "opencode_without_session_header",
client: aibridge.ClientOpenCode,
Expand Down
Loading