@akms/mcp-ssh 0.1.1 → 0.1.3

package/lib/cli.cjs

@@ -35,7 +35,7 @@ var CWD_MARKER = "__AKMS_SSH_CWD__";
 var MAX_DIRECTORY_ENTRIES = 1e3;
 var SERVER_NAME = "akms-mcp-ssh";
 var PACKAGE_NAME = "@akms/mcp-ssh";
-var SERVER_VERSION = "0.1.1";
+var SERVER_VERSION = "0.1.3";
 
 // src/_defs/command-rules.ts
 var CRITICAL_PATH_PATTERN = new RegExp(
@@ -2368,6 +2368,23 @@ async function downloadFile(connection, remotePath, localPath) {
 }
 
 // src/modules/manage/connection-check.ts
+function profileFromEnv(output, env) {
+  try {
+    const profile = loadHostProfile(env);
+    if (profile == null) {
+      output.write("  The entry has no host.\n");
+    }
+    return profile;
+  } catch (ex) {
+    let detail = String(ex);
+    if (ex instanceof Error) {
+      detail = ex.message;
+    }
+    output.write(`  The server would refuse to start with this entry: ${detail}
+`);
+    return null;
+  }
+}
 function describeAuth(profile) {
   if (profile.privateKeyPath != null) {
     return `key ${profile.privateKeyPath}`;
@@ -2634,15 +2651,25 @@ var PromptClosedError = class extends Error {
     this.name = "PromptClosedError";
   }
 };
+var PromptBackError = class extends Error {
+  constructor() {
+    super("prompt left with esc");
+    this.name = "PromptBackError";
+  }
+};
 var ESC = "\x1B";
-var KEY_UP = [`${ESC}[A`, `${ESC}OA`, "k"];
-var KEY_DOWN = [`${ESC}[B`, `${ESC}OB`, "j"];
-var KEY_HOME = [`${ESC}[H`, `${ESC}OH`, `${ESC}[1~`];
-var KEY_END = [`${ESC}[F`, `${ESC}OF`, `${ESC}[4~`];
+var KEY_UP = [`${ESC}[A`, `${ESC}OA`];
+var KEY_DOWN = [`${ESC}[B`, `${ESC}OB`];
+var KEY_RIGHT = [`${ESC}[C`, `${ESC}OC`];
+var KEY_LEFT = [`${ESC}[D`, `${ESC}OD`];
+var KEY_HOME = [`${ESC}[H`, `${ESC}OH`, `${ESC}[1~`, "
"];
+var KEY_END = [`${ESC}[F`, `${ESC}OF`, `${ESC}[4~`, ""];
+var KEY_DELETE = [`${ESC}[3~`];
 var KEY_ENTER = ["\r", "\n"];
 var KEY_BACKSPACE = ["\x7F", "\b"];
 var KEY_CTRL_C = "";
 var KEY_CTRL_D = "";
+var KEY_CLEAR_LINE = "";
 function splitKeys(chunk) {
   const keys = [];
   let index = 0;
@@ -2664,6 +2691,13 @@ function splitKeys(chunk) {
   }
   return keys;
 }
+function isPrintableKey(key) {
+  if (key.startsWith(ESC) == true) {
+    return false;
+  }
+  const codePoint = key.codePointAt(0) ?? 0;
+  return codePoint >= 32 && codePoint !== 127;
+}
 function charWidth(codePoint) {
   if (codePoint < 4352) {
     return 1;
@@ -2738,8 +2772,14 @@ var Prompter = class {
     this.pendingLines = [];
     this.lineWaiter = null;
     this.inputEnded = false;
-    /** Set while a key-driven prompt (select, secret) owns the input. */
+    /** Set while a key-driven prompt owns the input. */
     this.keyHandler = null;
+    /**
+     * When true, an answered prompt leaves nothing behind on a TTY instead of its
+     * `✔ question · answer` line. The settings form sets it: the form itself shows every
+     * value, so it can redraw in place rather than scroll a trail of edits.
+     */
+    this.transient = false;
     const ttyInput = input;
     const ttyOutput = output;
     this.interactive = ttyInput.isTTY == true && ttyInput.setRawMode != null && ttyOutput.isTTY == true;
@@ -2783,6 +2823,7 @@ var Prompter = class {
   /**
    * Free-text prompt. Enter accepts `defaultValue` when one is shown.
    *
+   * @throws {PromptBackError} On Esc.
    * @throws {PromptClosedError} If the input closes before a line arrives.
    */
   async ask(question, defaultValue) {
@@ -2791,16 +2832,16 @@ var Prompter = class {
       suffix = ` ${this.style.dim(`(${defaultValue})`)}`;
     }
     const prompt = `${this.style.accent(this.symbols.question)} ${this.style.bold(question)}${suffix} `;
-    this.output.write(prompt);
-    const line = await this.readLine();
-    if (line == null) {
-      throw new PromptClosedError();
-    }
-    let answer = line.trim();
+    const typed = await this.readText(prompt, false);
+    let answer = typed.trim();
     if (answer === "" && defaultValue != null) {
       answer = defaultValue;
     }
-    this.collapseAnswered(prompt, line, question, answer);
+    let shown = answer;
+    if (shown === "") {
+      shown = this.style.dim("(empty)");
+    }
+    this.writeAnswered(question, shown);
     return answer;
   }
   /** Like `ask`, re-asking until something non-empty is entered. */
@@ -2814,6 +2855,10 @@ var Prompter = class {
 `);
     }
   }
+  /**
+   * @throws {PromptBackError} On Esc — the caller decides what "neither" means.
+   * @throws {PromptClosedError} If the input closes before a line arrives.
+   */
   async askYesNo(question, defaultValue) {
     let hint = "y/N";
     if (defaultValue == true) {
@@ -2821,12 +2866,8 @@ var Prompter = class {
     }
     for (; ; ) {
       const prompt = `${this.style.accent(this.symbols.question)} ${this.style.bold(question)} ${this.style.dim(`(${hint})`)} `;
-      this.output.write(prompt);
-      const line = await this.readLine();
-      if (line == null) {
-        throw new PromptClosedError();
-      }
-      const normalized = line.trim().toLowerCase();
+      const typed = await this.readText(prompt, false);
+      const normalized = typed.trim().toLowerCase();
       let answer = null;
       if (normalized === "") {
         answer = defaultValue;
@@ -2840,7 +2881,7 @@ var Prompter = class {
         if (answer == true) {
           shown = "yes";
         }
-        this.collapseAnswered(prompt, line, question, shown);
+        this.writeAnswered(question, shown);
         return answer;
       }
       this.output.write(`  ${this.style.dim("Answer y or n.")}
@@ -2848,9 +2889,10 @@ var Prompter = class {
     }
   }
   /**
-   * Picks one of `items`. On a TTY: ↑/↓ (or k/j) move, 1–9 jump, Enter picks, Esc returns
-   * `cancelValue`. Off a TTY: a numbered list, answered by number, key or label.
+   * Picks one of `items`. On a TTY: ↑/↓ move, 1–9 jump, Enter picks, Esc goes back. Off a
+   * TTY: a numbered list, answered by number, key or label.
    *
+   * @throws {PromptBackError} On Esc without a `cancelValue`.
    * @throws {PromptClosedError} On Ctrl+C or when the input closes.
    */
   async select(question, items, options) {
@@ -2862,63 +2904,62 @@ var Prompter = class {
     if (startIndex < 0) {
       startIndex = items.findIndex((item) => "value" in item);
     }
+    let picked;
     if (this.interactive == true) {
-      const picked2 = await this.selectWithKeys(question, items, startIndex, options?.cancelValue);
-      return picked2;
+      picked = await this.selectWithKeys(question, items, startIndex);
+    } else {
+      picked = await this.selectWithLines(question, items, startIndex);
     }
-    const picked = await this.selectWithLines(question, items, startIndex);
-    return picked;
+    if (picked != null) {
+      return picked;
+    }
+    if (options?.cancelValue != null) {
+      return options.cancelValue;
+    }
+    throw new PromptBackError();
   }
   /**
    * Reads a value without echoing it on a TTY. Empty means "none", or "keep" when the
    * caller says a value already exists.
    *
+   * @throws {PromptBackError} On Esc.
    * @throws {PromptClosedError} On Ctrl+C or when the input closes.
    */
   async askSecret(question) {
+    const prompt = `${this.style.accent(this.symbols.question)} ${this.style.bold(question)} `;
+    const secret = await this.readText(prompt, true);
+    let shown = this.style.dim("(empty)");
+    if (secret !== "") {
+      shown = "\u2022".repeat(Math.min(secret.length, 8));
+    }
+    this.writeAnswered(question, shown);
+    return secret;
+  }
+  // ── input ──────────────────────────────────────────────────────────────
+  /**
+   * One text answer, through the line editor on a TTY and a line read off one. The prompt
+   * is erased once answered; the caller writes the summary line.
+   *
+   * @throws {PromptBackError} On Esc, or a line of just `ESC` off a TTY.
+   */
+  async readText(prompt, secret) {
     if (this.interactive == false) {
-      const answer = await this.ask(question);
-      return answer;
+      this.output.write(prompt);
+      const line = await this.readLine();
+      if (line == null) {
+        throw new PromptClosedError();
+      }
+      if (line === ESC) {
+        throw new PromptBackError();
+      }
+      return line;
     }
-    const prompt = `${this.style.accent(this.symbols.question)} ${this.style.bold(question)} `;
-    this.output.write(prompt);
-    const ttyInput = this.input;
-    return new Promise((resolve, reject) => {
-      let buffer = "";
-      const finish = () => {
-        this.keyHandler = null;
-        ttyInput.setRawMode?.(false);
-        this.output.write(`\r${ESC}[2K`);
-      };
-      this.keyHandler = (key) => {
-        if (key === KEY_CTRL_C || key === KEY_CTRL_D) {
-          finish();
-          reject(new PromptClosedError());
-          return;
-        }
-        if (KEY_ENTER.includes(key) == true) {
-          finish();
-          let shown = this.style.dim("(empty)");
-          if (buffer !== "") {
-            shown = "\u2022".repeat(Math.min(buffer.length, 8));
-          }
-          this.writeAnswered(question, shown);
-          resolve(buffer);
-          return;
-        }
-        if (KEY_BACKSPACE.includes(key) == true) {
-          buffer = Array.from(buffer).slice(0, -1).join("");
-          return;
-        }
-        if (key.startsWith(ESC) == true) {
-          return;
-        }
-        buffer += key;
-      };
-      ttyInput.setRawMode?.(true);
-    });
+    const result = await this.editLine(prompt, secret);
+    if (result.kind === "back") {
+      throw new PromptBackError();
+    }
+    return result.text;
   }
-  // ── line mode ──────────────────────────────────────────────────────────
   readLine() {
     const queued = this.pendingLines.shift();
     if (queued != null) {
@@ -2956,6 +2997,78 @@ var Prompter = class {
       newlineIndex = this.lineBuffer.indexOf("\n");
     }
   }
+  /**
+   * A one-line editor in raw mode: insert at the cursor, Backspace / Delete, ←/→, Home /
+   * End, Ctrl+U clears, Enter answers, Esc goes back. Secrets draw nothing after the
+   * prompt. Cooked mode is not used for text on a TTY because it never reports Esc: the
+   * terminal swallows it or stuffs the `ESC` byte into the value.
+   */
+  editLine(prompt, secret) {
+    const ttyInput = this.input;
+    const plainPrompt = prompt.replace(/\u001b\[[0-9;]*m/g, "");
+    let characters = [];
+    let cursor = 0;
+    const draw = () => {
+      let text = `\r${ESC}[2K${prompt}`;
+      if (secret == false) {
+        text += characters.join("");
+        const column = displayWidth(plainPrompt) + displayWidth(characters.slice(0, cursor).join(""));
+        text += `\r${ESC}[${column}C`;
+      }
+      this.output.write(text);
+    };
+    return new Promise((resolve, reject) => {
+      const finish = () => {
+        this.keyHandler = null;
+        ttyInput.setRawMode?.(false);
+        this.output.write(`\r${ESC}[2K`);
+      };
+      this.keyHandler = (key) => {
+        if (key === KEY_CTRL_C || key === KEY_CTRL_D) {
+          finish();
+          reject(new PromptClosedError());
+          return;
+        }
+        if (KEY_ENTER.includes(key) == true) {
+          finish();
+          resolve({ kind: "entered", text: characters.join("") });
+          return;
+        }
+        if (key === ESC) {
+          finish();
+          resolve({ kind: "back" });
+          return;
+        }
+        if (KEY_BACKSPACE.includes(key) == true) {
+          if (cursor > 0) {
+            characters.splice(cursor - 1, 1);
+            cursor -= 1;
+          }
+        } else if (KEY_DELETE.includes(key) == true) {
+          characters.splice(cursor, 1);
+        } else if (KEY_LEFT.includes(key) == true) {
+          cursor = Math.max(0, cursor - 1);
+        } else if (KEY_RIGHT.includes(key) == true) {
+          cursor = Math.min(characters.length, cursor + 1);
+        } else if (KEY_HOME.includes(key) == true) {
+          cursor = 0;
+        } else if (KEY_END.includes(key) == true) {
+          cursor = characters.length;
+        } else if (key === KEY_CLEAR_LINE) {
+          characters = [];
+          cursor = 0;
+        } else if (isPrintableKey(key) == true) {
+          characters.splice(cursor, 0, key);
+          cursor += 1;
+        } else {
+          return;
+        }
+        draw();
+      };
+      ttyInput.setRawMode?.(true);
+      draw();
+    });
+  }
   async selectWithLines(question, items, startIndex) {
     const choices = items.filter((item) => "value" in item);
     const labelWidths = groupLabelWidths(items);
@@ -2984,6 +3097,9 @@ var Prompter = class {
       if (line == null) {
         throw new PromptClosedError();
       }
+      if (line === ESC) {
+        return null;
+      }
       const answer = line.trim();
       if (answer === "") {
         return defaultChoice.value;
@@ -3039,28 +3155,14 @@ var Prompter = class {
   }
   /** The one-line record an answered prompt leaves behind on a TTY. */
   writeAnswered(question, answer) {
-    this.output.write(`${this.style.success(this.symbols.tick)} ${question} ${this.style.dim("\xB7")} ${this.style.accent(answer)}
-`);
-  }
-  /**
-   * Replaces a cooked-mode prompt and its echoed answer with the one-line record. The
-   * rows are worked out from the widths, since a long answer wraps.
-   */
-  collapseAnswered(prompt, typed, question, answer) {
-    if (this.interactive == false) {
+    if (this.interactive == false || this.transient == true) {
       return;
     }
-    const plainPrompt = prompt.replace(/\u001b\[[0-9;]*m/g, "");
-    const used = displayWidth(plainPrompt) + displayWidth(typed);
-    const rows = Math.max(1, Math.ceil(used / this.columns()));
-    this.output.write(`${ESC}[${rows}A\r${ESC}[J`);
-    let shown = answer;
-    if (shown === "") {
-      shown = this.style.dim("(empty)");
-    }
-    this.writeAnswered(question, shown);
+    this.output.write(`${this.style.success(this.symbols.tick)} ${question} ${this.style.dim("\xB7")} ${this.style.accent(answer)}
+`);
   }
-  selectWithKeys(question, items, startIndex, cancelValue) {
+  /** @returns The picked value, or null on Esc. */
+  selectWithKeys(question, items, startIndex) {
     const ttyInput = this.input;
     const selectableIndexes = items.flatMap((item, index) => {
       if ("value" in item) {
@@ -3110,11 +3212,7 @@ var Prompter = class {
         }
         lines.push(this.fitLine(parts, width));
       }
-      let footer = "\u2191\u2193 move \xB7 enter select";
-      if (cancelValue != null) {
-        footer += " \xB7 esc back";
-      }
-      lines.push(this.fitLine([{ text: footer, paint: this.style.dim }], width));
+      lines.push(this.fitLine([{ text: "\u2191\u2193 move \xB7 enter select \xB7 esc back", paint: this.style.dim }], width));
       return lines;
     };
     const move = (step) => {
@@ -3143,11 +3241,8 @@ var Prompter = class {
           return;
         }
         if (key === ESC) {
-          if (cancelValue == null) {
-            return;
-          }
           finish();
-          resolve(cancelValue);
+          resolve(null);
           return;
         }
         if (KEY_UP.includes(key) == true) {
@@ -3171,11 +3266,47 @@ var Prompter = class {
     });
   }
 };
+
+// src/modules/manage/host-form.ts
 var PREFERRED_KEY_NAMES = ["id_ed25519", "id_ecdsa", "id_rsa"];
 var NON_KEY_FILE_NAMES = ["config", "known_hosts", "known_hosts.old", "authorized_keys", "environment"];
 var MAX_KEY_FILE_BYTES = 64 * 1024;
 var CLEAR_ANSWER = "-";
 var OTHER_KEY_PATH = "\0other";
+var FIELD_NAME_WIDTH = 17;
+var SUB_FIELDS = ["key", "passphrase", "password", "jump-host", "jump-port", "jump-user", "proxy"];
+var FIELD_NAMES = {
+  "host": "Host",
+  "port": "Port",
+  "user": "User",
+  "name": "Server name",
+  "auth": "Authentication",
+  "key": "Private key",
+  "passphrase": "Passphrase",
+  "password": "Password",
+  "route": "Route",
+  "jump-host": "Jump host",
+  "jump-port": "Jump port",
+  "jump-user": "Jump user",
+  "proxy": "Proxy command",
+  "description": "Description",
+  "readonly": "Read-only",
+  "paths": "File paths",
+  "host-key": "Host key",
+  "jump-host-key": "Jump host key"
+};
+var AUTH_LABELS = {
+  key: "Private key file",
+  password: "Password",
+  agent: "SSH agent"
+};
+var ROUTE_LABELS = {
+  "direct": "Directly",
+  "jump": "Through a jump host",
+  "proxy": "Through a proxy command",
+  "jump-proxy": "Proxy command, then a jump host"
+};
+var REQUIRED_MARK = "(required)";
 function findPrivateKeys() {
   const sshDirectory = path__default.default.join(os5__default.default.homedir(), ".ssh");
   let names = [];
@@ -3291,121 +3422,526 @@ async function askKeyPath(prompter, current) {
     }
   }
 }
-async function askHostQuestions(prompter, existing) {
-  if (existing != null) {
-    prompter.write(prompter.paint.dim(`  Enter keeps the value in brackets; ${CLEAR_ANSWER} clears an optional one.
-
-`));
+function routeUsesJump(route) {
+  return route === "jump" || route === "jump-proxy";
+}
+function routeUsesProxy(route) {
+  return route === "proxy" || route === "jump-proxy";
+}
+function deriveServerName(host) {
+  return `ssh-${host}`.replace(/[^A-Za-z0-9_-]+/g, "-").slice(0, 48);
+}
+function finalizeAnswers(state) {
+  const answers = { ...state.answers };
+  if (routeUsesJump(state.route) == false) {
+    answers.jumpHost = void 0;
+    answers.jumpPort = void 0;
+    answers.jumpUser = void 0;
+    answers.jumpHostKeyFingerprint = void 0;
   }
-  const host = await prompter.askRequired("Host (hostname or IP)", existing?.host);
-  const port = await askPort(prompter, "Port", existing?.port ?? DEFAULT_SSH_PORT);
-  const username = await prompter.askRequired("Login user", existing?.username);
-  let name = "";
-  const defaultName = existing?.name ?? `ssh-${host}`.replace(/[^A-Za-z0-9_-]+/g, "-").slice(0, 48);
-  for (; ; ) {
-    name = await prompter.askRequired("Server name the agent sees", defaultName);
-    if (SERVER_NAME_PATTERN.test(name) == true) {
-      break;
+  if (routeUsesProxy(state.route) == false) {
+    answers.proxyCommand = void 0;
+  }
+  if (answers.auth !== "key") {
+    answers.keyPath = void 0;
+    answers.passphrase = void 0;
+  }
+  if (answers.auth !== "password") {
+    answers.password = void 0;
+  }
+  return answers;
+}
+function snapshotOf(state) {
+  return JSON.stringify(finalizeAnswers(state));
+}
+function cloneState(state) {
+  return {
+    ...state,
+    answers: {
+      ...state.answers,
+      allowedPaths: [...state.answers.allowedPaths],
+      extraEnv: { ...state.answers.extraEnv }
     }
-    prompter.write("  Use letters, digits, '-' and '_' only (max 48) \u2014 the name becomes part of every tool name.\n");
+  };
+}
+function restoreState(state, snapshot) {
+  const restored = cloneState(snapshot);
+  state.answers = restored.answers;
+  state.route = restored.route;
+  state.nameTouched = restored.nameTouched;
+  state.lastTest = restored.lastTest;
+  state.testedSnapshot = restored.testedSnapshot;
+}
+function missingFields(state) {
+  const { answers } = state;
+  const missing = [];
+  if (answers.host === "") {
+    missing.push("host");
   }
-  const auth = await prompter.select(
-    "Authentication",
-    [
-      { value: "key", label: "Private key file", hint: "only the path is stored \u2014 recommended" },
-      { value: "password", label: "Password", hint: "stored in the config file as plain text" },
-      { value: "agent", label: "SSH agent", hint: "keys already loaded in ssh-agent" }
-    ],
-    { defaultValue: existing?.auth ?? "key" }
-  );
-  let keyPath;
-  let passphrase;
-  let password;
-  if (auth === "key") {
-    keyPath = await askKeyPath(prompter, existing?.keyPath);
-    passphrase = await askOptionalSecret(prompter, "Key passphrase", existing?.passphrase);
-  }
-  if (auth === "password") {
-    password = await askOptionalSecret(prompter, "Password", existing?.password);
-    if (password == null) {
-      prompter.write("  No password given \u2014 falling back to the ssh agent.\n");
-    }
-  }
-  let currentRoute = "direct";
-  if (existing?.jumpHost != null && existing.proxyCommand != null) {
-    currentRoute = "jump-proxy";
-  } else if (existing?.jumpHost != null) {
-    currentRoute = "jump";
-  } else if (existing?.proxyCommand != null) {
-    currentRoute = "proxy";
-  }
-  const route = await prompter.select(
-    "How is it reached?",
-    [
-      { value: "direct", label: "Directly" },
-      { value: "jump", label: "Through a jump host", hint: "ssh -J" },
-      { value: "proxy", label: "Through a proxy command", hint: "e.g. cloudflared access ssh" },
-      { value: "jump-proxy", label: "Proxy command, then a jump host", hint: "cloudflared to the bastion, then on to the host" }
-    ],
-    { defaultValue: currentRoute }
-  );
-  let jumpHost;
-  let jumpPort;
-  let jumpUser;
-  let proxyCommand;
-  if (route === "jump" || route === "jump-proxy") {
-    jumpHost = await prompter.askRequired("Jump host", existing?.jumpHost);
-    jumpPort = await askPort(prompter, "Jump host port", existing?.jumpPort ?? DEFAULT_SSH_PORT);
-    jumpUser = await prompter.askRequired("Jump host user", existing?.jumpUser ?? username);
-  }
-  if (route === "proxy" || route === "jump-proxy") {
-    prompter.write(prompter.paint.dim("  %h / %p / %r expand to the first hop's host, port and user.\n"));
-    proxyCommand = await prompter.askRequired("Proxy command", existing?.proxyCommand ?? "cloudflared access ssh --hostname %h");
-  }
-  const description = await askOptional(prompter, "Description shown to the agent", existing?.description);
-  const readonly = await prompter.askYesNo("Read-only? (rejects writes, redirections, uploads)", existing?.readonly ?? false);
-  let currentAllowedPaths;
-  if (existing != null && existing.allowedPaths.length > 0) {
-    currentAllowedPaths = existing.allowedPaths.join(",");
+  if (answers.username === "") {
+    missing.push("user");
   }
-  let allowedPaths = [];
-  const allowedPathsAnswer = await askOptional(
-    prompter,
-    "Limit file tools to path prefixes (comma-separated, empty = anywhere)",
-    currentAllowedPaths
-  );
-  if (allowedPathsAnswer != null) {
-    allowedPaths = allowedPathsAnswer.split(",").map((item) => item.trim()).filter((item) => item !== "");
+  if (answers.auth === "key" && answers.keyPath == null) {
+    missing.push("key");
   }
-  let resolvedAuth = auth;
-  if (auth === "password" && password == null) {
-    resolvedAuth = "agent";
+  if (answers.auth === "password" && answers.password == null) {
+    missing.push("password");
   }
-  const answers = {
-    name,
-    host,
-    port,
-    username,
-    auth: resolvedAuth,
-    keyPath,
-    passphrase,
-    password,
-    description,
-    jumpHost,
-    jumpPort,
-    jumpUser,
-    proxyCommand,
-    readonly,
-    allowedPaths,
-    extraEnv: existing?.extraEnv ?? {}
+  if (routeUsesJump(state.route) == true && answers.jumpHost == null) {
+    missing.push("jump-host");
+  }
+  if (routeUsesProxy(state.route) == true && answers.proxyCommand == null) {
+    missing.push("proxy");
+  }
+  return missing;
+}
+function describePin(fingerprint) {
+  if (fingerprint == null) {
+    return "not pinned";
+  }
+  return `pinned \xB7 ${fingerprint.slice(0, 19)}\u2026`;
+}
+function valueOrRequired(value) {
+  if (value == null || value === "") {
+    return REQUIRED_MARK;
+  }
+  return value;
+}
+function fieldRow(id, value, hint) {
+  let name = FIELD_NAMES[id];
+  if (SUB_FIELDS.includes(id) == true) {
+    name = `  ${name}`;
+  }
+  return {
+    value: id,
+    key: id,
+    label: `${name.padEnd(FIELD_NAME_WIDTH)}${value}`,
+    hint
   };
-  if (existing != null && existing.host === host && existing.port === port) {
-    answers.hostKeyFingerprint = existing.hostKeyFingerprint;
+}
+function buildRows(state, destination) {
+  const { answers } = state;
+  const rows = [];
+  rows.push(fieldRow("host", valueOrRequired(answers.host)));
+  rows.push(fieldRow("port", String(answers.port)));
+  rows.push(fieldRow("user", valueOrRequired(answers.username)));
+  let nameValue = answers.name;
+  let nameHint = "what the agent sees";
+  if (state.nameTouched == false) {
+    nameHint = "follows the host until you change it";
+  }
+  if (nameValue === "") {
+    nameValue = "ssh-<host>";
+  }
+  rows.push(fieldRow("name", nameValue, nameHint));
+  rows.push(fieldRow("auth", AUTH_LABELS[answers.auth]));
+  if (answers.auth === "key") {
+    rows.push(fieldRow("key", valueOrRequired(answers.keyPath)));
+    let passphrase = "none";
+    if (answers.passphrase != null) {
+      passphrase = "set";
+    }
+    rows.push(fieldRow("passphrase", passphrase));
+  }
+  if (answers.auth === "password") {
+    let password = REQUIRED_MARK;
+    if (answers.password != null) {
+      password = "set";
+    }
+    rows.push(fieldRow("password", password, "stored in the config file as plain text"));
+  }
+  rows.push(fieldRow("route", ROUTE_LABELS[state.route]));
+  if (routeUsesJump(state.route) == true) {
+    rows.push(fieldRow("jump-host", valueOrRequired(answers.jumpHost)));
+    rows.push(fieldRow("jump-port", String(answers.jumpPort ?? DEFAULT_SSH_PORT)));
+    let jumpUser = answers.jumpUser;
+    if (jumpUser == null || jumpUser === answers.username) {
+      let loginUser = answers.username;
+      if (loginUser === "") {
+        loginUser = "\u2026";
+      }
+      jumpUser = `same as login (${loginUser})`;
+    }
+    rows.push(fieldRow("jump-user", jumpUser));
   }
-  if (existing != null && existing.jumpHost === jumpHost && existing.jumpPort === jumpPort) {
-    answers.jumpHostKeyFingerprint = existing.jumpHostKeyFingerprint;
+  if (routeUsesProxy(state.route) == true) {
+    rows.push(fieldRow("proxy", valueOrRequired(answers.proxyCommand), "%h %p %r \u2192 first hop"));
+  }
+  rows.push(fieldRow("description", answers.description ?? "none", "shown to the agent"));
+  let readonly = "no";
+  if (answers.readonly == true) {
+    readonly = "yes";
+  }
+  rows.push(fieldRow("readonly", readonly, "enter toggles"));
+  let paths = "anywhere";
+  if (answers.allowedPaths.length > 0) {
+    paths = answers.allowedPaths.join(", ");
+  }
+  rows.push(fieldRow("paths", paths, "where the file tools may read and write"));
+  rows.push(fieldRow("host-key", describePin(answers.hostKeyFingerprint)));
+  if (routeUsesJump(state.route) == true) {
+    rows.push(fieldRow("jump-host-key", describePin(answers.jumpHostKeyFingerprint)));
+  }
+  rows.push({ separator: true });
+  let testHint = "not run yet";
+  if (state.lastTest === "ok") {
+    testHint = "last run: OK";
+  } else if (state.lastTest === "failed") {
+    testHint = "last run: failed";
+  }
+  rows.push({ value: "test", key: "test", label: "Test the connection", hint: testHint });
+  rows.push({ value: "save", key: "save", label: "Save", hint: `to ${destination}` });
+  rows.push({ value: "cancel", key: "cancel", label: "Cancel" });
+  return rows;
+}
+function nextCursor(state, destination, edited) {
+  if (edited === "readonly") {
+    return edited;
+  }
+  const values = buildRows(state, destination).flatMap((row) => {
+    if ("value" in row) {
+      return [row.value];
+    }
+    return [];
+  });
+  let index = values.indexOf(edited) + 1;
+  if (SUB_FIELDS.includes(edited) == false) {
+    while (index < values.length && SUB_FIELDS.includes(values[index]) == true) {
+      index += 1;
+    }
+  }
+  const next = values[index];
+  if (next == null || next === "test") {
+    return "save";
+  }
+  return next;
+}
+async function testConnection(prompter, output, state) {
+  const answers = finalizeAnswers(state);
+  output.write("\n");
+  const profile = profileFromEnv(output, answersToEntry(answers).env);
+  if (profile == null) {
+    output.write("\n");
+    state.lastTest = "failed";
+    return false;
+  }
+  const result = await runConnectionCheck(profile, output);
+  output.write("\n");
+  if (result.connected == true) {
+    if (result.hostKeyFingerprint != null && state.answers.hostKeyFingerprint == null) {
+      const pin = await prompter.askYesNo("Pin this host key? (a changed key then aborts the connection)", true);
+      if (pin == true) {
+        state.answers.hostKeyFingerprint = result.hostKeyFingerprint;
+      }
+    }
+    if (result.jumpHostKeyFingerprint != null && routeUsesJump(state.route) == true && state.answers.jumpHostKeyFingerprint == null) {
+      const pin = await prompter.askYesNo("Pin the jump host key too?", true);
+      if (pin == true) {
+        state.answers.jumpHostKeyFingerprint = result.jumpHostKeyFingerprint;
+      }
+    }
+    state.lastTest = "ok";
+    state.testedSnapshot = snapshotOf(state);
+    return true;
+  }
+  const hostKeyChanged = result.hostKeyFingerprint != null && state.answers.hostKeyFingerprint != null && result.hostKeyFingerprint !== state.answers.hostKeyFingerprint;
+  if (hostKeyChanged == true) {
+    output.write("  The host presented a different key than the pinned one. Re-pin only if you know it was rebuilt.\n");
+    const repin = await prompter.askYesNo(`Pin ${result.hostKeyFingerprint} instead?`, false);
+    if (repin == true) {
+      state.answers.hostKeyFingerprint = result.hostKeyFingerprint ?? void 0;
+      output.write("  Pinned the new key \u2014 test again to confirm.\n");
+    }
+  }
+  const jumpKeyChanged = result.jumpHostKeyFingerprint != null && state.answers.jumpHostKeyFingerprint != null && result.jumpHostKeyFingerprint !== state.answers.jumpHostKeyFingerprint;
+  if (jumpKeyChanged == true) {
+    output.write("  The jump host presented a different key than the pinned one. Re-pin only if you know it was rebuilt.\n");
+    const repin = await prompter.askYesNo(`Pin ${result.jumpHostKeyFingerprint} instead?`, false);
+    if (repin == true) {
+      state.answers.jumpHostKeyFingerprint = result.jumpHostKeyFingerprint ?? void 0;
+      output.write("  Pinned the new key \u2014 test again to confirm.\n");
+    }
+  }
+  state.lastTest = "failed";
+  return false;
+}
+async function editField(prompter, output, state, id) {
+  const { answers } = state;
+  if (id === "host") {
+    let current;
+    if (answers.host !== "") {
+      current = answers.host;
+    }
+    answers.host = await prompter.askRequired("Host (hostname or IP)", current);
+    if (state.nameTouched == false) {
+      answers.name = deriveServerName(answers.host);
+    }
+    return;
+  }
+  if (id === "port") {
+    answers.port = await askPort(prompter, "Port", answers.port);
+    return;
+  }
+  if (id === "user") {
+    let current;
+    if (answers.username !== "") {
+      current = answers.username;
+    }
+    answers.username = await prompter.askRequired("Login user", current);
+    return;
+  }
+  if (id === "name") {
+    let current;
+    if (answers.name !== "") {
+      current = answers.name;
+    }
+    for (; ; ) {
+      const name = await prompter.askRequired("Server name the agent sees", current);
+      if (SERVER_NAME_PATTERN.test(name) == true) {
+        answers.name = name;
+        state.nameTouched = true;
+        return;
+      }
+      prompter.write("  Use letters, digits, '-' and '_' only (max 48) \u2014 the name becomes part of every tool name.\n");
+    }
+  }
+  if (id === "auth") {
+    answers.auth = await prompter.select(
+      "Authentication",
+      [
+        { value: "key", label: AUTH_LABELS.key, hint: "only the path is stored \u2014 recommended" },
+        { value: "password", label: AUTH_LABELS.password, hint: "stored in the config file as plain text" },
+        { value: "agent", label: AUTH_LABELS.agent, hint: "keys already loaded in ssh-agent" }
+      ],
+      { defaultValue: answers.auth }
+    );
+    if (answers.auth === "key" && answers.keyPath == null) {
+      answers.keyPath = await askKeyPath(prompter, void 0);
+    }
+    if (answers.auth === "password" && answers.password == null) {
+      answers.password = await askOptionalSecret(prompter, "Password", void 0);
+    }
+    return;
+  }
+  if (id === "key") {
+    answers.keyPath = await askKeyPath(prompter, answers.keyPath);
+    return;
+  }
+  if (id === "passphrase") {
+    answers.passphrase = await askOptionalSecret(prompter, "Key passphrase", answers.passphrase);
+    return;
+  }
+  if (id === "password") {
+    answers.password = await askOptionalSecret(prompter, "Password", answers.password);
+    return;
+  }
+  if (id === "route") {
+    state.route = await prompter.select(
+      "Route",
+      [
+        { value: "direct", label: ROUTE_LABELS.direct },
+        { value: "jump", label: ROUTE_LABELS.jump, hint: "ssh -J" },
+        { value: "proxy", label: ROUTE_LABELS.proxy, hint: "e.g. cloudflared access ssh" },
+        { value: "jump-proxy", label: ROUTE_LABELS["jump-proxy"], hint: "cloudflared to the bastion, then on to the host" }
+      ],
+      { defaultValue: state.route }
+    );
+    if (routeUsesJump(state.route) == true && answers.jumpHost == null) {
+      answers.jumpHost = await prompter.askRequired("Jump host");
+    }
+    if (routeUsesProxy(state.route) == true && answers.proxyCommand == null) {
+      answers.proxyCommand = await prompter.askRequired("Proxy command", "cloudflared access ssh --hostname %h");
+    }
+    return;
+  }
+  if (id === "jump-host") {
+    answers.jumpHost = await prompter.askRequired("Jump host", answers.jumpHost);
+    return;
+  }
+  if (id === "jump-port") {
+    answers.jumpPort = await askPort(prompter, "Jump host port", answers.jumpPort ?? DEFAULT_SSH_PORT);
+    return;
+  }
+  if (id === "jump-user") {
+    answers.jumpUser = await askOptional(prompter, "Jump host user (empty = same as the login user)", answers.jumpUser);
+    return;
+  }
+  if (id === "proxy") {
+    output.write(prompter.paint.dim("  %h / %p / %r expand to the first hop's host, port and user.\n"));
+    answers.proxyCommand = await prompter.askRequired("Proxy command", answers.proxyCommand ?? "cloudflared access ssh --hostname %h");
+    return;
+  }
+  if (id === "description") {
+    answers.description = await askOptional(prompter, "Description shown to the agent", answers.description);
+    return;
+  }
+  if (id === "readonly") {
+    answers.readonly = answers.readonly == false;
+    return;
+  }
+  if (id === "paths") {
+    let current;
+    if (answers.allowedPaths.length > 0) {
+      current = answers.allowedPaths.join(",");
+    }
+    const typed = await askOptional(prompter, "Limit file tools to path prefixes (comma-separated, empty = anywhere)", current);
+    answers.allowedPaths = [];
+    if (typed != null) {
+      answers.allowedPaths = typed.split(",").map((item) => item.trim()).filter((item) => item !== "");
+    }
+    return;
+  }
+  const isJump = id === "jump-host-key";
+  let pinned = answers.hostKeyFingerprint;
+  if (isJump == true) {
+    pinned = answers.jumpHostKeyFingerprint;
+  }
+  if (pinned != null) {
+    const unpin = await prompter.askYesNo(`Unpin ${pinned}?`, false);
+    if (unpin == true && isJump == true) {
+      answers.jumpHostKeyFingerprint = void 0;
+    } else if (unpin == true) {
+      answers.hostKeyFingerprint = void 0;
+    }
+    return;
+  }
+  const missing = missingFields(state);
+  if (missing.length > 0) {
+    output.write(`  Fill in ${missing.map((field) => FIELD_NAMES[field]).join(", ")} first \u2014 the key is pinned by testing the connection.
+`);
+    return;
+  }
+  await testConnection(prompter, output, state);
+}
+async function runHostForm(prompter, output, options) {
+  const { existing, takenNames, destination } = options;
+  let state;
+  if (existing != null) {
+    let route = "direct";
+    if (existing.jumpHost != null && existing.proxyCommand != null) {
+      route = "jump-proxy";
+    } else if (existing.jumpHost != null) {
+      route = "jump";
+    } else if (existing.proxyCommand != null) {
+      route = "proxy";
+    }
+    state = { answers: { ...existing }, route, nameTouched: true, lastTest: "never", testedSnapshot: null };
+  } else {
+    const foundKeys = findPrivateKeys();
+    state = {
+      answers: {
+        name: "",
+        host: "",
+        port: DEFAULT_SSH_PORT,
+        username: "",
+        auth: "key",
+        keyPath: foundKeys[0]?.path,
+        readonly: false,
+        allowedPaths: [],
+        extraEnv: {}
+      },
+      route: "direct",
+      nameTouched: false,
+      lastTest: "never",
+      testedSnapshot: null
+    };
+  }
+  const initialSnapshot = snapshotOf(state);
+  const originalName = existing?.name;
+  let title = "New host";
+  if (existing != null) {
+    title = `Editing ${existing.name}`;
+  }
+  output.write(prompter.paint.dim(`
+  Pick a setting to change it. In a text field, Enter keeps the value shown and ${CLEAR_ANSWER} clears it.
+
+`));
+  const previousTransient = prompter.transient;
+  prompter.transient = true;
+  try {
+    let cursor = "host";
+    for (; ; ) {
+      const picked = await prompter.select(title, buildRows(state, destination), { defaultValue: cursor, cancelValue: "cancel" });
+      const before = cloneState(state);
+      try {
+        if (picked === "cancel") {
+          if (snapshotOf(state) !== initialSnapshot) {
+            const discard = await prompter.askYesNo("Discard the changes?", false);
+            if (discard == false) {
+              continue;
+            }
+          }
+          return null;
+        }
+        const missing = missingFields(state);
+        if (picked === "test") {
+          if (missing.length > 0) {
+            output.write(`  Fill in ${missing.map((field) => FIELD_NAMES[field]).join(", ")} first.
+`);
+            cursor = missing[0];
+            continue;
+          }
+          const connected = await testConnection(prompter, output, state);
+          cursor = "test";
+          if (connected == true) {
+            cursor = "save";
+          }
+          continue;
+        }
+        if (picked === "save") {
+          if (missing.length > 0) {
+            output.write(`  Fill in ${missing.map((field) => FIELD_NAMES[field]).join(", ")} first.
+`);
+            cursor = missing[0];
+            continue;
+          }
+          const name = state.answers.name;
+          if (name !== originalName && takenNames.includes(name) == true) {
+            const replace = await prompter.askYesNo(`"${name}" already exists in this file. Replace it?`, false);
+            if (replace == false) {
+              cursor = "name";
+              continue;
+            }
+          }
+          if (snapshotOf(state) !== state.testedSnapshot) {
+            const testFirst = await prompter.askYesNo("Test the connection before saving?", true);
+            if (testFirst == true) {
+              const connected = await testConnection(prompter, output, state);
+              if (connected == false) {
+                const next = await prompter.select(
+                  "The check failed. What now?",
+                  [
+                    { value: "back", key: "back", label: "Back to the settings" },
+                    { value: "save", key: "save", label: "Save anyway", hint: "the host may be unreachable from here" },
+                    { value: "discard", key: "discard", label: "Discard", hint: "nothing is written" }
+                  ],
+                  { defaultValue: "back", cancelValue: "back" }
+                );
+                if (next === "discard") {
+                  return null;
+                }
+                if (next === "back") {
+                  cursor = "test";
+                  continue;
+                }
+              }
+            }
+          }
+          return finalizeAnswers(state);
+        }
+        await editField(prompter, output, state, picked);
+        cursor = nextCursor(state, destination, picked);
+      } catch (ex) {
+        if (ex instanceof PromptBackError == false) {
+          throw ex;
+        }
+        restoreState(state, before);
+        cursor = picked;
+      }
+    }
+  } finally {
+    prompter.transient = previousTransient;
   }
-  return answers;
 }
 function toMcpServerEntry(value) {
   if (typeof value !== "object" || value == null) {
@@ -4134,125 +4670,54 @@ function reportWrite(prompter, result, action) {
 
 `);
 }
-function profileFromEntry(output, entry) {
-  try {
-    const profile = loadHostProfile(entry.env);
-    if (profile == null) {
-      output.write("  The entry has no host.\n");
-    }
-    return profile;
-  } catch (ex) {
-    output.write(`  The server would refuse to start with this entry: ${errorMessage(ex)}
-`);
-    return null;
-  }
-}
-async function verifyAnswers(prompter, output, initial) {
-  let answers = initial;
-  for (; ; ) {
-    const testNow = await prompter.askYesNo("Test the connection now?", true);
-    if (testNow == false) {
-      return answers;
-    }
-    output.write("\n");
-    const profile = profileFromEntry(output, answersToEntry(answers));
-    if (profile != null) {
-      const result = await runConnectionCheck(profile, output);
-      output.write("\n");
-      if (result.connected == true) {
-        if (result.hostKeyFingerprint != null && answers.hostKeyFingerprint == null) {
-          const pin = await prompter.askYesNo("Pin this host key? (a changed key then aborts the connection)", true);
-          if (pin == true) {
-            answers = { ...answers, hostKeyFingerprint: result.hostKeyFingerprint };
-          }
-        }
-        if (result.jumpHostKeyFingerprint != null && answers.jumpHost != null && answers.jumpHostKeyFingerprint == null) {
-          const pin = await prompter.askYesNo("Pin the jump host key too?", true);
-          if (pin == true) {
-            answers = { ...answers, jumpHostKeyFingerprint: result.jumpHostKeyFingerprint };
-          }
-        }
-        return answers;
-      }
-      const hostKeyChanged = result.hostKeyFingerprint != null && answers.hostKeyFingerprint != null && result.hostKeyFingerprint !== answers.hostKeyFingerprint;
-      if (hostKeyChanged == true) {
-        output.write("  The host presented a different key than the pinned one. Re-pin only if you know it was rebuilt.\n");
-        const repin = await prompter.askYesNo(`Pin ${result.hostKeyFingerprint} instead?`, false);
-        if (repin == true) {
-          answers = { ...answers, hostKeyFingerprint: result.hostKeyFingerprint ?? void 0 };
-          continue;
-        }
-      }
-      const jumpKeyChanged = result.jumpHostKeyFingerprint != null && answers.jumpHostKeyFingerprint != null && result.jumpHostKeyFingerprint !== answers.jumpHostKeyFingerprint;
-      if (jumpKeyChanged == true) {
-        output.write("  The jump host presented a different key than the pinned one. Re-pin only if you know it was rebuilt.\n");
-        const repin = await prompter.askYesNo(`Pin ${result.jumpHostKeyFingerprint} instead?`, false);
-        if (repin == true) {
-          answers = { ...answers, jumpHostKeyFingerprint: result.jumpHostKeyFingerprint ?? void 0 };
-          continue;
-        }
-      }
-    }
-    const next = await prompter.select(
-      "The check failed. What now?",
-      [
-        { value: "edit", key: "e", label: "Change the answers" },
-        { value: "retry", key: "r", label: "Try again", hint: "e.g. after starting a tunnel" },
-        { value: "write", key: "w", label: "Write it anyway", hint: "the host may be unreachable from here" },
-        { value: "cancel", key: "c", label: "Cancel", hint: "nothing is written" }
-      ],
-      { defaultValue: "edit", cancelValue: "cancel" }
-    );
-    if (next === "cancel") {
-      return null;
-    }
-    if (next === "write") {
-      return answers;
-    }
-    if (next === "edit") {
-      output.write("\n");
-      answers = await askHostQuestions(prompter, answers);
-    }
-  }
-}
 async function addOrEditHost(prompter, output, target, entries, existingName) {
   let existing;
   if (existingName != null) {
     existing = entryToAnswers(existingName, entries[existingName]);
-    output.write(`
-${prompter.paint.bold(`Editing ${existingName}`)}
-`);
-  } else {
-    output.write(`
-${prompter.paint.bold("Adding a host")}
-`);
   }
-  const asked = await askHostQuestions(prompter, existing);
-  output.write("\n");
-  const answers = await verifyAnswers(prompter, output, asked);
+  let answers = await runHostForm(prompter, output, {
+    existing,
+    takenNames: Object.keys(entries),
+    destination: target.label
+  });
   if (answers == null) {
     output.write("  Cancelled \u2014 nothing was written.\n\n");
     return;
   }
-  if (answers.name !== existingName && entries[answers.name] != null) {
-    const replace = await prompter.askYesNo(`"${answers.name}" already exists in this file. Replace it?`, false);
-    if (replace == false) {
-      output.write("  Cancelled \u2014 nothing was written.\n\n");
-      return;
-    }
-  }
-  const entry = answersToEntry(answers);
-  output.write(`
+  let entry = answersToEntry(answers);
+  for (; ; ) {
+    output.write(`
   ${prompter.paint.dim(`This goes into ${target.location}:`)}
 
 `);
-  output.write(`${indent(formatForTarget(target, answers.name, maskSecrets(entry)))}
+    output.write(`${indent(formatForTarget(target, answers.name, maskSecrets(entry)))}
 
 `);
-  const confirmed = await prompter.askYesNo("Write it?", true);
-  if (confirmed == false) {
-    output.write("  Not written. Pick the host and choose Print to get the entry ready to paste.\n\n");
-    return;
+    let confirmed;
+    try {
+      confirmed = await prompter.askYesNo("Write it?", true);
+    } catch (ex) {
+      if (ex instanceof PromptBackError == false) {
+        throw ex;
+      }
+      const revised = await runHostForm(prompter, output, {
+        existing: answers,
+        takenNames: Object.keys(entries),
+        destination: target.label
+      });
+      if (revised == null) {
+        output.write("  Cancelled \u2014 nothing was written.\n\n");
+        return;
+      }
+      answers = revised;
+      entry = answersToEntry(answers);
+      continue;
+    }
+    if (confirmed == false) {
+      output.write("  Not written. Pick the host and choose Print to get the entry ready to paste.\n\n");
+      return;
+    }
+    break;
   }
   const written = target.writeEntry(answers.name, entry);
   reportWrite(prompter, written, "Written");
@@ -4267,7 +4732,7 @@ ${prompter.paint.bold("Adding a host")}
 }
 async function checkHost(prompter, output, target, name, entry) {
   output.write("\n");
-  const profile = profileFromEntry(output, entry);
+  const profile = profileFromEnv(output, entry.env);
   if (profile == null) {
     output.write("\n");
     return;
@@ -4341,7 +4806,7 @@ async function manageHost(prompter, output, target, entries, name) {
   const action = await prompter.select(
     name,
     [
-      { value: "edit", key: "e", label: "Edit", hint: "change the answers, re-check, re-write" },
+      { value: "edit", key: "e", label: "Edit", hint: "open its settings" },
       { value: "check", key: "c", label: "Check the connection", hint: "connect now and offer to pin the host key" },
       { value: "print", key: "p", label: "Print the entry", hint: "JSON, Codex TOML and a claude command, ready to paste" },
       { value: "remove", key: "r", label: "Remove", hint: `from ${target.label}` },
@@ -4369,7 +4834,7 @@ async function manageHost(prompter, output, target, entries, name) {
     }
   }
 }
-async function runConfigCommand(options) {
+async function runSetupCommand(options) {
   const { input, output } = options;
   const targets = options.targets ?? listConfigTargets();
   let target = targets[0];
@@ -4469,6 +4934,9 @@ ${paint.bold(target.label)}  ${paint.dim(target.location)}
         if (ex instanceof PromptClosedError) {
           throw ex;
         }
+        if (ex instanceof PromptBackError) {
+          continue;
+        }
         output.write(`  Failed: ${errorMessage(ex)}
 
 `);
@@ -5176,11 +5644,12 @@ function createSshMcpServer() {
 }
 
 // src/cli.ts
+var SETUP_COMMAND_NAMES = ["setup", "config"];
 function parseArguments(argv) {
-  const parsed = { showHelp: false, showVersion: false, checkOnly: false, configMode: false };
+  const parsed = { showHelp: false, showVersion: false, checkOnly: false, setupMode: false };
   let rest = argv;
-  if (argv[0] === "config") {
-    parsed.configMode = true;
+  if (argv[0] != null && SETUP_COMMAND_NAMES.includes(argv[0]) == true) {
+    parsed.setupMode = true;
     rest = argv.slice(1);
   }
   for (let index = 0; index < rest.length; index += 1) {
@@ -5214,17 +5683,17 @@ var HELP_TEXT = [
   "",
   "Usage:",
   "  akms-mcp-ssh [--check]",
-  "  akms-mcp-ssh config [--target <client>]",
+  "  akms-mcp-ssh setup [--target <client>]",
   "",
   "Commands:",
-  "  config               Manage the SSH hosts registered in an MCP client's config \u2014",
+  "  setup                Manage the SSH hosts registered in an MCP client's config \u2014",
   "                       list, add, edit, remove, check, print. Asks plain questions,",
   "                       so the SSH_* names below never have to be typed.",
   "",
   "Options:",
   "      --check          Connect to the configured host, report the result, and exit.",
   "                       Prints the host key fingerprint so it can be pinned.",
-  "      --target <id>    config: claude-code | codex | claude-desktop | cursor",
+  "      --target <id>    setup: claude-code | codex | claude-desktop | cursor",
   "                       (default: the first one installed)",
   "  -v, --version        Print the version and exit",
   "  -h, --help           Print this help and exit",
@@ -5258,7 +5727,7 @@ var HELP_TEXT = [
 ].join("\n");
 async function runCheckCommand(profile) {
   if (profile == null) {
-    process.stdout.write(`No SSH host is registered \u2014 set ${SINGLE_HOST_ENV.HOST} and ${SINGLE_HOST_ENV.USER}, or run: akms-mcp-ssh config
+    process.stdout.write(`No SSH host is registered \u2014 set ${SINGLE_HOST_ENV.HOST} and ${SINGLE_HOST_ENV.USER}, or run: akms-mcp-ssh setup
 `);
     return 1;
   }
@@ -5281,11 +5750,11 @@ async function main() {
 `);
     return;
   }
-  if (cliArguments.configMode == true) {
+  if (cliArguments.setupMode == true) {
     if (process.env[LOG_LEVEL_ENV] == null) {
       process.env[LOG_LEVEL_ENV] = "warn";
     }
-    const exitCode = await runConfigCommand({
+    const exitCode = await runSetupCommand({
       input: process.stdin,
       output: process.stdout,
       targetId: cliArguments.targetId