@openeryc/pi-coding-agent 0.75.24 → 0.75.26

package/dist/core/agent-session.js

@@ -26,6 +26,7 @@ import { exportSessionToHtml } from "./export-html/index.js";
 import { createToolHtmlRenderer } from "./export-html/tool-renderer.js";
 import { ExtensionRunner, wrapRegisteredTools, } from "./extensions/index.js";
 import { emitSessionShutdownEvent } from "./extensions/runner.js";
+import { MCPManager } from "./mcp/index.js";
 import { expandPromptTemplate } from "./prompt-templates.js";
 import { CURRENT_SESSION_VERSION, getLatestCompactionEntry, SessionManager as SessionManagerCtor, } from "./session-manager.js";
 import { createSyntheticSourceInfo } from "./source-info.js";
@@ -100,6 +101,8 @@ export class AgentSession {
     _extensionShutdownHandler;
     _extensionErrorListener;
     _extensionErrorUnsubscriber;
+    // MCP client management
+    _mcpManager = null;
     // Model registry for API key resolution
     _modelRegistry;
     // Tool registry for extension getTools/setTools
@@ -469,8 +472,15 @@ 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;
+        }
+    }
     // =========================================================================
     // Read-only State Access
     // =========================================================================
@@ -1630,6 +1640,24 @@ 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();
+        }
     }
     async extendResourcesFromExtensions(reason) {
         if (!this._extensionRunner.hasHandlers("resources_discover")) {