@fitchmultz/pi-mcp-adapter 8.0.5 → 8.0.7

package/dist/commands.js

@@ -1,18 +1,19 @@
-import { isServerDisabled, isNonInteractiveOAuth } from "./types.js";
+import { isServerDisabled, isNonInteractiveOAuth, } from "./types.js";
 import { ensureCompatibilityImports, getMcpDiscoverySummary, getProjectConfigPath, getServerProvenance, previewCompatibilityImports, previewSharedServerEntry, previewStarterProjectConfig, writeDirectToolsConfig, writeSharedServerEntry, writeStarterProjectConfig, } from "./config.js";
-import { MAX_CONCURRENT_SERVER_CONNECTS, markKeepAliveAfterConnect, notifyToolMetadataUpdated, updateMetadataCache, updateStatusBar, getFailureAgeSeconds, getFailureMessage, clearFailure, recordFailure } from "./init.js";
+import { MAX_CONCURRENT_SERVER_CONNECTS, markKeepAliveAfterConnect, notifyToolMetadataUpdated, updateMetadataCache, updateStatusBar, getFailureAgeSeconds, getFailureMessage, clearFailure, recordFailure, } from "./init.js";
 import { loadMetadataCache, reconstructPromptMetadata } from "./metadata-cache.js";
 import { buildToolMetadata } from "./tool-metadata.js";
 import { supportsOAuth } from "./mcp-oauth-runtime.js";
 import { getAuthStorageOptions, inspectAuthForUrl } from "./mcp-auth.js";
-import { loadOnboardingState, markSetupCompleted as persistSetupCompleted, markSharedConfigHintShown } from "./onboarding-state.js";
+import { loadOnboardingState, markSetupCompleted as persistSetupCompleted, markSharedConfigHintShown, } from "./onboarding-state.js";
 import { openPath, parallelLimit, resolveServerUrl, sanitizeTerminalText } from "./utils.js";
 import { isAbortError } from "./runtime-owner.js";
 import { createMcpPanel } from "./mcp-panel.js";
 import { createMcpSetupPanel } from "./mcp-setup-panel.js";
 export async function showStatus(state, ctx) {
-    if (!ctx.hasUI)
+    if (!ctx.hasUI) {
         return;
+    }
     const lines = ["MCP Server Status:", ""];
     for (const name of Object.keys(state.config.mcpServers)) {
         const definition = state.config.mcpServers[name];
@@ -22,8 +23,8 @@ export async function showStatus(state, ctx) {
         }
         const connection = state.manager.getConnection(name);
         const metadata = state.toolMetadata.get(name);
-        const toolCount = metadata?.filter(tool => tool.resourceUri === undefined).length ?? 0;
-        const resourceCount = metadata?.filter(tool => tool.resourceUri !== undefined).length ?? 0;
+        const toolCount = metadata?.filter((tool) => tool.resourceUri === undefined).length ?? 0;
+        const resourceCount = metadata?.filter((tool) => tool.resourceUri !== undefined).length ?? 0;
         const failedAgo = getFailureAgeSeconds(state, name);
         let status = "not connected";
         let statusIcon = "○";
@@ -45,9 +46,11 @@ export async function showStatus(state, ctx) {
         else if (metadata !== undefined) {
             status = "cached";
         }
-        const toolSuffix = failed ? "" : metadata === undefined
-            ? " (undiscovered)"
-            : ` (${toolCount} tool${toolCount === 1 ? "" : "s"}, ${resourceCount} resource${resourceCount === 1 ? "" : "s"}${status === "cached" ? ", cached" : ""})`;
+        const toolSuffix = failed
+            ? ""
+            : metadata === undefined
+                ? " (undiscovered)"
+                : ` (${toolCount} tool${toolCount === 1 ? "" : "s"}, ${resourceCount} resource${resourceCount === 1 ? "" : "s"}${status === "cached" ? ", cached" : ""})`;
         lines.push(`${statusIcon} ${name}: ${status}${toolSuffix}`);
     }
     if (Object.keys(state.config.mcpServers).length === 0) {
@@ -57,8 +60,9 @@ export async function showStatus(state, ctx) {
     ctx.ui.notify(lines.join("\n"), "info");
 }
 export async function showPrompts(state, ctx) {
-    if (!ctx.hasUI)
+    if (!ctx.hasUI) {
         return;
+    }
     const allPrompts = [...(state.promptMetadata?.values() ?? [])].flat();
     const failedPromptServers = [...(state.manager.getAllConnections?.() ?? [])]
         .filter(([, connection]) => connection.status === "connected" && connection.promptDiscoveryFailed)
@@ -81,10 +85,13 @@ export async function showPrompts(state, ctx) {
     for (const [serverName, prompts] of [...grouped.entries()].sort(([a], [b]) => a.localeCompare(b))) {
         lines.push(`${serverName}:`);
         for (const prompt of prompts.sort((a, b) => a.commandName.localeCompare(b.commandName))) {
-            const args = prompt.arguments.map(argument => argument.required ? `<${argument.name}>` : `[${argument.name}]`).join(" ");
+            const args = prompt.arguments
+                .map((argument) => (argument.required ? `<${argument.name}>` : `[${argument.name}]`))
+                .join(" ");
             lines.push(`  /${prompt.commandName}${args ? ` ${args}` : ""}`);
-            if (prompt.description)
+            if (prompt.description) {
                 lines.push(`      ${prompt.description}`);
+            }
         }
         lines.push("");
     }
@@ -95,11 +102,12 @@ export async function showPrompts(state, ctx) {
     ctx.ui.notify(lines.join("\n"), "info");
 }
 export async function showTools(state, ctx) {
-    if (!ctx.hasUI)
+    if (!ctx.hasUI) {
         return;
+    }
     const allTools = [...state.toolMetadata.entries()]
         .filter(([serverName]) => !isServerDisabled(state.config.mcpServers[serverName]))
-        .flatMap(([, metadata]) => metadata.filter(tool => tool.resourceUri === undefined).map(tool => tool.name));
+        .flatMap(([, metadata]) => metadata.filter((tool) => tool.resourceUri === undefined).map((tool) => tool.name));
     if (allTools.length === 0) {
         ctx.ui.notify("No MCP tools discovered. Use mcp_search to discover tools.", "info");
         return;
@@ -107,7 +115,7 @@ export async function showTools(state, ctx) {
     const lines = [
         "Discovered MCP Tools:",
         "",
-        ...allTools.map(t => `  ${t}`),
+        ...allTools.map((t) => `  ${t}`),
         "",
         `Total: ${allTools.length} tool${allTools.length === 1 ? "" : "s"}`,
     ];
@@ -124,14 +132,16 @@ export async function reconnectServer(state, ctx, name, afterAuth = false) {
         return false;
     }
     if (isServerDisabled(definition)) {
-        if (ui)
+        if (ui) {
             ui.notify(`MCP: ${name} is disabled. Run /mcp enable ${name}, then /reload.`, "warning");
+        }
         return false;
     }
     try {
         const previous = afterAuth ? state.manager.getConnection(name) : undefined;
-        if (!afterAuth)
+        if (!afterAuth) {
             await state.manager.close(name);
+        }
         state.owner?.throwIfInactive();
         const connection = previous
             ? await state.manager.reconnect(name, definition, previous, signal)
@@ -174,8 +184,9 @@ export async function reconnectServer(state, ctx, name, afterAuth = false) {
     }
     catch (error) {
         const message = error instanceof Error ? error.message : String(error);
-        if (isAbortError(error, signal))
+        if (isAbortError(error, signal)) {
             throw error;
+        }
         recordFailure(state, name, message);
         if (ui) {
             ui.notify(`MCP: Failed to reconnect to ${name}: ${sanitizeTerminalText(message)}`, "error");
@@ -192,15 +203,16 @@ export async function reconnectServers(state, ctx, targetServer) {
         return;
     }
     const names = targetServer ? [targetServer] : Object.keys(state.config.mcpServers);
-    await parallelLimit(names, MAX_CONCURRENT_SERVER_CONNECTS, name => reconnectServer(state, ctx, name));
+    await parallelLimit(names, MAX_CONCURRENT_SERVER_CONNECTS, (name) => reconnectServer(state, ctx, name));
     updateStatusBar(state);
 }
 export async function authenticateServer(serverName, config, ctx, signal, runtime) {
     const ui = ctx.hasUI ? ctx.ui : undefined;
     const cwd = ctx.cwd;
     signal ??= ctx.signal;
-    if (!ui)
+    if (!ui) {
         return { ok: false, message: "OAuth authentication requires an interactive session." };
+    }
     const definition = config.mcpServers[serverName];
     if (!definition) {
         const message = `Server "${serverName}" not found in config`;
@@ -237,8 +249,9 @@ export async function authenticateServer(serverName, config, ctx, signal, runtim
             ...(signal ? { signal } : {}),
             ...(runtime ? { runtime } : {}),
         });
-        if (signal?.aborted)
+        if (signal?.aborted) {
             signal.throwIfAborted();
+        }
         if (status === "authenticated") {
             const message = `OAuth authentication successful for "${serverName}".`;
             ui.notify(message, "info");
@@ -249,15 +262,17 @@ export async function authenticateServer(serverName, config, ctx, signal, runtim
         return { ok: false, message };
     }
     catch (error) {
-        if (signal?.aborted)
+        if (signal?.aborted) {
             throw error;
+        }
         const message = error instanceof Error ? error.message : String(error);
         ui.notify(`Failed to authenticate "${serverName}": ${message}`, "error");
         return { ok: false, message };
     }
     finally {
-        if (!signal?.aborted)
+        if (!signal?.aborted) {
             ui.setStatus("mcp-auth", undefined);
+        }
     }
 }
 export async function logoutServer(serverName, state, ctx) {
@@ -265,18 +280,24 @@ export async function logoutServer(serverName, state, ctx) {
     const ui = ctx.hasUI ? ctx.ui : undefined;
     if (!definition) {
         const message = `Server "${serverName}" not found in config`;
-        if (ui)
+        if (ui) {
             ui.notify(message, "error");
+        }
         return { ok: false, message };
     }
     const signal = state.owner?.signal;
     try {
         const { removeAuth } = await import("./mcp-auth-flow.js");
-        await removeAuth(serverName, { authStorageOptions: state.authStorageOptions, signal, runtime: state.oauthRuntime });
+        await removeAuth(serverName, {
+            authStorageOptions: state.authStorageOptions,
+            signal,
+            runtime: state.oauthRuntime,
+        });
     }
     catch (error) {
-        if (isAbortError(error, signal))
+        if (isAbortError(error, signal)) {
             throw error;
+        }
         const message = error instanceof Error ? error.message : String(error);
         if (ui) {
             ui.notify(`Failed to clear OAuth credentials for "${serverName}": ${sanitizeTerminalText(message)}`, "error");
@@ -288,8 +309,9 @@ export async function logoutServer(serverName, state, ctx) {
         await state.manager.close(serverName);
     }
     catch (error) {
-        if (isAbortError(error, signal))
+        if (isAbortError(error, signal)) {
             throw error;
+        }
         const message = error instanceof Error ? error.message : String(error);
         if (ui) {
             ui.notify(`OAuth credentials were cleared for "${serverName}", but its connection could not be closed: ${sanitizeTerminalText(message)}`, "error");
@@ -299,15 +321,17 @@ export async function logoutServer(serverName, state, ctx) {
     state.owner?.throwIfInactive();
     updateStatusBar(state);
     const message = `OAuth credentials cleared for "${serverName}". Run /mcp-auth ${serverName} to authenticate again.`;
-    if (ui)
+    if (ui) {
         ui.notify(message, "info");
+    }
     return { ok: true, message };
 }
 function buildSharedConfigNoticeLines(configOverridePath, cwd) {
     const discovery = getMcpDiscoverySummary(configOverridePath, cwd);
     const onboardingState = loadOnboardingState();
-    if (!discovery.hasSharedServers || onboardingState.sharedConfigHintShown)
+    if (!discovery.hasSharedServers || onboardingState.sharedConfigHintShown) {
         return [];
+    }
     const sharedSources = discovery.sources.filter((source) => source.kind === "shared" && source.serverCount > 0);
     const sourceList = sharedSources.map((source) => source.path).join(", ");
     return [
@@ -316,8 +340,9 @@ function buildSharedConfigNoticeLines(configOverridePath, cwd) {
     ];
 }
 export async function openMcpSetup(state, pi, ctx, configOverridePath, mode = "setup") {
-    if (!ctx.hasUI)
+    if (!ctx.hasUI) {
         return { configChanged: false };
+    }
     if (!ctx.isProjectTrusted()) {
         ctx.ui.notify("Project MCP setup is unavailable until this project is trusted.", "warning");
         return { configChanged: false };
@@ -338,15 +363,17 @@ export async function openMcpSetup(state, pi, ctx, configOverridePath, mode = "s
         previewStarterProject: () => previewStarterProjectConfig(ctx.cwd),
         previewRepoPrompt: () => {
             const repoPrompt = getMcpDiscoverySummary(configOverridePath, ctx.cwd).repoPrompt;
-            if (!repoPrompt.entry || !repoPrompt.targetPath || !repoPrompt.serverName)
+            if (!repoPrompt.entry || !repoPrompt.targetPath || !repoPrompt.serverName) {
                 return null;
+            }
             return previewSharedServerEntry(repoPrompt.targetPath, repoPrompt.serverName, repoPrompt.entry);
         },
         previewKnownServer: (preset) => previewSharedServerEntry(getProjectConfigPath(ctx.cwd), preset.id, preset.entry),
         adoptImports: async (imports) => {
             const result = ensureCompatibilityImports(imports, configOverridePath);
-            if (result.added.length > 0)
+            if (result.added.length > 0) {
                 configChanged = true;
+            }
             return result;
         },
         scaffoldProjectConfig: async () => {
@@ -397,8 +424,9 @@ function buildMcpPanelCallbacks(state, config, ctx) {
         getConnectionStatus: (serverName) => {
             authStatusFailures.delete(serverName);
             const definition = config.mcpServers[serverName];
-            if (isServerDisabled(definition))
+            if (isServerDisabled(definition)) {
                 return "disabled";
+            }
             const connection = state.manager.getConnection(serverName);
             let serverUrl;
             try {
@@ -407,10 +435,10 @@ function buildMcpPanelCallbacks(state, config, ctx) {
             catch {
                 return "failed";
             }
-            if (definition?.auth === "oauth"
-                && serverUrl
-                && definition.oauth !== false
-                && !isNonInteractiveOAuth(definition.oauth)) {
+            if (definition?.auth === "oauth" &&
+                serverUrl &&
+                definition.oauth !== false &&
+                !isNonInteractiveOAuth(definition.oauth)) {
                 const authStatus = inspectAuthForUrl(serverName, serverUrl, state.authStorageOptions);
                 if (authStatus.status === "unavailable") {
                     authStatusFailures.set(serverName, authStatus.message);
@@ -420,12 +448,15 @@ function buildMcpPanelCallbacks(state, config, ctx) {
                     return "needs-auth";
                 }
             }
-            if (connection?.status === "needs-auth")
+            if (connection?.status === "needs-auth") {
                 return "needs-auth";
-            if (connection?.status === "connected")
+            }
+            if (connection?.status === "connected") {
                 return "connected";
-            if (getFailureAgeSeconds(state, serverName) !== null)
+            }
+            if (getFailureAgeSeconds(state, serverName) !== null) {
                 return "failed";
+            }
             return "idle";
         },
         getFailureMessage: (serverName) => authStatusFailures.get(serverName) ?? getFailureMessage(state, serverName),
@@ -437,8 +468,9 @@ function buildMcpPanelCallbacks(state, config, ctx) {
 }
 export async function openMcpPanel(state, pi, ctx, configOverridePath, onDirectToolsConfigChanged) {
     if (!ctx.isProjectTrusted() || ctx.mode !== "tui") {
-        if (ctx.hasUI)
+        if (ctx.hasUI) {
             await showStatus(state, ctx);
+        }
         return { configChanged: false };
     }
     if (state.programmaticConfig) {
@@ -479,13 +511,15 @@ export async function openMcpPanel(state, pi, ctx, configOverridePath, onDirectT
             }, { noticeLines, keybindings });
         }, { overlay: true, overlayOptions: { anchor: "center", width: 82 } });
     });
-    if (noticeLines.length > 0)
+    if (noticeLines.length > 0) {
         markSharedConfigHintShown();
+    }
     return { configChanged };
 }
 export async function openMcpAuthPanel(state, ctx, configOverridePath) {
-    if (!ctx.hasUI)
+    if (!ctx.hasUI) {
         return { configChanged: false };
+    }
     if (!ctx.isProjectTrusted()) {
         ctx.ui.notify("Use /mcp-auth <server> while this project is untrusted.", "info");
         return { configChanged: false };