npm - gsd-pi - Versions diffs - 2.61.0-dev.7aed0bf → 2.62.0-dev.a987556 - Mend

gsd-pi 2.61.0-dev.7aed0bf → 2.62.0-dev.a987556

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (119) hide show

package/packages/pi-coding-agent/dist/core/retry-handler.d.ts CHANGED Viewed

@@ -32,6 +32,8 @@ export declare class RetryHandler {
     private _retryAttempt;
     private _retryPromise;
     private _retryResolve;
+    private _retryGeneration;
+    private _continueTimeout;
     constructor(_deps: RetryHandlerDeps);
     /** Current retry attempt (0 if not retrying) */
     get retryAttempt(): number;
@@ -76,6 +78,7 @@ export declare class RetryHandler {
     /** Resolve the pending retry promise */
     resolveRetry(): void;
     private _resolveRetry;
+    private _scheduleContinue;
     private _findLastAssistantInMessages;
     /**
      * Classify an error message into a usage-limit error type for credential backoff.

package/packages/pi-coding-agent/dist/core/retry-handler.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"retry-handler.d.ts","sourceRoot":"","sources":["../../src/core/retry-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,KAAK,EAAE,gBAAgB,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAG1D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAE7D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAE5D,gEAAgE;AAChE,MAAM,WAAW,gBAAgB;IAChC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;IACtB,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAC1C,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IACtC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAC5C,QAAQ,EAAE,MAAM,KAAK,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC;IACvC,YAAY,EAAE,MAAM,MAAM,CAAC;IAC3B,IAAI,EAAE,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,CAAC;IACzC,iEAAiE;IACjE,aAAa,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC;CAC3C;AAED,qBAAa,YAAY;~~IAMZ~~,OAAO,CAAC,QAAQ,CAAC,KAAK;~~IALlC~~,OAAO,CAAC,qBAAqB,CAA0C;IACvE,OAAO,CAAC,aAAa,CAAK;IAC1B,OAAO,CAAC,aAAa,CAAwC;IAC7D,OAAO,CAAC,aAAa,CAAuC;~~gBAE/B~~,KAAK,EAAE,gBAAgB;IAEpD,gDAAgD;IAChD,IAAI,YAAY,IAAI,MAAM,CAEzB;IAED,kDAAkD;IAClD,IAAI,UAAU,IAAI,OAAO,CAExB;IAED,oCAAoC;IACpC,IAAI,gBAAgB,IAAI,OAAO,CAE9B;IAED,gCAAgC;IAChC,mBAAmB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAI3C;;;;OAIG;IACH,6BAA6B,CAAC,QAAQ,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,IAAI;IAc5F;;;OAGG;IACH,wBAAwB,IAAI,IAAI;IAYhC;;;OAGG;IACH,gBAAgB,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO;IAapD;;;;;OAKG;IACG,oBAAoB,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;IAmLvE,+BAA+B;IAC/B,UAAU,IAAI,IAAI;~~IAKlB~~;;;OAGG;IACG,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAMnC,wCAAwC;IACxC,YAAY,IAAI,IAAI;IAQpB,OAAO,CAAC,aAAa;IAQrB,OAAO,CAAC,4BAA4B;IAYpC;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAW1B;;;;OAIG;IACH,OAAO,CAAC,wBAAwB;~~IAuChC~~,+DAA+D;IAC/D,OAAO,CAAC,yBAAyB;CAMjC"}
1	+ {"version":3,"file":"retry-handler.d.ts","sourceRoot":"","sources":["../../src/core/retry-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,KAAK,EAAE,gBAAgB,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAG1D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAE7D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAE5D,gEAAgE;AAChE,MAAM,WAAW,gBAAgB;IAChC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;IACtB,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAC1C,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IACtC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAC5C,QAAQ,EAAE,MAAM,KAAK,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC;IACvC,YAAY,EAAE,MAAM,MAAM,CAAC;IAC3B,IAAI,EAAE,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,CAAC;IACzC,iEAAiE;IACjE,aAAa,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC;CAC3C;AAED,qBAAa,YAAY;IAQZ,OAAO,CAAC,QAAQ,CAAC,KAAK;IAPlC,OAAO,CAAC,qBAAqB,CAA0C;IACvE,OAAO,CAAC,aAAa,CAAK;IAC1B,OAAO,CAAC,aAAa,CAAwC;IAC7D,OAAO,CAAC,aAAa,CAAuC;IAC5D,OAAO,CAAC,gBAAgB,CAAK;IAC7B,OAAO,CAAC,gBAAgB,CAAwD;gBAEnD,KAAK,EAAE,gBAAgB;IAEpD,gDAAgD;IAChD,IAAI,YAAY,IAAI,MAAM,CAEzB;IAED,kDAAkD;IAClD,IAAI,UAAU,IAAI,OAAO,CAExB;IAED,oCAAoC;IACpC,IAAI,gBAAgB,IAAI,OAAO,CAE9B;IAED,gCAAgC;IAChC,mBAAmB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAI3C;;;;OAIG;IACH,6BAA6B,CAAC,QAAQ,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,IAAI;IAc5F;;;OAGG;IACH,wBAAwB,IAAI,IAAI;IAYhC;;;OAGG;IACH,gBAAgB,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO;IAapD;;;;;OAKG;IACG,oBAAoB,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;IAmLvE,+BAA+B;IAC/B,UAAU,IAAI,IAAI;IA2BlB;;;OAGG;IACG,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAMnC,wCAAwC;IACxC,YAAY,IAAI,IAAI;IAQpB,OAAO,CAAC,aAAa;IAQrB,OAAO,CAAC,iBAAiB;IAWzB,OAAO,CAAC,4BAA4B;IAYpC;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAW1B;;;;OAIG;IACH,OAAO,CAAC,wBAAwB;IAqChC,+DAA+D;IAC/D,OAAO,CAAC,yBAAyB;CAMjC"}

package/packages/pi-coding-agent/dist/core/retry-handler.js CHANGED Viewed

@@ -17,6 +17,8 @@ export class RetryHandler {
         this._retryAttempt = 0;
         this._retryPromise = undefined;
         this._retryResolve = undefined;
+        this._retryGeneration = 0;
+        this._continueTimeout = undefined;
     }
     /** Current retry attempt (0 if not retrying) */
     get retryAttempt() {
@@ -101,6 +103,7 @@ export class RetryHandler {
             });
         }
         // Try credential fallback before counting against retry budget.
+        const retryGeneration = this._retryGeneration;
         if (this._deps.getModel() && message.errorMessage) {
             const errorType = this._classifyErrorType(message.errorMessage);
             const isCredentialError = errorType === "rate_limit" || errorType === "quota_exhausted";
@@ -116,9 +119,7 @@ export class RetryHandler {
                     errorMessage: `${message.errorMessage} (switching credential)`,
                 });
                 // Retry immediately with the next credential - don't increment _retryAttempt
-                setTimeout(() => {
-                    this._deps.agent.continue().catch(() => { });
-                }, 0);
+                this._scheduleContinue(retryGeneration);
                 return true;
             }
             // All credentials are backed off. Try cross-provider fallback before giving up.
@@ -143,15 +144,13 @@ export class RetryHandler {
                         errorMessage: `${message.errorMessage} (${fallbackResult.reason})`,
                     });
                     // Retry immediately with fallback provider - don't increment _retryAttempt
-                    setTimeout(() => {
-                        this._deps.agent.continue().catch(() => { });
-                    }, 0);
+                    this._scheduleContinue(retryGeneration);
                     return true;
                 }
                 // No fallback available either
                 if (errorType === "quota_exhausted") {
                     // Try long-context model downgrade ([1m] → base) before giving up
-                    const downgraded = this._tryLongContextDowngrade(message);
+                    const downgraded = this._tryLongContextDowngrade(message, retryGeneration);
                     if (downgraded)
                         return true;
                     this._deps.emit({
@@ -218,7 +217,12 @@ export class RetryHandler {
             await sleep(delayMs, this._retryAbortController.signal);
         }
         catch {
-            // Aborted during sleep
+            // Aborted during sleep. If the retry generation already advanced, this
+            // cancellation was handled externally (e.g. explicit model switch).
+            if (retryGeneration !== this._retryGeneration) {
+                this._retryAbortController = undefined;
+                return false;
+            }
             const attempt = this._retryAttempt;
             this._retryAttempt = 0;
             this._retryAbortController = undefined;
@@ -233,14 +237,33 @@ export class RetryHandler {
         }
         this._retryAbortController = undefined;
         // Retry via continue() - use setTimeout to break out of event handler chain
-        setTimeout(() => {
-            this._deps.agent.continue().catch(() => { });
-        }, 0);
+        this._scheduleContinue(retryGeneration);
         return true;
     }
     /** Cancel in-progress retry */
     abortRetry() {
-        this._retryAbortController?.abort();
+        const hadRetry = this._retryPromise !== undefined
+            || this._retryAbortController !== undefined
+            || this._continueTimeout !== undefined;
+        if (!hadRetry)
+            return;
+        const attempt = this._retryAttempt > 0 ? this._retryAttempt : 1;
+        this._retryGeneration++;
+        if (this._continueTimeout) {
+            clearTimeout(this._continueTimeout);
+            this._continueTimeout = undefined;
+        }
+        if (this._retryAbortController) {
+            this._retryAbortController.abort();
+            this._retryAbortController = undefined;
+        }
+        this._retryAttempt = 0;
+        this._deps.emit({
+            type: "auto_retry_end",
+            success: false,
+            attempt,
+            finalError: "Retry cancelled",
+        });
         this._resolveRetry();
     }
     /**
@@ -266,6 +289,17 @@ export class RetryHandler {
             this._retryPromise = undefined;
         }
     }
+    _scheduleContinue(retryGeneration) {
+        if (this._continueTimeout) {
+            clearTimeout(this._continueTimeout);
+        }
+        this._continueTimeout = setTimeout(() => {
+            this._continueTimeout = undefined;
+            if (retryGeneration !== this._retryGeneration)
+                return;
+            this._deps.agent.continue().catch(() => { });
+        }, 0);
+    }
     _findLastAssistantInMessages(messages) {
         for (let i = messages.length - 1; i >= 0; i--) {
             const message = messages[i];
@@ -297,7 +331,7 @@ export class RetryHandler {
      * base model (claude-opus-4-6) when the account lacks the long-context billing
      * entitlement. Returns true if the downgrade was initiated.
      */
-    _tryLongContextDowngrade(message) {
+    _tryLongContextDowngrade(message, retryGeneration) {
         const currentModel = this._deps.getModel();
         if (!currentModel)
             return false;
@@ -326,9 +360,7 @@ export class RetryHandler {
             delayMs: 0,
             errorMessage: `${message.errorMessage} (long context downgrade)`,
         });
-        setTimeout(() => {
-            this._deps.agent.continue().catch(() => { });
-        }, 0);
+        this._scheduleContinue(retryGeneration);
         return true;
     }
     /** Remove the last assistant error message from agent state */

package/packages/pi-coding-agent/dist/core/retry-handler.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"retry-handler.js","sourceRoot":"","sources":["../../src/core/retry-handler.ts"],"names":[],"mappings":"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","sourcesContent":["/*\n RetryHandler - Automatic retry logic with exponential backoff and credential/provider fallback.\n \n Handles retryable errors (overloaded, rate limit, server errors) by:\n * 1. Trying alternate credentials for the same provider\n * 2. Falling back to other providers via FallbackResolver\n * 3. Exponential backoff with configurable max retries\n \n Context overflow errors are NOT handled here (see compaction).\n /\n\nimport type { Agent } from \"@gsd/pi-agent-core\";\nimport type { AssistantMessage, Model } from \"@gsd/pi-ai\";\nimport { isContextOverflow } from \"@gsd/pi-ai\";\nimport type { UsageLimitErrorType } from \"./auth-storage.js\";\nimport type { FallbackResolver } from \"./fallback-resolver.js\";\nimport type { ModelRegistry } from \"./model-registry.js\";\nimport type { SettingsManager } from \"./settings-manager.js\";\nimport { sleep } from \"../utils/sleep.js\";\nimport type { AgentSessionEvent } from \"./agent-session.js\";\n\n/* Dependencies injected from AgentSession into RetryHandler /\nexport interface RetryHandlerDeps {\n\treadonly agent: Agent;\n\treadonly settingsManager: SettingsManager;\n\treadonly modelRegistry: ModelRegistry;\n\treadonly fallbackResolver: FallbackResolver;\n\tgetModel: () => Model<any> \| undefined;\n\tgetSessionId: () => string;\n\temit: (event: AgentSessionEvent) => void;\n\t/* Called when the retry handler switches to a fallback model /\n\tonModelChange: (model: Model<any>) => void;\n}\n\nexport class RetryHandler {\n\tprivate _retryAbortController: AbortController \| undefined = undefined;\n\tprivate _retryAttempt = 0;\n\tprivate _retryPromise: Promise<void> \| undefined = undefined;\n\tprivate _retryResolve: (() => void) \| undefined = undefined;\n\n\tconstructor(private readonly _deps: RetryHandlerDeps) {}\n\n\t/* Current retry attempt (0 if not retrying) /\n\tget retryAttempt(): number {\n\t\treturn this._retryAttempt;\n\t}\n\n\t/* Whether auto-retry is currently in progress /\n\tget isRetrying(): boolean {\n\t\treturn this._retryPromise !== undefined;\n\t}\n\n\t/* Whether auto-retry is enabled /\n\tget autoRetryEnabled(): boolean {\n\t\treturn this._deps.settingsManager.getRetryEnabled();\n\t}\n\n\t/* Toggle auto-retry setting /\n\tsetAutoRetryEnabled(enabled: boolean): void {\n\t\tthis._deps.settingsManager.setRetryEnabled(enabled);\n\t}\n\n\t/\n\t Create a retry promise synchronously for agent_end events.\n\t * Must be called synchronously from the agent event handler before\n\t * any async processing, so that waitForRetry() doesn't miss in-flight retries.\n\t /\n\tcreateRetryPromiseForAgentEnd(messages: Array<{ role: string } & Record<string, any>>): void {\n\t\tif (this._retryPromise) return;\n\n\t\tconst settings = this._deps.settingsManager.getRetrySettings();\n\t\tif (!settings.enabled) return;\n\n\t\tconst lastAssistant = this._findLastAssistantInMessages(messages);\n\t\tif (!lastAssistant \|\| !this.isRetryableError(lastAssistant)) return;\n\n\t\tthis._retryPromise = new Promise((resolve) => {\n\t\t\tthis._retryResolve = resolve;\n\t\t});\n\t}\n\n\t/\n\t Handle a successful assistant response by resetting retry state.\n\t * Call this when an assistant message completes without error.\n\t /\n\thandleSuccessfulResponse(): void {\n\t\tif (this._retryAttempt > 0) {\n\t\t\tthis._deps.emit({\n\t\t\t\ttype: \"auto_retry_end\",\n\t\t\t\tsuccess: true,\n\t\t\t\tattempt: this._retryAttempt,\n\t\t\t});\n\t\t\tthis._retryAttempt = 0;\n\t\t\tthis._resolveRetry();\n\t\t}\n\t}\n\n\t/\n\t Check if an error is retryable (overloaded, rate limit, server errors).\n\t * Context overflow errors are NOT retryable (handled by compaction instead).\n\t /\n\tisRetryableError(message: AssistantMessage): boolean {\n\t\tif (message.stopReason !== \"error\" \|\| !message.errorMessage) return false;\n\n\t\t// Context overflow is handled by compaction, not retry\n\t\tconst contextWindow = this._deps.getModel()?.contextWindow ?? 0;\n\t\tif (isContextOverflow(message, contextWindow)) return false;\n\n\t\tconst err = message.errorMessage;\n\t\treturn /overloaded\|rate.?limit\|too many requests\|429\|500\|502\|503\|504\|service.?unavailable\|server.?error\|internal.?error\|connection.?error\|connection.?refused\|other side closed\|fetch failed\|upstream.?connect\|reset before headers\|terminated\|retry delay\|network.?(?:is\\s+)?unavailable\|credentials.expired\|temporarily backed off\|extra usage is required/i.test(\n\t\t\terr,\n\t\t);\n\t}\n\n\t/*\n\t Handle retryable errors with exponential backoff.\n\t * When multiple credentials are available, marks the failing credential\n\t * as backed off and retries immediately with the next one.\n\t * @returns true if retry was initiated, false if max retries exceeded or disabled\n\t /\n\tasync handleRetryableError(message: AssistantMessage): Promise<boolean> {\n\t\tconst settings = this._deps.settingsManager.getRetrySettings();\n\t\tif (!settings.enabled) {\n\t\t\tthis._resolveRetry();\n\t\t\treturn false;\n\t\t}\n\n\t\t// Retry promise is created synchronously in createRetryPromiseForAgentEnd.\n\t\t// Keep a defensive fallback here in case a future refactor bypasses that path.\n\t\tif (!this._retryPromise) {\n\t\t\tthis._retryPromise = new Promise((resolve) => {\n\t\t\t\tthis._retryResolve = resolve;\n\t\t\t});\n\t\t}\n\n\t\t// Try credential fallback before counting against retry budget.\n\t\tif (this._deps.getModel() && message.errorMessage) {\n\t\t\tconst errorType = this._classifyErrorType(message.errorMessage);\n\t\t\tconst isCredentialError = errorType === \"rate_limit\" \|\| errorType === \"quota_exhausted\";\n\t\t\tconst hasAlternate =\n\t\t\t\tisCredentialError &&\n\t\t\t\tthis._deps.modelRegistry.authStorage.markUsageLimitReached(\n\t\t\t\t\tthis._deps.getModel()!.provider,\n\t\t\t\t\tthis._deps.getSessionId(),\n\t\t\t\t\t{ errorType },\n\t\t\t\t);\n\n\t\t\tif (hasAlternate) {\n\t\t\t\tthis._removeLastAssistantError();\n\n\t\t\t\tthis._deps.emit({\n\t\t\t\t\ttype: \"auto_retry_start\",\n\t\t\t\t\tattempt: this._retryAttempt + 1,\n\t\t\t\t\tmaxAttempts: settings.maxRetries,\n\t\t\t\t\tdelayMs: 0,\n\t\t\t\t\terrorMessage: `${message.errorMessage} (switching credential)`,\n\t\t\t\t});\n\n\t\t\t\t// Retry immediately with the next credential - don't increment _retryAttempt\n\t\t\t\tsetTimeout(() => {\n\t\t\t\t\tthis._deps.agent.continue().catch(() => {});\n\t\t\t\t}, 0);\n\n\t\t\t\treturn true;\n\t\t\t}\n\n\t\t\t// All credentials are backed off. Try cross-provider fallback before giving up.\n\t\t\tif (isCredentialError) {\n\t\t\t\tconst fallbackResult = await this._deps.fallbackResolver.findFallback(\n\t\t\t\t\tthis._deps.getModel()!,\n\t\t\t\t\terrorType,\n\t\t\t\t);\n\n\t\t\t\tif (fallbackResult) {\n\t\t\t\t\tconst previousProvider = this._deps.getModel()!.provider;\n\t\t\t\t\tthis._deps.agent.setModel(fallbackResult.model);\n\t\t\t\t\tthis._deps.onModelChange(fallbackResult.model);\n\t\t\t\t\tthis._removeLastAssistantError();\n\n\t\t\t\t\tthis._deps.emit({\n\t\t\t\t\t\ttype: \"fallback_provider_switch\",\n\t\t\t\t\t\tfrom: `${previousProvider}/${this._deps.getModel()?.id}`,\n\t\t\t\t\t\tto: `${fallbackResult.model.provider}/${fallbackResult.model.id}`,\n\t\t\t\t\t\treason: fallbackResult.reason,\n\t\t\t\t\t});\n\n\t\t\t\t\tthis._deps.emit({\n\t\t\t\t\t\ttype: \"auto_retry_start\",\n\t\t\t\t\t\tattempt: this._retryAttempt + 1,\n\t\t\t\t\t\tmaxAttempts: settings.maxRetries,\n\t\t\t\t\t\tdelayMs: 0,\n\t\t\t\t\t\terrorMessage: `${message.errorMessage} (${fallbackResult.reason})`,\n\t\t\t\t\t});\n\n\t\t\t\t\t// Retry immediately with fallback provider - don't increment _retryAttempt\n\t\t\t\t\tsetTimeout(() => {\n\t\t\t\t\t\tthis._deps.agent.continue().catch(() => {});\n\t\t\t\t\t}, 0);\n\n\t\t\t\t\treturn true;\n\t\t\t\t}\n\n\t\t\t\t// No fallback available either\n\t\t\t\tif (errorType === \"quota_exhausted\") {\n\t\t\t\t\t// Try long-context model downgrade ([1m] → base) before giving up\n\t\t\t\t\tconst downgraded = this._tryLongContextDowngrade(message);\n\t\t\t\t\tif (downgraded) return true;\n\n\t\t\t\t\tthis._deps.emit({\n\t\t\t\t\t\ttype: \"fallback_chain_exhausted\",\n\t\t\t\t\t\treason: `All providers exhausted for ${this._deps.getModel()!.provider}/${this._deps.getModel()!.id}`,\n\t\t\t\t\t});\n\t\t\t\t\tthis._deps.emit({\n\t\t\t\t\t\ttype: \"auto_retry_end\",\n\t\t\t\t\t\tsuccess: false,\n\t\t\t\t\t\tattempt: this._retryAttempt,\n\t\t\t\t\t\tfinalError: message.errorMessage,\n\t\t\t\t\t});\n\t\t\t\t\tthis._retryAttempt = 0;\n\t\t\t\t\tthis._resolveRetry();\n\t\t\t\t\treturn false;\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\n\t\tthis._retryAttempt++;\n\n\t\tif (this._retryAttempt > settings.maxRetries) {\n\t\t\tthis._deps.emit({\n\t\t\t\ttype: \"auto_retry_end\",\n\t\t\t\tsuccess: false,\n\t\t\t\tattempt: this._retryAttempt - 1,\n\t\t\t\tfinalError: message.errorMessage,\n\t\t\t});\n\t\t\tthis._retryAttempt = 0;\n\t\t\tthis._resolveRetry();\n\t\t\treturn false;\n\t\t}\n\n\t\t// Use server-requested delay when available, capped by maxDelayMs.\n\t\t// Fall back to exponential backoff when no server hint is present.\n\t\tconst exponentialDelayMs = settings.baseDelayMs 2 (this._retryAttempt - 1);\n\t\tlet delayMs: number;\n\t\tif (message.retryAfterMs !== undefined) {\n\t\t\tconst cap = settings.maxDelayMs > 0 ? settings.maxDelayMs : Infinity;\n\t\t\tif (message.retryAfterMs > cap) {\n\t\t\t\tthis._deps.emit({\n\t\t\t\t\ttype: \"auto_retry_end\",\n\t\t\t\t\tsuccess: false,\n\t\t\t\t\tattempt: this._retryAttempt - 1,\n\t\t\t\t\tfinalError: `Rate limit reset in ${Math.ceil(message.retryAfterMs / 1000)}s (max: ${Math.ceil(cap / 1000)}s). ${message.errorMessage \|\| \"\"}`.trim(),\n\t\t\t\t});\n\t\t\t\tthis._retryAttempt = 0;\n\t\t\t\tthis._resolveRetry();\n\t\t\t\treturn false;\n\t\t\t}\n\t\t\tdelayMs = message.retryAfterMs;\n\t\t} else {\n\t\t\tdelayMs = exponentialDelayMs;\n\t\t}\n\n\t\tthis._deps.emit({\n\t\t\ttype: \"auto_retry_start\",\n\t\t\tattempt: this._retryAttempt,\n\t\t\tmaxAttempts: settings.maxRetries,\n\t\t\tdelayMs,\n\t\t\terrorMessage: message.errorMessage \|\| \"Unknown error\",\n\t\t});\n\n\t\tthis._removeLastAssistantError();\n\n\t\t// Wait with exponential backoff (abortable)\n\t\tthis._retryAbortController = new AbortController();\n\t\ttry {\n\t\t\tawait sleep(delayMs, this._retryAbortController.signal);\n\t\t} catch {\n\t\t\t// Aborted during sleep\n\t\t\tconst attempt = this._retryAttempt;\n\t\t\tthis._retryAttempt = 0;\n\t\t\tthis._retryAbortController = undefined;\n\t\t\tthis._deps.emit({\n\t\t\t\ttype: \"auto_retry_end\",\n\t\t\t\tsuccess: false,\n\t\t\t\tattempt,\n\t\t\t\tfinalError: \"Retry cancelled\",\n\t\t\t});\n\t\t\tthis._resolveRetry();\n\t\t\treturn false;\n\t\t}\n\t\tthis._retryAbortController = undefined;\n\n\t\t// Retry via continue() - use setTimeout to break out of event handler chain\n\t\tsetTimeout(() => {\n\t\t\tthis._deps.agent.continue().catch(() => {});\n\t\t}, 0);\n\n\t\treturn true;\n\t}\n\n\t/ Cancel in-progress retry /\n\tabortRetry(): void {\n\t\tthis._retryAbortController?.abort();\n\t\tthis._resolveRetry();\n\t}\n\n\t/\n\t Wait for any in-progress retry to complete.\n\t * Returns immediately if no retry is in progress.\n\t /\n\tasync waitForRetry(): Promise<void> {\n\t\tif (this._retryPromise) {\n\t\t\tawait this._retryPromise;\n\t\t}\n\t}\n\n\t/* Resolve the pending retry promise /\n\tresolveRetry(): void {\n\t\tthis._resolveRetry();\n\t}\n\n\t// =========================================================================\n\t// Private helpers\n\t// =========================================================================\n\n\tprivate _resolveRetry(): void {\n\t\tif (this._retryResolve) {\n\t\t\tthis._retryResolve();\n\t\t\tthis._retryResolve = undefined;\n\t\t\tthis._retryPromise = undefined;\n\t\t}\n\t}\n\n\tprivate _findLastAssistantInMessages(\n\t\tmessages: Array<{ role: string } & Record<string, any>>,\n\t): AssistantMessage \| undefined {\n\t\tfor (let i = messages.length - 1; i >= 0; i--) {\n\t\t\tconst message = messages[i];\n\t\t\tif (message.role === \"assistant\") {\n\t\t\t\treturn message as AssistantMessage;\n\t\t\t}\n\t\t}\n\t\treturn undefined;\n\t}\n\n\t/\n\t Classify an error message into a usage-limit error type for credential backoff.\n\t /\n\tprivate _classifyErrorType(errorMessage: string): UsageLimitErrorType {\n\t\tconst err = errorMessage.toLowerCase();\n\t\t// Long-context entitlement errors are billing gates, not transient rate limits.\n\t\t// Must be checked before the generic 429/rate_limit regex.\n\t\tif (/extra usage is required\|long context required/i.test(err)) return \"quota_exhausted\";\n\t\tif (/quota\|billing\|exceeded.limit\|usage.limit/i.test(err)) return \"quota_exhausted\";\n\t\tif (/rate.?limit\|too many requests\|429/i.test(err)) return \"rate_limit\";\n\t\tif (/500\|502\|503\|504\|server.?error\|internal.?error\|service.?unavailable/i.test(err)) return \"server_error\";\n\t\treturn \"unknown\";\n\t}\n\n\t/\n\t Attempt to downgrade a long-context model (e.g. claude-opus-4-6[1m]) to its\n\t * base model (claude-opus-4-6) when the account lacks the long-context billing\n\t * entitlement. Returns true if the downgrade was initiated.\n\t /\n\tprivate _tryLongContextDowngrade(message: AssistantMessage): boolean {\n\t\tconst currentModel = this._deps.getModel();\n\t\tif (!currentModel) return false;\n\n\t\t// Only attempt downgrade for [1m] (or similar long-context) model IDs\n\t\tconst match = currentModel.id.match(/^(.+)\\[\\d+m\\]$/);\n\t\tif (!match) return false;\n\n\t\tconst baseModelId = match[1];\n\t\tconst baseModel = this._deps.modelRegistry.find(currentModel.provider, baseModelId);\n\t\tif (!baseModel) return false;\n\n\t\tconst previousId = currentModel.id;\n\t\tthis._deps.agent.setModel(baseModel);\n\t\tthis._deps.onModelChange(baseModel);\n\t\tthis._removeLastAssistantError();\n\n\t\tthis._deps.emit({\n\t\t\ttype: \"fallback_provider_switch\",\n\t\t\tfrom: `${currentModel.provider}/${previousId}`,\n\t\t\tto: `${baseModel.provider}/${baseModel.id}`,\n\t\t\treason: `long context downgrade: ${previousId} → ${baseModel.id}`,\n\t\t});\n\n\t\tthis._deps.emit({\n\t\t\ttype: \"auto_retry_start\",\n\t\t\tattempt: this._retryAttempt + 1,\n\t\t\tmaxAttempts: this._deps.settingsManager.getRetrySettings().maxRetries,\n\t\t\tdelayMs: 0,\n\t\t\terrorMessage: `${message.errorMessage} (long context downgrade)`,\n\t\t});\n\n\t\tsetTimeout(() => {\n\t\t\tthis._deps.agent.continue().catch(() => {});\n\t\t}, 0);\n\n\t\treturn true;\n\t}\n\n\t/* Remove the last assistant error message from agent state */\n\tprivate _removeLastAssistantError(): void {\n\t\tconst messages = this._deps.agent.state.messages;\n\t\tif (messages.length > 0 && messages[messages.length - 1].role === \"assistant\") {\n\t\t\tthis._deps.agent.replaceMessages(messages.slice(0, -1));\n\t\t}\n\t}\n}\n"]}
1	+ {"version":3,"file":"retry-handler.js","sourceRoot":"","sources":["../../src/core/retry-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAIH,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAK/C,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAgB1C,MAAM,OAAO,YAAY;IAQxB,YAA6B,KAAuB;QAAvB,UAAK,GAAL,KAAK,CAAkB;QAP5C,0BAAqB,GAAgC,SAAS,CAAC;QAC/D,kBAAa,GAAG,CAAC,CAAC;QAClB,kBAAa,GAA8B,SAAS,CAAC;QACrD,kBAAa,GAA6B,SAAS,CAAC;QACpD,qBAAgB,GAAG,CAAC,CAAC;QACrB,qBAAgB,GAA8C,SAAS,CAAC;IAEzB,CAAC;IAExD,gDAAgD;IAChD,IAAI,YAAY;QACf,OAAO,IAAI,CAAC,aAAa,CAAC;IAC3B,CAAC;IAED,kDAAkD;IAClD,IAAI,UAAU;QACb,OAAO,IAAI,CAAC,aAAa,KAAK,SAAS,CAAC;IACzC,CAAC;IAED,oCAAoC;IACpC,IAAI,gBAAgB;QACnB,OAAO,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,eAAe,EAAE,CAAC;IACrD,CAAC;IAED,gCAAgC;IAChC,mBAAmB,CAAC,OAAgB;QACnC,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;IACrD,CAAC;IAED;;;;OAIG;IACH,6BAA6B,CAAC,QAAuD;QACpF,IAAI,IAAI,CAAC,aAAa;YAAE,OAAO;QAE/B,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,gBAAgB,EAAE,CAAC;QAC/D,IAAI,CAAC,QAAQ,CAAC,OAAO;YAAE,OAAO;QAE9B,MAAM,aAAa,GAAG,IAAI,CAAC,4BAA4B,CAAC,QAAQ,CAAC,CAAC;QAClE,IAAI,CAAC,aAAa,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,aAAa,CAAC;YAAE,OAAO;QAEpE,IAAI,CAAC,aAAa,GAAG,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC5C,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC;QAC9B,CAAC,CAAC,CAAC;IACJ,CAAC;IAED;;;OAGG;IACH,wBAAwB;QACvB,IAAI,IAAI,CAAC,aAAa,GAAG,CAAC,EAAE,CAAC;YAC5B,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;gBACf,IAAI,EAAE,gBAAgB;gBACtB,OAAO,EAAE,IAAI;gBACb,OAAO,EAAE,IAAI,CAAC,aAAa;aAC3B,CAAC,CAAC;YACH,IAAI,CAAC,aAAa,GAAG,CAAC,CAAC;YACvB,IAAI,CAAC,aAAa,EAAE,CAAC;QACtB,CAAC;IACF,CAAC;IAED;;;OAGG;IACH,gBAAgB,CAAC,OAAyB;QACzC,IAAI,OAAO,CAAC,UAAU,KAAK,OAAO,IAAI,CAAC,OAAO,CAAC,YAAY;YAAE,OAAO,KAAK,CAAC;QAE1E,uDAAuD;QACvD,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,EAAE,aAAa,IAAI,CAAC,CAAC;QAChE,IAAI,iBAAiB,CAAC,OAAO,EAAE,aAAa,CAAC;YAAE,OAAO,KAAK,CAAC;QAE5D,MAAM,GAAG,GAAG,OAAO,CAAC,YAAY,CAAC;QACjC,OAAO,wVAAwV,CAAC,IAAI,CACnW,GAAG,CACH,CAAC;IACH,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,oBAAoB,CAAC,OAAyB;QACnD,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,gBAAgB,EAAE,CAAC;QAC/D,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;YACvB,IAAI,CAAC,aAAa,EAAE,CAAC;YACrB,OAAO,KAAK,CAAC;QACd,CAAC;QAED,2EAA2E;QAC3E,+EAA+E;QAC/E,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;YACzB,IAAI,CAAC,aAAa,GAAG,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;gBAC5C,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC;YAC9B,CAAC,CAAC,CAAC;QACJ,CAAC;QAED,gEAAgE;QAChE,MAAM,eAAe,GAAG,IAAI,CAAC,gBAAgB,CAAC;QAC9C,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;YACnD,MAAM,SAAS,GAAG,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;YAChE,MAAM,iBAAiB,GAAG,SAAS,KAAK,YAAY,IAAI,SAAS,KAAK,iBAAiB,CAAC;YACxF,MAAM,YAAY,GACjB,iBAAiB;gBACjB,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,WAAW,CAAC,qBAAqB,CACzD,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAG,CAAC,QAAQ,EAC/B,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,EACzB,EAAE,SAAS,EAAE,CACb,CAAC;YAEH,IAAI,YAAY,EAAE,CAAC;gBAClB,IAAI,CAAC,yBAAyB,EAAE,CAAC;gBAEjC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;oBACf,IAAI,EAAE,kBAAkB;oBACxB,OAAO,EAAE,IAAI,CAAC,aAAa,GAAG,CAAC;oBAC/B,WAAW,EAAE,QAAQ,CAAC,UAAU;oBAChC,OAAO,EAAE,CAAC;oBACV,YAAY,EAAE,GAAG,OAAO,CAAC,YAAY,yBAAyB;iBAC9D,CAAC,CAAC;gBAEH,6EAA6E;gBAC7E,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAAC,CAAC;gBAExC,OAAO,IAAI,CAAC;YACb,CAAC;YAED,gFAAgF;YAChF,IAAI,iBAAiB,EAAE,CAAC;gBACvB,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,YAAY,CACpE,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAG,EACtB,SAAS,CACT,CAAC;gBAEF,IAAI,cAAc,EAAE,CAAC;oBACpB,MAAM,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAG,CAAC,QAAQ,CAAC;oBACzD,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;oBAChD,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;oBAC/C,IAAI,CAAC,yBAAyB,EAAE,CAAC;oBAEjC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;wBACf,IAAI,EAAE,0BAA0B;wBAChC,IAAI,EAAE,GAAG,gBAAgB,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,EAAE,EAAE,EAAE;wBACxD,EAAE,EAAE,GAAG,cAAc,CAAC,KAAK,CAAC,QAAQ,IAAI,cAAc,CAAC,KAAK,CAAC,EAAE,EAAE;wBACjE,MAAM,EAAE,cAAc,CAAC,MAAM;qBAC7B,CAAC,CAAC;oBAEH,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;wBACf,IAAI,EAAE,kBAAkB;wBACxB,OAAO,EAAE,IAAI,CAAC,aAAa,GAAG,CAAC;wBAC/B,WAAW,EAAE,QAAQ,CAAC,UAAU;wBAChC,OAAO,EAAE,CAAC;wBACV,YAAY,EAAE,GAAG,OAAO,CAAC,YAAY,KAAK,cAAc,CAAC,MAAM,GAAG;qBAClE,CAAC,CAAC;oBAEH,2EAA2E;oBAC3E,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAAC,CAAC;oBAExC,OAAO,IAAI,CAAC;gBACb,CAAC;gBAED,+BAA+B;gBAC/B,IAAI,SAAS,KAAK,iBAAiB,EAAE,CAAC;oBACrC,kEAAkE;oBAClE,MAAM,UAAU,GAAG,IAAI,CAAC,wBAAwB,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;oBAC3E,IAAI,UAAU;wBAAE,OAAO,IAAI,CAAC;oBAE5B,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;wBACf,IAAI,EAAE,0BAA0B;wBAChC,MAAM,EAAE,+BAA+B,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAG,CAAC,QAAQ,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAG,CAAC,EAAE,EAAE;qBACrG,CAAC,CAAC;oBACH,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;wBACf,IAAI,EAAE,gBAAgB;wBACtB,OAAO,EAAE,KAAK;wBACd,OAAO,EAAE,IAAI,CAAC,aAAa;wBAC3B,UAAU,EAAE,OAAO,CAAC,YAAY;qBAChC,CAAC,CAAC;oBACH,IAAI,CAAC,aAAa,GAAG,CAAC,CAAC;oBACvB,IAAI,CAAC,aAAa,EAAE,CAAC;oBACrB,OAAO,KAAK,CAAC;gBACd,CAAC;YACF,CAAC;QACF,CAAC;QAED,IAAI,CAAC,aAAa,EAAE,CAAC;QAErB,IAAI,IAAI,CAAC,aAAa,GAAG,QAAQ,CAAC,UAAU,EAAE,CAAC;YAC9C,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;gBACf,IAAI,EAAE,gBAAgB;gBACtB,OAAO,EAAE,KAAK;gBACd,OAAO,EAAE,IAAI,CAAC,aAAa,GAAG,CAAC;gBAC/B,UAAU,EAAE,OAAO,CAAC,YAAY;aAChC,CAAC,CAAC;YACH,IAAI,CAAC,aAAa,GAAG,CAAC,CAAC;YACvB,IAAI,CAAC,aAAa,EAAE,CAAC;YACrB,OAAO,KAAK,CAAC;QACd,CAAC;QAED,mEAAmE;QACnE,mEAAmE;QACnE,MAAM,kBAAkB,GAAG,QAAQ,CAAC,WAAW,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,GAAG,CAAC,CAAC,CAAC;QAChF,IAAI,OAAe,CAAC;QACpB,IAAI,OAAO,CAAC,YAAY,KAAK,SAAS,EAAE,CAAC;YACxC,MAAM,GAAG,GAAG,QAAQ,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC;YACrE,IAAI,OAAO,CAAC,YAAY,GAAG,GAAG,EAAE,CAAC;gBAChC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;oBACf,IAAI,EAAE,gBAAgB;oBACtB,OAAO,EAAE,KAAK;oBACd,OAAO,EAAE,IAAI,CAAC,aAAa,GAAG,CAAC;oBAC/B,UAAU,EAAE,uBAAuB,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,WAAW,IAAI,CAAC,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,OAAO,OAAO,CAAC,YAAY,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE;iBACnJ,CAAC,CAAC;gBACH,IAAI,CAAC,aAAa,GAAG,CAAC,CAAC;gBACvB,IAAI,CAAC,aAAa,EAAE,CAAC;gBACrB,OAAO,KAAK,CAAC;YACd,CAAC;YACD,OAAO,GAAG,OAAO,CAAC,YAAY,CAAC;QAChC,CAAC;aAAM,CAAC;YACP,OAAO,GAAG,kBAAkB,CAAC;QAC9B,CAAC;QAED,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;YACf,IAAI,EAAE,kBAAkB;YACxB,OAAO,EAAE,IAAI,CAAC,aAAa;YAC3B,WAAW,EAAE,QAAQ,CAAC,UAAU;YAChC,OAAO;YACP,YAAY,EAAE,OAAO,CAAC,YAAY,IAAI,eAAe;SACrD,CAAC,CAAC;QAEH,IAAI,CAAC,yBAAyB,EAAE,CAAC;QAEjC,4CAA4C;QAC5C,IAAI,CAAC,qBAAqB,GAAG,IAAI,eAAe,EAAE,CAAC;QACnD,IAAI,CAAC;YACJ,MAAM,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC;QACzD,CAAC;QAAC,MAAM,CAAC;YACR,uEAAuE;YACvE,oEAAoE;YACpE,IAAI,eAAe,KAAK,IAAI,CAAC,gBAAgB,EAAE,CAAC;gBAC/C,IAAI,CAAC,qBAAqB,GAAG,SAAS,CAAC;gBACvC,OAAO,KAAK,CAAC;YACd,CAAC;YACD,MAAM,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC;YACnC,IAAI,CAAC,aAAa,GAAG,CAAC,CAAC;YACvB,IAAI,CAAC,qBAAqB,GAAG,SAAS,CAAC;YACvC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;gBACf,IAAI,EAAE,gBAAgB;gBACtB,OAAO,EAAE,KAAK;gBACd,OAAO;gBACP,UAAU,EAAE,iBAAiB;aAC7B,CAAC,CAAC;YACH,IAAI,CAAC,aAAa,EAAE,CAAC;YACrB,OAAO,KAAK,CAAC;QACd,CAAC;QACD,IAAI,CAAC,qBAAqB,GAAG,SAAS,CAAC;QAEvC,4EAA4E;QAC5E,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAAC,CAAC;QAExC,OAAO,IAAI,CAAC;IACb,CAAC;IAED,+BAA+B;IAC/B,UAAU;QACT,MAAM,QAAQ,GACb,IAAI,CAAC,aAAa,KAAK,SAAS;eAC7B,IAAI,CAAC,qBAAqB,KAAK,SAAS;eACxC,IAAI,CAAC,gBAAgB,KAAK,SAAS,CAAC;QACxC,IAAI,CAAC,QAAQ;YAAE,OAAO;QAEtB,MAAM,OAAO,GAAG,IAAI,CAAC,aAAa,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;QAChE,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACxB,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC3B,YAAY,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;YACpC,IAAI,CAAC,gBAAgB,GAAG,SAAS,CAAC;QACnC,CAAC;QACD,IAAI,IAAI,CAAC,qBAAqB,EAAE,CAAC;YAChC,IAAI,CAAC,qBAAqB,CAAC,KAAK,EAAE,CAAC;YACnC,IAAI,CAAC,qBAAqB,GAAG,SAAS,CAAC;QACxC,CAAC;QACD,IAAI,CAAC,aAAa,GAAG,CAAC,CAAC;QACvB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;YACf,IAAI,EAAE,gBAAgB;YACtB,OAAO,EAAE,KAAK;YACd,OAAO;YACP,UAAU,EAAE,iBAAiB;SAC7B,CAAC,CAAC;QACH,IAAI,CAAC,aAAa,EAAE,CAAC;IACtB,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,YAAY;QACjB,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;YACxB,MAAM,IAAI,CAAC,aAAa,CAAC;QAC1B,CAAC;IACF,CAAC;IAED,wCAAwC;IACxC,YAAY;QACX,IAAI,CAAC,aAAa,EAAE,CAAC;IACtB,CAAC;IAED,4EAA4E;IAC5E,kBAAkB;IAClB,4EAA4E;IAEpE,aAAa;QACpB,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;YACxB,IAAI,CAAC,aAAa,EAAE,CAAC;YACrB,IAAI,CAAC,aAAa,GAAG,SAAS,CAAC;YAC/B,IAAI,CAAC,aAAa,GAAG,SAAS,CAAC;QAChC,CAAC;IACF,CAAC;IAEO,iBAAiB,CAAC,eAAuB;QAChD,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC3B,YAAY,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QACrC,CAAC;QACD,IAAI,CAAC,gBAAgB,GAAG,UAAU,CAAC,GAAG,EAAE;YACvC,IAAI,CAAC,gBAAgB,GAAG,SAAS,CAAC;YAClC,IAAI,eAAe,KAAK,IAAI,CAAC,gBAAgB;gBAAE,OAAO;YACtD,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QAC7C,CAAC,EAAE,CAAC,CAAC,CAAC;IACP,CAAC;IAEO,4BAA4B,CACnC,QAAuD;QAEvD,KAAK,IAAI,CAAC,GAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;YAC/C,MAAM,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;YAC5B,IAAI,OAAO,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;gBAClC,OAAO,OAA2B,CAAC;YACpC,CAAC;QACF,CAAC;QACD,OAAO,SAAS,CAAC;IAClB,CAAC;IAED;;OAEG;IACK,kBAAkB,CAAC,YAAoB;QAC9C,MAAM,GAAG,GAAG,YAAY,CAAC,WAAW,EAAE,CAAC;QACvC,gFAAgF;QAChF,2DAA2D;QAC3D,IAAI,gDAAgD,CAAC,IAAI,CAAC,GAAG,CAAC;YAAE,OAAO,iBAAiB,CAAC;QACzF,IAAI,6CAA6C,CAAC,IAAI,CAAC,GAAG,CAAC;YAAE,OAAO,iBAAiB,CAAC;QACtF,IAAI,oCAAoC,CAAC,IAAI,CAAC,GAAG,CAAC;YAAE,OAAO,YAAY,CAAC;QACxE,IAAI,qEAAqE,CAAC,IAAI,CAAC,GAAG,CAAC;YAAE,OAAO,cAAc,CAAC;QAC3G,OAAO,SAAS,CAAC;IAClB,CAAC;IAED;;;;OAIG;IACK,wBAAwB,CAAC,OAAyB,EAAE,eAAuB;QAClF,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;QAC3C,IAAI,CAAC,YAAY;YAAE,OAAO,KAAK,CAAC;QAEhC,sEAAsE;QACtE,MAAM,KAAK,GAAG,YAAY,CAAC,EAAE,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;QACtD,IAAI,CAAC,KAAK;YAAE,OAAO,KAAK,CAAC;QAEzB,MAAM,WAAW,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QAC7B,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;QACpF,IAAI,CAAC,SAAS;YAAE,OAAO,KAAK,CAAC;QAE7B,MAAM,UAAU,GAAG,YAAY,CAAC,EAAE,CAAC;QACnC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QACrC,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;QACpC,IAAI,CAAC,yBAAyB,EAAE,CAAC;QAEjC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;YACf,IAAI,EAAE,0BAA0B;YAChC,IAAI,EAAE,GAAG,YAAY,CAAC,QAAQ,IAAI,UAAU,EAAE;YAC9C,EAAE,EAAE,GAAG,SAAS,CAAC,QAAQ,IAAI,SAAS,CAAC,EAAE,EAAE;YAC3C,MAAM,EAAE,2BAA2B,UAAU,MAAM,SAAS,CAAC,EAAE,EAAE;SACjE,CAAC,CAAC;QAEH,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;YACf,IAAI,EAAE,kBAAkB;YACxB,OAAO,EAAE,IAAI,CAAC,aAAa,GAAG,CAAC;YAC/B,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,gBAAgB,EAAE,CAAC,UAAU;YACrE,OAAO,EAAE,CAAC;YACV,YAAY,EAAE,GAAG,OAAO,CAAC,YAAY,2BAA2B;SAChE,CAAC,CAAC;QAEH,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAAC,CAAC;QAExC,OAAO,IAAI,CAAC;IACb,CAAC;IAED,+DAA+D;IACvD,yBAAyB;QAChC,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC;QACjD,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,IAAI,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;YAC/E,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,eAAe,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QACzD,CAAC;IACF,CAAC;CACD","sourcesContent":["/*\n RetryHandler - Automatic retry logic with exponential backoff and credential/provider fallback.\n \n Handles retryable errors (overloaded, rate limit, server errors) by:\n * 1. Trying alternate credentials for the same provider\n * 2. Falling back to other providers via FallbackResolver\n * 3. Exponential backoff with configurable max retries\n \n Context overflow errors are NOT handled here (see compaction).\n /\n\nimport type { Agent } from \"@gsd/pi-agent-core\";\nimport type { AssistantMessage, Model } from \"@gsd/pi-ai\";\nimport { isContextOverflow } from \"@gsd/pi-ai\";\nimport type { UsageLimitErrorType } from \"./auth-storage.js\";\nimport type { FallbackResolver } from \"./fallback-resolver.js\";\nimport type { ModelRegistry } from \"./model-registry.js\";\nimport type { SettingsManager } from \"./settings-manager.js\";\nimport { sleep } from \"../utils/sleep.js\";\nimport type { AgentSessionEvent } from \"./agent-session.js\";\n\n/* Dependencies injected from AgentSession into RetryHandler /\nexport interface RetryHandlerDeps {\n\treadonly agent: Agent;\n\treadonly settingsManager: SettingsManager;\n\treadonly modelRegistry: ModelRegistry;\n\treadonly fallbackResolver: FallbackResolver;\n\tgetModel: () => Model<any> \| undefined;\n\tgetSessionId: () => string;\n\temit: (event: AgentSessionEvent) => void;\n\t/* Called when the retry handler switches to a fallback model /\n\tonModelChange: (model: Model<any>) => void;\n}\n\nexport class RetryHandler {\n\tprivate _retryAbortController: AbortController \| undefined = undefined;\n\tprivate _retryAttempt = 0;\n\tprivate _retryPromise: Promise<void> \| undefined = undefined;\n\tprivate _retryResolve: (() => void) \| undefined = undefined;\n\tprivate _retryGeneration = 0;\n\tprivate _continueTimeout: ReturnType<typeof setTimeout> \| undefined = undefined;\n\n\tconstructor(private readonly _deps: RetryHandlerDeps) {}\n\n\t/* Current retry attempt (0 if not retrying) /\n\tget retryAttempt(): number {\n\t\treturn this._retryAttempt;\n\t}\n\n\t/* Whether auto-retry is currently in progress /\n\tget isRetrying(): boolean {\n\t\treturn this._retryPromise !== undefined;\n\t}\n\n\t/* Whether auto-retry is enabled /\n\tget autoRetryEnabled(): boolean {\n\t\treturn this._deps.settingsManager.getRetryEnabled();\n\t}\n\n\t/* Toggle auto-retry setting /\n\tsetAutoRetryEnabled(enabled: boolean): void {\n\t\tthis._deps.settingsManager.setRetryEnabled(enabled);\n\t}\n\n\t/\n\t Create a retry promise synchronously for agent_end events.\n\t * Must be called synchronously from the agent event handler before\n\t * any async processing, so that waitForRetry() doesn't miss in-flight retries.\n\t /\n\tcreateRetryPromiseForAgentEnd(messages: Array<{ role: string } & Record<string, any>>): void {\n\t\tif (this._retryPromise) return;\n\n\t\tconst settings = this._deps.settingsManager.getRetrySettings();\n\t\tif (!settings.enabled) return;\n\n\t\tconst lastAssistant = this._findLastAssistantInMessages(messages);\n\t\tif (!lastAssistant \|\| !this.isRetryableError(lastAssistant)) return;\n\n\t\tthis._retryPromise = new Promise((resolve) => {\n\t\t\tthis._retryResolve = resolve;\n\t\t});\n\t}\n\n\t/\n\t Handle a successful assistant response by resetting retry state.\n\t * Call this when an assistant message completes without error.\n\t /\n\thandleSuccessfulResponse(): void {\n\t\tif (this._retryAttempt > 0) {\n\t\t\tthis._deps.emit({\n\t\t\t\ttype: \"auto_retry_end\",\n\t\t\t\tsuccess: true,\n\t\t\t\tattempt: this._retryAttempt,\n\t\t\t});\n\t\t\tthis._retryAttempt = 0;\n\t\t\tthis._resolveRetry();\n\t\t}\n\t}\n\n\t/\n\t Check if an error is retryable (overloaded, rate limit, server errors).\n\t * Context overflow errors are NOT retryable (handled by compaction instead).\n\t /\n\tisRetryableError(message: AssistantMessage): boolean {\n\t\tif (message.stopReason !== \"error\" \|\| !message.errorMessage) return false;\n\n\t\t// Context overflow is handled by compaction, not retry\n\t\tconst contextWindow = this._deps.getModel()?.contextWindow ?? 0;\n\t\tif (isContextOverflow(message, contextWindow)) return false;\n\n\t\tconst err = message.errorMessage;\n\t\treturn /overloaded\|rate.?limit\|too many requests\|429\|500\|502\|503\|504\|service.?unavailable\|server.?error\|internal.?error\|connection.?error\|connection.?refused\|other side closed\|fetch failed\|upstream.?connect\|reset before headers\|terminated\|retry delay\|network.?(?:is\\s+)?unavailable\|credentials.expired\|temporarily backed off\|extra usage is required/i.test(\n\t\t\terr,\n\t\t);\n\t}\n\n\t/*\n\t Handle retryable errors with exponential backoff.\n\t * When multiple credentials are available, marks the failing credential\n\t * as backed off and retries immediately with the next one.\n\t * @returns true if retry was initiated, false if max retries exceeded or disabled\n\t /\n\tasync handleRetryableError(message: AssistantMessage): Promise<boolean> {\n\t\tconst settings = this._deps.settingsManager.getRetrySettings();\n\t\tif (!settings.enabled) {\n\t\t\tthis._resolveRetry();\n\t\t\treturn false;\n\t\t}\n\n\t\t// Retry promise is created synchronously in createRetryPromiseForAgentEnd.\n\t\t// Keep a defensive fallback here in case a future refactor bypasses that path.\n\t\tif (!this._retryPromise) {\n\t\t\tthis._retryPromise = new Promise((resolve) => {\n\t\t\t\tthis._retryResolve = resolve;\n\t\t\t});\n\t\t}\n\n\t\t// Try credential fallback before counting against retry budget.\n\t\tconst retryGeneration = this._retryGeneration;\n\t\tif (this._deps.getModel() && message.errorMessage) {\n\t\t\tconst errorType = this._classifyErrorType(message.errorMessage);\n\t\t\tconst isCredentialError = errorType === \"rate_limit\" \|\| errorType === \"quota_exhausted\";\n\t\t\tconst hasAlternate =\n\t\t\t\tisCredentialError &&\n\t\t\t\tthis._deps.modelRegistry.authStorage.markUsageLimitReached(\n\t\t\t\t\tthis._deps.getModel()!.provider,\n\t\t\t\t\tthis._deps.getSessionId(),\n\t\t\t\t\t{ errorType },\n\t\t\t\t);\n\n\t\t\tif (hasAlternate) {\n\t\t\t\tthis._removeLastAssistantError();\n\n\t\t\t\tthis._deps.emit({\n\t\t\t\t\ttype: \"auto_retry_start\",\n\t\t\t\t\tattempt: this._retryAttempt + 1,\n\t\t\t\t\tmaxAttempts: settings.maxRetries,\n\t\t\t\t\tdelayMs: 0,\n\t\t\t\t\terrorMessage: `${message.errorMessage} (switching credential)`,\n\t\t\t\t});\n\n\t\t\t\t// Retry immediately with the next credential - don't increment _retryAttempt\n\t\t\t\tthis._scheduleContinue(retryGeneration);\n\n\t\t\t\treturn true;\n\t\t\t}\n\n\t\t\t// All credentials are backed off. Try cross-provider fallback before giving up.\n\t\t\tif (isCredentialError) {\n\t\t\t\tconst fallbackResult = await this._deps.fallbackResolver.findFallback(\n\t\t\t\t\tthis._deps.getModel()!,\n\t\t\t\t\terrorType,\n\t\t\t\t);\n\n\t\t\t\tif (fallbackResult) {\n\t\t\t\t\tconst previousProvider = this._deps.getModel()!.provider;\n\t\t\t\t\tthis._deps.agent.setModel(fallbackResult.model);\n\t\t\t\t\tthis._deps.onModelChange(fallbackResult.model);\n\t\t\t\t\tthis._removeLastAssistantError();\n\n\t\t\t\t\tthis._deps.emit({\n\t\t\t\t\t\ttype: \"fallback_provider_switch\",\n\t\t\t\t\t\tfrom: `${previousProvider}/${this._deps.getModel()?.id}`,\n\t\t\t\t\t\tto: `${fallbackResult.model.provider}/${fallbackResult.model.id}`,\n\t\t\t\t\t\treason: fallbackResult.reason,\n\t\t\t\t\t});\n\n\t\t\t\t\tthis._deps.emit({\n\t\t\t\t\t\ttype: \"auto_retry_start\",\n\t\t\t\t\t\tattempt: this._retryAttempt + 1,\n\t\t\t\t\t\tmaxAttempts: settings.maxRetries,\n\t\t\t\t\t\tdelayMs: 0,\n\t\t\t\t\t\terrorMessage: `${message.errorMessage} (${fallbackResult.reason})`,\n\t\t\t\t\t});\n\n\t\t\t\t\t// Retry immediately with fallback provider - don't increment _retryAttempt\n\t\t\t\t\tthis._scheduleContinue(retryGeneration);\n\n\t\t\t\t\treturn true;\n\t\t\t\t}\n\n\t\t\t\t// No fallback available either\n\t\t\t\tif (errorType === \"quota_exhausted\") {\n\t\t\t\t\t// Try long-context model downgrade ([1m] → base) before giving up\n\t\t\t\t\tconst downgraded = this._tryLongContextDowngrade(message, retryGeneration);\n\t\t\t\t\tif (downgraded) return true;\n\n\t\t\t\t\tthis._deps.emit({\n\t\t\t\t\t\ttype: \"fallback_chain_exhausted\",\n\t\t\t\t\t\treason: `All providers exhausted for ${this._deps.getModel()!.provider}/${this._deps.getModel()!.id}`,\n\t\t\t\t\t});\n\t\t\t\t\tthis._deps.emit({\n\t\t\t\t\t\ttype: \"auto_retry_end\",\n\t\t\t\t\t\tsuccess: false,\n\t\t\t\t\t\tattempt: this._retryAttempt,\n\t\t\t\t\t\tfinalError: message.errorMessage,\n\t\t\t\t\t});\n\t\t\t\t\tthis._retryAttempt = 0;\n\t\t\t\t\tthis._resolveRetry();\n\t\t\t\t\treturn false;\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\n\t\tthis._retryAttempt++;\n\n\t\tif (this._retryAttempt > settings.maxRetries) {\n\t\t\tthis._deps.emit({\n\t\t\t\ttype: \"auto_retry_end\",\n\t\t\t\tsuccess: false,\n\t\t\t\tattempt: this._retryAttempt - 1,\n\t\t\t\tfinalError: message.errorMessage,\n\t\t\t});\n\t\t\tthis._retryAttempt = 0;\n\t\t\tthis._resolveRetry();\n\t\t\treturn false;\n\t\t}\n\n\t\t// Use server-requested delay when available, capped by maxDelayMs.\n\t\t// Fall back to exponential backoff when no server hint is present.\n\t\tconst exponentialDelayMs = settings.baseDelayMs 2 (this._retryAttempt - 1);\n\t\tlet delayMs: number;\n\t\tif (message.retryAfterMs !== undefined) {\n\t\t\tconst cap = settings.maxDelayMs > 0 ? settings.maxDelayMs : Infinity;\n\t\t\tif (message.retryAfterMs > cap) {\n\t\t\t\tthis._deps.emit({\n\t\t\t\t\ttype: \"auto_retry_end\",\n\t\t\t\t\tsuccess: false,\n\t\t\t\t\tattempt: this._retryAttempt - 1,\n\t\t\t\t\tfinalError: `Rate limit reset in ${Math.ceil(message.retryAfterMs / 1000)}s (max: ${Math.ceil(cap / 1000)}s). ${message.errorMessage \|\| \"\"}`.trim(),\n\t\t\t\t});\n\t\t\t\tthis._retryAttempt = 0;\n\t\t\t\tthis._resolveRetry();\n\t\t\t\treturn false;\n\t\t\t}\n\t\t\tdelayMs = message.retryAfterMs;\n\t\t} else {\n\t\t\tdelayMs = exponentialDelayMs;\n\t\t}\n\n\t\tthis._deps.emit({\n\t\t\ttype: \"auto_retry_start\",\n\t\t\tattempt: this._retryAttempt,\n\t\t\tmaxAttempts: settings.maxRetries,\n\t\t\tdelayMs,\n\t\t\terrorMessage: message.errorMessage \|\| \"Unknown error\",\n\t\t});\n\n\t\tthis._removeLastAssistantError();\n\n\t\t// Wait with exponential backoff (abortable)\n\t\tthis._retryAbortController = new AbortController();\n\t\ttry {\n\t\t\tawait sleep(delayMs, this._retryAbortController.signal);\n\t\t} catch {\n\t\t\t// Aborted during sleep. If the retry generation already advanced, this\n\t\t\t// cancellation was handled externally (e.g. explicit model switch).\n\t\t\tif (retryGeneration !== this._retryGeneration) {\n\t\t\t\tthis._retryAbortController = undefined;\n\t\t\t\treturn false;\n\t\t\t}\n\t\t\tconst attempt = this._retryAttempt;\n\t\t\tthis._retryAttempt = 0;\n\t\t\tthis._retryAbortController = undefined;\n\t\t\tthis._deps.emit({\n\t\t\t\ttype: \"auto_retry_end\",\n\t\t\t\tsuccess: false,\n\t\t\t\tattempt,\n\t\t\t\tfinalError: \"Retry cancelled\",\n\t\t\t});\n\t\t\tthis._resolveRetry();\n\t\t\treturn false;\n\t\t}\n\t\tthis._retryAbortController = undefined;\n\n\t\t// Retry via continue() - use setTimeout to break out of event handler chain\n\t\tthis._scheduleContinue(retryGeneration);\n\n\t\treturn true;\n\t}\n\n\t/ Cancel in-progress retry /\n\tabortRetry(): void {\n\t\tconst hadRetry =\n\t\t\tthis._retryPromise !== undefined\n\t\t\t\|\| this._retryAbortController !== undefined\n\t\t\t\|\| this._continueTimeout !== undefined;\n\t\tif (!hadRetry) return;\n\n\t\tconst attempt = this._retryAttempt > 0 ? this._retryAttempt : 1;\n\t\tthis._retryGeneration++;\n\t\tif (this._continueTimeout) {\n\t\t\tclearTimeout(this._continueTimeout);\n\t\t\tthis._continueTimeout = undefined;\n\t\t}\n\t\tif (this._retryAbortController) {\n\t\t\tthis._retryAbortController.abort();\n\t\t\tthis._retryAbortController = undefined;\n\t\t}\n\t\tthis._retryAttempt = 0;\n\t\tthis._deps.emit({\n\t\t\ttype: \"auto_retry_end\",\n\t\t\tsuccess: false,\n\t\t\tattempt,\n\t\t\tfinalError: \"Retry cancelled\",\n\t\t});\n\t\tthis._resolveRetry();\n\t}\n\n\t/\n\t Wait for any in-progress retry to complete.\n\t * Returns immediately if no retry is in progress.\n\t /\n\tasync waitForRetry(): Promise<void> {\n\t\tif (this._retryPromise) {\n\t\t\tawait this._retryPromise;\n\t\t}\n\t}\n\n\t/* Resolve the pending retry promise /\n\tresolveRetry(): void {\n\t\tthis._resolveRetry();\n\t}\n\n\t// =========================================================================\n\t// Private helpers\n\t// =========================================================================\n\n\tprivate _resolveRetry(): void {\n\t\tif (this._retryResolve) {\n\t\t\tthis._retryResolve();\n\t\t\tthis._retryResolve = undefined;\n\t\t\tthis._retryPromise = undefined;\n\t\t}\n\t}\n\n\tprivate _scheduleContinue(retryGeneration: number): void {\n\t\tif (this._continueTimeout) {\n\t\t\tclearTimeout(this._continueTimeout);\n\t\t}\n\t\tthis._continueTimeout = setTimeout(() => {\n\t\t\tthis._continueTimeout = undefined;\n\t\t\tif (retryGeneration !== this._retryGeneration) return;\n\t\t\tthis._deps.agent.continue().catch(() => {});\n\t\t}, 0);\n\t}\n\n\tprivate _findLastAssistantInMessages(\n\t\tmessages: Array<{ role: string } & Record<string, any>>,\n\t): AssistantMessage \| undefined {\n\t\tfor (let i = messages.length - 1; i >= 0; i--) {\n\t\t\tconst message = messages[i];\n\t\t\tif (message.role === \"assistant\") {\n\t\t\t\treturn message as AssistantMessage;\n\t\t\t}\n\t\t}\n\t\treturn undefined;\n\t}\n\n\t/\n\t Classify an error message into a usage-limit error type for credential backoff.\n\t /\n\tprivate _classifyErrorType(errorMessage: string): UsageLimitErrorType {\n\t\tconst err = errorMessage.toLowerCase();\n\t\t// Long-context entitlement errors are billing gates, not transient rate limits.\n\t\t// Must be checked before the generic 429/rate_limit regex.\n\t\tif (/extra usage is required\|long context required/i.test(err)) return \"quota_exhausted\";\n\t\tif (/quota\|billing\|exceeded.limit\|usage.limit/i.test(err)) return \"quota_exhausted\";\n\t\tif (/rate.?limit\|too many requests\|429/i.test(err)) return \"rate_limit\";\n\t\tif (/500\|502\|503\|504\|server.?error\|internal.?error\|service.?unavailable/i.test(err)) return \"server_error\";\n\t\treturn \"unknown\";\n\t}\n\n\t/\n\t Attempt to downgrade a long-context model (e.g. claude-opus-4-6[1m]) to its\n\t * base model (claude-opus-4-6) when the account lacks the long-context billing\n\t * entitlement. Returns true if the downgrade was initiated.\n\t /\n\tprivate _tryLongContextDowngrade(message: AssistantMessage, retryGeneration: number): boolean {\n\t\tconst currentModel = this._deps.getModel();\n\t\tif (!currentModel) return false;\n\n\t\t// Only attempt downgrade for [1m] (or similar long-context) model IDs\n\t\tconst match = currentModel.id.match(/^(.+)\\[\\d+m\\]$/);\n\t\tif (!match) return false;\n\n\t\tconst baseModelId = match[1];\n\t\tconst baseModel = this._deps.modelRegistry.find(currentModel.provider, baseModelId);\n\t\tif (!baseModel) return false;\n\n\t\tconst previousId = currentModel.id;\n\t\tthis._deps.agent.setModel(baseModel);\n\t\tthis._deps.onModelChange(baseModel);\n\t\tthis._removeLastAssistantError();\n\n\t\tthis._deps.emit({\n\t\t\ttype: \"fallback_provider_switch\",\n\t\t\tfrom: `${currentModel.provider}/${previousId}`,\n\t\t\tto: `${baseModel.provider}/${baseModel.id}`,\n\t\t\treason: `long context downgrade: ${previousId} → ${baseModel.id}`,\n\t\t});\n\n\t\tthis._deps.emit({\n\t\t\ttype: \"auto_retry_start\",\n\t\t\tattempt: this._retryAttempt + 1,\n\t\t\tmaxAttempts: this._deps.settingsManager.getRetrySettings().maxRetries,\n\t\t\tdelayMs: 0,\n\t\t\terrorMessage: `${message.errorMessage} (long context downgrade)`,\n\t\t});\n\n\t\tthis._scheduleContinue(retryGeneration);\n\n\t\treturn true;\n\t}\n\n\t/* Remove the last assistant error message from agent state */\n\tprivate _removeLastAssistantError(): void {\n\t\tconst messages = this._deps.agent.state.messages;\n\t\tif (messages.length > 0 && messages[messages.length - 1].role === \"assistant\") {\n\t\t\tthis._deps.agent.replaceMessages(messages.slice(0, -1));\n\t\t}\n\t}\n}\n"]}

package/packages/pi-coding-agent/dist/core/retry-handler.test.js CHANGED Viewed

@@ -59,9 +59,9 @@ function createMockDeps(overrides) {
             getRetryEnabled: () => overrides?.retryEnabled ?? true,
             getRetrySettings: () => ({
                 enabled: overrides?.retryEnabled ?? true,
-                maxRetries: 5,
-                baseDelayMs: 1000,
-                maxDelayMs: 30000,
+                maxRetries: overrides?.retrySettings?.maxRetries ?? 5,
+                baseDelayMs: overrides?.retrySettings?.baseDelayMs ?? 1000,
+                maxDelayMs: overrides?.retrySettings?.maxDelayMs ?? 30000,
             }),
         },
         modelRegistry: {
@@ -181,6 +181,23 @@ describe("RetryHandler — long-context entitlement 429 (#2803)", () => {
             assert.equal(switchEvent, undefined, "Should not switch for non-[1m] models");
         });
     });
+    describe("retry cancellation", () => {
+        it("cancels queued immediate continue callbacks when retry is aborted", async () => {
+            const { deps, emittedEvents, continueFn } = createMockDeps({
+                markUsageLimitReachedResult: true,
+            });
+            const handler = new RetryHandler(deps);
+            const msg = errorMessage("429 Too Many Requests");
+            const result = await handler.handleRetryableError(msg);
+            assert.equal(result, true, "retry should be initiated");
+            handler.abortRetry();
+            await new Promise((resolve) => setTimeout(resolve, 10));
+            assert.equal(continueFn.mock.calls.length, 0, "cancelled retry must not continue after explicit abort");
+            const endEvents = emittedEvents.filter((e) => e.type === "auto_retry_end");
+            assert.equal(endEvents.length, 1, "retry cancellation should emit a single auto_retry_end event");
+            assert.equal(endEvents[0]?.finalError, "Retry cancelled");
+        });
+    });
     describe("isRetryableError", () => {
         it("considers long-context entitlement error as retryable", () => {
             const { deps } = createMockDeps();

package/packages/pi-coding-agent/dist/core/retry-handler.test.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"retry-handler.test.js","sourceRoot":"","sources":["../../src/core/retry-handler.test.ts"],"names":[],"mappings":"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","sourcesContent":["/*\n RetryHandler tests — long-context entitlement 429 error handling (#2803)\n \n Verifies that \"Extra usage is required for long context requests\" errors\n * are classified as quota_exhausted (not rate_limit) and trigger a model\n * downgrade from [1m] to base when no cross-provider fallback exists.\n */\n\nimport { describe, it, beforeEach, mock, type Mock } from \"node:test\";\nimport assert from \"node:assert/strict\";\nimport { RetryHandler, type RetryHandlerDeps } from \"./retry-handler.js\";\nimport type { Api, AssistantMessage, Model } from \"@gsd/pi-ai\";\nimport type { FallbackResolver } from \"./fallback-resolver.js\";\nimport type { ModelRegistry } from \"./model-registry.js\";\nimport type { SettingsManager } from \"./settings-manager.js\";\n\n// ─── Helpers ────────────────────────────────────────────────────────────────\n\nfunction createMockModel(provider: string, id: string): Model<Api> {\n\treturn {\n\t\tid,\n\t\tname: id,\n\t\tapi: \"anthropic\" as Api,\n\t\tprovider,\n\t\tbaseUrl: \"https://api.anthropic.com\",\n\t\treasoning: false,\n\t\tinput: [\"text\"],\n\t\tcost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },\n\t\tcontextWindow: 1_000_000,\n\t\tmaxTokens: 16384,\n\t} as Model<Api>;\n}\n\nfunction errorMessage(msg: string): AssistantMessage {\n\treturn {\n\t\trole: \"assistant\",\n\t\tcontent: [],\n\t\tapi: \"anthropic-messages\",\n\t\tprovider: \"anthropic\",\n\t\tmodel: \"claude-opus-4-6[1m]\",\n\t\tusage: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, totalTokens: 0, cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, total: 0 } },\n\t\tstopReason: \"error\",\n\t\terrorMessage: msg,\n\t\ttimestamp: Date.now(),\n\t} as AssistantMessage;\n}\n\ninterface MockDeps {\n\tdeps: RetryHandlerDeps;\n\temittedEvents: Array<Record<string, any>>;\n\tcontinueFn: Mock<() => Promise<void>>;\n\tonModelChangeFn: Mock<(model: Model<any>) => void>;\n\tmarkUsageLimitReached: Mock<(...args: any[]) => boolean>;\n\tfindFallback: Mock<(...args: any[]) => Promise<any>>;\n\tfindModel: Mock<(provider: string, modelId: string) => Model<Api> \| undefined>;\n}\n\nfunction createMockDeps(overrides?: {\n\tmodel?: Model<Api>;\n\tretryEnabled?: boolean;\n\tmarkUsageLimitReachedResult?: boolean;\n\tfallbackResult?: any;\n\tfindModelResult?: (provider: string, modelId: string) => Model<Api> \| undefined;\n}): MockDeps {\n\tconst model = overrides?.model ?? createMockModel(\"anthropic\", \"claude-opus-4-6[1m]\");\n\tconst emittedEvents: Array<Record<string, any>> = [];\n\tconst continueFn = mock.fn(async () => {});\n\tconst onModelChangeFn = mock.fn((_model: Model<any>) => {});\n\tconst markUsageLimitReached = mock.fn(\n\t\t() => overrides?.markUsageLimitReachedResult ?? false,\n\t);\n\tconst findFallback = mock.fn(async () => overrides?.fallbackResult ?? null);\n\tconst findModel = mock.fn(\n\t\toverrides?.findModelResult ?? ((_provider: string, _modelId: string) => undefined),\n\t);\n\n\tconst messages: Array<{ role: string } & Record<string, any>> = [];\n\n\tconst deps: RetryHandlerDeps = {\n\t\tagent: {\n\t\t\tcontinue: continueFn,\n\t\t\tstate: { messages },\n\t\t\tsetModel: mock.fn(),\n\t\t\treplaceMessages: mock.fn((newMessages: any[]) => {\n\t\t\t\tmessages.length = 0;\n\t\t\t\tmessages.push(...newMessages);\n\t\t\t}),\n\t\t} as any,\n\t\tsettingsManager: {\n\t\t\tgetRetryEnabled: () => overrides?.retryEnabled ?? true,\n\t\t\tgetRetrySettings: () => ({\n\t\t\t\tenabled: overrides?.retryEnabled ?? true,\n\t\t\t\tmaxRetries: 5,\n\t\t\t\tbaseDelayMs: 1000,\n\t\t\t\tmaxDelayMs: 30000,\n\t\t\t}),\n\t\t} as unknown as SettingsManager,\n\t\tmodelRegistry: {\n\t\t\tauthStorage: {\n\t\t\t\tmarkUsageLimitReached,\n\t\t\t},\n\t\t\tfind: findModel,\n\t\t} as unknown as ModelRegistry,\n\t\tfallbackResolver: {\n\t\t\tfindFallback,\n\t\t} as unknown as FallbackResolver,\n\t\tgetModel: () => model,\n\t\tgetSessionId: () => \"test-session\",\n\t\temit: (event: any) => emittedEvents.push(event),\n\t\tonModelChange: onModelChangeFn,\n\t};\n\n\treturn { deps, emittedEvents, continueFn, onModelChangeFn, markUsageLimitReached, findFallback, findModel };\n}\n\n// ─── _classifyErrorType (tested via handleRetryableError behavior) ──────────\n\ndescribe(\"RetryHandler — long-context entitlement 429 (#2803)\", () => {\n\n\tdescribe(\"error classification\", () => {\n\t\tit(\"classifies 'Extra usage is required for long context requests' as quota_exhausted, not rate_limit\", async () => {\n\t\t\t// When the error is classified as quota_exhausted AND no alternate credentials\n\t\t\t// AND no fallback, the handler should emit fallback_chain_exhausted and stop.\n\t\t\t// If misclassified as rate_limit, it would enter the backoff loop instead.\n\t\t\tconst { deps, emittedEvents, findModel } = createMockDeps({\n\t\t\t\tmodel: createMockModel(\"anthropic\", \"claude-opus-4-6[1m]\"),\n\t\t\t\tmarkUsageLimitReachedResult: false, // no alternate credentials\n\t\t\t\tfallbackResult: null, // no cross-provider fallback\n\t\t\t\tfindModelResult: () => undefined, // no base model either\n\t\t\t});\n\n\t\t\tconst handler = new RetryHandler(deps);\n\t\t\tconst msg = errorMessage(\n\t\t\t\t'429 {\"type\":\"error\",\"error\":{\"type\":\"rate_limit_error\",\"message\":\"Extra usage is required for long context requests.\"}}'\n\t\t\t);\n\n\t\t\tconst result = await handler.handleRetryableError(msg);\n\n\t\t\t// Should NOT retry (would be true if misclassified as rate_limit entering backoff)\n\t\t\tassert.equal(result, false);\n\n\t\t\t// Should emit fallback_chain_exhausted (quota_exhausted path), NOT auto_retry_start (backoff path)\n\t\t\tconst chainExhausted = emittedEvents.find((e) => e.type === \"fallback_chain_exhausted\");\n\t\t\tassert.ok(chainExhausted, \"Expected fallback_chain_exhausted event for entitlement error\");\n\n\t\t\tconst retryStart = emittedEvents.find((e) => e.type === \"auto_retry_start\");\n\t\t\tassert.equal(retryStart, undefined, \"Should NOT emit auto_retry_start for entitlement error\");\n\t\t});\n\n\t\tit(\"still classifies regular 429 rate limits as rate_limit\", async () => {\n\t\t\t// A normal \"rate limit\" 429 should still be classified as rate_limit\n\t\t\tconst { deps, emittedEvents } = createMockDeps({\n\t\t\t\tmodel: createMockModel(\"anthropic\", \"claude-opus-4-6\"),\n\t\t\t\tmarkUsageLimitReachedResult: false,\n\t\t\t\tfallbackResult: null,\n\t\t\t});\n\n\t\t\tconst handler = new RetryHandler(deps);\n\t\t\tconst msg = errorMessage(\"429 Too Many Requests\");\n\n\t\t\tconst result = await handler.handleRetryableError(msg);\n\n\t\t\t// Should enter the backoff loop (rate_limit path, not quota_exhausted)\n\t\t\tassert.equal(result, true);\n\n\t\t\tconst retryStart = emittedEvents.find((e) => e.type === \"auto_retry_start\");\n\t\t\tassert.ok(retryStart, \"Regular 429 should enter backoff retry\");\n\t\t});\n\t});\n\n\tdescribe(\"long-context model downgrade\", () => {\n\t\tit(\"downgrades from [1m] to base model when entitlement error and no fallback\", async () => {\n\t\t\tconst baseModel = createMockModel(\"anthropic\", \"claude-opus-4-6\");\n\t\t\tconst { deps, emittedEvents, onModelChangeFn, continueFn } = createMockDeps({\n\t\t\t\tmodel: createMockModel(\"anthropic\", \"claude-opus-4-6[1m]\"),\n\t\t\t\tmarkUsageLimitReachedResult: false,\n\t\t\t\tfallbackResult: null,\n\t\t\t\tfindModelResult: (provider: string, modelId: string) => {\n\t\t\t\t\tif (provider === \"anthropic\" && modelId === \"claude-opus-4-6\") return baseModel;\n\t\t\t\t\treturn undefined;\n\t\t\t\t},\n\t\t\t});\n\n\t\t\tconst handler = new RetryHandler(deps);\n\t\t\tconst msg = errorMessage(\"Extra usage is required for long context requests.\");\n\n\t\t\tconst result = await handler.handleRetryableError(msg);\n\n\t\t\tassert.equal(result, true, \"Should retry after downgrade\");\n\n\t\t\t// Should have called setModel with the base model\n\t\t\tconst setModelCalls = (deps.agent.setModel as any).mock.calls;\n\t\t\tassert.equal(setModelCalls.length, 1);\n\t\t\tassert.equal(setModelCalls[0].arguments[0].id, \"claude-opus-4-6\");\n\n\t\t\t// Should have notified about model change\n\t\t\tassert.equal(onModelChangeFn.mock.calls.length, 1);\n\n\t\t\t// Should emit a fallback_provider_switch event indicating downgrade\n\t\t\tconst switchEvent = emittedEvents.find((e) => e.type === \"fallback_provider_switch\");\n\t\t\tassert.ok(switchEvent, \"Expected fallback_provider_switch event for downgrade\");\n\t\t\tassert.ok(switchEvent!.reason.includes(\"long context downgrade\"), `reason should mention downgrade: ${switchEvent!.reason}`);\n\t\t});\n\n\t\tit(\"emits fallback_chain_exhausted when base model is also unavailable\", async () => {\n\t\t\tconst { deps, emittedEvents } = createMockDeps({\n\t\t\t\tmodel: createMockModel(\"anthropic\", \"claude-opus-4-6[1m]\"),\n\t\t\t\tmarkUsageLimitReachedResult: false,\n\t\t\t\tfallbackResult: null,\n\t\t\t\tfindModelResult: () => undefined, // base model not found\n\t\t\t});\n\n\t\t\tconst handler = new RetryHandler(deps);\n\t\t\tconst msg = errorMessage(\"Extra usage is required for long context requests.\");\n\n\t\t\tconst result = await handler.handleRetryableError(msg);\n\n\t\t\tassert.equal(result, false);\n\t\t\tconst chainExhausted = emittedEvents.find((e) => e.type === \"fallback_chain_exhausted\");\n\t\t\tassert.ok(chainExhausted, \"Expected fallback_chain_exhausted when base model unavailable\");\n\t\t});\n\n\t\tit(\"does not attempt downgrade for non-[1m] models\", async () => {\n\t\t\t// When a regular model (no [1m] suffix) gets a quota_exhausted error\n\t\t\t// with no fallback, it should just stop — no downgrade attempt.\n\t\t\tconst { deps, emittedEvents } = createMockDeps({\n\t\t\t\tmodel: createMockModel(\"anthropic\", \"claude-opus-4-6\"),\n\t\t\t\tmarkUsageLimitReachedResult: false,\n\t\t\t\tfallbackResult: null,\n\t\t\t});\n\n\t\t\tconst handler = new RetryHandler(deps);\n\t\t\tconst msg = errorMessage(\"Extra usage is required for long context requests.\");\n\n\t\t\tconst result = await handler.handleRetryableError(msg);\n\n\t\t\tassert.equal(result, false);\n\t\t\tconst chainExhausted = emittedEvents.find((e) => e.type === \"fallback_chain_exhausted\");\n\t\t\tassert.ok(chainExhausted);\n\n\t\t\t// No downgrade switch should occur\n\t\t\tconst switchEvent = emittedEvents.find((e) => e.type === \"fallback_provider_switch\");\n\t\t\tassert.equal(switchEvent, undefined, \"Should not switch for non-[1m] models\");\n\t\t});\n\t});\n\n\tdescribe(\"isRetryableError\", () => {\n\t\tit(\"considers long-context entitlement error as retryable\", () => {\n\t\t\tconst { deps } = createMockDeps();\n\t\t\tconst handler = new RetryHandler(deps);\n\t\t\tconst msg = errorMessage(\"Extra usage is required for long context requests.\");\n\t\t\tassert.equal(handler.isRetryableError(msg), true);\n\t\t});\n\t});\n});\n"]}
1	+ {"version":3,"file":"retry-handler.test.js","sourceRoot":"","sources":["../../src/core/retry-handler.test.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAc,IAAI,EAAa,MAAM,WAAW,CAAC;AACtE,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,YAAY,EAAyB,MAAM,oBAAoB,CAAC;AAMzE,+EAA+E;AAE/E,SAAS,eAAe,CAAC,QAAgB,EAAE,EAAU;IACpD,OAAO;QACN,EAAE;QACF,IAAI,EAAE,EAAE;QACR,GAAG,EAAE,WAAkB;QACvB,QAAQ;QACR,OAAO,EAAE,2BAA2B;QACpC,SAAS,EAAE,KAAK;QAChB,KAAK,EAAE,CAAC,MAAM,CAAC;QACf,IAAI,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE;QAC1D,aAAa,EAAE,SAAS;QACxB,SAAS,EAAE,KAAK;KACF,CAAC;AACjB,CAAC;AAED,SAAS,YAAY,CAAC,GAAW;IAChC,OAAO;QACN,IAAI,EAAE,WAAW;QACjB,OAAO,EAAE,EAAE;QACX,GAAG,EAAE,oBAAoB;QACzB,QAAQ,EAAE,WAAW;QACrB,KAAK,EAAE,qBAAqB;QAC5B,KAAK,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;QACjJ,UAAU,EAAE,OAAO;QACnB,YAAY,EAAE,GAAG;QACjB,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;KACD,CAAC;AACvB,CAAC;AAYD,SAAS,cAAc,CAAC,SAWvB;IACA,MAAM,KAAK,GAAG,SAAS,EAAE,KAAK,IAAI,eAAe,CAAC,WAAW,EAAE,qBAAqB,CAAC,CAAC;IACtF,MAAM,aAAa,GAA+B,EAAE,CAAC;IACrD,MAAM,UAAU,GAAG,IAAI,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE,GAAE,CAAC,CAAC,CAAC;IAC3C,MAAM,eAAe,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC,MAAkB,EAAE,EAAE,GAAE,CAAC,CAAC,CAAC;IAC5D,MAAM,qBAAqB,GAAG,IAAI,CAAC,EAAE,CACpC,GAAG,EAAE,CAAC,SAAS,EAAE,2BAA2B,IAAI,KAAK,CACrD,CAAC;IACF,MAAM,YAAY,GAAG,IAAI,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,SAAS,EAAE,cAAc,IAAI,IAAI,CAAC,CAAC;IAC5E,MAAM,SAAS,GAAG,IAAI,CAAC,EAAE,CACxB,SAAS,EAAE,eAAe,IAAI,CAAC,CAAC,SAAiB,EAAE,QAAgB,EAAE,EAAE,CAAC,SAAS,CAAC,CAClF,CAAC;IAEF,MAAM,QAAQ,GAAkD,EAAE,CAAC;IAEnE,MAAM,IAAI,GAAqB;QAC9B,KAAK,EAAE;YACN,QAAQ,EAAE,UAAU;YACpB,KAAK,EAAE,EAAE,QAAQ,EAAE;YACnB,QAAQ,EAAE,IAAI,CAAC,EAAE,EAAE;YACnB,eAAe,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,WAAkB,EAAE,EAAE;gBAC/C,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC;gBACpB,QAAQ,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,CAAC;YAC/B,CAAC,CAAC;SACK;QACR,eAAe,EAAE;YAChB,eAAe,EAAE,GAAG,EAAE,CAAC,SAAS,EAAE,YAAY,IAAI,IAAI;YACtD,gBAAgB,EAAE,GAAG,EAAE,CAAC,CAAC;gBACxB,OAAO,EAAE,SAAS,EAAE,YAAY,IAAI,IAAI;gBACxC,UAAU,EAAE,SAAS,EAAE,aAAa,EAAE,UAAU,IAAI,CAAC;gBACrD,WAAW,EAAE,SAAS,EAAE,aAAa,EAAE,WAAW,IAAI,IAAI;gBAC1D,UAAU,EAAE,SAAS,EAAE,aAAa,EAAE,UAAU,IAAI,KAAK;aACzD,CAAC;SAC4B;QAC/B,aAAa,EAAE;YACd,WAAW,EAAE;gBACZ,qBAAqB;aACrB;YACD,IAAI,EAAE,SAAS;SACa;QAC7B,gBAAgB,EAAE;YACjB,YAAY;SACmB;QAChC,QAAQ,EAAE,GAAG,EAAE,CAAC,KAAK;QACrB,YAAY,EAAE,GAAG,EAAE,CAAC,cAAc;QAClC,IAAI,EAAE,CAAC,KAAU,EAAE,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC;QAC/C,aAAa,EAAE,eAAe;KAC9B,CAAC;IAEF,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,UAAU,EAAE,eAAe,EAAE,qBAAqB,EAAE,YAAY,EAAE,SAAS,EAAE,CAAC;AAC7G,CAAC;AAED,+EAA+E;AAE/E,QAAQ,CAAC,qDAAqD,EAAE,GAAG,EAAE;IAEpE,QAAQ,CAAC,sBAAsB,EAAE,GAAG,EAAE;QACrC,EAAE,CAAC,mGAAmG,EAAE,KAAK,IAAI,EAAE;YAClH,+EAA+E;YAC/E,8EAA8E;YAC9E,2EAA2E;YAC3E,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,SAAS,EAAE,GAAG,cAAc,CAAC;gBACzD,KAAK,EAAE,eAAe,CAAC,WAAW,EAAE,qBAAqB,CAAC;gBAC1D,2BAA2B,EAAE,KAAK,EAAE,2BAA2B;gBAC/D,cAAc,EAAE,IAAI,EAAE,6BAA6B;gBACnD,eAAe,EAAE,GAAG,EAAE,CAAC,SAAS,EAAE,uBAAuB;aACzD,CAAC,CAAC;YAEH,MAAM,OAAO,GAAG,IAAI,YAAY,CAAC,IAAI,CAAC,CAAC;YACvC,MAAM,GAAG,GAAG,YAAY,CACvB,yHAAyH,CACzH,CAAC;YAEF,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC;YAEvD,mFAAmF;YACnF,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;YAE5B,mGAAmG;YACnG,MAAM,cAAc,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,0BAA0B,CAAC,CAAC;YACxF,MAAM,CAAC,EAAE,CAAC,cAAc,EAAE,+DAA+D,CAAC,CAAC;YAE3F,MAAM,UAAU,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,kBAAkB,CAAC,CAAC;YAC5E,MAAM,CAAC,KAAK,CAAC,UAAU,EAAE,SAAS,EAAE,wDAAwD,CAAC,CAAC;QAC/F,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,wDAAwD,EAAE,KAAK,IAAI,EAAE;YACvE,qEAAqE;YACrE,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,GAAG,cAAc,CAAC;gBAC9C,KAAK,EAAE,eAAe,CAAC,WAAW,EAAE,iBAAiB,CAAC;gBACtD,2BAA2B,EAAE,KAAK;gBAClC,cAAc,EAAE,IAAI;aACpB,CAAC,CAAC;YAEH,MAAM,OAAO,GAAG,IAAI,YAAY,CAAC,IAAI,CAAC,CAAC;YACvC,MAAM,GAAG,GAAG,YAAY,CAAC,uBAAuB,CAAC,CAAC;YAElD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC;YAEvD,uEAAuE;YACvE,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;YAE3B,MAAM,UAAU,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,kBAAkB,CAAC,CAAC;YAC5E,MAAM,CAAC,EAAE,CAAC,UAAU,EAAE,wCAAwC,CAAC,CAAC;QACjE,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,8BAA8B,EAAE,GAAG,EAAE;QAC7C,EAAE,CAAC,2EAA2E,EAAE,KAAK,IAAI,EAAE;YAC1F,MAAM,SAAS,GAAG,eAAe,CAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC;YAClE,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,eAAe,EAAE,UAAU,EAAE,GAAG,cAAc,CAAC;gBAC3E,KAAK,EAAE,eAAe,CAAC,WAAW,EAAE,qBAAqB,CAAC;gBAC1D,2BAA2B,EAAE,KAAK;gBAClC,cAAc,EAAE,IAAI;gBACpB,eAAe,EAAE,CAAC,QAAgB,EAAE,OAAe,EAAE,EAAE;oBACtD,IAAI,QAAQ,KAAK,WAAW,IAAI,OAAO,KAAK,iBAAiB;wBAAE,OAAO,SAAS,CAAC;oBAChF,OAAO,SAAS,CAAC;gBAClB,CAAC;aACD,CAAC,CAAC;YAEH,MAAM,OAAO,GAAG,IAAI,YAAY,CAAC,IAAI,CAAC,CAAC;YACvC,MAAM,GAAG,GAAG,YAAY,CAAC,oDAAoD,CAAC,CAAC;YAE/E,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC;YAEvD,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,EAAE,8BAA8B,CAAC,CAAC;YAE3D,kDAAkD;YAClD,MAAM,aAAa,GAAI,IAAI,CAAC,KAAK,CAAC,QAAgB,CAAC,IAAI,CAAC,KAAK,CAAC;YAC9D,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;YACtC,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,iBAAiB,CAAC,CAAC;YAElE,0CAA0C;YAC1C,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;YAEnD,oEAAoE;YACpE,MAAM,WAAW,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,0BAA0B,CAAC,CAAC;YACrF,MAAM,CAAC,EAAE,CAAC,WAAW,EAAE,uDAAuD,CAAC,CAAC;YAChF,MAAM,CAAC,EAAE,CAAC,WAAY,CAAC,MAAM,CAAC,QAAQ,CAAC,wBAAwB,CAAC,EAAE,oCAAoC,WAAY,CAAC,MAAM,EAAE,CAAC,CAAC;QAC9H,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,oEAAoE,EAAE,KAAK,IAAI,EAAE;YACnF,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,GAAG,cAAc,CAAC;gBAC9C,KAAK,EAAE,eAAe,CAAC,WAAW,EAAE,qBAAqB,CAAC;gBAC1D,2BAA2B,EAAE,KAAK;gBAClC,cAAc,EAAE,IAAI;gBACpB,eAAe,EAAE,GAAG,EAAE,CAAC,SAAS,EAAE,uBAAuB;aACzD,CAAC,CAAC;YAEH,MAAM,OAAO,GAAG,IAAI,YAAY,CAAC,IAAI,CAAC,CAAC;YACvC,MAAM,GAAG,GAAG,YAAY,CAAC,oDAAoD,CAAC,CAAC;YAE/E,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC;YAEvD,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;YAC5B,MAAM,cAAc,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,0BAA0B,CAAC,CAAC;YACxF,MAAM,CAAC,EAAE,CAAC,cAAc,EAAE,+DAA+D,CAAC,CAAC;QAC5F,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,gDAAgD,EAAE,KAAK,IAAI,EAAE;YAC/D,qEAAqE;YACrE,gEAAgE;YAChE,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,GAAG,cAAc,CAAC;gBAC9C,KAAK,EAAE,eAAe,CAAC,WAAW,EAAE,iBAAiB,CAAC;gBACtD,2BAA2B,EAAE,KAAK;gBAClC,cAAc,EAAE,IAAI;aACpB,CAAC,CAAC;YAEH,MAAM,OAAO,GAAG,IAAI,YAAY,CAAC,IAAI,CAAC,CAAC;YACvC,MAAM,GAAG,GAAG,YAAY,CAAC,oDAAoD,CAAC,CAAC;YAE/E,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC;YAEvD,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;YAC5B,MAAM,cAAc,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,0BAA0B,CAAC,CAAC;YACxF,MAAM,CAAC,EAAE,CAAC,cAAc,CAAC,CAAC;YAE1B,mCAAmC;YACnC,MAAM,WAAW,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,0BAA0B,CAAC,CAAC;YACrF,MAAM,CAAC,KAAK,CAAC,WAAW,EAAE,SAAS,EAAE,uCAAuC,CAAC,CAAC;QAC/E,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;QACnC,EAAE,CAAC,mEAAmE,EAAE,KAAK,IAAI,EAAE;YAClF,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,UAAU,EAAE,GAAG,cAAc,CAAC;gBAC1D,2BAA2B,EAAE,IAAI;aACjC,CAAC,CAAC;YAEH,MAAM,OAAO,GAAG,IAAI,YAAY,CAAC,IAAI,CAAC,CAAC;YACvC,MAAM,GAAG,GAAG,YAAY,CAAC,uBAAuB,CAAC,CAAC;YAElD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC;YACvD,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,EAAE,2BAA2B,CAAC,CAAC;YAExD,OAAO,CAAC,UAAU,EAAE,CAAC;YACrB,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;YAExD,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,wDAAwD,CAAC,CAAC;YACxG,MAAM,SAAS,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,gBAAgB,CAAC,CAAC;YAC3E,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,8DAA8D,CAAC,CAAC;YAClG,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,iBAAiB,CAAC,CAAC;QAC3D,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;QACjC,EAAE,CAAC,uDAAuD,EAAE,GAAG,EAAE;YAChE,MAAM,EAAE,IAAI,EAAE,GAAG,cAAc,EAAE,CAAC;YAClC,MAAM,OAAO,GAAG,IAAI,YAAY,CAAC,IAAI,CAAC,CAAC;YACvC,MAAM,GAAG,GAAG,YAAY,CAAC,oDAAoD,CAAC,CAAC;YAC/E,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,CAAC;QACnD,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC","sourcesContent":["/*\n RetryHandler tests — long-context entitlement 429 error handling (#2803)\n \n Verifies that \"Extra usage is required for long context requests\" errors\n * are classified as quota_exhausted (not rate_limit) and trigger a model\n * downgrade from [1m] to base when no cross-provider fallback exists.\n */\n\nimport { describe, it, beforeEach, mock, type Mock } from \"node:test\";\nimport assert from \"node:assert/strict\";\nimport { RetryHandler, type RetryHandlerDeps } from \"./retry-handler.js\";\nimport type { Api, AssistantMessage, Model } from \"@gsd/pi-ai\";\nimport type { FallbackResolver } from \"./fallback-resolver.js\";\nimport type { ModelRegistry } from \"./model-registry.js\";\nimport type { SettingsManager } from \"./settings-manager.js\";\n\n// ─── Helpers ────────────────────────────────────────────────────────────────\n\nfunction createMockModel(provider: string, id: string): Model<Api> {\n\treturn {\n\t\tid,\n\t\tname: id,\n\t\tapi: \"anthropic\" as Api,\n\t\tprovider,\n\t\tbaseUrl: \"https://api.anthropic.com\",\n\t\treasoning: false,\n\t\tinput: [\"text\"],\n\t\tcost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },\n\t\tcontextWindow: 1_000_000,\n\t\tmaxTokens: 16384,\n\t} as Model<Api>;\n}\n\nfunction errorMessage(msg: string): AssistantMessage {\n\treturn {\n\t\trole: \"assistant\",\n\t\tcontent: [],\n\t\tapi: \"anthropic-messages\",\n\t\tprovider: \"anthropic\",\n\t\tmodel: \"claude-opus-4-6[1m]\",\n\t\tusage: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, totalTokens: 0, cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, total: 0 } },\n\t\tstopReason: \"error\",\n\t\terrorMessage: msg,\n\t\ttimestamp: Date.now(),\n\t} as AssistantMessage;\n}\n\ninterface MockDeps {\n\tdeps: RetryHandlerDeps;\n\temittedEvents: Array<Record<string, any>>;\n\tcontinueFn: Mock<() => Promise<void>>;\n\tonModelChangeFn: Mock<(model: Model<any>) => void>;\n\tmarkUsageLimitReached: Mock<(...args: any[]) => boolean>;\n\tfindFallback: Mock<(...args: any[]) => Promise<any>>;\n\tfindModel: Mock<(provider: string, modelId: string) => Model<Api> \| undefined>;\n}\n\nfunction createMockDeps(overrides?: {\n\tmodel?: Model<Api>;\n\tretryEnabled?: boolean;\n\tmarkUsageLimitReachedResult?: boolean;\n\tfallbackResult?: any;\n\tfindModelResult?: (provider: string, modelId: string) => Model<Api> \| undefined;\n\tretrySettings?: {\n\t\tmaxRetries?: number;\n\t\tbaseDelayMs?: number;\n\t\tmaxDelayMs?: number;\n\t};\n}): MockDeps {\n\tconst model = overrides?.model ?? createMockModel(\"anthropic\", \"claude-opus-4-6[1m]\");\n\tconst emittedEvents: Array<Record<string, any>> = [];\n\tconst continueFn = mock.fn(async () => {});\n\tconst onModelChangeFn = mock.fn((_model: Model<any>) => {});\n\tconst markUsageLimitReached = mock.fn(\n\t\t() => overrides?.markUsageLimitReachedResult ?? false,\n\t);\n\tconst findFallback = mock.fn(async () => overrides?.fallbackResult ?? null);\n\tconst findModel = mock.fn(\n\t\toverrides?.findModelResult ?? ((_provider: string, _modelId: string) => undefined),\n\t);\n\n\tconst messages: Array<{ role: string } & Record<string, any>> = [];\n\n\tconst deps: RetryHandlerDeps = {\n\t\tagent: {\n\t\t\tcontinue: continueFn,\n\t\t\tstate: { messages },\n\t\t\tsetModel: mock.fn(),\n\t\t\treplaceMessages: mock.fn((newMessages: any[]) => {\n\t\t\t\tmessages.length = 0;\n\t\t\t\tmessages.push(...newMessages);\n\t\t\t}),\n\t\t} as any,\n\t\tsettingsManager: {\n\t\t\tgetRetryEnabled: () => overrides?.retryEnabled ?? true,\n\t\t\tgetRetrySettings: () => ({\n\t\t\t\tenabled: overrides?.retryEnabled ?? true,\n\t\t\t\tmaxRetries: overrides?.retrySettings?.maxRetries ?? 5,\n\t\t\t\tbaseDelayMs: overrides?.retrySettings?.baseDelayMs ?? 1000,\n\t\t\t\tmaxDelayMs: overrides?.retrySettings?.maxDelayMs ?? 30000,\n\t\t\t}),\n\t\t} as unknown as SettingsManager,\n\t\tmodelRegistry: {\n\t\t\tauthStorage: {\n\t\t\t\tmarkUsageLimitReached,\n\t\t\t},\n\t\t\tfind: findModel,\n\t\t} as unknown as ModelRegistry,\n\t\tfallbackResolver: {\n\t\t\tfindFallback,\n\t\t} as unknown as FallbackResolver,\n\t\tgetModel: () => model,\n\t\tgetSessionId: () => \"test-session\",\n\t\temit: (event: any) => emittedEvents.push(event),\n\t\tonModelChange: onModelChangeFn,\n\t};\n\n\treturn { deps, emittedEvents, continueFn, onModelChangeFn, markUsageLimitReached, findFallback, findModel };\n}\n\n// ─── _classifyErrorType (tested via handleRetryableError behavior) ──────────\n\ndescribe(\"RetryHandler — long-context entitlement 429 (#2803)\", () => {\n\n\tdescribe(\"error classification\", () => {\n\t\tit(\"classifies 'Extra usage is required for long context requests' as quota_exhausted, not rate_limit\", async () => {\n\t\t\t// When the error is classified as quota_exhausted AND no alternate credentials\n\t\t\t// AND no fallback, the handler should emit fallback_chain_exhausted and stop.\n\t\t\t// If misclassified as rate_limit, it would enter the backoff loop instead.\n\t\t\tconst { deps, emittedEvents, findModel } = createMockDeps({\n\t\t\t\tmodel: createMockModel(\"anthropic\", \"claude-opus-4-6[1m]\"),\n\t\t\t\tmarkUsageLimitReachedResult: false, // no alternate credentials\n\t\t\t\tfallbackResult: null, // no cross-provider fallback\n\t\t\t\tfindModelResult: () => undefined, // no base model either\n\t\t\t});\n\n\t\t\tconst handler = new RetryHandler(deps);\n\t\t\tconst msg = errorMessage(\n\t\t\t\t'429 {\"type\":\"error\",\"error\":{\"type\":\"rate_limit_error\",\"message\":\"Extra usage is required for long context requests.\"}}'\n\t\t\t);\n\n\t\t\tconst result = await handler.handleRetryableError(msg);\n\n\t\t\t// Should NOT retry (would be true if misclassified as rate_limit entering backoff)\n\t\t\tassert.equal(result, false);\n\n\t\t\t// Should emit fallback_chain_exhausted (quota_exhausted path), NOT auto_retry_start (backoff path)\n\t\t\tconst chainExhausted = emittedEvents.find((e) => e.type === \"fallback_chain_exhausted\");\n\t\t\tassert.ok(chainExhausted, \"Expected fallback_chain_exhausted event for entitlement error\");\n\n\t\t\tconst retryStart = emittedEvents.find((e) => e.type === \"auto_retry_start\");\n\t\t\tassert.equal(retryStart, undefined, \"Should NOT emit auto_retry_start for entitlement error\");\n\t\t});\n\n\t\tit(\"still classifies regular 429 rate limits as rate_limit\", async () => {\n\t\t\t// A normal \"rate limit\" 429 should still be classified as rate_limit\n\t\t\tconst { deps, emittedEvents } = createMockDeps({\n\t\t\t\tmodel: createMockModel(\"anthropic\", \"claude-opus-4-6\"),\n\t\t\t\tmarkUsageLimitReachedResult: false,\n\t\t\t\tfallbackResult: null,\n\t\t\t});\n\n\t\t\tconst handler = new RetryHandler(deps);\n\t\t\tconst msg = errorMessage(\"429 Too Many Requests\");\n\n\t\t\tconst result = await handler.handleRetryableError(msg);\n\n\t\t\t// Should enter the backoff loop (rate_limit path, not quota_exhausted)\n\t\t\tassert.equal(result, true);\n\n\t\t\tconst retryStart = emittedEvents.find((e) => e.type === \"auto_retry_start\");\n\t\t\tassert.ok(retryStart, \"Regular 429 should enter backoff retry\");\n\t\t});\n\t});\n\n\tdescribe(\"long-context model downgrade\", () => {\n\t\tit(\"downgrades from [1m] to base model when entitlement error and no fallback\", async () => {\n\t\t\tconst baseModel = createMockModel(\"anthropic\", \"claude-opus-4-6\");\n\t\t\tconst { deps, emittedEvents, onModelChangeFn, continueFn } = createMockDeps({\n\t\t\t\tmodel: createMockModel(\"anthropic\", \"claude-opus-4-6[1m]\"),\n\t\t\t\tmarkUsageLimitReachedResult: false,\n\t\t\t\tfallbackResult: null,\n\t\t\t\tfindModelResult: (provider: string, modelId: string) => {\n\t\t\t\t\tif (provider === \"anthropic\" && modelId === \"claude-opus-4-6\") return baseModel;\n\t\t\t\t\treturn undefined;\n\t\t\t\t},\n\t\t\t});\n\n\t\t\tconst handler = new RetryHandler(deps);\n\t\t\tconst msg = errorMessage(\"Extra usage is required for long context requests.\");\n\n\t\t\tconst result = await handler.handleRetryableError(msg);\n\n\t\t\tassert.equal(result, true, \"Should retry after downgrade\");\n\n\t\t\t// Should have called setModel with the base model\n\t\t\tconst setModelCalls = (deps.agent.setModel as any).mock.calls;\n\t\t\tassert.equal(setModelCalls.length, 1);\n\t\t\tassert.equal(setModelCalls[0].arguments[0].id, \"claude-opus-4-6\");\n\n\t\t\t// Should have notified about model change\n\t\t\tassert.equal(onModelChangeFn.mock.calls.length, 1);\n\n\t\t\t// Should emit a fallback_provider_switch event indicating downgrade\n\t\t\tconst switchEvent = emittedEvents.find((e) => e.type === \"fallback_provider_switch\");\n\t\t\tassert.ok(switchEvent, \"Expected fallback_provider_switch event for downgrade\");\n\t\t\tassert.ok(switchEvent!.reason.includes(\"long context downgrade\"), `reason should mention downgrade: ${switchEvent!.reason}`);\n\t\t});\n\n\t\tit(\"emits fallback_chain_exhausted when base model is also unavailable\", async () => {\n\t\t\tconst { deps, emittedEvents } = createMockDeps({\n\t\t\t\tmodel: createMockModel(\"anthropic\", \"claude-opus-4-6[1m]\"),\n\t\t\t\tmarkUsageLimitReachedResult: false,\n\t\t\t\tfallbackResult: null,\n\t\t\t\tfindModelResult: () => undefined, // base model not found\n\t\t\t});\n\n\t\t\tconst handler = new RetryHandler(deps);\n\t\t\tconst msg = errorMessage(\"Extra usage is required for long context requests.\");\n\n\t\t\tconst result = await handler.handleRetryableError(msg);\n\n\t\t\tassert.equal(result, false);\n\t\t\tconst chainExhausted = emittedEvents.find((e) => e.type === \"fallback_chain_exhausted\");\n\t\t\tassert.ok(chainExhausted, \"Expected fallback_chain_exhausted when base model unavailable\");\n\t\t});\n\n\t\tit(\"does not attempt downgrade for non-[1m] models\", async () => {\n\t\t\t// When a regular model (no [1m] suffix) gets a quota_exhausted error\n\t\t\t// with no fallback, it should just stop — no downgrade attempt.\n\t\t\tconst { deps, emittedEvents } = createMockDeps({\n\t\t\t\tmodel: createMockModel(\"anthropic\", \"claude-opus-4-6\"),\n\t\t\t\tmarkUsageLimitReachedResult: false,\n\t\t\t\tfallbackResult: null,\n\t\t\t});\n\n\t\t\tconst handler = new RetryHandler(deps);\n\t\t\tconst msg = errorMessage(\"Extra usage is required for long context requests.\");\n\n\t\t\tconst result = await handler.handleRetryableError(msg);\n\n\t\t\tassert.equal(result, false);\n\t\t\tconst chainExhausted = emittedEvents.find((e) => e.type === \"fallback_chain_exhausted\");\n\t\t\tassert.ok(chainExhausted);\n\n\t\t\t// No downgrade switch should occur\n\t\t\tconst switchEvent = emittedEvents.find((e) => e.type === \"fallback_provider_switch\");\n\t\t\tassert.equal(switchEvent, undefined, \"Should not switch for non-[1m] models\");\n\t\t});\n\t});\n\n\tdescribe(\"retry cancellation\", () => {\n\t\tit(\"cancels queued immediate continue callbacks when retry is aborted\", async () => {\n\t\t\tconst { deps, emittedEvents, continueFn } = createMockDeps({\n\t\t\t\tmarkUsageLimitReachedResult: true,\n\t\t\t});\n\n\t\t\tconst handler = new RetryHandler(deps);\n\t\t\tconst msg = errorMessage(\"429 Too Many Requests\");\n\n\t\t\tconst result = await handler.handleRetryableError(msg);\n\t\t\tassert.equal(result, true, \"retry should be initiated\");\n\n\t\t\thandler.abortRetry();\n\t\t\tawait new Promise((resolve) => setTimeout(resolve, 10));\n\n\t\t\tassert.equal(continueFn.mock.calls.length, 0, \"cancelled retry must not continue after explicit abort\");\n\t\t\tconst endEvents = emittedEvents.filter((e) => e.type === \"auto_retry_end\");\n\t\t\tassert.equal(endEvents.length, 1, \"retry cancellation should emit a single auto_retry_end event\");\n\t\t\tassert.equal(endEvents[0]?.finalError, \"Retry cancelled\");\n\t\t});\n\t});\n\n\tdescribe(\"isRetryableError\", () => {\n\t\tit(\"considers long-context entitlement error as retryable\", () => {\n\t\t\tconst { deps } = createMockDeps();\n\t\t\tconst handler = new RetryHandler(deps);\n\t\t\tconst msg = errorMessage(\"Extra usage is required for long context requests.\");\n\t\t\tassert.equal(handler.isRetryableError(msg), true);\n\t\t});\n\t});\n});\n"]}

package/packages/pi-coding-agent/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@gsd/pi-coding-agent",
-  "version": "2.61.0",
+  "version": "2.62.0",
   "description": "Coding agent CLI (vendored from pi-mono)",
   "type": "module",
   "piConfig": {

package/packages/pi-coding-agent/src/core/agent-session-model-switch.test.ts ADDED Viewed

@@ -0,0 +1,21 @@
+import test from "node:test";
+import assert from "node:assert/strict";
+import { readFileSync } from "node:fs";
+import { join } from "node:path";
+const source = readFileSync(join(process.cwd(), "packages/pi-coding-agent/src/core/agent-session.ts"), "utf-8");
+test("agent-session: explicit model switches cancel retry before applying new model", () => {
+	const start = source.indexOf("private async _applyModelChange(");
+	assert.ok(start >= 0, "missing _applyModelChange");
+	const window = source.slice(start, start + 900);
+	const abortIdx = window.indexOf("this._retryHandler.abortRetry();");
+	const setModelIdx = window.indexOf("this.agent.setModel(model);");
+	assert.ok(abortIdx >= 0, "_applyModelChange should cancel any in-flight retry");
+	assert.ok(setModelIdx >= 0, "_applyModelChange should set the new model");
+	assert.ok(
+		abortIdx < setModelIdx,
+		"retry cancellation must happen before applying the new model to prevent stale provider retries",
+	);
+});

package/packages/pi-coding-agent/src/core/agent-session.ts CHANGED Viewed

@@ -1633,6 +1633,10 @@ export class AgentSession {
 		options?: { persist?: boolean },
 	): Promise<void> {
 		const previousModel = this.model;
+		// Explicit model switches must cancel any in-flight retry loop from the
+		// previous provider/model. Otherwise stale provider backoff errors can
+		// continue to land after the user or runtime has already switched models.
+		this._retryHandler.abortRetry();
 		this.agent.setModel(model);
 		this.sessionManager.appendModelChange(model.provider, model.id);
 		if (options?.persist !== false) {

package/packages/pi-coding-agent/src/core/retry-handler.test.ts CHANGED Viewed

@@ -61,6 +61,11 @@ function createMockDeps(overrides?: {
 	markUsageLimitReachedResult?: boolean;
 	fallbackResult?: any;
 	findModelResult?: (provider: string, modelId: string) => Model<Api> | undefined;
+	retrySettings?: {
+		maxRetries?: number;
+		baseDelayMs?: number;
+		maxDelayMs?: number;
+	};
 }): MockDeps {
 	const model = overrides?.model ?? createMockModel("anthropic", "claude-opus-4-6[1m]");
 	const emittedEvents: Array<Record<string, any>> = [];
@@ -90,9 +95,9 @@ function createMockDeps(overrides?: {
 			getRetryEnabled: () => overrides?.retryEnabled ?? true,
 			getRetrySettings: () => ({
 				enabled: overrides?.retryEnabled ?? true,
-				maxRetries: 5,
-				baseDelayMs: 1000,
-				maxDelayMs: 30000,
+				maxRetries: overrides?.retrySettings?.maxRetries ?? 5,
+				baseDelayMs: overrides?.retrySettings?.baseDelayMs ?? 1000,
+				maxDelayMs: overrides?.retrySettings?.maxDelayMs ?? 30000,
 			}),
 		} as unknown as SettingsManager,
 		modelRegistry: {
@@ -244,6 +249,28 @@ describe("RetryHandler — long-context entitlement 429 (#2803)", () => {
 		});
 	});
+	describe("retry cancellation", () => {
+		it("cancels queued immediate continue callbacks when retry is aborted", async () => {
+			const { deps, emittedEvents, continueFn } = createMockDeps({
+				markUsageLimitReachedResult: true,
+			});
+			const handler = new RetryHandler(deps);
+			const msg = errorMessage("429 Too Many Requests");
+			const result = await handler.handleRetryableError(msg);
+			assert.equal(result, true, "retry should be initiated");
+			handler.abortRetry();
+			await new Promise((resolve) => setTimeout(resolve, 10));
+			assert.equal(continueFn.mock.calls.length, 0, "cancelled retry must not continue after explicit abort");
+			const endEvents = emittedEvents.filter((e) => e.type === "auto_retry_end");
+			assert.equal(endEvents.length, 1, "retry cancellation should emit a single auto_retry_end event");
+			assert.equal(endEvents[0]?.finalError, "Retry cancelled");
+		});
+	});
 	describe("isRetryableError", () => {
 		it("considers long-context entitlement error as retryable", () => {
 			const { deps } = createMockDeps();