@@ -3131,7 +3131,7 @@ interface ActiveClaudeTurnContext {
31313131 // assistant snapshots repeat message_start usage, which some proxies send
31323132 // as zeros, so they only fill in input the stream has not reported. A
31333133 // compaction makes the usage stale (null) without forgetting the request.
3134- // `requestedAt` is when the request's usage was first seen ; its prompt cache lifetime starts then.
3134+ // `requestedAt` is when a streamed request started ; its prompt cache lifetime starts then.
31353135 streamUsage : {
31363136 readonly messageId : string ;
31373137 requestedAt ?: DateTime . Utc ;
@@ -3863,9 +3863,12 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
38633863 const emitContextUsage = Effect . fnUntraced ( function * (
38643864 context : ActiveClaudeTurnContext ,
38653865 usage : ClaudeMessageUsage ,
3866+ requestStarted = false ,
38663867 ) {
38673868 const now = yield * DateTime . now ;
3868- if ( context . streamUsage !== null ) context . streamUsage . requestedAt ??= now ;
3869+ // Only message_start marks the request start; an assistant snapshot
3870+ // arrives after generation, so it leaves the cache expiry unknown.
3871+ if ( requestStarted && context . streamUsage !== null ) context . streamUsage . requestedAt = now ;
38693872 const tokenUsage = claudeProviderTurnTokenUsage (
38703873 usage ,
38713874 context . input . modelSelection ,
@@ -7129,7 +7132,7 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
71297132 const usage : ClaudeMessageUsage | undefined = event . message . usage ;
71307133 context . streamUsage =
71317134 usage === undefined ? null : { messageId : event . message . id , usage } ;
7132- if ( usage !== undefined ) yield * emitContextUsage ( context , usage ) ;
7135+ if ( usage !== undefined ) yield * emitContextUsage ( context , usage , true ) ;
71337136 } else if ( event . type === "message_delta" ) {
71347137 const usage : typeof event . usage | undefined = event . usage ;
71357138 const stream = context . streamUsage ;
0 commit comments