@paradigma-inc/flywheel 0.1.115 → 0.1.134

package/src/cli.mjs

@@ -4,42 +4,43 @@ import ora from "ora";
 import pc from "picocolors";
 import { access, readFile, rm } from "node:fs/promises";
 import path from "node:path";
+import { isatty } from "node:tty";
 
 import {
-  ALL_HOST_NAMES,
-  SERVER_NAME,
-  SETUP_HOST_NAMES,
-  SKILL_ONLY_HOST_NAMES,
-  detectHosts,
-  getHost,
-  isSkillOnlyHost,
-  normalizeHosts,
+ ALL_HOST_NAMES,
+ SERVER_NAME,
+ SETUP_HOST_NAMES,
+ SKILL_ONLY_HOST_NAMES,
+ detectHosts,
+ getHost,
+ isSkillOnlyHost,
+ normalizeHosts,
 } from "./agents.mjs";
 import { generateCompletionScript } from "./completion.mjs";
 import {
-  installCompletion,
-  uninstallCompletion,
+ installCompletion,
+ uninstallCompletion,
 } from "./completion-install.mjs";
 import {
-  readEntryServerUrl,
-  readNamedConfigEntry,
-  readJsonConfig,
-  readTomlServerEntry,
-  readYamlConfig,
-  removeCodexTomlServer,
-  removeJsonServerEntry,
-  resolveMcpPath,
-  writeJsonConfig,
-  writeYamlConfig,
+ readEntryServerUrl,
+ readNamedConfigEntry,
+ readJsonConfig,
+ readTomlServerEntry,
+ readYamlConfig,
+ removeCodexTomlServer,
+ removeJsonServerEntry,
+ resolveMcpPath,
+ writeJsonConfig,
+ writeYamlConfig,
 } from "./mcp-writer.mjs";
 import {
-  listBundledSkills,
-  partitionInstallSkillHosts,
-  removeInstalledSkillsForHosts,
-  resolveInstalledSkillDir,
-  resolveFlywheelInstalledMarkerPath,
-  SUPPORTED_INSTALL_SKILL_HOSTS,
-  resolvePackageRoot,
+ listBundledSkills,
+ partitionInstallSkillHosts,
+ removeInstalledSkillsForHosts,
+ resolveInstalledSkillDir,
+ resolveFlywheelInstalledMarkerPath,
+ SUPPORTED_INSTALL_SKILL_HOSTS,
+ resolvePackageRoot,
 } from "./skill-installer.mjs";
 import { normalizeSetupAuthMode } from "./setup-auth.mjs";
 import { resolveSetupBaseUrl } from "./setup/base-url.mjs";
@@ -47,292 +48,292 @@ import { runSetupRouter } from "./setup/command.mjs";
 import { SetupModeUsageError } from "./setup/mode.mjs";
 import { runCliSetupMode } from "./setup/modes/cli.mjs";
 import {
-  buildGuidedSkillInstallPrompt,
-  runMcpModeCommand,
+ buildGuidedSkillInstallPrompt,
+ runMcpModeCommand,
 } from "./setup/modes/mcp-command.mjs";
 import { COMPLETION_SHELL_CHOICES } from "./public-command-metadata.mjs";
 import { findFlywheelMcpEntryNames } from "./setup/shared/prior-mode-detect.mjs";
 import { renderSetupSummary } from "./setup/shared/summary.mjs";
 
 async function pathExists(targetPath) {
-  try {
-    await access(targetPath);
-    return true;
-  } catch {
-    return false;
-  }
+ try {
+  await access(targetPath);
+  return true;
+ } catch {
+  return false;
+ }
 }
 
 export { buildGuidedSkillInstallPrompt };
 
 const log = {
-  info: (message) => console.log(pc.cyan(message)),
-  warn: (message) => console.log(pc.yellow(`⚠ ${message}`)),
-  error: (message) => console.log(pc.red(`✖ ${message}`)),
-  plain: (message) => console.log(message),
-  blank: () => console.log(""),
+ info: (message) => console.log(pc.cyan(message)),
+ warn: (message) => console.log(pc.yellow(`⚠ ${message}`)),
+ error: (message) => console.log(pc.red(`✖ ${message}`)),
+ plain: (message) => console.log(message),
+ blank: () => console.log(""),
 };
 
 const CHECKBOX_THEME = {
-  style: {
-    highlight: (text) => pc.green(text),
-    disabledChoice: (text) => ` ${pc.dim("◯")} ${pc.dim(text)}`,
-  },
+ style: {
+  highlight: (text) => pc.green(text),
+  disabledChoice: (text) => ` ${pc.dim("◯")} ${pc.dim(text)}`,
+ },
 };
 
 function hostChoiceDescription({ detected = false, configured = false } = {}) {
-  if (configured) return "Already has a Flywheel entry for this scope.";
-  if (detected) return "Detected on this machine.";
-  return "Supported host; select it if you use it here.";
+ if (configured) return "Already has a Flywheel entry for this scope.";
+ if (detected) return "Detected on this machine.";
+ return "Supported host; select it if you use it here.";
 }
 
 function normalizeBaseUrl(value) {
-  const normalized = String(value || "").trim();
-  let parsedUrl;
-  try {
-    parsedUrl = new URL(normalized);
-  } catch {
-    throw new Error("Base URL must be a valid absolute URL.");
-  }
-
-  if (parsedUrl.pathname !== "/" || parsedUrl.search || parsedUrl.hash) {
-    throw new Error(
-      "Base URL must be a public Flywheel origin without a path, query, or hash.",
-    );
-  }
+ const normalized = String(value || "").trim();
+ let parsedUrl;
+ try {
+  parsedUrl = new URL(normalized);
+ } catch {
+  throw new Error("Base URL must be a valid absolute URL.");
+ }
+
+ if (parsedUrl.pathname !== "/" || parsedUrl.search || parsedUrl.hash) {
+  throw new Error(
+   "Base URL must be a public Flywheel origin without a path, query, or hash.",
+  );
+ }
 
-  return parsedUrl.origin;
+ return parsedUrl.origin;
 }
 
 function normalizeServerName(value) {
-  const normalized = String(value || "").trim();
-  if (!normalized) {
-    throw new Error("Server name cannot be empty.");
-  }
-  return normalized;
+ const normalized = String(value || "").trim();
+ if (!normalized) {
+  throw new Error("Server name cannot be empty.");
+ }
+ return normalized;
 }
 
 function normalizeAuthMode(value) {
-  return normalizeSetupAuthMode(value);
+ return normalizeSetupAuthMode(value);
 }
 
 function selectedHostsFromOptions(options) {
-  const hosts = [];
-  if (options.claude) hosts.push("claude");
-  if (options.cursor) hosts.push("cursor");
-  if (options.universal) hosts.push("universal");
-  if (options.antigravity) hosts.push("antigravity");
-  if (options.opencode) hosts.push("opencode");
-  if (options.codex) hosts.push("codex");
-  if (options.gemini) hosts.push("gemini");
-  if (options.piMono) hosts.push("pi-mono");
-  if (options.hermesAgent) hosts.push("hermes-agent");
-  if (options.openclaw) hosts.push("openclaw");
-  return hosts;
+ const hosts = [];
+ if (options.claude) hosts.push("claude");
+ if (options.cursor) hosts.push("cursor");
+ if (options.universal) hosts.push("universal");
+ if (options.antigravity) hosts.push("antigravity");
+ if (options.opencode) hosts.push("opencode");
+ if (options.codex) hosts.push("codex");
+ if (options.gemini) hosts.push("gemini");
+ if (options.piMono) hosts.push("pi-mono");
+ if (options.hermesAgent) hosts.push("hermes-agent");
+ if (options.openclaw) hosts.push("openclaw");
+ return hosts;
 }
 
 const UNINSTALL_OPTION_KEY_BY_HOST = Object.freeze({
-  claude: "claude",
-  codex: "codex",
-  opencode: "opencode",
-  cursor: "cursor",
-  gemini: "gemini",
-  universal: "universal",
-  antigravity: "antigravity",
-  "pi-mono": "piMono",
-  "hermes-agent": "hermesAgent",
-  openclaw: "openclaw",
+ claude: "claude",
+ codex: "codex",
+ opencode: "opencode",
+ cursor: "cursor",
+ gemini: "gemini",
+ universal: "universal",
+ antigravity: "antigravity",
+ "pi-mono": "piMono",
+ "hermes-agent": "hermesAgent",
+ openclaw: "openclaw",
 });
 
 function buildUninstallOptionsForHosts({
-  hostNames = [],
-  scope = "project",
-  serverName = SERVER_NAME,
+ hostNames = [],
+ scope = "project",
+ serverName = SERVER_NAME,
 } = {}) {
-  const options = {
-    yes: true,
-    scope,
-    name: serverName,
-  };
+ const options = {
+  yes: true,
+  scope,
+  name: serverName,
+ };
 
-  for (const hostName of hostNames) {
-    const optionKey = UNINSTALL_OPTION_KEY_BY_HOST[hostName];
-    if (optionKey) {
-      options[optionKey] = true;
-    }
+ for (const hostName of hostNames) {
+  const optionKey = UNINSTALL_OPTION_KEY_BY_HOST[hostName];
+  if (optionKey) {
+   options[optionKey] = true;
   }
+ }
 
-  return options;
+ return options;
 }
 
 function parseHostsList(value) {
-  if (!value) return [];
-  return normalizeHosts(
-    String(value)
-      .split(",")
-      .map((item) => item.trim())
-      .filter(Boolean),
-  );
+ if (!value) return [];
+ return normalizeHosts(
+  String(value)
+   .split(",")
+   .map((item) => item.trim())
+   .filter(Boolean),
+ );
 }
 
 function collectModeValues(value, previousValues = []) {
-  return [...previousValues, value];
+ return [...previousValues, value];
 }
 
 function mcpCandidatesForScope(host, scope) {
-  if (scope === "global") return host.mcp.globalPaths;
-  return host.mcp.projectPaths.map((candidate) =>
-    path.join(process.cwd(), candidate),
-  );
+ if (scope === "global") return host.mcp.globalPaths;
+ return host.mcp.projectPaths.map((candidate) =>
+  path.join(process.cwd(), candidate),
+ );
 }
 
 async function isAlreadyConfigured(hostName, scope, serverName) {
-  const existingState = await readExistingServerState(
-    hostName,
-    scope,
-    serverName,
-  );
-  return existingState.exists;
+ const existingState = await readExistingServerState(
+  hostName,
+  scope,
+  serverName,
+ );
+ return existingState.exists;
 }
 
 async function readExistingServerState(hostName, scope, serverName) {
-  const host = getHost(hostName);
-  if (isSkillOnlyHost(host)) {
-    return { exists: false, url: null, mcpPath: null };
-  }
-  const mcpPath = await resolveMcpPath(mcpCandidatesForScope(host, scope));
-
-  if (host.mcp.configType === "toml") {
-    const { exists, url } = await readTomlServerEntry(mcpPath, serverName);
-    return { exists, url, mcpPath };
-  }
-
-  const existing =
-    host.mcp.configType === "yaml"
-      ? await readYamlConfig(mcpPath)
-      : await readJsonConfig(mcpPath);
-  const entry = readNamedConfigEntry(existing, host.mcp.configKey, serverName);
-  return {
-    exists: entry !== null,
-    url: readEntryServerUrl(entry),
-    mcpPath,
-  };
+ const host = getHost(hostName);
+ if (isSkillOnlyHost(host)) {
+  return { exists: false, url: null, mcpPath: null };
+ }
+ const mcpPath = await resolveMcpPath(mcpCandidatesForScope(host, scope));
+
+ if (host.mcp.configType === "toml") {
+  const { exists, url } = await readTomlServerEntry(mcpPath, serverName);
+  return { exists, url, mcpPath };
+ }
+
+ const existing =
+  host.mcp.configType === "yaml"
+   ? await readYamlConfig(mcpPath)
+   : await readJsonConfig(mcpPath);
+ const entry = readNamedConfigEntry(existing, host.mcp.configKey, serverName);
+ return {
+  exists: entry !== null,
+  url: readEntryServerUrl(entry),
+  mcpPath,
+ };
 }
 
 async function promptHosts(
-  scope,
-  detected,
-  serverName,
-  { disableAlreadyConfigured = true } = {},
+ scope,
+ detected,
+ serverName,
+ { disableAlreadyConfigured = true } = {},
 ) {
-  const choices = await Promise.all(
-    ALL_HOST_NAMES.map(async (hostName) => {
-      const configured = await isAlreadyConfigured(
-        hostName,
-        scope,
-        serverName,
-      ).catch(() => false);
-      return {
-        name: SETUP_HOST_NAMES[hostName],
-        value: hostName,
-        short: SETUP_HOST_NAMES[hostName],
-        description: hostChoiceDescription({
-          detected: detected.includes(hostName),
-          configured,
-        }),
-        checked: detected.includes(hostName),
-        disabled:
-          disableAlreadyConfigured && configured
-            ? "(already configured)"
-            : false,
-      };
+ const choices = await Promise.all(
+  ALL_HOST_NAMES.map(async (hostName) => {
+   const configured = await isAlreadyConfigured(
+    hostName,
+    scope,
+    serverName,
+   ).catch(() => false);
+   return {
+    name: SETUP_HOST_NAMES[hostName],
+    value: hostName,
+    short: SETUP_HOST_NAMES[hostName],
+    description: hostChoiceDescription({
+     detected: detected.includes(hostName),
+     configured,
     }),
-  );
-
-  if (
-    disableAlreadyConfigured &&
-    choices.every((choice) => Boolean(choice.disabled))
-  ) {
-    log.info("Flywheel is already configured for all detected hosts.");
-    return null;
-  }
-
-  try {
-    return await checkbox({
-      message: "Which hosts do you want to set up?",
-      choices,
-      loop: false,
-      theme: CHECKBOX_THEME,
-      validate: (selected) =>
-        selected.length > 0 || "Select at least one host.",
-    });
-  } catch {
-    return null;
-  }
+    checked: detected.includes(hostName),
+    disabled:
+     disableAlreadyConfigured && configured
+      ? "(already configured)"
+      : false,
+   };
+  }),
+ );
+
+ if (
+  disableAlreadyConfigured &&
+  choices.every((choice) => Boolean(choice.disabled))
+ ) {
+  log.info("Flywheel is already configured for all detected hosts.");
+  return null;
+ }
+
+ try {
+  return await checkbox({
+   message: "Which hosts do you want to set up?",
+   choices,
+   loop: false,
+   theme: CHECKBOX_THEME,
+   validate: (selected) =>
+    selected.length > 0 || "Select at least one host.",
+  });
+ } catch {
+  return null;
+ }
 }
 
 async function resolveHosts(
-  options,
-  scope,
-  serverName,
-  { allowPrompt = true, disableAlreadyConfigured = true } = {},
+ options,
+ scope,
+ serverName,
+ { allowPrompt = true, disableAlreadyConfigured = true } = {},
 ) {
-  const explicit = selectedHostsFromOptions(options);
-  if (explicit.length > 0) return explicit;
-
-  const detected = await detectHosts(scope);
-  const promptDisabled =
-    options.yes || process.stdout.isTTY !== true || !allowPrompt;
-  if (detected.length > 0 && promptDisabled) {
-    return detected;
-  }
-
-  if (promptDisabled) {
-    log.warn(
-      "No hosts were detected for prompt-free setup. Pass explicit host flags such as --codex.",
-    );
-    return [];
-  }
-
-  log.blank();
-  const selected = await promptHosts(scope, detected, serverName, {
-    disableAlreadyConfigured,
-  });
-  if (!selected) {
-    log.warn("Setup cancelled");
-    return [];
-  }
-  return selected;
+ const explicit = selectedHostsFromOptions(options);
+ if (explicit.length > 0) return explicit;
+
+ const detected = await detectHosts(scope);
+ const promptDisabled =
+  options.yes || process.stdout.isTTY !== true || !allowPrompt;
+ if (detected.length > 0 && promptDisabled) {
+  return detected;
+ }
+
+ if (promptDisabled) {
+  log.warn(
+   "No hosts were detected for prompt-free setup. Pass explicit host flags such as --codex.",
+  );
+  return [];
+ }
+
+ log.blank();
+ const selected = await promptHosts(scope, detected, serverName, {
+  disableAlreadyConfigured,
+ });
+ if (!selected) {
+  log.warn("Setup cancelled");
+  return [];
+ }
+ return selected;
 }
 
 export function buildSetupModePromptConfig() {
-  return {
-    message: "How should your agent access Flywheel?",
-    choices: [
-      {
-        name: "MCP + bundled skills",
-        value: "mcp",
-        short: "MCP + skills",
-        description:
-          "Configure MCP tools plus bundled skills for supported AI hosts.",
-      },
-      {
-        name: "CLI + bundled skills",
-        value: "cli",
-        short: "CLI + skills",
-        description:
-          "Install bundled skills for agents that call the flywheel binary.",
-      },
-    ],
-    default: "mcp",
-    loop: false,
-    pageSize: 4,
-    theme: CHECKBOX_THEME,
-  };
+ return {
+  message: "How should your agent access Flywheel?",
+  choices: [
+   {
+    name: "MCP + bundled skills",
+    value: "mcp",
+    short: "MCP + skills",
+    description:
+     "Configure MCP tools plus bundled skills for supported AI hosts.",
+   },
+   {
+    name: "CLI + bundled skills",
+    value: "cli",
+    short: "CLI + skills",
+    description:
+     "Install bundled skills for agents that call the flywheel binary.",
+   },
+  ],
+  default: "mcp",
+  loop: false,
+  pageSize: 4,
+  theme: CHECKBOX_THEME,
+ };
 }
 
 async function promptSetupMode() {
-  return await select(buildSetupModePromptConfig());
+ return await select(buildSetupModePromptConfig());
 }
 
 /**
@@ -348,327 +349,329 @@ async function promptSetupMode() {
  * it up front with guidance toward the correct invocation.
  */
 function validateCliModeFlags(options) {
-  if (options.installSkill && options.skipSkill) {
-    throw new SetupModeUsageError(
-      "--install-skill and --skip-skill cannot be used together.",
-    );
-  }
-  // CLI mode is intentionally "skills only", so --skip-skill would contradict
-  // the mode contract and silently surprising behavior should be rejected.
-  if (options.skipSkill) {
-    throw new SetupModeUsageError(
-      "--skip-skill is not supported with --mode cli; use --mode mcp --skip-skill for MCP-only setup.",
-    );
-  }
-  if (options.oauth === true) {
-    throw new SetupModeUsageError(
-      "--oauth is not supported with --mode cli. --oauth only affects the MCP config written by --mode mcp; re-run with --mode mcp --oauth, or drop --oauth for a CLI-mode setup.",
-    );
-  }
-}
-
-async function runCliModeCommand(options) {
-  validateCliModeFlags(options);
-  const scope = options.project ? "project" : "global";
-  const baseUrl = normalizeBaseUrl(
-    resolveSetupBaseUrl({ explicitBaseUrl: options.baseUrl }),
+ if (options.installSkill && options.skipSkill) {
+  throw new SetupModeUsageError(
+   "--install-skill and --skip-skill cannot be used together.",
   );
-  const serverUrl = `${baseUrl}/mcp-server`;
-  const serverName = normalizeServerName(options.name || SERVER_NAME);
-  const hosts = await resolveHosts(options, scope, serverName, {
-    allowPrompt: true,
-    // CLI mode is a skills refresh/install path, so existing MCP wiring should
-    // not make hosts ineligible for selection.
-    disableAlreadyConfigured: false,
-  });
-  if (hosts.length === 0) {
-    return { exitCode: 0 };
-  }
-
-  const result = await runCliSetupMode({
-    selectedHosts: hosts,
-    scope,
-    cwd: process.cwd(),
-    force: options.force === true,
-    apiKey: options.apiKey,
-    authMode: options.authMode,
-    baseUrl,
-    serverName,
-    serverUrl,
-    reconcilePriorMode: async ({ hostNames, serverNames }) => {
-      // Uninstall each detected server name so renamed/drifted Flywheel MCP
-      // entries are actually removed. When the detector found no explicit
-      // names (prior CLI artifacts case), fall back to the current request's
-      // --name so the skill cleanup path still runs.
-      const targetNames =
-        Array.isArray(serverNames) && serverNames.length > 0
-          ? serverNames
-          : [serverName];
-      for (const targetName of targetNames) {
-        // eslint-disable-next-line no-await-in-loop
-        await runUninstallCommand(
-          buildUninstallOptionsForHosts({
-            hostNames,
-            scope,
-            serverName: targetName,
-          }),
-        );
-      }
-    },
-  });
+ }
+ // CLI mode is intentionally "skills only", so --skip-skill would contradict
+ // the mode contract and silently surprising behavior should be rejected.
+ if (options.skipSkill) {
+  throw new SetupModeUsageError(
+   "--skip-skill is not supported with --mode cli; use --mode mcp --skip-skill for MCP-only setup.",
+  );
+ }
+ if (options.oauth === true) {
+  throw new SetupModeUsageError(
+   "--oauth is not supported with --mode cli. --oauth only affects the MCP config written by --mode mcp; re-run with --mode mcp --oauth, or drop --oauth for a CLI-mode setup.",
+  );
+ }
+}
 
-  const lines = renderSetupSummary(result);
-  log.blank();
-  for (const line of lines) {
-    log.plain(`  ${line}`);
-  }
-  log.blank();
-
-  if (result.exitCode !== 0) {
-    const failureDetails = result.agentResults
-      .filter((agentResult) => agentResult.success !== true)
-      .flatMap((agentResult) =>
-        Array.isArray(agentResult.warnings) ? agentResult.warnings : [],
-      )
-      .join(" | ");
-    const error = new Error(
-      failureDetails.length > 0
-        ? `CLI setup encountered host-level failures: ${failureDetails}`
-        : "CLI setup encountered host-level failures.",
+async function runCliModeCommand(options, readStdinAuth) {
+ validateCliModeFlags(options);
+ const scope = options.project ? "project" : "global";
+ const baseUrl = normalizeBaseUrl(
+  resolveSetupBaseUrl({ explicitBaseUrl: options.baseUrl }),
+ );
+ const serverUrl = `${baseUrl}/mcp-server`;
+ const serverName = normalizeServerName(options.name || SERVER_NAME);
+ const hosts = await resolveHosts(options, scope, serverName, {
+  allowPrompt: true,
+  // CLI mode is a skills refresh/install path, so existing MCP wiring should
+  // not make hosts ineligible for selection.
+  disableAlreadyConfigured: false,
+ });
+ if (hosts.length === 0 && readStdinAuth === undefined) {
+  return { exitCode: 0 };
+ }
+
+ const result = await runCliSetupMode({
+  selectedHosts: hosts,
+  scope,
+  cwd: process.cwd(),
+  force: options.force === true,
+  apiKey: options.apiKey,
+  authMode: options.authMode,
+  readStdinAuth,
+  baseUrl,
+  serverName,
+  serverUrl,
+  reconcilePriorMode: async ({ hostNames, serverNames }) => {
+   // Uninstall each detected server name so renamed/drifted Flywheel MCP
+   // entries are actually removed. When the detector found no explicit
+   // names (prior CLI artifacts case), fall back to the current request's
+   // --name so the skill cleanup path still runs.
+   const targetNames =
+    Array.isArray(serverNames) && serverNames.length > 0
+     ? serverNames
+     : [serverName];
+   for (const targetName of targetNames) {
+    // eslint-disable-next-line no-await-in-loop
+    await runUninstallCommand(
+     buildUninstallOptionsForHosts({
+      hostNames,
+      scope,
+      serverName: targetName,
+     }),
     );
-    error.exitCode = result.exitCode;
-    throw error;
-  }
+   }
+  },
+ });
+
+ const lines = renderSetupSummary(result);
+ log.blank();
+ for (const line of lines) {
+  log.plain(`  ${line}`);
+ }
+ log.blank();
+
+ if (result.exitCode !== 0) {
+  const failureDetails = result.agentResults
+   .filter((agentResult) => agentResult.success !== true)
+   .flatMap((agentResult) =>
+    Array.isArray(agentResult.warnings) ? agentResult.warnings : [],
+   )
+   .join(" | ");
+  const error = new Error(
+   failureDetails.length > 0
+    ? `CLI setup encountered host-level failures: ${failureDetails}`
+    : "CLI setup encountered host-level failures.",
+  );
+  error.exitCode = result.exitCode;
+  throw error;
+ }
 
-  return result;
+ return result;
 }
 
 async function runSetupCommandViaRouter(options) {
-  return await runSetupRouter(options, {
-    isInteractive:
-      process.stdin.isTTY === true && process.stdout.isTTY === true,
-    promptMode: promptSetupMode,
-    runMcpMode: async () =>
-      await runMcpModeCommand(options, {
-        force: options.force === true,
-        reconcilePriorMode: async ({
-          hostNames,
-          serverNames,
-          scope: reconcileScope,
-          serverName: requestedServerName,
-        }) => {
-          // Prior CLI artifacts have no MCP entry name, so fall back to the
-          // current request's --name for the skill uninstall path. Prior MCP
-          // entries may carry drifted names; uninstall each detected name so
-          // the reconcile actually removes what we detected.
-          const targetNames =
-            Array.isArray(serverNames) && serverNames.length > 0
-              ? serverNames
-              : [requestedServerName];
-          for (const targetName of targetNames) {
-            // eslint-disable-next-line no-await-in-loop
-            await runUninstallCommand(
-              buildUninstallOptionsForHosts({
-                hostNames,
-                scope: reconcileScope,
-                serverName: targetName,
-              }),
-            );
-          }
-        },
-      }),
-    runCliMode: async () => await runCliModeCommand(options),
-  });
+ return await runSetupRouter(options, {
+  isInteractive:
+   isatty(0) && process.stdout.isTTY === true,
+  promptMode: promptSetupMode,
+  runMcpMode: async ({ readStdinAuth }) =>
+   await runMcpModeCommand(options, {
+    readStdinAuth,
+    force: options.force === true,
+    reconcilePriorMode: async ({
+     hostNames,
+     serverNames,
+     scope: reconcileScope,
+     serverName: requestedServerName,
+    }) => {
+     // Prior CLI artifacts have no MCP entry name, so fall back to the
+     // current request's --name for the skill uninstall path. Prior MCP
+     // entries may carry drifted names; uninstall each detected name so
+     // the reconcile actually removes what we detected.
+     const targetNames =
+      Array.isArray(serverNames) && serverNames.length > 0
+       ? serverNames
+       : [requestedServerName];
+     for (const targetName of targetNames) {
+      // eslint-disable-next-line no-await-in-loop
+      await runUninstallCommand(
+       buildUninstallOptionsForHosts({
+        hostNames,
+        scope: reconcileScope,
+        serverName: targetName,
+       }),
+      );
+     }
+    },
+   }),
+  runCliMode: async ({ readStdinAuth }) => await runCliModeCommand(options, readStdinAuth),
+ });
 }
 
 async function runCompletionCommand(shell, options) {
-  try {
-    const script = await generateCompletionScript({
-      shell,
-      includeBashCompletionLib: options.includeBashCompletionLib === true,
-    });
-    process.stdout.write(script);
-  } catch (error) {
-    const message = error instanceof Error ? error.message : String(error);
-    process.stderr.write(`${message}\n`);
-    process.exitCode = 1;
-  }
+ try {
+  const script = await generateCompletionScript({
+   shell,
+   includeBashCompletionLib: options.includeBashCompletionLib === true,
+  });
+  process.stdout.write(script);
+ } catch (error) {
+  const message = error instanceof Error ? error.message : String(error);
+  process.stderr.write(`${message}\n`);
+  process.exitCode = 1;
+ }
 }
 
 async function runCompletionInstallCommand(shell, options) {
-  try {
-    await installCompletion({
-      shell,
-      dir: options.dir,
-      force: options.force === true,
-      dryRun: options.dryRun === true,
-      updateProfile: options.updateProfile === true,
-      yes: options.yes === true,
-      isInteractive:
-        process.stdin.isTTY === true && process.stdout.isTTY === true,
-      stdout: (chunk) => process.stdout.write(chunk),
-      stderr: (chunk) => process.stderr.write(chunk),
-      confirmProfileUpdate: async ({ message, default: defaultValue }) =>
-        await confirm({ message, default: defaultValue }),
-      generateCompletionScript,
-    });
-  } catch (error) {
-    const message = error instanceof Error ? error.message : String(error);
-    process.stderr.write(`${message}\n`);
-    process.exitCode = 1;
-  }
+ try {
+  await installCompletion({
+   shell,
+   dir: options.dir,
+   force: options.force === true,
+   dryRun: options.dryRun === true,
+   updateProfile: options.updateProfile === true,
+   yes: options.yes === true,
+   isInteractive:
+    process.stdin.isTTY === true && process.stdout.isTTY === true,
+   stdout: (chunk) => process.stdout.write(chunk),
+   stderr: (chunk) => process.stderr.write(chunk),
+   confirmProfileUpdate: async ({ message, default: defaultValue }) =>
+    await confirm({ message, default: defaultValue }),
+   generateCompletionScript,
+  });
+ } catch (error) {
+  const message = error instanceof Error ? error.message : String(error);
+  process.stderr.write(`${message}\n`);
+  process.exitCode = 1;
+ }
 }
 
 async function runCompletionUninstallCommand(shell, options) {
-  try {
-    await uninstallCompletion({
-      shell,
-      dir: options.dir,
-      dryRun: options.dryRun === true,
-      updateProfile: options.updateProfile === true,
-      yes: options.yes === true,
-      isInteractive:
-        process.stdin.isTTY === true && process.stdout.isTTY === true,
-      stdout: (chunk) => process.stdout.write(chunk),
-      stderr: (chunk) => process.stderr.write(chunk),
-      confirmProfileUpdate: async ({ message, default: defaultValue }) =>
-        await confirm({ message, default: defaultValue }),
-    });
-  } catch (error) {
-    const message = error instanceof Error ? error.message : String(error);
-    process.stderr.write(`${message}\n`);
-    process.exitCode = 1;
-  }
+ try {
+  await uninstallCompletion({
+   shell,
+   dir: options.dir,
+   dryRun: options.dryRun === true,
+   updateProfile: options.updateProfile === true,
+   yes: options.yes === true,
+   isInteractive:
+    process.stdin.isTTY === true && process.stdout.isTTY === true,
+   stdout: (chunk) => process.stdout.write(chunk),
+   stderr: (chunk) => process.stderr.write(chunk),
+   confirmProfileUpdate: async ({ message, default: defaultValue }) =>
+    await confirm({ message, default: defaultValue }),
+  });
+ } catch (error) {
+  const message = error instanceof Error ? error.message : String(error);
+  process.stderr.write(`${message}\n`);
+  process.exitCode = 1;
+ }
 }
 
 function parseUninstallScope(value) {
-  const normalized = String(value || "")
-    .trim()
-    .toLowerCase();
-  if (
-    normalized === "global" ||
-    normalized === "project" ||
-    normalized === "all"
-  ) {
-    return normalized;
-  }
-  return "all";
+ const normalized = String(value || "")
+  .trim()
+  .toLowerCase();
+ if (
+  normalized === "global" ||
+  normalized === "project" ||
+  normalized === "all"
+ ) {
+  return normalized;
+ }
+ return "all";
 }
 
 function scopesFromUninstallScope(scope) {
-  return scope === "all" ? ["global", "project"] : [scope];
+ return scope === "all" ? ["global", "project"] : [scope];
 }
 
 function keyPath(configKey) {
-  return Array.isArray(configKey) ? configKey : [configKey];
+ return Array.isArray(configKey) ? configKey : [configKey];
 }
 
 function readConfigSection(config, configKey) {
-  const pathParts = keyPath(configKey);
-  let current = config && typeof config === "object" ? config : {};
-  for (const part of pathParts) {
-    if (
-      !current ||
-      typeof current !== "object" ||
-      Array.isArray(current) ||
-      !(part in current)
-    ) {
-      return {};
-    }
-    const next = current[part];
-    if (!next || typeof next !== "object" || Array.isArray(next)) {
-      return {};
-    }
-    current = next;
+ const pathParts = keyPath(configKey);
+ let current = config && typeof config === "object" ? config : {};
+ for (const part of pathParts) {
+  if (
+   !current ||
+   typeof current !== "object" ||
+   Array.isArray(current) ||
+   !(part in current)
+  ) {
+   return {};
+  }
+  const next = current[part];
+  if (!next || typeof next !== "object" || Array.isArray(next)) {
+   return {};
   }
-  return current;
+  current = next;
+ }
+ return current;
 }
 
 function parseTomlServerNames(tomlText) {
-  const serverNames = new Set();
-  for (const line of String(tomlText || "")
-    .replace(/\r\n/g, "\n")
-    .split("\n")) {
-    const match = line
-      .trim()
-      .match(/^\[mcp_servers\.([A-Za-z0-9_-]+)\](?:\s*#.*)?$/);
-    if (!match) {
-      continue;
-    }
-    serverNames.add(match[1]);
+ const serverNames = new Set();
+ for (const line of String(tomlText || "")
+  .replace(/\r\n/g, "\n")
+  .split("\n")) {
+  const match = line
+   .trim()
+   .match(/^\[mcp_servers\.([A-Za-z0-9_-]+)\](?:\s*#.*)?$/);
+  if (!match) {
+   continue;
   }
-  return [...serverNames].sort();
+  serverNames.add(match[1]);
+ }
+ return [...serverNames].sort();
 }
 
 function isLikelyFlywheelMcpUrl(url) {
-  if (typeof url !== "string" || url.trim().length === 0) {
-    return false;
-  }
-  try {
-    const parsed = new URL(url);
-    return parsed.pathname === "/mcp-server";
-  } catch {
-    return false;
-  }
+ if (typeof url !== "string" || url.trim().length === 0) {
+  return false;
+ }
+ try {
+  const parsed = new URL(url);
+  return parsed.pathname === "/mcp-server";
+ } catch {
+  return false;
+ }
 }
 
 async function listHostMcpEntries(hostName, scope) {
-  const host = getHost(hostName);
-  if (isSkillOnlyHost(host)) {
-    return [];
+ const host = getHost(hostName);
+ if (isSkillOnlyHost(host)) {
+  return [];
+ }
+ const filePath = await resolveMcpPath(mcpCandidatesForScope(host, scope));
+
+ if (host.mcp.configType === "toml") {
+  let raw = "";
+  try {
+   raw = await readFile(filePath, "utf8");
+  } catch {
+   return [];
   }
-  const filePath = await resolveMcpPath(mcpCandidatesForScope(host, scope));
-
-  if (host.mcp.configType === "toml") {
-    let raw = "";
-    try {
-      raw = await readFile(filePath, "utf8");
-    } catch {
-      return [];
-    }
-    const entries = [];
-    for (const serverName of parseTomlServerNames(raw)) {
-      // eslint-disable-next-line no-await-in-loop
-      const entry = await readTomlServerEntry(filePath, serverName);
-      if (!entry.exists) {
-        continue;
-      }
-      entries.push({
-        serverName,
-        url: typeof entry.url === "string" ? entry.url : null,
-      });
-    }
-    return entries;
+  const entries = [];
+  for (const serverName of parseTomlServerNames(raw)) {
+   // eslint-disable-next-line no-await-in-loop
+   const entry = await readTomlServerEntry(filePath, serverName);
+   if (!entry.exists) {
+    continue;
+   }
+   entries.push({
+    serverName,
+    url: typeof entry.url === "string" ? entry.url : null,
+   });
   }
-
-  const config =
-    host.mcp.configType === "yaml"
-      ? await readYamlConfig(filePath)
-      : await readJsonConfig(filePath);
-  const section = readConfigSection(config, host.mcp.configKey);
-  return Object.entries(section)
-    .filter(
-      ([, entry]) =>
-        entry && typeof entry === "object" && !Array.isArray(entry),
-    )
-    .map(([serverName, entry]) => ({
-      serverName,
-      url: readEntryServerUrl(entry),
-    }));
+  return entries;
+ }
+
+ const config =
+  host.mcp.configType === "yaml"
+   ? await readYamlConfig(filePath)
+   : await readJsonConfig(filePath);
+ const section = readConfigSection(config, host.mcp.configKey);
+ return Object.entries(section)
+  .filter(
+   ([, entry]) =>
+    entry && typeof entry === "object" && !Array.isArray(entry),
+  )
+  .map(([serverName, entry]) => ({
+   serverName,
+   url: readEntryServerUrl(entry),
+  }));
 }
 
 async function resolveHostsWithRemainingFlywheelMcpEntries({ scope }) {
-  const remainingHosts = [];
-  for (const hostName of SUPPORTED_INSTALL_SKILL_HOSTS) {
-    // eslint-disable-next-line no-await-in-loop
-    const hostEntries = await listHostMcpEntries(hostName, scope).catch(
-      () => [],
-    );
-    if (hostEntries.some((entry) => isLikelyFlywheelMcpUrl(entry.url))) {
-      remainingHosts.push(hostName);
-    }
+ const remainingHosts = [];
+ for (const hostName of SUPPORTED_INSTALL_SKILL_HOSTS) {
+  // eslint-disable-next-line no-await-in-loop
+  const hostEntries = await listHostMcpEntries(hostName, scope).catch(
+   () => [],
+  );
+  if (hostEntries.some((entry) => isLikelyFlywheelMcpUrl(entry.url))) {
+   remainingHosts.push(hostName);
   }
-  return remainingHosts;
+ }
+ return remainingHosts;
 }
 
 /**
@@ -697,95 +700,95 @@ async function resolveHostsWithRemainingFlywheelMcpEntries({ scope }) {
  * they are excluded from retention here.
  */
 async function resolveSkillOnlyHostsRetainingArtifacts({
-  scope,
-  excludedHostNames = [],
+ scope,
+ excludedHostNames = [],
 }) {
-  const excluded = new Set(excludedHostNames);
-  const retained = [];
-  for (const hostName of SUPPORTED_INSTALL_SKILL_HOSTS) {
-    if (excluded.has(hostName)) continue;
-    let markerPath;
-    try {
-      markerPath = resolveFlywheelInstalledMarkerPath(
-        process.cwd(),
-        hostName,
-        scope,
-      );
-    } catch {
-      // Host isn't registered with the flywheel skill installer; no marker
-      // to consult, nothing to retain.
-      continue;
-    }
-    // eslint-disable-next-line no-await-in-loop
-    const markerExists = await pathExists(markerPath);
-    if (markerExists) {
-      retained.push(hostName);
-    }
+ const excluded = new Set(excludedHostNames);
+ const retained = [];
+ for (const hostName of SUPPORTED_INSTALL_SKILL_HOSTS) {
+  if (excluded.has(hostName)) continue;
+  let markerPath;
+  try {
+   markerPath = resolveFlywheelInstalledMarkerPath(
+    process.cwd(),
+    hostName,
+    scope,
+   );
+  } catch {
+   // Host isn't registered with the flywheel skill installer; no marker
+   // to consult, nothing to retain.
+   continue;
+  }
+  // eslint-disable-next-line no-await-in-loop
+  const markerExists = await pathExists(markerPath);
+  if (markerExists) {
+   retained.push(hostName);
   }
-  return retained;
+ }
+ return retained;
 }
 
 async function findFlywheelServerNamesOnHost(hostName, scope) {
-  // Mirror setup's prior-mode detector: walk every MCP entry on the host and
-  // keep those whose URL is Flywheel-identifying (hostname contains "flywheel"
-  // or path === /mcp-server with a matching target origin). Uninstall must
-  // catch renamed or drifted entries (e.g. a non-default TOML section name
-  // under `[mcp_servers.*]`) that setup already detects; otherwise a user
-  // whose host has a non-default entry name is stuck between setup ("already
-  // installed") and uninstall ("not configured").
-  return await findFlywheelMcpEntryNames({ hostName, scope }).catch(() => []);
+ // Mirror setup's prior-mode detector: walk every MCP entry on the host and
+ // keep those whose URL is Flywheel-identifying (hostname contains "flywheel"
+ // or path === /mcp-server with a matching target origin). Uninstall must
+ // catch renamed or drifted entries (e.g. a non-default TOML section name
+ // under `[mcp_servers.*]`) that setup already detects; otherwise a user
+ // whose host has a non-default entry name is stuck between setup ("already
+ // installed") and uninstall ("not configured").
+ return await findFlywheelMcpEntryNames({ hostName, scope }).catch(() => []);
 }
 
 async function resolveUninstallServerNamesForHost(
-  hostName,
-  scope,
-  { explicitServerName },
+ hostName,
+ scope,
+ { explicitServerName },
 ) {
-  if (explicitServerName) {
-    const configured = await isAlreadyConfigured(
-      hostName,
-      scope,
-      explicitServerName,
-    ).catch(() => false);
-    return configured ? [explicitServerName] : [];
-  }
-  return await findFlywheelServerNamesOnHost(hostName, scope);
+ if (explicitServerName) {
+  const configured = await isAlreadyConfigured(
+   hostName,
+   scope,
+   explicitServerName,
+  ).catch(() => false);
+  return configured ? [explicitServerName] : [];
+ }
+ return await findFlywheelServerNamesOnHost(hostName, scope);
 }
 
 async function isConfiguredForUninstallScope(
-  hostName,
-  scope,
-  { explicitServerName },
+ hostName,
+ scope,
+ { explicitServerName },
 ) {
-  const scopes = scopesFromUninstallScope(scope);
-  for (const singleScope of scopes) {
-    // eslint-disable-next-line no-await-in-loop
-    const targets = await resolveUninstallServerNamesForHost(
-      hostName,
-      singleScope,
-      { explicitServerName },
+ const scopes = scopesFromUninstallScope(scope);
+ for (const singleScope of scopes) {
+  // eslint-disable-next-line no-await-in-loop
+  const targets = await resolveUninstallServerNamesForHost(
+   hostName,
+   singleScope,
+   { explicitServerName },
+  );
+  if (targets.length > 0) return true;
+  // Skill-only hosts and CLI-mode MCP-capable hosts never write an MCP
+  // entry, so the sweep above finds nothing for them. Fall back to the
+  // install marker: if this host wrote its own ownership marker in the
+  // selected scope, it IS configured for the purposes of the uninstall
+  // prompt.
+  if (SUPPORTED_INSTALL_SKILL_HOSTS.includes(hostName)) {
+   try {
+    const markerPath = resolveFlywheelInstalledMarkerPath(
+     process.cwd(),
+     hostName,
+     singleScope,
     );
-    if (targets.length > 0) return true;
-    // Skill-only hosts and CLI-mode MCP-capable hosts never write an MCP
-    // entry, so the sweep above finds nothing for them. Fall back to the
-    // install marker: if this host wrote its own ownership marker in the
-    // selected scope, it IS configured for the purposes of the uninstall
-    // prompt.
-    if (SUPPORTED_INSTALL_SKILL_HOSTS.includes(hostName)) {
-      try {
-        const markerPath = resolveFlywheelInstalledMarkerPath(
-          process.cwd(),
-          hostName,
-          singleScope,
-        );
-        // eslint-disable-next-line no-await-in-loop
-        if (await pathExists(markerPath)) return true;
-      } catch {
-        // Host isn't registered with the skill installer; nothing to check.
-      }
-    }
+    // eslint-disable-next-line no-await-in-loop
+    if (await pathExists(markerPath)) return true;
+   } catch {
+    // Host isn't registered with the skill installer; nothing to check.
+   }
   }
-  return false;
+ }
+ return false;
 }
 
 /**
@@ -796,23 +799,23 @@ async function isConfiguredForUninstallScope(
  * prompt even though they write no MCP entry.
  */
 export async function isHostConfiguredForUninstall({
-  hostName,
-  scope = "project",
-  serverName = SERVER_NAME,
+ hostName,
+ scope = "project",
+ serverName = SERVER_NAME,
 } = {}) {
-  // Mirror `runUninstallCommand`'s derivation: only treat the caller's
-  // `serverName` as "explicit" when it differs from the package default.
-  // An explicit name short-circuits the Flywheel-identifying sweep in
-  // `resolveUninstallServerNamesForHost`, which the default-named case
-  // needs to run so drifted entries (and the marker fallback for
-  // skill-only / CLI-mode hosts) are reachable.
-  const explicitServerName =
-    typeof serverName === "string" &&
-    serverName.length > 0 &&
-    serverName !== SERVER_NAME
-      ? serverName
-      : null;
-  return isConfiguredForUninstallScope(hostName, scope, { explicitServerName });
+ // Mirror `runUninstallCommand`'s derivation: only treat the caller's
+ // `serverName` as "explicit" when it differs from the package default.
+ // An explicit name short-circuits the Flywheel-identifying sweep in
+ // `resolveUninstallServerNamesForHost`, which the default-named case
+ // needs to run so drifted entries (and the marker fallback for
+ // skill-only / CLI-mode hosts) are reachable.
+ const explicitServerName =
+  typeof serverName === "string" &&
+   serverName.length > 0 &&
+   serverName !== SERVER_NAME
+   ? serverName
+   : null;
+ return isConfiguredForUninstallScope(hostName, scope, { explicitServerName });
 }
 
 /**
@@ -830,380 +833,380 @@ export async function isHostConfiguredForUninstall({
  * without pre-filtering.
  */
 export async function cleanupHostInstallMarkers({
-  cwd = process.cwd(),
-  scopes = ["project"],
-  hostNames = [],
+ cwd = process.cwd(),
+ scopes = ["project"],
+ hostNames = [],
 } = {}) {
-  for (const singleScope of scopes) {
-    for (const hostName of hostNames) {
-      let markerPath;
-      try {
-        markerPath = resolveFlywheelInstalledMarkerPath(
-          cwd,
-          hostName,
-          singleScope,
-        );
-      } catch {
-        continue;
-      }
-      // eslint-disable-next-line no-await-in-loop
-      await rm(markerPath, { force: true });
-    }
+ for (const singleScope of scopes) {
+  for (const hostName of hostNames) {
+   let markerPath;
+   try {
+    markerPath = resolveFlywheelInstalledMarkerPath(
+     cwd,
+     hostName,
+     singleScope,
+    );
+   } catch {
+    continue;
+   }
+   // eslint-disable-next-line no-await-in-loop
+   await rm(markerPath, { force: true });
   }
+ }
 }
 
 async function promptUninstallScope(defaultScope) {
-  try {
-    return await select({
-      message: "Which scope do you want to uninstall from?",
-      choices: [
-        { name: "All (global and project)", value: "all" },
-        { name: "Global", value: "global" },
-        { name: "Project", value: "project" },
-      ],
-      default: defaultScope,
-      theme: CHECKBOX_THEME,
-    });
-  } catch {
-    return null;
-  }
+ try {
+  return await select({
+   message: "Which scope do you want to uninstall from?",
+   choices: [
+    { name: "All (global and project)", value: "all" },
+    { name: "Global", value: "global" },
+    { name: "Project", value: "project" },
+   ],
+   default: defaultScope,
+   theme: CHECKBOX_THEME,
+  });
+ } catch {
+  return null;
+ }
 }
 
 async function promptUninstallHosts(scope, { explicitServerName }) {
-  const choices = await Promise.all(
-    ALL_HOST_NAMES.map(async (hostName) => {
-      const configured = await isConfiguredForUninstallScope(hostName, scope, {
-        explicitServerName,
-      });
-      return {
-        name: SETUP_HOST_NAMES[hostName],
-        value: hostName,
-        checked: configured,
-        disabled: configured ? false : "(not configured)",
-      };
-    }),
-  );
+ const choices = await Promise.all(
+  ALL_HOST_NAMES.map(async (hostName) => {
+   const configured = await isConfiguredForUninstallScope(hostName, scope, {
+    explicitServerName,
+   });
+   return {
+    name: SETUP_HOST_NAMES[hostName],
+    value: hostName,
+    checked: configured,
+    disabled: configured ? false : "(not configured)",
+   };
+  }),
+ );
+
+ if (choices.every((choice) => Boolean(choice.disabled))) {
+  log.info("Flywheel is not configured for the selected scope.");
+  return null;
+ }
+
+ try {
+  return await checkbox({
+   message: "Which hosts do you want to uninstall?",
+   choices,
+   loop: false,
+   theme: CHECKBOX_THEME,
+   validate: (selected) =>
+    selected.length > 0 || "Select at least one host.",
+  });
+ } catch {
+  return null;
+ }
+}
 
-  if (choices.every((choice) => Boolean(choice.disabled))) {
-    log.info("Flywheel is not configured for the selected scope.");
+async function resolveUninstallTargets(options, { explicitServerName }) {
+ const explicitHostsFromFlags = selectedHostsFromOptions(options);
+ const explicitHostsFromList =
+  explicitHostsFromFlags.length === 0 ? parseHostsList(options.hosts) : [];
+ const hasExplicitHosts =
+  explicitHostsFromFlags.length > 0 || explicitHostsFromList.length > 0;
+ const hasExplicitScope =
+  typeof options.scope === "string" && options.scope.trim().length > 0;
+
+ let scope = parseUninstallScope(options.scope || "all");
+ let hosts =
+  explicitHostsFromFlags.length > 0
+   ? explicitHostsFromFlags
+   : explicitHostsFromList.length > 0
+    ? explicitHostsFromList
+    : [...ALL_HOST_NAMES];
+
+ if (!options.yes) {
+  if (!hasExplicitScope) {
+   log.blank();
+   const selectedScope = await promptUninstallScope(scope);
+   if (!selectedScope) {
+    log.warn("Uninstall cancelled");
     return null;
+   }
+   scope = selectedScope;
   }
 
-  try {
-    return await checkbox({
-      message: "Which hosts do you want to uninstall?",
-      choices,
-      loop: false,
-      theme: CHECKBOX_THEME,
-      validate: (selected) =>
-        selected.length > 0 || "Select at least one host.",
-    });
-  } catch {
+  if (!hasExplicitHosts) {
+   const selectedHosts = await promptUninstallHosts(scope, {
+    explicitServerName,
+   });
+   if (!selectedHosts) {
+    log.warn("Uninstall cancelled");
     return null;
+   }
+   hosts = selectedHosts;
   }
-}
-
-async function resolveUninstallTargets(options, { explicitServerName }) {
-  const explicitHostsFromFlags = selectedHostsFromOptions(options);
-  const explicitHostsFromList =
-    explicitHostsFromFlags.length === 0 ? parseHostsList(options.hosts) : [];
-  const hasExplicitHosts =
-    explicitHostsFromFlags.length > 0 || explicitHostsFromList.length > 0;
-  const hasExplicitScope =
-    typeof options.scope === "string" && options.scope.trim().length > 0;
-
-  let scope = parseUninstallScope(options.scope || "all");
-  let hosts =
-    explicitHostsFromFlags.length > 0
-      ? explicitHostsFromFlags
-      : explicitHostsFromList.length > 0
-        ? explicitHostsFromList
-        : [...ALL_HOST_NAMES];
-
-  if (!options.yes) {
-    if (!hasExplicitScope) {
-      log.blank();
-      const selectedScope = await promptUninstallScope(scope);
-      if (!selectedScope) {
-        log.warn("Uninstall cancelled");
-        return null;
-      }
-      scope = selectedScope;
-    }
-
-    if (!hasExplicitHosts) {
-      const selectedHosts = await promptUninstallHosts(scope, {
-        explicitServerName,
-      });
-      if (!selectedHosts) {
-        log.warn("Uninstall cancelled");
-        return null;
-      }
-      hosts = selectedHosts;
-    }
-  }
+ }
 
-  return { scope, hosts };
+ return { scope, hosts };
 }
 
 async function removeHostConfig(hostName, scope, serverName) {
-  const host = getHost(hostName);
-  if (isSkillOnlyHost(host)) {
-    return {
-      host: host.displayName,
-      scope,
-      filePath: null,
-      status: "not present",
-    };
-  }
-  const filePath = await resolveMcpPath(mcpCandidatesForScope(host, scope));
-
-  if (host.mcp.configType === "toml") {
-    const result = await removeCodexTomlServer({
-      filePath,
-      serverName,
-    });
-    return {
-      host: host.displayName,
-      scope,
-      filePath,
-      status: result.changed ? "removed" : "not present",
-    };
-  }
+ const host = getHost(hostName);
+ if (isSkillOnlyHost(host)) {
+  return {
+   host: host.displayName,
+   scope,
+   filePath: null,
+   status: "not present",
+  };
+ }
+ const filePath = await resolveMcpPath(mcpCandidatesForScope(host, scope));
 
-  const current =
-    host.mcp.configType === "yaml"
-      ? await readYamlConfig(filePath)
-      : await readJsonConfig(filePath);
-  const next = removeJsonServerEntry({
-    config: current,
-    configKey: host.mcp.configKey,
-    serverName,
+ if (host.mcp.configType === "toml") {
+  const result = await removeCodexTomlServer({
+   filePath,
+   serverName,
   });
-  if (next.changed) {
-    if (host.mcp.configType === "yaml") {
-      await writeYamlConfig(filePath, next.config);
-    } else {
-      await writeJsonConfig(filePath, next.config);
-    }
-  }
   return {
-    host: host.displayName,
-    scope,
-    filePath,
-    status: next.changed ? "removed" : "not present",
+   host: host.displayName,
+   scope,
+   filePath,
+   status: result.changed ? "removed" : "not present",
   };
+ }
+
+ const current =
+  host.mcp.configType === "yaml"
+   ? await readYamlConfig(filePath)
+   : await readJsonConfig(filePath);
+ const next = removeJsonServerEntry({
+  config: current,
+  configKey: host.mcp.configKey,
+  serverName,
+ });
+ if (next.changed) {
+  if (host.mcp.configType === "yaml") {
+   await writeYamlConfig(filePath, next.config);
+  } else {
+   await writeJsonConfig(filePath, next.config);
+  }
+ }
+ return {
+  host: host.displayName,
+  scope,
+  filePath,
+  status: next.changed ? "removed" : "not present",
+ };
 }
 
 async function runUninstallCommand(options) {
-  const explicitServerName =
-    typeof options.name === "string" && options.name.trim().length > 0
-      ? normalizeServerName(options.name)
-      : null;
-  const resolved = await resolveUninstallTargets(options, {
-    explicitServerName,
-  });
-  if (!resolved) return;
-  const { scope, hosts } = resolved;
-  const scopes = scopesFromUninstallScope(scope);
-
-  const mcpSpinner = ora("Removing Flywheel MCP entries...").start();
-  const mcpResults = [];
-  for (const singleScope of scopes) {
-    for (const host of hosts) {
-      mcpSpinner.text = `Removing from ${getHost(host).displayName} (${singleScope})...`;
-      // Resolve the concrete server name(s) to remove at the host/scope level.
-      // When --name was not given, this iterates every Flywheel-identifying
-      // entry (matching setup's prior-mode detector) so renamed or drifted
-      // entries (non-default TOML section names under `[mcp_servers.*]`) are
-      // actually cleared.
-      // eslint-disable-next-line no-await-in-loop
-      const targetNames = await resolveUninstallServerNamesForHost(
-        host,
-        singleScope,
-        { explicitServerName },
-      );
-      if (targetNames.length === 0) {
-        // eslint-disable-next-line no-await-in-loop
-        const hostForDisplay = getHost(host);
-        // Skill-only hosts (universal, antigravity) have no MCP surface
-        // at all — `host.mcp` is null, so dereferencing `projectPaths` via
-        // `mcpCandidatesForScope` throws. Report the absence without
-        // consulting a path that doesn't exist for them.
-        const filePath = isSkillOnlyHost(hostForDisplay)
-          ? null
-          : // eslint-disable-next-line no-await-in-loop
-            await resolveMcpPath(
-              mcpCandidatesForScope(hostForDisplay, singleScope),
-            );
-        mcpResults.push({
-          host: hostForDisplay.displayName,
-          scope: singleScope,
-          filePath,
-          status: "not present",
-        });
-        continue;
-      }
-      for (const targetName of targetNames) {
-        // eslint-disable-next-line no-await-in-loop
-        mcpResults.push(await removeHostConfig(host, singleScope, targetName));
-      }
-    }
-  }
-  mcpSpinner.succeed("MCP uninstall complete");
-
-  const { supportedHosts, unsupportedHosts } =
-    partitionInstallSkillHosts(hosts);
-  const bundledSkillResults = [];
-  let bundledSkillNames = [];
-
-  if (supportedHosts.length > 0) {
-    const packageRoot = resolvePackageRoot();
-    bundledSkillNames = await listBundledSkills(packageRoot);
-    if (bundledSkillNames.length > 0) {
-      const skillSpinner = ora("Removing Flywheel bundled skills...").start();
-      for (const singleScope of scopes) {
-        // Retain any skill directory still claimed by a non-uninstalled host.
-        // Two signals combine: (a) MCP-backed hosts whose Flywheel entries
-        // survived the MCP-removal pass above, and (b) any host with bundled
-        // skill artifacts still on disk (including skill-only hosts like
-        // universal/antigravity, which never advertise themselves via MCP
-        // entries). Without (b), uninstalling one MCP host would silently
-        // wipe a shared `.agents/skills/<skill>/` that another host still
-        // relies on.
-        // eslint-disable-next-line no-await-in-loop
-        const mcpRetained = await resolveHostsWithRemainingFlywheelMcpEntries({
-          scope: singleScope,
-        });
-        // eslint-disable-next-line no-await-in-loop
-        const skillOnlyRetained = await resolveSkillOnlyHostsRetainingArtifacts(
-          {
-            scope: singleScope,
-            excludedHostNames: supportedHosts,
-          },
-        );
-        const configuredRetainHostNames = [
-          ...new Set([...mcpRetained, ...skillOnlyRetained]),
-        ];
-        skillSpinner.text = `Removing bundled skills from ${supportedHosts.length} host(s) (${singleScope})...`;
-        // eslint-disable-next-line no-await-in-loop
-        bundledSkillResults.push(
-          ...(await removeInstalledSkillsForHosts({
-            projectRoot: process.cwd(),
-            hostNames: supportedHosts,
-            retainHostNames: configuredRetainHostNames,
-            scope: singleScope,
-            skillNames: bundledSkillNames,
-          })),
-        );
-      }
-      skillSpinner.succeed("Bundled skill uninstall complete");
-    }
-
-    // Install-marker cleanup runs independently of bundled-skill discovery.
-    // A broken or trimmed package (missing `skills/`) can leave
-    // `bundledSkillNames` empty — the skill-removal pass above legitimately
-    // no-ops in that case, but the ownership markers must still be cleared,
-    // otherwise a later `uninstall`/`setup` would treat the uninstalled
-    // host as still owning shared skill dirs (wrong retention) or as a
-    // prior CLI install (false cross-mode conflict).
-    await cleanupHostInstallMarkers({
-      cwd: process.cwd(),
-      scopes,
-      hostNames: supportedHosts,
+ const explicitServerName =
+  typeof options.name === "string" && options.name.trim().length > 0
+   ? normalizeServerName(options.name)
+   : null;
+ const resolved = await resolveUninstallTargets(options, {
+  explicitServerName,
+ });
+ if (!resolved) return;
+ const { scope, hosts } = resolved;
+ const scopes = scopesFromUninstallScope(scope);
+
+ const mcpSpinner = ora("Removing Flywheel MCP entries...").start();
+ const mcpResults = [];
+ for (const singleScope of scopes) {
+  for (const host of hosts) {
+   mcpSpinner.text = `Removing from ${getHost(host).displayName} (${singleScope})...`;
+   // Resolve the concrete server name(s) to remove at the host/scope level.
+   // When --name was not given, this iterates every Flywheel-identifying
+   // entry (matching setup's prior-mode detector) so renamed or drifted
+   // entries (non-default TOML section names under `[mcp_servers.*]`) are
+   // actually cleared.
+   // eslint-disable-next-line no-await-in-loop
+   const targetNames = await resolveUninstallServerNamesForHost(
+    host,
+    singleScope,
+    { explicitServerName },
+   );
+   if (targetNames.length === 0) {
+    // eslint-disable-next-line no-await-in-loop
+    const hostForDisplay = getHost(host);
+    // Skill-only hosts (universal, antigravity) have no MCP surface
+    // at all — `host.mcp` is null, so dereferencing `projectPaths` via
+    // `mcpCandidatesForScope` throws. Report the absence without
+    // consulting a path that doesn't exist for them.
+    const filePath = isSkillOnlyHost(hostForDisplay)
+     ? null
+     : // eslint-disable-next-line no-await-in-loop
+     await resolveMcpPath(
+      mcpCandidatesForScope(hostForDisplay, singleScope),
+     );
+    mcpResults.push({
+     host: hostForDisplay.displayName,
+     scope: singleScope,
+     filePath,
+     status: "not present",
     });
+    continue;
+   }
+   for (const targetName of targetNames) {
+    // eslint-disable-next-line no-await-in-loop
+    mcpResults.push(await removeHostConfig(host, singleScope, targetName));
+   }
   }
-
-  log.blank();
-  log.plain(
-    pc.green("✔ Flywheel uninstall complete (MCP entries and bundled skills)"),
-  );
-  log.blank();
-  for (const result of mcpResults) {
-    const icon = result.status === "removed" ? pc.green("-") : pc.dim("~");
-    log.plain(`  ${pc.bold(result.host)} ${pc.dim(`(${result.scope})`)}`);
-    log.plain(`    ${icon} ${result.status}`);
-    log.plain(`      ${pc.dim(result.filePath)}`);
+ }
+ mcpSpinner.succeed("MCP uninstall complete");
+
+ const { supportedHosts, unsupportedHosts } =
+  partitionInstallSkillHosts(hosts);
+ const bundledSkillResults = [];
+ let bundledSkillNames = [];
+
+ if (supportedHosts.length > 0) {
+  const packageRoot = resolvePackageRoot();
+  bundledSkillNames = await listBundledSkills(packageRoot);
+  if (bundledSkillNames.length > 0) {
+   const skillSpinner = ora("Removing Flywheel bundled skills...").start();
+   for (const singleScope of scopes) {
+    // Retain any skill directory still claimed by a non-uninstalled host.
+    // Two signals combine: (a) MCP-backed hosts whose Flywheel entries
+    // survived the MCP-removal pass above, and (b) any host with bundled
+    // skill artifacts still on disk (including skill-only hosts like
+    // universal/antigravity, which never advertise themselves via MCP
+    // entries). Without (b), uninstalling one MCP host would silently
+    // wipe a shared `.agents/skills/<skill>/` that another host still
+    // relies on.
+    // eslint-disable-next-line no-await-in-loop
+    const mcpRetained = await resolveHostsWithRemainingFlywheelMcpEntries({
+     scope: singleScope,
+    });
+    // eslint-disable-next-line no-await-in-loop
+    const skillOnlyRetained = await resolveSkillOnlyHostsRetainingArtifacts(
+     {
+      scope: singleScope,
+      excludedHostNames: supportedHosts,
+     },
+    );
+    const configuredRetainHostNames = [
+     ...new Set([...mcpRetained, ...skillOnlyRetained]),
+    ];
+    skillSpinner.text = `Removing bundled skills from ${supportedHosts.length} host(s) (${singleScope})...`;
+    // eslint-disable-next-line no-await-in-loop
+    bundledSkillResults.push(
+     ...(await removeInstalledSkillsForHosts({
+      projectRoot: process.cwd(),
+      hostNames: supportedHosts,
+      retainHostNames: configuredRetainHostNames,
+      scope: singleScope,
+      skillNames: bundledSkillNames,
+     })),
+    );
+   }
+   skillSpinner.succeed("Bundled skill uninstall complete");
   }
 
-  log.blank();
-  log.plain(`  ${pc.bold("Bundled skills")}`);
-  if (supportedHosts.length === 0) {
-    log.plain(`    ${pc.dim("~")} no skill-supporting hosts selected`);
-  } else if (bundledSkillNames.length === 0) {
-    log.plain(`    ${pc.dim("~")} no bundled skills found in this package`);
-  } else {
-    const groupedSkillResults = new Map();
-    for (const skillResult of bundledSkillResults) {
-      for (const hostName of skillResult.hostNames) {
-        const groupingKey = `${hostName}:${skillResult.scope}`;
-        const existingGroup = groupedSkillResults.get(groupingKey);
-        if (existingGroup) {
-          existingGroup.entries.push(skillResult);
-          continue;
-        }
-        groupedSkillResults.set(groupingKey, {
-          hostName,
-          scope: skillResult.scope,
-          entries: [skillResult],
-        });
-      }
+  // Install-marker cleanup runs independently of bundled-skill discovery.
+  // A broken or trimmed package (missing `skills/`) can leave
+  // `bundledSkillNames` empty — the skill-removal pass above legitimately
+  // no-ops in that case, but the ownership markers must still be cleared,
+  // otherwise a later `uninstall`/`setup` would treat the uninstalled
+  // host as still owning shared skill dirs (wrong retention) or as a
+  // prior CLI install (false cross-mode conflict).
+  await cleanupHostInstallMarkers({
+   cwd: process.cwd(),
+   scopes,
+   hostNames: supportedHosts,
+  });
+ }
+
+ log.blank();
+ log.plain(
+  pc.green("✔ Flywheel uninstall complete (MCP entries and bundled skills)"),
+ );
+ log.blank();
+ for (const result of mcpResults) {
+  const icon = result.status === "removed" ? pc.green("-") : pc.dim("~");
+  log.plain(`  ${pc.bold(result.host)} ${pc.dim(`(${result.scope})`)}`);
+  log.plain(`    ${icon} ${result.status}`);
+  log.plain(`      ${pc.dim(result.filePath)}`);
+ }
+
+ log.blank();
+ log.plain(`  ${pc.bold("Bundled skills")}`);
+ if (supportedHosts.length === 0) {
+  log.plain(`    ${pc.dim("~")} no skill-supporting hosts selected`);
+ } else if (bundledSkillNames.length === 0) {
+  log.plain(`    ${pc.dim("~")} no bundled skills found in this package`);
+ } else {
+  const groupedSkillResults = new Map();
+  for (const skillResult of bundledSkillResults) {
+   for (const hostName of skillResult.hostNames) {
+    const groupingKey = `${hostName}:${skillResult.scope}`;
+    const existingGroup = groupedSkillResults.get(groupingKey);
+    if (existingGroup) {
+     existingGroup.entries.push(skillResult);
+     continue;
     }
+    groupedSkillResults.set(groupingKey, {
+     hostName,
+     scope: skillResult.scope,
+     entries: [skillResult],
+    });
+   }
+  }
 
-    const sortedGroups = [...groupedSkillResults.values()].sort(
-      (left, right) => {
-        const leftKey = `${left.hostName}:${left.scope}`;
-        const rightKey = `${right.hostName}:${right.scope}`;
-        return leftKey.localeCompare(rightKey);
-      },
+  const sortedGroups = [...groupedSkillResults.values()].sort(
+   (left, right) => {
+    const leftKey = `${left.hostName}:${left.scope}`;
+    const rightKey = `${right.hostName}:${right.scope}`;
+    return leftKey.localeCompare(rightKey);
+   },
+  );
+  for (const groupedResult of sortedGroups) {
+   log.plain(
+    `  ${pc.bold(getHost(groupedResult.hostName).displayName)} ${pc.dim(`(${groupedResult.scope})`)}`,
+   );
+   for (const entry of groupedResult.entries) {
+    const icon =
+     entry.status === "removed"
+      ? pc.green("-")
+      : entry.status === "retained"
+       ? pc.yellow("~")
+       : pc.dim("~");
+    const retainedSuffix =
+     entry.status === "retained" && Array.isArray(entry.retainedHostNames)
+      ? ` (shared with configured host(s): ${entry.retainedHostNames.join(", ")})`
+      : "";
+    log.plain(
+     `    ${icon} ${entry.status}${retainedSuffix}: ${entry.skillNames.join(", ")}`,
     );
-    for (const groupedResult of sortedGroups) {
-      log.plain(
-        `  ${pc.bold(getHost(groupedResult.hostName).displayName)} ${pc.dim(`(${groupedResult.scope})`)}`,
-      );
-      for (const entry of groupedResult.entries) {
-        const icon =
-          entry.status === "removed"
-            ? pc.green("-")
-            : entry.status === "retained"
-              ? pc.yellow("~")
-              : pc.dim("~");
-        const retainedSuffix =
-          entry.status === "retained" && Array.isArray(entry.retainedHostNames)
-            ? ` (shared with configured host(s): ${entry.retainedHostNames.join(", ")})`
-            : "";
-        log.plain(
-          `    ${icon} ${entry.status}${retainedSuffix}: ${entry.skillNames.join(", ")}`,
-        );
-        log.plain(`      ${pc.dim(entry.installedSkillDir)}`);
-      }
-    }
+    log.plain(`      ${pc.dim(entry.installedSkillDir)}`);
+   }
   }
+ }
 
-  for (const unsupportedHostName of unsupportedHosts) {
-    for (const singleScope of scopes) {
-      log.plain(
-        `  ${pc.bold(getHost(unsupportedHostName).displayName)} ${pc.dim(`(${singleScope})`)}`,
-      );
-      log.plain(
-        `    ${pc.dim("~")} skill uninstall not supported (MCP-only host)`,
-      );
-    }
+ for (const unsupportedHostName of unsupportedHosts) {
+  for (const singleScope of scopes) {
+   log.plain(
+    `  ${pc.bold(getHost(unsupportedHostName).displayName)} ${pc.dim(`(${singleScope})`)}`,
+   );
+   log.plain(
+    `    ${pc.dim("~")} skill uninstall not supported (MCP-only host)`,
+   );
   }
-  log.blank();
+ }
+ log.blank();
 }
 
 function buildProgram({ exitOverride = false } = {}) {
-  const program = new Command();
-  if (exitOverride) {
-    program.exitOverride();
-  }
-  program
-    .name("flywheel")
-    .description("Flywheel setup CLI")
-    .addHelpText(
-      "after",
-      `
+ const program = new Command();
+ if (exitOverride) {
+  program.exitOverride();
+ }
+ program
+  .name("flywheel")
+  .description("Flywheel setup CLI")
+  .addHelpText(
+   "after",
+   `
 Examples:
   ${pc.green("npx --yes @paradigma-inc/flywheel setup --mode mcp")}
   ${pc.green("npx --yes @paradigma-inc/flywheel setup --mode mcp --install-skill")}
@@ -1213,28 +1216,28 @@ Examples:
   ${pc.green("npx --yes @paradigma-inc/flywheel setup --mode mcp --yes --codex --claude --cursor")}
   ${pc.green("npx --yes @paradigma-inc/flywheel uninstall --yes --scope all")}
 `,
-    );
+  );
 
-  const completionCommand = program
-    .command("completion")
-    .description("Generate a shell completion script")
-    .argument("[shell]", "Shell to generate completions for")
-    .addHelpText(
-      "before",
-      `${pc.bold(pc.cyan("✻ Flywheel Completion"))}
+ const completionCommand = program
+  .command("completion")
+  .description("Generate a shell completion script")
+  .argument("[shell]", "Shell to generate completions for")
+  .addHelpText(
+   "before",
+   `${pc.bold(pc.cyan("✻ Flywheel Completion"))}
 
 Generate shell completion scripts from the public Flywheel Usage spec.
 Supported shells: ${COMPLETION_SHELL_CHOICES.join(", ")}.
 Requires the official Usage CLI executable on PATH.
 `,
-    )
-    .option(
-      "--include-bash-completion-lib",
-      "Include Usage's bash completion library in bash output",
-    )
-    .addHelpText(
-      "after",
-      `
+  )
+  .option(
+   "--include-bash-completion-lib",
+   "Include Usage's bash completion library in bash output",
+  )
+  .addHelpText(
+   "after",
+   `
 Usage CLI prerequisite:
   ${pc.green("mise use -g usage")}
   ${pc.green("brew install usage")}
@@ -1250,38 +1253,38 @@ Examples:
   ${pc.green("flywheel completion nu > ~/.config/nushell/autoload/flywheel.nu")}
   ${pc.green("flywheel completion nushell > ~/.config/nushell/autoload/flywheel.nu")}
 `,
-    )
-    .action(async (shell, options) => {
-      if (!shell) {
-        if (exitOverride) {
-          completionCommand.outputHelp();
-          return;
-        }
-        completionCommand.help();
-        return;
-      }
-      await runCompletionCommand(shell, options);
-    });
+  )
+  .action(async (shell, options) => {
+   if (!shell) {
+    if (exitOverride) {
+     completionCommand.outputHelp();
+     return;
+    }
+    completionCommand.help();
+    return;
+   }
+   await runCompletionCommand(shell, options);
+  });
 
-  completionCommand
-    .command("install <shell>")
-    .description("Install generated shell completion scripts")
-    .option("--dir <path>", "Override completion script destination directory")
-    .option("--force", "Replace an existing unmarked destination file")
-    .option("--dry-run", "Print planned changes without writing files")
-    .option("--update-profile", "Allow shell startup/profile file updates")
-    .option("-y, --yes", "Skip confirmation prompts")
-    .addHelpText(
-      "before",
-      `${pc.bold(pc.cyan("✻ Flywheel Completion Install"))}
+ completionCommand
+  .command("install <shell>")
+  .description("Install generated shell completion scripts")
+  .option("--dir <path>", "Override completion script destination directory")
+  .option("--force", "Replace an existing unmarked destination file")
+  .option("--dry-run", "Print planned changes without writing files")
+  .option("--update-profile", "Allow shell startup/profile file updates")
+  .option("-y, --yes", "Skip confirmation prompts")
+  .addHelpText(
+   "before",
+   `${pc.bold(pc.cyan("✻ Flywheel Completion Install"))}
 
 Install generated Flywheel shell completions to user-level locations.
 Supported shells: ${COMPLETION_SHELL_CHOICES.join(", ")}.
 `,
-    )
-    .addHelpText(
-      "after",
-      `
+  )
+  .addHelpText(
+   "after",
+   `
 Examples:
   ${pc.green("flywheel completion install bash")}
   ${pc.green("flywheel completion install zsh --update-profile --yes")}
@@ -1289,29 +1292,29 @@ Examples:
   ${pc.green("flywheel completion install powershell --update-profile --yes")}
   ${pc.green("flywheel completion install nu")}
 `,
-    )
-    .action(async (shell, options) => {
-      await runCompletionInstallCommand(shell, options);
-    });
+  )
+  .action(async (shell, options) => {
+   await runCompletionInstallCommand(shell, options);
+  });
 
-  completionCommand
-    .command("uninstall <shell>")
-    .description("Uninstall Flywheel-managed shell completion scripts")
-    .option("--dir <path>", "Override completion script destination directory")
-    .option("--dry-run", "Print planned removals without writing files")
-    .option("--update-profile", "Allow shell startup/profile file updates")
-    .option("-y, --yes", "Skip confirmation prompts")
-    .addHelpText(
-      "before",
-      `${pc.bold(pc.cyan("✻ Flywheel Completion Uninstall"))}
+ completionCommand
+  .command("uninstall <shell>")
+  .description("Uninstall Flywheel-managed shell completion scripts")
+  .option("--dir <path>", "Override completion script destination directory")
+  .option("--dry-run", "Print planned removals without writing files")
+  .option("--update-profile", "Allow shell startup/profile file updates")
+  .option("-y, --yes", "Skip confirmation prompts")
+  .addHelpText(
+   "before",
+   `${pc.bold(pc.cyan("✻ Flywheel Completion Uninstall"))}
 
 Remove only Flywheel-managed shell completion files and profile blocks.
 Supported shells: ${COMPLETION_SHELL_CHOICES.join(", ")}.
 `,
-    )
-    .addHelpText(
-      "after",
-      `
+  )
+  .addHelpText(
+   "after",
+   `
 Examples:
   ${pc.green("flywheel completion uninstall bash")}
   ${pc.green("flywheel completion uninstall zsh --update-profile --yes")}
@@ -1319,73 +1322,74 @@ Examples:
   ${pc.green("flywheel completion uninstall powershell --update-profile --yes")}
   ${pc.green("flywheel completion uninstall nu")}
 `,
-    )
-    .action(async (shell, options) => {
-      await runCompletionUninstallCommand(shell, options);
-    });
+  )
+  .action(async (shell, options) => {
+   await runCompletionUninstallCommand(shell, options);
+  });
 
-  program
-    .command("setup")
-    .description("Set up Flywheel for your AI coding host")
-    .addHelpText(
-      "before",
-      `${pc.bold(pc.cyan("✻ Flywheel Setup"))}
+ program
+  .command("setup")
+  .description("Set up Flywheel for your AI coding host")
+  .addHelpText(
+   "before",
+   `${pc.bold(pc.cyan("✻ Flywheel Setup"))}
 
 Configure the Flywheel CLI, MCP host entries, and bundled skills without changing command names or setup modes.
 `,
-    )
-    .optionsGroup("Hosts:")
-    .option("--claude", "Set up for Claude Code")
-    .option("--cursor", "Set up for Cursor")
-    .option("--universal", "Set up for Universal (.agents/skills)")
-    .option("--antigravity", "Set up for Antigravity (.agent/skills)")
-    .option("--opencode", "Set up for OpenCode")
-    .option("--codex", "Set up for Codex")
-    .option("--gemini", "Set up for Gemini CLI")
-    .option("--pi-mono", "Set up for Pi (pi-mono)")
-    .option("--hermes-agent", "Set up for Hermes Agent")
-    .option("--openclaw", "Set up for OpenClaw")
-    .optionsGroup("Mode:")
-    .option(
-      "--mode <mode>",
-      "Install mode: mcp | cli (required in non-interactive; prompted in TTY, default: mcp)",
-      collectModeValues,
-      [],
-    )
-    .option("--mcp", "Alias for --mode mcp")
-    .option("--cli", "Alias for --mode cli")
-    .optionsGroup("Scope:")
-    .option(
-      "-p, --project",
-      "Configure for current project instead of globally",
-    )
-    .option("-y, --yes", "Skip confirmation prompts")
-    .optionsGroup("Authentication:")
-    .option("--api-key <key>", "Use API key authentication")
-    .option("--oauth", "Use OAuth endpoint (IDE handles auth flow)")
-    .optionsGroup("Skills:")
-    .option("--install-skill", "Install or refresh the bundled Flywheel skills")
-    .option("--skip-skill", "Skip bundled skill installation (MCP-only setup)")
-    .optionsGroup("Advanced:")
-    .option(
-      "--auth-mode <mode>",
-      "Device approval flow; default auto. " +
-        "Explicit loopback is retired and returns FLY-416 guidance",
-      normalizeAuthMode,
-      "auto",
-    )
-    .option(
-      "--base-url <url>",
-      `Public Flywheel origin used for setup and MCP config (default: ${resolveSetupBaseUrl()})`,
-    )
-    .option("--name <name>", `MCP server name (default: ${SERVER_NAME})`)
-    .option(
-      "--force",
-      "Reconcile prior install mode automatically via uninstall",
-    )
-    .addHelpText(
-      "after",
-      `
+  )
+  .optionsGroup("Hosts:")
+  .option("--claude", "Set up for Claude Code")
+  .option("--cursor", "Set up for Cursor")
+  .option("--universal", "Set up for Universal (.agents/skills)")
+  .option("--antigravity", "Set up for Antigravity (.agent/skills)")
+  .option("--opencode", "Set up for OpenCode")
+  .option("--codex", "Set up for Codex")
+  .option("--gemini", "Set up for Gemini CLI")
+  .option("--pi-mono", "Set up for Pi (pi-mono)")
+  .option("--hermes-agent", "Set up for Hermes Agent")
+  .option("--openclaw", "Set up for OpenClaw")
+  .optionsGroup("Mode:")
+  .option(
+   "--mode <mode>",
+   "Install mode: mcp | cli (required in non-interactive; prompted in TTY, default: mcp)",
+   collectModeValues,
+   [],
+  )
+  .option("--mcp", "Alias for --mode mcp")
+  .option("--cli", "Alias for --mode cli")
+  .optionsGroup("Scope:")
+  .option(
+   "-p, --project",
+   "Configure for current project instead of globally",
+  )
+  .option("-y, --yes", "Skip confirmation prompts")
+  .optionsGroup("Authentication:")
+  .option("--api-key <key>", "Use API key authentication")
+  .option("--api-key-stdin", "Read one API key privately from stdin without browser authentication")
+  .option("--oauth", "Use OAuth endpoint (IDE handles auth flow)")
+  .optionsGroup("Skills:")
+  .option("--install-skill", "Install or refresh the bundled Flywheel skills")
+  .option("--skip-skill", "Skip bundled skill installation (MCP-only setup)")
+  .optionsGroup("Advanced:")
+  .option(
+   "--auth-mode <mode>",
+   "Device approval flow; default auto. " +
+   "Explicit loopback is retired and returns FLY-416 guidance",
+   normalizeAuthMode,
+   "auto",
+  )
+  .option(
+   "--base-url <url>",
+   `Public Flywheel origin used for setup and MCP config (default: ${resolveSetupBaseUrl()})`,
+  )
+  .option("--name <name>", `MCP server name (default: ${SERVER_NAME})`)
+  .option(
+   "--force",
+   "Reconcile prior install mode automatically via uninstall",
+  )
+  .addHelpText(
+   "after",
+   `
 Examples:
   ${pc.green("npx --yes @paradigma-inc/flywheel setup --mode mcp --install-skill")}
   ${pc.green("npx --yes @paradigma-inc/flywheel setup --mode mcp --skip-skill --codex --project")}
@@ -1395,48 +1399,48 @@ Next steps:
   ${pc.green("flywheel help")}
   ${pc.green("flywheel auth:status")}
 `,
-    )
-    .action(async (options) => {
-      await runSetupCommandViaRouter(options);
-    });
+  )
+  .action(async (options) => {
+   await runSetupCommandViaRouter(options);
+  });
 
-  program
-    .command("uninstall")
-    .description(
-      "Remove Flywheel MCP entries and bundled skills from selected hosts",
-    )
-    .addHelpText(
-      "before",
-      `${pc.bold(pc.cyan("✻ Flywheel Uninstall"))}
+ program
+  .command("uninstall")
+  .description(
+   "Remove Flywheel MCP entries and bundled skills from selected hosts",
+  )
+  .addHelpText(
+   "before",
+   `${pc.bold(pc.cyan("✻ Flywheel Uninstall"))}
 
 Remove Flywheel MCP entries and bundled skills from selected hosts without changing command names or uninstall scopes.
 `,
-    )
-    .optionsGroup("Hosts:")
-    .option("--claude", "Uninstall for Claude Code")
-    .option("--cursor", "Uninstall for Cursor")
-    .option("--universal", "Uninstall bundled skills from .agents/skills")
-    .option("--antigravity", "Uninstall bundled skills from .agent/skills")
-    .option("--opencode", "Uninstall for OpenCode")
-    .option("--codex", "Uninstall for Codex")
-    .option("--gemini", "Uninstall for Gemini CLI")
-    .option("--pi-mono", "Uninstall for Pi (pi-mono)")
-    .option("--hermes-agent", "Uninstall for Hermes Agent")
-    .option("--openclaw", "Uninstall for OpenClaw")
-    .optionsGroup("Selection:")
-    .option(
-      "--hosts <list>",
-      "Comma-separated: claude,cursor,universal,antigravity,opencode,codex,gemini,pi-mono,hermes-agent,openclaw",
-    )
-    .option("--scope <scope>", "all | global | project")
-    .option(
-      "--name <name>",
-      `MCP server name to remove (default: ${SERVER_NAME})`,
-    )
-    .option("-y, --yes", "Skip uninstall selection prompts")
-    .addHelpText(
-      "after",
-      `
+  )
+  .optionsGroup("Hosts:")
+  .option("--claude", "Uninstall for Claude Code")
+  .option("--cursor", "Uninstall for Cursor")
+  .option("--universal", "Uninstall bundled skills from .agents/skills")
+  .option("--antigravity", "Uninstall bundled skills from .agent/skills")
+  .option("--opencode", "Uninstall for OpenCode")
+  .option("--codex", "Uninstall for Codex")
+  .option("--gemini", "Uninstall for Gemini CLI")
+  .option("--pi-mono", "Uninstall for Pi (pi-mono)")
+  .option("--hermes-agent", "Uninstall for Hermes Agent")
+  .option("--openclaw", "Uninstall for OpenClaw")
+  .optionsGroup("Selection:")
+  .option(
+   "--hosts <list>",
+   "Comma-separated: claude,cursor,universal,antigravity,opencode,codex,gemini,pi-mono,hermes-agent,openclaw",
+  )
+  .option("--scope <scope>", "all | global | project")
+  .option(
+   "--name <name>",
+   `MCP server name to remove (default: ${SERVER_NAME})`,
+  )
+  .option("-y, --yes", "Skip uninstall selection prompts")
+  .addHelpText(
+   "after",
+   `
 Examples:
   ${pc.green("npx --yes @paradigma-inc/flywheel uninstall --codex --scope project")}
   ${pc.green("npx --yes @paradigma-inc/flywheel uninstall --hosts claude,codex --scope all --yes")}
@@ -1445,43 +1449,43 @@ Next steps:
   ${pc.green("flywheel help setup")}
   ${pc.green("npx --yes @paradigma-inc/flywheel setup --mode mcp")}
 `,
-    )
-    .action(async (options) => {
-      await runUninstallCommand(options);
-    });
+  )
+  .action(async (options) => {
+   await runUninstallCommand(options);
+  });
 
-  return program;
+ return program;
 }
 
 export async function runCli(argv = process.argv, { exitOverride = false } = {}) {
-  try {
-    const program = buildProgram({ exitOverride });
-    await program.parseAsync(argv);
-    return process.exitCode ?? 0;
-  } catch (error) {
-    if (error instanceof Error && error.name === "ExitPromptError") {
-      if (exitOverride) {
-        return 0;
-      }
-      process.exit(0);
-    }
-    if (error instanceof Error && /cancelled/i.test(error.message)) {
-      log.warn(error.message);
-      if (exitOverride) {
-        return 0;
-      }
-      process.exit(0);
-    }
-    if (
-      exitOverride &&
-      error &&
-      typeof error === "object" &&
-      typeof error.code === "string" &&
-      error.code.startsWith("commander.") &&
-      Number.isInteger(error.exitCode)
-    ) {
-      return error.exitCode;
-    }
-    throw error;
+ try {
+  const program = buildProgram({ exitOverride });
+  await program.parseAsync(argv);
+  return process.exitCode ?? 0;
+ } catch (error) {
+  if (error instanceof Error && error.name === "ExitPromptError") {
+   if (exitOverride) {
+    return 0;
+   }
+   process.exit(0);
+  }
+  if (error instanceof Error && /cancelled/i.test(error.message)) {
+   log.warn(error.message);
+   if (exitOverride) {
+    return 0;
+   }
+   process.exit(0);
+  }
+  if (
+   exitOverride &&
+   error &&
+   typeof error === "object" &&
+   typeof error.code === "string" &&
+   error.code.startsWith("commander.") &&
+   Number.isInteger(error.exitCode)
+  ) {
+   return error.exitCode;
   }
+  throw error;
+ }
 }