fix(codex): normalize cached harness input tokens · openclaw/openclaw@7902c76

Recent Commits to openclaw:main

vincentkoc · 2026-04-27 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,7 @@ describe("CodexAppServerEventProjector", () => {`
`167`	`167`	`outputTokens: 100_000,`
`168`	`168`	`},`
`169`	`169`	`last: {`
`170`		`-totalTokens: 14,`
	`170`	`+totalTokens: 12,`
`171`	`171`	`inputTokens: 5,`
`172`	`172`	`cachedInputTokens: 2,`
`173`	`173`	`outputTokens: 7,`
`@@ -186,12 +186,12 @@ describe("CodexAppServerEventProjector", () => {`
`186`	`186`	`expect(result.assistantTexts).toEqual(["hello"]);`
`187`	`187`	`expect(result.messagesSnapshot.map((message) => message.role)).toEqual(["user", "assistant"]);`
`188`	`188`	`expect(result.lastAssistant?.content).toEqual([{ type: "text", text: "hello" }]);`
`189`		`-expect(result.attemptUsage).toMatchObject({ input: 5, output: 7, cacheRead: 2, total: 14 });`
	`189`	`+expect(result.attemptUsage).toMatchObject({ input: 3, output: 7, cacheRead: 2, total: 12 });`
`190`	`190`	`expect(result.lastAssistant?.usage).toMatchObject({`
`191`		`-input: 5,`
	`191`	`+input: 3,`
`192`	`192`	`output: 7,`
`193`	`193`	`cacheRead: 2,`
`194`		`-totalTokens: 14,`
	`194`	`+totalTokens: 12,`
`195`	`195`	`});`
`196`	`196`	`expect(result.replayMetadata.replaySafe).toBe(true);`
`197`	`197`	`});`
`@@ -289,7 +289,7 @@ describe("CodexAppServerEventProjector", () => {`
`289`	`289`	`tokenUsage: {`
`290`	`290`	`total: { total_tokens: 1_000_000 },`
`291`	`291`	`last_token_usage: {`
`292`		`-total_tokens: 20,`
	`292`	`+total_tokens: 17,`
`293`	`293`	`input_tokens: 8,`
`294`	`294`	`cached_input_tokens: 3,`
`295`	`295`	`output_tokens: 9,`
`@@ -300,12 +300,12 @@ describe("CodexAppServerEventProjector", () => {`
`300`	`300`
`301`	`301`	`const result = projector.buildResult(buildEmptyToolTelemetry());`
`302`	`302`
`303`		`-expect(result.attemptUsage).toMatchObject({ input: 8, output: 9, cacheRead: 3, total: 20 });`
	`303`	`+expect(result.attemptUsage).toMatchObject({ input: 5, output: 9, cacheRead: 3, total: 17 });`
`304`	`304`	`expect(result.lastAssistant?.usage).toMatchObject({`
`305`		`-input: 8,`
	`305`	`+input: 5,`
`306`	`306`	`output: 9,`
`307`	`307`	`cacheRead: 3,`
`308`		`-totalTokens: 20,`
	`308`	`+totalTokens: 17,`
`309`	`309`	`});`
`310`	`310`	`});`
`311`	`311`

Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,13 @@ const CURRENT_TOKEN_USAGE_KEYS = [`
`61`	`61`	`"last_token_usage",`
`62`	`62`	`] as const;`
`63`	`63`
	`64`	`+const CODEX_PROMPT_TOTAL_INPUT_KEYS = [`
	`65`	`+"inputTokens",`
	`66`	`+"input_tokens",`
	`67`	`+"promptTokens",`
	`68`	`+"prompt_tokens",`
	`69`	`+] as const;`
	`70`	`+`
`64`	`71`	`const MAX_TOOL_OUTPUT_DELTA_MESSAGES_PER_ITEM = 20;`
`65`	`72`
`66`	`73`	`export class CodexAppServerEventProjector {`
`@@ -910,17 +917,24 @@ function readNumberAlias(record: JsonObject, keys: readonly string[]): number \|`
`910`	`917`	`}`
`911`	`918`
`912`	`919`	`function normalizeCodexTokenUsage(record: JsonObject): ReturnType<typeof normalizeUsage> {`
	`920`	`+const promptTotalInput = readNumberAlias(record, CODEX_PROMPT_TOTAL_INPUT_KEYS);`
	`921`	`+const cacheRead = readNumberAlias(record, [`
	`922`	`+"cachedInputTokens",`
	`923`	`+"cached_input_tokens",`
	`924`	`+"cacheRead",`
	`925`	`+"cache_read",`
	`926`	`+"cache_read_input_tokens",`
	`927`	`+"cached_tokens",`
	`928`	`+]);`
	`929`	`+const input =`
	`930`	`+promptTotalInput !== undefined && cacheRead !== undefined`
	`931`	`+ ? Math.max(0, promptTotalInput - cacheRead)`
	`932`	`+ : (promptTotalInput ?? readNumber(record, "input"));`
	`933`	`+`
`913`	`934`	`return normalizeUsage({`
`914`		`-input: readNumberAlias(record, ["inputTokens", "input_tokens", "input", "promptTokens"]),`
	`935`	`+ input,`
`915`	`936`	`output: readNumberAlias(record, ["outputTokens", "output_tokens", "output"]),`
`916`		`-cacheRead: readNumberAlias(record, [`
`917`		`-"cachedInputTokens",`
`918`		`-"cached_input_tokens",`
`919`		`-"cacheRead",`
`920`		`-"cache_read",`
`921`		`-"cache_read_input_tokens",`
`922`		`-"cached_tokens",`
`923`		`-]),`
	`937`	`+ cacheRead,`
`924`	`938`	`cacheWrite: readNumberAlias(record, [`
`925`	`939`	`"cacheWrite",`
`926`	`940`	`"cache_write",`

此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。原文来自 — 版权归原作者所有。

推荐订阅源

Recent Commits to openclaw:main