@@ -29,8 +29,13 @@ export type ThreadTurnTokenUsageSummary = {
2929export type ThreadTurnTokenUsageRow = {
3030 readonly runId : RunId ;
3131 readonly ordinal : number ;
32- /** Native model id when a turn reported one; otherwise the run's selected model. */
32+ /** Label for the By turn row (a single model, Mixed models, or Unknown model) . */
3333 readonly model : string | null ;
34+ /**
35+ * Model id to price this run's totals. Null when models are mixed or unknown so we do not
36+ * apply one rate to another model's tokens.
37+ */
38+ readonly priceModel : string | null ;
3439 readonly usage : ThreadTurnTokenUsageSummary ;
3540} ;
3641
@@ -69,18 +74,24 @@ function sumOther(
6974 return known === 0 ? null : sum ;
7075}
7176
77+ function usageHasCounts ( usage : TurnTokenUsage | undefined ) : boolean {
78+ return (
79+ usage ?. inputTokens !== undefined ||
80+ usage ?. outputTokens !== undefined ||
81+ usage ?. cachedInputTokens !== undefined ||
82+ usage ?. cacheCreationTokens !== undefined ||
83+ usage ?. reasoningTokens !== undefined
84+ ) ;
85+ }
86+
7287/** complete only when every turn reports complete usage; partial when any turn has counts. */
7388function combinedStatus (
7489 usages : ReadonlyArray < TurnTokenUsage | undefined > ,
7590) : ThreadTurnTokenUsageStatus {
7691 if ( usages . length > 0 && usages . every ( ( usage ) => usage ?. usageStatus === "complete" ) ) {
7792 return "complete" ;
7893 }
79- return usages . some (
80- ( usage ) => usage ?. inputTokens !== undefined || usage ?. outputTokens !== undefined ,
81- )
82- ? "partial"
83- : "unavailable" ;
94+ return usages . some ( usageHasCounts ) ? "partial" : "unavailable" ;
8495}
8596
8697function emptySummary ( turnCount : number ) : ThreadTurnTokenUsageSummary {
@@ -169,19 +180,30 @@ export function threadTurnTokenUsageTotals(
169180 } ;
170181}
171182
172- function reportedModels (
183+ function resolveRunModels (
173184 turns : ReadonlyArray < Pick < OrchestrationV2ProviderTurn , "turnTokenUsage" > > ,
174- ) : string | null {
185+ fallbackModel : string ,
186+ ) : { readonly label : string | null ; readonly priceModel : string | null } {
187+ const reported = new Set < string > ( ) ;
175188 for ( const turn of turns ) {
176- const model = turn . turnTokenUsage ?. models ?. find ( ( entry ) => entry . trim ( ) . length > 0 ) ;
177- if ( model !== undefined ) return model . trim ( ) ;
189+ for ( const entry of turn . turnTokenUsage ?. models ?? [ ] ) {
190+ const model = entry . trim ( ) ;
191+ if ( model . length > 0 ) reported . add ( model ) ;
192+ }
193+ }
194+ if ( reported . size > 1 ) return { label : "Mixed models" , priceModel : null } ;
195+ if ( reported . size === 1 ) {
196+ const model = [ ...reported ] [ 0 ] ! ;
197+ return { label : model , priceModel : model } ;
178198 }
179- return null ;
199+ const fallback = fallbackModel . trim ( ) ;
200+ if ( fallback . length > 0 ) return { label : fallback , priceModel : fallback } ;
201+ return { label : null , priceModel : null } ;
180202}
181203
182204/**
183- * One row per user run, summing provider turns on non-superseded attempts .
184- * Retries that actually ran still count; superseded attempts do not .
205+ * One row per user run, summing provider turns across every attempt that ran .
206+ * Superseded attempts still count when they burned tokens before a restart .
185207 */
186208export function listThreadTurnTokenUsageByRun ( input : {
187209 readonly runs : ReadonlyArray <
@@ -212,14 +234,14 @@ export function listThreadTurnTokenUsageByRun(input: {
212234
213235 const rows : ThreadTurnTokenUsageRow [ ] = [ ] ;
214236 for ( const run of [ ...input . runs ] . sort ( ( a , b ) => a . ordinal - b . ordinal ) ) {
215- const attempts = ( attemptsByRun . get ( run . id ) ?? [ ] ) . filter (
216- ( attempt ) => attempt . status !== "superseded" ,
217- ) ;
237+ const attempts = attemptsByRun . get ( run . id ) ?? [ ] ;
218238 const turns = attempts . flatMap ( ( attempt ) => turnsByAttempt . get ( attempt . id ) ?? [ ] ) ;
239+ const models = resolveRunModels ( turns , run . modelSelection . model ) ;
219240 rows . push ( {
220241 runId : run . id ,
221242 ordinal : run . ordinal ,
222- model : reportedModels ( turns ) ?? ( run . modelSelection . model . trim ( ) || null ) ,
243+ model : models . label ,
244+ priceModel : models . priceModel ,
223245 usage : summarizeThreadTurnTokenUsage ( turns ) ,
224246 } ) ;
225247 }
0 commit comments