From 35f6ddd24738e51167717514d8addff15fbcdd17 Mon Sep 17 00:00:00 2001 From: vladikkuzn Date: Wed, 11 Nov 2026 08:34:18 +0200 Subject: [PATCH 1/2] fix(server): Claude context meter shows the window Claude actually enforces The meter preferred the bundled catalog window over the contextWindow that Claude Code reports per model in result.modelUsage, so a user with CLAUDE_CODE_DISABLE_1M_CONTEXT saw Opus 5.5 measured against 1M (and an auto-compact threshold derived from autoCompactWindow) while Claude Code blocked the turn near its real 200k limit. The reported window for the session's model now outranks the catalog; the catalog stays the fallback until a result reports one. Signed-off-by: vladikkuzn --- .../Adapters/ClaudeAdapterV2.test.ts | 80 ++++++++++++++----- .../Adapters/ClaudeAdapterV2.ts | 5 +- 2 files changed, 63 insertions(+), 22 deletions(-) diff --git a/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts b/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts index dd350fb73621..2d49d2104ae6 100644 --- a/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts +++ b/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts @@ -8770,14 +8770,41 @@ describe("ClaudeAdapterV2 background wake turns", () => { ), ); - it.effect("measures a model outside the catalog against the window Claude reports", () => + it.effect.each([ + { + model: "gateway-model", + autoCompactWindow: "", + reported: { "gateway-model": 1_048_576 }, + windows: [null, 1_048_576], + thresholds: [undefined, undefined], + }, + { + model: "claude-opus-5-5", + autoCompactWindow: "300000", + reported: { "claude-opus-5-5": 200_000 }, + windows: [1_000_000, 200_000], + thresholds: [267_000, undefined], + }, + { + model: "claude-opus-5-5", + autoCompactWindow: "300000", + reported: { "claude-haiku-5-5": 200_000 }, + windows: [1_000_000, 1_000_000], + thresholds: [267_000, 267_000], + }, + ])("measures $model against the window Claude reports for it", (row) => Effect.gen(function* () { - const harness = yield* makeWakeHarness; + const harness = yield* makeWakeHarnessWithOptions({ + settings: { ...DEFAULT_CLAUDE_SETTINGS, autoCompactWindow: row.autoCompactWindow }, + }); const modelSelection = { instanceId: ProviderInstanceId.make(ClaudeAdapterV2.CLAUDE_PROVIDER), - model: "gateway-model", + model: row.model, } satisfies ModelSelection; - assert.strictEqual(harness.runtime.getModelContextWindow?.(modelSelection), undefined); + assert.strictEqual( + harness.runtime.getModelContextWindow?.(modelSelection) ?? null, + row.windows[0], + ); yield* harness.runtime.startTurn( makeClaudeTestTurnInput({ threadId: harness.threadId, @@ -8795,30 +8822,43 @@ describe("ClaudeAdapterV2 background wake turns", () => { makeResultFrame({ uuid: "00000000-0000-4000-8000-000000000680", result: "OK", - modelUsage: { - "gateway-model": { - inputTokens: 9_667, - outputTokens: 2, - cacheReadInputTokens: 0, - cacheCreationInputTokens: 0, - webSearchRequests: 0, - costUSD: 0, - contextWindow: 1_048_576, - maxOutputTokens: 32_000, - }, - }, + modelUsage: Object.fromEntries( + Object.entries(row.reported).map(([model, contextWindow]) => [ + model, + { + inputTokens: 9_667, + outputTokens: 2, + cacheReadInputTokens: 0, + cacheCreationInputTokens: 0, + webSearchRequests: 0, + costUSD: 0, + contextWindow, + maxOutputTokens: 32_000, + }, + ]), + ), }), ]; for (const frame of frames) yield* Queue.offer(harness.sdkMessages, frame); const terminal = yield* Queue.take(harness.terminalReceipts); assert.equal(terminal.status, "completed"); - const windows = harness.events.flatMap((event) => + const usages = harness.events.flatMap((event) => event.type === "provider_turn.updated" && event.providerTurn.tokenUsage - ? [event.providerTurn.tokenUsage.maxTokens] + ? [event.providerTurn.tokenUsage] : [], ); - assert.deepEqual(windows, [null, 1_048_576]); - assert.strictEqual(harness.runtime.getModelContextWindow?.(modelSelection), 1_048_576); + assert.deepEqual( + usages.map((usage) => usage.maxTokens), + row.windows, + ); + assert.deepEqual( + usages.map((usage) => usage.autoCompactThreshold), + row.thresholds, + ); + assert.strictEqual( + harness.runtime.getModelContextWindow?.(modelSelection), + row.windows.at(-1), + ); }).pipe( Effect.provide( Layer.mergeAll( diff --git a/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts b/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts index f1ae8c58e7ae..c0d59730f88c 100644 --- a/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts +++ b/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts @@ -5306,13 +5306,14 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* ( ); // Reloaded at each turn and steer so downloaded manifest updates apply without a release. let modelCatalog = yield* loadModelCatalog; - // Results report the window Claude Code compacts against; outside the catalog it is the only source. + // Results report the window Claude Code enforces, which outranks the catalog: user settings + // such as CLAUDE_CODE_DISABLE_1M_CONTEXT shrink it, and outside the catalog it is the only source. const reportedContextWindows = new Map(); const claudeContextWindow = (modelSelection: ModelSelection): number | null => - resolveClaudeCatalogContextWindowTokens(modelCatalog, modelSelection) ?? reportedContextWindows.get( compileClaudeModelSelection(modelSelection, modelCatalog).apiModelId, ) ?? + resolveClaudeCatalogContextWindowTokens(modelCatalog, modelSelection) ?? null; const continuationRequests = adapterOptions.continuationRequests ?? { offer: () => Effect.void, From a986b8765ff57943b833f3f3ca159a249fdd653d Mon Sep 17 00:00:00 2001 From: vladikkuzn Date: Wed, 11 Nov 2026 08:34:19 +0200 Subject: [PATCH 2/2] 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. Signed-off-by: vladikkuzn --- .../Adapters/ClaudeAdapterV2.test.ts | 124 ++++++++++++++++++ .../Adapters/ClaudeAdapterV2.ts | 19 +-- 2 files changed, 134 insertions(+), 9 deletions(-) diff --git a/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts b/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts index 2d49d2104ae6..154fc9051f68 100644 --- a/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts +++ b/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts @@ -3613,6 +3613,7 @@ describe("ClaudeAdapterV2 background wake turns", () => { event.type === "turn.terminal", ); return { + adapter, attachmentsDir, runtime, providerThread, @@ -8966,6 +8967,129 @@ describe("ClaudeAdapterV2 background wake turns", () => { ), ); + it.effect("keeps each session on the window its own Claude process reports", () => + Effect.gen(function* () { + const harness = yield* makeWakeHarnessWithOptions({ freshQueueOnReopen: true }); + const modelSelection = { + instanceId: ProviderInstanceId.make(ClaudeAdapterV2.CLAUDE_PROVIDER), + model: "claude-opus-5-5", + } satisfies ModelSelection; + const usage = { ...zeroUsage, input_tokens: 9_667, output_tokens: 2 }; + const reportedWindow = (uuid: string, contextWindow: number) => + makeResultFrame({ + uuid, + result: "OK", + modelUsage: { + "claude-opus-5-5": { + inputTokens: 9_667, + outputTokens: 2, + cacheReadInputTokens: 0, + cacheCreationInputTokens: 0, + webSearchRequests: 0, + costUSD: 0, + contextWindow, + maxOutputTokens: 32_000, + }, + }, + }); + const windows = (events: ReadonlyArray) => + events.flatMap((event) => + event.type === "provider_turn.updated" && event.providerTurn.tokenUsage + ? [event.providerTurn.tokenUsage.maxTokens] + : [], + ); + const startTurn = ( + runtime: ProviderAdapter.ProviderAdapterV2SessionRuntime, + threadId: ThreadId, + providerThread: typeof harness.providerThread, + attemptId: string, + ) => + Effect.gen(function* () { + yield* runtime.startTurn( + makeClaudeTestTurnInput({ + threadId, + providerThread, + now: yield* DateTime.now, + attemptId: RunAttemptId.make(attemptId), + text: "Continue.", + attachments: [], + modelSelection, + }), + ); + }); + + yield* startTurn(harness.runtime, harness.threadId, harness.providerThread, "attempt-a-1"); + yield* Queue.offer( + harness.sdkMessages, + usageStreamFrame({ type: "message_start", message: { id: "msg_a1", usage } }), + ); + yield* Queue.offer( + harness.sdkMessages, + reportedWindow("00000000-0000-4000-8000-000000000690", 200_000), + ); + assert.equal((yield* Queue.take(harness.terminalReceipts)).status, "completed"); + + const threadB = ThreadId.make("thread-claude-wake-b"); + const runtimeB = yield* harness.adapter.openSession({ + threadId: threadB, + providerSessionId: ProviderSessionId.make("provider-session-claude-wake-b"), + modelSelection, + runtimePolicy: CLAUDE_TEST_RUNTIME_POLICY, + }); + const providerThreadB = yield* runtimeB.ensureThread({ + threadId: threadB, + modelSelection, + runtimePolicy: CLAUDE_TEST_RUNTIME_POLICY, + }); + const eventsB: Array = []; + const terminalsB = yield* Queue.unbounded(); + yield* runtimeB.events.pipe( + Stream.runForEach((event) => + Effect.gen(function* () { + eventsB.push(event); + if (event.type === "turn.terminal") yield* Queue.offer(terminalsB, event); + }), + ), + Effect.forkScoped, + ); + yield* startTurn(runtimeB, threadB, providerThreadB, "attempt-b-1"); + const queueB = harness.processQueues.at(-1); + assert.isDefined(queueB); + assert.notStrictEqual(queueB, harness.sdkMessages); + yield* Queue.offer( + queueB, + usageStreamFrame({ type: "message_start", message: { id: "msg_b1", usage } }), + ); + yield* Queue.offer(queueB, reportedWindow("00000000-0000-4000-8000-000000000691", 1_000_000)); + yield* Queue.take(terminalsB); + + yield* startTurn(harness.runtime, harness.threadId, harness.providerThread, "attempt-a-2"); + yield* Queue.offer( + harness.sdkMessages, + usageStreamFrame({ type: "message_start", message: { id: "msg_a2", usage } }), + ); + yield* Queue.offer( + harness.sdkMessages, + reportedWindow("00000000-0000-4000-8000-000000000692", 200_000), + ); + assert.equal((yield* Queue.take(harness.terminalReceipts)).status, "completed"); + + assert.deepEqual(windows(harness.events), [1_000_000, 200_000, 200_000]); + assert.deepEqual(windows(eventsB), [1_000_000, 1_000_000]); + assert.strictEqual(harness.runtime.getModelContextWindow?.(modelSelection), 200_000); + assert.strictEqual(runtimeB.getModelContextWindow?.(modelSelection), 1_000_000); + }).pipe( + Effect.provide( + Layer.mergeAll( + IdAllocator.layer, + McpProviderSessions.layer, + NodeServices.layer, + NodeCrypto.layer, + ), + ), + ), + ); + it.effect("merges cumulative stream usage into the message_start counts", () => Effect.gen(function* () { const harness = yield* makeWakeHarnessWithOptions({ diff --git a/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts b/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts index c0d59730f88c..7f6408f82878 100644 --- a/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts +++ b/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts @@ -5306,15 +5306,6 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* ( ); // Reloaded at each turn and steer so downloaded manifest updates apply without a release. let modelCatalog = yield* loadModelCatalog; - // Results report the window Claude Code enforces, which outranks the catalog: user settings - // such as CLAUDE_CODE_DISABLE_1M_CONTEXT shrink it, and outside the catalog it is the only source. - const reportedContextWindows = new Map(); - const claudeContextWindow = (modelSelection: ModelSelection): number | null => - reportedContextWindows.get( - compileClaudeModelSelection(modelSelection, modelCatalog).apiModelId, - ) ?? - resolveClaudeCatalogContextWindowTokens(modelCatalog, modelSelection) ?? - null; const continuationRequests = adapterOptions.continuationRequests ?? { offer: () => Effect.void, }; @@ -5632,6 +5623,16 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* ( // Wake buffers replay result frames, so ledger growth is measured once on arrival. const resultLedgerUsage = new WeakMap(); const resultsReportingNewContextWindow = new WeakSet(); + // Results report the window this session's Claude process enforces, which outranks the + // catalog: user and project settings such as CLAUDE_CODE_DISABLE_1M_CONTEXT shrink it, and + // outside the catalog it is the only source. Other sessions may load other settings. + const reportedContextWindows = new Map(); + const claudeContextWindow = (modelSelection: ModelSelection): number | null => + reportedContextWindows.get( + compileClaudeModelSelection(modelSelection, modelCatalog).apiModelId, + ) ?? + resolveClaudeCatalogContextWindowTokens(modelCatalog, modelSelection) ?? + null; // A worktree handoff changes the project settings even within one session. let bypassCache: { cwd: string | null; availability: ClaudeBypassAvailability } | null = null;