@fitchmultz/pi-mcp-adapter 8.0.5 → 8.0.7

package/dist/mcp-panel.js

@@ -1,7 +1,7 @@
 import { matchesKey, truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
 import { createPanelKeys } from "./panel-keys.js";
 import { sanitizeTerminalText, stripOscSequences } from "./utils.js";
-import { reconstructToolMetadata } from "./metadata-cache.js";
+import { reconstructToolMetadata, } from "./metadata-cache.js";
 const DEFAULT_THEME = {
     border: "2",
     title: "2",
@@ -15,8 +15,9 @@ const DEFAULT_THEME = {
     cancel: "31",
 };
 function fg(code, text) {
-    if (!code)
+    if (!code) {
         return text;
+    }
     return `\x1b[${code}m${text}\x1b[0m`;
 }
 const RAINBOW_COLORS = [
@@ -32,8 +33,9 @@ function rainbowProgress(filled, total) {
     const dots = [];
     for (let i = 0; i < total; i++) {
         const color = RAINBOW_COLORS[i % RAINBOW_COLORS.length];
-        if (!color)
+        if (!color) {
             continue;
+        }
         dots.push(fg(color, i < filled ? "●" : "○"));
     }
     return dots.join(" ");
@@ -41,8 +43,9 @@ function rainbowProgress(filled, total) {
 function fuzzyScore(query, text) {
     const lq = query.toLowerCase();
     const lt = text.toLowerCase();
-    if (lt.includes(lq))
+    if (lt.includes(lq)) {
         return 100 + (lq.length / lt.length) * 50;
+    }
     let score = 0;
     let qi = 0;
     let consecutive = 0;
@@ -124,8 +127,9 @@ class McpPanel {
         this.keys = createPanelKeys(options.keybindings);
         this.prefix = config.settings?.toolPrefix ?? "server";
         for (const [serverName, definition] of Object.entries(config.mcpServers)) {
-            if (this.authOnly && !callbacks.canAuthenticate(serverName))
+            if (this.authOnly && !callbacks.canAuthenticate(serverName)) {
                 continue;
+            }
             const prov = provenance.get(serverName);
             const serverCache = cache?.servers?.[serverName];
             const globalDirect = config.settings?.directTools;
@@ -149,18 +153,20 @@ class McpPanel {
                 connectionStatus: status,
                 failureMessage,
                 tools: [],
-                hasCachedData: !!serverCache,
+                hasCachedData: Boolean(serverCache),
             };
             this.servers.push(server);
-            if (serverCache && !this.authOnly)
+            if (serverCache && !this.authOnly) {
                 this.rebuildServerTools(server, serverCache);
+            }
         }
         this.rebuildVisibleItems();
         this.resetInactivityTimeout();
     }
     resetInactivityTimeout() {
-        if (this.inactivityTimeout)
+        if (this.inactivityTimeout) {
             clearTimeout(this.inactivityTimeout);
+        }
         this.inactivityTimeout = setTimeout(() => {
             this.cleanup();
             this.done({ cancelled: true, changes: new Map() });
@@ -178,8 +184,9 @@ class McpPanel {
         this.visibleItems = [];
         for (let si = 0; si < this.servers.length; si++) {
             const server = this.servers[si];
-            if (!server)
+            if (!server) {
                 continue;
+            }
             if (query && this.authOnly) {
                 const score = mode === "name" ? fuzzyScore(query, server.name) : 0;
                 if (score > 0) {
@@ -191,14 +198,16 @@ class McpPanel {
             if (server.expanded || query) {
                 for (let ti = 0; ti < server.tools.length; ti++) {
                     const tool = server.tools[ti];
-                    if (!tool)
+                    if (!tool) {
                         continue;
+                    }
                     if (query) {
                         const score = mode === "name"
                             ? Math.max(fuzzyScore(query, tool.name), fuzzyScore(query, server.name) * 0.6)
                             : fuzzyScore(query, tool.description);
-                        if (score === 0)
+                        if (score === 0) {
                             continue;
+                        }
                     }
                     this.visibleItems.push({ type: "tool", serverIndex: si, toolIndex: ti });
                 }
@@ -220,8 +229,9 @@ class McpPanel {
         const changes = new Map();
         for (const server of this.servers) {
             const changed = server.tools.some((t) => t.isDirect !== t.wasDirect);
-            if (!changed)
+            if (!changed) {
                 continue;
+            }
             const directTools = server.tools.filter((t) => t.isDirect);
             if (directTools.length === server.tools.length && server.tools.length > 0) {
                 changes.set(server.name, true);
@@ -238,8 +248,9 @@ class McpPanel {
     handleInput(data) {
         this.resetInactivityTimeout();
         this.importNotice = null;
-        if (!this.authInFlight)
+        if (!this.authInFlight) {
             this.authNotice = null;
+        }
         if (this.confirmingDiscard) {
             this.handleDiscardInput(data);
             return;
@@ -283,8 +294,9 @@ class McpPanel {
             if (matchesKey(data, "space")) {
                 // Toggle even while in desc search
                 const item = this.visibleItems[this.cursorIndex];
-                if (item)
+                if (item) {
                     this.toggleItem(item);
+                }
                 return;
             }
             if (data.length === 1 && data.charCodeAt(0) >= 32) {
@@ -321,20 +333,24 @@ class McpPanel {
         }
         if (matchesKey(data, "space")) {
             const item = this.visibleItems[this.cursorIndex];
-            if (item && !this.authOnly)
+            if (item && !this.authOnly) {
                 this.toggleItem(item);
+            }
             return;
         }
         if (this.keys.selectConfirm(data)) {
             const item = this.visibleItems[this.cursorIndex];
-            if (!item)
+            if (!item) {
                 return;
+            }
             const server = this.servers[item.serverIndex];
-            if (!server)
+            if (!server) {
                 return;
+            }
             if (item.type === "server") {
-                if (server.connectionStatus === "disabled")
+                if (server.connectionStatus === "disabled") {
                     return;
+                }
                 if (this.authOnly || server.connectionStatus === "needs-auth") {
                     this.authenticateServer(server);
                     return;
@@ -345,8 +361,9 @@ class McpPanel {
             }
             else if (item.toolIndex !== undefined) {
                 const tool = server.tools[item.toolIndex];
-                if (!tool)
+                if (!tool) {
                     return;
+                }
                 tool.isDirect = !tool.isDirect;
                 if (tool.isDirect && server.source === "import") {
                     this.importNotice = "Only tool selections save to Pi config.";
@@ -357,32 +374,40 @@ class McpPanel {
         }
         if (matchesKey(data, "ctrl+a")) {
             const item = this.visibleItems[this.cursorIndex];
-            if (item)
+            if (item) {
                 this.authenticateSelectedServer(item);
+            }
             return;
         }
         if (matchesKey(data, "ctrl+r")) {
             const item = this.visibleItems[this.cursorIndex];
-            if (!item)
+            if (!item) {
                 return;
+            }
             const server = this.servers[item.serverIndex];
-            if (server)
+            if (server) {
                 this.reconnectServer(server);
+            }
             return;
         }
         if (matchesKey(data, "ctrl+y")) {
             const item = this.visibleItems[this.cursorIndex];
-            if (!item)
+            if (!item) {
                 return;
+            }
             const server = this.servers[item.serverIndex];
-            if (!server || server.connectionStatus !== "failed" || !server.failureMessage)
+            if (!server || server.connectionStatus !== "failed" || !server.failureMessage) {
                 return;
+            }
             const serverName = sanitizeDisplayText(server.name);
             const failureMessage = sanitizeDisplayText(server.failureMessage);
-            import("@earendil-works/pi-coding-agent").then(({ copyToClipboard }) => copyToClipboard(failureMessage)).then(() => {
+            import("@earendil-works/pi-coding-agent")
+                .then(({ copyToClipboard }) => copyToClipboard(failureMessage))
+                .then(() => {
                 this.authNotice = `Copied error for ${serverName} to clipboard`;
                 this.tui.requestRender();
-            }).catch((error) => {
+            })
+                .catch((error) => {
                 const message = sanitizeDisplayText(error instanceof Error ? error.message : String(error));
                 this.authNotice = `Failed to copy error for ${serverName}: ${message}`;
                 this.tui.requestRender();
@@ -390,8 +415,9 @@ class McpPanel {
             return;
         }
         if (data === "?") {
-            if (this.authOnly)
+            if (this.authOnly) {
                 return;
+            }
             this.descSearchActive = true;
             this.descQuery = "";
             this.rebuildVisibleItems();
@@ -417,14 +443,17 @@ class McpPanel {
     }
     authenticateSelectedServer(item) {
         const server = this.servers[item.serverIndex];
-        if (server)
+        if (server) {
             this.authenticateServer(server);
+        }
     }
     authenticateServer(server) {
-        if (this.authInFlight)
+        if (this.authInFlight) {
             return;
-        if (server.connectionStatus === "connecting" || server.connectionStatus === "disabled")
+        }
+        if (server.connectionStatus === "connecting" || server.connectionStatus === "disabled") {
             return;
+        }
         const serverName = sanitizeDisplayText(server.name);
         if (!this.callbacks.canAuthenticate(server.name)) {
             this.authNotice = `${serverName} does not use OAuth authentication.`;
@@ -433,7 +462,9 @@ class McpPanel {
         this.authInFlight = server.name;
         this.authNotice = `Authenticating ${serverName}...`;
         this.tui.requestRender();
-        this.callbacks.authenticate(server.name).then((result) => {
+        this.callbacks
+            .authenticate(server.name)
+            .then((result) => {
             server.connectionStatus = this.callbacks.getConnectionStatus(server.name);
             if (result.ok) {
                 this.authNotice = `OAuth finished for ${serverName}. Reconnecting...`;
@@ -446,7 +477,8 @@ class McpPanel {
             this.authNotice = `OAuth failed for ${serverName}${message ? `: ${message}` : ". Check the notification for details."}`;
             this.authInFlight = null;
             this.tui.requestRender();
-        }).catch((error) => {
+        })
+            .catch((error) => {
             const message = sanitizeDisplayText(error instanceof Error ? error.message : String(error));
             server.connectionStatus = this.callbacks.getConnectionStatus(server.name);
             this.authNotice = `OAuth failed for ${serverName}: ${message}`;
@@ -455,12 +487,15 @@ class McpPanel {
         });
     }
     reconnectServer(server, options = {}) {
-        if (server.connectionStatus === "connecting" || server.connectionStatus === "disabled")
+        if (server.connectionStatus === "connecting" || server.connectionStatus === "disabled") {
             return;
+        }
         const serverName = sanitizeDisplayText(server.name);
         server.connectionStatus = "connecting";
         this.tui.requestRender();
-        this.callbacks.reconnect(server.name, options.afterAuth).then((connected) => {
+        this.callbacks
+            .reconnect(server.name, options.afterAuth)
+            .then((connected) => {
             server.connectionStatus = this.callbacks.getConnectionStatus(server.name);
             server.failureMessage = this.callbacks.getFailureMessage?.(server.name) ?? null;
             if (server.connectionStatus === "connected") {
@@ -470,12 +505,14 @@ class McpPanel {
                 }
             }
             if (options.afterAuth) {
-                this.authNotice = connected && server.connectionStatus === "connected"
-                    ? `OAuth finished for ${serverName}. Reconnected.`
-                    : `OAuth finished for ${serverName}, but reconnect did not complete. Press ctrl+r to retry.`;
+                this.authNotice =
+                    connected && server.connectionStatus === "connected"
+                        ? `OAuth finished for ${serverName}. Reconnected.`
+                        : `OAuth finished for ${serverName}, but reconnect did not complete. Press ctrl+r to retry.`;
             }
             this.tui.requestRender();
-        }).catch((error) => {
+        })
+            .catch((error) => {
             server.connectionStatus = "failed";
             const message = sanitizeDisplayText(error instanceof Error ? error.message : String(error));
             this.authNotice = `Reconnect failed for ${serverName}: ${message}`;
@@ -483,23 +520,27 @@ class McpPanel {
         });
     }
     toggleItem(item) {
-        if (this.authOnly)
+        if (this.authOnly) {
             return;
+        }
         const server = this.servers[item.serverIndex];
-        if (!server)
+        if (!server) {
             return;
+        }
         if (item.type === "server") {
             const newState = !server.tools.every((t) => t.isDirect);
             if (server.source === "import" && newState) {
                 this.importNotice = "Only tool selections save to Pi config.";
             }
-            for (const t of server.tools)
+            for (const t of server.tools) {
                 t.isDirect = newState;
+            }
         }
         else if (item.toolIndex !== undefined) {
             const tool = server.tools[item.toolIndex];
-            if (!tool)
+            if (!tool) {
                 return;
+            }
             tool.isDirect = !tool.isDirect;
             if (tool.isDirect && server.source === "import") {
                 this.importNotice = "Only tool selections save to Pi config.";
@@ -537,18 +578,21 @@ class McpPanel {
         }
     }
     moveCursor(delta) {
-        if (this.visibleItems.length === 0)
+        if (this.visibleItems.length === 0) {
             return;
+        }
         this.cursorIndex = Math.max(0, Math.min(this.visibleItems.length - 1, this.cursorIndex + delta));
     }
     rebuildServerTools(server, entry) {
-        const existingState = new Map(server.tools.map(tool => [tool.name, tool]));
+        const existingState = new Map(server.tools.map((tool) => [tool.name, tool]));
         const metadata = reconstructToolMetadata(server.name, entry, this.prefix, server.definition);
-        server.resourceCount = metadata.filter(tool => tool.resourceUri !== undefined).length;
-        server.tools = metadata.filter(tool => tool.resourceUri === undefined).map(tool => {
+        server.resourceCount = metadata.filter((tool) => tool.resourceUri !== undefined).length;
+        server.tools = metadata
+            .filter((tool) => tool.resourceUri === undefined)
+            .map((tool) => {
             const previous = existingState.get(tool.originalName);
-            const pinned = server.toolFilter === true
-                || (Array.isArray(server.toolFilter) && server.toolFilter.includes(tool.originalName));
+            const pinned = server.toolFilter === true ||
+                (Array.isArray(server.toolFilter) && server.toolFilter.includes(tool.originalName));
             return {
                 name: tool.originalName,
                 description: tool.description,
@@ -568,14 +612,18 @@ class McpPanel {
         const bold = (s) => `\x1b[1m${s}\x1b[22m`;
         const italic = (s) => `\x1b[3m${s}\x1b[23m`;
         const inverse = (s) => `\x1b[7m${s}\x1b[27m`;
-        const row = (content) => fg(t.border, "│") + truncateToWidth(" " + sanitizeRowContent(content), innerW, "…", true) + fg(t.border, "│");
+        const row = (content) => fg(t.border, "│") +
+            truncateToWidth(" " + sanitizeRowContent(content), innerW, "…", true) +
+            fg(t.border, "│");
         const emptyRow = () => fg(t.border, "│") + " ".repeat(innerW) + fg(t.border, "│");
         const divider = () => fg(t.border, "├" + "─".repeat(innerW) + "┤");
         const titleText = this.authOnly ? " MCP OAuth " : " MCP Servers ";
         const borderLen = innerW - visibleWidth(titleText);
         const leftB = Math.floor(borderLen / 2);
         const rightB = borderLen - leftB;
-        lines.push(fg(t.border, "╭" + "─".repeat(leftB)) + fg(t.title, titleText) + fg(t.border, "─".repeat(rightB) + "╮"));
+        lines.push(fg(t.border, "╭" + "─".repeat(leftB)) +
+            fg(t.title, titleText) +
+            fg(t.border, "─".repeat(rightB) + "╮"));
         lines.push(emptyRow());
         const cursor = fg(t.selected, "│");
         const searchIcon = fg(t.border, "◎");
@@ -598,7 +646,9 @@ class McpPanel {
         lines.push(divider());
         if (this.servers.length === 0) {
             lines.push(emptyRow());
-            lines.push(row(fg(t.hint, italic(this.authOnly ? "No OAuth-capable MCP servers configured." : "No MCP servers configured."))));
+            lines.push(row(fg(t.hint, italic(this.authOnly
+                ? "No OAuth-capable MCP servers configured."
+                : "No MCP servers configured."))));
             lines.push(emptyRow());
         }
         else {
@@ -609,12 +659,14 @@ class McpPanel {
             lines.push(emptyRow());
             for (let i = startIdx; i < endIdx; i++) {
                 const item = this.visibleItems[i];
-                if (!item)
+                if (!item) {
                     continue;
+                }
                 const isCursor = i === this.cursorIndex;
                 const server = this.servers[item.serverIndex];
-                if (!server)
+                if (!server) {
                     continue;
+                }
                 if (item.type === "server") {
                     lines.push(row(this.renderServerRow(server, isCursor)));
                     if (isCursor && !this.authOnly && server.resourceCount > 0) {
@@ -628,8 +680,9 @@ class McpPanel {
                 }
                 else if (item.toolIndex !== undefined) {
                     const tool = server.tools[item.toolIndex];
-                    if (tool)
+                    if (tool) {
                         lines.push(row(this.renderToolRow(tool, isCursor, innerW)));
+                    }
                 }
             }
             lines.push(emptyRow());
@@ -665,7 +718,9 @@ class McpPanel {
             else {
                 const directCount = this.servers.reduce((sum, s) => sum + s.tools.filter((t) => t.isDirect).length, 0);
                 const totalTokens = this.servers.reduce((sum, s) => sum + s.tools.filter((t) => t.isDirect).reduce((ts, t) => ts + t.estimatedTokens, 0), 0);
-                const stats = directCount > 0 ? `${directCount} pinned  ~${totalTokens.toLocaleString()} tokens` : "no pinned tools";
+                const stats = directCount > 0
+                    ? `${directCount} pinned  ~${totalTokens.toLocaleString()} tokens`
+                    : "no pinned tools";
                 lines.push(row(fg(t.description, stats + (this.dirty ? fg(t.needsAuth, "  (unsaved)") : ""))));
                 lines.push(row(fg(t.hint, "Pins load at startup; discover more with mcp_search.")));
             }
@@ -709,8 +764,9 @@ class McpPanel {
                 curW += needed;
             }
         }
-        if (curLine)
+        if (curLine) {
             lines.push(row(fg(t.hint, curLine)));
+        }
         lines.push(fg(t.border, "╰" + "─".repeat(innerW) + "╯"));
         return lines;
     }
@@ -718,7 +774,9 @@ class McpPanel {
         const t = this.t;
         const bold = (s) => `\x1b[1m${s}\x1b[22m`;
         const expandIcon = server.expanded ? "▾" : "▸";
-        const prefix = isCursor ? fg(t.selected, expandIcon) : fg(t.border, server.expanded ? expandIcon : "·");
+        const prefix = isCursor
+            ? fg(t.selected, expandIcon)
+            : fg(t.border, server.expanded ? expandIcon : "·");
         const serverName = sanitizeDisplayText(server.name);
         const importKind = sanitizeDisplayText(server.importKind ?? "import");
         const nameStr = isCursor ? bold(fg(t.selected, serverName)) : serverName;
@@ -736,15 +794,18 @@ class McpPanel {
         else if (directCount > 0) {
             toggleIcon = fg(t.needsAuth, "◐");
         }
-        const toolInfo = this.authOnly ? "" : fg(t.description, `${totalCount} tool${totalCount === 1 ? "" : "s"}, ${directCount} pinned${server.resourceCount > 0 ? `, ${server.resourceCount} resource${server.resourceCount === 1 ? "" : "s"}` : ""}`);
+        const toolInfo = this.authOnly
+            ? ""
+            : fg(t.description, `${totalCount} tool${totalCount === 1 ? "" : "s"}, ${directCount} pinned${server.resourceCount > 0 ? `, ${server.resourceCount} resource${server.resourceCount === 1 ? "" : "s"}` : ""}`);
         return `${prefix} ${toggleIcon} ${nameStr}${importLabel}${statusLabel}  ${toolInfo}`;
     }
     selectedServerHasFailureMessage() {
         const item = this.visibleItems[this.cursorIndex];
-        if (!item)
+        if (!item) {
             return false;
+        }
         const server = this.servers[item.serverIndex];
-        return server?.connectionStatus === "failed" && !!server.failureMessage;
+        return server?.connectionStatus === "failed" && Boolean(server.failureMessage);
     }
     wrapText(text, width) {
         const max = Math.max(8, width);
@@ -760,8 +821,9 @@ class McpPanel {
                     take += rest.charAt(index);
                     index++;
                 }
-                if (!take)
+                if (!take) {
                     take = rest.charAt(0);
+                }
                 lines.push(take);
                 rest = rest.slice(take.length);
             }
@@ -773,31 +835,40 @@ class McpPanel {
                 current = candidate;
             }
             else {
-                if (current)
+                if (current) {
                     lines.push(current);
+                }
                 current = splitLongWord(word);
             }
         }
-        if (current)
+        if (current) {
             lines.push(current);
+        }
         return lines.length > 0 ? lines : [text];
     }
     renderConnectionStatus(server) {
         const t = this.t;
-        if (this.authInFlight === server.name)
+        if (this.authInFlight === server.name) {
             return `  ${fg(t.needsAuth, "authenticating")}`;
-        if (server.connectionStatus === "disabled")
+        }
+        if (server.connectionStatus === "disabled") {
             return `  ${fg(t.description, "disabled")}`;
-        if (server.connectionStatus === "needs-auth")
+        }
+        if (server.connectionStatus === "needs-auth") {
             return `  ${fg(t.needsAuth, "needs auth")}`;
-        if (server.connectionStatus === "connecting")
+        }
+        if (server.connectionStatus === "connecting") {
             return `  ${fg(t.needsAuth, "connecting")}`;
-        if (server.connectionStatus === "failed")
+        }
+        if (server.connectionStatus === "failed") {
             return `  ${fg(t.cancel, "failed")}`;
-        if (this.authOnly && server.connectionStatus === "connected")
+        }
+        if (this.authOnly && server.connectionStatus === "connected") {
             return `  ${fg(t.direct, "connected")}`;
-        if (this.authOnly)
+        }
+        if (this.authOnly) {
             return `  ${fg(t.description, "idle")}`;
+        }
         return "";
     }
     renderToolRow(tool, isCursor, innerW) {