Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions apps/server/src/orchestration-v2/Adapters/AcpAdapterV2.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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,
},
);
});
Expand Down
6 changes: 2 additions & 4 deletions packages/provider-acp/src/server/adapter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading