Skip to content

Commit f9b6ed4

Browse files
committed
fix(server): retain late Codex child usage fields (#5793)
1 parent 50382c8 commit f9b6ed4

2 files changed

Lines changed: 36 additions & 25 deletions

File tree

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1221,19 +1221,18 @@ lifecycleLayer("CodexAdapterLive lifecycle", (it) => {
12211221
},
12221222
} satisfies ProviderEvent);
12231223

1224+
// Reasoning first appears on the resume frame. Its baseline must initialize then.
12241225
const childAFirstTotal = {
12251226
totalTokens: 5_800_000_100,
12261227
inputTokens: 5_000_000_070,
12271228
cachedInputTokens: 3_000_000_040,
12281229
outputTokens: 800_000_030,
1229-
reasoningOutputTokens: 5,
12301230
} satisfies RuntimeTaskUsage;
12311231
const childAFirstLast = {
12321232
totalTokens: 100,
12331233
inputTokens: 70,
12341234
cachedInputTokens: 40,
12351235
outputTokens: 30,
1236-
reasoningOutputTokens: 5,
12371236
} satisfies RuntimeTaskUsage;
12381237
const childBZeroTotal = {
12391238
totalTokens: 5_800_050_000,
@@ -1321,7 +1320,6 @@ lifecycleLayer("CodexAdapterLive lifecycle", (it) => {
13211320
inputTokens: 70,
13221321
cachedInputTokens: 40,
13231322
outputTokens: 30,
1324-
reasoningOutputTokens: 5,
13251323
},
13261324
},
13271325
{
@@ -1351,7 +1349,7 @@ lifecycleLayer("CodexAdapterLive lifecycle", (it) => {
13511349
inputTokens: 90,
13521350
cachedInputTokens: 50,
13531351
outputTokens: 40,
1354-
reasoningOutputTokens: 10,
1352+
reasoningOutputTokens: 5,
13551353
},
13561354
},
13571355
{
@@ -1361,7 +1359,7 @@ lifecycleLayer("CodexAdapterLive lifecycle", (it) => {
13611359
inputTokens: 100,
13621360
cachedInputTokens: 55,
13631361
outputTokens: 50,
1364-
reasoningOutputTokens: 15,
1362+
reasoningOutputTokens: 10,
13651363
},
13661364
},
13671365
{
@@ -1371,7 +1369,7 @@ lifecycleLayer("CodexAdapterLive lifecycle", (it) => {
13711369
inputTokens: 100,
13721370
cachedInputTokens: 55,
13731371
outputTokens: 50,
1374-
reasoningOutputTokens: 15,
1372+
reasoningOutputTokens: 10,
13751373
},
13761374
},
13771375
]);

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

Lines changed: 32 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -705,34 +705,47 @@ function mapCollabAgentEvent(
705705
const lastCachedInputTokens = count(last?.cachedInputTokens);
706706
const lastOutputTokens = count(last?.outputTokens);
707707
const lastReasoningOutputTokens = count(last?.reasoningOutputTokens);
708+
const existing = usageByAgent.get(agentThreadId);
708709
const baselineCount = (
710+
offset: number | undefined,
709711
cumulative: number | undefined,
710712
currentTurn: number | undefined,
711713
): number | undefined =>
712-
cumulative !== undefined && currentTurn !== undefined
714+
offset ??
715+
(cumulative !== undefined && currentTurn !== undefined
713716
? Math.max(cumulative - currentTurn, 0)
714-
: undefined;
715-
const existing = usageByAgent.get(agentThreadId);
716-
const baselineInputTokens = baselineCount(inputTokens, lastInputTokens);
717-
const baselineCachedInputTokens = baselineCount(cachedInputTokens, lastCachedInputTokens);
718-
const baselineOutputTokens = baselineCount(outputTokens, lastOutputTokens);
717+
: undefined);
718+
const baselineInputTokens = baselineCount(
719+
existing?.baseline.inputTokens,
720+
inputTokens,
721+
lastInputTokens,
722+
);
723+
const baselineCachedInputTokens = baselineCount(
724+
existing?.baseline.cachedInputTokens,
725+
cachedInputTokens,
726+
lastCachedInputTokens,
727+
);
728+
const baselineOutputTokens = baselineCount(
729+
existing?.baseline.outputTokens,
730+
outputTokens,
731+
lastOutputTokens,
732+
);
719733
const baselineReasoningOutputTokens = baselineCount(
734+
existing?.baseline.reasoningOutputTokens,
720735
reasoningOutputTokens,
721736
lastReasoningOutputTokens,
722737
);
723-
const baseline =
724-
existing?.baseline ??
725-
({
726-
totalTokens: Math.max(totalTokens - lastTotalTokens, 0),
727-
...(baselineInputTokens !== undefined ? { inputTokens: baselineInputTokens } : {}),
728-
...(baselineCachedInputTokens !== undefined
729-
? { cachedInputTokens: baselineCachedInputTokens }
730-
: {}),
731-
...(baselineOutputTokens !== undefined ? { outputTokens: baselineOutputTokens } : {}),
732-
...(baselineReasoningOutputTokens !== undefined
733-
? { reasoningOutputTokens: baselineReasoningOutputTokens }
734-
: {}),
735-
} satisfies RuntimeTaskUsage);
738+
const baseline = {
739+
totalTokens: existing?.baseline.totalTokens ?? Math.max(totalTokens - lastTotalTokens, 0),
740+
...(baselineInputTokens !== undefined ? { inputTokens: baselineInputTokens } : {}),
741+
...(baselineCachedInputTokens !== undefined
742+
? { cachedInputTokens: baselineCachedInputTokens }
743+
: {}),
744+
...(baselineOutputTokens !== undefined ? { outputTokens: baselineOutputTokens } : {}),
745+
...(baselineReasoningOutputTokens !== undefined
746+
? { reasoningOutputTokens: baselineReasoningOutputTokens }
747+
: {}),
748+
} satisfies RuntimeTaskUsage;
736749
const normalizedCount = (
737750
cumulative: number | undefined,
738751
offset: number | undefined,

0 commit comments

Comments
 (0)