Skip to content

Use Claude Code, Codex, VSCode, Pi, and OpenCode (and 6 other harnesses) for free (1.3B+ free tokens) from your terminal, app, IDE, or phone, and now from the browser with native browser sessions (multi-harness + multi-model) like OpenClaw (voice supported + ToS friendly)

Python

Fix Claude Code session forwarding to OpenCode (#1706)

Ali Khokhar1bc4ca4432ca
diff --git a/pyproject.toml b/pyproject.toml
index 0c45c3a0..1ca4b3a2 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
[project]
name = "free-claude-code"
-version = "5.23.4"
+version = "5.23.5"
description = "Local proxy connecting coding agents to OpenAI-compatible AI providers"
readme = "README.md"
requires-python = ">=3.14.0"
diff --git a/src/free_claude_code/providers/opencode/provider.py b/src/free_claude_code/providers/opencode/provider.py
index 64d22bd7..d73562ed 100644
--- a/src/free_claude_code/providers/opencode/provider.py
+++ b/src/free_claude_code/providers/opencode/provider.py
@@ -133,7 +133,12 @@ class OpenCodeProvider(OpenAIChatProvider):
self, request_headers: Mapping[str, str]
) -> Mapping[str, str]:
headers = {name.lower(): value for name, value in request_headers.items()}
- for name in ("x-opencode-session", "session-id", "x-session-id"):
+ for name in (
+ "x-opencode-session",
+ "session-id",
+ "x-session-id",
+ "x-claude-code-session-id",
+ ):
session_id = headers.get(name)
if session_id and session_id.strip():
return {"x-opencode-session": session_id}
diff --git a/tests/api/test_opencode_session_headers.py b/tests/api/test_opencode_session_headers.py
index cb7147b4..395c3deb 100644
--- a/tests/api/test_opencode_session_headers.py
+++ b/tests/api/test_opencode_session_headers.py
@@ -122,7 +122,12 @@ async def test_existing_session_id_reaches_opencode_without_forwarding_other_hea
for name, value in provider._client.default_headers.items()
if isinstance(value, str)
}
- for name in ("Session-Id", "X-OpenCode-Session", "X-Session-Id"):
+ for name in (
+ "Session-Id",
+ "X-OpenCode-Session",
+ "X-Session-Id",
+ "X-Claude-Code-Session-Id",
+ ):
for conversation in ("conversation-a", "conversation-a", "conversation-b"):
response = await client.post(
f"/v1/{ingress}",
@@ -159,6 +164,7 @@ async def test_session_header_precedence_and_absence_do_not_invent_or_reuse_iden
headers={
"x-opencode-session": "explicit-session",
"session-id": "native-session",
+ "X-Claude-Code-Session-Id": "claude-session",
},
)
assert response.status_code == 200, response.text
@@ -173,7 +179,10 @@ async def test_session_header_precedence_and_absence_do_not_invent_or_reuse_iden
@pytest.mark.parametrize("selector", ["responses-selector", "chat-selector"])
-async def test_concurrent_conversations_keep_their_session_ids_during_retry(selector):
[email protected]("session_header", ["session-id", "X-Claude-Code-Session-Id"])
+async def test_concurrent_conversations_keep_their_session_ids_during_retry(
+ selector, session_header
+):
first_arrived = asyncio.Event()
second_arrived = asyncio.Event()
attempts = []
@@ -201,7 +210,7 @@ async def test_concurrent_conversations_keep_their_session_ids_during_retry(sele
client.post(
"/v1/responses",
json=request,
- headers={"session-id": "conversation-a"},
+ headers={session_header: "conversation-a"},
)
)
try:
@@ -209,7 +218,7 @@ async def test_concurrent_conversations_keep_their_session_ids_during_retry(sele
second = await client.post(
"/v1/responses",
json=request,
- headers={"session-id": "conversation-b"},
+ headers={session_header: "conversation-b"},
)
assert second.status_code == 200, second.text
result = await first
diff --git a/uv.lock b/uv.lock
index 7aa80490..3658e391 100644
--- a/uv.lock
+++ b/uv.lock
@@ -598,7 +598,7 @@ wheels = [
[[package]]
name = "free-claude-code"
-version = "5.23.4"
+version = "5.23.5"
source = { editable = "." }
dependencies = [
{ name = "aiohttp" },