@fitchmultz/pi-mcp-adapter 6.0.0 → 7.0.0

package/checkpoint.ts

@@ -1,55 +0,0 @@
-import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-import type { McpExtensionState } from "./state.ts";
-import { flushMetadataCache } from "./init.ts";
-import { getOAuthCheckpointBlocker, holdOAuthCheckpoint } from "./mcp-auth-flow.ts";
-import { isServerDisabled } from "./types.ts";
-
-/** Optional host event. Published Pi hosts without this event simply never emit it.
- * Keep its structural typing local; do not require a private host package/version. */
-export interface McpCheckpointEvent {
-  readonly boundary: "turn" | "settled";
-  readonly signal: AbortSignal;
-  invalidate(): void;
-}
-export type McpCheckpointResult = { sleepReady: true } | { sleepReady: false; reason: string };
-export function onSessionCheckpoint(pi: ExtensionAPI, handler: (event: McpCheckpointEvent) => Promise<McpCheckpointResult>): void {
-  (pi.on as unknown as (event: "session_checkpoint", callback: (event: McpCheckpointEvent) => Promise<McpCheckpointResult>) => unknown)("session_checkpoint", handler);
-}
-
-/** No shutdown, credential copying, connection replay or permanent owner cancellation. */
-export async function prepareMcpCheckpoint(state: McpExtensionState, event: McpCheckpointEvent): Promise<McpCheckpointResult> {
-  event.signal.throwIfAborted();
-  const releases: Array<() => void> = [];
-  const release = () => { for (const undo of releases.splice(0).reverse()) undo(); };
-  // Fence all owned sources synchronously, before the first await (including trace flush).
-  event.signal.addEventListener("abort", release, { once: true });
-  const undo = () => { release(); event.signal.removeEventListener("abort", release); };
-  const blocked = (reason: string): McpCheckpointResult => { undo(); return { sleepReady: false, reason }; };
-  try {
-    releases.push(state.owner.holdCheckpoint(event));
-    releases.push(state.manager.holdCheckpoint(event));
-    releases.push(holdOAuthCheckpoint(state.oauthRuntime, event));
-    releases.push(state.lifecycle.pauseForCheckpoint());
-    if (state.lifecycle.hasActiveHealthCheck()) return blocked("MCP health check is active");
-    for (const [name, definition] of Object.entries(state.config.mcpServers)) {
-      if (!isServerDisabled(definition) && !definition.url) return blocked(`MCP ${name}: stdio/Unix server state is not reconstructible`);
-    }
-    const callback = state.owner.getCheckpointBlocker();
-    if (callback) return blocked(callback);
-    if (state.activeScripts) return blocked("MCP script is active");
-    if (state.uiServer || state.completedUiSessions.length) return blocked("MCP UI session/messages require the running runtime");
-    if (state.approvedToolCalls.size || state.consentManager.hasDecisions()) return blocked("MCP session approvals are not persisted");
-    const oauth = getOAuthCheckpointBlocker(state.oauthRuntime);
-    if (oauth) return blocked(oauth);
-    const manager = state.manager.getCheckpointBlocker();
-    if (manager) return blocked(manager);
-    flushMetadataCache(state);
-    await state.manager.flushForCheckpoint();
-    event.signal.throwIfAborted();
-    // Release/cancellation is host-owned. Existing clients/timers remain usable afterwards.
-    return { sleepReady: true };
-  } catch (error) {
-    undo();
-    throw error;
-  }
-}

package/commands.ts

@@ -1,622 +0,0 @@
-import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
-import type { McpExtensionState } from "./state.ts";
-import { isServerDisabled, isNonInteractiveOAuth, type McpAuthResult, type McpConfig, type McpPanelCallbacks, type McpPanelResult, type ImportKind } from "./types.ts";
-import {
-  ensureCompatibilityImports,
-  getMcpDiscoverySummary,
-  getProjectConfigPath,
-  type KnownServerPreset,
-  getServerProvenance,
-  previewCompatibilityImports,
-  previewSharedServerEntry,
-  previewStarterProjectConfig,
-  writeDirectToolsConfig,
-  writeSharedServerEntry,
-  writeStarterProjectConfig,
-} from "./config.ts";
-import { markKeepAliveAfterConnect, notifyToolMetadataUpdated, updateMetadataCache, updateStatusBar, getFailureAgeSeconds, getFailureMessage, clearFailure, recordFailure } from "./init.ts";
-import { loadMetadataCache, reconstructPromptMetadata } from "./metadata-cache.ts";
-import { buildToolMetadata } from "./tool-metadata.ts";
-import { supportsOAuth, authenticate, removeAuth, type McpOAuthRuntime } from "./mcp-auth-flow.ts";
-import { getAuthStorageOptions, inspectAuthForUrl } from "./mcp-auth.ts";
-import { loadOnboardingState, markSetupCompleted as persistSetupCompleted, markSharedConfigHintShown } from "./onboarding-state.ts";
-import { openPath, resolveServerUrl, sanitizeTerminalText } from "./utils.ts";
-import { isAbortError } from "./runtime-owner.ts";
-import { createMcpPanel } from "./mcp-panel.ts";
-import { createMcpSetupPanel } from "./mcp-setup-panel.ts";
-
-export async function showStatus(state: McpExtensionState, ctx: ExtensionContext): Promise<void> {
-  if (!ctx.hasUI) return;
-
-  const lines: string[] = ["MCP Server Status:", ""];
-
-  for (const name of Object.keys(state.config.mcpServers)) {
-    const definition = state.config.mcpServers[name];
-    if (isServerDisabled(definition)) {
-      lines.push(`⊘ ${name}: disabled (run /mcp enable ${name}, then /reload)`);
-      continue;
-    }
-    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 failedAgo = getFailureAgeSeconds(state, name);
-    let status = "not connected";
-    let statusIcon = "○";
-    let failed = false;
-
-    if (connection?.status === "connected") {
-      status = "connected";
-      statusIcon = "✓";
-    } else if (connection?.status === "needs-auth") {
-      status = "needs auth";
-      statusIcon = "⚠";
-    } else if (failedAgo !== null) {
-      const reason = sanitizeTerminalText(getFailureMessage(state, name) ?? "");
-      status = reason ? `failed ${failedAgo}s ago — ${reason}` : `failed ${failedAgo}s ago`;
-      statusIcon = "✗";
-      failed = true;
-    } 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" : ""})`;
-    lines.push(`${statusIcon} ${name}: ${status}${toolSuffix}`);
-  }
-
-  if (Object.keys(state.config.mcpServers).length === 0) {
-    lines.push("No MCP servers configured");
-    lines.push("Run /mcp setup to adopt imports or scaffold a starter .mcp.json");
-  }
-
-  ctx.ui.notify(lines.join("\n"), "info");
-}
-
-export async function showPrompts(state: McpExtensionState, ctx: ExtensionContext): Promise<void> {
-  if (!ctx.hasUI) return;
-  const allPrompts = [...(state.promptMetadata?.values() ?? [])].flat();
-  const failedPromptServers = [...(state.manager.getAllConnections?.() ?? [])]
-    .filter(([, connection]) => connection.status === "connected" && connection.promptDiscoveryFailed)
-    .map(([serverName]) => serverName)
-    .sort();
-  if (allPrompts.length === 0) {
-    const failureNote = failedPromptServers.length > 0
-      ? ` Prompt discovery failed for: ${failedPromptServers.join(", ")}.`
-      : "";
-    ctx.ui.notify(`No MCP prompts available. Prompts are discovered when servers with the \`prompts\` capability connect.${failureNote}`, "info");
-    return;
-  }
-  const lines = ["MCP Prompts:", ""];
-  const grouped = new Map<string, typeof allPrompts>();
-  for (const prompt of allPrompts) {
-    const list = grouped.get(prompt.serverName) ?? [];
-    list.push(prompt);
-    grouped.set(prompt.serverName, list);
-  }
-  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(" ");
-      lines.push(`  /${prompt.commandName}${args ? ` ${args}` : ""}`);
-      if (prompt.description) lines.push(`      ${prompt.description}`);
-    }
-    lines.push("");
-  }
-  lines.push(`Total: ${allPrompts.length} prompt${allPrompts.length === 1 ? "" : "s"}`);
-  if (failedPromptServers.length > 0) {
-    lines.push(`Prompt discovery failed for: ${failedPromptServers.join(", ")}. Cached prompt metadata may be stale.`);
-  }
-  ctx.ui.notify(lines.join("\n"), "info");
-}
-
-export async function showTools(state: McpExtensionState, ctx: ExtensionContext): Promise<void> {
-  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));
-
-  if (allTools.length === 0) {
-    ctx.ui.notify("No MCP tools discovered. Use mcp_search to discover tools.", "info");
-    return;
-  }
-
-  const lines = [
-    "Discovered MCP Tools:",
-    "",
-    ...allTools.map(t => `  ${t}`),
-    "",
-    `Total: ${allTools.length} tool${allTools.length === 1 ? "" : "s"}`,
-  ];
-
-  ctx.ui.notify(lines.join("\n"), "info");
-}
-
-export async function reconnectServer(
-  state: McpExtensionState,
-  ctx: ExtensionContext,
-  name: string,
-  afterAuth = false,
-): Promise<boolean> {
-  const definition = state.config.mcpServers[name];
-  const ui = ctx.hasUI ? ctx.ui : undefined;
-  const signal = state.owner?.signal;
-  if (!definition) {
-    if (ui) {
-      ui.notify(`Server "${name}" not found in config`, "error");
-    }
-    return false;
-  }
-  if (isServerDisabled(definition)) {
-    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) await state.manager.close(name);
-    state.owner?.throwIfInactive();
-    const connection = previous
-      ? await state.manager.reconnect(name, definition, previous, signal)
-      : signal
-        ? await state.manager.connect(name, definition, signal)
-        : await state.manager.connect(name, definition);
-    state.owner?.throwIfInactive();
-    if (connection.status === "needs-auth") {
-      if (ui) {
-        ui.notify(`MCP: ${name} requires OAuth. Run /mcp-auth ${name} first.`, "warning");
-      }
-      updateStatusBar(state);
-      return false;
-    }
-
-    const prefix = state.config.settings?.toolPrefix ?? "server";
-    const { metadata, failedTools } = buildToolMetadata(connection.tools, connection.resources, definition, name, prefix);
-    state.toolMetadata.set(name, metadata);
-    if (!connection.promptDiscoveryFailed) {
-      state.promptMetadata?.set(name, reconstructPromptMetadata(name, connection.prompts ?? [], prefix, definition));
-      state.promptMetadataLive?.add(name);
-    }
-    if (connection.instructions) {
-      state.serverInstructions.set(name, connection.instructions);
-    } else {
-      state.serverInstructions.delete(name);
-    }
-    updateMetadataCache(state, name);
-    notifyToolMetadataUpdated(state, name, "command-reconnect");
-    markKeepAliveAfterConnect(state, name);
-    clearFailure(state, name);
-
-    if (ui) {
-      ui.notify(
-        `MCP: Reconnected to ${name} (${connection.tools.length} tools, ${connection.resources.length} resources)`,
-        "info"
-      );
-      if (failedTools.length > 0) {
-        ui.notify(`MCP: ${name} - ${failedTools.length} tools skipped`, "warning");
-      }
-    }
-    updateStatusBar(state);
-    return true;
-  } catch (error) {
-    const message = error instanceof Error ? error.message : String(error);
-    if (isAbortError(error, signal)) throw error;
-    recordFailure(state, name, message);
-    if (ui) {
-      ui.notify(`MCP: Failed to reconnect to ${name}: ${sanitizeTerminalText(message)}`, "error");
-    }
-    updateStatusBar(state);
-    return false;
-  }
-}
-
-export async function reconnectServers(
-  state: McpExtensionState,
-  ctx: ExtensionContext,
-  targetServer?: string
-): Promise<void> {
-  if (targetServer && !state.config.mcpServers[targetServer]) {
-    if (ctx.hasUI) {
-      ctx.ui.notify(`Server "${targetServer}" not found in config`, "error");
-    }
-    return;
-  }
-
-  const names = targetServer ? [targetServer] : Object.keys(state.config.mcpServers);
-  for (const name of names) {
-    await reconnectServer(state, ctx, name);
-  }
-
-  updateStatusBar(state);
-}
-
-export async function authenticateServer(
-  serverName: string,
-  config: McpConfig,
-  ctx: ExtensionContext,
-  signal?: AbortSignal,
-  runtime?: McpOAuthRuntime,
-): Promise<McpAuthResult> {
-  const ui = ctx.hasUI ? ctx.ui : undefined;
-  const cwd = ctx.cwd;
-  signal ??= ctx.signal;
-  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`;
-    ui.notify(message, "error");
-    return { ok: false, message };
-  }
-  if (isServerDisabled(definition)) {
-    const message = `Server "${serverName}" is disabled. Run /mcp enable ${serverName}, then /reload.`;
-    ui.notify(message, "warning");
-    return { ok: false, message };
-  }
-
-  if (!supportsOAuth(definition)) {
-    const message = `Server "${serverName}" does not use OAuth authentication. Set "auth": "oauth" or omit auth for auto-detection.`;
-    ui.notify(
-      `Server "${serverName}" does not use OAuth authentication.\n` +
-      `Set "auth": "oauth" or omit auth for auto-detection.`,
-      "error"
-    );
-    return { ok: false, message };
-  }
-
-  try {
-    const serverUrl = resolveServerUrl(definition);
-    if (!serverUrl) {
-      const message = `Server "${serverName}" has no URL configured (OAuth requires HTTP transport)`;
-      ui.notify(message, "error");
-      return { ok: false, message };
-    }
-
-    ui.setStatus("mcp-auth", `Authenticating ${serverName}...`);
-    const authStorageOptions = getAuthStorageOptions(config.settings?.oauthDir, cwd);
-    const status = await authenticate(serverName, serverUrl, definition, {
-      ...(authStorageOptions.baseDir ? { authStorageOptions } : {}),
-      onAuthorizationUrl: (authorizationUrl) => {
-        ui.notify(
-          `Open this URL to authenticate ${serverName}:\n\n${authorizationUrl}\n\n` +
-          "After approving, return to Pi; the local callback will complete automatically.",
-          "info"
-        );
-      },
-      ...(signal ? { signal } : {}),
-      ...(runtime ? { runtime } : {}),
-    });
-    if (signal?.aborted) signal.throwIfAborted();
-
-    if (status === "authenticated") {
-      const message = `OAuth authentication successful for "${serverName}".`;
-      ui.notify(message, "info");
-      return { ok: true, message };
-    }
-
-    const message = `OAuth authentication failed for "${serverName}".`;
-    ui.notify(message, "error");
-    return { ok: false, message };
-  } catch (error) {
-    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) ui.setStatus("mcp-auth", undefined);
-  }
-}
-
-export async function logoutServer(
-  serverName: string,
-  state: McpExtensionState,
-  ctx: ExtensionContext
-): Promise<{ ok: boolean; message: string }> {
-  const definition = state.config.mcpServers[serverName];
-  const ui = ctx.hasUI ? ctx.ui : undefined;
-  if (!definition) {
-    const message = `Server "${serverName}" not found in config`;
-    if (ui) ui.notify(message, "error");
-    return { ok: false, message };
-  }
-
-  const signal = state.owner?.signal;
-  try {
-    await removeAuth(serverName, { authStorageOptions: state.authStorageOptions, signal, runtime: state.oauthRuntime });
-  } catch (error) {
-    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");
-    }
-    return { ok: false, message };
-  }
-
-  state.owner?.throwIfInactive();
-  try {
-    await state.manager.close(serverName);
-  } catch (error) {
-    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",
-      );
-    }
-    return { ok: false, message };
-  }
-
-  state.owner?.throwIfInactive();
-  updateStatusBar(state);
-
-  const message = `OAuth credentials cleared for "${serverName}". Run /mcp-auth ${serverName} to authenticate again.`;
-  if (ui) ui.notify(message, "info");
-  return { ok: true, message };
-}
-
-export interface PanelFlowResult {
-  configChanged: boolean;
-}
-
-function buildSharedConfigNoticeLines(configOverridePath: string | undefined, cwd: string): string[] {
-  const discovery = getMcpDiscoverySummary(configOverridePath, cwd);
-  const onboardingState = loadOnboardingState();
-  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 [
-    `Using standard MCP config from ${sourceList}.`,
-    "Pi only writes compatibility imports and adapter-specific overrides into Pi-owned files when needed.",
-  ];
-}
-
-export async function openMcpSetup(
-  state: McpExtensionState,
-  pi: ExtensionAPI,
-  ctx: ExtensionContext,
-  configOverridePath?: string,
-  mode: "empty" | "setup" = "setup",
-): Promise<PanelFlowResult> {
-  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 };
-  }
-  if (ctx.mode !== "tui") {
-    ctx.ui.notify("MCP setup is available in TUI mode only.", "info");
-    return { configChanged: false };
-  }
-  if (state.programmaticConfig) {
-    ctx.ui.notify("MCP setup is unavailable when config is supplied by createMcpAdapter().", "info");
-    return { configChanged: false };
-  }
-
-  const discovery = getMcpDiscoverySummary(configOverridePath, ctx.cwd);
-  const onboardingState = loadOnboardingState();
-  let configChanged = false;
-
-  const callbacks = {
-    previewImports: (imports: ImportKind[]) => previewCompatibilityImports(imports, configOverridePath),
-    previewStarterProject: () => previewStarterProjectConfig(ctx.cwd),
-    previewRepoPrompt: () => {
-      const repoPrompt = getMcpDiscoverySummary(configOverridePath, ctx.cwd).repoPrompt;
-      if (!repoPrompt.entry || !repoPrompt.targetPath || !repoPrompt.serverName) return null;
-      return previewSharedServerEntry(repoPrompt.targetPath, repoPrompt.serverName, repoPrompt.entry);
-    },
-    previewKnownServer: (preset: KnownServerPreset) => previewSharedServerEntry(getProjectConfigPath(ctx.cwd), preset.id, preset.entry),
-    adoptImports: async (imports: ImportKind[]) => {
-      const result = ensureCompatibilityImports(imports, configOverridePath);
-      if (result.added.length > 0) configChanged = true;
-      return result;
-    },
-    scaffoldProjectConfig: async () => {
-      const path = writeStarterProjectConfig(ctx.cwd);
-      configChanged = true;
-      return { path };
-    },
-    addRepoPrompt: async () => {
-      const repoPrompt = getMcpDiscoverySummary(configOverridePath, ctx.cwd).repoPrompt;
-      if (!repoPrompt.entry || !repoPrompt.targetPath || !repoPrompt.serverName) {
-        throw new Error("RepoPrompt is not available to add from this setup screen.");
-      }
-      const path = writeSharedServerEntry(repoPrompt.targetPath, repoPrompt.serverName, repoPrompt.entry);
-      configChanged = true;
-      return { path, serverName: repoPrompt.serverName };
-    },
-    addKnownServer: async (preset: KnownServerPreset) => {
-      const path = writeSharedServerEntry(getProjectConfigPath(ctx.cwd), preset.id, preset.entry);
-      configChanged = true;
-      return { path, serverName: preset.name };
-    },
-    openPath: async (targetPath: string) => {
-      await openPath(pi, targetPath);
-    },
-    markSetupCompleted: persistSetupCompleted,
-  };
-
-  return new Promise<PanelFlowResult>((resolve) => {
-    ctx.ui.custom(
-      (tui, _theme, keybindings, done) => {
-        return createMcpSetupPanel(discovery, callbacks, { mode, onboardingState, keybindings }, tui, () => {
-          done(undefined);
-          resolve({ configChanged });
-        });
-      },
-      { overlay: true, overlayOptions: { anchor: "center", width: 92 } },
-    );
-  });
-}
-
-function buildMcpPanelCallbacks(
-  state: McpExtensionState,
-  config: McpConfig,
-  ctx: ExtensionContext,
-): McpPanelCallbacks {
-  // Panel-only diagnostics keep status inspection from mutating connection
-  // failure state while allowing the existing panel failure UI to show why the
-  // credential store could not be inspected.
-  const authStatusFailures = new Map<string, string>();
-
-  return {
-    reconnect: (serverName, afterAuth) => reconnectServer(state, ctx, serverName, afterAuth),
-    canAuthenticate: (serverName: string) => {
-      const definition = config.mcpServers[serverName];
-      return definition ? !isServerDisabled(definition) && supportsOAuth(definition) : false;
-    },
-    authenticate: (serverName: string) => authenticateServer(serverName, config, ctx, state.owner?.signal, state.oauthRuntime),
-    getConnectionStatus: (serverName: string) => {
-      authStatusFailures.delete(serverName);
-      const definition = config.mcpServers[serverName];
-      if (isServerDisabled(definition)) return "disabled";
-      const connection = state.manager.getConnection(serverName);
-      let serverUrl: string | undefined;
-      try {
-        serverUrl = definition ? resolveServerUrl(definition) : undefined;
-      } catch {
-        return "failed";
-      }
-      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);
-          return "failed";
-        }
-        if (authStatus.status === "absent" || !authStatus.entry.tokens) {
-          return "needs-auth";
-        }
-      }
-      if (connection?.status === "needs-auth") return "needs-auth";
-      if (connection?.status === "connected") return "connected";
-      if (getFailureAgeSeconds(state, serverName) !== null) return "failed";
-      return "idle";
-    },
-    getFailureMessage: (serverName: string) => authStatusFailures.get(serverName) ?? getFailureMessage(state, serverName),
-    refreshCacheAfterReconnect: (serverName: string) => {
-      const freshCache = loadMetadataCache(state.metadataCacheEnabled);
-      return freshCache?.servers?.[serverName] ?? null;
-    },
-  };
-}
-
-export async function openMcpPanel(
-  state: McpExtensionState,
-  pi: ExtensionAPI,
-  ctx: ExtensionContext,
-  configOverridePath?: string,
-  onDirectToolsConfigChanged?: (changes: Map<string, true | string[] | false>) => void | Promise<void>,
-): Promise<PanelFlowResult> {
-  if (!ctx.isProjectTrusted() || ctx.mode !== "tui") {
-    if (ctx.hasUI) await showStatus(state, ctx);
-    return { configChanged: false };
-  }
-  if (state.programmaticConfig) {
-    if (ctx.hasUI) {
-      ctx.ui.notify("MCP status is shown from the in-memory SDK config; configuration discovery is unavailable.", "info");
-      await showStatus(state, ctx);
-    }
-    return { configChanged: false };
-  }
-  if (Object.keys(state.config.mcpServers).length === 0) {
-    return openMcpSetup(state, pi, ctx, configOverridePath, "empty");
-  }
-
-  const config = state.config;
-  const cache = loadMetadataCache(state.metadataCacheEnabled);
-  const configPath = configOverridePath;
-  const provenanceMap = getServerProvenance(configPath, ctx.cwd);
-  const noticeLines = buildSharedConfigNoticeLines(configPath, ctx.cwd);
-
-  const callbacks = buildMcpPanelCallbacks(state, config, ctx);
-
-  let configChanged = false;
-
-  await new Promise<void>((resolve) => {
-    ctx.ui.custom(
-      (tui, _theme, keybindings, done) => {
-        return createMcpPanel(config, cache, provenanceMap, callbacks, tui, (result: McpPanelResult) => {
-          void (async () => {
-            if (!result.cancelled && result.changes.size > 0) {
-              writeDirectToolsConfig(result.changes, provenanceMap);
-              await onDirectToolsConfigChanged?.(result.changes);
-              ctx.ui.notify("Direct tools updated for this session.", "info");
-            }
-            done(undefined);
-            resolve();
-          })().catch((error) => {
-            const message = error instanceof Error ? error.message : String(error);
-            ctx.ui.notify(`Direct tools updated, but live refresh failed: ${message}`, "error");
-            configChanged = true;
-            done(undefined);
-            resolve();
-          });
-        }, { noticeLines, keybindings });
-      },
-      { overlay: true, overlayOptions: { anchor: "center", width: 82 } },
-    );
-  });
-
-  if (noticeLines.length > 0) markSharedConfigHintShown();
-
-  return { configChanged };
-}
-
-export async function openMcpAuthPanel(
-  state: McpExtensionState,
-  ctx: ExtensionContext,
-  configOverridePath?: string,
-): Promise<PanelFlowResult> {
-  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 };
-  }
-  if (ctx.mode !== "tui") {
-    ctx.ui.notify("Use /mcp-auth <server> to authenticate outside TUI mode.", "info");
-    return { configChanged: false };
-  }
-  if (state.programmaticConfig) {
-    ctx.ui.notify("Use /mcp-auth <server> to authenticate a server from the in-memory SDK config.", "info");
-    return { configChanged: false };
-  }
-
-  const config = state.config;
-  const oauthServers = Object.entries(config.mcpServers).filter(
-    ([, definition]) => !isServerDisabled(definition) && supportsOAuth(definition),
-  );
-  if (oauthServers.length === 0) {
-    ctx.ui.notify("No OAuth-capable MCP servers are configured.", "warning");
-    return { configChanged: false };
-  }
-
-  const cache = loadMetadataCache(state.metadataCacheEnabled);
-  const configPath = configOverridePath;
-  const provenanceMap = getServerProvenance(configPath, ctx.cwd);
-  const callbacks = buildMcpPanelCallbacks(state, config, ctx);
-
-  await new Promise<void>((resolve) => {
-    ctx.ui.custom(
-      (tui, _theme, keybindings, done) => {
-        return createMcpPanel(config, cache, provenanceMap, callbacks, tui, () => {
-          done(undefined);
-          resolve();
-        }, {
-          authOnly: true,
-          keybindings,
-          noticeLines: ["Select an OAuth MCP server and press Enter or ctrl+a to authenticate."],
-        });
-      },
-      { overlay: true, overlayOptions: { anchor: "center", width: 82 } },
-    );
-  });
-
-  return { configChanged: false };
-}