Skip to content

Commit 927fda2

Browse files
committed
fix(server): reject cumulative-only result iterations
1 parent 57e19da commit 927fda2

2 files changed

Lines changed: 40 additions & 13 deletions

File tree

‎apps/server/src/provider/Layers/ClaudeAdapter.test.ts‎

Lines changed: 34 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5668,7 +5668,31 @@ describe("ClaudeAdapterLive", () => {
56685668
);
56695669
});
56705670

5671-
it.effect("does not treat total-only Claude result usage as active context", () => {
5671+
it.effect.each([
5672+
{
5673+
name: "does not treat total-only Claude result usage as active context",
5674+
usage: { total_tokens: 535_000 },
5675+
expectedUsedTokens: undefined,
5676+
},
5677+
{
5678+
name: "does not treat a total-only result iteration as active context",
5679+
usage: { total_tokens: 535_000, iterations: [{ total_tokens: 535_000 }] },
5680+
expectedUsedTokens: undefined,
5681+
},
5682+
{
5683+
name: "does not use aggregate input when the selected iteration is total-only",
5684+
usage: { input_tokens: 535_000, iterations: [{ total_tokens: 535_000 }] },
5685+
expectedUsedTokens: undefined,
5686+
},
5687+
{
5688+
name: "uses active input and output from the selected result iteration",
5689+
usage: {
5690+
input_tokens: 535_000,
5691+
iterations: [{ input_tokens: 4_000, output_tokens: 200 }],
5692+
},
5693+
expectedUsedTokens: 4_200,
5694+
},
5695+
])("$name", ({ usage, expectedUsedTokens }) => {
56725696
const harness = makeHarness();
56735697
return Effect.gen(function* () {
56745698
const adapter = yield* ClaudeAdapter;
@@ -5700,9 +5724,7 @@ describe("ClaudeAdapterLive", () => {
57005724
result: "done",
57015725
stop_reason: "end_turn",
57025726
session_id: "sdk-session-result-total-only",
5703-
usage: {
5704-
total_tokens: 535000,
5705-
},
5727+
usage,
57065728
modelUsage: {
57075729
[SYNTHETIC_CLAUDE_CAPABLE_MODEL]: {
57085730
contextWindow: 200000,
@@ -5714,10 +5736,14 @@ describe("ClaudeAdapterLive", () => {
57145736

57155737
const runtimeEvents = Array.from(yield* Fiber.join(runtimeEventsFiber));
57165738
const usageEvent = runtimeEvents.find((event) => event.type === "thread.token-usage.updated");
5717-
// 535,000 is the session's cumulative spend, not context occupancy. With
5718-
// no active reading in the turn there is nothing truthful to show, and
5719-
// clamping it to the window rendered a full meter.
5720-
assert.equal(usageEvent, undefined);
5739+
if (expectedUsedTokens === undefined) {
5740+
assert.equal(usageEvent, undefined);
5741+
} else {
5742+
assert.equal(usageEvent?.type, "thread.token-usage.updated");
5743+
if (usageEvent?.type === "thread.token-usage.updated") {
5744+
assert.equal(usageEvent.payload.usage.usedTokens, expectedUsedTokens);
5745+
}
5746+
}
57215747
}).pipe(
57225748
Effect.provideService(Random.Random, makeDeterministicRandomService()),
57235749
Effect.provide(harness.layer),

‎apps/server/src/provider/Layers/ClaudeAdapter.ts‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2528,12 +2528,13 @@ export const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (
25282528
result?.usage && typeof result.usage === "object" && !Array.isArray(result.usage)
25292529
? (result.usage as Record<string, unknown>)
25302530
: undefined;
2531-
const hasResultUsageIteration =
2532-
resultUsageRecord !== undefined && lastClaudeUsageIteration(resultUsageRecord) !== undefined;
2531+
const selectedResultUsage = resultUsageRecord
2532+
? (lastClaudeUsageIteration(resultUsageRecord) ?? resultUsageRecord)
2533+
: undefined;
25332534
const resultHasActiveUsage =
2534-
resultUsageRecord !== undefined &&
2535-
(hasResultUsageIteration ||
2536-
claudeUsageInputTokens(resultUsageRecord) + claudeUsageOutputTokens(resultUsageRecord) > 0);
2535+
selectedResultUsage !== undefined &&
2536+
claudeUsageInputTokens(selectedResultUsage) + claudeUsageOutputTokens(selectedResultUsage) >
2537+
0;
25372538
const resultTotalOnly =
25382539
resultUsageRecord !== undefined &&
25392540
!resultHasActiveUsage &&

0 commit comments

Comments
 (0)