gsd-pi 2.10.2 → 2.10.5

package/node_modules/@gsd/pi-coding-agent/dist/core/agent-session.js

@@ -608,7 +608,7 @@ export class AgentSession {
                 "Then use /model to select a model.");
         }
         // Validate API key
-        const apiKey = await this._modelRegistry.getApiKey(this.model);
+        const apiKey = await this._modelRegistry.getApiKey(this.model, this.sessionId);
         if (!apiKey) {
             const isOAuth = this._modelRegistry.isUsingOAuth(this.model);
             if (isOAuth) {
@@ -989,7 +989,7 @@ export class AgentSession {
      * @throws Error if no API key available for the model
      */
     async setModel(model, options) {
-        const apiKey = await this._modelRegistry.getApiKey(model);
+        const apiKey = await this._modelRegistry.getApiKey(model, this.sessionId);
         if (!apiKey) {
             throw new Error(`No API key for ${model.provider}/${model.id}`);
         }
@@ -1026,7 +1026,7 @@ export class AgentSession {
                 apiKey = apiKeysByProvider.get(provider);
             }
             else {
-                apiKey = await this._modelRegistry.getApiKeyForProvider(provider);
+                apiKey = await this._modelRegistry.getApiKeyForProvider(provider, this.sessionId);
                 apiKeysByProvider.set(provider, apiKey);
             }
             if (apiKey) {
@@ -1072,7 +1072,7 @@ export class AgentSession {
         const len = availableModels.length;
         const nextIndex = direction === "forward" ? (currentIndex + 1) % len : (currentIndex - 1 + len) % len;
         const nextModel = availableModels[nextIndex];
-        const apiKey = await this._modelRegistry.getApiKey(nextModel);
+        const apiKey = await this._modelRegistry.getApiKey(nextModel, this.sessionId);
         if (!apiKey) {
             throw new Error(`No API key for ${nextModel.provider}/${nextModel.id}`);
         }
@@ -1206,7 +1206,7 @@ export class AgentSession {
             if (!this.model) {
                 throw new Error("No model selected");
             }
-            const apiKey = await this._modelRegistry.getApiKey(this.model);
+            const apiKey = await this._modelRegistry.getApiKey(this.model, this.sessionId);
             if (!apiKey) {
                 throw new Error(`No API key for ${this.model.provider}`);
             }
@@ -1392,7 +1392,7 @@ export class AgentSession {
                 this._emit({ type: "auto_compaction_end", result: undefined, aborted: false, willRetry: false });
                 return;
             }
-            const apiKey = await this._modelRegistry.getApiKey(this.model);
+            const apiKey = await this._modelRegistry.getApiKey(this.model, this.sessionId);
             if (!apiKey) {
                 this._emit({ type: "auto_compaction_end", result: undefined, aborted: false, willRetry: false });
                 return;
@@ -1647,7 +1647,7 @@ export class AgentSession {
             refreshTools: () => this._refreshToolRegistry(),
             getCommands,
             setModel: async (model, options) => {
-                const key = await this.modelRegistry.getApiKey(model);
+                const key = await this.modelRegistry.getApiKey(model, this.sessionId);
                 if (!key)
                     return false;
                 await this.setModel(model, options);
@@ -1737,7 +1737,14 @@ export class AgentSession {
             ? this._baseToolsOverride
             : createAllTools(this._cwd, {
                 read: { autoResizeImages },
-                bash: { commandPrefix: shellCommandPrefix },
+                bash: {
+                    commandPrefix: shellCommandPrefix,
+                    interceptor: {
+                        enabled: this.settingsManager.getBashInterceptorEnabled(),
+                        rules: this.settingsManager.getBashInterceptorRules(),
+                    },
+                    availableToolNames: () => this.getActiveToolNames(),
+                },
             });
         this._baseToolRegistry = new Map(Object.entries(baseTools).map(([name, tool]) => [name, tool]));
         const extensionsResult = this._resourceLoader.getExtensions();
@@ -1806,8 +1813,23 @@ export class AgentSession {
         // Match: overloaded_error, rate limit, 429, 500, 502, 503, 504, service unavailable, connection errors, fetch failed, terminated, retry delay exceeded
         return /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/i.test(err);
     }
+    /**
+     * Classify an error message into a usage-limit error type for credential backoff.
+     */
+    _classifyErrorType(errorMessage) {
+        const err = errorMessage.toLowerCase();
+        if (/quota|billing|exceeded.*limit|usage.*limit/i.test(err))
+            return "quota_exhausted";
+        if (/rate.?limit|too many requests|429/i.test(err))
+            return "rate_limit";
+        if (/500|502|503|504|server.?error|internal.?error|service.?unavailable/i.test(err))
+            return "server_error";
+        return "unknown";
+    }
     /**
      * Handle retryable errors with exponential backoff.
+     * When multiple credentials are available, marks the failing credential
+     * as backed off and retries immediately with the next one.
      * @returns true if retry was initiated, false if max retries exceeded or disabled
      */
     async _handleRetryableError(message) {
@@ -1823,6 +1845,33 @@ export class AgentSession {
                 this._retryResolve = resolve;
             });
         }
+        // Try credential fallback before counting against retry budget.
+        // If another credential is available, switch to it and retry immediately.
+        if (this.model && message.errorMessage) {
+            const errorType = this._classifyErrorType(message.errorMessage);
+            const hasAlternate = this._modelRegistry.authStorage.markUsageLimitReached(this.model.provider, this.sessionId, { errorType });
+            if (hasAlternate) {
+                // Remove error message from agent state
+                const messages = this.agent.state.messages;
+                if (messages.length > 0 && messages[messages.length - 1].role === "assistant") {
+                    this.agent.replaceMessages(messages.slice(0, -1));
+                }
+                this._emit({
+                    type: "auto_retry_start",
+                    attempt: this._retryAttempt + 1,
+                    maxAttempts: settings.maxRetries,
+                    delayMs: 0,
+                    errorMessage: `${message.errorMessage} (switching credential)`,
+                });
+                // Retry immediately with the next credential - don't increment _retryAttempt
+                setTimeout(() => {
+                    this.agent.continue().catch(() => {
+                        // Retry failed - will be caught by next agent_end
+                    });
+                }, 0);
+                return true;
+            }
+        }
         this._retryAttempt++;
         if (this._retryAttempt > settings.maxRetries) {
             // Max retries exceeded, emit final failure and reset
@@ -2203,7 +2252,7 @@ export class AgentSession {
         let summaryDetails;
         if (options.summarize && entriesToSummarize.length > 0 && !extensionSummary) {
             const model = this.model;
-            const apiKey = await this._modelRegistry.getApiKey(model);
+            const apiKey = await this._modelRegistry.getApiKey(model, this.sessionId);
             if (!apiKey) {
                 throw new Error(`No API key for ${model.provider}`);
             }