rovecode 0.3.3 → 0.4.0-beta.2

package/src/cli/mcp-login.ts

@@ -1,141 +0,0 @@
-/** `rovecode mcp login <name>` (port #76) — the CLI half of MCP server OAuth. The flow is mcp/oauth.ts
- *  runMcpLoginFlow; the notices are rendered by cli/auth-login.ts describeNotice (the #66 `auth_url` notice:
- *  `open <url>` / `waiting for the browser to return to <callbackUrl>`). Mirror of auth-login.ts runAuthLogin/cmdAuthLogin.
- *  Order: the project mcp.json is parsed first (unparsable → exit 2: the user asked about THIS file), then the merged
- *  config is searched THROUGH THE TRUST GATE — the same loadMcpConfig({ trusted }) call the runtime makes (mcp/trust.ts,
- *  Berkay's 2026-09-04 decision): a server in an unapproved .rovecode/mcp.json or .mcp.json does not exist here either,
- *  so a login can never POST to a URL nobody approved. Unknown name, a stdio server or `enabled:false`
- *  → one stderr line, exit 1; the flow runs (probe → discovery → registration → browser → token exchange); the record
- *  lands under `mcp:<name>`; a verification connect through the ordinary McpManager (whose runtime provider finds the
- *  record: 1 authorized initialize, no further /token) proves the token works; the final line is
- *  `stored OAuth token for MCP server "<name>" in <credentialsPath()> (<expiryText>) — connected`.
- *  Exit codes: 0 stored + connected · 1 unknown/stdio/disabled/not-401/denied/flow or verification failure · 2 unparsable
- *  project config · 130 Ctrl-C (the loopback is closed). Tokens never reach stdout/stderr: notices carry none by
- *  construction (oauth/common.ts), flow errors are token-free (mcp/oauth.ts) and the only credential value echoed is
- *  the expiry. */
-
-import { McpManager } from "../mcp/client.ts";
-import { existsSync, readFileSync } from "node:fs";
-import { join } from "node:path";
-import { isRecord, loadMcpConfig, mcpConfigPath, message, type McpServerConfig } from "../mcp/config.ts";
-import { runMcpLoginFlow, type McpOAuthRecord } from "../mcp/oauth.ts";
-import { trustedPredicate } from "../mcp/trust.ts";
-import { loadState } from "../plugins/state.ts";
-import { credentialsPath, rovecodeHome } from "../providers/auth.ts";
-import type { OAuthDeps } from "../providers/oauth/common.ts";
-import { defaultOAuthDeps } from "../providers/oauth/registry.ts";
-import { describeNotice, expiryText } from "./auth-login.ts";
-
-export const MCP_LOGIN_USAGE = "usage: rovecode mcp login <name>  — a url server from ~/.rovecode/mcp.json or a TRUSTED .rovecode/mcp.json / .mcp.json";
-
-export interface McpCmdIo { out(line: string): void; err(line: string): void; /** the user home (default rovecodeHome()) */ home?: string }
-
-/** The project file must parse before anything else happens (the user asked about THIS file): null when absent;
- *  throws with the reason when unparsable — the same refusal `mcp add` gives, nothing is rewritten. */
-function checkProjectFile(path: string): void {
-  if (!existsSync(path)) return;
-  let json: unknown;
-  try {
-    json = JSON.parse(readFileSync(path, "utf8"));
-  } catch (err) {
-    throw new Error(`${path}: invalid JSON (${message(err)}) — fix or remove it by hand; refusing to overwrite`);
-  }
-  if (!isRecord(json)) throw new Error(`${path}: root is not an object — fix or remove it by hand; refusing to overwrite`);
-}
-
-export interface McpLoginDeps {
-  out: (line: string) => void;
-  err: (line: string) => void;
-  /** Ctrl-C */
-  signal?: AbortSignal;
-  /** network/clock overrides for the flow (tests) */
-  oauth?: Partial<OAuthDeps>;
-  /** loopback wait budget (default 5 minutes) */
-  timeoutMs?: number;
-  /** verification connect budget (default 10 s) */
-  connectTimeoutMs?: number;
-  /** the user home: the user mcp.json and the trust store live there (default rovecodeHome()) */
-  home?: string;
-}
-
-/** Run one login. Returns the exit code: 0 stored + connected · 1 refused/failed · 2 unparsable project config · 130 cancelled. */
-export async function runMcpLogin(name: string, cwd: string, deps: McpLoginDeps): Promise<number> {
-  if (name.length === 0) {
-    deps.err(MCP_LOGIN_USAGE);
-    return 1;
-  }
-  const path = mcpConfigPath(cwd);
-  try {
-    checkProjectFile(path); // unparsable → exit 2 here: the user asked about THIS file
-  } catch (err) {
-    deps.err(`error: ${message(err)}`);
-    return 2;
-  }
-  const home = deps.home ?? rovecodeHome();
-  const warnings: string[] = [];
-  // the runtime's own gate: an unapproved project file contributes nothing (its one warning names the approval command)
-  const config = loadMcpConfig(cwd, warnings, { home, trusted: trustedPredicate(loadState(home)) }).find((c) => c.name === name);
-  for (const w of warnings) deps.err(`warning: ${w}`);
-  if (!config) {
-    deps.err(`error: no MCP server "${name}" in ${path}, .mcp.json (trusted files only — rovecode mcp trust) or ${join(home, "mcp.json")}`);
-    return 1;
-  }
-  if (config.transport === "stdio" || config.url === undefined) {
-    deps.err(`error: MCP server "${name}" is a stdio server — OAuth login applies to url servers only`);
-    return 1;
-  }
-  if (config.enabled === false) {
-    deps.err(`error: MCP server "${name}" is disabled (enabled: false) — enable it first`);
-    return 1;
-  }
-  const signal = deps.signal ?? new AbortController().signal;
-  const oauth: OAuthDeps = { ...defaultOAuthDeps(), ...deps.oauth };
-  deps.out(`rovecode mcp login ${name} — ${config.transport} ${config.url}`);
-  let record: McpOAuthRecord;
-  try {
-    record = await runMcpLoginFlow(
-      config,
-      { notify: (n) => { for (const line of describeNotice(n)) deps.out(`  ${line}`); }, signal },
-      { ...oauth, ...(deps.timeoutMs !== undefined ? { timeoutMs: deps.timeoutMs } : {}) },
-    );
-  } catch (e) {
-    if (signal.aborted) {
-      deps.err("login cancelled");
-      return 130;
-    }
-    deps.err(`error: ${e instanceof Error ? e.message : String(e)}`);
-    return 1;
-  }
-  const stored = `stored OAuth token for MCP server "${name}" in ${credentialsPath()} (${expiryText(record.expires, oauth.now())})`;
-  const failure = await verifyConnect(config, deps.connectTimeoutMs);
-  if (failure === undefined) {
-    deps.out(`${stored} — connected`);
-    return 0;
-  }
-  deps.out(stored);
-  deps.err(`error: verification connect failed: ${failure}`);
-  return 1;
-}
-
-/** One ordinary connect (the runtime provider picks the record up) — the failed[] text, or undefined when connected. */
-async function verifyConnect(config: McpServerConfig, timeoutMs = 10_000): Promise<string | undefined> {
-  const manager = new McpManager([config], { connectTimeoutMs: timeoutMs });
-  try {
-    const res = await manager.connect();
-    return res.failed[0]?.error ?? (res.connected.includes(config.name) ? undefined : "not connected");
-  } finally {
-    await manager.close();
-  }
-}
-
-/** argv entry (mcp-market-cmd.ts `login`): the words after `login`; SIGINT → abort. */
-export async function cmdMcpLogin(args: string[], cwd: string, io: McpCmdIo): Promise<number> {
-  const ac = new AbortController();
-  const onSigint = (): void => ac.abort();
-  process.once("SIGINT", onSigint);
-  try {
-    return await runMcpLogin(args[0] ?? "", cwd, { out: (l) => io.out(l), err: (l) => io.err(l), signal: ac.signal, ...(io.home !== undefined ? { home: io.home } : {}) });
-  } finally {
-    process.removeListener("SIGINT", onSigint);
-  }
-}

package/src/cli/mcp-market-cmd.ts

@@ -1,302 +0,0 @@
-/** `rovecode mcp …` — search · info · add · remove · list · login. The shell face of the MCP market
- *  (mcp/market.ts + mcp/market-install.ts); a pure command function over injected cwd/home/streams/
- *  fetch/prompts so tests drive it without a process or a network. cli/main.ts wires `case "mcp"`.
- *
- *  The rule `add` lives by: the human SEES the exact command/args or URL, the source, the publisher and
- *  the version, then says yes — on a terminal through a y/N prompt, in a script through `--yes`. Without
- *  a TTY and without --yes nothing is written. Secrets are asked by NAME through the masked prompt
- *  (providers/auth.ts readSecret): never echoed, never on the command line, never in a project file. */
-
-import { readSecret } from "../providers/auth.ts";
-import { rovecodeHome } from "../providers/auth.ts";
-import { installLabel, marketInfo, searchMarket, type MarketDeps, type MarketEntry } from "../mcp/market.ts";
-import { configuredServers, describePlan, fillPlan, namesWritten, planInstall, removeServer, serverLine, unfilledPending, writeServer, type InstallPlan, type McpScope } from "../mcp/market-install.ts";
-import { mcpConfigFiles, parseConfigFile } from "../mcp/config.ts";
-import { mcpTrustStatus, projectMcpFiles, trustMcpFile, untrustMcpFile } from "../mcp/trust.ts";
-import { installLocalPackage, launchesViaNpx, localLaunch, npxOfferLine, npxPackage, type Spawn } from "../mcp/local-package.ts";
-import { buildRecord, recordInstall } from "../market/manifest.ts";
-import { createInterface } from "node:readline";
-
-export interface McpCliDeps {
-  cwd?: string;
-  home?: string;
-  out?: (line: string) => void;
-  err?: (line: string) => void;
-  /** registry access (fetch/offline/registryUrl/now) — tests inject a fixture fetch */
-  market?: MarketDeps;
-  /** one masked line (default readSecret) */
-  secret?: (prompt: string) => Promise<string>;
-  /** one plain line (default: readline on stdin) */
-  plain?: (prompt: string) => Promise<string>;
-  /** default process.stdin.isTTY === true; a pipe is never consumed by a prompt */
-  tty?: boolean;
-  /** how `npm install` runs for `add --local` — tests inject one that writes a fake node_modules */
-  spawn?: Spawn;
-}
-
-export const MCP_USAGE = [
-  "usage: rovecode mcp <command>",
-  "  search [query]             the curated list, then the MCP registry's name matches (cached a day)",
-  "  info <name>                everything about one server: publisher, version, what it runs or connects to, what it asks",
-  "  add <name> [--project] [--pick N] [--as <name>] [--yes] [--force] [--local | --no-local]",
-  "                             install: shows the exact command/URL + source, asks (masked) for keys by name, then writes",
-  "                             ~/.rovecode/mcp.json — or .rovecode/mcp.json with --project (keys stay out of it: ${NAME})",
-  "                             --local: an npx server is installed ONCE (npm, ~25 MB under ~/.rovecode/mcp) and started with",
-  "                             node in ~0.4 s instead of ~2 s; --no-local keeps npx; neither → a terminal asks, --yes keeps npx",
-  "  remove <name> [--project]  delete the entry from that file",
-  "  list                       every configured server, by file (user · .mcp.json · project), with the project files' trust",
-  "  show --project             each project file's servers — exact command/URL, env NAMES — and whether it is trusted here",
-  "  trust · untrust            approve this repo's .rovecode/mcp.json and .mcp.json as they are now (any edit asks again);",
-  "                             files you write through `add --project` are trusted as you approve them",
-  "  login <name>               OAuth sign-in to a url server through the browser (port #76, mcp-login.ts): the token",
-  "                             lands in credentials.json under mcp:<name>; only servers the runtime itself would load",
-  "restart rovecode after add/remove/trust — servers are read once per process (docs/mcp-market.md)",
-];
-
-/** `show --project` — every project file, its trust, its servers (names only for env/headers) */
-export function showLines(cwd: string, home: string): string[] {
-  const files = projectMcpFiles(cwd);
-  if (files.length === 0) return ["no project MCP files here (.rovecode/mcp.json, .mcp.json)"];
-  const anySet = new Proxy({}, { get: () => "set" }) as Record<string, string>;
-  const out: string[] = [];
-  for (const file of files) {
-    const status = mcpTrustStatus(home, file);
-    out.push(`${file}  — ${status === "trusted" ? "trusted on this machine" : "NOT trusted: nothing in it loads until `rovecode mcp trust`"}`);
-    const warnings: string[] = [];
-    for (const s of parseConfigFile(file, warnings, anySet)) out.push(`  ${serverLine(s)}`);
-    for (const w of warnings) out.push(`  ! ${w}`);
-  }
-  return out;
-}
-
-async function readLine(prompt: string): Promise<string> {
-  process.stderr.write(prompt);
-  const rl = createInterface({ input: process.stdin });
-  return new Promise((resolve) => { rl.once("line", (l) => { rl.close(); resolve(l.trim()); }); rl.once("close", () => resolve("")); });
-}
-
-function flag(args: string[], name: string): boolean { return args.includes(name); }
-function value(args: string[], name: string): string | undefined { const i = args.indexOf(name); return i === -1 ? undefined : args[i + 1]; }
-function words(args: string[]): string[] {
-  const out: string[] = [];
-  for (let i = 0; i < args.length; i++) { const a = args[i]!; if (a === "--pick" || a === "--as") { i++; continue; } if (!a.startsWith("--")) out.push(a); }
-  return out;
-}
-
-function row(e: MarketEntry): string {
-  const src = e.source === "curated" ? "curated " : "registry";
-  const head = [e.title, e.version, e.status ? `[${e.status}]` : undefined].filter((s): s is string => s !== undefined).join(" ");
-  return `${e.key.padEnd(40)} ${src}  ${head}${e.description ? `${head ? " — " : ""}${e.description}` : ""}`.trimEnd();
-}
-
-export function infoLines(e: MarketEntry): string[] {
-  const lines = [`${e.key}${e.title ? `  (${e.title})` : ""}${e.version ? `  v${e.version}` : ""}${e.status ? `  [${e.status}]` : ""}`, `  ${e.description}`,
-    `  source     ${e.source === "curated" ? "curated list" : "MCP registry"}`, `  publisher  ${e.publisher ?? "unknown"}`];
-  if (e.repository) lines.push(`  repo       ${e.repository}`);
-  if (e.homepage) lines.push(`  home       ${e.homepage}`);
-  if (e.installs.length === 0) lines.push("  install    nothing rovecode can launch (no stdio package, no streamable-http remote)");
-  e.installs.forEach((i, ix) => {
-    lines.push(`  install ${ix}  ${i.kind === "stdio" ? `runs     ${installLabel(i)}` : `connects ${i.url}`}`);
-    if (i.kind === "stdio") { for (const v of i.env) lines.push(`             env ${v.name}${v.secret ? " (secret)" : ""}${v.required ? "" : " optional"}${v.description ? ` — ${v.description}` : ""}`); for (const p of i.pending) lines.push(`             needs ${p}`); }
-    else for (const h of i.headers) lines.push(`             header ${h.name}${h.template ? `: ${h.template}` : ""}${h.secret ? " (secret)" : ""}${h.required ? "" : " optional"}`);
-  });
-  if (e.installs.length > 1) lines.push(`  pick one with: rovecode mcp add ${e.key} --pick N`);
-  return lines;
-}
-
-/** ask every plan question in order; secrets masked, the rest plain. Returns null when a required
- *  answer cannot be obtained (no TTY) — the caller stops without writing. */
-export async function askPlan(plan: InstallPlan, deps: { secret: (p: string) => Promise<string>; plain: (p: string) => Promise<string>; tty: boolean; err: (l: string) => void }): Promise<Record<string, string> | null> {
-  const answers: Record<string, string> = {};
-  for (const a of plan.asks) {
-    // A PROJECT file never holds a secret's value — fillPlan writes `${NAME}` there whatever is typed — so
-    // asking for one would take a token off a human and throw it away. `rovecode market install` already
-    // declined to ask; this face used to ask anyway, which is the worse half of the two.
-    const pointless = a.secret && plan.scope === "project";
-    if (!deps.tty || pointless) {
-      if (a.required) deps.err(`${a.name} is not set — it will be written as \${${a.name}} and read from your environment at launch`);
-      continue;
-    }
-    const label = `${a.name}${a.description ? ` (${a.description})` : ""}${a.required ? "" : " [optional, enter to skip]"}: `;
-    answers[a.name] = a.secret ? await deps.secret(label) : await deps.plain(label);
-    if (a.required && answers[a.name]!.length === 0) deps.err(`${a.name} is not set — it will be written as \${${a.name}} and read from your environment at launch`);
-  }
-  // `pending` is a required argument only the human knows — a directory, a database URL. It is never a
-  // secret, so it is asked in the clear and keyed by the placeholder text itself (fillPlan reads it back
-  // under that key). Off a terminal it stays as the placeholder in the file, which the loader then names
-  // instead of launching a server that would reject its own arguments.
-  for (const p of plan.pending) {
-    if (!deps.tty) continue;
-    const v = (await deps.plain(`${p}: `)).trim();
-    if (v.length > 0) answers[p] = v;
-  }
-  return answers;
-}
-
-export async function cmdMcp(args: string[], deps: McpCliDeps = {}): Promise<number> {
-  const cwd = deps.cwd ?? process.cwd(), home = deps.home ?? rovecodeHome();
-  const out = deps.out ?? console.log, err = deps.err ?? console.error;
-  const market: MarketDeps = { home, ...deps.market };
-  const tty = deps.tty ?? process.stdin.isTTY === true;
-  const secret = deps.secret ?? ((p: string) => readSecret(p));
-  const plain = deps.plain ?? readLine;
-  const [cmd, ...rest] = args;
-  // every flag a subcommand takes; anything else is a usage error (exit 2), not a silently ignored word —
-  // `mcp show --project` used to pass only because unknown flags were filtered out
-  const KNOWN_FLAGS: Record<string, readonly string[]> = {
-    search: [], info: [], add: ["--project", "--pick", "--as", "--yes", "--force", "--local", "--no-local"], remove: ["--project"], list: [],
-    show: ["--project"], trust: ["--yes", "--project"], untrust: [], login: [], help: [],
-  };
-  if (cmd !== undefined && cmd in KNOWN_FLAGS) {
-    const valued = new Set(["--pick", "--as"]);
-    let skip = false;
-    for (const a of rest) {
-      if (skip) { skip = false; continue; }
-      if (a.startsWith("--")) {
-        if (!KNOWN_FLAGS[cmd]!.includes(a)) { err(`unknown flag ${a} for "rovecode mcp ${cmd}" — see: rovecode mcp help`); return 2; }
-        if (valued.has(a)) skip = true;
-      }
-    }
-  }
-  const names = words(rest);
-  const scope: McpScope = flag(rest, "--project") ? "project" : "user";
-  switch (cmd) {
-    case undefined: case "help": case "--help": case "-h": for (const l of MCP_USAGE) out(l); return cmd === undefined ? 2 : 0;
-    case "search": {
-      const r = await searchMarket(names.join(" "), market);
-      for (const n of r.notes) err(`note: ${n}`);
-      if (r.entries.length === 0) { out(`nothing matches "${names.join(" ")}"`); return 0; }
-      for (const e of r.entries) out(row(e));
-      out(`→ rovecode mcp info <name> · rovecode mcp add <name>${r.fromCache ? "   (registry results from cache)" : ""}`);
-      return 0;
-    }
-    case "info": {
-      if (!names[0]) { err("usage: rovecode mcp info <name>"); return 2; }
-      const r = await marketInfo(names[0], market);
-      for (const n of r.notes) err(`note: ${n}`);
-      if (!r.entry) return 1;
-      for (const l of infoLines(r.entry)) out(l);
-      return 0;
-    }
-    case "add": {
-      if (!names[0]) { err("usage: rovecode mcp add <name> [--project] [--pick N] [--as <name>] [--yes] [--force]"); return 2; }
-      const r = await marketInfo(names[0], market);
-      for (const n of r.notes) err(`note: ${n}`);
-      if (!r.entry) return 1;
-      const pickRaw = value(rest, "--pick");
-      const pick = pickRaw === undefined ? undefined : Number(pickRaw);
-      if (pick !== undefined && (!Number.isInteger(pick) || pick < 0)) { err(`--pick wants a whole number, not "${pickRaw}"`); return 2; }
-      const as = value(rest, "--as");
-      const baseOpts = { scope, cwd, home, ...(pick !== undefined ? { pick } : {}), ...(as !== undefined ? { name: as } : {}) };
-      const base = planInstall(r.entry, baseOpts);
-      if ("error" in base) { err(base.error); return 1; }
-      // The install-once offer (mcp/local-package.ts), BEFORE the plan is shown, so the plan the human reads is
-      // the one that runs. --local / --no-local decide it; otherwise a terminal is asked, and --yes or no
-      // terminal keeps today's npx line — the offer is never silent and never the only way.
-      let local = flag(rest, "--local") ? true : flag(rest, "--no-local") ? false : undefined;
-      const offer = npxPackage(base.install);
-      // not offered for a project file: install-once writes this machine's absolute path, and that file is shared (planInstall refuses an explicit --local there)
-      if (offer !== undefined && local === undefined && scope === "user" && !flag(rest, "--yes") && tty) {
-        out(`${offer.spec} would start through npx: ~2 s at every start, re-resolving the package (and asking the npm registry) each time.`);
-        out(`Install it once instead? npm puts the package's code under ~/.rovecode/mcp — typically 20–30 MB and a few seconds, one time;`);
-        out(`it then starts in ~0.4 s and needs no network to start. No keeps the npx line exactly as it is today.`);
-        const a = (await plain(`install ${offer.spec} once? [y/N] `)).trim().toLowerCase();
-        local = a === "y" || a === "yes";
-      }
-      const plan = local === true ? planInstall(r.entry, { ...baseOpts, local: true }) : base;
-      if ("error" in plan) { err(plan.error); return 1; }
-      // the human sees everything first — then the questions, then the yes
-      for (const l of describePlan(plan)) out(l);
-      if (!flag(rest, "--yes")) {
-        if (!tty) { err("nothing written: no terminal to confirm on — re-run with --yes after reading the lines above"); return 1; }
-        const a = (await plain("install this? [y/N] ")).toLowerCase();   // the same words `rovecode market install` uses
-        if (a !== "y" && a !== "yes") { out("nothing written"); return 1; }
-      }
-      const answers = await askPlan(plan, { secret, plain, tty, err });
-      if (answers === null) { out("nothing written"); return 1; }
-      // install-once: npm runs first; only its success reaches the file, and what landed goes on record
-      let launch: { command: string; args: string[] } | undefined;
-      let pkgRecord: NonNullable<Parameters<typeof buildRecord>[1]["package"]> | undefined;
-      if (plan.local) {
-        const lr = await installLocalPackage(plan.local.pkg, plan.local.prefix, deps.spawn ? { spawn: deps.spawn } : {});
-        if (!lr.ok) { err(lr.error); out("nothing written"); return 1; }
-        launch = localLaunch(lr.pkg, plan.local.pkg.rest);
-        pkgRecord = { name: lr.pkg.name, version: lr.pkg.version, prefix: plan.local.prefix, bin: lr.pkg.bin, missing: lr.pkg.missing,
-          ...(lr.pkg.integrity !== undefined ? { integrity: lr.pkg.integrity } : {}), ...(lr.pkg.resolved !== undefined ? { resolved: lr.pkg.resolved } : {}) };
-      }
-      let trusted: boolean | undefined;
-      const raw = fillPlan(plan, answers, launch);
-      try {
-        // a project file the human just approved is trusted as written (mcp/trust.ts); the user file is never gated
-        trusted = writeServer(plan.file, plan.name, raw, { replace: flag(rest, "--force"), ...(scope === "project" ? { trustHome: home } : {}) }).trusted;
-      } catch (e) { err(e instanceof Error ? e.message : String(e)); return 1; }
-      out(`added "${plan.name}" → ${plan.file}${trusted === true ? "  (trusted on this machine as written)" : ""}`);
-      if (pkgRecord) {
-        // the record is the point of installing once: what ran is written down (market/manifest.ts)
-        recordInstall(buildRecord({ kind: "mcp", id: r.entry.key, source: r.entry.source, ...(r.entry.version !== undefined ? { version: r.entry.version } : {}) },
-          { scope, target: plan.file, package: pkgRecord, installedBy: "mcp add" }), { cwd, home });
-        out(`installed ${pkgRecord.name} ${pkgRecord.version} once → ${plan.local!.prefix}${pkgRecord.integrity !== undefined ? "  (integrity recorded in installed.json)" : ""}`);
-        if (pkgRecord.missing?.length) err(`record incomplete: ${pkgRecord.missing.join("; ")}`);
-      }
-      if (trusted === false) out(`NOT trusted yet: that file already held servers you have not approved — rovecode mcp show, then rovecode mcp trust`);
-      // only what is STILL a placeholder: answering the question at the prompt should not leave the
-      // install telling you to go and edit a line that now holds your answer
-      const unfilled = unfilledPending(plan, raw);
-      if (unfilled.length) out(`fill in before use: ${unfilled.join(", ")} — edit the args in that file; until then this server is skipped`);
-      const named = namesWritten(plan, raw); // only what the file now refers to (a project file's secrets, an unanswered required value)
-      if (named.length) out(`set ${named.join(", ")} in your environment — the file only names them`);
-      // a restart does nothing for an entry the loader will skip; the line above is the whole next step
-      if (unfilled.length === 0) out("restart rovecode to connect (servers are read once per process)");
-      return 0;
-    }
-    case "remove": {
-      if (!names[0]) { err("usage: rovecode mcp remove <name> [--project]"); return 2; }
-      const files = mcpConfigFiles(cwd, home);
-      const file = scope === "project" ? files.project : files.user!;
-      try {
-        if (!removeServer(file, names[0], scope === "project" ? { trustHome: home } : {})) { err(`${file} has no server named "${names[0]}"${scope === "user" ? " (project entries: add --project)" : ""}`); return 1; }
-      } catch (e) { err(e instanceof Error ? e.message : String(e)); return 1; }
-      out(`removed "${names[0]}" from ${file}`);
-      return 0;
-    }
-    case "list": {
-      // what the files say, placeholders included (marked `(fill in <…>)` by serverLine); what parsing could
-      // not read is said too, on stderr — an invalid file used to make its servers vanish without a word
-      const warnings: string[] = [];
-      const rows = configuredServers(cwd, home, warnings);
-      for (const w of warnings) err(w);
-      if (rows.length === 0) { out("no MCP servers configured — rovecode mcp search <query>"); return 0; }
-      for (const r of rows) {
-        const gate = r.scope === "user" ? "" : mcpTrustStatus(home, r.file) === "trusted" ? "" : "  (file not trusted — off; rovecode mcp trust)";
-        out(`${r.scope.padEnd(8)} ${serverLine(r.server)}${gate}`);
-      }
-      // the install-once offer for rows still starting through npx: an offer and a command, never a rewrite —
-      // a listing changes nothing, and an npx line keeps working whether or not anyone takes it
-      const offer = npxOfferLine(rows.filter((r) => launchesViaNpx(r.server)).map((r) => r.server.name));
-      if (offer !== undefined) out(offer);
-      return 0;
-    }
-    case "show": { for (const l of showLines(cwd, home)) out(l); return 0; }
-    case "login": return (await import("./mcp-login.ts")).cmdMcpLogin(names, cwd, { out, err, home }); // the flow's module loads the MCP SDK's auth code — on demand only
-    case "trust": {
-      const files = projectMcpFiles(cwd);
-      if (files.length === 0) { out("no project MCP files here (.rovecode/mcp.json, .mcp.json) — nothing to trust"); return 1; }
-      for (const l of showLines(cwd, home)) out(l);
-      if (!flag(rest, "--yes")) {
-        if (!tty) { err("nothing trusted: no terminal to confirm on — re-run with --yes after reading the lines above"); return 1; }
-        const a = (await plain("trust these files as they are now? [y/N] ")).toLowerCase();
-        if (a !== "y" && a !== "yes") { out("nothing trusted"); return 1; }
-      }
-      for (const f of files) { const r = trustMcpFile(home, f); out(r.ok ? `trusted ${f}  (${r.digest.slice(0, 12)}…)` : r.reason); }
-      out("restart rovecode to connect — an edit to either file asks again");
-      return 0;
-    }
-    case "untrust": {
-      const files = [mcpConfigFiles(cwd).harvest, mcpConfigFiles(cwd).project];
-      const had = files.filter((f) => untrustMcpFile(home, f));
-      out(had.length ? `untrusted ${had.join(", ")}` : "nothing was trusted here");
-      return 0;
-    }
-    default: err(`unknown mcp command "${cmd}"`); for (const l of MCP_USAGE) err(l); return 2;
-  }
-}