@mariozechner/pi-coding-agent 0.62.0 → 0.63.0

package/dist/core/agent-session.js

@@ -134,6 +134,23 @@ export class AgentSession {
     get modelRegistry() {
         return this._modelRegistry;
     }
+    async _getRequiredRequestAuth(model) {
+        const result = await this._modelRegistry.getApiKeyAndHeaders(model);
+        if (!result.ok) {
+            throw new Error(result.error);
+        }
+        if (result.apiKey) {
+            return { apiKey: result.apiKey, headers: result.headers };
+        }
+        const isOAuth = this._modelRegistry.isUsingOAuth(model);
+        if (isOAuth) {
+            throw new Error(`Authentication failed for "${model.provider}". ` +
+                `Credentials may have expired or network is unavailable. ` +
+                `Run '/login ${model.provider}' to re-authenticate.`);
+        }
+        throw new Error(`No API key found for ${model.provider}.\n\n` +
+            `Use /login or set an API key environment variable. See ${join(getDocsPath(), "providers.md")}`);
+    }
     /**
      * Install tool hooks once on the Agent instance.
      *
@@ -686,9 +703,7 @@ export class AgentSession {
                 `Use /login or set an API key environment variable. See ${join(getDocsPath(), "providers.md")}\n\n` +
                 "Then use /model to select a model.");
         }
-        // Validate API key
-        const apiKey = await this._modelRegistry.getApiKey(this.model);
-        if (!apiKey) {
+        if (!this._modelRegistry.hasConfiguredAuth(this.model)) {
             const isOAuth = this._modelRegistry.isUsingOAuth(this.model);
             if (isOAuth) {
                 throw new Error(`Authentication failed for "${this.model.provider}". ` +
@@ -1065,12 +1080,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 that auth is configured, saves to session and settings.
+     * @throws Error if no auth is configured for the model
      */
     async setModel(model) {
-        const apiKey = await this._modelRegistry.getApiKey(model);
-        if (!apiKey) {
+        if (!this._modelRegistry.hasConfiguredAuth(model)) {
             throw new Error(`No API key for ${model.provider}/${model.id}`);
         }
         const previousModel = this.model;
@@ -1094,27 +1108,11 @@ export class AgentSession {
         }
         return this._cycleAvailableModel(direction);
     }
-    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);
-                apiKeysByProvider.set(provider, apiKey);
-            }
-            if (apiKey) {
-                result.push(scoped);
-            }
-        }
-        return result;
+    _getScopedModelsWithAuth() {
+        return this._scopedModels.filter((scoped) => this._modelRegistry.hasConfiguredAuth(scoped.model));
     }
     async _cycleScopedModel(direction) {
-        const scopedModels = await this._getScopedModelsWithApiKey();
+        const scopedModels = this._getScopedModelsWithAuth();
         if (scopedModels.length <= 1)
             return undefined;
         const currentModel = this.model;
@@ -1148,10 +1146,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);
-        if (!apiKey) {
-            throw new Error(`No API key for ${nextModel.provider}/${nextModel.id}`);
-        }
         const thinkingLevel = this._getThinkingLevelForModelSwitch();
         this.agent.setModel(nextModel);
         this.sessionManager.appendModelChange(nextModel.provider, nextModel.id);
@@ -1280,10 +1274,7 @@ export class AgentSession {
             if (!this.model) {
                 throw new Error("No model selected");
             }
-            const apiKey = await this._modelRegistry.getApiKey(this.model);
-            if (!apiKey) {
-                throw new Error(`No API key for ${this.model.provider}`);
-            }
+            const { apiKey, headers } = await this._getRequiredRequestAuth(this.model);
             const pathEntries = this.sessionManager.getBranch();
             const settings = this.settingsManager.getCompactionSettings();
             const preparation = prepareCompaction(pathEntries, settings);
@@ -1326,7 +1317,7 @@ export class AgentSession {
             }
             else {
                 // Generate compaction result
-                const result = await compact(preparation, this.model, apiKey, customInstructions, this._compactionAbortController.signal);
+                const result = await compact(preparation, this.model, apiKey, headers, customInstructions, this._compactionAbortController.signal);
                 summary = result.summary;
                 firstKeptEntryId = result.firstKeptEntryId;
                 tokensBefore = result.tokensBefore;
@@ -1466,11 +1457,12 @@ export class AgentSession {
                 this._emit({ type: "auto_compaction_end", result: undefined, aborted: false, willRetry: false });
                 return;
             }
-            const apiKey = await this._modelRegistry.getApiKey(this.model);
-            if (!apiKey) {
+            const authResult = await this._modelRegistry.getApiKeyAndHeaders(this.model);
+            if (!authResult.ok || !authResult.apiKey) {
                 this._emit({ type: "auto_compaction_end", result: undefined, aborted: false, willRetry: false });
                 return;
             }
+            const { apiKey, headers } = authResult;
             const pathEntries = this.sessionManager.getBranch();
             const preparation = prepareCompaction(pathEntries, settings);
             if (!preparation) {
@@ -1509,7 +1501,7 @@ export class AgentSession {
             }
             else {
                 // Generate compaction result
-                const compactResult = await compact(preparation, this.model, apiKey, undefined, this._autoCompactionAbortController.signal);
+                const compactResult = await compact(preparation, this.model, apiKey, headers, undefined, this._autoCompactionAbortController.signal);
                 summary = compactResult.summary;
                 firstKeptEntryId = compactResult.firstKeptEntryId;
                 tokensBefore = compactResult.tokensBefore;
@@ -1720,8 +1712,7 @@ export class AgentSession {
             refreshTools: () => this._refreshToolRegistry(),
             getCommands,
             setModel: async (model) => {
-                const key = await this.modelRegistry.getApiKey(model);
-                if (!key)
+                if (!this.modelRegistry.hasConfiguredAuth(model))
                     return false;
                 await this.setModel(model);
                 return true;
@@ -2302,14 +2293,12 @@ export class AgentSession {
         let summaryDetails;
         if (options.summarize && entriesToSummarize.length > 0 && !extensionSummary) {
             const model = this.model;
-            const apiKey = await this._modelRegistry.getApiKey(model);
-            if (!apiKey) {
-                throw new Error(`No API key for ${model.provider}`);
-            }
+            const { apiKey, headers } = await this._getRequiredRequestAuth(model);
             const branchSummarySettings = this.settingsManager.getBranchSummarySettings();
             const result = await generateBranchSummary(entriesToSummarize, {
                 model,
                 apiKey,
+                headers,
                 signal: this._branchSummaryAbortController.signal,
                 customInstructions,
                 replaceInstructions,
@@ -2466,6 +2455,7 @@ export class AgentSession {
                 total: totalInput + totalOutput + totalCacheRead + totalCacheWrite,
             },
             cost: totalCost,
+            contextUsage: this.getContextUsage(),
         };
     }
     getContextUsage() {