@@ -20,9 +20,12 @@ import { messagePrompt } from "./session.shared"
2020import { createSubagentTracker , toolCommit , toolFinalPhase } from "./stream-v2.subagent"
2121import { normalizeTool , toolOutputText } from "./tool"
2222import { toolDisplayContent } from "../util/tool-display"
23+ import { sessionSpend } from "./spend"
24+ import type { CostMessage , CostModel , CostSession } from "../util/session"
2325import type {
2426 FooterApi ,
2527 FooterPatch ,
28+ FooterState ,
2629 FooterView ,
2730 LocalReplayRow ,
2831 MiniPermissionRequest ,
@@ -58,6 +61,16 @@ type StreamInput = {
5861 signal ?: AbortSignal
5962 onCatalogRefresh ?: ( signal ?: AbortSignal ) => unknown | Promise < unknown >
6063 contextLimit ?: ( model : NonNullable < RunInput [ "model" ] > ) => number | undefined
64+ /**
65+ * Session-level spend for the status line. When the experiment is enabled and
66+ * the provider reports zero, the catalog estimate replaces the per-step cost.
67+ */
68+ spend ?: {
69+ enabled : boolean
70+ session ?: CostSession
71+ models ?: ( ) => ReadonlyArray < CostModel > | undefined
72+ messages ?: ReadonlyArray < CostMessage >
73+ }
6174}
6275
6376export type SessionTurnInput = {
@@ -163,6 +176,16 @@ type State = {
163176 admitted : Set < string >
164177 stepModel : RunInput [ "model" ]
165178 activeCompaction ?: string
179+ spend ?: {
180+ enabled : boolean
181+ session ?: CostSession
182+ models ?: ( ) => ReadonlyArray < CostModel > | undefined
183+ messages : CostMessage [ ]
184+ /** Step event IDs already priced, so a replayed step cannot add its tier twice. */
185+ steps : Set < string >
186+ }
187+ /** Tokens, context percent, and reported cost of the most recent step. */
188+ lastStep ?: { tokens : number ; percent ?: number ; cost ?: number }
166189}
167190
168191export function formatUnknownError ( error : unknown ) : string {
@@ -511,6 +534,7 @@ export async function createSessionTransport(input: StreamInput): Promise<Sessio
511534 pending : new Map ( ) ,
512535 admitted : new Set ( ) ,
513536 stepModel : undefined ,
537+ spend : input . spend && { ...input . spend , messages : [ ...( input . spend . messages ?? [ ] ) ] , steps : new Set ( ) } ,
514538 }
515539 let readyResolve ! : ( ) => void
516540 let readyReject ! : ( error : unknown ) => void
@@ -580,6 +604,20 @@ export async function createSessionTransport(input: StreamInput): Promise<Sessio
580604 )
581605 }
582606
607+ const usageFor = ( ) : FooterState [ "usage" ] => {
608+ const step = state . lastStep
609+ if ( ! step ) return undefined
610+ const spend = state . spend
611+ if ( ! spend || step . cost !== undefined ) return step
612+ const current = sessionSpend ( {
613+ enabled : spend . enabled ,
614+ session : spend . session ,
615+ models : spend . models ?.( ) ,
616+ messages : spend . messages ,
617+ } )
618+ return { ...step , estimate : current . estimate }
619+ }
620+
583621 let syncedPending : string [ ] | undefined
584622 const syncPending = ( ) => {
585623 const prompts = [ ...state . pending . values ( ) ]
@@ -1376,6 +1414,23 @@ export async function createSessionTransport(input: StreamInput): Promise<Sessio
13761414 syncBlockers ( )
13771415 return
13781416 }
1417+ if ( event . type === "session.usage.updated" ) {
1418+ const spend = state . spend
1419+ if ( ! spend ?. session ) return
1420+ spend . session = { ...spend . session , cost : event . data . cost , tokens : event . data . tokens }
1421+ if ( state . lastStep ) write ( [ ] , { usage : usageFor ( ) } )
1422+ return
1423+ }
1424+ if ( event . type === "session.model.selected" ) {
1425+ const spend = state . spend
1426+ if ( ! spend ?. session ) return
1427+ spend . session = {
1428+ ...spend . session ,
1429+ model : { providerID : event . data . model . providerID , id : event . data . model . id } ,
1430+ }
1431+ if ( state . lastStep ) write ( [ ] , { usage : usageFor ( ) } )
1432+ return
1433+ }
13791434 if ( event . type === "session.step.ended" ) {
13801435 const total =
13811436 event . data . tokens . input +
@@ -1386,16 +1441,19 @@ export async function createSessionTransport(input: StreamInput): Promise<Sessio
13861441 const limit = state . stepModel ? input . contextLimit ?.( state . stepModel ) : undefined
13871442 state . stepModel = undefined
13881443 if ( ! showTools ( ) ) flushQuietText ( event . data . assistantMessageID )
1389- write ( [ ] , {
1390- usage :
1391- total > 0 || event . data . cost
1392- ? {
1393- tokens : total ,
1394- percent : limit ? Math . round ( ( total / limit ) * 100 ) : undefined ,
1395- cost : event . data . cost || undefined ,
1396- }
1397- : undefined ,
1398- } )
1444+ state . lastStep =
1445+ total > 0 || event . data . cost
1446+ ? {
1447+ tokens : total ,
1448+ percent : limit ? Math . round ( ( total / limit ) * 100 ) : undefined ,
1449+ cost : event . data . cost || undefined ,
1450+ }
1451+ : undefined
1452+ if ( state . spend && ! state . spend . steps . has ( event . id ) ) {
1453+ state . spend . steps . add ( event . id )
1454+ state . spend . messages . push ( { type : "assistant" , tokens : event . data . tokens , time : { created : event . created } } )
1455+ }
1456+ write ( [ ] , { usage : usageFor ( ) } )
13991457 return
14001458 }
14011459 if ( event . type === "session.step.failed" ) {
0 commit comments