@fitchmultz/pi-mcp-adapter 8.0.0 → 8.0.2

package/dist/tool-metadata.js

@@ -1,6 +1,4 @@
-import { getToolUiResourceUri } from "@modelcontextprotocol/ext-apps/app-bridge";
 import { formatToolName, isServerDisabled, isToolAllowed, resolveToolPrefix } from "./types.js";
-import { resourceNameToToolName } from "./resource-tools.js";
 import { extractToolUiStreamMode } from "./utils.js";
 import { extractUiToolVisibility, isUiToolVisibleToModel } from "./ui-tool-visibility.js";
 export function buildToolMetadata(tools, resources, definition, serverName, prefix) {
@@ -24,7 +22,13 @@ export function buildToolMetadata(tools, resources, definition, serverName, pref
         }
         let uiResourceUri;
         try {
-            uiResourceUri = getToolUiResourceUri({ _meta: tool._meta });
+            // MCP Apps metadata must also be readable from the cache before loading the SDK.
+            const uri = tool._meta?.ui?.resourceUri;
+            const resourceUri = uri === undefined ? tool._meta?.["ui/resourceUri"] : uri;
+            if (typeof resourceUri === "string" && resourceUri.startsWith("ui://"))
+                uiResourceUri = resourceUri;
+            else if (resourceUri !== undefined)
+                failedTools.push(tool.name);
         }
         catch {
             failedTools.push(tool.name);
@@ -197,3 +201,16 @@ function appendSchemaAnnotations(parts, schema) {
         parts.push(`[default: ${JSON.stringify(schema.default)}]`);
     }
 }
+function resourceNameToToolName(name) {
+    let result = name
+        .replace(/[^a-zA-Z0-9]/g, "_")
+        .replace(/_+/g, "_")
+        .replace(/^_+/, "") // Remove leading underscores
+        .replace(/_+$/, "") // Remove trailing underscores
+        .toLowerCase();
+    // Ensure we have a valid name
+    if (!result || /^\d/.test(result)) {
+        result = "resource" + (result ? "_" + result : "");
+    }
+    return result;
+}

package/dist/tool-result-renderer.d.ts

@@ -1,4 +1,4 @@
-import { type AgentToolResult, type Theme, type ToolRenderResultOptions } from "@earendil-works/pi-coding-agent";
+import type { AgentToolResult, Theme, ToolRenderResultOptions } from "@earendil-works/pi-coding-agent";
 import { type Component, Text } from "@earendil-works/pi-tui";
 type McpToolResultDetails = Record<string, unknown> & {
     error?: unknown;

package/dist/tool-result-renderer.js

@@ -1,5 +1,4 @@
-import { keyHint } from "@earendil-works/pi-coding-agent";
-import { Text } from "@earendil-works/pi-tui";
+import { getKeybindings, Text } from "@earendil-works/pi-tui";
 const plainTheme = {
     fg: (_name, text) => text,
     bold: (text) => text,
@@ -54,6 +53,14 @@ class CollapsibleText {
     }
     invalidate() { }
 }
+// Read the shared TUI keybinding registry without importing the entire host SDK.
+function expandHint(theme) {
+    const keys = getKeybindings().getKeys("app.tools.expand").join("/")
+        .split("/").map(key => key.split("+")
+        .map(part => process.platform === "darwin" && part.toLowerCase() === "alt" ? "option" : part)
+        .join("+")).join("/");
+    return theme.fg("dim", keys) + theme.fg("muted", " to expand");
+}
 function truncateText(value, maxChars) {
     if (value.length <= maxChars)
         return value;
@@ -225,5 +232,5 @@ export function renderMcpToolResult(result, options, theme, context) {
         ...(identity ? [activeTheme.fg("muted", identity)] : []),
         ...display.lines.map((line) => activeTheme.fg("toolOutput", line)),
     ].join("\n");
-    return new CollapsibleText(output, expanded, DEFAULT_MAX_COLLAPSED_LINES + (identity ? 1 : 0), activeTheme.fg("muted", "…"), activeTheme.fg("muted", `(${keyHint("app.tools.expand", "to expand")})`), display.truncated);
+    return new CollapsibleText(output, expanded, DEFAULT_MAX_COLLAPSED_LINES + (identity ? 1 : 0), activeTheme.fg("muted", "…"), activeTheme.fg("muted", `(${expandHint(activeTheme)})`), display.truncated);
 }

package/dist/types.d.ts

@@ -104,7 +104,7 @@ export interface UiHostContext {
     [key: string]: unknown;
 }
 export type UiDisplayMode = "inline" | "fullscreen" | "pip";
-export { UI_STREAM_HOST_CONTEXT_KEY, UI_STREAM_REQUEST_META_KEY, UI_STREAM_RESULT_PATCH_METHOD, SERVER_STREAM_RESULT_PATCH_METHOD, UI_STREAM_STRUCTURED_CONTENT_KEY, uiStreamModeSchema, visualizationStreamPhaseSchema, visualizationStreamFrameTypeSchema, visualizationStreamStatusSchema, uiStreamHostContextSchema, visualizationStreamEnvelopeSchema, uiStreamCallToolResultSchema, uiStreamResultPatchNotificationSchema, serverStreamResultPatchNotificationSchema, getUiStreamHostContext, getVisualizationStreamEnvelope, type UiStreamMode, type VisualizationStreamPhase, type VisualizationStreamFrameType, type VisualizationStreamStatus, type UiStreamHostContext, type VisualizationStreamEnvelope, type UiStreamCallToolResult, type UiStreamResultPatchNotification, type ServerStreamResultPatchNotification, type UiStreamSummary, } from "./ui-stream-types.ts";
+export type { UiStreamMode, VisualizationStreamPhase, VisualizationStreamFrameType, VisualizationStreamStatus, UiStreamHostContext, VisualizationStreamEnvelope, UiStreamCallToolResult, UiStreamResultPatchNotification, ServerStreamResultPatchNotification, UiStreamSummary, } from "./ui-stream-types.ts";
 export interface UiMessageParams {
     role?: string;
     content?: unknown[];

package/dist/types.js

@@ -1,9 +1,6 @@
 /** Versioned shared-event-bus channel for read-only MCP runtime snapshots. */
 export const MCP_STATUS_EVENT = "fitch-mcp-adapter/status/v1";
 export const MCP_STATUS_SNAPSHOT_VERSION = 1;
-// Re-export stream types from the shared lightweight module.
-// This allows the example package to import stream schemas without pulling the full types.ts dependency graph.
-export { UI_STREAM_HOST_CONTEXT_KEY, UI_STREAM_REQUEST_META_KEY, UI_STREAM_RESULT_PATCH_METHOD, SERVER_STREAM_RESULT_PATCH_METHOD, UI_STREAM_STRUCTURED_CONTENT_KEY, uiStreamModeSchema, visualizationStreamPhaseSchema, visualizationStreamFrameTypeSchema, visualizationStreamStatusSchema, uiStreamHostContextSchema, visualizationStreamEnvelopeSchema, uiStreamCallToolResultSchema, uiStreamResultPatchNotificationSchema, serverStreamResultPatchNotificationSchema, getUiStreamHostContext, getVisualizationStreamEnvelope, } from "./ui-stream-types.js";
 /**
  * Extract prompt text from either legacy MCP UI message shapes or native AppBridge user messages.
  */

package/dist/ui-message-history.js

@@ -1,8 +1,9 @@
-import { appendFileSync, createReadStream, mkdirSync, mkdtempSync, writeFileSync } from "node:fs";
+import { createReadStream, mkdirSync, mkdtempSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join, resolve } from "node:path";
 import { randomBytes } from "node:crypto";
 import { createInterface } from "node:readline";
+import { appendPlainOutput } from "./plain-result-reader.js";
 /** Private append-only history; failed writes stay owned in memory, never silently discarded. */
 export function createUiMessageHistory(outputDirectory) {
     const messages = { prompts: [], intents: [], notifications: [], contexts: [] };
@@ -26,7 +27,7 @@ export function createUiMessageHistory(outputDirectory) {
                 }
                 const line = JSON.stringify({ category, value }) + "\n";
                 // ponytail: synchronous append owns acceptance order; upgrade to an awaited serial writer if local disk latency becomes material.
-                appendFileSync(messages.historyRef, line, { flush: true });
+                appendPlainOutput(messages.historyRef, line);
                 messages.historyBytes += Buffer.byteLength(line);
                 messages.historyCount++;
                 return undefined;

package/dist/ui-resource-handler.d.ts

@@ -1,6 +1,7 @@
-import { type SessionRecoveryDeps } from "./session-recovery.ts";
+import type { SessionRecoveryDeps } from "./session-recovery.ts";
 import type { McpServerManager } from "./server-manager.ts";
 import { type McpConfig, type UiResourceContent } from "./types.ts";
+export declare const RESOURCE_MIME_TYPE = "text/html;profile=mcp-app";
 interface ReadUiResourceOptions {
     config?: McpConfig;
     signal?: AbortSignal;

package/dist/ui-resource-handler.js

@@ -1,8 +1,7 @@
-import { RESOURCE_MIME_TYPE } from "@modelcontextprotocol/ext-apps/app-bridge";
-import { UrlElicitationRequiredError } from "@modelcontextprotocol/client";
 import { logger } from "./logger.js";
-import { SessionRecoveryAuthRequiredError, withSessionRecovery } from "./session-recovery.js";
 import { isServerDisabled } from "./types.js";
+// MCP Apps resource media type; metadata reads must not import the app bridge.
+export const RESOURCE_MIME_TYPE = "text/html;profile=mcp-app";
 export class UiResourceHandler {
     log = logger.child({ component: "UiResourceHandler" });
     manager;
@@ -12,6 +11,8 @@ export class UiResourceHandler {
         this.config = config;
     }
     async readUiResource(serverName, uri, options = {}) {
+        const { UrlElicitationRequiredError } = await import("@modelcontextprotocol/client");
+        const { SessionRecoveryAuthRequiredError, withSessionRecovery } = await import("./session-recovery.js");
         const log = this.log.child({ server: serverName, uri });
         if (!uri.startsWith("ui://")) {
             throw new Error(`Invalid UI resource "${uri}": URI must start with ui://`);

package/dist/ui-server.js

@@ -11,7 +11,8 @@ import { SessionRecoveryAuthRequiredError, withSessionRecovery } from "./session
 import { ensureToolCallApproved, isToolCallApprovalRequired } from "./tool-approval.js";
 import { extractUiToolVisibility, isUiToolCallableByApp } from "./ui-tool-visibility.js";
 import { createUiMessageHistory } from "./ui-message-history.js";
-import { createUiModelContextUpdate, extractUiPromptText, getVisualizationStreamEnvelope, isServerDisabled, isToolAllowed, resolveToolPrefix, } from "./types.js";
+import { createUiModelContextUpdate, extractUiPromptText, isServerDisabled, isToolAllowed, resolveToolPrefix, } from "./types.js";
+import { getVisualizationStreamEnvelope } from "./ui-stream-types.js";
 const MAX_BODY_SIZE = 2 * 1024 * 1024;
 const ABANDONED_GRACE_MS = 60_000;
 const WATCHDOG_INTERVAL_MS = 5_000;

package/dist/ui-session.js

@@ -2,7 +2,8 @@ import { execFile } from "node:child_process";
 import { randomUUID } from "node:crypto";
 import net from "node:net";
 import { UrlElicitationRequiredError } from "@modelcontextprotocol/client";
-import { createUiModelContextUpdate, extractUiPromptText, UI_STREAM_HOST_CONTEXT_KEY, UI_STREAM_REQUEST_META_KEY, UI_STREAM_STRUCTURED_CONTENT_KEY, } from "./types.js";
+import { createUiModelContextUpdate, extractUiPromptText, } from "./types.js";
+import { UI_STREAM_HOST_CONTEXT_KEY, UI_STREAM_REQUEST_META_KEY, UI_STREAM_STRUCTURED_CONTENT_KEY } from "./ui-stream-types.js";
 import { logger } from "./logger.js";
 import { startUiServer } from "./ui-server.js";
 import { isGlimpseAvailable, openGlimpseWindow } from "./glimpse-ui.js";

package/dist/utils.d.ts

@@ -1,6 +1,7 @@
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import type { McpConfig, ServerEntry } from "./types.ts";
 export declare const ADAPTER_VERSION: string;
+export declare const DEFAULT_MCP_SCRIPT_TIMEOUT_MS = 30000;
 export declare function normalizeRequestTimeoutMs(timeoutMs: number | undefined): number | undefined;
 export declare function openUrl(pi: ExtensionAPI, url: string, browser?: string, signal?: AbortSignal): Promise<void>;
 export declare function openPath(pi: ExtensionAPI, targetPath: string): Promise<void>;

package/dist/utils.js

@@ -15,6 +15,7 @@ function readAdapterVersion() {
     return "0.0.0";
 }
 export const ADAPTER_VERSION = readAdapterVersion();
+export const DEFAULT_MCP_SCRIPT_TIMEOUT_MS = 30_000;
 export function normalizeRequestTimeoutMs(timeoutMs) {
     return typeof timeoutMs === "number" && Number.isFinite(timeoutMs) && timeoutMs > 0
         ? timeoutMs

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@fitchmultz/pi-mcp-adapter",
-  "version": "8.0.0",
-  "description": "Fitch's independently maintained MCP adapter for Pi coding agent",
+  "version": "8.0.2",
+  "description": "Token-efficient MCP adapter for the Pi coding agent",
   "type": "module",
   "types": "./dist/index.d.ts",
   "exports": {
@@ -10,15 +10,12 @@
       "default": "./dist/index.js"
     },
     "./types": {
-      "types": "./dist/types.d.ts",
-      "default": "./dist/types.js"
+      "types": "./dist/public-types.d.ts",
+      "default": "./dist/public-types.js"
     }
   },
   "license": "MIT",
   "author": "Mitch Fultz",
-  "contributors": [
-    "Nico Bailon"
-  ],
   "homepage": "https://github.com/fitchmultz/pi-mcp-adapter",
   "bugs": "https://github.com/fitchmultz/pi-mcp-adapter/issues",
   "publishConfig": {
@@ -76,16 +73,16 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@modelcontextprotocol/client": "2.2.0",
-    "@modelcontextprotocol/core": "2.2.0",
+    "@modelcontextprotocol/client": "2.3.1",
+    "@modelcontextprotocol/core": "2.3.1",
     "@modelcontextprotocol/ext-apps": "2.0.3",
     "@napi-rs/keyring": "2.1.0",
     "cross-spawn": "7.0.6",
     "minisearch": "7.2.0",
     "open": "11.0.4",
-    "smol-toml": "1.9.0",
+    "smol-toml": "1.9.1",
     "strip-json-comments": "5.0.3",
-    "zod": "4.6.5"
+    "zod": "4.6.7"
   },
   "peerDependencies": {
     "@earendil-works/pi-ai": "*",
@@ -111,9 +108,9 @@
     "@earendil-works/pi-ai": "1.0.0",
     "@earendil-works/pi-coding-agent": "1.0.0",
     "@earendil-works/pi-tui": "1.0.0",
-    "@modelcontextprotocol/server": "2.2.0",
+    "@modelcontextprotocol/server": "2.3.1",
     "@types/cross-spawn": "6.0.6",
-    "@types/node": "24.19.0",
+    "@types/node": "24.19.1",
     "esbuild": "0.28.2",
     "typebox": "1.3.27",
     "typescript": "7.0.2",