chore: merge dev into websocket support

packages/opencode/src/plugin/openai/codex.ts

@@ -644,7 +644,7 @@ export async function CodexAuthPlugin(input: PluginInput, options: CodexAuthPlug
       if (input.model.providerID !== "openai") return
       output.headers.originator = "opencode"
       output.headers["User-Agent"] = `opencode/${InstallationVersion} (${os.platform()} ${os.release()}; ${os.arch()})`
-      output.headers.session_id = input.sessionID
+      output.headers["session-id"] = input.sessionID
       // Temporary fetch-layer hack: title generation currently shares the conversation
       // session ID, so the OpenAI plugin marks it for HTTP fallback until transport
       // context can be passed directly instead of smuggled through headers.

packages/opencode/src/plugin/openai/ws-pool.ts

@@ -151,7 +151,7 @@ function invalidate(entry: PoolEntry) {
 }
 
 function poolKey(headers: Record<string, string>) {
-  const sessionID = headers["x-session-affinity"] ?? headers["session_id"]
+  const sessionID = headers["x-session-affinity"] ?? headers["session-id"]
   if (!sessionID) return undefined
 
   return [