@fitchmultz/pi-mcp-adapter 8.0.6 → 8.0.8

package/dist/mcp-setup-panel.js

@@ -1,6 +1,6 @@
 import { matchesKey, truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
 import { createPanelKeys } from "./panel-keys.js";
-import { KNOWN_SERVER_PRESETS } from "./config.js";
+import { KNOWN_SERVER_PRESETS, } from "./config.js";
 const DEFAULT_THEME = {
     border: "2",
     title: "36",
@@ -18,8 +18,9 @@ function fg(code, text) {
     return code ? `\x1b[${code}m${text}\x1b[0m` : text;
 }
 function wrapText(text, width) {
-    if (width <= 8)
+    if (width <= 8) {
         return [text];
+    }
     const words = text.split(/\s+/).filter(Boolean);
     const lines = [];
     let current = "";
@@ -29,12 +30,14 @@ function wrapText(text, width) {
             current = candidate;
             continue;
         }
-        if (current)
+        if (current) {
             lines.push(current);
+        }
         current = word;
     }
-    if (current)
+    if (current) {
         lines.push(current);
+    }
     return lines.length > 0 ? lines : [""];
 }
 export class McpSetupPanel {
@@ -68,8 +71,9 @@ export class McpSetupPanel {
         this.resetInactivityTimeout();
     }
     resetInactivityTimeout() {
-        if (this.inactivityTimeout)
+        if (this.inactivityTimeout) {
             clearTimeout(this.inactivityTimeout);
+        }
         this.inactivityTimeout = setTimeout(() => {
             this.cleanup();
             this.done();
@@ -84,24 +88,61 @@ export class McpSetupPanel {
     getActions() {
         const actions = [];
         if (this.screen === "empty") {
-            actions.push({ id: "run-setup", label: "Run setup", description: "Inspect detected configs, adopt imports, and scaffold a minimal `.mcp.json`." });
+            actions.push({
+                id: "run-setup",
+                label: "Run setup",
+                description: "Inspect detected configs, adopt imports, and scaffold a minimal `.mcp.json`.",
+            });
         }
         if (this.discovery.imports.length > 0) {
-            actions.push({ id: "adopt-imports", label: "Adopt detected compatibility imports", description: `Choose which host-specific MCP configs Pi should import into its own override file. ${this.discovery.imports.length} source${this.discovery.imports.length === 1 ? "" : "s"} found.` });
+            actions.push({
+                id: "adopt-imports",
+                label: "Adopt detected compatibility imports",
+                description: `Choose which host-specific MCP configs Pi should import into its own override file. ${this.discovery.imports.length} source${this.discovery.imports.length === 1 ? "" : "s"} found.`,
+            });
         }
-        actions.push({ id: "view-example", label: "View example `.mcp.json`", description: "Preview a working shared MCP config you can paste or adapt." });
+        actions.push({
+            id: "view-example",
+            label: "View example `.mcp.json`",
+            description: "Preview a working shared MCP config you can paste or adapt.",
+        });
         if (!this.discovery.sources.some((source) => source.id === "shared-project" && source.exists)) {
-            actions.push({ id: "scaffold-project", label: "Scaffold project `.mcp.json`", description: "Write a minimal project config using the standard shared MCP file path, then reload Pi." });
+            actions.push({
+                id: "scaffold-project",
+                label: "Scaffold project `.mcp.json`",
+                description: "Write a minimal project config using the standard shared MCP file path, then reload Pi.",
+            });
         }
-        actions.push({ id: "show-precedence", label: "Explain config precedence", description: "Show the read order and where Pi writes compatibility settings." });
+        actions.push({
+            id: "show-precedence",
+            label: "Explain config precedence",
+            description: "Show the read order and where Pi writes compatibility settings.",
+        });
         if (this.getDetectedPaths().length > 0) {
-            actions.push({ id: "open-paths", label: "Open detected config paths", description: "Browse the actual config files that Pi discovered on this machine." });
+            actions.push({
+                id: "open-paths",
+                label: "Open detected config paths",
+                description: "Browse the actual config files that Pi discovered on this machine.",
+            });
         }
         for (const preset of KNOWN_SERVER_PRESETS) {
-            actions.push({ id: "add-known-server", label: preset.name, description: preset.summary, preset });
+            actions.push({
+                id: "add-known-server",
+                label: preset.name,
+                description: preset.summary,
+                preset,
+            });
         }
-        if (!this.discovery.repoPrompt.configured && this.discovery.repoPrompt.executablePath && this.discovery.repoPrompt.targetPath && this.discovery.repoPrompt.entry && this.discovery.repoPrompt.serverName) {
-            actions.push({ id: "add-repoprompt", label: "Add RepoPrompt to shared MCP config", description: "Write a standard MCP entry for RepoPrompt to the recommended shared target, then reload MCP in-session." });
+        if (!this.discovery.repoPrompt.configured &&
+            this.discovery.repoPrompt.executablePath &&
+            this.discovery.repoPrompt.targetPath &&
+            this.discovery.repoPrompt.entry &&
+            this.discovery.repoPrompt.serverName) {
+            actions.push({
+                id: "add-repoprompt",
+                label: "Add RepoPrompt to shared MCP config",
+                description: "Write a standard MCP entry for RepoPrompt to the recommended shared target, then reload MCP in-session.",
+            });
         }
         actions.push({ id: "close", label: "Close", description: "Exit the onboarding flow." });
         return actions;
@@ -119,8 +160,9 @@ export class McpSetupPanel {
     }
     handleInput(data) {
         this.resetInactivityTimeout();
-        if (!this.busy)
+        if (!this.busy) {
             this.notice = null;
+        }
         if (matchesKey(data, "ctrl+c")) {
             this.cleanup();
             this.done();
@@ -136,8 +178,9 @@ export class McpSetupPanel {
             this.done();
             return;
         }
-        if (this.busy)
+        if (this.busy) {
             return;
+        }
         if (this.screen === "imports") {
             this.handleImportsInput(data);
             return;
@@ -159,8 +202,9 @@ export class McpSetupPanel {
         }
         if (this.keys.selectConfirm(data)) {
             const selected = this.getSelectedAction();
-            if (selected)
+            if (selected) {
                 void this.runAction(selected);
+            }
         }
     }
     handleImportsInput(data) {
@@ -177,8 +221,9 @@ export class McpSetupPanel {
         }
         if (matchesKey(data, "space")) {
             const current = imports[this.importCursor];
-            if (!current)
+            if (!current) {
                 return;
+            }
             if (this.selectedImports.has(current.kind)) {
                 this.selectedImports.delete(current.kind);
             }
@@ -206,8 +251,9 @@ export class McpSetupPanel {
         }
         if (this.keys.selectConfirm(data)) {
             const selected = paths[this.pathCursor];
-            if (!selected)
+            if (!selected) {
                 return;
+            }
             void this.runBusy(async () => {
                 await this.callbacks.openPath(selected);
                 this.notice = { text: `Opened ${selected}`, tone: "success" };
@@ -237,7 +283,10 @@ export class McpSetupPanel {
             await this.runBusy(async () => {
                 const result = await this.callbacks.scaffoldProjectConfig();
                 this.callbacks.markSetupCompleted();
-                this.notice = { text: `Wrote starter config to ${result.path}. Pi will reload after this panel closes.`, tone: "success" };
+                this.notice = {
+                    text: `Wrote starter config to ${result.path}. Pi will reload after this panel closes.`,
+                    tone: "success",
+                };
             });
             return;
         }
@@ -245,7 +294,10 @@ export class McpSetupPanel {
             await this.runBusy(async () => {
                 const result = await this.callbacks.addRepoPrompt();
                 this.callbacks.markSetupCompleted();
-                this.notice = { text: `Added ${result.serverName} to ${result.path}. Pi will reload after this panel closes.`, tone: "success" };
+                this.notice = {
+                    text: `Added ${result.serverName} to ${result.path}. Pi will reload after this panel closes.`,
+                    tone: "success",
+                };
             });
             return;
         }
@@ -254,7 +306,10 @@ export class McpSetupPanel {
             await this.runBusy(async () => {
                 const result = await this.callbacks.addKnownServer(preset);
                 this.callbacks.markSetupCompleted();
-                this.notice = { text: `Added ${result.serverName} to ${result.path}. Pi will reload after this panel closes.`, tone: "success" };
+                this.notice = {
+                    text: `Added ${result.serverName} to ${result.path}. Pi will reload after this panel closes.`,
+                    tone: "success",
+                };
             });
             return;
         }
@@ -263,11 +318,16 @@ export class McpSetupPanel {
             this.done();
             return;
         }
-        this.notice = { text: "Review the details below. Press Enter on an action with a side effect to apply it.", tone: "muted" };
+        this.notice = {
+            text: "Review the details below. Press Enter on an action with a side effect to apply it.",
+            tone: "muted",
+        };
         this.tui.requestRender();
     }
     async applySelectedImports() {
-        const selected = this.discovery.imports.filter((entry) => this.selectedImports.has(entry.kind)).map((entry) => entry.kind);
+        const selected = this.discovery.imports
+            .filter((entry) => this.selectedImports.has(entry.kind))
+            .map((entry) => entry.kind);
         if (selected.length === 0) {
             this.notice = { text: "Select at least one compatibility import first.", tone: "warning" };
             this.tui.requestRender();
@@ -276,9 +336,13 @@ export class McpSetupPanel {
         await this.runBusy(async () => {
             const result = await this.callbacks.adoptImports(selected);
             this.callbacks.markSetupCompleted();
-            this.notice = result.added.length > 0
-                ? { text: `Added ${result.added.join(", ")} to ${result.path}. Pi will reload after this panel closes.`, tone: "success" }
-                : { text: `No changes needed in ${result.path}.`, tone: "muted" };
+            this.notice =
+                result.added.length > 0
+                    ? {
+                        text: `Added ${result.added.join(", ")} to ${result.path}. Pi will reload after this panel closes.`,
+                        tone: "success",
+                    }
+                    : { text: `No changes needed in ${result.path}.`, tone: "muted" };
             this.screen = this.discovery.hasAnyConfig ? "setup" : "empty";
             this.actionCursor = 0;
         });
@@ -317,7 +381,11 @@ export class McpSetupPanel {
         }
         lines.push(this.padLine("", innerW));
         if (this.notice) {
-            const tone = this.notice.tone === "success" ? this.t.success : this.notice.tone === "warning" ? this.t.warning : this.t.hint;
+            const tone = this.notice.tone === "success"
+                ? this.t.success
+                : this.notice.tone === "warning"
+                    ? this.t.warning
+                    : this.t.hint;
             for (const line of wrapText(this.notice.text, contentW)) {
                 lines.push(this.padLine(fg(tone, line), innerW));
             }
@@ -348,9 +416,11 @@ export class McpSetupPanel {
         }
         for (let index = start; index < end; index++) {
             const action = actions[index];
-            if (!action)
+            if (!action) {
                 continue;
-            if (action.id === "add-known-server" && (index === start || actions[index - 1]?.id !== "add-known-server")) {
+            }
+            if (action.id === "add-known-server" &&
+                (index === start || actions[index - 1]?.id !== "add-known-server")) {
                 lines.push(this.padLine(fg(this.t.title, "Add a known server"), innerW));
             }
             const selected = index === this.actionCursor;
@@ -361,12 +431,14 @@ export class McpSetupPanel {
             lines.push(this.padLine(fg(this.t.muted, `… ${actions.length - end} more below`), innerW));
         }
         lines.push(this.padLine("", innerW));
-        const preview = this.previewOrError(width => this.getActionPreview(this.getSelectedAction(), width), innerW);
+        const preview = this.previewOrError((width) => this.getActionPreview(this.getSelectedAction(), width), innerW);
         for (const line of preview) {
             lines.push(this.padLine(line, innerW));
         }
         lines.push(this.padLine("", innerW));
-        const hint = compact ? "Enter select · Esc back" : "Enter selects, Esc goes back, Ctrl+C closes.";
+        const hint = compact
+            ? "Enter select · Esc back"
+            : "Enter selects, Esc goes back, Ctrl+C closes.";
         lines.push(this.padLine(fg(this.t.muted, hint), innerW));
         return lines;
     }
@@ -376,15 +448,18 @@ export class McpSetupPanel {
         lines.push(this.padLine("", innerW));
         for (let index = 0; index < this.discovery.imports.length; index++) {
             const entry = this.discovery.imports[index];
-            if (!entry)
+            if (!entry) {
                 continue;
+            }
             const selected = this.selectedImports.has(entry.kind) ? "[x]" : "[ ]";
             const cursor = index === this.importCursor ? fg(this.t.selected, "›") : " ";
             lines.push(this.padLine(`${cursor} ${selected} ${entry.kind}  ${entry.path}`, innerW));
         }
         lines.push(this.padLine("", innerW));
-        const selected = this.discovery.imports.filter((entry) => this.selectedImports.has(entry.kind)).map((entry) => entry.kind);
-        for (const line of this.previewOrError(width => this.formatWritePreview("Compatibility import write preview", this.callbacks.previewImports(selected), [], width), innerW)) {
+        const selected = this.discovery.imports
+            .filter((entry) => this.selectedImports.has(entry.kind))
+            .map((entry) => entry.kind);
+        for (const line of this.previewOrError((width) => this.formatWritePreview("Compatibility import write preview", this.callbacks.previewImports(selected), [], width), innerW)) {
             lines.push(this.padLine(line, innerW));
         }
         return lines;
@@ -397,8 +472,9 @@ export class McpSetupPanel {
         for (let index = 0; index < paths.length; index++) {
             const cursor = index === this.pathCursor ? fg(this.t.selected, "›") : " ";
             const path = paths[index];
-            if (path !== undefined)
+            if (path !== undefined) {
                 lines.push(this.padLine(`${cursor} ${path}`, innerW));
+            }
         }
         return lines;
     }
@@ -408,7 +484,8 @@ export class McpSetupPanel {
                 ? "No MCP servers are active right now."
                 : "No MCP config is active yet.");
         }
-        if (this.discovery.totalServerCount === 0 && (this.discovery.imports.length > 0 || !!this.discovery.repoPrompt.executablePath)) {
+        if (this.discovery.totalServerCount === 0 &&
+            (this.discovery.imports.length > 0 || Boolean(this.discovery.repoPrompt.executablePath))) {
             return fg(this.t.warning, "Pi found MCP-related setup options, but none are active in Pi yet.");
         }
         const shared = this.discovery.sources.filter((source) => source.kind === "shared" && source.serverCount > 0).length;
@@ -431,8 +508,9 @@ export class McpSetupPanel {
         return `Shared MCP files are preferred. Pi-owned files are only for compatibility imports and adapter-specific overrides.${hostNote}${conflictNote}`;
     }
     visibleActionRange(total) {
-        if (total <= COMPACT_ACTION_ROWS)
+        if (total <= COMPACT_ACTION_ROWS) {
             return { start: 0, end: total };
+        }
         const half = Math.floor(COMPACT_ACTION_ROWS / 2);
         const start = Math.min(Math.max(0, this.actionCursor - half), Math.max(0, total - COMPACT_ACTION_ROWS));
         return { start, end: Math.min(total, start + COMPACT_ACTION_ROWS) };
@@ -450,7 +528,9 @@ export class McpSetupPanel {
                     "Run setup to adopt host-specific imports, inspect detected paths, and scaffold a minimal `.mcp.json` if needed.",
                 ], previewW);
             case "adopt-imports":
-                return this.formatWritePreview("Compatibility import write preview", this.callbacks.previewImports(this.discovery.imports.filter((entry) => this.selectedImports.has(entry.kind)).map((entry) => entry.kind)), [
+                return this.formatWritePreview("Compatibility import write preview", this.callbacks.previewImports(this.discovery.imports
+                    .filter((entry) => this.selectedImports.has(entry.kind))
+                    .map((entry) => entry.kind)), [
                     `Detected imports: ${this.discovery.imports.map((entry) => `${entry.kind} (${entry.serverCount} servers)`).join(", ")}`,
                     "Selected imports are written into the Pi agent dir config as Pi-owned compatibility state.",
                 ], previewW);
@@ -479,8 +559,10 @@ export class McpSetupPanel {
                     "5. .mcp.json",
                     "6. .pi/fitch-mcp-adapter/mcp.json",
                     `Host discovery: ${this.discovery.hostConfigDiscovery}. Conflicts reported: ${this.discovery.conflicts.length}.`,
-                    ...this.discovery.conflicts.slice(0, 8).map((conflict) => `${conflict.serverName}: ${conflict.sources.map((source) => source.path).join(" -> ")} (winner: ${conflict.winner.path})`),
-                    "Pi writes compatibility imports and adapter-only overrides to Pi-owned files."
+                    ...this.discovery.conflicts
+                        .slice(0, 8)
+                        .map((conflict) => `${conflict.serverName}: ${conflict.sources.map((source) => source.path).join(" -> ")} (winner: ${conflict.winner.path})`),
+                    "Pi writes compatibility imports and adapter-only overrides to Pi-owned files.",
                 ], previewW);
             case "open-paths":
                 return this.formatPreview(this.getDetectedPaths().length > 0
@@ -500,8 +582,9 @@ export class McpSetupPanel {
             }
             case "add-known-server": {
                 const preset = action.preset;
-                if (!preset)
+                if (!preset) {
                     return this.formatPreview(["Known server preset is unavailable."], previewW);
+                }
                 return this.formatWritePreview(`${preset.name} write preview`, this.callbacks.previewKnownServer(preset), [preset.summary], previewW);
             }
             case "scaffold-project":
@@ -535,10 +618,13 @@ export class McpSetupPanel {
         for (const line of intro) {
             lines.push(...wrapText(line, width));
         }
-        if (intro.length > 0)
+        if (intro.length > 0) {
             lines.push("");
+        }
         lines.push(...wrapText(`${title}: ${preview.path}`, width));
-        lines.push(...wrapText(preview.existed ? "Existing file detected. Showing exact before/after diff." : "New file will be created. Showing exact content diff.", width));
+        lines.push(...wrapText(preview.existed
+            ? "Existing file detected. Showing exact before/after diff."
+            : "New file will be created. Showing exact content diff.", width));
         lines.push("");
         const diffLines = preview.diffText.split("\n");
         const maxLines = 18;

package/dist/mcp-status.js

@@ -2,11 +2,13 @@ import { MCP_STATUS_EVENT, MCP_STATUS_SNAPSHOT_VERSION, } from "./types.js";
 const FAILURE_BACKOFF_MS = 60 * 1000;
 function getActiveFailureAgeSeconds(state, serverName) {
     const failedAt = state.failureTracker.get(serverName);
-    if (!failedAt)
+    if (!failedAt) {
         return undefined;
+    }
     const ageMs = Date.now() - failedAt;
-    if (ageMs > FAILURE_BACKOFF_MS)
+    if (ageMs > FAILURE_BACKOFF_MS) {
         return undefined;
+    }
     return Math.round(ageMs / 1000);
 }
 /** Build a sanitized snapshot without connecting or querying any MCP server. */
@@ -21,10 +23,12 @@ export function createMcpStatusSnapshot(state) {
         const disabled = definition?.disabled === true;
         const connection = disabled ? undefined : state.manager.getConnection(name);
         const metadata = disabled ? undefined : state.toolMetadata.get(name);
-        const toolCount = metadata?.filter(tool => !tool.resourceUri).length ?? (connection?.status === "connected" ? connection.tools.length : 0);
+        const toolCount = metadata?.filter((tool) => !tool.resourceUri).length ??
+            (connection?.status === "connected" ? connection.tools.length : 0);
         const resourceCount = disabled
             ? undefined
-            : state.resourceCounts?.get(name) ?? (connection?.status === "connected" ? connection.resources.length : undefined);
+            : (state.resourceCounts?.get(name) ??
+                (connection?.status === "connected" ? connection.resources.length : undefined));
         const failedAgoSeconds = disabled ? undefined : getActiveFailureAgeSeconds(state, name);
         let status = "not-connected";
         if (disabled) {
@@ -45,8 +49,9 @@ export function createMcpStatusSnapshot(state) {
             status = "cached";
         }
         totalTools += disabled ? 0 : toolCount;
-        if (!disabled && resourceCount !== undefined)
+        if (!disabled && resourceCount !== undefined) {
             totalResources += resourceCount;
+        }
         servers.push({
             name,
             status,
@@ -68,8 +73,9 @@ export function createMcpStatusSnapshot(state) {
 }
 export function publishMcpStatusSnapshot(state, snapshot) {
     const events = state.statusEvents;
-    if (!events)
+    if (!events) {
         return;
+    }
     try {
         events.emit(MCP_STATUS_EVENT, snapshot ?? createMcpStatusSnapshot(state));
     }
@@ -78,8 +84,9 @@ export function publishMcpStatusSnapshot(state, snapshot) {
     }
 }
 export function publishMcpStatusShutdown(events) {
-    if (!events)
+    if (!events) {
         return;
+    }
     try {
         events.emit(MCP_STATUS_EVENT, {
             version: MCP_STATUS_SNAPSHOT_VERSION,

package/dist/mcp-trace.d.ts

@@ -1,5 +1,4 @@
-import type { Transport } from "@modelcontextprotocol/client";
-import type { JSONRPCMessage } from "@modelcontextprotocol/client";
+import type { Transport, JSONRPCMessage } from "@modelcontextprotocol/client";
 export declare const MCP_TRACE_SCHEMA_VERSION = 1;
 export declare const DEFAULT_MCP_TRACE_MAX_BYTES: number;
 export declare const DEFAULT_MCP_TRACE_MAX_EVENTS = 10000;
@@ -47,10 +46,16 @@ export interface McpTraceWriterOptions {
 }
 /** Redact strings before they can become durable trace metadata. */
 export declare function redactTraceText(value: string, maxLength?: number): string;
-export declare function createMcpTraceEvent(direction: McpTraceDirection, server: string, transport: McpTraceTransport, message: JSONRPCMessage, status: "sent" | "received" | "error", options?: {
+export interface McpTraceEventRequest {
+    direction: McpTraceDirection;
+    server: string;
+    transport: McpTraceTransport;
+    message: JSONRPCMessage;
+    status: "sent" | "received" | "error";
     relatedRequestId?: unknown;
     durationMs?: number;
-}): McpTraceEvent;
+}
+export declare function createMcpTraceEvent(request: McpTraceEventRequest): McpTraceEvent;
 export declare class McpTraceWriter {
     private readonly maxBytes;
     private readonly maxEvents;
@@ -77,7 +82,7 @@ export declare class McpTraceWriter {
 }
 export declare function createMcpTraceWriter(sessionCwd: string | undefined, settings?: McpTraceSettings, randomSuffix?: string): McpTraceWriter;
 export interface McpTraceObserver {
-    record(event: McpTraceEvent): void;
+    record: (event: McpTraceEvent) => void;
 }
 export declare function isMcpTraceEnabled(definition: {
     trace?: boolean;