Skip to content

Commit 24c7d4c

Browse files
fix(claude): retain measured usage after a steered query exits
Co-authored-by: Aditya Garud <[email protected]>
1 parent 122c5f8 commit 24c7d4c

3 files changed

Lines changed: 120 additions & 45 deletions

File tree

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

Lines changed: 29 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4506,11 +4506,16 @@ describe("ClaudeAdapterV2 background wake turns", () => {
45064506

45074507
it.effect.each(
45084508
(["aborted_tools", "aborted_streaming"] as const).flatMap((terminalReason) =>
4509-
[true, false].map((steered) => ({ terminalReason, steered })),
4509+
[
4510+
{ steered: false, queryExits: false },
4511+
{ steered: true, queryExits: false },
4512+
{ steered: true, queryExits: true },
4513+
].map((scenario) => ({ terminalReason, ...scenario })),
45104514
),
4511-
)("handles $terminalReason with active steering=$steered", ({ terminalReason, steered }) =>
4515+
)("handles $terminalReason (steered=$steered, exits=$queryExits)", (scenario) =>
45124516
Effect.scoped(
45134517
Effect.gen(function* () {
4518+
const { terminalReason, steered, queryExits } = scenario;
45144519
const harness = yield* makeWakeHarness;
45154520
const idAllocator = yield* IdAllocator.IdAllocatorV2;
45164521
const attemptId = RunAttemptId.make("attempt-steering-abort");
@@ -4542,8 +4547,7 @@ describe("ClaudeAdapterV2 background wake turns", () => {
45424547
});
45434548
assert.equal(harness.offeredMessages[1]?.priority, "now");
45444549
}
4545-
yield* Queue.offer(
4546-
harness.sdkMessages,
4550+
yield* harness.offerAndWait(
45474551
makeResultFrame({
45484552
uuid: "00000000-0000-4000-8000-000000000901",
45494553
result: "",
@@ -4556,7 +4560,9 @@ describe("ClaudeAdapterV2 background wake turns", () => {
45564560
},
45574561
}),
45584562
);
4559-
if (steered) {
4563+
if (queryExits) {
4564+
yield* Queue.shutdown(harness.sdkMessages);
4565+
} else if (steered) {
45604566
yield* Queue.offer(harness.sdkMessages, wakeAssistant);
45614567
yield* Queue.offer(
45624568
harness.sdkMessages,
@@ -4573,16 +4579,20 @@ describe("ClaudeAdapterV2 background wake turns", () => {
45734579
);
45744580
}
45754581
const terminal = yield* Queue.take(harness.terminalReceipts);
4576-
assert.equal(terminal.status, steered ? "completed" : "interrupted");
4582+
assert.equal(
4583+
terminal.status,
4584+
queryExits ? "failed" : steered ? "completed" : "interrupted",
4585+
);
45774586
if (steered) {
4578-
assert.isTrue(
4579-
harness.events.some(
4580-
(event) =>
4581-
event.type === "turn_item.updated" &&
4582-
event.turnItem.type === "assistant_message" &&
4583-
event.turnItem.text === WAKE_ASSISTANT_TEXT,
4584-
),
4585-
);
4587+
if (!queryExits)
4588+
assert.isTrue(
4589+
harness.events.some(
4590+
(event) =>
4591+
event.type === "turn_item.updated" &&
4592+
event.turnItem.type === "assistant_message" &&
4593+
event.turnItem.text === WAKE_ASSISTANT_TEXT,
4594+
),
4595+
);
45864596
const completed = harness.events.findLast(
45874597
(event) => event.type === "provider_turn.updated",
45884598
);
@@ -4592,12 +4602,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
45924602
: undefined,
45934603
{
45944604
usageScope: "main_agent",
4595-
usageStatus: "complete",
4605+
usageStatus: queryExits ? "partial" : "complete",
45964606
hasSubagents: false,
4597-
inputTokens: 603 + 2847 + 11455,
4598-
outputTokens: 46,
4599-
cachedInputTokens: 11455,
4600-
cacheCreationTokens: 2847,
4607+
inputTokens: queryExits ? 3100 : 603 + 2847 + 11455,
4608+
outputTokens: queryExits ? 40 : 46,
4609+
cachedInputTokens: queryExits ? 2000 : 11455,
4610+
cacheCreationTokens: queryExits ? 500 : 2847,
46014611
},
46024612
);
46034613
}

‎apps/server/src/provider/ClaudeTurnTokenUsage.ts‎

Lines changed: 16 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,10 @@ const BILLED_USAGE_FIELDS = [
1515
] as const;
1616

1717
function addKnownCount(finalCount: unknown, earlierCounts: ReadonlyArray<unknown>): unknown {
18-
const known = finiteNonNegativeInteger(finalCount);
19-
if (known === undefined) return finalCount;
20-
return earlierCounts.reduce<number>(
21-
(sum, count) => sum + (finiteNonNegativeInteger(count) ?? 0),
22-
known,
23-
);
18+
const counts = [finalCount, ...earlierCounts]
19+
.map(finiteNonNegativeInteger)
20+
.filter((count) => count !== undefined);
21+
return counts.length === 0 ? finalCount : counts.reduce((sum, count) => sum + count, 0);
2422
}
2523

2624
// Steering aborts the current segment; each SDK result reports only that segment's usage.
@@ -38,18 +36,16 @@ function withEarlierSegmentUsage(
3836
);
3937
}
4038
const outputDetails = usage.output_tokens_details as Record<string, unknown> | undefined;
41-
if (outputDetails != null) {
42-
total.output_tokens_details = {
43-
...outputDetails,
44-
thinking_tokens: addKnownCount(
45-
outputDetails.thinking_tokens,
46-
segments.map(
47-
(segment) =>
48-
(segment.output_tokens_details as Record<string, unknown> | undefined)?.thinking_tokens,
49-
),
39+
total.output_tokens_details = {
40+
...outputDetails,
41+
thinking_tokens: addKnownCount(
42+
outputDetails?.thinking_tokens,
43+
segments.map(
44+
(segment) =>
45+
(segment.output_tokens_details as Record<string, unknown> | undefined)?.thinking_tokens,
5046
),
51-
};
52-
}
47+
),
48+
};
5349
return total;
5450
}
5551

@@ -60,15 +56,7 @@ export function normalizeClaudeTurnTokenUsage(
6056
earlierSegmentUsage: ReadonlyArray<unknown> = [],
6157
): TurnTokenUsage {
6258
const finalUsage = result?.usage as Record<string, unknown> | undefined;
63-
const usage = finalUsage && withEarlierSegmentUsage(finalUsage, earlierSegmentUsage);
64-
if (!usage) {
65-
return {
66-
usageStatus: "unavailable",
67-
usageScope: "main_agent",
68-
hasSubagents,
69-
};
70-
}
71-
59+
const usage = withEarlierSegmentUsage(finalUsage ?? {}, earlierSegmentUsage);
7260
const uncachedInputTokens = finiteNonNegativeInteger(usage.input_tokens);
7361
const cachedInputTokens = finiteNonNegativeInteger(usage.cache_read_input_tokens);
7462
const cacheCreationTokens = finiteNonNegativeInteger(usage.cache_creation_input_tokens);
@@ -116,6 +104,8 @@ export function normalizeClaudeTurnTokenUsage(
116104
if (
117105
terminalStatus === "completed" &&
118106
result?.subtype === "success" &&
107+
finiteNonNegativeInteger(finalUsage?.input_tokens) !== undefined &&
108+
finiteNonNegativeInteger(finalUsage?.output_tokens) !== undefined &&
119109
inputTokens !== undefined &&
120110
rawOutputTokens !== undefined
121111
) {

‎apps/server/src/provider/TurnTokenUsage.test.ts‎

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,4 +130,79 @@ describe("billable native turn usage", () => {
130130
),
131131
).toMatchObject({ usageStatus: "partial", inputTokens: 4, outputTokens: 2 });
132132
});
133+
134+
it.each(["failed", "interrupted", "completed"] as const)(
135+
"retains measured Claude steering usage as partial after %s without final usage",
136+
(status) => {
137+
expect(
138+
normalizeClaudeTurnTokenUsage(
139+
status === "completed" ? { subtype: "success" } : undefined,
140+
true,
141+
status,
142+
[
143+
{ input_tokens: 100, cache_read_input_tokens: 40, output_tokens: 20 },
144+
{ input_tokens: 5, cache_read_input_tokens: 2, output_tokens: 3 },
145+
],
146+
),
147+
).toEqual({
148+
usageStatus: "partial",
149+
usageScope: "main_agent",
150+
hasSubagents: true,
151+
inputTokens: 147,
152+
cachedInputTokens: 42,
153+
outputTokens: 23,
154+
});
155+
},
156+
);
157+
158+
it.each([undefined, null, {}])(
159+
"keeps unavailable Claude usage unavailable without measured segments (%s)",
160+
(usage) => {
161+
expect(
162+
normalizeClaudeTurnTokenUsage({ subtype: "success", usage }, false, "completed")
163+
.usageStatus,
164+
).toBe("unavailable");
165+
},
166+
);
167+
168+
it("retains measured thinking tokens without a final result", () => {
169+
expect(
170+
normalizeClaudeTurnTokenUsage(undefined, false, "failed", [
171+
{ input_tokens: 4, output_tokens: 3, output_tokens_details: { thinking_tokens: 2 } },
172+
]),
173+
).toMatchObject({
174+
usageStatus: "partial",
175+
inputTokens: 4,
176+
outputTokens: 3,
177+
reasoningTokens: 2,
178+
});
179+
});
180+
181+
it.each([undefined, null])(
182+
"retains earlier cache counts when a steering segment reports %s",
183+
(cache) => {
184+
expect(
185+
normalizeClaudeTurnTokenUsage(undefined, false, "failed", [
186+
{ input_tokens: 100, cache_read_input_tokens: 40, output_tokens: 20 },
187+
{ input_tokens: 5, cache_read_input_tokens: cache, output_tokens: 3 },
188+
]),
189+
).toMatchObject({
190+
usageStatus: "partial",
191+
inputTokens: 145,
192+
cachedInputTokens: 40,
193+
outputTokens: 23,
194+
});
195+
},
196+
);
197+
198+
it("adds Claude steering segments to the final measured result once", () => {
199+
expect(
200+
normalizeClaudeTurnTokenUsage(
201+
{ subtype: "success", usage: { input_tokens: 5, output_tokens: 3 } },
202+
false,
203+
"completed",
204+
[{ input_tokens: 4, output_tokens: 2 }],
205+
),
206+
).toMatchObject({ usageStatus: "complete", inputTokens: 9, outputTokens: 5 });
207+
});
133208
});

0 commit comments

Comments
 (0)