pi-namespace-patch 1.1.0-namespace.3 → 1.2.0-namespace.2

package/dist/extensions/mcp/index.js

@@ -29,8 +29,8 @@ import { join, resolve } from "node:path";
 import { getAgentDir } from "../../config.js";
 import { mcpNamespace } from "../../core/mcp-servers.js";
 import { openBrowser } from "../../utils/open-browser.js";
-import { CODEMODE_TOOL_NAME, isCodemodeTool } from "../codemode/tool.js";
-import { isToolSearchTool, TOOL_SEARCH_TOOL_NAME } from "../tool-search/tool.js";
+import { CODEMODE_TOOL_NAME } from "../codemode/tool.js";
+import { TOOL_SEARCH_TOOL_NAME } from "../tool-search/tool.js";
 import { getMcpToolExposure, loadMcpConfig, updateMcpServerConfig, } from "./config.js";
 import { createMcpResourceToolDefinitions, LIST_MCP_RESOURCE_TEMPLATES_TOOL, LIST_MCP_RESOURCES_TOOL, READ_MCP_RESOURCE_TOOL, } from "./resources.js";
 import { loadMcpRuntime } from "./runtime.lazy.js";
@@ -131,13 +131,14 @@ export function renderServersSection(servers) {
     return [intro, ...lines, ...omitted(listed.length - kept)].join("\n");
 }
 /**
- * Whether a codemode script needs the server: it names the server's namespace, or searches,
- * enumerates, or describes tools or namespaces, which may name the server in other forms.
+ * Whether a call that reaches `reach` (see `ToolDefinition.reachesTools`) needs the server: it
+ * reaches every tool, or one of its words contains the server's namespace.
  */
-function scriptNeedsServer(code, server) {
-    if (/\b(searchTools|describeNamespace|describeTool|ALL_TOOLS)\b/.test(code))
+function reachesServer(reach, server) {
+    if (reach === "all")
         return true;
-    return code.includes(mcpNamespace(server));
+    const namespace = mcpNamespace(server);
+    return reach.some((word) => word.includes(namespace));
 }
 /** Short state for lists and the startup report. `withError` appends the first line of a failure. */
 function describeState(server, withError = true) {
@@ -152,10 +153,8 @@ function describeState(server, withError = true) {
         case "failed":
             return withError ? `failed: ${firstLine(connection.error ?? "unknown error")}` : "failed";
         case "connected": {
-            const { tools, resources } = connection;
-            const count = resources.length;
-            const resourceCount = count > 0 ? ` · ${count} resource${count === 1 ? "" : "s"}` : "";
-            return `connected · ${tools.length} tool${tools.length === 1 ? "" : "s"}${resourceCount}`;
+            const { tools, hasResources } = connection;
+            return `connected · ${tools.length} tool${tools.length === 1 ? "" : "s"}${hasResources ? " · resources" : ""}`;
         }
         case "connecting":
             return "connecting…";
@@ -287,6 +286,8 @@ export function createMcpExtension(options = {}) {
             const description = entry.config.description?.trim();
             const namespace = {
                 name: mcpNamespace(server),
+                // `describeNamespace("docs")` finds `mcp__docs`.
+                aliases: [server],
                 ...(description ? { description } : {}),
                 ...(connection.instructions ? { instructions: connection.instructions } : {}),
             };
@@ -398,10 +399,12 @@ export function createMcpExtension(options = {}) {
             const needsToolSearch = exposures.has("deferred");
             if (!needsCodemode && !needsToolSearch)
                 return;
-            // Other extensions' tools of the same names cannot reach MCP tools, so never activate them.
+            // Only a tool of these names that declares `reachesTools` can reach MCP tools; another
+            // extension's tool of the same name without it is never activated.
             const tools = pi.getAllTools();
-            const hasCodemode = tools.some(isCodemodeTool);
-            const hasToolSearch = tools.some(isToolSearchTool);
+            const hasReachingTool = (name) => tools.some((tool) => tool.name === name && tool.reachesTools);
+            const hasCodemode = hasReachingTool(CODEMODE_TOOL_NAME);
+            const hasToolSearch = hasReachingTool(TOOL_SEARCH_TOOL_NAME);
             const active = pi.getActiveTools();
             const activate = [];
             if (needsCodemode && hasCodemode && autoEnableCodemode && !active.includes(CODEMODE_TOOL_NAME)) {
@@ -1038,10 +1041,11 @@ export function createMcpExtension(options = {}) {
             else
                 delete sections[MCP_SERVERS_SECTION];
         });
-        // A codemode script waits for the servers it names, or for every server when it searches or
-        // enumerates tools, so their tools are registered before the script runs. tool_search and the
-        // resource tools reach every server, so they wait for all of them. Direct MCP calls wait only
-        // for their own server, including a reconnect still closing its old transport.
+        // A tool that reaches other tools (`reachesTools`) waits for the servers it may reach, so their
+        // tools are registered before it runs: a codemode script for the servers it names, or for every
+        // server when it searches or enumerates tools, and tool_search for every server. The resource
+        // tools reach every server, so they wait for all of them. Direct MCP calls wait only for their
+        // own server, including a reconnect still closing its old transport.
         pi.on("tool_call", async (event, ctx) => {
             const tool = pi.getAllTools().find((candidate) => candidate.name === event.toolName);
             if (!tool)
@@ -1052,12 +1056,11 @@ export function createMcpExtension(options = {}) {
             if (readyServers.length === 0)
                 return;
             let waiting = [];
-            if (isCodemodeTool(tool)) {
-                const { code } = event.input;
-                const source = typeof code === "string" ? code : "";
-                waiting = readyServers.filter((server) => scriptNeedsServer(source, server.entry.name));
+            const reach = tool.reachesTools?.(event.input);
+            if (reach !== undefined) {
+                waiting = readyServers.filter((server) => reachesServer(reach, server.entry.name));
             }
-            else if (isToolSearchTool(tool) || RESOURCE_TOOL_NAMES.has(tool.name)) {
+            else if (RESOURCE_TOOL_NAMES.has(tool.name)) {
                 waiting = readyServers;
             }
             else {