@codex-infinity/pi-infinity 0.63.2 → 0.64.1

package/dist/core/agent-session.js

@@ -160,7 +160,7 @@ export class AgentSession {
      * happens here instead of in wrappers.
      */
     _installAgentToolHooks() {
-        this.agent.setBeforeToolCall(async ({ toolCall, args }) => {
+        this.agent.beforeToolCall = async ({ toolCall, args }) => {
             const runner = this._extensionRunner;
             if (!runner?.hasHandlers("tool_call")) {
                 return undefined;
@@ -180,8 +180,8 @@ export class AgentSession {
                 }
                 throw new Error(`Extension failed, blocking execution: ${String(err)}`);
             }
-        });
-        this.agent.setAfterToolCall(async ({ toolCall, args, result, isError }) => {
+        };
+        this.agent.afterToolCall = async ({ toolCall, args, result, isError }) => {
             const runner = this._extensionRunner;
             if (!runner?.hasHandlers("tool_result")) {
                 return undefined;
@@ -202,7 +202,7 @@ export class AgentSession {
                 content: hookResult.content,
                 details: hookResult.details,
             };
-        });
+        };
     }
     // =========================================================================
     // Event Subscription
@@ -213,6 +213,13 @@ export class AgentSession {
             l(event);
         }
     }
+    _emitQueueUpdate() {
+        this._emit({
+            type: "queue_update",
+            steering: [...this._steeringMessages],
+            followUp: [...this._followUpMessages],
+        });
+    }
     _createRetryPromiseForAgentEnd(event) {
         if (event.type !== "agent_end" || this._retryPromise) {
             return;
@@ -249,12 +256,14 @@ export class AgentSession {
                 const steeringIndex = this._steeringMessages.indexOf(messageText);
                 if (steeringIndex !== -1) {
                     this._steeringMessages.splice(steeringIndex, 1);
+                    this._emitQueueUpdate();
                 }
                 else {
                     // Check follow-up queue
                     const followUpIndex = this._followUpMessages.indexOf(messageText);
                     if (followUpIndex !== -1) {
                         this._followUpMessages.splice(followUpIndex, 1);
+                        this._emitQueueUpdate();
                     }
                 }
             }
@@ -529,10 +538,10 @@ export class AgentSession {
                 validToolNames.push(name);
             }
         }
-        this.agent.setTools(tools);
+        this.agent.state.tools = tools;
         // Rebuild base system prompt with new tool set
         this._baseSystemPrompt = this._rebuildSystemPrompt(validToolNames);
-        this.agent.setSystemPrompt(this._baseSystemPrompt);
+        this.agent.state.systemPrompt = this._baseSystemPrompt;
     }
     /** Whether compaction or branch summarization is currently running */
     get isCompacting() {
@@ -546,11 +555,11 @@ export class AgentSession {
     }
     /** Current steering mode */
     get steeringMode() {
-        return this.agent.getSteeringMode();
+        return this.agent.steeringMode;
     }
     /** Current follow-up mode */
     get followUpMode() {
-        return this.agent.getFollowUpMode();
+        return this.agent.followUpMode;
     }
     /** Current session file path, or undefined if sessions are disabled */
     get sessionFile() {
@@ -741,11 +750,11 @@ export class AgentSession {
             }
             // Apply extension-modified system prompt, or reset to base
             if (result?.systemPrompt) {
-                this.agent.setSystemPrompt(result.systemPrompt);
+                this.agent.state.systemPrompt = result.systemPrompt;
             }
             else {
                 // Ensure we're using the base prompt (in case previous turn had modifications)
-                this.agent.setSystemPrompt(this._baseSystemPrompt);
+                this.agent.state.systemPrompt = this._baseSystemPrompt;
             }
         }
         await this.agent.prompt(messages);
@@ -850,6 +859,7 @@ export class AgentSession {
      */
     async _queueSteer(text, images) {
         this._steeringMessages.push(text);
+        this._emitQueueUpdate();
         const content = [{ type: "text", text }];
         if (images) {
             content.push(...images);
@@ -865,6 +875,7 @@ export class AgentSession {
      */
     async _queueFollowUp(text, images) {
         this._followUpMessages.push(text);
+        this._emitQueueUpdate();
         const content = [{ type: "text", text }];
         if (images) {
             content.push(...images);
@@ -924,7 +935,7 @@ export class AgentSession {
             await this.agent.prompt(appMessage);
         }
         else {
-            this.agent.appendMessage(appMessage);
+            this.agent.state.messages.push(appMessage);
             this.sessionManager.appendCustomMessageEntry(message.customType, message.content, message.display, message.details);
             this._emit({ type: "message_start", message: appMessage });
             this._emit({ type: "message_end", message: appMessage });
@@ -978,6 +989,7 @@ export class AgentSession {
         this._steeringMessages = [];
         this._followUpMessages = [];
         this.agent.clearAllQueues();
+        this._emitQueueUpdate();
         return { steering, followUp };
     }
     /** Number of pending messages (includes both steering and follow-up) */
@@ -1037,7 +1049,7 @@ export class AgentSession {
             await options.setup(this.sessionManager);
             // Sync agent state with session manager after setup
             const sessionContext = this.sessionManager.buildSessionContext();
-            this.agent.replaceMessages(sessionContext.messages);
+            this.agent.state.messages = sessionContext.messages;
         }
         this._reconnectToAgent();
         // Emit session_switch event with reason "new" to extensions
@@ -1077,7 +1089,7 @@ export class AgentSession {
         }
         const previousModel = this.model;
         const thinkingLevel = this._getThinkingLevelForModelSwitch();
-        this.agent.setModel(model);
+        this.agent.state.model = model;
         this.sessionManager.appendModelChange(model.provider, model.id);
         this.settingsManager.setDefaultModelAndProvider(model.provider, model.id);
         // Re-clamp thinking level for new model's capabilities
@@ -1112,7 +1124,7 @@ export class AgentSession {
         const next = scopedModels[nextIndex];
         const thinkingLevel = this._getThinkingLevelForModelSwitch(next.thinkingLevel);
         // Apply model
-        this.agent.setModel(next.model);
+        this.agent.state.model = next.model;
         this.sessionManager.appendModelChange(next.model.provider, next.model.id);
         this.settingsManager.setDefaultModelAndProvider(next.model.provider, next.model.id);
         // Apply thinking level.
@@ -1135,7 +1147,7 @@ export class AgentSession {
         const nextIndex = direction === "forward" ? (currentIndex + 1) % len : (currentIndex - 1 + len) % len;
         const nextModel = availableModels[nextIndex];
         const thinkingLevel = this._getThinkingLevelForModelSwitch();
-        this.agent.setModel(nextModel);
+        this.agent.state.model = nextModel;
         this.sessionManager.appendModelChange(nextModel.provider, nextModel.id);
         this.settingsManager.setDefaultModelAndProvider(nextModel.provider, nextModel.id);
         // Re-clamp thinking level for new model's capabilities
@@ -1156,7 +1168,7 @@ export class AgentSession {
         const effectiveLevel = availableLevels.includes(level) ? level : this._clampThinkingLevel(level, availableLevels);
         // Only persist if actually changing
         const isChanging = effectiveLevel !== this.agent.state.thinkingLevel;
-        this.agent.setThinkingLevel(effectiveLevel);
+        this.agent.state.thinkingLevel = effectiveLevel;
         if (isChanging) {
             this.sessionManager.appendThinkingLevelChange(effectiveLevel);
             if (this.supportsThinking() || effectiveLevel !== "off") {
@@ -1235,7 +1247,7 @@ export class AgentSession {
      * Saves to settings.
      */
     setSteeringMode(mode) {
-        this.agent.setSteeringMode(mode);
+        this.agent.steeringMode = mode;
         this.settingsManager.setSteeringMode(mode);
     }
     /**
@@ -1243,7 +1255,7 @@ export class AgentSession {
      * Saves to settings.
      */
     setFollowUpMode(mode) {
-        this.agent.setFollowUpMode(mode);
+        this.agent.followUpMode = mode;
         this.settingsManager.setFollowUpMode(mode);
     }
     // =========================================================================
@@ -1318,7 +1330,7 @@ export class AgentSession {
             this.sessionManager.appendCompaction(summary, firstKeptEntryId, tokensBefore, details, fromExtension);
             const newEntries = this.sessionManager.getEntries();
             const sessionContext = this.sessionManager.buildSessionContext();
-            this.agent.replaceMessages(sessionContext.messages);
+            this.agent.state.messages = sessionContext.messages;
             // Get the saved compaction entry for the extension event
             const savedCompactionEntry = newEntries.find((e) => e.type === "compaction" && e.summary === summary);
             if (this._extensionRunner && savedCompactionEntry) {
@@ -1424,7 +1436,7 @@ export class AgentSession {
             // but we don't want it in context for the retry)
             const messages = this.agent.state.messages;
             if (messages.length > 0 && messages[messages.length - 1].role === "assistant") {
-                this.agent.replaceMessages(messages.slice(0, -1));
+                this.agent.state.messages = messages.slice(0, -1);
             }
             await this._runAutoCompaction("overflow", true);
             return;
@@ -1555,7 +1567,7 @@ export class AgentSession {
             this.sessionManager.appendCompaction(summary, firstKeptEntryId, tokensBefore, details, fromExtension);
             const newEntries = this.sessionManager.getEntries();
             const sessionContext = this.sessionManager.buildSessionContext();
-            this.agent.replaceMessages(sessionContext.messages);
+            this.agent.state.messages = sessionContext.messages;
             // Get the saved compaction entry for the extension event
             const savedCompactionEntry = newEntries.find((e) => e.type === "compaction" && e.summary === summary);
             if (this._extensionRunner && savedCompactionEntry) {
@@ -1576,7 +1588,7 @@ export class AgentSession {
                 const messages = this.agent.state.messages;
                 const lastMsg = messages[messages.length - 1];
                 if (lastMsg?.role === "assistant" && lastMsg.stopReason === "error") {
-                    this.agent.replaceMessages(messages.slice(0, -1));
+                    this.agent.state.messages = messages.slice(0, -1);
                 }
                 setTimeout(() => {
                     this.agent.continue().catch(() => { });
@@ -1651,7 +1663,7 @@ export class AgentSession {
         };
         this._resourceLoader.extendResources(extensionPaths);
         this._baseSystemPrompt = this._rebuildSystemPrompt(this.getActiveToolNames());
-        this.agent.setSystemPrompt(this._baseSystemPrompt);
+        this.agent.state.systemPrompt = this._baseSystemPrompt;
     }
     buildExtensionResourcePaths(entries) {
         return entries.map((entry) => {
@@ -1693,7 +1705,7 @@ export class AgentSession {
         if (!refreshedModel || refreshedModel === currentModel) {
             return;
         }
-        this.agent.setModel(refreshedModel);
+        this.agent.state.model = refreshedModel;
     }
     _bindExtensionCore(runner) {
         const getCommands = () => {
@@ -1764,6 +1776,7 @@ export class AgentSession {
         }, {
             getModel: () => this.model,
             isIdle: () => !this.isStreaming,
+            getSignal: () => this.agent.signal,
             abort: () => this.abort(),
             hasPendingMessages: () => this.pendingMessageCount > 0,
             shutdown: () => {
@@ -2017,7 +2030,7 @@ export class AgentSession {
         // Remove error message from agent state (keep in session for history)
         const messages = this.agent.state.messages;
         if (messages.length > 0 && messages[messages.length - 1].role === "assistant") {
-            this.agent.replaceMessages(messages.slice(0, -1));
+            this.agent.state.messages = messages.slice(0, -1);
         }
         // Wait with exponential backoff (abortable)
         this._retryAbortController = new AbortController();
@@ -2060,9 +2073,11 @@ export class AgentSession {
      * Returns immediately if no retry is in progress.
      */
     async waitForRetry() {
-        if (this._retryPromise) {
-            await this._retryPromise;
+        if (!this._retryPromise) {
+            return;
         }
+        await this._retryPromise;
+        await this.agent.waitForIdle();
     }
     /** Whether auto-retry is currently in progress */
     get isRetrying() {
@@ -2134,7 +2149,7 @@ export class AgentSession {
         }
         else {
             // Add to agent state immediately
-            this.agent.appendMessage(bashMessage);
+            this.agent.state.messages.push(bashMessage);
             // Save to session
             this.sessionManager.appendMessage(bashMessage);
         }
@@ -2162,7 +2177,7 @@ export class AgentSession {
             return;
         for (const bashMessage of this._pendingBashMessages) {
             // Add to agent state
-            this.agent.appendMessage(bashMessage);
+            this.agent.state.messages.push(bashMessage);
             // Save to session
             this.sessionManager.appendMessage(bashMessage);
         }
@@ -2209,14 +2224,14 @@ export class AgentSession {
             });
         }
         // Emit session event to custom tools
-        this.agent.replaceMessages(sessionContext.messages);
+        this.agent.state.messages = sessionContext.messages;
         // Restore model if saved
         if (sessionContext.model) {
             const previousModel = this.model;
             const availableModels = await this._modelRegistry.getAvailable();
             const match = availableModels.find((m) => m.provider === sessionContext.model.provider && m.id === sessionContext.model.modelId);
             if (match) {
-                this.agent.setModel(match);
+                this.agent.state.model = match;
                 await this._emitModelSelect(match, previousModel, "restore");
             }
         }
@@ -2231,7 +2246,7 @@ export class AgentSession {
             const effectiveLevel = availableLevels.includes(defaultThinkingLevel)
                 ? defaultThinkingLevel
                 : this._clampThinkingLevel(defaultThinkingLevel, availableLevels);
-            this.agent.setThinkingLevel(effectiveLevel);
+            this.agent.state.thinkingLevel = effectiveLevel;
             this.sessionManager.appendThinkingLevelChange(effectiveLevel);
         }
         this._reconnectToAgent();
@@ -2291,7 +2306,7 @@ export class AgentSession {
         }
         // Emit session event to custom tools (with reason "fork")
         if (!skipConversationRestore) {
-            this.agent.replaceMessages(sessionContext.messages);
+            this.agent.state.messages = sessionContext.messages;
         }
         return { selectedText, cancelled: false };
     }
@@ -2450,7 +2465,7 @@ export class AgentSession {
         }
         // Update agent state
         const sessionContext = this.sessionManager.buildSessionContext();
-        this.agent.replaceMessages(sessionContext.messages);
+        this.agent.state.messages = sessionContext.messages;
         // Emit session_tree event
         if (this._extensionRunner) {
             await this._extensionRunner.emit({