@@ -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