The best way to control Claude Code, Codex and more from any computer or phone
Mirrored from https://github.com/Camo67/t3code.git
Synced Nov 22, 04:30 UTC
fix(server): Claude context meter shows the window for models outside the catalog (#30051)
Co-authored-by: maria-rcks <maria@kuuro.net>
Chunhao Zhang committed
Nov 4, 2026 at 07:44 UTC
7fd859aeef7e8a151551e7888d7732c136ffc7f0
3 files changed
+149
-53
apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts
+87
-2
@@ -738,7 +738,7 @@ describe("ClaudeAdapterV2 context usage", () => {
738
output_tokens: 1,
739
cache_creation: { ephemeral_1h_input_tokens: 0, ephemeral_5m_input_tokens: 300 },
740
},
741
- CLAUDE_TEST_MODEL_SELECTION,
741
+ null,
742
"2026-08-29T00:03:00.000Z",
743
"",
744
DateTime.makeUnsafe("2026-08-29T00:00:00.000Z"),
@@ -2990,6 +2990,7 @@ describe("ClaudeAdapterV2 background wake turns", () => {
2990
readonly cache_creation_input_tokens: number;
2991
readonly cache_read_input_tokens: number;
2992
};
2993
+ readonly modelUsage?: SDKResultMessage["modelUsage"];
2994
}) =>
2995
claudeSdkFrame({
2996
type: "result",
@@ -3007,7 +3008,7 @@ describe("ClaudeAdapterV2 background wake turns", () => {
3008
cache_creation_input_tokens: 0,
3009
cache_read_input_tokens: 0,
3010
},
3010
- modelUsage: {},
3011
+ modelUsage: input.modelUsage ?? {},
3012
permission_denials: [],
3013
uuid: input.uuid,
3014
session_id: WAKE_NATIVE_SESSION,
@@ -7131,6 +7132,67 @@ describe("ClaudeAdapterV2 background wake turns", () => {
7132
),
7133
);
7134
7135
+ it.effect("measures a model outside the catalog against the window Claude reports", () =>
7136
+ Effect.gen(function* () {
7137
+ const harness = yield* makeWakeHarness;
7138
+ const modelSelection = {
7139
+ instanceId: ProviderInstanceId.make(ClaudeAdapterV2.CLAUDE_PROVIDER),
7140
+ model: "gateway-model",
7141
+ } satisfies ModelSelection;
7142
+ assert.strictEqual(harness.runtime.getModelContextWindow?.(modelSelection), undefined);
7143
+ yield* harness.runtime.startTurn(
7144
+ makeClaudeTestTurnInput({
7145
+ threadId: harness.threadId,
7146
+ providerThread: harness.providerThread,
7147
+ now: yield* DateTime.now,
7148
+ attemptId: RunAttemptId.make("attempt-reported-context-window"),
7149
+ text: "Continue.",
7150
+ attachments: [],
7151
+ modelSelection,
7152
+ }),
7153
+ );
7154
+ const usage = { ...zeroUsage, input_tokens: 9_667, output_tokens: 2 };
7155
+ const frames = [
7156
+ usageStreamFrame({ type: "message_start", message: { id: "msg_gateway", usage } }),
7157
+ makeResultFrame({
7158
+ uuid: "00000000-0000-4000-8000-000000000680",
7159
+ result: "OK",
7160
+ modelUsage: {
7161
+ "gateway-model": {
7162
+ inputTokens: 9_667,
7163
+ outputTokens: 2,
7164
+ cacheReadInputTokens: 0,
7165
+ cacheCreationInputTokens: 0,
7166
+ webSearchRequests: 0,
7167
+ costUSD: 0,
7168
+ contextWindow: 1_048_576,
7169
+ maxOutputTokens: 32_000,
7170
+ },
7171
+ },
7172
+ }),
7173
+ ];
7174
+ for (const frame of frames) yield* Queue.offer(harness.sdkMessages, frame);
7175
+ const terminal = yield* Queue.take(harness.terminalReceipts);
7176
+ assert.equal(terminal.status, "completed");
7177
+ const windows = harness.events.flatMap((event) =>
7178
+ event.type === "provider_turn.updated" && event.providerTurn.tokenUsage
7179
+ ? [event.providerTurn.tokenUsage.maxTokens]
7180
+ : [],
7181
+ );
7182
+ assert.deepEqual(windows, [null, 1_048_576]);
7183
+ assert.strictEqual(harness.runtime.getModelContextWindow?.(modelSelection), 1_048_576);
7184
+ }).pipe(
7185
+ Effect.provide(
7186
+ Layer.mergeAll(
7187
+ IdAllocator.layer,
7188
+ McpProviderSessions.layer,
7189
+ NodeServices.layer,
7190
+ NodeCrypto.layer,
7191
+ ),
7192
+ ),
7193
+ ),
7194
+ );
7195
+
7196
it.effect("merges cumulative stream usage into the message_start counts", () =>
7197
Effect.gen(function* () {
7198
const harness = yield* makeWakeHarnessWithOptions({
@@ -7372,6 +7434,10 @@ describe("ClaudeAdapterV2 background wake turns", () => {
7434
providerThread: harness.providerThread,
7435
now,
7436
attemptId: RunAttemptId.make("claude-native-compact-attempt"),
7437
+ modelSelection: {
7438
+ instanceId: ProviderInstanceId.make(ClaudeAdapterV2.CLAUDE_PROVIDER),
7439
+ model: "gateway-model",
7440
+ },
7441
text: " /COMPACT ",
7442
attachments: [],
7443
}),
@@ -7391,6 +7457,18 @@ describe("ClaudeAdapterV2 background wake turns", () => {
7457
makeResultFrame({
7458
uuid: "00000000-0000-4000-8000-000000000202",
7459
result: "Compacted conversation.",
7460
+ modelUsage: {
7461
+ "gateway-model": {
7462
+ inputTokens: 1,
7463
+ outputTokens: 1,
7464
+ cacheReadInputTokens: 0,
7465
+ cacheCreationInputTokens: 0,
7466
+ webSearchRequests: 0,
7467
+ costUSD: 0,
7468
+ contextWindow: 200_000,
7469
+ maxOutputTokens: 32_000,
7470
+ },
7471
+ },
7472
}),
7473
);
7474
yield* Queue.take(harness.terminalReceipts);
@@ -7411,6 +7489,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
7489
event.providerTurn.tokenUsage?.usedTokens === 400,
7490
);
7491
assert.isDefined(watermark);
7492
+ const windows = harness.events.flatMap((event) =>
7493
+ event.type === "provider_turn.updated" && event.providerTurn.tokenUsage
7494
+ ? [event.providerTurn.tokenUsage.maxTokens]
7495
+ : [],
7496
+ );
7497
+ assert.deepEqual(windows, [null, 200_000]);
7498
const completed = harness.events.findLast(
7499
(event) => event.type === "provider_turn.updated",
7500
);
@@ -7424,6 +7508,7 @@ describe("ClaudeAdapterV2 background wake turns", () => {
7508
outputTokens: 1,
7509
cachedInputTokens: 0,
7510
cacheCreationTokens: 0,
7511
+ otherUsage: { inputTokens: 0, outputTokens: 0 },
7512
});
7513
}
7514
}).pipe(
apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts
+49
-51
@@ -25,6 +25,7 @@ import {
25
addClaudeLedgerUsage,
26
claudeLedgerDelta,
27
claudeModelLedger,
28
+ claudeReportedContextWindows,
29
normalizeClaudeTurnTokenUsage,
30
type ClaudeLedgerUsage,
31
type ClaudeModelLedger,
@@ -221,12 +222,6 @@ import {
222
export const CLAUDE_PROVIDER = ProviderDriverKind.make("claudeAgent");
223
const CLAUDE_AGENT_SDK_QUERY_PROTOCOL = "claude-agent-sdk.query" as const;
224
224
-function claudeContextWindow(modelSelection: ModelSelection): number | null {
225
- return (
226
- resolveClaudeCatalogContextWindowTokens(BUNDLED_CLAUDE_MODEL_CATALOG, modelSelection) ?? null
227
- );
228
-}
229
-
225
interface ClaudeCacheCreation {
226
readonly ephemeral_1h_input_tokens: number;
227
readonly ephemeral_5m_input_tokens: number;
@@ -273,7 +268,7 @@ export function claudeProviderTurnTokenUsage(
268
readonly cache_creation?: ClaudeCacheCreation | null;
269
readonly output_tokens: number;
270
},
276
- modelSelection: ModelSelection,
271
+ maxTokens: number | null,
272
updatedAt: string,
273
autoCompactWindow = "",
274
requestedAt?: DateTime.Utc,
@@ -281,7 +276,6 @@ export function claudeProviderTurnTokenUsage(
276
const inputTokens = claudeMessageInputTokens(usage);
277
const outputTokens = usage.output_tokens;
278
const promptCacheTtlMs = claudePromptCacheTtlMs(usage.cache_creation);
284
- const maxTokens = claudeContextWindow(modelSelection);
279
// The cache lifetime starts with the request, not when its response ends.
280
const promptCacheExpiresAt =
281
promptCacheTtlMs === undefined || requestedAt === undefined
@@ -4123,6 +4117,7 @@ interface ActiveClaudeTurnContext {
4117
requestedAt?: DateTime.Utc;
4118
usage: ClaudeMessageUsage | null;
4119
} | null;
4120
+ compactionTokens: number | undefined;
4121
readonly toolCalls: Map<string, ActiveClaudeToolCall>;
4122
// A successful status can precede the boundary that supplies its token counts.
4123
compaction: Extract<OrchestrationV2TurnItem, { type: "compaction" }> | null;
@@ -4621,6 +4616,12 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
4616
BUNDLED_CLAUDE_MODEL_CATALOG,
4617
adapterOptions.settings.customModels,
4618
);
4619
+ // Results report the window Claude Code compacts against; outside the catalog it is the only source.
4620
+ const reportedContextWindows = new Map<string, number>();
4621
+ const claudeContextWindow = (modelSelection: ModelSelection): number | null =>
4622
+ resolveClaudeCatalogContextWindowTokens(BUNDLED_CLAUDE_MODEL_CATALOG, modelSelection) ??
4623
+ reportedContextWindows.get(compileClaudeModelSelection(modelSelection).apiModelId) ??
4624
+ null;
4625
const continuationRequests = adapterOptions.continuationRequests ?? {
4626
offer: () => Effect.void,
4627
};
@@ -4853,6 +4854,7 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
4854
const queryContext = yield* Ref.make<ClaudeLiveQueryContext | null>(null);
4855
// Wake buffers replay result frames, so ledger growth is measured once on arrival.
4856
const resultLedgerUsage = new WeakMap<SDKMessage, ClaudeLedgerUsage>();
4857
+ const resultsReportingNewContextWindow = new WeakSet<SDKMessage>();
4858
// A worktree handoff changes the project settings even within one session.
4859
let bypassCache: { cwd: string | null; availability: ClaudeBypassAvailability } | null =
4860
null;
@@ -5139,21 +5141,36 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
5141
// Usage without input is a placeholder, not a context measurement.
5142
const emitContextUsage = Effect.fnUntraced(function* (
5143
context: ActiveClaudeTurnContext,
5142
- usage: ClaudeMessageUsage,
5144
+ usage: ClaudeMessageUsage | number,
5145
requestStarted = false,
5146
) {
5147
const now = yield* DateTime.now;
5148
// Only message_start marks the request start; an assistant snapshot
5149
// arrives after generation, so it leaves the cache expiry unknown.
5150
if (requestStarted && context.streamUsage !== null) context.streamUsage.requestedAt = now;
5149
- const tokenUsage = claudeProviderTurnTokenUsage(
5150
- usage,
5151
- context.input.modelSelection,
5152
- DateTime.formatIso(now),
5153
- adapterOptions.settings.autoCompactWindow,
5154
- context.streamUsage?.requestedAt,
5155
- );
5156
- if (tokenUsage.inputTokens <= 0) return;
5151
+ const maxTokens = claudeContextWindow(context.input.modelSelection);
5152
+ const tokenUsage =
5153
+ typeof usage === "number"
5154
+ ? {
5155
+ usedTokens: usage,
5156
+ maxTokens,
5157
+ ...claudeAutoCompactThreshold(
5158
+ adapterOptions.settings.autoCompactWindow,
5159
+ maxTokens,
5160
+ ),
5161
+ updatedAt: DateTime.formatIso(now),
5162
+ }
5163
+ : claudeProviderTurnTokenUsage(
5164
+ usage,
5165
+ maxTokens,
5166
+ DateTime.formatIso(now),
5167
+ adapterOptions.settings.autoCompactWindow,
5168
+ context.streamUsage?.requestedAt,
5169
+ );
5170
+ if (typeof usage !== "number") {
5171
+ if (claudeMessageInputTokens(usage) <= 0) return;
5172
+ context.compactionTokens = undefined;
5173
+ }
5174
yield* emitProviderEvent({
5175
type: "provider_turn.updated",
5176
driver: CLAUDE_PROVIDER,
@@ -8828,38 +8845,8 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
8845
typeof postTokens === "number" && Number.isFinite(postTokens) && postTokens > 0
8846
? Math.round(postTokens)
8847
: undefined;
8831
- if (afterTokenCount !== undefined) {
8832
- const maxTokens = claudeContextWindow(context.input.modelSelection);
8833
- yield* emitProviderEvent({
8834
- type: "provider_turn.updated",
8835
- driver: CLAUDE_PROVIDER,
8836
- threadId: context.input.threadId,
8837
- providerTurn: {
8838
- id: context.providerTurnId,
8839
- providerThreadId: context.input.providerThread.id,
8840
- nodeId: context.input.rootNodeId,
8841
- runAttemptId: context.input.attemptId,
8842
- nativeTurnRef: {
8843
- driver: CLAUDE_PROVIDER,
8844
- nativeId: context.nativeTurnId,
8845
- strength: "strong",
8846
- },
8847
- ordinal: context.providerTurnOrdinal,
8848
- status: "running",
8849
- startedAt: context.startedAt,
8850
- completedAt: null,
8851
- tokenUsage: {
8852
- usedTokens: afterTokenCount,
8853
- maxTokens,
8854
- ...claudeAutoCompactThreshold(
8855
- adapterOptions.settings.autoCompactWindow,
8856
- maxTokens,
8857
- ),
8858
- updatedAt: DateTime.formatIso(now),
8859
- },
8860
- },
8861
- });
8862
- }
8848
+ context.compactionTokens = afterTokenCount;
8849
+ if (afterTokenCount !== undefined) yield* emitContextUsage(context, afterTokenCount);
8850
yield* emitProviderEvent({
8851
type: "turn_item.updated",
8852
driver: CLAUDE_PROVIDER,
@@ -9585,6 +9572,10 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
9572
}
9573
9574
if (message.type === "result") {
9575
+ const contextUsage = context.streamUsage?.usage ?? context.compactionTokens;
9576
+ if (resultsReportingNewContextWindow.has(message) && contextUsage !== undefined) {
9577
+ yield* emitContextUsage(context, contextUsage);
9578
+ }
9579
const completedAt = yield* DateTime.now;
9580
const interrupted = (yield* Ref.get(interruptedTurns)).has(context.providerTurnId);
9581
const wasSteered = (yield* Ref.get(steeredTurns)).has(context.providerTurnId);
@@ -10647,6 +10638,13 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
10638
growth === undefined && context.modelLedger !== undefined
10639
? undefined
10640
: ledger;
10641
+ for (const [model, window] of claudeReportedContextWindows(
10642
+ message.modelUsage,
10643
+ )) {
10644
+ if (reportedContextWindows.get(model) === window) continue;
10645
+ reportedContextWindows.set(model, window);
10646
+ resultsReportingNewContextWindow.add(message);
10647
+ }
10648
}
10649
return handleSdkMessage({ query: querySession, message });
10650
}),
@@ -10785,6 +10783,7 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
10783
blocks: new Map(),
10784
},
10785
streamUsage: null,
10786
+ compactionTokens: undefined,
10787
toolCalls: new Map(),
10788
compaction: null,
10789
ignoredTaskIds: new Set(),
@@ -11349,8 +11348,7 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
11348
driver: CLAUDE_PROVIDER,
11349
providerSessionId: input.providerSessionId,
11350
providerSession: session,
11352
- getModelContextWindow: (selection) =>
11353
- resolveClaudeCatalogContextWindowTokens(BUNDLED_CLAUDE_MODEL_CATALOG, selection),
11351
+ getModelContextWindow: (selection) => claudeContextWindow(selection) ?? undefined,
11352
events: Stream.fromEffectRepeat(Queue.take(events)),
11353
backgroundTasksEndWithProcess: true,
11354
hasPendingBackgroundWork: Effect.gen(function* () {
apps/server/src/provider/ClaudeTurnTokenUsage.ts
+13
@@ -77,6 +77,19 @@ export function claudeModelLedger(modelUsage: unknown): ClaudeModelLedger | unde
77
return ledger;
78
}
79
80
+/** The window each model in the SDK's `modelUsage` is measured against, as Claude Code resolved it. */
81
+export function claudeReportedContextWindows(modelUsage: unknown): ReadonlyMap<string, number> {
82
+ const windows = new Map<string, number>();
83
+ if (typeof modelUsage !== "object" || modelUsage === null) return windows;
84
+ for (const [model, entry] of Object.entries(modelUsage as Record<string, unknown>)) {
85
+ const window = finiteNonNegativeInteger(
86
+ (entry as Record<string, unknown> | null)?.contextWindow,
87
+ );
88
+ if (window !== undefined && window > 0) windows.set(model, window);
89
+ }
90
+ return windows;
91
+}
92
+
93
/** Ledger growth since `previous`. Unknown without a baseline or when a counter goes backwards. */
94
export function claudeLedgerDelta(
95
previous: ClaudeModelLedger | undefined,