@ashx-j/lunr 0.2.17 → 0.2.18

package/dist/builtin-extensions/pi-mcp-adapter/direct-tool-executor.js

@@ -0,0 +1,211 @@
+import { UrlElicitationRequiredError } from "@modelcontextprotocol/sdk/types.js";
+import { lazyConnect, getFailureAgeSeconds } from "./init.js";
+import { abortable, throwIfAborted } from "./abort.js";
+import { formatSchema } from "./tool-metadata.js";
+import { resolveMcpResultContent, transformMcpContent } from "./tool-registrar.js";
+import { guardMcpOutput, guardedMcpDetails, resolveMcpOutputGuardOptions } from "./mcp-output-guard.js";
+import { maybeStartUiSession } from "./ui-session.js";
+import { authenticate, supportsOAuth } from "./mcp-auth-flow.js";
+import { formatAuthRequiredMessage } from "./utils.js";
+function getDirectAuthRequiredMessage(state, serverName, defaultMessage = `MCP server "${serverName}" requires OAuth authentication. Run mcp({ action: "auth-start", server: "${serverName}" }) to get a browser URL, or /mcp-auth ${serverName} in an interactive local session.`) {
+    return formatAuthRequiredMessage(state.config, serverName, defaultMessage);
+}
+function getDirectAuthFailedMessage(state, serverName, message) {
+    const customGuidance = state.config.settings?.authRequiredMessage;
+    if (customGuidance) {
+        return `OAuth authentication failed for "${serverName}": ${message}. ${getDirectAuthRequiredMessage(state, serverName)}`;
+    }
+    return `OAuth authentication failed for "${serverName}": ${message}. Run mcp({ action: "auth-start", server: "${serverName}" }) to get a browser URL, or /mcp-auth ${serverName} in an interactive local session.`;
+}
+async function attemptDirectAutoAuth(state, serverName, signal) {
+    if (state.config.settings?.autoAuth !== true) {
+        return { status: "skipped" };
+    }
+    const definition = state.config.mcpServers[serverName];
+    if (!definition || !supportsOAuth(definition) || !definition.url) {
+        return { status: "skipped" };
+    }
+    const grantType = definition.oauth ? definition.oauth.grantType ?? "authorization_code" : "authorization_code";
+    if (!state.ui && grantType !== "client_credentials") {
+        return {
+            status: "failed",
+            message: getDirectAuthRequiredMessage(state, serverName, `MCP server "${serverName}" requires OAuth authentication. Run mcp({ action: "auth-start", server: "${serverName}" }) to get a browser URL, or /mcp-auth ${serverName} in an interactive local session.`),
+        };
+    }
+    try {
+        await abortable(authenticate(serverName, definition.url, definition), signal);
+        throwIfAborted(signal);
+        return { status: "success" };
+    }
+    catch (error) {
+        throwIfAborted(signal);
+        const message = error instanceof Error ? error.message : String(error);
+        return {
+            status: "failed",
+            message: getDirectAuthFailedMessage(state, serverName, message),
+        };
+    }
+}
+export function createDirectToolExecutor(getState, getInitPromise, spec) {
+    return async function execute(_toolCallId, params, signal) {
+        throwIfAborted(signal);
+        let state = getState();
+        const initPromise = getInitPromise();
+        if (!state && initPromise) {
+            try {
+                state = await initPromise;
+            }
+            catch (error) {
+                const message = error instanceof Error ? error.message : String(error);
+                return {
+                    content: [{ type: "text", text: `MCP initialization failed: ${message}` }],
+                    details: { error: "init_failed", message },
+                };
+            }
+        }
+        if (!state) {
+            return {
+                content: [{ type: "text", text: "MCP not initialized" }],
+                details: { error: "not_initialized" },
+            };
+        }
+        let connected = await lazyConnect(state, spec.serverName, signal);
+        throwIfAborted(signal);
+        let autoAuthAttempted = false;
+        if (!connected && state.manager.getConnection(spec.serverName)?.status === "needs-auth") {
+            autoAuthAttempted = true;
+            const autoAuth = await attemptDirectAutoAuth(state, spec.serverName, signal);
+            throwIfAborted(signal);
+            if (autoAuth.status === "failed") {
+                return {
+                    content: [{ type: "text", text: autoAuth.message }],
+                    details: { error: "auth_required", server: spec.serverName, message: autoAuth.message },
+                };
+            }
+            if (autoAuth.status === "success") {
+                await state.manager.close(spec.serverName);
+                throwIfAborted(signal);
+                state.failureTracker.delete(spec.serverName);
+                connected = await lazyConnect(state, spec.serverName, signal);
+                throwIfAborted(signal);
+            }
+        }
+        if (!connected) {
+            const authConnection = state.manager.getConnection(spec.serverName);
+            if (authConnection?.status === "needs-auth") {
+                const message = getDirectAuthRequiredMessage(state, spec.serverName);
+                return {
+                    content: [{ type: "text", text: message }],
+                    details: { error: "auth_required", server: spec.serverName, message, autoAuthAttempted },
+                };
+            }
+            const failedAgo = getFailureAgeSeconds(state, spec.serverName);
+            return {
+                content: [{ type: "text", text: `MCP server "${spec.serverName}" not available${failedAgo !== null ? ` (failed ${failedAgo}s ago)` : ""}` }],
+                details: { error: "server_unavailable", server: spec.serverName },
+            };
+        }
+        const connection = state.manager.getConnection(spec.serverName);
+        if (!connection || connection.status !== "connected") {
+            return {
+                content: [{ type: "text", text: `MCP server "${spec.serverName}" not connected` }],
+                details: { error: "not_connected", server: spec.serverName },
+            };
+        }
+        let uiSession = null;
+        const requestOptions = state.manager.getRequestOptions?.(spec.serverName, signal) ?? (signal ? { signal } : undefined);
+        const outputGuardOptions = resolveMcpOutputGuardOptions(state.config.settings);
+        try {
+            state.manager.touch(spec.serverName);
+            state.manager.incrementInFlight(spec.serverName);
+            if (spec.resourceUri) {
+                const result = await connection.client.readResource({ uri: spec.resourceUri }, requestOptions);
+                const content = (result.contents ?? []).map(c => ({
+                    type: "text",
+                    text: "text" in c ? c.text : ("blob" in c ? `[Binary data: ${c.mimeType ?? "unknown"}]` : JSON.stringify(c)),
+                }));
+                const guarded = await guardMcpOutput(content.length > 0 ? content : [{ type: "text", text: "(empty resource)" }], outputGuardOptions);
+                return {
+                    content: guarded.content,
+                    details: { server: spec.serverName, resourceUri: spec.resourceUri, ...guardedMcpDetails(guarded) },
+                };
+            }
+            const hasUi = !!spec.uiResourceUri;
+            uiSession = hasUi
+                ? await maybeStartUiSession(state, {
+                    serverName: spec.serverName,
+                    toolName: spec.originalName,
+                    toolArgs: params ?? {},
+                    uiResourceUri: spec.uiResourceUri,
+                    streamMode: spec.uiStreamMode,
+                })
+                : null;
+            throwIfAborted(signal);
+            const resultPromise = connection.client.callTool({
+                name: spec.originalName,
+                arguments: params ?? {},
+                _meta: uiSession?.requestMeta,
+            }, undefined, requestOptions);
+            const result = await abortable(resultPromise, signal);
+            throwIfAborted(signal);
+            uiSession?.sendToolResult(result);
+            if (result.isError) {
+                const mcpContent = (result.content ?? []);
+                const content = transformMcpContent(mcpContent);
+                const outputContent = content.length > 0 ? content : [{ type: "text", text: "(empty result)" }];
+                const schemaText = spec.inputSchema ? `\n\nExpected parameters:\n${formatSchema(spec.inputSchema)}` : "";
+                const guarded = await guardMcpOutput(outputContent, { ...outputGuardOptions, prefix: "Error: ", suffix: schemaText, emptyTextFallback: "Tool execution failed" });
+                return {
+                    content: guarded.content,
+                    details: { error: "tool_error", server: spec.serverName, ...guardedMcpDetails(guarded) },
+                };
+            }
+            const content = resolveMcpResultContent(result);
+            const outputContent = content.length > 0 ? content : [{ type: "text", text: "(empty result)" }];
+            if (hasUi) {
+                const uiMessage = uiSession?.reused
+                    ? "Updated the open UI."
+                    : "📺 Interactive UI is now open in your browser. I'll respond to your prompts and intents as you interact with it.";
+                const guarded = await guardMcpOutput(outputContent, { ...outputGuardOptions, suffix: `\n\n${uiMessage}` });
+                return {
+                    content: guarded.content,
+                    details: { server: spec.serverName, tool: spec.originalName, uiOpen: true, ...guardedMcpDetails(guarded) },
+                };
+            }
+            const guarded = await guardMcpOutput(outputContent, { ...outputGuardOptions });
+            return {
+                content: guarded.content,
+                details: { server: spec.serverName, tool: spec.originalName, ...guardedMcpDetails(guarded) },
+            };
+        }
+        catch (error) {
+            if (error instanceof UrlElicitationRequiredError) {
+                const action = await state.manager.handleUrlElicitationRequired(spec.serverName, error);
+                const message = action === "accept"
+                    ? "The original MCP tool did not run. Complete the opened browser interaction, then retry the tool."
+                    : `The URL interaction was ${action === "decline" ? "declined" : "cancelled"}.`;
+                uiSession?.sendToolCancelled(message);
+                return {
+                    content: [{ type: "text", text: message }],
+                    details: { error: "url_elicitation_required", server: spec.serverName, action },
+                };
+            }
+            const message = error instanceof Error ? error.message : String(error);
+            uiSession?.sendToolCancelled(message);
+            const schemaText = spec.inputSchema ? `\n\nExpected parameters:\n${formatSchema(spec.inputSchema)}` : "";
+            const guarded = await guardMcpOutput([{ type: "text", text: message }], { ...outputGuardOptions, prefix: "Failed to call tool: ", suffix: schemaText });
+            return {
+                content: guarded.content,
+                details: { error: "call_failed", server: spec.serverName, ...guardedMcpDetails(guarded) },
+            };
+        }
+        finally {
+            if (uiSession?.reused) {
+                uiSession.close();
+            }
+            state.manager.decrementInFlight(spec.serverName);
+            state.manager.touch(spec.serverName);
+        }
+    };
+}
+//# sourceMappingURL=direct-tool-executor.js.map

package/dist/builtin-extensions/pi-mcp-adapter/direct-tool-executor.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"direct-tool-executor.js","sourceRoot":"","sources":["../../../src/builtin-extensions/pi-mcp-adapter/direct-tool-executor.ts"],"names":[],"mappings":"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","sourcesContent":["// @ts-nocheck\nimport type { AgentToolResult, AgentToolUpdateCallback, ExtensionContext } from \"@ashx-j/lunr\";\nimport { UrlElicitationRequiredError } from \"@modelcontextprotocol/sdk/types.js\";\nimport type { McpExtensionState } from \"./state.ts\";\nimport type { DirectToolSpec, McpContent } from \"./types.ts\";\nimport { lazyConnect, getFailureAgeSeconds } from \"./init.ts\";\nimport { abortable, throwIfAborted } from \"./abort.ts\";\nimport { formatSchema } from \"./tool-metadata.ts\";\nimport { resolveMcpResultContent, transformMcpContent } from \"./tool-registrar.ts\";\nimport { guardMcpOutput, guardedMcpDetails, resolveMcpOutputGuardOptions } from \"./mcp-output-guard.ts\";\nimport { maybeStartUiSession, type UiSessionRuntime } from \"./ui-session.ts\";\nimport { authenticate, supportsOAuth } from \"./mcp-auth-flow.ts\";\nimport { formatAuthRequiredMessage } from \"./utils.ts\";\n\ntype DirectAutoAuthResult =\n  | { status: \"skipped\" }\n  | { status: \"success\" }\n  | { status: \"failed\"; message: string };\n\nfunction getDirectAuthRequiredMessage(\n  state: McpExtensionState,\n  serverName: string,\n  defaultMessage = `MCP server \"${serverName}\" requires OAuth authentication. Run mcp({ action: \"auth-start\", server: \"${serverName}\" }) to get a browser URL, or /mcp-auth ${serverName} in an interactive local session.`,\n): string {\n  return formatAuthRequiredMessage(state.config, serverName, defaultMessage);\n}\n\nfunction getDirectAuthFailedMessage(state: McpExtensionState, serverName: string, message: string): string {\n  const customGuidance = state.config.settings?.authRequiredMessage;\n  if (customGuidance) {\n    return `OAuth authentication failed for \"${serverName}\": ${message}. ${getDirectAuthRequiredMessage(state, serverName)}`;\n  }\n  return `OAuth authentication failed for \"${serverName}\": ${message}. Run mcp({ action: \"auth-start\", server: \"${serverName}\" }) to get a browser URL, or /mcp-auth ${serverName} in an interactive local session.`;\n}\n\nasync function attemptDirectAutoAuth(\n  state: McpExtensionState,\n  serverName: string,\n  signal?: AbortSignal,\n): Promise<DirectAutoAuthResult> {\n  if (state.config.settings?.autoAuth !== true) {\n    return { status: \"skipped\" };\n  }\n\n  const definition = state.config.mcpServers[serverName];\n  if (!definition || !supportsOAuth(definition) || !definition.url) {\n    return { status: \"skipped\" };\n  }\n\n  const grantType = definition.oauth ? definition.oauth.grantType ?? \"authorization_code\" : \"authorization_code\";\n  if (!state.ui && grantType !== \"client_credentials\") {\n    return {\n      status: \"failed\",\n      message: getDirectAuthRequiredMessage(\n        state,\n        serverName,\n        `MCP server \"${serverName}\" requires OAuth authentication. Run mcp({ action: \"auth-start\", server: \"${serverName}\" }) to get a browser URL, or /mcp-auth ${serverName} in an interactive local session.`,\n      ),\n    };\n  }\n\n  try {\n    await abortable(authenticate(serverName, definition.url, definition), signal);\n    throwIfAborted(signal);\n    return { status: \"success\" };\n  } catch (error) {\n    throwIfAborted(signal);\n    const message = error instanceof Error ? error.message : String(error);\n    return {\n      status: \"failed\",\n      message: getDirectAuthFailedMessage(state, serverName, message),\n    };\n  }\n}\n\ntype DirectToolExecute = (\n  toolCallId: string,\n  params: Record<string, unknown>,\n  signal: AbortSignal | undefined,\n  onUpdate: AgentToolUpdateCallback<Record<string, unknown>> | undefined,\n  ctx: ExtensionContext,\n) => Promise<AgentToolResult<Record<string, unknown>>>;\n\nexport function createDirectToolExecutor(\n  getState: () => McpExtensionState | null,\n  getInitPromise: () => Promise<McpExtensionState> | null,\n  spec: DirectToolSpec\n): DirectToolExecute {\n  return async function execute(_toolCallId, params, signal) {\n    throwIfAborted(signal);\n    let state = getState();\n    const initPromise = getInitPromise();\n\n    if (!state && initPromise) {\n      try {\n        state = await initPromise;\n      } catch (error) {\n        const message = error instanceof Error ? error.message : String(error);\n        return {\n          content: [{ type: \"text\" as const, text: `MCP initialization failed: ${message}` }],\n          details: { error: \"init_failed\", message },\n        };\n      }\n    }\n    if (!state) {\n      return {\n        content: [{ type: \"text\" as const, text: \"MCP not initialized\" }],\n        details: { error: \"not_initialized\" },\n      };\n    }\n\n    let connected = await lazyConnect(state, spec.serverName, signal);\n    throwIfAborted(signal);\n    let autoAuthAttempted = false;\n\n    if (!connected && state.manager.getConnection(spec.serverName)?.status === \"needs-auth\") {\n      autoAuthAttempted = true;\n      const autoAuth = await attemptDirectAutoAuth(state, spec.serverName, signal);\n      throwIfAborted(signal);\n      if (autoAuth.status === \"failed\") {\n        return {\n          content: [{ type: \"text\" as const, text: autoAuth.message }],\n          details: { error: \"auth_required\", server: spec.serverName, message: autoAuth.message },\n        };\n      }\n      if (autoAuth.status === \"success\") {\n        await state.manager.close(spec.serverName);\n        throwIfAborted(signal);\n        state.failureTracker.delete(spec.serverName);\n        connected = await lazyConnect(state, spec.serverName, signal);\n        throwIfAborted(signal);\n      }\n    }\n\n    if (!connected) {\n      const authConnection = state.manager.getConnection(spec.serverName);\n      if (authConnection?.status === \"needs-auth\") {\n        const message = getDirectAuthRequiredMessage(state, spec.serverName);\n        return {\n          content: [{ type: \"text\" as const, text: message }],\n          details: { error: \"auth_required\", server: spec.serverName, message, autoAuthAttempted },\n        };\n      }\n      const failedAgo = getFailureAgeSeconds(state, spec.serverName);\n      return {\n        content: [{ type: \"text\" as const, text: `MCP server \"${spec.serverName}\" not available${failedAgo !== null ? ` (failed ${failedAgo}s ago)` : \"\"}` }],\n        details: { error: \"server_unavailable\", server: spec.serverName },\n      };\n    }\n\n    const connection = state.manager.getConnection(spec.serverName);\n    if (!connection || connection.status !== \"connected\") {\n      return {\n        content: [{ type: \"text\" as const, text: `MCP server \"${spec.serverName}\" not connected` }],\n        details: { error: \"not_connected\", server: spec.serverName },\n      };\n    }\n\n    let uiSession: UiSessionRuntime | null = null;\n    const requestOptions = state.manager.getRequestOptions?.(spec.serverName, signal) ?? (signal ? { signal } : undefined);\n\n    const outputGuardOptions = resolveMcpOutputGuardOptions(state.config.settings);\n\n    try {\n      state.manager.touch(spec.serverName);\n      state.manager.incrementInFlight(spec.serverName);\n\n      if (spec.resourceUri) {\n        const result = await connection.client.readResource({ uri: spec.resourceUri }, requestOptions);\n        const content = (result.contents ?? []).map(c => ({\n          type: \"text\" as const,\n          text: \"text\" in c ? c.text : (\"blob\" in c ? `[Binary data: ${(c as { mimeType?: string }).mimeType ?? \"unknown\"}]` : JSON.stringify(c)),\n        }));\n        const guarded = await guardMcpOutput(content.length > 0 ? content : [{ type: \"text\" as const, text: \"(empty resource)\" }], outputGuardOptions);\n        return {\n          content: guarded.content,\n          details: { server: spec.serverName, resourceUri: spec.resourceUri, ...guardedMcpDetails(guarded) },\n        };\n      }\n\n      const hasUi = !!spec.uiResourceUri;\n      uiSession = hasUi\n        ? await maybeStartUiSession(state, {\n            serverName: spec.serverName,\n            toolName: spec.originalName,\n            toolArgs: params ?? {},\n            uiResourceUri: spec.uiResourceUri!,\n            streamMode: spec.uiStreamMode,\n          })\n        : null;\n\n      throwIfAborted(signal);\n      const resultPromise = connection.client.callTool({\n        name: spec.originalName,\n        arguments: params ?? {},\n        _meta: uiSession?.requestMeta,\n      }, undefined, requestOptions);\n\n      const result = await abortable(resultPromise, signal);\n      throwIfAborted(signal);\n      uiSession?.sendToolResult(result as unknown as import(\"@modelcontextprotocol/sdk/types.js\").CallToolResult);\n\n      if (result.isError) {\n        const mcpContent = (result.content ?? []) as McpContent[];\n        const content = transformMcpContent(mcpContent);\n        const outputContent = content.length > 0 ? content : [{ type: \"text\" as const, text: \"(empty result)\" }];\n        const schemaText = spec.inputSchema ? `\\n\\nExpected parameters:\\n${formatSchema(spec.inputSchema)}` : \"\";\n        const guarded = await guardMcpOutput(outputContent, { ...outputGuardOptions, prefix: \"Error: \", suffix: schemaText, emptyTextFallback: \"Tool execution failed\" });\n        return {\n          content: guarded.content,\n          details: { error: \"tool_error\", server: spec.serverName, ...guardedMcpDetails(guarded) },\n        };\n      }\n\n      const content = resolveMcpResultContent(result as Record<string, unknown>);\n      const outputContent = content.length > 0 ? content : [{ type: \"text\" as const, text: \"(empty result)\" }];\n      if (hasUi) {\n        const uiMessage = uiSession?.reused\n          ? \"Updated the open UI.\"\n          : \"📺 Interactive UI is now open in your browser. I'll respond to your prompts and intents as you interact with it.\";\n        const guarded = await guardMcpOutput(outputContent, { ...outputGuardOptions, suffix: `\\n\\n${uiMessage}` });\n        return {\n          content: guarded.content,\n          details: { server: spec.serverName, tool: spec.originalName, uiOpen: true, ...guardedMcpDetails(guarded) },\n        };\n      }\n\n      const guarded = await guardMcpOutput(outputContent, { ...outputGuardOptions });\n      return {\n        content: guarded.content,\n        details: { server: spec.serverName, tool: spec.originalName, ...guardedMcpDetails(guarded) },\n      };\n    } catch (error) {\n      if (error instanceof UrlElicitationRequiredError) {\n        const action = await state.manager.handleUrlElicitationRequired(spec.serverName, error);\n        const message = action === \"accept\"\n          ? \"The original MCP tool did not run. Complete the opened browser interaction, then retry the tool.\"\n          : `The URL interaction was ${action === \"decline\" ? \"declined\" : \"cancelled\"}.`;\n        uiSession?.sendToolCancelled(message);\n        return {\n          content: [{ type: \"text\" as const, text: message }],\n          details: { error: \"url_elicitation_required\", server: spec.serverName, action },\n        };\n      }\n      const message = error instanceof Error ? error.message : String(error);\n      uiSession?.sendToolCancelled(message);\n      const schemaText = spec.inputSchema ? `\\n\\nExpected parameters:\\n${formatSchema(spec.inputSchema)}` : \"\";\n      const guarded = await guardMcpOutput([{ type: \"text\" as const, text: message }], { ...outputGuardOptions, prefix: \"Failed to call tool: \", suffix: schemaText });\n      return {\n        content: guarded.content,\n        details: { error: \"call_failed\", server: spec.serverName, ...guardedMcpDetails(guarded) },\n      };\n    } finally {\n      if (uiSession?.reused) {\n        uiSession.close();\n      }\n      state.manager.decrementInFlight(spec.serverName);\n      state.manager.touch(spec.serverName);\n    }\n  };\n}\n"]}

package/dist/builtin-extensions/pi-mcp-adapter/direct-tools.d.ts

@@ -1,11 +1,6 @@
-import type { AgentToolResult, AgentToolUpdateCallback, ExtensionContext } from "@ashx-j/lunr";
-import type { McpExtensionState } from "./state.ts";
 import type { DirectToolSpec, McpConfig } from "./types.ts";
 import type { MetadataCache } from "./metadata-cache.ts";
 export declare function resolveDirectTools(config: McpConfig, cache: MetadataCache | null, prefix: "server" | "none" | "short", envOverride?: string[]): DirectToolSpec[];
 export declare function getMissingConfiguredDirectToolServers(config: McpConfig, cache: MetadataCache | null): string[];
 export declare function buildProxyDescription(config: McpConfig, cache: MetadataCache | null, directSpecs: DirectToolSpec[]): string;
-type DirectToolExecute = (toolCallId: string, params: Record<string, unknown>, signal: AbortSignal | undefined, onUpdate: AgentToolUpdateCallback<Record<string, unknown>> | undefined, ctx: ExtensionContext) => Promise<AgentToolResult<Record<string, unknown>>>;
-export declare function createDirectToolExecutor(getState: () => McpExtensionState | null, getInitPromise: () => Promise<McpExtensionState> | null, spec: DirectToolSpec): DirectToolExecute;
-export {};
 //# sourceMappingURL=direct-tools.d.ts.map

package/dist/builtin-extensions/pi-mcp-adapter/direct-tools.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"direct-tools.d.ts","sourceRoot":"","sources":["../../../src/builtin-extensions/pi-mcp-adapter/direct-tools.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,uBAAuB,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAElH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AACpD,OAAO,KAAK,EAAE,cAAc,EAAE,SAAS,EAAc,MAAM,YAAY,CAAC;AACxE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAyEzD,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,SAAS,EACjB,KAAK,EAAE,aAAa,GAAG,IAAI,EAC3B,MAAM,EAAE,QAAQ,GAAG,MAAM,GAAG,OAAO,EACnC,WAAW,CAAC,EAAE,MAAM,EAAE,GACrB,cAAc,EAAE,CAoGlB;AAED,wBAAgB,qCAAqC,CACnD,MAAM,EAAE,SAAS,EACjB,KAAK,EAAE,aAAa,GAAG,IAAI,GAC1B,MAAM,EAAE,CAkBV;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,SAAS,EACjB,KAAK,EAAE,aAAa,GAAG,IAAI,EAC3B,WAAW,EAAE,cAAc,EAAE,GAC5B,MAAM,CAsDR;AAED,KAAK,iBAAiB,GAAG,CACvB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,MAAM,EAAE,WAAW,GAAG,SAAS,EAC/B,QAAQ,EAAE,uBAAuB,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,SAAS,EACtE,GAAG,EAAE,gBAAgB,KAClB,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;AAEvD,wBAAgB,wBAAwB,CACtC,QAAQ,EAAE,MAAM,iBAAiB,GAAG,IAAI,EACxC,cAAc,EAAE,MAAM,OAAO,CAAC,iBAAiB,CAAC,GAAG,IAAI,EACvD,IAAI,EAAE,cAAc,GACnB,iBAAiB,CAuKnB","sourcesContent":["// @ts-nocheck\nimport type { AgentToolResult, AgentToolUpdateCallback, ExtensionContext } from \"@ashx-j/lunr\";\nimport { UrlElicitationRequiredError } from \"@modelcontextprotocol/sdk/types.js\";\nimport type { McpExtensionState } from \"./state.ts\";\nimport type { DirectToolSpec, McpConfig, McpContent } from \"./types.ts\";\nimport type { MetadataCache } from \"./metadata-cache.ts\";\nimport { lazyConnect, getFailureAgeSeconds } from \"./init.ts\";\nimport { abortable, throwIfAborted } from \"./abort.ts\";\nimport { isServerCacheValid } from \"./metadata-cache.ts\";\nimport { formatSchema } from \"./tool-metadata.ts\";\nimport { resolveMcpResultContent, transformMcpContent } from \"./tool-registrar.ts\";\nimport { guardMcpOutput, guardedMcpDetails, resolveMcpOutputGuardOptions } from \"./mcp-output-guard.ts\";\nimport { maybeStartUiSession, type UiSessionRuntime } from \"./ui-session.ts\";\nimport { formatToolName, isToolExcluded } from \"./types.ts\";\nimport { resourceNameToToolName } from \"./resource-tools.ts\";\nimport { authenticate, supportsOAuth } from \"./mcp-auth-flow.ts\";\nimport { formatAuthRequiredMessage } from \"./utils.ts\";\n\nconst BUILTIN_NAMES = new Set([\"read\", \"bash\", \"edit\", \"write\", \"grep\", \"find\", \"ls\", \"mcp\"]);\n\ntype DirectAutoAuthResult =\n  | { status: \"skipped\" }\n  | { status: \"success\" }\n  | { status: \"failed\"; message: string };\n\nfunction getDirectAuthRequiredMessage(\n  state: McpExtensionState,\n  serverName: string,\n  defaultMessage = `MCP server \"${serverName}\" requires OAuth authentication. Run mcp({ action: \"auth-start\", server: \"${serverName}\" }) to get a browser URL, or /mcp-auth ${serverName} in an interactive local session.`,\n): string {\n  return formatAuthRequiredMessage(state.config, serverName, defaultMessage);\n}\n\nfunction getDirectAuthFailedMessage(state: McpExtensionState, serverName: string, message: string): string {\n  const customGuidance = state.config.settings?.authRequiredMessage;\n  if (customGuidance) {\n    return `OAuth authentication failed for \"${serverName}\": ${message}. ${getDirectAuthRequiredMessage(state, serverName)}`;\n  }\n  return `OAuth authentication failed for \"${serverName}\": ${message}. Run mcp({ action: \"auth-start\", server: \"${serverName}\" }) to get a browser URL, or /mcp-auth ${serverName} in an interactive local session.`;\n}\n\nasync function attemptDirectAutoAuth(\n  state: McpExtensionState,\n  serverName: string,\n): Promise<DirectAutoAuthResult> {\n  if (state.config.settings?.autoAuth !== true) {\n    return { status: \"skipped\" };\n  }\n\n  const definition = state.config.mcpServers[serverName];\n  if (!definition || !supportsOAuth(definition) || !definition.url) {\n    return { status: \"skipped\" };\n  }\n\n  const grantType = definition.oauth ? definition.oauth.grantType ?? \"authorization_code\" : \"authorization_code\";\n  if (!state.ui && grantType !== \"client_credentials\") {\n    return {\n      status: \"failed\",\n      message: getDirectAuthRequiredMessage(\n        state,\n        serverName,\n        `MCP server \"${serverName}\" requires OAuth authentication. Run mcp({ action: \"auth-start\", server: \"${serverName}\" }) to get a browser URL, or /mcp-auth ${serverName} in an interactive local session.`,\n      ),\n    };\n  }\n\n  try {\n    await authenticate(serverName, definition.url, definition);\n    return { status: \"success\" };\n  } catch (error) {\n    const message = error instanceof Error ? error.message : String(error);\n    return {\n      status: \"failed\",\n      message: getDirectAuthFailedMessage(state, serverName, message),\n    };\n  }\n}\n\nexport function resolveDirectTools(\n  config: McpConfig,\n  cache: MetadataCache | null,\n  prefix: \"server\" | \"none\" | \"short\",\n  envOverride?: string[],\n): DirectToolSpec[] {\n  const specs: DirectToolSpec[] = [];\n  if (!cache) return specs;\n\n  const seenNames = new Set<string>();\n\n  const envServers = new Set<string>();\n  const envTools = new Map<string, Set<string>>();\n  if (envOverride) {\n    for (let item of envOverride) {\n      item = item.replace(/\\/+$/, \"\");\n      if (item.includes(\"/\")) {\n        const [server, tool] = item.split(\"/\", 2);\n        if (server && tool) {\n          if (!envTools.has(server)) envTools.set(server, new Set());\n          envTools.get(server)!.add(tool);\n        } else if (server) {\n          envServers.add(server);\n        }\n      } else if (item) {\n        envServers.add(item);\n      }\n    }\n  }\n\n  const globalDirect = config.settings?.directTools;\n\n  for (const [serverName, definition] of Object.entries(config.mcpServers)) {\n    const serverCache = cache.servers[serverName];\n    if (!serverCache || !isServerCacheValid(serverCache, definition)) continue;\n\n    let toolFilter: true | string[] | false = false;\n\n    if (envOverride) {\n      if (envServers.has(serverName)) {\n        toolFilter = true;\n      } else if (envTools.has(serverName)) {\n        toolFilter = [...envTools.get(serverName)!];\n      }\n    } else {\n      if (definition.directTools !== undefined) {\n        toolFilter = definition.directTools;\n      } else if (globalDirect) {\n        toolFilter = globalDirect;\n      }\n    }\n\n    if (!toolFilter) continue;\n\n    for (const tool of serverCache.tools ?? []) {\n      if (toolFilter !== true && !toolFilter.includes(tool.name)) continue;\n      if (isToolExcluded(tool.name, serverName, prefix, definition.excludeTools)) continue;\n      const prefixedName = formatToolName(tool.name, serverName, prefix);\n      if (BUILTIN_NAMES.has(prefixedName)) {\n        console.warn(`MCP: skipping direct tool \"${prefixedName}\" (collides with builtin)`);\n        continue;\n      }\n      if (seenNames.has(prefixedName)) {\n        console.warn(`MCP: skipping duplicate direct tool \"${prefixedName}\" from \"${serverName}\"`);\n        continue;\n      }\n      seenNames.add(prefixedName);\n      specs.push({\n        serverName,\n        originalName: tool.name,\n        prefixedName,\n        description: tool.description ?? \"\",\n        inputSchema: tool.inputSchema,\n        uiResourceUri: tool.uiResourceUri,\n        uiStreamMode: tool.uiStreamMode,\n      });\n    }\n\n    if (definition.exposeResources !== false) {\n      for (const resource of serverCache.resources ?? []) {\n        const baseName = `get_${resourceNameToToolName(resource.name)}`;\n        if (toolFilter !== true && !toolFilter.includes(baseName)) continue;\n        if (isToolExcluded(baseName, serverName, prefix, definition.excludeTools)) continue;\n        const prefixedName = formatToolName(baseName, serverName, prefix);\n        if (BUILTIN_NAMES.has(prefixedName)) {\n          console.warn(`MCP: skipping direct resource tool \"${prefixedName}\" (collides with builtin)`);\n          continue;\n        }\n        if (seenNames.has(prefixedName)) {\n          console.warn(`MCP: skipping duplicate direct resource tool \"${prefixedName}\" from \"${serverName}\"`);\n          continue;\n        }\n        seenNames.add(prefixedName);\n        specs.push({\n          serverName,\n          originalName: baseName,\n          prefixedName,\n          description: resource.description ?? `Read resource: ${resource.uri}`,\n          resourceUri: resource.uri,\n        });\n      }\n    }\n  }\n\n  return specs;\n}\n\nexport function getMissingConfiguredDirectToolServers(\n  config: McpConfig,\n  cache: MetadataCache | null,\n): string[] {\n  const missing: string[] = [];\n  const globalDirect = config.settings?.directTools;\n\n  for (const [serverName, definition] of Object.entries(config.mcpServers)) {\n    const hasDirectTools = definition.directTools !== undefined\n      ? !!definition.directTools\n      : !!globalDirect;\n\n    if (!hasDirectTools) continue;\n\n    const serverCache = cache?.servers?.[serverName];\n    if (!serverCache || !isServerCacheValid(serverCache, definition)) {\n      missing.push(serverName);\n    }\n  }\n\n  return missing;\n}\n\nexport function buildProxyDescription(\n  config: McpConfig,\n  cache: MetadataCache | null,\n  directSpecs: DirectToolSpec[],\n): string {\n  const prefix = config.settings?.toolPrefix ?? \"server\";\n  let desc = `MCP gateway - connect to MCP servers and call their tools. Non-MCP Pi tools should be called directly, not through mcp.\\n`;\n\n  const directByServer = new Map<string, number>();\n  for (const spec of directSpecs) {\n    directByServer.set(spec.serverName, (directByServer.get(spec.serverName) ?? 0) + 1);\n  }\n  if (directByServer.size > 0) {\n    const parts = [...directByServer.entries()].map(\n      ([server, count]) => `${server} (${count})`,\n    );\n    desc += `\\nDirect tools available (call as normal tools): ${parts.join(\", \")}\\n`;\n  }\n\n  const serverSummaries: string[] = [];\n  for (const serverName of Object.keys(config.mcpServers)) {\n    const entry = cache?.servers?.[serverName];\n    const definition = config.mcpServers[serverName];\n    const toolCount = (entry?.tools ?? []).filter(\n      (tool) => !isToolExcluded(tool.name, serverName, prefix, definition.excludeTools),\n    ).length;\n    const resourceCount = definition?.exposeResources !== false\n      ? (entry?.resources ?? []).filter((resource) => {\n          const baseName = `get_${resourceNameToToolName(resource.name)}`;\n          return !isToolExcluded(baseName, serverName, prefix, definition.excludeTools);\n        }).length\n      : 0;\n    const totalItems = toolCount + resourceCount;\n    if (totalItems === 0) continue;\n    const directCount = directByServer.get(serverName) ?? 0;\n    const proxyCount = totalItems - directCount;\n    if (proxyCount > 0) {\n      serverSummaries.push(`${serverName} (${proxyCount} tools)`);\n    }\n  }\n\n  if (serverSummaries.length > 0) {\n    desc += `\\nServers: ${serverSummaries.join(\", \")}\\n`;\n  }\n\n  desc += `\\nUsage:\\n`;\n  desc += `  mcp({ })                              → Show server status\\n`;\n  desc += `  mcp({ server: \"name\" })               → List tools from server\\n`;\n  desc += `  mcp({ search: \"query\" })              → Search MCP tools by name/description\\n`;\n  desc += `  mcp({ describe: \"tool_name\" })        → Show tool details and parameters\\n`;\n  desc += `  mcp({ connect: \"server-name\" })       → Connect to a server and refresh metadata\\n`;\n  desc += `  mcp({ tool: \"name\", args: '{\"key\": \"value\"}' })    → Call a tool (args is JSON string)\\n`;\n  desc += `  mcp({ action: \"ui-messages\" })        → Retrieve accumulated messages from completed UI sessions\\n`;\n  desc += `  mcp({ action: \"auth-start\", server: \"name\" })      → Start manual OAuth and get a browser URL\\n`;\n  desc += `  mcp({ action: \"auth-complete\", server: \"name\", args: '{\"redirectUrl\":\"...\"}' }) → Complete manual OAuth\\n`;\n  desc += `\\nMode: action > tool (call) > connect > describe > search > server (list) > nothing (status)`;\n\n  return desc;\n}\n\ntype DirectToolExecute = (\n  toolCallId: string,\n  params: Record<string, unknown>,\n  signal: AbortSignal | undefined,\n  onUpdate: AgentToolUpdateCallback<Record<string, unknown>> | undefined,\n  ctx: ExtensionContext,\n) => Promise<AgentToolResult<Record<string, unknown>>>;\n\nexport function createDirectToolExecutor(\n  getState: () => McpExtensionState | null,\n  getInitPromise: () => Promise<McpExtensionState> | null,\n  spec: DirectToolSpec\n): DirectToolExecute {\n  return async function execute(_toolCallId, params, signal) {\n    throwIfAborted(signal);\n    let state = getState();\n    const initPromise = getInitPromise();\n\n    if (!state && initPromise) {\n      try {\n        state = await initPromise;\n      } catch (error) {\n        const message = error instanceof Error ? error.message : String(error);\n        return {\n          content: [{ type: \"text\" as const, text: `MCP initialization failed: ${message}` }],\n          details: { error: \"init_failed\", message },\n        };\n      }\n    }\n    if (!state) {\n      return {\n        content: [{ type: \"text\" as const, text: \"MCP not initialized\" }],\n        details: { error: \"not_initialized\" },\n      };\n    }\n\n    let connected = await lazyConnect(state, spec.serverName, signal);\n    let autoAuthAttempted = false;\n\n    if (!connected && state.manager.getConnection(spec.serverName)?.status === \"needs-auth\") {\n      autoAuthAttempted = true;\n      const autoAuth = await attemptDirectAutoAuth(state, spec.serverName);\n      if (autoAuth.status === \"failed\") {\n        return {\n          content: [{ type: \"text\" as const, text: autoAuth.message }],\n          details: { error: \"auth_required\", server: spec.serverName, message: autoAuth.message },\n        };\n      }\n      if (autoAuth.status === \"success\") {\n        await state.manager.close(spec.serverName);\n        state.failureTracker.delete(spec.serverName);\n        connected = await lazyConnect(state, spec.serverName, signal);\n      }\n    }\n\n    if (!connected) {\n      const authConnection = state.manager.getConnection(spec.serverName);\n      if (authConnection?.status === \"needs-auth\") {\n        const message = getDirectAuthRequiredMessage(state, spec.serverName);\n        return {\n          content: [{ type: \"text\" as const, text: message }],\n          details: { error: \"auth_required\", server: spec.serverName, message, autoAuthAttempted },\n        };\n      }\n      const failedAgo = getFailureAgeSeconds(state, spec.serverName);\n      return {\n        content: [{ type: \"text\" as const, text: `MCP server \"${spec.serverName}\" not available${failedAgo !== null ? ` (failed ${failedAgo}s ago)` : \"\"}` }],\n        details: { error: \"server_unavailable\", server: spec.serverName },\n      };\n    }\n\n    const connection = state.manager.getConnection(spec.serverName);\n    if (!connection || connection.status !== \"connected\") {\n      return {\n        content: [{ type: \"text\" as const, text: `MCP server \"${spec.serverName}\" not connected` }],\n        details: { error: \"not_connected\", server: spec.serverName },\n      };\n    }\n\n    let uiSession: UiSessionRuntime | null = null;\n    const requestOptions = state.manager.getRequestOptions?.(spec.serverName, signal) ?? (signal ? { signal } : undefined);\n\n    const outputGuardOptions = resolveMcpOutputGuardOptions(state.config.settings);\n\n    try {\n      state.manager.touch(spec.serverName);\n      state.manager.incrementInFlight(spec.serverName);\n\n      if (spec.resourceUri) {\n        const result = await connection.client.readResource({ uri: spec.resourceUri }, requestOptions);\n        const content = (result.contents ?? []).map(c => ({\n          type: \"text\" as const,\n          text: \"text\" in c ? c.text : (\"blob\" in c ? `[Binary data: ${(c as { mimeType?: string }).mimeType ?? \"unknown\"}]` : JSON.stringify(c)),\n        }));\n        const guarded = await guardMcpOutput(content.length > 0 ? content : [{ type: \"text\" as const, text: \"(empty resource)\" }], outputGuardOptions);\n        return {\n          content: guarded.content,\n          details: { server: spec.serverName, resourceUri: spec.resourceUri, ...guardedMcpDetails(guarded) },\n        };\n      }\n\n      const hasUi = !!spec.uiResourceUri;\n      uiSession = hasUi\n        ? await maybeStartUiSession(state, {\n            serverName: spec.serverName,\n            toolName: spec.originalName,\n            toolArgs: params ?? {},\n            uiResourceUri: spec.uiResourceUri!,\n            streamMode: spec.uiStreamMode,\n          })\n        : null;\n\n      const resultPromise = connection.client.callTool({\n        name: spec.originalName,\n        arguments: params ?? {},\n        _meta: uiSession?.requestMeta,\n      }, undefined, requestOptions);\n\n      const result = await abortable(resultPromise, signal);\n      uiSession?.sendToolResult(result as unknown as import(\"@modelcontextprotocol/sdk/types.js\").CallToolResult);\n\n      if (result.isError) {\n        const mcpContent = (result.content ?? []) as McpContent[];\n        const content = transformMcpContent(mcpContent);\n        const outputContent = content.length > 0 ? content : [{ type: \"text\" as const, text: \"(empty result)\" }];\n        const schemaText = spec.inputSchema ? `\\n\\nExpected parameters:\\n${formatSchema(spec.inputSchema)}` : \"\";\n        const guarded = await guardMcpOutput(outputContent, { ...outputGuardOptions, prefix: \"Error: \", suffix: schemaText, emptyTextFallback: \"Tool execution failed\" });\n        return {\n          content: guarded.content,\n          details: { error: \"tool_error\", server: spec.serverName, ...guardedMcpDetails(guarded) },\n        };\n      }\n\n      const content = resolveMcpResultContent(result as Record<string, unknown>);\n      const outputContent = content.length > 0 ? content : [{ type: \"text\" as const, text: \"(empty result)\" }];\n      if (hasUi) {\n        const uiMessage = uiSession?.reused\n          ? \"Updated the open UI.\"\n          : \"📺 Interactive UI is now open in your browser. I'll respond to your prompts and intents as you interact with it.\";\n        const guarded = await guardMcpOutput(outputContent, { ...outputGuardOptions, suffix: `\\n\\n${uiMessage}` });\n        return {\n          content: guarded.content,\n          details: { server: spec.serverName, tool: spec.originalName, uiOpen: true, ...guardedMcpDetails(guarded) },\n        };\n      }\n\n      const guarded = await guardMcpOutput(outputContent, { ...outputGuardOptions });\n      return {\n        content: guarded.content,\n        details: { server: spec.serverName, tool: spec.originalName, ...guardedMcpDetails(guarded) },\n      };\n    } catch (error) {\n      if (error instanceof UrlElicitationRequiredError) {\n        const action = await state.manager.handleUrlElicitationRequired(spec.serverName, error);\n        const message = action === \"accept\"\n          ? \"The original MCP tool did not run. Complete the opened browser interaction, then retry the tool.\"\n          : `The URL interaction was ${action === \"decline\" ? \"declined\" : \"cancelled\"}.`;\n        uiSession?.sendToolCancelled(message);\n        return {\n          content: [{ type: \"text\" as const, text: message }],\n          details: { error: \"url_elicitation_required\", server: spec.serverName, action },\n        };\n      }\n      const message = error instanceof Error ? error.message : String(error);\n      uiSession?.sendToolCancelled(message);\n      const schemaText = spec.inputSchema ? `\\n\\nExpected parameters:\\n${formatSchema(spec.inputSchema)}` : \"\";\n      const guarded = await guardMcpOutput([{ type: \"text\" as const, text: message }], { ...outputGuardOptions, prefix: \"Failed to call tool: \", suffix: schemaText });\n      return {\n        content: guarded.content,\n        details: { error: \"call_failed\", server: spec.serverName, ...guardedMcpDetails(guarded) },\n      };\n    } finally {\n      if (uiSession?.reused) {\n        uiSession.close();\n      }\n      state.manager.decrementInFlight(spec.serverName);\n      state.manager.touch(spec.serverName);\n    }\n  };\n}\n"]}
+{"version":3,"file":"direct-tools.d.ts","sourceRoot":"","sources":["../../../src/builtin-extensions/pi-mcp-adapter/direct-tools.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAC5D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAOzD,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,SAAS,EACjB,KAAK,EAAE,aAAa,GAAG,IAAI,EAC3B,MAAM,EAAE,QAAQ,GAAG,MAAM,GAAG,OAAO,EACnC,WAAW,CAAC,EAAE,MAAM,EAAE,GACrB,cAAc,EAAE,CAoGlB;AAED,wBAAgB,qCAAqC,CACnD,MAAM,EAAE,SAAS,EACjB,KAAK,EAAE,aAAa,GAAG,IAAI,GAC1B,MAAM,EAAE,CAkBV;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,SAAS,EACjB,KAAK,EAAE,aAAa,GAAG,IAAI,EAC3B,WAAW,EAAE,cAAc,EAAE,GAC5B,MAAM,CAsDR","sourcesContent":["// @ts-nocheck\nimport type { DirectToolSpec, McpConfig } from \"./types.ts\";\nimport type { MetadataCache } from \"./metadata-cache.ts\";\nimport { isServerCacheValid } from \"./metadata-cache.ts\";\nimport { formatToolName, isToolExcluded } from \"./types.ts\";\nimport { resourceNameToToolName } from \"./resource-tools.ts\";\n\nconst BUILTIN_NAMES = new Set([\"read\", \"bash\", \"edit\", \"write\", \"grep\", \"find\", \"ls\", \"mcp\"]);\n\nexport function resolveDirectTools(\n  config: McpConfig,\n  cache: MetadataCache | null,\n  prefix: \"server\" | \"none\" | \"short\",\n  envOverride?: string[],\n): DirectToolSpec[] {\n  const specs: DirectToolSpec[] = [];\n  if (!cache) return specs;\n\n  const seenNames = new Set<string>();\n\n  const envServers = new Set<string>();\n  const envTools = new Map<string, Set<string>>();\n  if (envOverride) {\n    for (let item of envOverride) {\n      item = item.replace(/\\/+$/, \"\");\n      if (item.includes(\"/\")) {\n        const [server, tool] = item.split(\"/\", 2);\n        if (server && tool) {\n          if (!envTools.has(server)) envTools.set(server, new Set());\n          envTools.get(server)!.add(tool);\n        } else if (server) {\n          envServers.add(server);\n        }\n      } else if (item) {\n        envServers.add(item);\n      }\n    }\n  }\n\n  const globalDirect = config.settings?.directTools;\n\n  for (const [serverName, definition] of Object.entries(config.mcpServers)) {\n    const serverCache = cache.servers[serverName];\n    if (!serverCache || !isServerCacheValid(serverCache, definition)) continue;\n\n    let toolFilter: true | string[] | false = false;\n\n    if (envOverride) {\n      if (envServers.has(serverName)) {\n        toolFilter = true;\n      } else if (envTools.has(serverName)) {\n        toolFilter = [...envTools.get(serverName)!];\n      }\n    } else {\n      if (definition.directTools !== undefined) {\n        toolFilter = definition.directTools;\n      } else if (globalDirect) {\n        toolFilter = globalDirect;\n      }\n    }\n\n    if (!toolFilter) continue;\n\n    for (const tool of serverCache.tools ?? []) {\n      if (toolFilter !== true && !toolFilter.includes(tool.name)) continue;\n      if (isToolExcluded(tool.name, serverName, prefix, definition.excludeTools)) continue;\n      const prefixedName = formatToolName(tool.name, serverName, prefix);\n      if (BUILTIN_NAMES.has(prefixedName)) {\n        console.warn(`MCP: skipping direct tool \"${prefixedName}\" (collides with builtin)`);\n        continue;\n      }\n      if (seenNames.has(prefixedName)) {\n        console.warn(`MCP: skipping duplicate direct tool \"${prefixedName}\" from \"${serverName}\"`);\n        continue;\n      }\n      seenNames.add(prefixedName);\n      specs.push({\n        serverName,\n        originalName: tool.name,\n        prefixedName,\n        description: tool.description ?? \"\",\n        inputSchema: tool.inputSchema,\n        uiResourceUri: tool.uiResourceUri,\n        uiStreamMode: tool.uiStreamMode,\n      });\n    }\n\n    if (definition.exposeResources !== false) {\n      for (const resource of serverCache.resources ?? []) {\n        const baseName = `get_${resourceNameToToolName(resource.name)}`;\n        if (toolFilter !== true && !toolFilter.includes(baseName)) continue;\n        if (isToolExcluded(baseName, serverName, prefix, definition.excludeTools)) continue;\n        const prefixedName = formatToolName(baseName, serverName, prefix);\n        if (BUILTIN_NAMES.has(prefixedName)) {\n          console.warn(`MCP: skipping direct resource tool \"${prefixedName}\" (collides with builtin)`);\n          continue;\n        }\n        if (seenNames.has(prefixedName)) {\n          console.warn(`MCP: skipping duplicate direct resource tool \"${prefixedName}\" from \"${serverName}\"`);\n          continue;\n        }\n        seenNames.add(prefixedName);\n        specs.push({\n          serverName,\n          originalName: baseName,\n          prefixedName,\n          description: resource.description ?? `Read resource: ${resource.uri}`,\n          resourceUri: resource.uri,\n        });\n      }\n    }\n  }\n\n  return specs;\n}\n\nexport function getMissingConfiguredDirectToolServers(\n  config: McpConfig,\n  cache: MetadataCache | null,\n): string[] {\n  const missing: string[] = [];\n  const globalDirect = config.settings?.directTools;\n\n  for (const [serverName, definition] of Object.entries(config.mcpServers)) {\n    const hasDirectTools = definition.directTools !== undefined\n      ? !!definition.directTools\n      : !!globalDirect;\n\n    if (!hasDirectTools) continue;\n\n    const serverCache = cache?.servers?.[serverName];\n    if (!serverCache || !isServerCacheValid(serverCache, definition)) {\n      missing.push(serverName);\n    }\n  }\n\n  return missing;\n}\n\nexport function buildProxyDescription(\n  config: McpConfig,\n  cache: MetadataCache | null,\n  directSpecs: DirectToolSpec[],\n): string {\n  const prefix = config.settings?.toolPrefix ?? \"server\";\n  let desc = `MCP gateway - connect to MCP servers and call their tools. Non-MCP Pi tools should be called directly, not through mcp.\\n`;\n\n  const directByServer = new Map<string, number>();\n  for (const spec of directSpecs) {\n    directByServer.set(spec.serverName, (directByServer.get(spec.serverName) ?? 0) + 1);\n  }\n  if (directByServer.size > 0) {\n    const parts = [...directByServer.entries()].map(\n      ([server, count]) => `${server} (${count})`,\n    );\n    desc += `\\nDirect tools available (call as normal tools): ${parts.join(\", \")}\\n`;\n  }\n\n  const serverSummaries: string[] = [];\n  for (const serverName of Object.keys(config.mcpServers)) {\n    const entry = cache?.servers?.[serverName];\n    const definition = config.mcpServers[serverName];\n    const toolCount = (entry?.tools ?? []).filter(\n      (tool) => !isToolExcluded(tool.name, serverName, prefix, definition.excludeTools),\n    ).length;\n    const resourceCount = definition?.exposeResources !== false\n      ? (entry?.resources ?? []).filter((resource) => {\n          const baseName = `get_${resourceNameToToolName(resource.name)}`;\n          return !isToolExcluded(baseName, serverName, prefix, definition.excludeTools);\n        }).length\n      : 0;\n    const totalItems = toolCount + resourceCount;\n    if (totalItems === 0) continue;\n    const directCount = directByServer.get(serverName) ?? 0;\n    const proxyCount = totalItems - directCount;\n    if (proxyCount > 0) {\n      serverSummaries.push(`${serverName} (${proxyCount} tools)`);\n    }\n  }\n\n  if (serverSummaries.length > 0) {\n    desc += `\\nServers: ${serverSummaries.join(\", \")}\\n`;\n  }\n\n  desc += `\\nUsage:\\n`;\n  desc += `  mcp({ })                              → Show server status\\n`;\n  desc += `  mcp({ server: \"name\" })               → List tools from server\\n`;\n  desc += `  mcp({ search: \"query\" })              → Search MCP tools by name/description\\n`;\n  desc += `  mcp({ describe: \"tool_name\" })        → Show tool details and parameters\\n`;\n  desc += `  mcp({ connect: \"server-name\" })       → Connect to a server and refresh metadata\\n`;\n  desc += `  mcp({ tool: \"name\", args: '{\"key\": \"value\"}' })    → Call a tool (args is JSON string)\\n`;\n  desc += `  mcp({ action: \"ui-messages\" })        → Retrieve accumulated messages from completed UI sessions\\n`;\n  desc += `  mcp({ action: \"auth-start\", server: \"name\" })      → Start manual OAuth and get a browser URL\\n`;\n  desc += `  mcp({ action: \"auth-complete\", server: \"name\", args: '{\"redirectUrl\":\"...\"}' }) → Complete manual OAuth\\n`;\n  desc += `\\nMode: action > tool (call) > connect > describe > search > server (list) > nothing (status)`;\n\n  return desc;\n}\n"]}

package/dist/builtin-extensions/pi-mcp-adapter/direct-tools.js

@@ -1,53 +1,7 @@
-import { UrlElicitationRequiredError } from "@modelcontextprotocol/sdk/types.js";
-import { lazyConnect, getFailureAgeSeconds } from "./init.js";
-import { abortable, throwIfAborted } from "./abort.js";
 import { isServerCacheValid } from "./metadata-cache.js";
-import { formatSchema } from "./tool-metadata.js";
-import { resolveMcpResultContent, transformMcpContent } from "./tool-registrar.js";
-import { guardMcpOutput, guardedMcpDetails, resolveMcpOutputGuardOptions } from "./mcp-output-guard.js";
-import { maybeStartUiSession } from "./ui-session.js";
 import { formatToolName, isToolExcluded } from "./types.js";
 import { resourceNameToToolName } from "./resource-tools.js";
-import { authenticate, supportsOAuth } from "./mcp-auth-flow.js";
-import { formatAuthRequiredMessage } from "./utils.js";
 const BUILTIN_NAMES = new Set(["read", "bash", "edit", "write", "grep", "find", "ls", "mcp"]);
-function getDirectAuthRequiredMessage(state, serverName, defaultMessage = `MCP server "${serverName}" requires OAuth authentication. Run mcp({ action: "auth-start", server: "${serverName}" }) to get a browser URL, or /mcp-auth ${serverName} in an interactive local session.`) {
-    return formatAuthRequiredMessage(state.config, serverName, defaultMessage);
-}
-function getDirectAuthFailedMessage(state, serverName, message) {
-    const customGuidance = state.config.settings?.authRequiredMessage;
-    if (customGuidance) {
-        return `OAuth authentication failed for "${serverName}": ${message}. ${getDirectAuthRequiredMessage(state, serverName)}`;
-    }
-    return `OAuth authentication failed for "${serverName}": ${message}. Run mcp({ action: "auth-start", server: "${serverName}" }) to get a browser URL, or /mcp-auth ${serverName} in an interactive local session.`;
-}
-async function attemptDirectAutoAuth(state, serverName) {
-    if (state.config.settings?.autoAuth !== true) {
-        return { status: "skipped" };
-    }
-    const definition = state.config.mcpServers[serverName];
-    if (!definition || !supportsOAuth(definition) || !definition.url) {
-        return { status: "skipped" };
-    }
-    const grantType = definition.oauth ? definition.oauth.grantType ?? "authorization_code" : "authorization_code";
-    if (!state.ui && grantType !== "client_credentials") {
-        return {
-            status: "failed",
-            message: getDirectAuthRequiredMessage(state, serverName, `MCP server "${serverName}" requires OAuth authentication. Run mcp({ action: "auth-start", server: "${serverName}" }) to get a browser URL, or /mcp-auth ${serverName} in an interactive local session.`),
-        };
-    }
-    try {
-        await authenticate(serverName, definition.url, definition);
-        return { status: "success" };
-    }
-    catch (error) {
-        const message = error instanceof Error ? error.message : String(error);
-        return {
-            status: "failed",
-            message: getDirectAuthFailedMessage(state, serverName, message),
-        };
-    }
-}
 export function resolveDirectTools(config, cache, prefix, envOverride) {
     const specs = [];
     if (!cache)
@@ -215,160 +169,4 @@ export function buildProxyDescription(config, cache, directSpecs) {
     desc += `\nMode: action > tool (call) > connect > describe > search > server (list) > nothing (status)`;
     return desc;
 }
-export function createDirectToolExecutor(getState, getInitPromise, spec) {
-    return async function execute(_toolCallId, params, signal) {
-        throwIfAborted(signal);
-        let state = getState();
-        const initPromise = getInitPromise();
-        if (!state && initPromise) {
-            try {
-                state = await initPromise;
-            }
-            catch (error) {
-                const message = error instanceof Error ? error.message : String(error);
-                return {
-                    content: [{ type: "text", text: `MCP initialization failed: ${message}` }],
-                    details: { error: "init_failed", message },
-                };
-            }
-        }
-        if (!state) {
-            return {
-                content: [{ type: "text", text: "MCP not initialized" }],
-                details: { error: "not_initialized" },
-            };
-        }
-        let connected = await lazyConnect(state, spec.serverName, signal);
-        let autoAuthAttempted = false;
-        if (!connected && state.manager.getConnection(spec.serverName)?.status === "needs-auth") {
-            autoAuthAttempted = true;
-            const autoAuth = await attemptDirectAutoAuth(state, spec.serverName);
-            if (autoAuth.status === "failed") {
-                return {
-                    content: [{ type: "text", text: autoAuth.message }],
-                    details: { error: "auth_required", server: spec.serverName, message: autoAuth.message },
-                };
-            }
-            if (autoAuth.status === "success") {
-                await state.manager.close(spec.serverName);
-                state.failureTracker.delete(spec.serverName);
-                connected = await lazyConnect(state, spec.serverName, signal);
-            }
-        }
-        if (!connected) {
-            const authConnection = state.manager.getConnection(spec.serverName);
-            if (authConnection?.status === "needs-auth") {
-                const message = getDirectAuthRequiredMessage(state, spec.serverName);
-                return {
-                    content: [{ type: "text", text: message }],
-                    details: { error: "auth_required", server: spec.serverName, message, autoAuthAttempted },
-                };
-            }
-            const failedAgo = getFailureAgeSeconds(state, spec.serverName);
-            return {
-                content: [{ type: "text", text: `MCP server "${spec.serverName}" not available${failedAgo !== null ? ` (failed ${failedAgo}s ago)` : ""}` }],
-                details: { error: "server_unavailable", server: spec.serverName },
-            };
-        }
-        const connection = state.manager.getConnection(spec.serverName);
-        if (!connection || connection.status !== "connected") {
-            return {
-                content: [{ type: "text", text: `MCP server "${spec.serverName}" not connected` }],
-                details: { error: "not_connected", server: spec.serverName },
-            };
-        }
-        let uiSession = null;
-        const requestOptions = state.manager.getRequestOptions?.(spec.serverName, signal) ?? (signal ? { signal } : undefined);
-        const outputGuardOptions = resolveMcpOutputGuardOptions(state.config.settings);
-        try {
-            state.manager.touch(spec.serverName);
-            state.manager.incrementInFlight(spec.serverName);
-            if (spec.resourceUri) {
-                const result = await connection.client.readResource({ uri: spec.resourceUri }, requestOptions);
-                const content = (result.contents ?? []).map(c => ({
-                    type: "text",
-                    text: "text" in c ? c.text : ("blob" in c ? `[Binary data: ${c.mimeType ?? "unknown"}]` : JSON.stringify(c)),
-                }));
-                const guarded = await guardMcpOutput(content.length > 0 ? content : [{ type: "text", text: "(empty resource)" }], outputGuardOptions);
-                return {
-                    content: guarded.content,
-                    details: { server: spec.serverName, resourceUri: spec.resourceUri, ...guardedMcpDetails(guarded) },
-                };
-            }
-            const hasUi = !!spec.uiResourceUri;
-            uiSession = hasUi
-                ? await maybeStartUiSession(state, {
-                    serverName: spec.serverName,
-                    toolName: spec.originalName,
-                    toolArgs: params ?? {},
-                    uiResourceUri: spec.uiResourceUri,
-                    streamMode: spec.uiStreamMode,
-                })
-                : null;
-            const resultPromise = connection.client.callTool({
-                name: spec.originalName,
-                arguments: params ?? {},
-                _meta: uiSession?.requestMeta,
-            }, undefined, requestOptions);
-            const result = await abortable(resultPromise, signal);
-            uiSession?.sendToolResult(result);
-            if (result.isError) {
-                const mcpContent = (result.content ?? []);
-                const content = transformMcpContent(mcpContent);
-                const outputContent = content.length > 0 ? content : [{ type: "text", text: "(empty result)" }];
-                const schemaText = spec.inputSchema ? `\n\nExpected parameters:\n${formatSchema(spec.inputSchema)}` : "";
-                const guarded = await guardMcpOutput(outputContent, { ...outputGuardOptions, prefix: "Error: ", suffix: schemaText, emptyTextFallback: "Tool execution failed" });
-                return {
-                    content: guarded.content,
-                    details: { error: "tool_error", server: spec.serverName, ...guardedMcpDetails(guarded) },
-                };
-            }
-            const content = resolveMcpResultContent(result);
-            const outputContent = content.length > 0 ? content : [{ type: "text", text: "(empty result)" }];
-            if (hasUi) {
-                const uiMessage = uiSession?.reused
-                    ? "Updated the open UI."
-                    : "📺 Interactive UI is now open in your browser. I'll respond to your prompts and intents as you interact with it.";
-                const guarded = await guardMcpOutput(outputContent, { ...outputGuardOptions, suffix: `\n\n${uiMessage}` });
-                return {
-                    content: guarded.content,
-                    details: { server: spec.serverName, tool: spec.originalName, uiOpen: true, ...guardedMcpDetails(guarded) },
-                };
-            }
-            const guarded = await guardMcpOutput(outputContent, { ...outputGuardOptions });
-            return {
-                content: guarded.content,
-                details: { server: spec.serverName, tool: spec.originalName, ...guardedMcpDetails(guarded) },
-            };
-        }
-        catch (error) {
-            if (error instanceof UrlElicitationRequiredError) {
-                const action = await state.manager.handleUrlElicitationRequired(spec.serverName, error);
-                const message = action === "accept"
-                    ? "The original MCP tool did not run. Complete the opened browser interaction, then retry the tool."
-                    : `The URL interaction was ${action === "decline" ? "declined" : "cancelled"}.`;
-                uiSession?.sendToolCancelled(message);
-                return {
-                    content: [{ type: "text", text: message }],
-                    details: { error: "url_elicitation_required", server: spec.serverName, action },
-                };
-            }
-            const message = error instanceof Error ? error.message : String(error);
-            uiSession?.sendToolCancelled(message);
-            const schemaText = spec.inputSchema ? `\n\nExpected parameters:\n${formatSchema(spec.inputSchema)}` : "";
-            const guarded = await guardMcpOutput([{ type: "text", text: message }], { ...outputGuardOptions, prefix: "Failed to call tool: ", suffix: schemaText });
-            return {
-                content: guarded.content,
-                details: { error: "call_failed", server: spec.serverName, ...guardedMcpDetails(guarded) },
-            };
-        }
-        finally {
-            if (uiSession?.reused) {
-                uiSession.close();
-            }
-            state.manager.decrementInFlight(spec.serverName);
-            state.manager.touch(spec.serverName);
-        }
-    };
-}
 //# sourceMappingURL=direct-tools.js.map