Skip to content

Commit 5ea686c

Browse files
committed
fix(server): scope reported Claude context windows to their session
The reported-window map lived at adapter level, so a session whose project settings give a model 1M overwrote the 200k another session's Claude process enforces, and that session's meter went back to the wrong window. Each session now keeps the windows its own process reports, with the catalog as fallback until its first result. Implemented with Claude Opus 5.5 via Claude Code (T3 Code).
1 parent 35e7860 commit 5ea686c

2 files changed

Lines changed: 132 additions & 7 deletions

File tree

‎apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts‎

Lines changed: 124 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3349,6 +3349,7 @@ describe("ClaudeAdapterV2 background wake turns", () => {
33493349
event.type === "turn.terminal",
33503350
);
33513351
return {
3352+
adapter,
33523353
attachmentsDir,
33533354
runtime,
33543355
providerThread,
@@ -7865,6 +7866,129 @@ describe("ClaudeAdapterV2 background wake turns", () => {
78657866
),
78667867
);
78677868

7869+
it.effect("keeps each session on the window its own Claude process reports", () =>
7870+
Effect.gen(function* () {
7871+
const harness = yield* makeWakeHarnessWithOptions({ freshQueueOnReopen: true });
7872+
const modelSelection = {
7873+
instanceId: ProviderInstanceId.make(ClaudeAdapterV2.CLAUDE_PROVIDER),
7874+
model: "claude-opus-5-5",
7875+
} satisfies ModelSelection;
7876+
const usage = { ...zeroUsage, input_tokens: 9_667, output_tokens: 2 };
7877+
const reportedWindow = (uuid: string, contextWindow: number) =>
7878+
makeResultFrame({
7879+
uuid,
7880+
result: "OK",
7881+
modelUsage: {
7882+
"claude-opus-5-5": {
7883+
inputTokens: 9_667,
7884+
outputTokens: 2,
7885+
cacheReadInputTokens: 0,
7886+
cacheCreationInputTokens: 0,
7887+
webSearchRequests: 0,
7888+
costUSD: 0,
7889+
contextWindow,
7890+
maxOutputTokens: 32_000,
7891+
},
7892+
},
7893+
});
7894+
const windows = (events: ReadonlyArray<ProviderAdapter.ProviderAdapterV2Event>) =>
7895+
events.flatMap((event) =>
7896+
event.type === "provider_turn.updated" && event.providerTurn.tokenUsage
7897+
? [event.providerTurn.tokenUsage.maxTokens]
7898+
: [],
7899+
);
7900+
const startTurn = (
7901+
runtime: ProviderAdapter.ProviderAdapterV2SessionRuntime,
7902+
threadId: ThreadId,
7903+
providerThread: typeof harness.providerThread,
7904+
attemptId: string,
7905+
) =>
7906+
Effect.gen(function* () {
7907+
yield* runtime.startTurn(
7908+
makeClaudeTestTurnInput({
7909+
threadId,
7910+
providerThread,
7911+
now: yield* DateTime.now,
7912+
attemptId: RunAttemptId.make(attemptId),
7913+
text: "Continue.",
7914+
attachments: [],
7915+
modelSelection,
7916+
}),
7917+
);
7918+
});
7919+
7920+
yield* startTurn(harness.runtime, harness.threadId, harness.providerThread, "attempt-a-1");
7921+
yield* Queue.offer(
7922+
harness.sdkMessages,
7923+
usageStreamFrame({ type: "message_start", message: { id: "msg_a1", usage } }),
7924+
);
7925+
yield* Queue.offer(
7926+
harness.sdkMessages,
7927+
reportedWindow("00000000-0000-4000-8000-000000000690", 200_000),
7928+
);
7929+
assert.equal((yield* Queue.take(harness.terminalReceipts)).status, "completed");
7930+
7931+
const threadB = ThreadId.make("thread-claude-wake-b");
7932+
const runtimeB = yield* harness.adapter.openSession({
7933+
threadId: threadB,
7934+
providerSessionId: ProviderSessionId.make("provider-session-claude-wake-b"),
7935+
modelSelection,
7936+
runtimePolicy: CLAUDE_TEST_RUNTIME_POLICY,
7937+
});
7938+
const providerThreadB = yield* runtimeB.ensureThread({
7939+
threadId: threadB,
7940+
modelSelection,
7941+
runtimePolicy: CLAUDE_TEST_RUNTIME_POLICY,
7942+
});
7943+
const eventsB: Array<ProviderAdapter.ProviderAdapterV2Event> = [];
7944+
const terminalsB = yield* Queue.unbounded<ProviderAdapter.ProviderAdapterV2Event>();
7945+
yield* runtimeB.events.pipe(
7946+
Stream.runForEach((event) =>
7947+
Effect.gen(function* () {
7948+
eventsB.push(event);
7949+
if (event.type === "turn.terminal") yield* Queue.offer(terminalsB, event);
7950+
}),
7951+
),
7952+
Effect.forkScoped,
7953+
);
7954+
yield* startTurn(runtimeB, threadB, providerThreadB, "attempt-b-1");
7955+
const queueB = harness.processQueues.at(-1);
7956+
assert.isDefined(queueB);
7957+
assert.notStrictEqual(queueB, harness.sdkMessages);
7958+
yield* Queue.offer(
7959+
queueB,
7960+
usageStreamFrame({ type: "message_start", message: { id: "msg_b1", usage } }),
7961+
);
7962+
yield* Queue.offer(queueB, reportedWindow("00000000-0000-4000-8000-000000000691", 1_000_000));
7963+
yield* Queue.take(terminalsB);
7964+
7965+
yield* startTurn(harness.runtime, harness.threadId, harness.providerThread, "attempt-a-2");
7966+
yield* Queue.offer(
7967+
harness.sdkMessages,
7968+
usageStreamFrame({ type: "message_start", message: { id: "msg_a2", usage } }),
7969+
);
7970+
yield* Queue.offer(
7971+
harness.sdkMessages,
7972+
reportedWindow("00000000-0000-4000-8000-000000000692", 200_000),
7973+
);
7974+
assert.equal((yield* Queue.take(harness.terminalReceipts)).status, "completed");
7975+
7976+
assert.deepEqual(windows(harness.events), [1_000_000, 200_000, 200_000]);
7977+
assert.deepEqual(windows(eventsB), [1_000_000, 1_000_000]);
7978+
assert.strictEqual(harness.runtime.getModelContextWindow?.(modelSelection), 200_000);
7979+
assert.strictEqual(runtimeB.getModelContextWindow?.(modelSelection), 1_000_000);
7980+
}).pipe(
7981+
Effect.provide(
7982+
Layer.mergeAll(
7983+
IdAllocator.layer,
7984+
McpProviderSessions.layer,
7985+
NodeServices.layer,
7986+
NodeCrypto.layer,
7987+
),
7988+
),
7989+
),
7990+
);
7991+
78687992
it.effect("merges cumulative stream usage into the message_start counts", () =>
78697993
Effect.gen(function* () {
78707994
const harness = yield* makeWakeHarnessWithOptions({

‎apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4856,13 +4856,6 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
48564856
BUNDLED_CLAUDE_MODEL_CATALOG,
48574857
adapterOptions.settings.customModels,
48584858
);
4859-
// Results report the window Claude Code enforces, which outranks the catalog: user settings
4860-
// such as CLAUDE_CODE_DISABLE_1M_CONTEXT shrink it, and outside the catalog it is the only source.
4861-
const reportedContextWindows = new Map<string, number>();
4862-
const claudeContextWindow = (modelSelection: ModelSelection): number | null =>
4863-
reportedContextWindows.get(compileClaudeModelSelection(modelSelection).apiModelId) ??
4864-
resolveClaudeCatalogContextWindowTokens(BUNDLED_CLAUDE_MODEL_CATALOG, modelSelection) ??
4865-
null;
48664859
const continuationRequests = adapterOptions.continuationRequests ?? {
48674860
offer: () => Effect.void,
48684861
};
@@ -5100,6 +5093,14 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
51005093
// Wake buffers replay result frames, so ledger growth is measured once on arrival.
51015094
const resultLedgerUsage = new WeakMap<SDKMessage, ClaudeLedgerUsage>();
51025095
const resultsReportingNewContextWindow = new WeakSet<SDKMessage>();
5096+
// Results report the window this session's Claude process enforces, which outranks the
5097+
// catalog: user and project settings such as CLAUDE_CODE_DISABLE_1M_CONTEXT shrink it, and
5098+
// outside the catalog it is the only source. Other sessions may load other settings.
5099+
const reportedContextWindows = new Map<string, number>();
5100+
const claudeContextWindow = (modelSelection: ModelSelection): number | null =>
5101+
reportedContextWindows.get(compileClaudeModelSelection(modelSelection).apiModelId) ??
5102+
resolveClaudeCatalogContextWindowTokens(BUNDLED_CLAUDE_MODEL_CATALOG, modelSelection) ??
5103+
null;
51035104
// A worktree handoff changes the project settings even within one session.
51045105
let bypassCache: { cwd: string | null; availability: ClaudeBypassAvailability } | null =
51055106
null;

0 commit comments

Comments
 (0)