gsd-pi 2.43.0-next.8 → 2.44.0-dev.0b97ffd

package/packages/pi-coding-agent/dist/core/agent-session.js

@@ -753,9 +753,8 @@ export class AgentSession {
                 reason: `Restored from ${previousProvider}`,
             });
         }
-        // Validate API key
-        const apiKey = await this._modelRegistry.getApiKey(this.model, this.sessionId);
-        if (!apiKey) {
+        // Validate provider readiness
+        if (!this._modelRegistry.isProviderRequestReady(this.model.provider)) {
             const isOAuth = this._modelRegistry.isUsingOAuth(this.model);
             if (isOAuth) {
                 throw new Error(`Authentication failed for "${this.model.provider}". ` +
@@ -1230,12 +1229,11 @@ export class AgentSession {
     }
     /**
      * Set model directly.
-     * Validates API key, saves to session and settings.
-     * @throws Error if no API key available for the model
+     * Validates provider readiness, saves to session and settings.
+     * @throws Error if provider is not ready (missing credentials for apiKey/oauth providers)
      */
     async setModel(model, options) {
-        const apiKey = await this._modelRegistry.getApiKey(model, this.sessionId);
-        if (!apiKey) {
+        if (!this._modelRegistry.isProviderRequestReady(model.provider)) {
             throw new Error(`No API key for ${model.provider}/${model.id}`);
         }
         const thinkingLevel = this._getThinkingLevelForModelSwitch();
@@ -1253,27 +1251,11 @@ export class AgentSession {
         }
         return this._cycleAvailableModel(direction, options);
     }
-    async _getScopedModelsWithApiKey() {
-        const apiKeysByProvider = new Map();
-        const result = [];
-        for (const scoped of this._scopedModels) {
-            const provider = scoped.model.provider;
-            let apiKey;
-            if (apiKeysByProvider.has(provider)) {
-                apiKey = apiKeysByProvider.get(provider);
-            }
-            else {
-                apiKey = await this._modelRegistry.getApiKeyForProvider(provider, this.sessionId);
-                apiKeysByProvider.set(provider, apiKey);
-            }
-            if (apiKey) {
-                result.push(scoped);
-            }
-        }
-        return result;
+    _getReadyScopedModels() {
+        return this._scopedModels.filter((scoped) => this._modelRegistry.isProviderRequestReady(scoped.model.provider));
     }
     async _cycleScopedModel(direction, options) {
-        const scopedModels = await this._getScopedModelsWithApiKey();
+        const scopedModels = this._getReadyScopedModels();
         if (scopedModels.length <= 1)
             return undefined;
         const currentModel = this.model;
@@ -1300,10 +1282,6 @@ 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, this.sessionId);
-        if (!apiKey) {
-            throw new Error(`No API key for ${nextModel.provider}/${nextModel.id}`);
-        }
         const thinkingLevel = this._getThinkingLevelForModelSwitch();
         await this._applyModelChange(nextModel, thinkingLevel, "cycle", options);
         return { model: nextModel, thinkingLevel: this.thinkingLevel, isScoped: false };
@@ -1599,8 +1577,7 @@ export class AgentSession {
             refreshTools: () => this._refreshToolRegistry(),
             getCommands,
             setModel: async (model, options) => {
-                const key = await this.modelRegistry.getApiKey(model, this.sessionId);
-                if (!key)
+                if (!this.modelRegistry.isProviderRequestReady(model.provider))
                     return false;
                 await this.setModel(model, options);
                 return true;
@@ -2070,10 +2047,10 @@ export class AgentSession {
         let summaryDetails;
         if (options.summarize && entriesToSummarize.length > 0 && !extensionSummary) {
             const model = this.model;
-            const apiKey = await this._modelRegistry.getApiKey(model, this.sessionId);
-            if (!apiKey) {
+            if (!this._modelRegistry.isProviderRequestReady(model.provider)) {
                 throw new Error(`No API key for ${model.provider}`);
             }
+            const apiKey = await this._modelRegistry.getApiKey(model, this.sessionId);
             const branchSummarySettings = this.settingsManager.getBranchSummarySettings();
             const result = await generateBranchSummary(entriesToSummarize, {
                 model,