@dyyz1993/pi-coding-agent 0.74.4 → 0.74.5

package/dist/core/agent-session.js

@@ -33,6 +33,7 @@ import { ExtensionRunner, wrapRegisteredTools, } from "./extensions/index.js";
 import { emitSessionShutdownEvent } from "./extensions/runner.js";
 import { FileSnapshotManager } from "./file-store/file-snapshot-manager.js";
 import { InternalGit } from "./file-store/internal-git.js";
+import { McpManager } from "./mcp/mcp-manager.js";
 import { resolveModelAlias } from "./model-resolver.js";
 import { expandPromptTemplate } from "./prompt-templates.js";
 import { CURRENT_SESSION_VERSION, getLatestCompactionEntry } from "./session-manager.js";
@@ -117,6 +118,7 @@ export class AgentSession {
     // Model registry for API key resolution
     _modelRegistry;
     _fileSnapshotManager = null;
+    _mcpManager;
     _tierModels = {};
     // Tool registry for extension getTools/setTools
     _toolRegistry = new Map();
@@ -169,6 +171,28 @@ export class AgentSession {
             this._extensionRunner.setFileSnapshotManager(null);
         }
     }
+    _initMcpServers() {
+        const settings = this.settingsManager.getMergedSettings();
+        const servers = settings?.mcp?.servers;
+        if (!servers || Object.keys(servers).length === 0)
+            return;
+        this._mcpManager = new McpManager({
+            onConnectionChange: (conn) => {
+                this._emit({
+                    type: "mcp_connection_change",
+                    name: conn.name,
+                    status: conn.status,
+                    error: conn.error,
+                    tools: conn.tools.map((t) => ({
+                        originalName: t.originalName,
+                        fullName: t.fullName,
+                        description: t.description,
+                    })),
+                });
+            },
+        });
+        this._mcpManager.connectAll(servers).catch(() => { });
+    }
     async _getRequiredRequestAuth(model) {
         const result = await this._modelRegistry.getApiKeyAndHeaders(model);
         if (!result.ok) {
@@ -537,6 +561,7 @@ export class AgentSession {
      */
     dispose() {
         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._mcpManager?.dispose().catch(() => { });
         this._disconnectFromAgent();
         this._eventListeners = [];
         cleanupSessionResources(this.sessionId);
@@ -1961,6 +1986,7 @@ export class AgentSession {
             activeToolNames: baseActiveToolNames,
             includeAllExtensionTools: options.includeAllExtensionTools,
         });
+        this._initMcpServers();
     }
     async reload() {
         const previousFlagValues = this._extensionRunner.getFlagValues();