From 38159d8efb63536fbe726309011a3604dc905a66 Mon Sep 17 00:00:00 2001 From: MusseJusse Date: Fri, 20 Nov 2026 11:43:36 +0000 Subject: [PATCH 1/2] fix(antigravity): stop double-counting thinking tokens in turn output usage --- .../Adapters/AcpAdapterV2.test.ts | 43 ++++++++++++++----- packages/provider-acp/src/server/adapter.ts | 6 +-- 2 files changed, 35 insertions(+), 14 deletions(-) diff --git a/apps/server/src/orchestration-v2/Adapters/AcpAdapterV2.test.ts b/apps/server/src/orchestration-v2/Adapters/AcpAdapterV2.test.ts index 46a8f4c888296..cdf00cd61c09e 100644 --- a/apps/server/src/orchestration-v2/Adapters/AcpAdapterV2.test.ts +++ b/apps/server/src/orchestration-v2/Adapters/AcpAdapterV2.test.ts @@ -206,16 +206,16 @@ describe("acpPerTurnPromptUsage", () => { reasoningTokens: 3, }, ); - // Antigravity 1.4.5: its harness reports prompt tokens without the 24 cached ones. + // Antigravity 1.5+: inputTokens excludes cached reads, while outputTokens already includes thinking. assert.deepEqual( acpPerTurnPromptUsage( { - inputTokens: 42, - outputTokens: 3, - totalTokens: 54, - cachedReadTokens: 24, + inputTokens: 2181, + outputTokens: 23, + totalTokens: 14323, + cachedReadTokens: 12119, cachedWriteTokens: 0, - thoughtTokens: 9, + thoughtTokens: 19, }, false, "completed", @@ -225,11 +225,11 @@ describe("acpPerTurnPromptUsage", () => { usageScope: "main_agent", usageStatus: "complete", hasSubagents: false, - inputTokens: 66, - outputTokens: 12, - cachedInputTokens: 24, + inputTokens: 14300, + outputTokens: 23, + cachedInputTokens: 12119, cacheCreationTokens: 0, - reasoningTokens: 9, + reasoningTokens: 19, }, ); }); @@ -259,6 +259,29 @@ describe("acpPerTurnPromptUsage", () => { reasoningTokens: 10, }, ); + assert.deepEqual( + acpPerTurnPromptUsage( + { + inputTokens: 40, + outputTokens: 10, + totalTokens: 110, + cachedReadTokens: 60, + thoughtTokens: 30, + }, + false, + "completed", + true, + ), + { + usageScope: "main_agent", + usageStatus: "complete", + hasSubagents: false, + inputTokens: 100, + outputTokens: 10, + cachedInputTokens: 60, + reasoningTokens: 10, + }, + ); assert.deepEqual( acpPerTurnPromptUsage( { inputTokens: 100, outputTokens: 10, totalTokens: 110 }, diff --git a/packages/provider-acp/src/server/adapter.ts b/packages/provider-acp/src/server/adapter.ts index a00ea8625e697..9af7a307d6efb 100644 --- a/packages/provider-acp/src/server/adapter.ts +++ b/packages/provider-acp/src/server/adapter.ts @@ -340,9 +340,7 @@ export function acpPerTurnPromptUsage( const inputTokens = geminiUsage ? usage.inputTokens + (usage.cachedReadTokens ?? 0) : usage.inputTokens; - const outputTokens = geminiUsage - ? usage.outputTokens + (usage.thoughtTokens ?? 0) - : usage.outputTokens; + const outputTokens = usage.outputTokens; // TurnTokenUsage contract: input includes cache read + write and reasoning // is a subset of output, so clamp counters that exceed their parent and // drop the ones the agent left unset. Cache writes are capped at whatever @@ -657,7 +655,7 @@ export interface AcpAdapterV2Flavor { * leaves usage semantics open, so this stays unset until proven live. */ readonly reportsPerTurnPromptUsage?: boolean; - /** Gemini-style usage: inputTokens leaves out cachedReadTokens, outputTokens leaves out thoughtTokens. */ + /** Antigravity 1.5+ usage: inputTokens leaves out cachedReadTokens, while outputTokens already includes thoughtTokens. */ readonly geminiPromptUsage?: boolean; /** * Fails a dispatched prompt after this long with no update for its session while no From 66c1799b869a6a363d13d404a6b357535f45f4d5 Mon Sep 17 00:00:00 2001 From: Julius Marminge Date: Fri, 20 Nov 2026 12:02:53 +0000 Subject: [PATCH 2/2] test(antigravity): drop assertion that repeats the 1.5 usage case Co-Authored-By: Claude Opus 5.5 --- .../Adapters/AcpAdapterV2.test.ts | 23 ------------------- 1 file changed, 23 deletions(-) diff --git a/apps/server/src/orchestration-v2/Adapters/AcpAdapterV2.test.ts b/apps/server/src/orchestration-v2/Adapters/AcpAdapterV2.test.ts index cdf00cd61c09e..a0aa6ed3130f8 100644 --- a/apps/server/src/orchestration-v2/Adapters/AcpAdapterV2.test.ts +++ b/apps/server/src/orchestration-v2/Adapters/AcpAdapterV2.test.ts @@ -259,29 +259,6 @@ describe("acpPerTurnPromptUsage", () => { reasoningTokens: 10, }, ); - assert.deepEqual( - acpPerTurnPromptUsage( - { - inputTokens: 40, - outputTokens: 10, - totalTokens: 110, - cachedReadTokens: 60, - thoughtTokens: 30, - }, - false, - "completed", - true, - ), - { - usageScope: "main_agent", - usageStatus: "complete", - hasSubagents: false, - inputTokens: 100, - outputTokens: 10, - cachedInputTokens: 60, - reasoningTokens: 10, - }, - ); assert.deepEqual( acpPerTurnPromptUsage( { inputTokens: 100, outputTokens: 10, totalTokens: 110 },