@@ -21,7 +21,14 @@ import {
2121} from "./claudeWorkflowProgress.ts" ;
2222
2323import { isWorkspaceImagePreviewPath } from "@t3tools/shared/filePreview" ;
24- import { normalizeClaudeTurnTokenUsage } from "../../provider/ClaudeTurnTokenUsage.ts" ;
24+ import {
25+ addClaudeLedgerUsage ,
26+ claudeLedgerDelta ,
27+ claudeModelLedger ,
28+ normalizeClaudeTurnTokenUsage ,
29+ type ClaudeLedgerUsage ,
30+ type ClaudeModelLedger ,
31+ } from "../../provider/ClaudeTurnTokenUsage.ts" ;
2532import { toMcpElicitationResponse } from "../../provider/CodexMcpElicitation.ts" ;
2633import {
2734 type CanUseTool ,
@@ -4071,6 +4078,9 @@ interface ActiveClaudeTurnContext {
40714078 compactionFailure : { readonly message : string | undefined } | null ;
40724079 // Steers end segments whose usage is excluded from the final result; bill them too, oldest first.
40734080 readonly steeredSegmentUsage : Array < SDKResultMessage [ "usage" ] > ;
4081+ // Ledger growth of the steered segments; undefined once any segment's growth is unknown.
4082+ steeredLedgerUsage : ClaudeLedgerUsage | undefined ;
4083+ readonly rootModels : Set < string > ;
40744084 readonly subagentsByTaskId : Map < string , ActiveClaudeSubagent > ;
40754085 readonly subagentsByToolUseId : Map < string , ActiveClaudeSubagent > ;
40764086 readonly promptUuid : string | null ;
@@ -4122,6 +4132,8 @@ interface ClaudeLiveQueryContext {
41224132 permissionMode : PermissionMode ;
41234133 stopping : boolean ;
41244134 readonly subagentsFromEarlierProcesses : ReadonlySet < ActiveClaudeSubagent > ;
4135+ // The SDK's per-process model ledger at the last result; a new process starts at zero.
4136+ modelLedger : ClaudeModelLedger | undefined ;
41254137 // Per process, not per session: a relative temp dir follows the cwd this CLI
41264138 // was launched in, and a later turn's cwd can differ.
41274139 readonly taskOutputRoot : string | undefined ;
@@ -4775,6 +4787,8 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
47754787 const interruptedTurns = yield * Ref . make ( new Set < OrchestrationV2ProviderTurn [ "id" ] > ( ) ) ;
47764788 const steeredTurns = yield * Ref . make ( new Set < OrchestrationV2ProviderTurn [ "id" ] > ( ) ) ;
47774789 const queryContext = yield * Ref . make < ClaudeLiveQueryContext | null > ( null ) ;
4790+ // Wake buffers replay result frames, so ledger growth is measured once on arrival.
4791+ const resultLedgerUsage = new WeakMap < SDKMessage , ClaudeLedgerUsage > ( ) ;
47784792 // A worktree handoff changes the project settings even within one session.
47794793 let bypassCache : { cwd : string | null ; availability : ClaudeBypassAvailability } | null =
47804794 null ;
@@ -7613,6 +7627,17 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
76137627 input . context . subagentsByToolUseId . size > 0 ,
76147628 input . status ,
76157629 input . context . steeredSegmentUsage ,
7630+ {
7631+ rootModels : input . context . rootModels ,
7632+ ...( input . result === undefined
7633+ ? { }
7634+ : {
7635+ ledger : addClaudeLedgerUsage (
7636+ input . context . steeredLedgerUsage ,
7637+ resultLedgerUsage . get ( input . result ) ,
7638+ ) ,
7639+ } ) ,
7640+ } ,
76167641 ) ,
76177642 } ,
76187643 } ) ,
@@ -8528,6 +8553,10 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
85288553
85298554 if ( message . type === "assistant" && input . replayed !== true ) {
85308555 if ( message . parent_tool_use_id === null ) {
8556+ // CLI notices and API errors arrive as assistant messages from "<synthetic>".
8557+ if ( message . message . model && message . message . model !== "<synthetic>" ) {
8558+ context . rootModels . add ( message . message . model ) ;
8559+ }
85318560 // Subagent uuids exist only in the sidechain transcript, so resume and fork cannot target them.
85328561 context . nativeMessageCursor = message . uuid ;
85338562 context . latestAssistantRateLimit =
@@ -9409,6 +9438,10 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
94099438 const wasSteered = ( yield * Ref . get ( steeredTurns ) ) . has ( context . providerTurnId ) ;
94109439 if ( ! interrupted && wasSteered && isClaudeActiveSteeringAbortResult ( message ) ) {
94119440 context . steeredSegmentUsage . push ( message . usage ) ;
9441+ context . steeredLedgerUsage = addClaudeLedgerUsage (
9442+ context . steeredLedgerUsage ,
9443+ resultLedgerUsage . get ( message ) ,
9444+ ) ;
94129445 return ;
94139446 }
94149447 yield * Ref . update ( steeredTurns , ( current ) => {
@@ -10404,6 +10437,7 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
1040410437 ( subagent ) => subagent . task . status === "running" ,
1040510438 ) ,
1040610439 ) ,
10440+ modelLedger : new Map ( ) ,
1040710441 taskOutputRoot : claudeTaskOutputRoot (
1040810442 adapterOptions . environment ,
1040910443 path ,
@@ -10432,6 +10466,16 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
1043210466 ) {
1043310467 context . permissionMode = message . permissionMode ;
1043410468 }
10469+ if ( message . type === "result" ) {
10470+ const ledger = claudeModelLedger ( message . modelUsage ) ;
10471+ const growth = claudeLedgerDelta ( context . modelLedger , ledger ) ;
10472+ if ( growth !== undefined ) resultLedgerUsage . set ( message , growth ) ;
10473+ // A ledger that went backwards cannot anchor the next turn's growth.
10474+ context . modelLedger =
10475+ growth === undefined && context . modelLedger !== undefined
10476+ ? undefined
10477+ : ledger ;
10478+ }
1043510479 return handleSdkMessage ( { query : querySession , message } ) ;
1043610480 } ) ,
1043710481 ) ,
@@ -10577,6 +10621,8 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
1057710621 latestAssistantRateLimit : null ,
1057810622 compactionFailure : null ,
1057910623 steeredSegmentUsage : [ ] ,
10624+ steeredLedgerUsage : { inputTokens : 0 , outputTokens : 0 } ,
10625+ rootModels : new Set ( ) ,
1058010626 subagentsByTaskId : new Map ( ) ,
1058110627 subagentsByToolUseId : new Map ( ) ,
1058210628 promptUuid,
0 commit comments