@codex-infinity/pi-infinity 0.62.3 → 0.63.3

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.
      *
@@ -674,9 +691,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}". ` +
@@ -1053,12 +1068,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;
@@ -1082,27 +1096,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;
@@ -1136,10 +1134,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);
@@ -1264,14 +1258,12 @@ export class AgentSession {
         this._disconnectFromAgent();
         await this.abort();
         this._compactionAbortController = new AbortController();
+        this._emit({ type: "compaction_start", reason: "manual" });
         try {
             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);
@@ -1314,7 +1306,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;
@@ -1336,12 +1328,33 @@ export class AgentSession {
                     fromExtension,
                 });
             }
-            return {
+            const compactionResult = {
                 summary,
                 firstKeptEntryId,
                 tokensBefore,
                 details,
             };
+            this._emit({
+                type: "compaction_end",
+                reason: "manual",
+                result: compactionResult,
+                aborted: false,
+                willRetry: false,
+            });
+            return compactionResult;
+        }
+        catch (error) {
+            const message = error instanceof Error ? error.message : String(error);
+            const aborted = message === "Compaction cancelled" || (error instanceof Error && error.name === "AbortError");
+            this._emit({
+                type: "compaction_end",
+                reason: "manual",
+                result: undefined,
+                aborted,
+                willRetry: false,
+                errorMessage: aborted ? undefined : `Compaction failed: ${message}`,
+            });
+            throw error;
         }
         finally {
             this._compactionAbortController = undefined;
@@ -1397,7 +1410,8 @@ export class AgentSession {
         if (sameModel && isContextOverflow(assistantMessage, contextWindow)) {
             if (this._overflowRecoveryAttempted) {
                 this._emit({
-                    type: "auto_compaction_end",
+                    type: "compaction_end",
+                    reason: "overflow",
                     result: undefined,
                     aborted: false,
                     willRetry: false,
@@ -1447,22 +1461,41 @@ export class AgentSession {
      */
     async _runAutoCompaction(reason, willRetry) {
         const settings = this.settingsManager.getCompactionSettings();
-        this._emit({ type: "auto_compaction_start", reason });
+        this._emit({ type: "compaction_start", reason });
         this._autoCompactionAbortController = new AbortController();
         try {
             if (!this.model) {
-                this._emit({ type: "auto_compaction_end", result: undefined, aborted: false, willRetry: false });
+                this._emit({
+                    type: "compaction_end",
+                    reason,
+                    result: undefined,
+                    aborted: false,
+                    willRetry: false,
+                });
                 return;
             }
-            const apiKey = await this._modelRegistry.getApiKey(this.model);
-            if (!apiKey) {
-                this._emit({ type: "auto_compaction_end", result: undefined, aborted: false, willRetry: false });
+            const authResult = await this._modelRegistry.getApiKeyAndHeaders(this.model);
+            if (!authResult.ok || !authResult.apiKey) {
+                this._emit({
+                    type: "compaction_end",
+                    reason,
+                    result: undefined,
+                    aborted: false,
+                    willRetry: false,
+                });
                 return;
             }
+            const { apiKey, headers } = authResult;
             const pathEntries = this.sessionManager.getBranch();
             const preparation = prepareCompaction(pathEntries, settings);
             if (!preparation) {
-                this._emit({ type: "auto_compaction_end", result: undefined, aborted: false, willRetry: false });
+                this._emit({
+                    type: "compaction_end",
+                    reason,
+                    result: undefined,
+                    aborted: false,
+                    willRetry: false,
+                });
                 return;
             }
             let extensionCompaction;
@@ -1476,7 +1509,13 @@ export class AgentSession {
                     signal: this._autoCompactionAbortController.signal,
                 }));
                 if (extensionResult?.cancel) {
-                    this._emit({ type: "auto_compaction_end", result: undefined, aborted: true, willRetry: false });
+                    this._emit({
+                        type: "compaction_end",
+                        reason,
+                        result: undefined,
+                        aborted: true,
+                        willRetry: false,
+                    });
                     return;
                 }
                 if (extensionResult?.compaction) {
@@ -1497,14 +1536,20 @@ 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;
                 details = compactResult.details;
             }
             if (this._autoCompactionAbortController.signal.aborted) {
-                this._emit({ type: "auto_compaction_end", result: undefined, aborted: true, willRetry: false });
+                this._emit({
+                    type: "compaction_end",
+                    reason,
+                    result: undefined,
+                    aborted: true,
+                    willRetry: false,
+                });
                 return;
             }
             this.sessionManager.appendCompaction(summary, firstKeptEntryId, tokensBefore, details, fromExtension);
@@ -1526,7 +1571,7 @@ export class AgentSession {
                 tokensBefore,
                 details,
             };
-            this._emit({ type: "auto_compaction_end", result, aborted: false, willRetry });
+            this._emit({ type: "compaction_end", reason, result, aborted: false, willRetry });
             if (willRetry) {
                 const messages = this.agent.state.messages;
                 const lastMsg = messages[messages.length - 1];
@@ -1548,7 +1593,8 @@ export class AgentSession {
         catch (error) {
             const errorMessage = error instanceof Error ? error.message : "compaction failed";
             this._emit({
-                type: "auto_compaction_end",
+                type: "compaction_end",
+                reason,
                 result: undefined,
                 aborted: false,
                 willRetry: false,
@@ -1708,8 +1754,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;
@@ -1719,6 +1764,7 @@ export class AgentSession {
         }, {
             getModel: () => this.model,
             isIdle: () => !this.isStreaming,
+            getSignal: () => this.agent.signal,
             abort: () => this.abort(),
             hasPendingMessages: () => this.pendingMessageCount > 0,
             shutdown: () => {
@@ -2328,14 +2374,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,