Skip to content

Commit 12978ce

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). Signed-off-by: vladikkuzn <[email protected]>
1 parent c5264a4 commit 12978ce

2 files changed

Lines changed: 134 additions & 9 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
@@ -3377,6 +3377,7 @@ describe("ClaudeAdapterV2 background wake turns", () => {
33773377
event.type === "turn.terminal",
33783378
);
33793379
return {
3380+
adapter,
33803381
attachmentsDir,
33813382
runtime,
33823383
providerThread,
@@ -8001,6 +8002,129 @@ describe("ClaudeAdapterV2 background wake turns", () => {
80018002
),
80028003
);
80038004

8005+
it.effect("keeps each session on the window its own Claude process reports", () =>
8006+
Effect.gen(function* () {
8007+
const harness = yield* makeWakeHarnessWithOptions({ freshQueueOnReopen: true });
8008+
const modelSelection = {
8009+
instanceId: ProviderInstanceId.make(ClaudeAdapterV2.CLAUDE_PROVIDER),
8010+
model: "claude-opus-5-5",
8011+
} satisfies ModelSelection;
8012+
const usage = { ...zeroUsage, input_tokens: 9_667, output_tokens: 2 };
8013+
const reportedWindow = (uuid: string, contextWindow: number) =>
8014+
makeResultFrame({
8015+
uuid,
8016+
result: "OK",
8017+
modelUsage: {
8018+
"claude-opus-5-5": {
8019+
inputTokens: 9_667,
8020+
outputTokens: 2,
8021+
cacheReadInputTokens: 0,
8022+
cacheCreationInputTokens: 0,
8023+
webSearchRequests: 0,
8024+
costUSD: 0,
8025+
contextWindow,
8026+
maxOutputTokens: 32_000,
8027+
},
8028+
},
8029+
});
8030+
const windows = (events: ReadonlyArray<ProviderAdapter.ProviderAdapterV2Event>) =>
8031+
events.flatMap((event) =>
8032+
event.type === "provider_turn.updated" && event.providerTurn.tokenUsage
8033+
? [event.providerTurn.tokenUsage.maxTokens]
8034+
: [],
8035+
);
8036+
const startTurn = (
8037+
runtime: ProviderAdapter.ProviderAdapterV2SessionRuntime,
8038+
threadId: ThreadId,
8039+
providerThread: typeof harness.providerThread,
8040+
attemptId: string,
8041+
) =>
8042+
Effect.gen(function* () {
8043+
yield* runtime.startTurn(
8044+
makeClaudeTestTurnInput({
8045+
threadId,
8046+
providerThread,
8047+
now: yield* DateTime.now,
8048+
attemptId: RunAttemptId.make(attemptId),
8049+
text: "Continue.",
8050+
attachments: [],
8051+
modelSelection,
8052+
}),
8053+
);
8054+
});
8055+
8056+
yield* startTurn(harness.runtime, harness.threadId, harness.providerThread, "attempt-a-1");
8057+
yield* Queue.offer(
8058+
harness.sdkMessages,
8059+
usageStreamFrame({ type: "message_start", message: { id: "msg_a1", usage } }),
8060+
);
8061+
yield* Queue.offer(
8062+
harness.sdkMessages,
8063+
reportedWindow("00000000-0000-4000-8000-000000000690", 200_000),
8064+
);
8065+
assert.equal((yield* Queue.take(harness.terminalReceipts)).status, "completed");
8066+
8067+
const threadB = ThreadId.make("thread-claude-wake-b");
8068+
const runtimeB = yield* harness.adapter.openSession({
8069+
threadId: threadB,
8070+
providerSessionId: ProviderSessionId.make("provider-session-claude-wake-b"),
8071+
modelSelection,
8072+
runtimePolicy: CLAUDE_TEST_RUNTIME_POLICY,
8073+
});
8074+
const providerThreadB = yield* runtimeB.ensureThread({
8075+
threadId: threadB,
8076+
modelSelection,
8077+
runtimePolicy: CLAUDE_TEST_RUNTIME_POLICY,
8078+
});
8079+
const eventsB: Array<ProviderAdapter.ProviderAdapterV2Event> = [];
8080+
const terminalsB = yield* Queue.unbounded<ProviderAdapter.ProviderAdapterV2Event>();
8081+
yield* runtimeB.events.pipe(
8082+
Stream.runForEach((event) =>
8083+
Effect.gen(function* () {
8084+
eventsB.push(event);
8085+
if (event.type === "turn.terminal") yield* Queue.offer(terminalsB, event);
8086+
}),
8087+
),
8088+
Effect.forkScoped,
8089+
);
8090+
yield* startTurn(runtimeB, threadB, providerThreadB, "attempt-b-1");
8091+
const queueB = harness.processQueues.at(-1);
8092+
assert.isDefined(queueB);
8093+
assert.notStrictEqual(queueB, harness.sdkMessages);
8094+
yield* Queue.offer(
8095+
queueB,
8096+
usageStreamFrame({ type: "message_start", message: { id: "msg_b1", usage } }),
8097+
);
8098+
yield* Queue.offer(queueB, reportedWindow("00000000-0000-4000-8000-000000000691", 1_000_000));
8099+
yield* Queue.take(terminalsB);
8100+
8101+
yield* startTurn(harness.runtime, harness.threadId, harness.providerThread, "attempt-a-2");
8102+
yield* Queue.offer(
8103+
harness.sdkMessages,
8104+
usageStreamFrame({ type: "message_start", message: { id: "msg_a2", usage } }),
8105+
);
8106+
yield* Queue.offer(
8107+
harness.sdkMessages,
8108+
reportedWindow("00000000-0000-4000-8000-000000000692", 200_000),
8109+
);
8110+
assert.equal((yield* Queue.take(harness.terminalReceipts)).status, "completed");
8111+
8112+
assert.deepEqual(windows(harness.events), [1_000_000, 200_000, 200_000]);
8113+
assert.deepEqual(windows(eventsB), [1_000_000, 1_000_000]);
8114+
assert.strictEqual(harness.runtime.getModelContextWindow?.(modelSelection), 200_000);
8115+
assert.strictEqual(runtimeB.getModelContextWindow?.(modelSelection), 1_000_000);
8116+
}).pipe(
8117+
Effect.provide(
8118+
Layer.mergeAll(
8119+
IdAllocator.layer,
8120+
McpProviderSessions.layer,
8121+
NodeServices.layer,
8122+
NodeCrypto.layer,
8123+
),
8124+
),
8125+
),
8126+
);
8127+
80048128
it.effect("merges cumulative stream usage into the message_start counts", () =>
80058129
Effect.gen(function* () {
80068130
const harness = yield* makeWakeHarnessWithOptions({

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

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4876,15 +4876,6 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
48764876
);
48774877
// Reloaded at each turn and steer so downloaded manifest updates apply without a release.
48784878
let modelCatalog = yield* loadModelCatalog;
4879-
// Results report the window Claude Code enforces, which outranks the catalog: user settings
4880-
// such as CLAUDE_CODE_DISABLE_1M_CONTEXT shrink it, and outside the catalog it is the only source.
4881-
const reportedContextWindows = new Map<string, number>();
4882-
const claudeContextWindow = (modelSelection: ModelSelection): number | null =>
4883-
reportedContextWindows.get(
4884-
compileClaudeModelSelection(modelSelection, modelCatalog).apiModelId,
4885-
) ??
4886-
resolveClaudeCatalogContextWindowTokens(modelCatalog, modelSelection) ??
4887-
null;
48884879
const continuationRequests = adapterOptions.continuationRequests ?? {
48894880
offer: () => Effect.void,
48904881
};
@@ -5167,6 +5158,16 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
51675158
// Wake buffers replay result frames, so ledger growth is measured once on arrival.
51685159
const resultLedgerUsage = new WeakMap<SDKMessage, ClaudeLedgerUsage>();
51695160
const resultsReportingNewContextWindow = new WeakSet<SDKMessage>();
5161+
// Results report the window this session's Claude process enforces, which outranks the
5162+
// catalog: user and project settings such as CLAUDE_CODE_DISABLE_1M_CONTEXT shrink it, and
5163+
// outside the catalog it is the only source. Other sessions may load other settings.
5164+
const reportedContextWindows = new Map<string, number>();
5165+
const claudeContextWindow = (modelSelection: ModelSelection): number | null =>
5166+
reportedContextWindows.get(
5167+
compileClaudeModelSelection(modelSelection, modelCatalog).apiModelId,
5168+
) ??
5169+
resolveClaudeCatalogContextWindowTokens(modelCatalog, modelSelection) ??
5170+
null;
51705171
// A worktree handoff changes the project settings even within one session.
51715172
let bypassCache: { cwd: string | null; availability: ClaudeBypassAvailability } | null =
51725173
null;

0 commit comments

Comments
 (0)