@@ -3,8 +3,10 @@ import * as Cache from "effect/Cache";
33import * as Duration from "effect/Duration" ;
44import * as Crypto from "effect/Crypto" ;
55import * as Effect from "effect/Effect" ;
6+ import * as Exit from "effect/Exit" ;
67import * as FileSystem from "effect/FileSystem" ;
78import * as Path from "effect/Path" ;
9+ import * as Ref from "effect/Ref" ;
810import * as Schema from "effect/Schema" ;
911import { HttpClient } from "effect/http" ;
1012import { ChildProcessSpawner } from "effect/process" ;
@@ -29,6 +31,7 @@ import {
2931 makePendingClaudeProvider ,
3032 probeClaudeCapabilities ,
3133 probeClaudeWorkspaceSnapshot ,
34+ type ClaudeCapabilitiesProbe ,
3235} from "../ClaudeProvider.ts" ;
3336import { makeManagedServerProvider } from "@t3tools/provider-core/server/managedProvider" ;
3437import * as ModelCatalog from "@t3tools/provider-core/server/ModelCatalog" ;
@@ -63,6 +66,12 @@ const decodeClaudeSettings = Schema.decodeSync(ClaudeSettings);
6366const DRIVER_KIND = ProviderDriverKind . make ( "claudeAgent" ) ;
6467const CAPABILITIES_PROBE_TTL = Duration . minutes ( 5 ) ;
6568
69+ const withoutUsage = ( capabilities : ClaudeCapabilitiesProbe ) : ClaudeCapabilitiesProbe => {
70+ const result = { ...capabilities } ;
71+ delete result . usage ;
72+ return result ;
73+ } ;
74+
6675function isClaudeNativeCommandPath ( commandPath : string ) : boolean {
6776 const normalized = normalizeCommandPath ( commandPath ) ;
6877 return (
@@ -187,34 +196,67 @@ export const ClaudeDriver: ProviderDriver<ClaudeSettings, ClaudeDriverEnv, Path.
187196
188197 // Per-instance capabilities cache: keyed on binary + resolved HOME so
189198 // account-specific probes never share auth metadata across instances.
190- const capabilitiesProbeCache = yield * Cache . make ( {
191- capacity : 1 ,
192- timeToLive : CAPABILITIES_PROBE_TTL ,
193- lookup : ( ) =>
194- Effect . all ( [
195- probeClaudeCapabilities ( effectiveConfig , processEnv , stateDir ) ,
196- ClaudeResetCredits . readClaudeOrganizationId ( accountConfigPath ) ,
197- ] ) . pipe (
198- Effect . map ( ( [ capabilities , workspaceId ] ) =>
199- capabilities && workspaceId ? { ...capabilities , workspaceId } : capabilities ,
199+ // A transient miss may reuse the last account once, but its usage windows keep their age.
200+ const lastGoodCapabilities = yield * Ref . make < ClaudeCapabilitiesProbe | undefined > ( undefined ) ;
201+ const capabilitiesProbeCache = yield * Cache . makeWith (
202+ ( ) =>
203+ probeClaudeCapabilities ( effectiveConfig , processEnv , stateDir ) . pipe (
204+ Effect . flatMap ( ( capabilities ) =>
205+ ClaudeResetCredits . readClaudeOrganizationId ( accountConfigPath ) . pipe (
206+ Effect . map ( ( workspaceId ) => ( {
207+ _tag : "fresh" as const ,
208+ capabilities :
209+ workspaceId === undefined ? capabilities : { ...capabilities , workspaceId } ,
210+ } ) ) ,
211+ ) ,
212+ ) ,
213+ Effect . tap ( ( { capabilities } ) => Ref . set ( lastGoodCapabilities , capabilities ) ) ,
214+ Effect . catch ( ( error ) =>
215+ Ref . getAndSet ( lastGoodCapabilities , undefined ) . pipe (
216+ Effect . flatMap ( ( capabilities ) =>
217+ capabilities === undefined
218+ ? Effect . fail ( error )
219+ : ClaudeResetCredits . readClaudeOrganizationId ( accountConfigPath ) . pipe (
220+ Effect . flatMap ( ( workspaceId ) =>
221+ workspaceId === capabilities . workspaceId
222+ ? Effect . succeed ( {
223+ _tag : "fallback" as const ,
224+ capabilities : withoutUsage ( capabilities ) ,
225+ } )
226+ : Effect . fail ( error ) ,
227+ ) ,
228+ ) ,
229+ ) ,
230+ ) ,
200231 ) ,
201232 Effect . provideService ( FileSystem . FileSystem , fileSystem ) ,
202233 Effect . provideService ( Path . Path , path ) ,
203234 ) ,
204- } ) ;
235+ {
236+ capacity : 1 ,
237+ timeToLive : ( exit ) =>
238+ // Only a fresh probe earns the TTL; a failure or its fallback retries on the next check.
239+ Exit . isSuccess ( exit ) && exit . value . _tag === "fresh"
240+ ? CAPABILITIES_PROBE_TTL
241+ : Duration . zero ,
242+ } ,
243+ ) ;
205244 const capabilitiesCacheKey = yield * makeClaudeCapabilitiesCacheKey (
206245 effectiveConfig ,
207246 stateDir ,
208247 processEnv ,
209248 ) ;
249+ const resolveCapabilities = Cache . get ( capabilitiesProbeCache , capabilitiesCacheKey ) . pipe (
250+ Effect . map ( ( result ) => result . capabilities ) ,
251+ ) ;
210252
211253 const checkProvider = catalogService . refreshInBackground . pipe (
212254 Effect . andThen (
213255 modelCatalog . pipe (
214256 Effect . flatMap ( ( catalog ) =>
215257 checkClaudeProviderStatus (
216258 effectiveConfig ,
217- ( ) => Cache . get ( capabilitiesProbeCache , capabilitiesCacheKey ) ,
259+ ( ) => resolveCapabilities ,
218260 processEnv ,
219261 stateDir ,
220262 catalog ,
0 commit comments