@openeryc/pi-coding-agent 0.75.26 → 0.75.28

package/dist/core/agent-session.js

@@ -472,14 +472,11 @@ export class AgentSession {
         this._extensionRunner.invalidate("This extension ctx is stale after session replacement or reload. Do not use a captured pi or command ctx after ctx.newSession(), ctx.fork(), ctx.switchSession(), or ctx.reload(). For newSession, fork, and switchSession, move post-replacement work into withSession and use the ctx passed to withSession. For reload, do not use the old ctx after await ctx.reload().");
         this._disconnectFromAgent();
         this._eventListeners = [];
-        this._cleanupMcp();
-        cleanupSessionResources(this.sessionId);
-    }
-    _cleanupMcp() {
         if (this._mcpManager) {
             void this._mcpManager.stop().catch(() => { });
             this._mcpManager = null;
         }
+        cleanupSessionResources(this.sessionId);
     }
     // =========================================================================
     // Read-only State Access
@@ -1640,23 +1637,18 @@ export class AgentSession {
         this._applyExtensionBindings(this._extensionRunner);
         await this._extensionRunner.emit(this._sessionStartEvent);
         await this.extendResourcesFromExtensions(this._sessionStartEvent.reason === "reload" ? "reload" : "startup");
-        await this._initMcp();
-    }
-    async _initMcp() {
         const mcpServers = this.settingsManager.getMcpServers();
-        if (!mcpServers || Object.keys(mcpServers).length === 0) {
-            return;
-        }
-        if (this._mcpManager) {
-            await this._mcpManager.stop();
-            this._mcpManager = null;
-        }
-        this._mcpManager = new MCPManager(mcpServers);
-        await this._mcpManager.start();
-        const mcpTools = this._mcpManager.getToolDefinitions();
-        if (mcpTools.length > 0) {
-            this._customTools.push(...mcpTools);
-            this._refreshToolRegistry();
+        if (mcpServers && Object.keys(mcpServers).length > 0) {
+            if (this._mcpManager) {
+                await this._mcpManager.stop();
+            }
+            this._mcpManager = new MCPManager();
+            await this._mcpManager.start(mcpServers);
+            const mcpTools = this._mcpManager.getToolDefinitions();
+            if (mcpTools.length > 0) {
+                this._customTools.push(...mcpTools);
+                this._refreshToolRegistry();
+            }
         }
     }
     async extendResourcesFromExtensions(reason) {