Skip to content

Commit 5183ea4

Browse files
fix(core): send Codex session headers with ChatGPT token sharing (#53767)
Co-authored-by: rekram1-node <[email protected]>
1 parent 053e534 commit 5183ea4

2 files changed

Lines changed: 37 additions & 3 deletions

File tree

‎packages/core/src/plugin/provider/chatgpt.ts‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import { Integration } from "../../integration.js"
1313
import { Model } from "../../model.js"
1414
import { OauthCallbackPage } from "../../oauth/page.js"
1515
import { Provider } from "../../provider.js"
16+
import { SessionAffinity } from "../../session/affinity.js"
1617
import type { PluginInternal } from "../internal.js"
1718

1819
// First-time sign-in registers a user-owned client; OpenAI returns its issued client ID on the callback.
@@ -264,6 +265,21 @@ export const ChatGPTPlugin = define({
264265
}),
265266
{ providerID },
266267
)
268+
yield* ctx.session.hook(
269+
"model.request",
270+
(evt) =>
271+
Effect.gen(function* () {
272+
if (!chatgpt) return
273+
const session = yield* ctx.session
274+
.get({ sessionID: evt.sessionID })
275+
.pipe(Effect.orElseSucceed(() => undefined))
276+
// Mirror the Codex client's session headers: ChatGPT derives prompt-cache affinity from session-id.
277+
evt.headers["session-id"] = session ? SessionAffinity.get(session) : evt.sessionID
278+
evt.headers["thread-id"] = evt.sessionID
279+
evt.headers["x-client-request-id"] = evt.sessionID
280+
}),
281+
{ providerID },
282+
)
267283
yield* ctx.provider.transform((providers) => {
268284
const item = providers.get(providerID)
269285
if (!item) return

‎packages/core/test/plugin/provider-chatgpt.test.ts‎

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,14 @@ const authorize = Effect.fn(function* () {
7373
return new URL(attempt.url)
7474
})
7575

76-
const request = Effect.fn(function* (providerID: Provider.ID, baseURL: string) {
76+
const request = Effect.fn(function* (
77+
providerID: Provider.ID,
78+
baseURL: string,
79+
sessionID = Session.ID.make("ses_test"),
80+
) {
7781
const hooks = yield* PluginHooks.Service
7882
const event = yield* hooks.trigger("session", "model.request", {
79-
sessionID: Session.ID.make("ses_test"),
83+
sessionID,
8084
agent: Agent.ID.make("build"),
8185
model: Model.Ref.make({ providerID, id: Model.ID.make("gpt-5.5") }),
8286
kind: "primary",
@@ -767,8 +771,21 @@ describe("ChatGPTPlugin", () => {
767771
expect(provider.settings?.baseURL).toBe("https://api.openai.com/v1")
768772
expect(provider.headers).not.toHaveProperty("x-openai-chatpass-test")
769773
expect(direct.baseURL).toBe("https://api.openai.com/v1")
770-
expect(direct.headers).toEqual({})
774+
expect(direct.headers).toEqual({
775+
"session-id": "ses_test",
776+
"thread-id": "ses_test",
777+
"x-client-request-id": "ses_test",
778+
})
771779
expect(direct.hasHttpHooks).toBe(false)
780+
const sessions = yield* Session.Service
781+
const location = yield* Location.Service
782+
const parent = yield* sessions.create({ location: { directory: location.directory } })
783+
const child = yield* sessions.create({ parentID: parent.id })
784+
expect((yield* request(Provider.ID.openai, "https://api.openai.com/v1", child.id)).headers).toEqual({
785+
"session-id": parent.id,
786+
"thread-id": child.id,
787+
"x-client-request-id": child.id,
788+
})
772789
const eligible = required(yield* models.get(Provider.ID.openai, Model.ID.make("gpt-5.5")))
773790
expect(eligible.package).toBe("@opencode/ai/providers/openai")
774791
expect(eligible.headers).not.toHaveProperty("x-openai-chatpass-test")
@@ -845,6 +862,7 @@ describe("ChatGPTPlugin", () => {
845862
expect(provider.settings?.transport).toBe("websocket")
846863
expect(model.settings?.transport).toBeUndefined()
847864
expect(direct.baseURL).toBe("https://api.openai.com/v1")
865+
expect(direct.headers).toEqual({})
848866
expect(direct.hasHttpHooks).toBe(false)
849867
expect(provider.headers).not.toHaveProperty("x-openai-chatpass-test")
850868
expect(required(yield* models.get(Provider.ID.openai, Model.ID.make("gpt-4.1"))).enabled).toBe(true)

0 commit comments

Comments
 (0)