@dyyz1993/pi-coding-agent 0.74.9 → 0.74.11

package/dist/core/agent-session.js

@@ -34,6 +34,7 @@ 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 { createMcpToolDefinition } from "./mcp/tool-converter.js";
 import { resolveModelAlias } from "./model-resolver.js";
 import { expandPromptTemplate } from "./prompt-templates.js";
 import { CURRENT_SESSION_VERSION, getLatestCompactionEntry } from "./session-manager.js";
@@ -119,6 +120,9 @@ export class AgentSession {
     _modelRegistry;
     _fileSnapshotManager = null;
     _mcpManager;
+    _mcpToolDefinitions = new Map();
+    _mcpServerScopes = new Map();
+    _noMcp;
     _tierModels = {};
     // Tool registry for extension getTools/setTools
     _toolRegistry = new Map();
@@ -142,6 +146,7 @@ export class AgentSession {
         this._allowedToolNames = config.allowedToolNames ? new Set(config.allowedToolNames) : undefined;
         this._baseToolsOverride = config.baseToolsOverride;
         this._sessionStartEvent = config.sessionStartEvent ?? { type: "session_start", reason: "startup" };
+        this._noMcp = config.noMcp ?? false;
         // Always subscribe to agent events for internal handling
         // (session persistence, extensions, auto-compaction, retry logic)
         this._unsubscribeAgent = this.agent.subscribe(this._handleAgentEvent);
@@ -172,14 +177,22 @@ export class AgentSession {
         }
     }
     _initMcpServers() {
+        if (this._noMcp)
+            return;
         if (this._mcpManager) {
             this._mcpManager.dispose().catch(() => { });
             this._mcpManager = undefined;
         }
+        this._mcpServerScopes.clear();
+        const globalServers = this.settingsManager.getMcpServers("global");
+        const projectServers = this.settingsManager.getMcpServers("project");
         const settings = this.settingsManager.getMergedSettings();
         const servers = settings?.mcp?.servers;
         if (!servers || Object.keys(servers).length === 0)
             return;
+        for (const name of Object.keys(servers)) {
+            this._mcpServerScopes.set(name, projectServers[name] ? "project" : "global");
+        }
         this._mcpManager = new McpManager({
             onConnectionChange: (conn) => {
                 this._emit({
@@ -193,6 +206,21 @@ export class AgentSession {
                         description: t.description,
                     })),
                 });
+                if (conn.status === "connected" && this._mcpManager) {
+                    this._mcpToolDefinitions.clear();
+                    const allTools = this._mcpManager.getAllTools();
+                    for (const tool of allTools) {
+                        this._mcpToolDefinitions.set(tool.fullName, createMcpToolDefinition(tool, this._mcpManager));
+                    }
+                    this._refreshToolRegistry();
+                }
+                else if (conn.status === "error" || conn.status === "disconnected") {
+                    const staleKeys = [...this._mcpToolDefinitions.keys()].filter((key) => key.startsWith(`mcp__${conn.name}__`));
+                    for (const key of staleKeys) {
+                        this._mcpToolDefinitions.delete(key);
+                    }
+                    this._refreshToolRegistry();
+                }
             },
         });
         this._mcpManager.connectAll(servers).catch(() => { });
@@ -582,8 +610,24 @@ export class AgentSession {
                 fullName: t.fullName,
                 description: t.description,
             })),
+            scope: this._mcpServerScopes.get(c.name) ?? "global",
+            disabled: c.config.disabled,
         }));
     }
+    async toggleMcpServer(name, enabled) {
+        if (!this._mcpManager)
+            throw new Error("MCP is not initialized");
+        const scope = this._mcpServerScopes.get(name);
+        if (!scope)
+            throw new Error(`MCP server "${name}" not found`);
+        await this._mcpManager.setServerEnabled(name, enabled);
+        this.settingsManager.setMcpServerDisabled(name, !enabled, scope);
+    }
+    async restartMcpServer(name) {
+        if (!this._mcpManager)
+            throw new Error("MCP is not initialized");
+        await this._mcpManager.restartServer(name);
+    }
     // =========================================================================
     // Read-only State Access
     // =========================================================================
@@ -1901,12 +1945,19 @@ export class AgentSession {
         const allowedToolNames = this._allowedToolNames;
         const isAllowedTool = (name) => !allowedToolNames || allowedToolNames.has(name);
         const registeredTools = this._extensionRunner.getAllRegisteredTools();
+        const mcpTools = [...this._mcpToolDefinitions.values()]
+            .filter((def) => isAllowedTool(def.name))
+            .map((definition) => ({
+            definition,
+            sourceInfo: createSyntheticSourceInfo(`<mcp:${definition.name}>`, { source: "mcp" }),
+        }));
         const allCustomTools = [
             ...registeredTools,
             ...this._customTools.map((definition) => ({
                 definition,
                 sourceInfo: createSyntheticSourceInfo(`<sdk:${definition.name}>`, { source: "sdk" }),
             })),
+            ...mcpTools,
         ].filter((tool) => isAllowedTool(tool.definition.name));
         const definitionRegistry = new Map(Array.from(this._baseToolDefinitions.entries())
             .filter(([name]) => isAllowedTool(name))