@@ -3503,37 +3503,46 @@ function claudeUsageLimitResetAt(resetsAt: unknown): string | null {
35033503 : null ;
35043504}
35053505
3506+ function gatewayCooldownResetAt (
3507+ cooldown : RegExpExecArray | null ,
3508+ completedAt : DateTime . Utc ,
3509+ ) : string | undefined {
3510+ if ( cooldown === null ) return undefined ;
3511+ const seconds =
3512+ Number ( cooldown [ 1 ] ?? 0 ) * 3_600 + Number ( cooldown [ 2 ] ?? 0 ) * 60 + Number ( cooldown [ 3 ] ?? 0 ) ;
3513+ const resetMs = DateTime . toEpochMillis ( completedAt ) + seconds * 1_000 ;
3514+ return seconds > 0 && resetMs < 8.64e15
3515+ ? DateTime . formatIso ( DateTime . makeUnsafe ( resetMs ) )
3516+ : undefined ;
3517+ }
3518+
35063519function providerFailureFromResult (
35073520 message : SDKResultMessage ,
35083521 completedAt : DateTime . Utc ,
35093522 failureHint ?: string ,
35103523 usageLimited = false ,
35113524) : OrchestrationV2ProviderFailure | null {
3512- const gatewayLimit =
3525+ const gatewayResetAt =
35133526 failureHint === undefined &&
35143527 message . subtype === "success" &&
35153528 message . is_error &&
35163529 message . terminal_reason === "api_error" &&
35173530 message . api_error_status === 503
3518- ? / ^ A P I E r r o r : 5 0 3 \[ [ ^ \] \r \n ] + \] \[ 4 2 9 \] : \{ " t y p e " : " e r r o r " , " e r r o r " : \{ " t y p e " : " r a t e _ l i m i t _ e r r o r " , [ ^ \r \n ] * \} \( r e s e t a f t e r (?: ( \d + ) h ? ) ? (?: ( \d + ) m ? ) ? (?: ( \d + ) s ) ? \) / . exec (
3519- message . result ,
3531+ ? gatewayCooldownResetAt (
3532+ / ^ A P I E r r o r : 5 0 3 \[ [ ^ \] \r \n ] + \] \[ 4 2 9 \] : \{ " t y p e " : " e r r o r " , " e r r o r " : \{ " t y p e " : " r a t e _ l i m i t _ e r r o r " , [ ^ \r \n ] * \} \( r e s e t a f t e r (?: ( \d + ) h ? ) ? (?: ( \d + ) m ? ) ? (?: ( \d + ) s ) ? \) / . exec (
3533+ message . result ,
3534+ ) ,
3535+ completedAt ,
35203536 )
3521- : null ;
3522- if ( gatewayLimit ) {
3523- const seconds =
3524- Number ( gatewayLimit [ 1 ] ?? 0 ) * 3_600 +
3525- Number ( gatewayLimit [ 2 ] ?? 0 ) * 60 +
3526- Number ( gatewayLimit [ 3 ] ?? 0 ) ;
3527- const resetMs = DateTime . toEpochMillis ( completedAt ) + seconds * 1_000 ;
3528- if ( seconds > 0 && resetMs < 8.64e15 ) {
3529- return makeProviderFailure ( {
3530- class : "usage_limit" ,
3531- message : "Claude API rate limit reached. Try again later." ,
3532- code : "api_error_429" ,
3533- retryable : true ,
3534- resetAt : DateTime . formatIso ( DateTime . makeUnsafe ( resetMs ) ) ,
3535- } ) ;
3536- }
3537+ : undefined ;
3538+ if ( gatewayResetAt !== undefined ) {
3539+ return makeProviderFailure ( {
3540+ class : "usage_limit" ,
3541+ message : "Claude API rate limit reached. Try again later." ,
3542+ code : "api_error_429" ,
3543+ retryable : true ,
3544+ resetAt : gatewayResetAt ,
3545+ } ) ;
35373546 }
35383547 const failureClass =
35393548 ( message . subtype === "success" && message . api_error_status === 429 ) || usageLimited
@@ -3562,6 +3571,14 @@ function providerFailureFromResult(
35623571 return null ;
35633572 }
35643573 const apiErrorStatus = message . api_error_status ?? null ;
3574+ // API-key sessions get no rate_limit_info, so a gateway's 429 carries its reset only as text.
3575+ const resetAt =
3576+ apiErrorStatus === 429 && message . result . startsWith ( "API Error:" )
3577+ ? gatewayCooldownResetAt (
3578+ / \( r e s e t a f t e r (?: ( \d + ) h ? ) ? (?: ( \d + ) m ? ) ? (?: ( \d + ) s ) ? \) / . exec ( message . result ) ,
3579+ completedAt ,
3580+ )
3581+ : undefined ;
35653582 return makeProviderFailure ( {
35663583 message : listedError ?? structuredError ?? failureHint ?? message . result ,
35673584 code :
@@ -3570,6 +3587,7 @@ function providerFailureFromResult(
35703587 : `api_error_${ apiErrorStatus } ` ,
35713588 class : failureClass ,
35723589 retryable : apiErrorStatus === 429 || apiErrorStatus === 529 ? true : null ,
3590+ resetAt : resetAt ?? null ,
35733591 } ) ;
35743592}
35753593
0 commit comments