@openeryc/pi-coding-agent 0.75.53 → 0.75.55

package/dist/core/agent-session.js

@@ -659,32 +659,14 @@ export class AgentSession {
         const disabledSkills = new Set(this.settingsManager.getDisabledSkills());
         const activeSkills = loadedSkills.filter((s) => !disabledSkills.has(s.name) && !s.disableModelInvocation);
         const loadedContextFiles = this._resourceLoader.getAgentsFiles().agentsFiles;
-        // Collect MCP tools grouped by server name
-        // Uses the label field (mcp.<server>.<tool>) for reliable server name extraction
-        const mcpTools = [];
-        const mcpServerMap = new Map();
-        for (const name of validToolNames) {
-            if (!name.startsWith("mcp_"))
-                continue;
-            const def = this._toolDefinitions.get(name);
-            if (!def)
-                continue;
-            // Extract server name from label (mcp.<server>.<tool>)
-            const label = def.definition.label ?? "";
-            const labelParts = label.split(".");
-            const serverName = labelParts.length >= 3 ? labelParts.slice(1, -1).join(".") : label;
-            const desc = def.definition.description || `Tool from MCP server "${serverName}"`;
-            const existing = mcpServerMap.get(serverName);
-            if (existing) {
-                existing.push({ name, description: desc });
-            }
-            else {
-                mcpServerMap.set(serverName, [{ name, description: desc }]);
-            }
-        }
-        for (const [serverName, tools] of mcpServerMap) {
-            mcpTools.push({ serverName, tools });
-        }
+        // Collect MCP tool descriptions grouped by server
+        const mcpToolNames = new Set(validToolNames.filter((n) => n.startsWith("mcp_")));
+        const mcpTools = (this._mcpManager?.getMcpToolDescriptions() ?? [])
+            .map((server) => ({
+            ...server,
+            tools: server.tools.filter((t) => mcpToolNames.has(t.name)),
+        }))
+            .filter((server) => server.tools.length > 0);
         this._baseSystemPromptOptions = {
             cwd: this._cwd,
             skills: activeSkills,
@@ -1701,13 +1683,15 @@ export class AgentSession {
             this._mcpManager = null;
         }
         this._mcpManager = new MCPManager();
+        // Suppress per-server refresh during bulk startup; refresh once after
+        let batchInit = true;
         this._mcpManager.onStatusChange = (_serverName, status) => {
-            if (status === "connected") {
-                // A server reconnected — refresh the tool registry
+            if (!batchInit && status === "connected") {
                 this._refreshMcpTools();
             }
         };
         await this._mcpManager.start(mcpServers);
+        batchInit = false;
         this._refreshMcpTools();
     }
     _refreshMcpTools() {
@@ -1719,8 +1703,24 @@ export class AgentSession {
             this._refreshToolRegistry();
         }
     }
-    /** Reload MCP servers after config changes (e.g. toggle enabled). */
-    async reloadMcp() {
+    /** Reload MCP servers after config changes (e.g. toggle enabled).
+     * If changedServer is provided, only that server is started/stopped
+     * instead of restarting all servers. */
+    async reloadMcp(changedServer) {
+        if (changedServer && this._mcpManager) {
+            const configs = this.settingsManager.getMcpServers();
+            const config = configs?.[changedServer];
+            if (!config || config.enabled === false) {
+                // Server was disabled — stop it
+                await this._mcpManager.stopServer(changedServer);
+            }
+            else {
+                // Server was enabled — start it
+                await this._mcpManager.startServer(changedServer, config);
+            }
+            this._refreshMcpTools();
+            return;
+        }
         await this._initMcp();
     }
     /** Get MCP connection statuses (for UI display) */