pi-mcp-adapter 3.3.0 → 5.0.0

package/direct-tools.ts

@@ -8,7 +8,7 @@ import { describeFailure } from "./failure-backoff.ts";
 import { abortable, throwIfAborted } from "./abort.ts";
 import { formatSchema } from "./tool-metadata.ts";
 import { resolveMcpResultContent, transformMcpResourceContents } from "./tool-registrar.ts";
-import { guardMcpOutput, guardedMcpDetails, resolveMcpOutputGuardOptions } from "./mcp-output-guard.ts";
+import { guardMcpOutput, guardedMcpDetails, resolveMcpOutputGuardOptions, scriptPipeHint } from "./mcp-output-guard.ts";
 import { maybeStartUiSession, summarizeUiSessionResult, type UiSessionRuntime } from "./ui-session.ts";
 import { isServerDisabled } from "./types.ts";
 import { authenticate, supportsOAuth } from "./mcp-auth-flow.ts";
@@ -17,8 +17,8 @@ import { SessionRecoveryAuthRequiredError, withSessionRecovery } from "./session
 import { combineAbortSignals, isAbortError } from "./runtime-owner.ts";
 import { callToolViaTaskSession } from "./mcp-tasks.ts";
 import { callToolPausingForElicitation } from "./elicitation-handler.ts";
-import { recordObservedOutput } from "./output-shape.ts";
-import { ensureToolCallApproved } from "./tool-approval.ts";
+import { observedOutputRecorder } from "./output-shape.ts";
+import { ensureToolCallApproved, type ToolCallApprovalResult } from "./tool-approval.ts";
 import { getInputRequiredNeedsUiDetails } from "./errors.ts";
 
 type ClientCallToolResult = Awaited<ReturnType<Client["callTool"]>>;
@@ -129,8 +129,13 @@ type DirectToolExecute = (
 export function createDirectToolExecutor(
   getState: () => McpExtensionState | null,
   getInitPromise: () => Promise<McpExtensionState> | null,
-  spec: DirectToolSpec
+  spec: DirectToolSpec,
+  // Deferred tools (Pi 0.99+) keep the server's structuredContent.
+  structured = false,
 ): DirectToolExecute {
+  const structuredContentOf = (result: ClientCallToolResult) => structured && result.structuredContent !== undefined
+    ? { structuredContent: result.structuredContent as NonNullable<AgentToolResult["structuredContent"]> }
+    : {};
   return async function execute(toolCallId, params, signal) {
     throwIfAborted(signal);
     let state = getState();
@@ -213,30 +218,6 @@ export function createDirectToolExecutor(
     const annotations = spec.resourceUri
       ? undefined
       : state.toolMetadata.get(spec.serverName)?.find(tool => !tool.resourceUri && tool.originalName === spec.originalName)?.annotations;
-    const approval = await ensureToolCallApproved(state, spec.serverName, {
-      name: spec.prefixedName,
-      originalName: spec.originalName,
-      description: spec.description,
-      ...(spec.inputSchema !== undefined ? { inputSchema: spec.inputSchema } : {}),
-      ...(spec.resourceUri !== undefined ? { resourceUri: spec.resourceUri } : {}),
-      ...(spec.uiResourceUri !== undefined ? { uiResourceUri: spec.uiResourceUri } : {}),
-      ...(spec.uiStreamMode !== undefined ? { uiStreamMode: spec.uiStreamMode } : {}),
-      ...(annotations !== undefined ? { annotations } : {}),
-    }, normalizedParams, ownedSignal, spec.resourceUri ? "resource" : "direct");
-    if (approval.ok === false) {
-      const denied = approval.reason === "denied";
-      const message = denied
-        ? `The user declined approval to run MCP tool "${spec.originalName}" on server "${spec.serverName}".`
-        : `MCP tool "${spec.originalName}" on server "${spec.serverName}" is approval-gated and requires an interactive session.`;
-      return {
-        content: [{ type: "text" as const, text: message }],
-        details: {
-          error: denied ? "approval_denied" : "approval_required",
-          server: spec.serverName,
-          tool: spec.originalName,
-        },
-      };
-    }
 
     let uiSession: UiSessionRuntime | null = null;
     const requestOptions = state.manager.getRequestOptions?.(spec.serverName, ownedSignal) ?? (ownedSignal ? { signal: ownedSignal } : undefined);
@@ -266,9 +247,35 @@ export function createDirectToolExecutor(
       return state.manager.getConnection(spec.serverName);
     };
 
+    let approval: ToolCallApprovalResult | undefined;
     try {
+      // In flight from here so an idle check cannot close the server while the approval dialog is open.
       state.manager.touch(spec.serverName);
       state.manager.incrementInFlight(spec.serverName);
+      approval = await ensureToolCallApproved(state, spec.serverName, {
+        name: spec.prefixedName,
+        originalName: spec.originalName,
+        description: spec.description,
+        ...(spec.inputSchema !== undefined ? { inputSchema: spec.inputSchema } : {}),
+        ...(spec.resourceUri !== undefined ? { resourceUri: spec.resourceUri } : {}),
+        ...(spec.uiResourceUri !== undefined ? { uiResourceUri: spec.uiResourceUri } : {}),
+        ...(spec.uiStreamMode !== undefined ? { uiStreamMode: spec.uiStreamMode } : {}),
+        ...(annotations !== undefined ? { annotations } : {}),
+      }, normalizedParams, ownedSignal, spec.resourceUri ? "resource" : "direct");
+      if (approval.ok === false) {
+        const denied = approval.reason === "denied";
+        const message = denied
+          ? `The user declined approval to run MCP tool "${spec.originalName}" on server "${spec.serverName}".`
+          : `MCP tool "${spec.originalName}" on server "${spec.serverName}" is approval-gated and requires an interactive session.`;
+        return {
+          content: [{ type: "text" as const, text: message }],
+          details: {
+            error: denied ? "approval_denied" : "approval_required",
+            server: spec.serverName,
+            tool: spec.originalName,
+          },
+        };
+      }
 
       if (spec.resourceUri) {
         const result = await withSessionRecovery<ClientReadResourceResult>(
@@ -312,6 +319,7 @@ export function createDirectToolExecutor(
         : null;
 
       const requestMeta = withToolCallIdMeta(uiSession?.requestMeta, toolCallId);
+      const recordOutput = observedOutputRecorder(state, spec.serverName, spec.originalName);
       const result = await withSessionRecovery<ClientCallToolResult>(
         {
           manager: state.manager,
@@ -339,7 +347,7 @@ export function createDirectToolExecutor(
         },
       );
       uiSession?.sendToolResult(result as unknown as import("@modelcontextprotocol/client").CallToolResult);
-      if (!result.isError) recordObservedOutput(state, spec.serverName, spec.originalName, result as Record<string, unknown>);
+      if (!result.isError) recordOutput(result as Record<string, unknown>);
 
       if (result.isError) {
         const content = resolveMcpResultContent(result as Record<string, unknown>, state.owner?.signal);
@@ -353,6 +361,7 @@ export function createDirectToolExecutor(
         return {
           content: guarded.content,
           details: { error: "tool_error", server: spec.serverName, ...guardedMcpDetails(guarded) },
+          ...structuredContentOf(result),
         };
       }
 
@@ -375,18 +384,23 @@ export function createDirectToolExecutor(
             uiUrl: uiSummary.uiUrl,
             ...guardedMcpDetails(guarded),
           },
+          ...structuredContentOf(result),
         };
       }
 
       const guarded = await guardMcpOutput(outputContent, {
         ...outputGuardOptions,
+        ...scriptPipeHint(state.scriptTool, outputContent),
         ...(state.config.settings?.directToolResultDetails === "bounded" ? { rawMcpResult: result } : {}),
       });
       return {
         content: guarded.content,
         details: { server: spec.serverName, tool: spec.originalName, ...guardedMcpDetails(guarded) },
+        ...structuredContentOf(result),
       };
     } catch (error) {
+      // Approval errors, such as an abort while the dialog is open, propagate unchanged.
+      if (!approval) throw error;
       if (error instanceof SessionRecoveryAuthRequiredError) {
         const message = error.authMessage ?? getDirectAuthRequiredMessage(state, spec.serverName);
         uiSession?.sendToolCancelled(message);

package/dist/config.d.ts

@@ -5,10 +5,15 @@ export interface KnownServerPreset {
     name: string;
     summary: string;
     entry: ServerEntry;
+    /** Offered only when one of these app paths exists; the local server is probed after adding. */
+    desktopApp?: {
+        paths: readonly string[];
+        enableSteps: string;
+    };
 }
 export declare const KNOWN_SERVER_PRESETS: readonly KnownServerPreset[];
 interface ConfigSourceSpec {
-    id: "shared-global" | "agents-global" | "agents-nested-global" | "pi-global" | "shared-project-ancestor" | "pi-project-ancestor" | "shared-project" | "pi-project";
+    id: "shared-global" | "agents-global" | "agents-nested-global" | "pi-mcp-global" | "pi-global" | "shared-project-ancestor" | "pi-project-ancestor" | "shared-project" | "pi-mcp-project" | "pi-project";
     label: string;
     readPath: string;
     writePath: string;
@@ -71,6 +76,7 @@ export interface McpDiscoverySummary {
     totalServerCount: number;
     fingerprint: string;
     repoPrompt: RepoPromptDiscovery;
+    knownServerPresets: readonly KnownServerPreset[];
 }
 export interface McpStandardConfigSummary {
     sources: ConfigDiscoverySource[];
@@ -87,12 +93,12 @@ export interface ConfigWritePreview {
 }
 export type SharedConfigTarget = "project" | "global";
 export declare function getPiGlobalConfigPath(overridePath?: string): string;
-export declare function getLegacyPiMcpGlobalConfigPath(): string;
+export declare function getPiMcpGlobalConfigPath(): string;
 export declare function getGenericGlobalConfigPath(): string;
 export declare function getProjectConfigPath(cwd?: string): string;
 export declare function getProjectPiConfigPath(cwd?: string): string;
-export declare function getLegacyProjectPiMcpConfigPath(cwd?: string): string;
-export declare function getLegacyMcpMigrationNotices(cwd?: string, overridePath?: string, piOwnsServers?: boolean): string[];
+export declare function getProjectPiMcpConfigPath(cwd?: string): string;
+export declare function getLegacyMcpMigrationNotices(cwd?: string, overridePath?: string): string[];
 export declare function getSharedConfigPath(target: SharedConfigTarget, cwd?: string): string;
 export declare function getConfigDiscoveryPaths(overridePath?: string, cwd?: string): ConfigDiscoveryPath[];
 export declare function findAvailableImportConfigs(cwd?: string): DiscoveredImportConfig[];
@@ -114,6 +120,11 @@ export declare function loadMcpConfig(overridePath?: string, cwd?: string): McpC
 export declare function loadMcpConfigWithSources(overridePath?: string, cwd?: string): LoadedMcpConfig;
 export declare function resolveConfiguredClaudePluginMcp(config: McpConfig, cwd?: string): McpConfig;
 export declare function discoverConfiguredClaudePluginSkills(config: McpConfig, cwd?: string): string[];
+/** Returns why the entry is skipped when Pi would reject it or the adapter can't run it. */
+export declare function translatePiMcpServer(name: string, value: unknown): {
+    entry: ServerEntry;
+    ignored: string[];
+} | string;
 export declare function writeSharedConfigText(filePath: string, text: string): void;
 export declare function writeJevSemanticSearchConfig(overridePath: string | undefined, cwd: string, allowedServers: string[], effectiveJev?: unknown): {
     path: string;