@akms/mcp-ssh 0.1.5 → 0.1.7

package/lib/cli.js

@@ -8,7 +8,7 @@ import { createHash } from 'crypto';
 import { Duplex } from 'stream';
 import { StringDecoder } from 'string_decoder';
 import ssh2 from 'ssh2';
-import { setInterval, clearInterval } from 'timers';
+import { setInterval as setInterval$1, clearInterval as clearInterval$1 } from 'timers';
 import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 import { z } from 'zod';
 
@@ -22,11 +22,12 @@ var DEFAULT_MAX_READ_FILE_BYTES = 2e5;
 var KEEPALIVE_INTERVAL_MS = 15e3;
 var SESSION_IDLE_TIMEOUT_MS = 15 * 60 * 1e3;
 var SESSION_SWEEP_INTERVAL_MS = 6e4;
+var SHUTDOWN_DEADLINE_MS = 5e3;
 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.5";
+var SERVER_VERSION = "0.1.7";
 
 // src/_defs/command-rules.ts
 var CRITICAL_PATH_PATTERN = new RegExp(
@@ -489,6 +490,10 @@ var LEVEL_WEIGHTS = {
   error: 4
 };
 var SECRET_META_KEYS = ["password", "passphrase", "privatekey", "privatekeypath", "secret", "token"];
+var stderrBroken = false;
+process.stderr.on("error", () => {
+  stderrBroken = true;
+});
 function resolveThreshold() {
   const configured = process.env[LOG_LEVEL_ENV];
   if (configured == null) {
@@ -512,6 +517,9 @@ function maskMeta(meta) {
   return masked;
 }
 function write(level, message, meta) {
+  if (stderrBroken == true) {
+    return;
+  }
   const threshold = resolveThreshold();
   if (threshold === "silent") {
     return;
@@ -525,8 +533,12 @@ function write(level, message, meta) {
   if (Object.keys(masked).length > 0) {
     line += ` ${JSON.stringify(masked)}`;
   }
-  process.stderr.write(`${line}
+  try {
+    process.stderr.write(`${line}
 `);
+  } catch {
+    stderrBroken = true;
+  }
 }
 function createLogger(boundMeta) {
   return {
@@ -1628,7 +1640,7 @@ var SshConnection = class {
    * @throws {Error} If the connection was closed, authentication fails, the host is
    *                 unreachable, the handshake times out, or the carrier cannot be opened.
    */
-  async connect() {
+  async connect(onProgress) {
     if (this.disposed == true) {
       throw new Error(`ssh connection for '${this.profile.name}' has been closed; open a new session`);
     }
@@ -1650,6 +1662,9 @@ var SshConnection = class {
       this.observedFingerprint = fingerprint;
     });
     this.connecting = (async () => {
+      if (this.profile.jump != null || this.profile.proxyCommand != null) {
+        onProgress?.("transport");
+      }
       const transport = await openTransport(this.profile, (fingerprint) => {
         this.observedJumpFingerprint = fingerprint;
       });
@@ -1660,6 +1675,7 @@ var SshConnection = class {
       if (transport != null) {
         connectConfig.sock = transport.sock;
       }
+      onProgress?.("host");
       await new Promise((resolve, reject) => {
         const client = new Client();
         this.pendingClient = client;
@@ -2115,7 +2131,7 @@ var SshSessionManager = class {
     if (this.sweepTimer != null) {
       return;
     }
-    this.sweepTimer = setInterval(() => {
+    this.sweepTimer = setInterval$1(() => {
       const expiredAt = Date.now() - SESSION_IDLE_TIMEOUT_MS;
       for (const session of Array.from(this.sessions.values())) {
         if (session.isBusy == true) {
@@ -2139,7 +2155,7 @@ var SshSessionManager = class {
     if (this.sweepTimer == null) {
       return;
     }
-    clearInterval(this.sweepTimer);
+    clearInterval$1(this.sweepTimer);
     this.sweepTimer = null;
   }
 };
@@ -2358,386 +2374,109 @@ async function downloadFile(connection, remotePath, localPath) {
   return localStats.size;
 }
 
-// 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}`;
-  }
-  if (profile.password != null) {
-    return "password";
-  }
-  return "ssh agent";
-}
-async function runConnectionCheck(profile, output) {
-  const endpoint = `${profile.username}@${profile.host}:${profile.port}`;
-  const auth = describeAuth(profile);
-  output.write(`Checking ${profile.name}  \u2192  ${endpoint}
-`);
-  if (profile.proxyCommand != null) {
-    output.write(`  via proxy command: ${profile.proxyCommand}
-`);
+// src/modules/manage/prompter.ts
+var PromptClosedError = class extends Error {
+  constructor() {
+    super("input closed before the prompt was answered");
+    this.name = "PromptClosedError";
   }
-  if (profile.jump != null) {
-    output.write(`  via jump host: ${profile.jump.username}@${profile.jump.host}:${profile.jump.port}
-`);
+};
+var PromptBackError = class extends Error {
+  constructor() {
+    super("prompt left with esc");
+    this.name = "PromptBackError";
   }
-  output.write("\n");
-  const connection = new SshConnection(profile);
-  const startedAt = Date.now();
-  let connected = false;
-  let detail = "";
-  try {
-    await connection.connect();
-    connected = true;
-  } catch (ex) {
-    detail = String(ex);
-    if (ex instanceof Error) {
-      detail = ex.message;
+};
+var ESC = "\x1B";
+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;
+  while (index < chunk.length) {
+    const isSequence = chunk[index] === ESC && (chunk[index + 1] === "[" || chunk[index + 1] === "O");
+    if (isSequence == true) {
+      let end = index + 2;
+      while (end < chunk.length && /[0-9;]/.test(chunk[end]) == true) {
+        end += 1;
+      }
+      keys.push(chunk.slice(index, end + 1));
+      index = end + 1;
+      continue;
     }
-  } finally {
-    connection.disconnect();
+    const codePoint = chunk.codePointAt(index) ?? 0;
+    const character = String.fromCodePoint(codePoint);
+    keys.push(character);
+    index += character.length;
   }
-  const durationMs = Date.now() - startedAt;
-  if (connected == true) {
-    output.write(`  OK      ${endpoint}  (${auth}, ${durationMs}ms)
-`);
-  } else {
-    output.write(`  FAILED  ${endpoint}  (${auth})
-`);
-    output.write(`          ${detail}
-`);
+  return keys;
+}
+function isPrintableKey(key) {
+  if (key.startsWith(ESC) == true) {
+    return false;
   }
-  if (connection.hostKeyFingerprint != null) {
-    let pinNote = `not pinned \u2014 set ${SINGLE_HOST_ENV.HOST_KEY} to it to detect a changed key`;
-    if (profile.hostKeyFingerprint != null) {
-      pinNote = "pinned";
-    }
-    output.write(`          host key ${connection.hostKeyFingerprint}  (${pinNote})
-`);
+  const codePoint = key.codePointAt(0) ?? 0;
+  return codePoint >= 32 && codePoint !== 127;
+}
+function charWidth(codePoint) {
+  if (codePoint < 4352) {
+    return 1;
   }
-  if (connection.jumpHostKeyFingerprint != null) {
-    let pinNote = `not pinned \u2014 set ${SINGLE_HOST_ENV.JUMP_HOST_KEY} to it to detect a changed key`;
-    if (profile.jump?.hostKeyFingerprint != null) {
-      pinNote = "pinned";
-    }
-    output.write(`          jump host key ${connection.jumpHostKeyFingerprint}  (${pinNote})
-`);
+  const isWide = codePoint <= 4447 || codePoint === 9001 || codePoint === 9002 || codePoint >= 11904 && codePoint <= 42191 && codePoint !== 12351 || codePoint >= 44032 && codePoint <= 55203 || codePoint >= 63744 && codePoint <= 64255 || codePoint >= 65072 && codePoint <= 65103 || codePoint >= 65280 && codePoint <= 65376 || codePoint >= 65504 && codePoint <= 65510 || codePoint >= 127744 && codePoint <= 128591 || codePoint >= 129280 && codePoint <= 129535 || codePoint >= 131072 && codePoint <= 262141;
+  if (isWide == true) {
+    return 2;
   }
-  return {
-    connected,
-    hostKeyFingerprint: connection.hostKeyFingerprint,
-    jumpHostKeyFingerprint: connection.jumpHostKeyFingerprint
-  };
+  return 1;
 }
-
-// src/modules/manage/entry.ts
-var MANAGED_ENV_NAMES = [
-  SINGLE_HOST_ENV.HOST,
-  SINGLE_HOST_ENV.PORT,
-  SINGLE_HOST_ENV.USER,
-  SINGLE_HOST_ENV.KEY,
-  SINGLE_HOST_ENV.PASSPHRASE,
-  SINGLE_HOST_ENV.PASSWORD,
-  SINGLE_HOST_ENV.DESCRIPTION,
-  SINGLE_HOST_ENV.JUMP_HOST,
-  SINGLE_HOST_ENV.JUMP_PORT,
-  SINGLE_HOST_ENV.JUMP_USER,
-  SINGLE_HOST_ENV.PROXY_COMMAND,
-  SINGLE_HOST_ENV.READONLY,
-  SINGLE_HOST_ENV.ALLOWED_PATHS,
-  SINGLE_HOST_ENV.HOST_KEY,
-  SINGLE_HOST_ENV.JUMP_HOST_KEY
-];
-var JUMP_ENV_PREFIX = "SSH_JUMP_";
-var SERVER_NAME_PATTERN = /^[A-Za-z0-9_-]{1,48}$/;
-function isOurEntry(entry) {
-  if (entry.args.includes(PACKAGE_NAME) == true) {
-    return true;
+function displayWidth(text) {
+  let width = 0;
+  for (const character of text) {
+    width += charWidth(character.codePointAt(0) ?? 0);
   }
-  const commandBase = entry.command.replace(/\\/g, "/").split("/").pop() ?? "";
-  return commandBase === SERVER_NAME || commandBase.startsWith(`${SERVER_NAME}.`) == true;
+  return width;
 }
-function launchCommand() {
-  if (process.platform === "win32") {
-    return { command: "cmd", args: ["/c", "npx", "-y", PACKAGE_NAME] };
+function padToWidth(text, width) {
+  const missing = width - displayWidth(text);
+  if (missing <= 0) {
+    return text;
   }
-  return { command: "npx", args: ["-y", PACKAGE_NAME] };
+  return `${text}${" ".repeat(missing)}`;
 }
-function answersToEntry(answers) {
-  const env = {};
-  env[SINGLE_HOST_ENV.HOST] = answers.host;
-  if (answers.port !== DEFAULT_SSH_PORT) {
-    env[SINGLE_HOST_ENV.PORT] = String(answers.port);
-  }
-  env[SINGLE_HOST_ENV.USER] = answers.username;
-  if (answers.auth === "key" && answers.keyPath != null) {
-    env[SINGLE_HOST_ENV.KEY] = answers.keyPath;
-    if (answers.passphrase != null && answers.passphrase !== "") {
-      env[SINGLE_HOST_ENV.PASSPHRASE] = answers.passphrase;
-    }
-  }
-  if (answers.auth === "password" && answers.password != null) {
-    env[SINGLE_HOST_ENV.PASSWORD] = answers.password;
-  }
-  if (answers.hostKeyFingerprint != null) {
-    env[SINGLE_HOST_ENV.HOST_KEY] = answers.hostKeyFingerprint;
-  }
-  if (answers.description != null && answers.description !== "") {
-    env[SINGLE_HOST_ENV.DESCRIPTION] = answers.description;
-  }
-  if (answers.jumpHost != null) {
-    env[SINGLE_HOST_ENV.JUMP_HOST] = answers.jumpHost;
-    if (answers.jumpPort != null && answers.jumpPort !== DEFAULT_SSH_PORT) {
-      env[SINGLE_HOST_ENV.JUMP_PORT] = String(answers.jumpPort);
+function groupLabelWidths(items) {
+  const widths = items.map(() => 0);
+  let groupStart = 0;
+  for (let index = 0; index <= items.length; index += 1) {
+    const atBoundary = index === items.length || "value" in items[index] == false;
+    if (atBoundary == false) {
+      continue;
     }
-    if (answers.jumpUser != null && answers.jumpUser !== answers.username) {
-      env[SINGLE_HOST_ENV.JUMP_USER] = answers.jumpUser;
+    let groupWidth = 0;
+    for (let member = groupStart; member < index; member += 1) {
+      const item = items[member];
+      groupWidth = Math.max(groupWidth, displayWidth(item.label));
     }
-    if (answers.jumpHostKeyFingerprint != null) {
-      env[SINGLE_HOST_ENV.JUMP_HOST_KEY] = answers.jumpHostKeyFingerprint;
+    for (let member = groupStart; member < index; member += 1) {
+      widths[member] = groupWidth;
     }
+    groupStart = index + 1;
   }
-  if (answers.proxyCommand != null && answers.proxyCommand !== "") {
-    env[SINGLE_HOST_ENV.PROXY_COMMAND] = answers.proxyCommand;
-  }
-  if (answers.readonly == true) {
-    env[SINGLE_HOST_ENV.READONLY] = "true";
-  }
-  if (answers.allowedPaths.length > 0) {
-    env[SINGLE_HOST_ENV.ALLOWED_PATHS] = answers.allowedPaths.join(",");
-  }
-  for (const [name, value] of Object.entries(answers.extraEnv)) {
-    if (MANAGED_ENV_NAMES.includes(name) == true) {
-      continue;
-    }
-    if (answers.jumpHost == null && name.startsWith(JUMP_ENV_PREFIX) == true) {
-      continue;
-    }
-    env[name] = value;
+  return widths;
+}
+function supportsUnicode() {
+  if (process.platform !== "win32") {
+    return true;
   }
-  const launch = launchCommand();
-  return {
-    command: launch.command,
-    args: launch.args,
-    env
-  };
-}
-function readPort(value) {
-  if (value == null) {
-    return DEFAULT_SSH_PORT;
-  }
-  const parsed = Number(value);
-  if (Number.isInteger(parsed) == false || parsed <= 0) {
-    return DEFAULT_SSH_PORT;
-  }
-  return parsed;
-}
-function isTruthy(value) {
-  if (value == null) {
-    return false;
-  }
-  return TRUTHY_ENV_VALUES.includes(value.trim().toLowerCase());
-}
-function entryToAnswers(name, entry) {
-  const env = entry.env;
-  const host = env[SINGLE_HOST_ENV.HOST] ?? "";
-  const username = env[SINGLE_HOST_ENV.USER] ?? "";
-  let auth = "agent";
-  if (env[SINGLE_HOST_ENV.KEY] != null) {
-    auth = "key";
-  } else if (env[SINGLE_HOST_ENV.PASSWORD] != null) {
-    auth = "password";
-  }
-  let allowedPaths = [];
-  const allowedPathsValue = env[SINGLE_HOST_ENV.ALLOWED_PATHS];
-  if (allowedPathsValue != null) {
-    allowedPaths = allowedPathsValue.split(",").map((item) => item.trim()).filter((item) => item !== "");
-  }
-  const extraEnv = {};
-  for (const [variable, value] of Object.entries(env)) {
-    if (MANAGED_ENV_NAMES.includes(variable) == false) {
-      extraEnv[variable] = value;
-    }
-  }
-  const answers = {
-    name,
-    host,
-    port: readPort(env[SINGLE_HOST_ENV.PORT]),
-    username,
-    auth,
-    keyPath: env[SINGLE_HOST_ENV.KEY],
-    passphrase: env[SINGLE_HOST_ENV.PASSPHRASE],
-    password: env[SINGLE_HOST_ENV.PASSWORD],
-    description: env[SINGLE_HOST_ENV.DESCRIPTION],
-    proxyCommand: env[SINGLE_HOST_ENV.PROXY_COMMAND],
-    readonly: isTruthy(env[SINGLE_HOST_ENV.READONLY]),
-    allowedPaths,
-    hostKeyFingerprint: env[SINGLE_HOST_ENV.HOST_KEY],
-    extraEnv
-  };
-  const jumpHost = env[SINGLE_HOST_ENV.JUMP_HOST];
-  if (jumpHost != null) {
-    answers.jumpHost = jumpHost;
-    answers.jumpPort = readPort(env[SINGLE_HOST_ENV.JUMP_PORT]);
-    answers.jumpUser = env[SINGLE_HOST_ENV.JUMP_USER] ?? username;
-    answers.jumpHostKeyFingerprint = env[SINGLE_HOST_ENV.JUMP_HOST_KEY];
-  }
-  return answers;
-}
-function summarizeEntry(entry) {
-  const env = entry.env;
-  const host = env[SINGLE_HOST_ENV.HOST] ?? "?";
-  const port = env[SINGLE_HOST_ENV.PORT] ?? String(DEFAULT_SSH_PORT);
-  const username = env[SINGLE_HOST_ENV.USER] ?? "?";
-  let auth = "agent";
-  if (env[SINGLE_HOST_ENV.KEY] != null) {
-    auth = "key";
-  } else if (env[SINGLE_HOST_ENV.PASSWORD] != null) {
-    auth = "password";
-  }
-  const notes = [];
-  if (env[SINGLE_HOST_ENV.JUMP_HOST] != null) {
-    notes.push(`jump ${env[SINGLE_HOST_ENV.JUMP_HOST]}`);
-  }
-  if (env[SINGLE_HOST_ENV.PROXY_COMMAND] != null) {
-    notes.push("proxy");
-  }
-  if (isTruthy(env[SINGLE_HOST_ENV.READONLY]) == true) {
-    notes.push("readonly");
-  }
-  if (env[SINGLE_HOST_ENV.ALLOWED_PATHS] != null) {
-    notes.push(`paths ${env[SINGLE_HOST_ENV.ALLOWED_PATHS]}`);
-  }
-  if (env[SINGLE_HOST_ENV.HOST_KEY] != null) {
-    notes.push("pinned");
-  }
-  return {
-    endpoint: `${username}@${host}:${port}`,
-    auth,
-    notes: notes.join(", ")
-  };
-}
-
-// src/modules/manage/prompter.ts
-var PromptClosedError = class extends Error {
-  constructor() {
-    super("input closed before the prompt was answered");
-    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`];
-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;
-  while (index < chunk.length) {
-    const isSequence = chunk[index] === ESC && (chunk[index + 1] === "[" || chunk[index + 1] === "O");
-    if (isSequence == true) {
-      let end = index + 2;
-      while (end < chunk.length && /[0-9;]/.test(chunk[end]) == true) {
-        end += 1;
-      }
-      keys.push(chunk.slice(index, end + 1));
-      index = end + 1;
-      continue;
-    }
-    const codePoint = chunk.codePointAt(index) ?? 0;
-    const character = String.fromCodePoint(codePoint);
-    keys.push(character);
-    index += character.length;
-  }
-  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;
-  }
-  const isWide = codePoint <= 4447 || codePoint === 9001 || codePoint === 9002 || codePoint >= 11904 && codePoint <= 42191 && codePoint !== 12351 || codePoint >= 44032 && codePoint <= 55203 || codePoint >= 63744 && codePoint <= 64255 || codePoint >= 65072 && codePoint <= 65103 || codePoint >= 65280 && codePoint <= 65376 || codePoint >= 65504 && codePoint <= 65510 || codePoint >= 127744 && codePoint <= 128591 || codePoint >= 129280 && codePoint <= 129535 || codePoint >= 131072 && codePoint <= 262141;
-  if (isWide == true) {
-    return 2;
-  }
-  return 1;
-}
-function displayWidth(text) {
-  let width = 0;
-  for (const character of text) {
-    width += charWidth(character.codePointAt(0) ?? 0);
-  }
-  return width;
-}
-function padToWidth(text, width) {
-  const missing = width - displayWidth(text);
-  if (missing <= 0) {
-    return text;
-  }
-  return `${text}${" ".repeat(missing)}`;
-}
-function groupLabelWidths(items) {
-  const widths = items.map(() => 0);
-  let groupStart = 0;
-  for (let index = 0; index <= items.length; index += 1) {
-    const atBoundary = index === items.length || "value" in items[index] == false;
-    if (atBoundary == false) {
-      continue;
-    }
-    let groupWidth = 0;
-    for (let member = groupStart; member < index; member += 1) {
-      const item = items[member];
-      groupWidth = Math.max(groupWidth, displayWidth(item.label));
-    }
-    for (let member = groupStart; member < index; member += 1) {
-      widths[member] = groupWidth;
-    }
-    groupStart = index + 1;
-  }
-  return widths;
-}
-function supportsUnicode() {
-  if (process.platform !== "win32") {
-    return true;
-  }
-  return process.env.WT_SESSION != null || process.env.TERM_PROGRAM === "vscode" || process.env.TERMINAL_EMULATOR === "JetBrains-JediTerm" || process.env.ConEmuTask != null;
+  return process.env.WT_SESSION != null || process.env.TERM_PROGRAM === "vscode" || process.env.TERMINAL_EMULATOR === "JetBrains-JediTerm" || process.env.ConEmuTask != null;
 }
 function createStyle(enabled) {
   const paint = (open, close) => {
@@ -2811,6 +2550,17 @@ var Prompter = class {
   get paint() {
     return this.style;
   }
+  /** Keeps a report visible until Enter on a TTY; Esc goes back. Pipes need no extra answer. */
+  async pause() {
+    if (this.interactive == false) {
+      return;
+    }
+    if (this.inputEnded == true) {
+      throw new PromptClosedError();
+    }
+    const prompt = this.fitLine([{ text: "Press Enter to continue", paint: this.style.dim }], this.columns() - 1);
+    await this.readText(prompt, false);
+  }
   /**
    * Free-text prompt. Enter accepts `defaultValue` when one is shown.
    *
@@ -3117,148 +2867,519 @@ var Prompter = class {
     if (columns == null || columns < 20) {
       return 80;
     }
-    return columns;
+    return columns;
+  }
+  /** Joins styled parts, cutting the text (not the styles) once `width` columns are used. */
+  fitLine(parts, width) {
+    let used = 0;
+    let line = "";
+    for (const part of parts) {
+      let text = "";
+      for (const character of part.text) {
+        const characterWidth = charWidth(character.codePointAt(0) ?? 0);
+        if (used + characterWidth > width) {
+          break;
+        }
+        used += characterWidth;
+        text += character;
+      }
+      if (part.paint != null) {
+        line += part.paint(text);
+      } else {
+        line += text;
+      }
+      if (used >= width) {
+        break;
+      }
+    }
+    return line;
+  }
+  /** The one-line record an answered prompt leaves behind on a TTY. */
+  writeAnswered(question, answer) {
+    if (this.interactive == false || this.transient == true) {
+      return;
+    }
+    this.output.write(`${this.style.success(this.symbols.tick)} ${question} ${this.style.dim("\xB7")} ${this.style.accent(answer)}
+`);
+  }
+  /** @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) {
+        return [index];
+      }
+      return [];
+    });
+    const labelWidths = groupLabelWidths(items);
+    const ruleWidth = Math.min(Math.max(...labelWidths), 24);
+    let active = startIndex;
+    let renderedLines = 0;
+    const draw = (lines) => {
+      let text = "";
+      if (renderedLines > 1) {
+        text += `${ESC}[${renderedLines - 1}A`;
+      }
+      text += `\r${ESC}[J${lines.join("\n")}`;
+      this.output.write(text);
+      renderedLines = lines.length;
+    };
+    const buildLines = () => {
+      const width = this.columns() - 1;
+      const lines = [
+        this.fitLine([
+          { text: this.symbols.question, paint: this.style.accent },
+          { text: " " },
+          { text: question, paint: this.style.bold }
+        ], width)
+      ];
+      for (let index = 0; index < items.length; index += 1) {
+        const item = items[index];
+        if ("value" in item == false) {
+          lines.push(this.fitLine([{ text: `  ${this.symbols.rule.repeat(ruleWidth)}`, paint: this.style.dim }], width));
+          continue;
+        }
+        const isActive = index === active;
+        const parts = [];
+        if (isActive == true) {
+          parts.push({ text: `${this.symbols.pointer} `, paint: this.style.accent });
+          parts.push({ text: padToWidth(item.label, labelWidths[index]), paint: this.style.accent });
+        } else {
+          parts.push({ text: "  " });
+          parts.push({ text: padToWidth(item.label, labelWidths[index]) });
+        }
+        if (item.hint != null && item.hint !== "") {
+          parts.push({ text: `  ${item.hint}`, paint: this.style.dim });
+        }
+        lines.push(this.fitLine(parts, 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) => {
+      const position = selectableIndexes.indexOf(active);
+      const next = (position + step + selectableIndexes.length) % selectableIndexes.length;
+      active = selectableIndexes[next];
+    };
+    return new Promise((resolve, reject) => {
+      const finish = () => {
+        this.keyHandler = null;
+        ttyInput.setRawMode?.(false);
+        draw([]);
+        this.output.write(`${ESC}[?25h`);
+      };
+      this.keyHandler = (key) => {
+        if (key === KEY_CTRL_C || key === KEY_CTRL_D) {
+          finish();
+          reject(new PromptClosedError());
+          return;
+        }
+        if (KEY_ENTER.includes(key) == true) {
+          const picked = items[active];
+          finish();
+          this.writeAnswered(question, picked.label);
+          resolve(picked.value);
+          return;
+        }
+        if (key === ESC) {
+          finish();
+          resolve(null);
+          return;
+        }
+        if (KEY_UP.includes(key) == true) {
+          move(-1);
+        } else if (KEY_DOWN.includes(key) == true) {
+          move(1);
+        } else if (KEY_HOME.includes(key) == true) {
+          active = selectableIndexes[0];
+        } else if (KEY_END.includes(key) == true) {
+          active = selectableIndexes[selectableIndexes.length - 1];
+        } else if (/^[1-9]$/.test(key) == true && Number(key) <= selectableIndexes.length) {
+          active = selectableIndexes[Number(key) - 1];
+        } else {
+          return;
+        }
+        draw(buildLines());
+      };
+      ttyInput.setRawMode?.(true);
+      this.output.write(`${ESC}[?25l`);
+      draw(buildLines());
+    });
+  }
+};
+
+// src/modules/manage/check-progress.ts
+var ESC2 = "\x1B";
+var CheckProgress = class {
+  constructor(output) {
+    this.output = output;
+    this.unicode = supportsUnicode();
+    this.frames = this.unicode ? ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"] : ["-", "\\", "|", "/"];
+    this.timer = null;
+    this.label = null;
+    this.startedAt = 0;
+    this.frame = 0;
+    this.enabled = output.isTTY === true && process.env.TERM !== "dumb";
+    this.color = process.env.NO_COLOR == null;
+  }
+  /** Advancing means the preceding phase actually completed successfully. */
+  start(label) {
+    if (this.enabled == false) {
+      return;
+    }
+    this.finish(true);
+    this.label = label;
+    this.startedAt = Date.now();
+    this.frame = 0;
+    this.draw(this.frames[0], 36);
+    this.timer = setInterval(() => {
+      this.frame = (this.frame + 1) % this.frames.length;
+      this.draw(this.frames[this.frame], 36);
+    }, 80);
+    this.timer.unref();
+  }
+  /** Leaves the completed phase and its duration visible. */
+  finish(ok) {
+    if (this.label == null) {
+      return;
+    }
+    this.clearTimer();
+    const symbol = ok ? this.unicode ? "\u2714" : "OK" : this.unicode ? "\u2716" : "X";
+    this.draw(symbol, ok ? 32 : 31);
+    this.output.write("\n");
+    this.label = null;
+  }
+  /** Clears an unfinished phase without recording a result. */
+  stop() {
+    this.clearTimer();
+    if (this.label != null) {
+      this.output.write(`\r${ESC2}[2K`);
+      this.label = null;
+    }
+  }
+  clearTimer() {
+    if (this.timer != null) {
+      clearInterval(this.timer);
+      this.timer = null;
+    }
+  }
+  draw(symbol, color) {
+    const columns = this.output.columns;
+    const width = Math.max(0, (columns != null && columns > 0 ? columns : 80) - 1);
+    const elapsed = `  ${((Date.now() - this.startedAt) / 1e3).toFixed(1)}s`;
+    const prefix = `  ${symbol} `;
+    const labelWidth = Math.min(48, Math.max(0, width - displayWidth(prefix) - displayWidth(elapsed)));
+    const label = this.fit(this.label ?? "", labelWidth);
+    const line = this.fit(`${prefix}${label}${" ".repeat(labelWidth - displayWidth(label))}${elapsed}`, width);
+    const painted = this.color ? `${ESC2}[${color}m${line}${ESC2}[39m` : line;
+    this.output.write(`\r${ESC2}[2K${painted}`);
+  }
+  fit(text, width) {
+    if (displayWidth(text) <= width) {
+      return text;
+    }
+    if (width < 1) {
+      return "";
+    }
+    let result = "";
+    let used = 0;
+    for (const character of text) {
+      const size = displayWidth(character);
+      if (used + size > width - 1) {
+        break;
+      }
+      result += character;
+      used += size;
+    }
+    return `${result}${this.unicode ? "\u2026" : "~"}`;
+  }
+};
+
+// 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}`;
+  }
+  if (profile.password != null) {
+    return "password";
+  }
+  return "ssh agent";
+}
+async function runConnectionCheck(profile, output) {
+  const endpoint = `${profile.username}@${profile.host}:${profile.port}`;
+  const auth = describeAuth(profile);
+  output.write(`Checking ${profile.name}  \u2192  ${endpoint}
+`);
+  if (profile.proxyCommand != null) {
+    output.write(`  via proxy command: ${profile.proxyCommand}
+`);
+  }
+  if (profile.jump != null) {
+    output.write(`  via jump host: ${profile.jump.username}@${profile.jump.host}:${profile.jump.port}
+`);
+  }
+  output.write("\n");
+  const connection = new SshConnection(profile);
+  const progress = new CheckProgress(output);
+  const startedAt = Date.now();
+  let connected = false;
+  let detail = "";
+  try {
+    progress.start("Preparing SSH connection");
+    await connection.connect((stage) => {
+      if (stage === "transport") {
+        progress.start(profile.jump != null ? "Jump host connection and forwarding" : "Starting proxy connection");
+      } else {
+        progress.start("SSH handshake and authentication");
+      }
+    });
+    connected = true;
+  } catch (ex) {
+    detail = String(ex);
+    if (ex instanceof Error) {
+      detail = ex.message;
+    }
+  } finally {
+    progress.finish(connected);
+    connection.disconnect();
+  }
+  const durationMs = Date.now() - startedAt;
+  if (connected == true) {
+    output.write(`  OK      ${endpoint}  (${auth}, ${durationMs}ms)
+`);
+  } else {
+    output.write(`  FAILED  ${endpoint}  (${auth})
+`);
+    output.write(`          ${detail}
+`);
+  }
+  if (connection.hostKeyFingerprint != null) {
+    let pinNote = `not pinned \u2014 set ${SINGLE_HOST_ENV.HOST_KEY} to it to detect a changed key`;
+    if (profile.hostKeyFingerprint != null) {
+      pinNote = "pinned";
+    }
+    output.write(`          host key ${connection.hostKeyFingerprint}  (${pinNote})
+`);
+  }
+  if (connection.jumpHostKeyFingerprint != null) {
+    let pinNote = `not pinned \u2014 set ${SINGLE_HOST_ENV.JUMP_HOST_KEY} to it to detect a changed key`;
+    if (profile.jump?.hostKeyFingerprint != null) {
+      pinNote = "pinned";
+    }
+    output.write(`          jump host key ${connection.jumpHostKeyFingerprint}  (${pinNote})
+`);
+  }
+  return {
+    connected,
+    hostKeyFingerprint: connection.hostKeyFingerprint,
+    jumpHostKeyFingerprint: connection.jumpHostKeyFingerprint
+  };
+}
+
+// src/modules/manage/entry.ts
+var MANAGED_ENV_NAMES = [
+  SINGLE_HOST_ENV.HOST,
+  SINGLE_HOST_ENV.PORT,
+  SINGLE_HOST_ENV.USER,
+  SINGLE_HOST_ENV.KEY,
+  SINGLE_HOST_ENV.PASSPHRASE,
+  SINGLE_HOST_ENV.PASSWORD,
+  SINGLE_HOST_ENV.DESCRIPTION,
+  SINGLE_HOST_ENV.JUMP_HOST,
+  SINGLE_HOST_ENV.JUMP_PORT,
+  SINGLE_HOST_ENV.JUMP_USER,
+  SINGLE_HOST_ENV.PROXY_COMMAND,
+  SINGLE_HOST_ENV.READONLY,
+  SINGLE_HOST_ENV.ALLOWED_PATHS,
+  SINGLE_HOST_ENV.HOST_KEY,
+  SINGLE_HOST_ENV.JUMP_HOST_KEY
+];
+var JUMP_ENV_PREFIX = "SSH_JUMP_";
+var SERVER_NAME_PATTERN = /^[A-Za-z0-9_-]{1,48}$/;
+function isOurEntry(entry) {
+  if (entry.args.includes(PACKAGE_NAME) == true) {
+    return true;
+  }
+  const commandBase = entry.command.replace(/\\/g, "/").split("/").pop() ?? "";
+  return commandBase === SERVER_NAME || commandBase.startsWith(`${SERVER_NAME}.`) == true;
+}
+function launchCommand() {
+  if (process.platform === "win32") {
+    return { command: "cmd", args: ["/c", "npx", "-y", PACKAGE_NAME] };
+  }
+  return { command: "npx", args: ["-y", PACKAGE_NAME] };
+}
+function answersToEntry(answers) {
+  const env = {};
+  env[SINGLE_HOST_ENV.HOST] = answers.host;
+  if (answers.port !== DEFAULT_SSH_PORT) {
+    env[SINGLE_HOST_ENV.PORT] = String(answers.port);
+  }
+  env[SINGLE_HOST_ENV.USER] = answers.username;
+  if (answers.auth === "key" && answers.keyPath != null) {
+    env[SINGLE_HOST_ENV.KEY] = answers.keyPath;
+    if (answers.passphrase != null && answers.passphrase !== "") {
+      env[SINGLE_HOST_ENV.PASSPHRASE] = answers.passphrase;
+    }
+  }
+  if (answers.auth === "password" && answers.password != null) {
+    env[SINGLE_HOST_ENV.PASSWORD] = answers.password;
+  }
+  if (answers.hostKeyFingerprint != null) {
+    env[SINGLE_HOST_ENV.HOST_KEY] = answers.hostKeyFingerprint;
+  }
+  if (answers.description != null && answers.description !== "") {
+    env[SINGLE_HOST_ENV.DESCRIPTION] = answers.description;
+  }
+  if (answers.jumpHost != null) {
+    env[SINGLE_HOST_ENV.JUMP_HOST] = answers.jumpHost;
+    if (answers.jumpPort != null && answers.jumpPort !== DEFAULT_SSH_PORT) {
+      env[SINGLE_HOST_ENV.JUMP_PORT] = String(answers.jumpPort);
+    }
+    if (answers.jumpUser != null && answers.jumpUser !== answers.username) {
+      env[SINGLE_HOST_ENV.JUMP_USER] = answers.jumpUser;
+    }
+    if (answers.jumpHostKeyFingerprint != null) {
+      env[SINGLE_HOST_ENV.JUMP_HOST_KEY] = answers.jumpHostKeyFingerprint;
+    }
   }
-  /** Joins styled parts, cutting the text (not the styles) once `width` columns are used. */
-  fitLine(parts, width) {
-    let used = 0;
-    let line = "";
-    for (const part of parts) {
-      let text = "";
-      for (const character of part.text) {
-        const characterWidth = charWidth(character.codePointAt(0) ?? 0);
-        if (used + characterWidth > width) {
-          break;
-        }
-        used += characterWidth;
-        text += character;
-      }
-      if (part.paint != null) {
-        line += part.paint(text);
-      } else {
-        line += text;
-      }
-      if (used >= width) {
-        break;
-      }
+  if (answers.proxyCommand != null && answers.proxyCommand !== "") {
+    env[SINGLE_HOST_ENV.PROXY_COMMAND] = answers.proxyCommand;
+  }
+  if (answers.readonly == true) {
+    env[SINGLE_HOST_ENV.READONLY] = "true";
+  }
+  if (answers.allowedPaths.length > 0) {
+    env[SINGLE_HOST_ENV.ALLOWED_PATHS] = answers.allowedPaths.join(",");
+  }
+  for (const [name, value] of Object.entries(answers.extraEnv)) {
+    if (MANAGED_ENV_NAMES.includes(name) == true) {
+      continue;
     }
-    return line;
+    if (answers.jumpHost == null && name.startsWith(JUMP_ENV_PREFIX) == true) {
+      continue;
+    }
+    env[name] = value;
   }
-  /** The one-line record an answered prompt leaves behind on a TTY. */
-  writeAnswered(question, answer) {
-    if (this.interactive == false || this.transient == true) {
-      return;
+  const launch = launchCommand();
+  return {
+    command: launch.command,
+    args: launch.args,
+    env
+  };
+}
+function readPort(value) {
+  if (value == null) {
+    return DEFAULT_SSH_PORT;
+  }
+  const parsed = Number(value);
+  if (Number.isInteger(parsed) == false || parsed <= 0) {
+    return DEFAULT_SSH_PORT;
+  }
+  return parsed;
+}
+function isTruthy(value) {
+  if (value == null) {
+    return false;
+  }
+  return TRUTHY_ENV_VALUES.includes(value.trim().toLowerCase());
+}
+function entryToAnswers(name, entry) {
+  const env = entry.env;
+  const host = env[SINGLE_HOST_ENV.HOST] ?? "";
+  const username = env[SINGLE_HOST_ENV.USER] ?? "";
+  let auth = "agent";
+  if (env[SINGLE_HOST_ENV.KEY] != null) {
+    auth = "key";
+  } else if (env[SINGLE_HOST_ENV.PASSWORD] != null) {
+    auth = "password";
+  }
+  let allowedPaths = [];
+  const allowedPathsValue = env[SINGLE_HOST_ENV.ALLOWED_PATHS];
+  if (allowedPathsValue != null) {
+    allowedPaths = allowedPathsValue.split(",").map((item) => item.trim()).filter((item) => item !== "");
+  }
+  const extraEnv = {};
+  for (const [variable, value] of Object.entries(env)) {
+    if (MANAGED_ENV_NAMES.includes(variable) == false) {
+      extraEnv[variable] = value;
     }
-    this.output.write(`${this.style.success(this.symbols.tick)} ${question} ${this.style.dim("\xB7")} ${this.style.accent(answer)}
-`);
   }
-  /** @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) {
-        return [index];
-      }
-      return [];
-    });
-    const labelWidths = groupLabelWidths(items);
-    const ruleWidth = Math.min(Math.max(...labelWidths), 24);
-    let active = startIndex;
-    let renderedLines = 0;
-    const draw = (lines) => {
-      let text = "";
-      if (renderedLines > 1) {
-        text += `${ESC}[${renderedLines - 1}A`;
-      }
-      text += `\r${ESC}[J${lines.join("\n")}`;
-      this.output.write(text);
-      renderedLines = lines.length;
-    };
-    const buildLines = () => {
-      const width = this.columns() - 1;
-      const lines = [
-        this.fitLine([
-          { text: this.symbols.question, paint: this.style.accent },
-          { text: " " },
-          { text: question, paint: this.style.bold }
-        ], width)
-      ];
-      for (let index = 0; index < items.length; index += 1) {
-        const item = items[index];
-        if ("value" in item == false) {
-          lines.push(this.fitLine([{ text: `  ${this.symbols.rule.repeat(ruleWidth)}`, paint: this.style.dim }], width));
-          continue;
-        }
-        const isActive = index === active;
-        const parts = [];
-        if (isActive == true) {
-          parts.push({ text: `${this.symbols.pointer} `, paint: this.style.accent });
-          parts.push({ text: padToWidth(item.label, labelWidths[index]), paint: this.style.accent });
-        } else {
-          parts.push({ text: "  " });
-          parts.push({ text: padToWidth(item.label, labelWidths[index]) });
-        }
-        if (item.hint != null && item.hint !== "") {
-          parts.push({ text: `  ${item.hint}`, paint: this.style.dim });
-        }
-        lines.push(this.fitLine(parts, 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) => {
-      const position = selectableIndexes.indexOf(active);
-      const next = (position + step + selectableIndexes.length) % selectableIndexes.length;
-      active = selectableIndexes[next];
-    };
-    return new Promise((resolve, reject) => {
-      const finish = () => {
-        this.keyHandler = null;
-        ttyInput.setRawMode?.(false);
-        draw([]);
-        this.output.write(`${ESC}[?25h`);
-      };
-      this.keyHandler = (key) => {
-        if (key === KEY_CTRL_C || key === KEY_CTRL_D) {
-          finish();
-          reject(new PromptClosedError());
-          return;
-        }
-        if (KEY_ENTER.includes(key) == true) {
-          const picked = items[active];
-          finish();
-          this.writeAnswered(question, picked.label);
-          resolve(picked.value);
-          return;
-        }
-        if (key === ESC) {
-          finish();
-          resolve(null);
-          return;
-        }
-        if (KEY_UP.includes(key) == true) {
-          move(-1);
-        } else if (KEY_DOWN.includes(key) == true) {
-          move(1);
-        } else if (KEY_HOME.includes(key) == true) {
-          active = selectableIndexes[0];
-        } else if (KEY_END.includes(key) == true) {
-          active = selectableIndexes[selectableIndexes.length - 1];
-        } else if (/^[1-9]$/.test(key) == true && Number(key) <= selectableIndexes.length) {
-          active = selectableIndexes[Number(key) - 1];
-        } else {
-          return;
-        }
-        draw(buildLines());
-      };
-      ttyInput.setRawMode?.(true);
-      this.output.write(`${ESC}[?25l`);
-      draw(buildLines());
-    });
+  const answers = {
+    name,
+    host,
+    port: readPort(env[SINGLE_HOST_ENV.PORT]),
+    username,
+    auth,
+    keyPath: env[SINGLE_HOST_ENV.KEY],
+    passphrase: env[SINGLE_HOST_ENV.PASSPHRASE],
+    password: env[SINGLE_HOST_ENV.PASSWORD],
+    description: env[SINGLE_HOST_ENV.DESCRIPTION],
+    proxyCommand: env[SINGLE_HOST_ENV.PROXY_COMMAND],
+    readonly: isTruthy(env[SINGLE_HOST_ENV.READONLY]),
+    allowedPaths,
+    hostKeyFingerprint: env[SINGLE_HOST_ENV.HOST_KEY],
+    extraEnv
+  };
+  const jumpHost = env[SINGLE_HOST_ENV.JUMP_HOST];
+  if (jumpHost != null) {
+    answers.jumpHost = jumpHost;
+    answers.jumpPort = readPort(env[SINGLE_HOST_ENV.JUMP_PORT]);
+    answers.jumpUser = env[SINGLE_HOST_ENV.JUMP_USER] ?? username;
+    answers.jumpHostKeyFingerprint = env[SINGLE_HOST_ENV.JUMP_HOST_KEY];
   }
-};
-
-// src/modules/manage/host-form.ts
+  return answers;
+}
+function summarizeEntry(entry) {
+  const env = entry.env;
+  const host = env[SINGLE_HOST_ENV.HOST] ?? "?";
+  const port = env[SINGLE_HOST_ENV.PORT] ?? String(DEFAULT_SSH_PORT);
+  const username = env[SINGLE_HOST_ENV.USER] ?? "?";
+  let auth = "agent";
+  if (env[SINGLE_HOST_ENV.KEY] != null) {
+    auth = "key";
+  } else if (env[SINGLE_HOST_ENV.PASSWORD] != null) {
+    auth = "password";
+  }
+  const notes = [];
+  if (env[SINGLE_HOST_ENV.JUMP_HOST] != null) {
+    notes.push(`jump ${env[SINGLE_HOST_ENV.JUMP_HOST]}`);
+  }
+  if (env[SINGLE_HOST_ENV.PROXY_COMMAND] != null) {
+    notes.push("proxy");
+  }
+  if (isTruthy(env[SINGLE_HOST_ENV.READONLY]) == true) {
+    notes.push("readonly");
+  }
+  if (env[SINGLE_HOST_ENV.ALLOWED_PATHS] != null) {
+    notes.push(`paths ${env[SINGLE_HOST_ENV.ALLOWED_PATHS]}`);
+  }
+  if (env[SINGLE_HOST_ENV.HOST_KEY] != null) {
+    notes.push("pinned");
+  }
+  return {
+    endpoint: `${username}@${host}:${port}`,
+    auth,
+    notes: notes.join(", ")
+  };
+}
 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;
@@ -3614,10 +3735,12 @@ async function testConnection(prompter, output, state) {
   if (profile == null) {
     output.write("\n");
     state.lastTest = "failed";
+    await prompter.pause();
     return false;
   }
   const result = await runConnectionCheck(profile, output);
   output.write("\n");
+  await prompter.pause();
   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);
@@ -4726,10 +4849,12 @@ async function checkHost(prompter, output, target, name, entry) {
   const profile = profileFromEnv(output, entry.env);
   if (profile == null) {
     output.write("\n");
+    await prompter.pause();
     return;
   }
   const result = await runConnectionCheck(profile, output);
   output.write("\n");
+  await prompter.pause();
   if (result.connected == false) {
     return;
   }
@@ -5765,6 +5890,12 @@ async function main() {
     instance.shutdown();
     process.exit(exitCode);
   }
+  process.on("uncaughtException", (error) => {
+    _logger.error(error, "uncaught exception; the server keeps running");
+  });
+  process.on("unhandledRejection", (reason) => {
+    _logger.error(reason, "unhandled rejection; the server keeps running");
+  });
   let shuttingDown = false;
   const shutdown = (signal) => {
     if (shuttingDown == true) {
@@ -5772,6 +5903,10 @@ async function main() {
     }
     shuttingDown = true;
     _logger.info("shutting down", { signal });
+    setTimeout(() => {
+      _logger.warn("shutdown did not finish in time; exiting anyway", { deadline_ms: SHUTDOWN_DEADLINE_MS });
+      process.exit(0);
+    }, SHUTDOWN_DEADLINE_MS).unref();
     instance.shutdown();
     void instance.server.close().finally(() => {
       process.exit(0);
@@ -5791,7 +5926,8 @@ async function main() {
   _logger.info("mcp server ready on stdio", {
     server: SERVER_NAME,
     version: SERVER_VERSION,
-    profile: instance.profile?.name ?? null
+    profile: instance.profile?.name ?? null,
+    pid: process.pid
   });
 }
 main().catch((error) => {