From 542f7d05638168a42e7d13f8fa53b458c51287a2 Mon Sep 17 00:00:00 2001 From: Alex Castillo Date: Sat, 31 Oct 2026 00:52:58 -0400 Subject: [PATCH 1/2] fix(aiclient): count Claude streaming usage once The Messages stream decoder emitted usage on both message_start and message_delta, so TokenCounter and usage callbacks added the input tokens twice. Keep the message_start usage and emit one combined usage on message_delta. --- .../messagesWireApiProvider.ts | 22 +++++++++-- .../aiclient/test/providerAdapter.spec.ts | 37 +++++++++++++++++++ 2 files changed, 55 insertions(+), 4 deletions(-) diff --git a/ts/packages/aiclient/src/wireApiProvider/messagesWireApiProvider.ts b/ts/packages/aiclient/src/wireApiProvider/messagesWireApiProvider.ts index 2dd490558f..744cc57e6b 100644 --- a/ts/packages/aiclient/src/wireApiProvider/messagesWireApiProvider.ts +++ b/ts/packages/aiclient/src/wireApiProvider/messagesWireApiProvider.ts @@ -192,6 +192,10 @@ export class MessagesWireApiProvider implements ProviderAdapter { } createStreamDecoder(): StreamDecoder { + // message_start carries the input/cache counts; message_delta carries + // the cumulative output count. Report one combined usage at the end so + // callers that sum usage per piece don't count the input twice. + let startUsage: Message["usage"] | undefined; return { push: (raw: string): StreamPiece => { const evt = JSON.parse(raw) as RawMessageStreamEvent; @@ -204,10 +208,20 @@ export class MessagesWireApiProvider implements ProviderAdapter { piece.text = (evt.delta as TextDelta).text; } - if (evt.type === "message_delta") { - piece.usage = usageFromMessagesUsage(evt.usage); - } else if (evt.type === "message_start") { - piece.usage = usageFromMessagesUsage(evt.message.usage); + if (evt.type === "message_start") { + startUsage = evt.message.usage; + } else if (evt.type === "message_delta") { + piece.usage = usageFromMessagesUsage({ + input_tokens: + evt.usage.input_tokens ?? startUsage?.input_tokens, + output_tokens: evt.usage.output_tokens, + cache_creation_input_tokens: + evt.usage.cache_creation_input_tokens ?? + startUsage?.cache_creation_input_tokens, + cache_read_input_tokens: + evt.usage.cache_read_input_tokens ?? + startUsage?.cache_read_input_tokens, + }); } return piece; diff --git a/ts/packages/aiclient/test/providerAdapter.spec.ts b/ts/packages/aiclient/test/providerAdapter.spec.ts index e0e5efadd7..f22686cb5d 100644 --- a/ts/packages/aiclient/test/providerAdapter.spec.ts +++ b/ts/packages/aiclient/test/providerAdapter.spec.ts @@ -475,6 +475,43 @@ describe("MessagesWireApiProvider", () => { ); expect(piece.text).toBe("hi"); }); + + test("streaming decoder reports usage once, combining message_start input with message_delta output", () => { + const decoder = adapter.createStreamDecoder!(makeRequest()); + const start = decoder.push( + JSON.stringify({ + type: "message_start", + message: { + content: [], + usage: { + input_tokens: 10, + output_tokens: 1, + cache_creation_input_tokens: 20, + cache_read_input_tokens: 30, + }, + }, + }), + ); + const delta = decoder.push( + JSON.stringify({ + type: "message_delta", + delta: { stop_reason: "end_turn", stop_sequence: null }, + usage: { + input_tokens: null, + output_tokens: 42, + cache_creation_input_tokens: null, + cache_read_input_tokens: null, + }, + }), + ); + expect(start.usage).toBeUndefined(); + expect(delta.usage).toEqual({ + prompt_tokens: 60, + completion_tokens: 42, + total_tokens: 102, + cached_tokens: 30, + }); + }); }); describe("ResponsesWireApiProvider", () => { From 3e386a51c2606f9b1c8d2704642d1d6fb51bc87f Mon Sep 17 00:00:00 2001 From: Alex Castillo Date: Mon, 2 Nov 2026 08:56:02 -0500 Subject: [PATCH 2/2] fix(aiclient): satisfy exactOptionalPropertyTypes in merged usage fields --- .../src/wireApiProvider/messagesWireApiProvider.ts | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/ts/packages/aiclient/src/wireApiProvider/messagesWireApiProvider.ts b/ts/packages/aiclient/src/wireApiProvider/messagesWireApiProvider.ts index 3be27e795e..e0247298e1 100644 --- a/ts/packages/aiclient/src/wireApiProvider/messagesWireApiProvider.ts +++ b/ts/packages/aiclient/src/wireApiProvider/messagesWireApiProvider.ts @@ -220,14 +220,18 @@ export class MessagesWireApiProvider implements ProviderAdapter { } piece.usage = usageFromMessagesUsage({ input_tokens: - evt.usage.input_tokens ?? startUsage?.input_tokens, + evt.usage.input_tokens ?? + startUsage?.input_tokens ?? + null, output_tokens: evt.usage.output_tokens, cache_creation_input_tokens: evt.usage.cache_creation_input_tokens ?? - startUsage?.cache_creation_input_tokens, + startUsage?.cache_creation_input_tokens ?? + null, cache_read_input_tokens: evt.usage.cache_read_input_tokens ?? - startUsage?.cache_read_input_tokens, + startUsage?.cache_read_input_tokens ?? + null, }); }