@akms/mcp-ssh 0.0.2 → 0.1.0

package/lib/cli.js

@@ -1,9 +1,11 @@
 #!/usr/bin/env node
 import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
-import os from 'os';
-import path2 from 'path';
+import fs7 from 'fs';
+import os4 from 'os';
+import path from 'path';
+import { spawnSync, spawn } from 'child_process';
 import { createHash } from 'crypto';
-import fs from 'fs';
+import { Duplex } from 'stream';
 import { StringDecoder } from 'string_decoder';
 import ssh2 from 'ssh2';
 import { setInterval, clearInterval } from 'timers';
@@ -23,7 +25,8 @@ var SESSION_SWEEP_INTERVAL_MS = 6e4;
 var CWD_MARKER = "__AKMS_SSH_CWD__";
 var MAX_DIRECTORY_ENTRIES = 1e3;
 var SERVER_NAME = "akms-mcp-ssh";
-var SERVER_VERSION = "0.0.2";
+var PACKAGE_NAME = "@akms/mcp-ssh";
+var SERVER_VERSION = "0.1.0";
 
 // src/_defs/command-rules.ts
 var CRITICAL_PATH_PATTERN = new RegExp(
@@ -445,6 +448,22 @@ var SINGLE_HOST_ENV = {
   DESCRIPTION: "SSH_DESCRIPTION",
   /** Directory new sessions start in. */
   CWD: "SSH_CWD",
+  /**
+   * Command whose stdin/stdout carry the SSH stream, like OpenSSH's `ProxyCommand`.
+   * `%h` / `%p` / `%r` expand to the first hop's host, port and user.
+   */
+  PROXY_COMMAND: "SSH_PROXY_COMMAND",
+  /** Presence of this variable routes the connection through a jump host. */
+  JUMP_HOST: "SSH_JUMP_HOST",
+  JUMP_PORT: "SSH_JUMP_PORT",
+  /** Defaults to `SSH_USER`. */
+  JUMP_USER: "SSH_JUMP_USER",
+  /** Path to the jump host's private key file; defaults to `SSH_KEY`. */
+  JUMP_KEY: "SSH_JUMP_KEY",
+  JUMP_PASSPHRASE: "SSH_JUMP_PASSPHRASE",
+  JUMP_PASSWORD: "SSH_JUMP_PASSWORD",
+  /** Pinned jump host key, `SHA256:…`. */
+  JUMP_HOST_KEY: "SSH_JUMP_HOST_KEY",
   READONLY: "SSH_READONLY",
   ALLOW_SUDO: "SSH_ALLOW_SUDO",
   /** Comma-separated binary names. */
@@ -571,20 +590,38 @@ function formatBytes(bytes) {
   const megabytes = bytes / (1024 * 1024);
   return `${megabytes.toFixed(1)} MB`;
 }
+function findExecutable(name) {
+  const searchPath = process.env.PATH ?? "";
+  const directories = searchPath.split(path.delimiter).filter((directory) => directory !== "");
+  let suffixes = [""];
+  if (process.platform === "win32") {
+    const pathExt = process.env.PATHEXT ?? ".COM;.EXE;.BAT;.CMD";
+    suffixes = pathExt.split(";").filter((suffix) => suffix !== "");
+  }
+  for (const directory of directories) {
+    for (const suffix of suffixes) {
+      const candidate = path.join(directory, `${name}${suffix}`);
+      if (fs7.existsSync(candidate) == true && fs7.statSync(candidate).isFile() == true) {
+        return candidate;
+      }
+    }
+  }
+  return null;
+}
 function expandHomePath(inputPath) {
   let expanded = inputPath;
   if (inputPath === "~") {
-    expanded = os.homedir();
+    expanded = os4.homedir();
   } else if (inputPath.startsWith("~/") == true || inputPath.startsWith("~\\") == true) {
-    expanded = path2.join(os.homedir(), inputPath.slice(2));
+    expanded = path.join(os4.homedir(), inputPath.slice(2));
   }
-  return path2.resolve(expanded);
+  return path.resolve(expanded);
 }
 function isAbsoluteRemotePath(remotePath) {
   return remotePath.startsWith("/");
 }
 function normalizeRemotePath(remotePath) {
-  return path2.posix.normalize(remotePath);
+  return path.posix.normalize(remotePath);
 }
 function isRemotePathWithin(candidate, allowedPrefix) {
   const normalizedCandidate = normalizeRemotePath(candidate);
@@ -597,6 +634,195 @@ function isRemotePathWithin(candidate, allowedPrefix) {
   }
   return normalizedCandidate.startsWith(`${normalizedPrefix}/`);
 }
+function readEnv(env, name) {
+  const value = env[name];
+  if (value == null) {
+    return void 0;
+  }
+  const trimmed = value.trim();
+  if (trimmed === "") {
+    return void 0;
+  }
+  return trimmed;
+}
+function readBooleanEnv(env, name) {
+  const value = readEnv(env, name);
+  if (value == null) {
+    return void 0;
+  }
+  const normalized = value.toLowerCase();
+  if (TRUTHY_ENV_VALUES.includes(normalized) == true) {
+    return true;
+  }
+  if (FALSY_ENV_VALUES.includes(normalized) == false) {
+    throw new Error(`${name} must be one of ${[...TRUTHY_ENV_VALUES, ...FALSY_ENV_VALUES].join(", ")} (got "${value}")`);
+  }
+  return false;
+}
+function readIntegerEnv(env, name) {
+  const value = readEnv(env, name);
+  if (value == null) {
+    return void 0;
+  }
+  const parsed = Number(value);
+  if (Number.isInteger(parsed) == false || parsed <= 0) {
+    throw new Error(`${name} must be a positive integer (got "${value}")`);
+  }
+  return parsed;
+}
+function readListEnv(env, name) {
+  const value = readEnv(env, name);
+  if (value == null) {
+    return void 0;
+  }
+  const items = value.split(",").map((item) => item.trim()).filter((item) => item !== "");
+  if (items.length === 0) {
+    return void 0;
+  }
+  return items;
+}
+function compileDenyPatterns(sources) {
+  return sources.map((source) => {
+    try {
+      return new RegExp(source, "i");
+    } catch (ex) {
+      const _logger = $logger.child({ context: "compileDenyPatterns" });
+      _logger.error(ex, "denyPatterns entry is not a valid regular expression");
+      let detail = String(ex);
+      if (ex instanceof Error) {
+        detail = ex.message;
+      }
+      throw new Error(`${SINGLE_HOST_ENV.DENY_PATTERNS} has an invalid entry /${source}/: ${detail}`);
+    }
+  });
+}
+function loadHostProfile(env = process.env) {
+  const host = readEnv(env, SINGLE_HOST_ENV.HOST);
+  if (host == null) {
+    const _startupLogger = $logger.child({ context: "loadHostProfile" });
+    _startupLogger.warn("no host is registered; set the connection variables and restart", {
+      env_vars: [SINGLE_HOST_ENV.HOST, SINGLE_HOST_ENV.USER]
+    });
+    return null;
+  }
+  const username = readEnv(env, SINGLE_HOST_ENV.USER);
+  if (username == null) {
+    throw new Error(`${SINGLE_HOST_ENV.HOST} is set, so ${SINGLE_HOST_ENV.USER} is required`);
+  }
+  const name = readEnv(env, SINGLE_HOST_ENV.NAME) ?? host;
+  const _logger = $logger.child({ context: "loadHostProfile", profile: name });
+  const allowCommands = readListEnv(env, SINGLE_HOST_ENV.ALLOW_COMMANDS) ?? [];
+  if (allowCommands.length > 0 && allowCommands.includes("pwd") == false) {
+    allowCommands.push("pwd");
+  }
+  const policy = {
+    readonly: readBooleanEnv(env, SINGLE_HOST_ENV.READONLY) ?? false,
+    allowSudo: readBooleanEnv(env, SINGLE_HOST_ENV.ALLOW_SUDO) ?? true,
+    execTimeoutMs: readIntegerEnv(env, SINGLE_HOST_ENV.EXEC_TIMEOUT_MS) ?? DEFAULT_EXEC_TIMEOUT_MS,
+    connectTimeoutMs: readIntegerEnv(env, SINGLE_HOST_ENV.CONNECT_TIMEOUT_MS) ?? DEFAULT_CONNECT_TIMEOUT_MS,
+    maxOutputCharacters: readIntegerEnv(env, SINGLE_HOST_ENV.MAX_OUTPUT_CHARACTERS) ?? DEFAULT_MAX_OUTPUT_CHARACTERS,
+    maxReadFileBytes: readIntegerEnv(env, SINGLE_HOST_ENV.MAX_READ_FILE_BYTES) ?? DEFAULT_MAX_READ_FILE_BYTES,
+    allowCommands,
+    denyPatterns: compileDenyPatterns(readListEnv(env, SINGLE_HOST_ENV.DENY_PATTERNS) ?? []),
+    allowedPaths: readListEnv(env, SINGLE_HOST_ENV.ALLOWED_PATHS) ?? []
+  };
+  const profile = {
+    name,
+    host,
+    port: readIntegerEnv(env, SINGLE_HOST_ENV.PORT) ?? DEFAULT_SSH_PORT,
+    username,
+    description: readEnv(env, SINGLE_HOST_ENV.DESCRIPTION),
+    passphrase: readEnv(env, SINGLE_HOST_ENV.PASSPHRASE),
+    password: readEnv(env, SINGLE_HOST_ENV.PASSWORD),
+    hostKeyFingerprint: readEnv(env, SINGLE_HOST_ENV.HOST_KEY),
+    defaultCwd: readEnv(env, SINGLE_HOST_ENV.CWD),
+    policy
+  };
+  const keyPath = readEnv(env, SINGLE_HOST_ENV.KEY);
+  if (keyPath != null) {
+    const expandedKeyPath = expandHomePath(keyPath);
+    profile.privateKeyPath = expandedKeyPath;
+    if (fs7.existsSync(expandedKeyPath) == false) {
+      _logger.warn(`${SINGLE_HOST_ENV.KEY} does not exist; connections will fail`, {
+        private_key_path: expandedKeyPath
+      });
+    }
+  }
+  profile.proxyCommand = readEnv(env, SINGLE_HOST_ENV.PROXY_COMMAND);
+  const jumpHost = readEnv(env, SINGLE_HOST_ENV.JUMP_HOST);
+  if (jumpHost == null) {
+    const strayJumpVariables = [
+      SINGLE_HOST_ENV.JUMP_PORT,
+      SINGLE_HOST_ENV.JUMP_USER,
+      SINGLE_HOST_ENV.JUMP_KEY,
+      SINGLE_HOST_ENV.JUMP_PASSPHRASE,
+      SINGLE_HOST_ENV.JUMP_PASSWORD,
+      SINGLE_HOST_ENV.JUMP_HOST_KEY
+    ].filter((variable) => readEnv(env, variable) != null);
+    if (strayJumpVariables.length > 0) {
+      throw new Error(`${strayJumpVariables.join(", ")} is set, so ${SINGLE_HOST_ENV.JUMP_HOST} is required`);
+    }
+  } else {
+    profile.jump = {
+      host: jumpHost,
+      port: readIntegerEnv(env, SINGLE_HOST_ENV.JUMP_PORT) ?? DEFAULT_SSH_PORT,
+      username: readEnv(env, SINGLE_HOST_ENV.JUMP_USER) ?? username,
+      password: readEnv(env, SINGLE_HOST_ENV.JUMP_PASSWORD),
+      hostKeyFingerprint: readEnv(env, SINGLE_HOST_ENV.JUMP_HOST_KEY)
+    };
+    const jumpKeyPath = readEnv(env, SINGLE_HOST_ENV.JUMP_KEY);
+    if (jumpKeyPath != null) {
+      profile.jump.privateKeyPath = expandHomePath(jumpKeyPath);
+      profile.jump.passphrase = readEnv(env, SINGLE_HOST_ENV.JUMP_PASSPHRASE);
+      if (fs7.existsSync(profile.jump.privateKeyPath) == false) {
+        _logger.warn(`${SINGLE_HOST_ENV.JUMP_KEY} does not exist; connections will fail`, {
+          private_key_path: profile.jump.privateKeyPath
+        });
+      }
+    } else {
+      profile.jump.privateKeyPath = profile.privateKeyPath;
+      profile.jump.passphrase = readEnv(env, SINGLE_HOST_ENV.JUMP_PASSPHRASE) ?? profile.passphrase;
+    }
+  }
+  _logger.info("host profile loaded", {
+    host,
+    port: profile.port,
+    username,
+    readonly: policy.readonly,
+    jump_host: profile.jump?.host,
+    via_proxy_command: profile.proxyCommand != null
+  });
+  return profile;
+}
+function toHostSummary(profile) {
+  let authMethod = "agent";
+  if (profile.privateKeyPath != null) {
+    authMethod = "privateKey";
+  } else if (profile.password != null) {
+    authMethod = "password";
+  }
+  const summary = {
+    name: profile.name,
+    host: profile.host,
+    port: profile.port,
+    username: profile.username,
+    description: profile.description,
+    authMethod,
+    viaProxyCommand: profile.proxyCommand != null,
+    readonly: profile.policy.readonly,
+    allowSudo: profile.policy.allowSudo,
+    allowedPaths: profile.policy.allowedPaths,
+    allowCommands: profile.policy.allowCommands
+  };
+  if (profile.jump != null) {
+    summary.jump = {
+      host: profile.jump.host,
+      port: profile.jump.port,
+      username: profile.jump.username
+    };
+  }
+  return summary;
+}
 
 // src/modules/guard/command-guard.ts
 var WRAPPER_BINARY_SET = new Set(COMMAND_WRAPPER_BINARIES);
@@ -1034,20 +1260,20 @@ function inspectRemotePath(remotePath, policy, access) {
 function toRealPath(inputPath) {
   const _logger = $logger.child({ context: "toRealPath" });
   try {
-    return fs.realpathSync.native(inputPath);
+    return fs7.realpathSync.native(inputPath);
   } catch (ex) {
     _logger.debug("path does not resolve, falling back to its parent directory", {
       reason: ex instanceof Error ? ex.name : "unknown"
     });
   }
   try {
-    const parentRealPath = fs.realpathSync.native(path2.dirname(inputPath));
-    return path2.join(parentRealPath, path2.basename(inputPath));
+    const parentRealPath = fs7.realpathSync.native(path.dirname(inputPath));
+    return path.join(parentRealPath, path.basename(inputPath));
   } catch (ex) {
     _logger.debug("parent directory does not resolve either, comparing lexically", {
       reason: ex instanceof Error ? ex.name : "unknown"
     });
-    return path2.resolve(inputPath);
+    return path.resolve(inputPath);
   }
 }
 function toComparablePath(inputPath) {
@@ -1127,42 +1353,56 @@ function resolveAgentPath() {
   }
   return void 0;
 }
-function readPrivateKey(profile, keyPath) {
+function readPrivateKey(label, keyPath) {
   const cached = PRIVATE_KEY_CACHE.get(keyPath);
   if (cached != null) {
     return cached;
   }
   try {
-    const contents = fs.readFileSync(keyPath);
+    const contents = fs7.readFileSync(keyPath);
     PRIVATE_KEY_CACHE.set(keyPath, contents);
     return contents;
   } catch (ex) {
-    const _logger = $logger.child({ context: "readPrivateKey", profile: profile.name });
-    _logger.error(ex, "cannot read the profile's private key file");
-    throw new Error(`cannot read the private key configured for profile '${profile.name}' (see the server log for the path)`);
+    const _logger = $logger.child({ context: "readPrivateKey", profile: label });
+    _logger.error(ex, "cannot read the private key file");
+    throw new Error(`cannot read the private key configured for '${label}' (see the server log for the path)`);
+  }
+}
+function applyAuth(connectConfig, credentials, label) {
+  if (credentials.privateKeyPath != null) {
+    connectConfig.privateKey = readPrivateKey(label, credentials.privateKeyPath);
+  }
+  if (credentials.passphrase != null) {
+    connectConfig.passphrase = credentials.passphrase;
+  }
+  if (credentials.password != null) {
+    connectConfig.password = credentials.password;
+  }
+  if (connectConfig.privateKey == null && connectConfig.password == null) {
+    connectConfig.agent = resolveAgentPath();
   }
 }
 function toHostKeyFingerprint(hostKey) {
   const digest = createHash("sha256").update(hostKey).digest("base64").replace(/=+$/, "");
   return `SHA256:${digest}`;
 }
-function buildHostVerifier(profile, onHostKeySeen) {
+function buildHostVerifier(hop, onHostKeySeen) {
   return (hostKey) => {
     const fingerprint = toHostKeyFingerprint(hostKey);
     onHostKeySeen(fingerprint);
-    const _logger = $logger.child({ context: "hostVerifier", profile: profile.name, host: profile.host });
-    if (profile.hostKeyFingerprint == null) {
-      _logger.info("host key accepted unpinned; add hostKeyFingerprint to the profile to pin it", {
+    const _logger = $logger.child({ context: "hostVerifier", profile: hop.label, host: hop.host });
+    if (hop.pinnedFingerprint == null) {
+      _logger.info("host key accepted unpinned; pin the fingerprint in the profile to detect a changed key", {
         host_key_fingerprint: fingerprint
       });
       return true;
     }
-    if (profile.hostKeyFingerprint === fingerprint) {
+    if (hop.pinnedFingerprint === fingerprint) {
       _logger.debug("host key matches the pinned fingerprint");
       return true;
     }
     _logger.error(null, "host key does not match the pinned fingerprint", {
-      expected: profile.hostKeyFingerprint,
+      expected: hop.pinnedFingerprint,
       actual: fingerprint
     });
     return false;
@@ -1175,21 +1415,152 @@ function buildConnectConfig(profile, onHostKeySeen) {
     username: profile.username,
     readyTimeout: profile.policy.connectTimeoutMs,
     keepaliveInterval: KEEPALIVE_INTERVAL_MS,
-    hostVerifier: buildHostVerifier(profile, onHostKeySeen)
+    hostVerifier: buildHostVerifier(
+      { label: profile.name, host: profile.host, pinnedFingerprint: profile.hostKeyFingerprint },
+      onHostKeySeen
+    )
   };
-  if (profile.privateKeyPath != null) {
-    connectConfig.privateKey = readPrivateKey(profile, profile.privateKeyPath);
-  }
-  if (profile.passphrase != null) {
-    connectConfig.passphrase = profile.passphrase;
+  applyAuth(connectConfig, profile, profile.name);
+  return connectConfig;
+}
+function expandProxyCommand(template, hop) {
+  return template.replace(/%[hpr%]/g, (token) => {
+    if (token === "%h") {
+      return hop.host;
+    }
+    if (token === "%p") {
+      return String(hop.port);
+    }
+    if (token === "%r") {
+      return hop.username;
+    }
+    return "%";
+  });
+}
+function openProxyCommand(profile, hop) {
+  const command = expandProxyCommand(profile.proxyCommand ?? "", hop);
+  const _logger = $logger.child({ context: "openProxyCommand", profile: profile.name });
+  _logger.debug("starting the proxy command", { command });
+  const child = spawn(command, { shell: true, stdio: ["pipe", "pipe", "pipe"], windowsHide: true });
+  const stderrDecoder = new StringDecoder("utf8");
+  child.stderr.on("data", (chunk) => {
+    const text = stderrDecoder.write(chunk).trim();
+    if (text !== "") {
+      _logger.warn("proxy command stderr", { text });
+    }
+  });
+  child.on("exit", (code, signal) => {
+    _logger.debug("proxy command exited", { exit_code: code, signal });
+  });
+  const sock = Duplex.from({ readable: child.stdout, writable: child.stdin });
+  sock.on("error", (error) => {
+    _logger.debug("proxy command stream error", { error_message: error.message });
+  });
+  child.on("error", (error) => {
+    sock.destroy(error);
+  });
+  let closed = false;
+  return {
+    sock,
+    close: () => {
+      if (closed == true) {
+        return;
+      }
+      closed = true;
+      if (child.exitCode != null || child.signalCode != null) {
+        return;
+      }
+      if (process.platform === "win32" && child.pid != null) {
+        const killer = spawn("taskkill", ["/pid", String(child.pid), "/T", "/F"], { stdio: "ignore", windowsHide: true });
+        killer.on("error", (error) => {
+          _logger.error(error, "failed to kill the proxy command's process tree");
+        });
+        return;
+      }
+      child.kill();
+    }
+  };
+}
+function openJumpTransport(profile, jump, proxy, onHostKeySeen) {
+  const label = `${profile.name} jump host`;
+  const endpoint = `${jump.username}@${jump.host}:${jump.port}`;
+  const _logger = $logger.child({ context: "openJumpTransport", profile: profile.name, jump_host: jump.host });
+  const jumpConfig = {
+    host: jump.host,
+    port: jump.port,
+    username: jump.username,
+    readyTimeout: profile.policy.connectTimeoutMs,
+    keepaliveInterval: KEEPALIVE_INTERVAL_MS,
+    hostVerifier: buildHostVerifier(
+      { label, host: jump.host, pinnedFingerprint: jump.hostKeyFingerprint },
+      onHostKeySeen
+    )
+  };
+  applyAuth(jumpConfig, jump, label);
+  if (proxy != null) {
+    jumpConfig.sock = proxy.sock;
+  }
+  return new Promise((resolve, reject) => {
+    const jumpClient = new Client();
+    let settled = false;
+    jumpClient.on("error", (error) => {
+      if (settled == false) {
+        settled = true;
+        jumpClient.destroy();
+        reject(new Error(`jump host ${endpoint}: ${error.message}`));
+        return;
+      }
+      _logger.error(error, "jump host connection error after ready");
+    });
+    jumpClient.on("close", () => {
+      _logger.debug("jump host connection closed");
+      proxy?.close();
+      if (settled == false) {
+        settled = true;
+        reject(new Error(`jump host ${endpoint}: connection closed before the handshake completed`));
+      }
+    });
+    jumpClient.once("ready", () => {
+      if (settled == true) {
+        return;
+      }
+      jumpClient.forwardOut("127.0.0.1", 0, profile.host, profile.port, (error, stream) => {
+        if (settled == true) {
+          return;
+        }
+        settled = true;
+        if (error != null) {
+          jumpClient.end();
+          reject(new Error(`jump host ${endpoint} refused the forward to ${profile.host}:${profile.port}: ${error.message}`));
+          return;
+        }
+        _logger.info("jump host connected, target channel forwarded");
+        resolve({
+          sock: stream,
+          close: () => {
+            jumpClient.end();
+          }
+        });
+      });
+    });
+    jumpClient.connect(jumpConfig);
+  });
+}
+async function openTransport(profile, onJumpHostKeySeen) {
+  let proxy = null;
+  if (profile.proxyCommand != null) {
+    proxy = openProxyCommand(profile, profile.jump ?? profile);
   }
-  if (profile.password != null) {
-    connectConfig.password = profile.password;
+  if (profile.jump == null) {
+    return proxy;
   }
-  if (connectConfig.privateKey == null && connectConfig.password == null) {
-    connectConfig.agent = resolveAgentPath();
+  try {
+    const jumpTransport = await openJumpTransport(profile, profile.jump, proxy, onJumpHostKeySeen);
+    return jumpTransport;
+  } catch (ex) {
+    proxy?.close();
+    throw ex;
   }
-  return connectConfig;
 }
 function buildRemoteCommand(command, cwd, trackCwd) {
   const lines = [];
@@ -1231,6 +1602,7 @@ var SshConnection = class {
     /** Set when the peer closed a previously established connection. */
     this.droppedAfterReady = false;
     this.observedFingerprint = null;
+    this.observedJumpFingerprint = null;
   }
   get isConnected() {
     return this.client != null;
@@ -1239,6 +1611,10 @@ var SshConnection = class {
   get hostKeyFingerprint() {
     return this.observedFingerprint;
   }
+  /** Host key the jump host presented; null without a jump host or before its handshake. */
+  get jumpHostKeyFingerprint() {
+    return this.observedJumpFingerprint;
+  }
   /** True when a connection was established and then lost, so shell state is gone. */
   get wasDropped() {
     return this.droppedAfterReady;
@@ -1246,8 +1622,11 @@ var SshConnection = class {
   /**
    * Opens the connection, or joins the in-flight attempt when one is already running.
    *
+   * With a proxy command or a jump host the carrier is opened first and handed to ssh2
+   * as the socket; it is torn down with the target connection, whichever side closes.
+   *
    * @throws {Error} If the connection was closed, authentication fails, the host is
-   *                 unreachable, or the handshake times out.
+   *                 unreachable, the handshake times out, or the carrier cannot be opened.
    */
   async connect() {
     if (this.disposed == true) {
@@ -1270,43 +1649,66 @@ var SshConnection = class {
     const connectConfig = buildConnectConfig(this.profile, (fingerprint) => {
       this.observedFingerprint = fingerprint;
     });
-    this.connecting = new Promise((resolve, reject) => {
-      const client = new Client();
-      this.pendingClient = client;
-      let settled = false;
-      client.on("error", (error) => {
-        if (settled == false) {
+    this.connecting = (async () => {
+      const transport = await openTransport(this.profile, (fingerprint) => {
+        this.observedJumpFingerprint = fingerprint;
+      });
+      if (this.disposed == true) {
+        transport?.close();
+        throw new Error(`ssh connection for '${this.profile.name}' was closed during the handshake`);
+      }
+      if (transport != null) {
+        connectConfig.sock = transport.sock;
+      }
+      await new Promise((resolve, reject) => {
+        const client = new Client();
+        this.pendingClient = client;
+        let settled = false;
+        client.on("error", (error) => {
+          if (settled == false) {
+            settled = true;
+            this.pendingClient = null;
+            client.destroy();
+            reject(error);
+            return;
+          }
+          if (this.client !== client) {
+            _logger.debug("ssh connection error during teardown", { error_message: error.message });
+            return;
+          }
+          _logger.error(error, "ssh connection error after ready");
+        });
+        client.on("close", () => {
+          transport?.close();
+          if (this.client === client) {
+            _logger.debug("ssh connection closed by the peer");
+            this.client = null;
+            this.droppedAfterReady = true;
+            return;
+          }
+          if (settled == false) {
+            settled = true;
+            this.pendingClient = null;
+            reject(new Error("connection closed before the handshake completed"));
+          }
+        });
+        client.once("ready", () => {
+          if (settled == true) {
+            return;
+          }
           settled = true;
           this.pendingClient = null;
-          client.destroy();
-          reject(error);
-          return;
-        }
-        _logger.error(error, "ssh connection error after ready");
-      });
-      client.on("close", () => {
-        if (this.client === client) {
-          _logger.debug("ssh connection closed by the peer");
-          this.client = null;
-          this.droppedAfterReady = true;
-        }
-      });
-      client.once("ready", () => {
-        if (settled == true) {
-          return;
-        }
-        settled = true;
-        this.pendingClient = null;
-        if (this.disposed == true) {
-          client.destroy();
-          reject(new Error(`ssh connection for '${this.profile.name}' was closed during the handshake`));
-          return;
-        }
-        this.client = client;
-        resolve();
+          if (this.disposed == true) {
+            client.destroy();
+            reject(new Error(`ssh connection for '${this.profile.name}' was closed during the handshake`));
+            return;
+          }
+          this.client = client;
+          resolve();
+        });
+        client.connect(connectConfig);
       });
-      client.connect(connectConfig);
-    });
+    })();
     try {
       await this.connecting;
       _logger.info("ssh connection established");
@@ -1908,7 +2310,7 @@ async function writeRemoteFile(connection, args) {
 }
 async function uploadFile(connection, localPath, remotePath) {
   requirePermittedPath(connection, remotePath, "write");
-  const localStats = fs.statSync(localPath);
+  const localStats = fs7.statSync(localPath);
   if (localStats.isFile() == false) {
     throw new Error(`local path is not a file: ${localPath}`);
   }
@@ -1945,7 +2347,7 @@ async function downloadFile(connection, remotePath, localPath) {
       });
     });
   });
-  const localStats = fs.statSync(localPath);
+  const localStats = fs7.statSync(localPath);
   const _logger = $logger.child({
     context: "downloadFile",
     profile: connection.profile.name,
@@ -1955,147 +2357,1667 @@ async function downloadFile(connection, remotePath, localPath) {
   _logger.info("file downloaded", { bytes: localStats.size });
   return localStats.size;
 }
-function readEnv(name) {
-  const value = process.env[name];
-  if (value == null) {
-    return void 0;
+
+// src/modules/manage/connection-check.ts
+function describeAuth(profile) {
+  if (profile.privateKeyPath != null) {
+    return `key ${profile.privateKeyPath}`;
   }
-  const trimmed = value.trim();
-  if (trimmed === "") {
-    return void 0;
+  if (profile.password != null) {
+    return "password";
   }
-  return trimmed;
+  return "ssh agent";
 }
-function readBooleanEnv(name) {
-  const value = readEnv(name);
-  if (value == null) {
-    return void 0;
-  }
-  const normalized = value.toLowerCase();
-  if (TRUTHY_ENV_VALUES.includes(normalized) == true) {
-    return true;
+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 (FALSY_ENV_VALUES.includes(normalized) == false) {
-    throw new Error(`${name} must be one of ${[...TRUTHY_ENV_VALUES, ...FALSY_ENV_VALUES].join(", ")} (got "${value}")`);
+  if (profile.jump != null) {
+    output.write(`  via jump host: ${profile.jump.username}@${profile.jump.host}:${profile.jump.port}
+`);
   }
-  return false;
+  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;
+    }
+  } finally {
+    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;
+    }
+  }
+  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;
+  }
+  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 Prompter = class {
+  constructor(input, output) {
+    this.input = input;
+    this.output = output;
+    this.lineBuffer = "";
+    this.pendingLines = [];
+    this.waiter = null;
+    this.inputEnded = false;
+    this.secretMode = false;
+    this.secretBuffer = "";
+    input.setEncoding("utf8");
+    input.on("data", (chunk) => {
+      this.onData(chunk);
+    });
+    input.on("end", () => {
+      this.inputEnded = true;
+      if (this.waiter != null) {
+        const waiter = this.waiter;
+        this.waiter = null;
+        waiter(null);
+      }
+    });
+  }
+  /** Stops reading so the process can exit once the command is done. */
+  close() {
+    this.input.pause();
+  }
+  write(text) {
+    this.output.write(text);
+  }
+  /**
+   * Free-text prompt. Enter accepts `defaultValue` when one is shown.
+   *
+   * @throws {PromptClosedError} If the input closes before a line arrives.
+   */
+  async ask(question, defaultValue) {
+    let suffix = "";
+    if (defaultValue != null && defaultValue !== "") {
+      suffix = ` [${defaultValue}]`;
+    }
+    this.output.write(`${question}${suffix}: `);
+    const line = await this.readLine();
+    if (line == null) {
+      throw new PromptClosedError();
+    }
+    const trimmed = line.trim();
+    if (trimmed === "" && defaultValue != null) {
+      return defaultValue;
+    }
+    return trimmed;
+  }
+  /** Like `ask`, re-asking until something non-empty is entered. */
+  async askRequired(question, defaultValue) {
+    for (; ; ) {
+      const answer = await this.ask(question, defaultValue);
+      if (answer !== "") {
+        return answer;
+      }
+      this.output.write("  A value is required.\n");
+    }
+  }
+  async askYesNo(question, defaultValue) {
+    let hint = "[y/N]";
+    if (defaultValue == true) {
+      hint = "[Y/n]";
+    }
+    for (; ; ) {
+      this.output.write(`${question} ${hint}: `);
+      const line = await this.readLine();
+      if (line == null) {
+        throw new PromptClosedError();
+      }
+      const normalized = line.trim().toLowerCase();
+      if (normalized === "") {
+        return defaultValue;
+      }
+      if (normalized === "y" || normalized === "yes") {
+        return true;
+      }
+      if (normalized === "n" || normalized === "no") {
+        return false;
+      }
+      this.output.write("  Answer y or n.\n");
+    }
+  }
+  /** Lists the choices one per line and accepts a key, case-insensitively. */
+  async askChoice(question, choices, defaultKey) {
+    this.output.write(`${question}
+`);
+    for (const choice of choices) {
+      this.output.write(`  ${choice.key}) ${choice.label}
+`);
+    }
+    for (; ; ) {
+      const answer = await this.ask("Choice", defaultKey);
+      const matched = choices.find((choice) => choice.key.toLowerCase() === answer.toLowerCase());
+      if (matched != null) {
+        return matched.key;
+      }
+      this.output.write(`  Pick one of ${choices.map((choice) => choice.key).join(", ")}.
+`);
+    }
+  }
+  /**
+   * Reads a value without echoing it on a TTY. Empty means "none", or "keep" when the
+   * caller says a value already exists.
+   */
+  async askSecret(question) {
+    const rawModeStream = this.input;
+    if (rawModeStream.isTTY != true || rawModeStream.setRawMode == null) {
+      const answer = await this.ask(question);
+      return answer;
+    }
+    this.output.write(`${question}: `);
+    this.secretBuffer = "";
+    this.secretMode = true;
+    rawModeStream.setRawMode(true);
+    try {
+      const line = await this.readLine();
+      if (line == null) {
+        throw new PromptClosedError();
+      }
+      return line;
+    } finally {
+      rawModeStream.setRawMode(false);
+      this.secretMode = false;
+      this.output.write("\n");
+    }
+  }
+  readLine() {
+    const queued = this.pendingLines.shift();
+    if (queued != null) {
+      return Promise.resolve(queued);
+    }
+    if (this.inputEnded == true) {
+      return Promise.resolve(null);
+    }
+    return new Promise((resolve) => {
+      this.waiter = resolve;
+    });
+  }
+  deliver(line) {
+    if (this.waiter != null) {
+      const waiter = this.waiter;
+      this.waiter = null;
+      waiter(line);
+      return;
+    }
+    this.pendingLines.push(line);
+  }
+  onData(chunk) {
+    if (this.secretMode == true) {
+      for (const character of chunk) {
+        if (character === "\r" || character === "\n") {
+          const secret = this.secretBuffer;
+          this.secretBuffer = "";
+          this.deliver(secret);
+          continue;
+        }
+        if (character === "") {
+          this.output.write("\n");
+          process.exit(130);
+        }
+        if (character === "\x7F" || character === "\b") {
+          this.secretBuffer = this.secretBuffer.slice(0, -1);
+          continue;
+        }
+        this.secretBuffer += character;
+      }
+      return;
+    }
+    this.lineBuffer += chunk;
+    let newlineIndex = this.lineBuffer.indexOf("\n");
+    while (newlineIndex >= 0) {
+      const line = this.lineBuffer.slice(0, newlineIndex).replace(/\r$/, "");
+      this.lineBuffer = this.lineBuffer.slice(newlineIndex + 1);
+      this.deliver(line);
+      newlineIndex = this.lineBuffer.indexOf("\n");
+    }
+  }
+};
+var DEFAULT_KEY_CANDIDATES = ["~/.ssh/id_ed25519", "~/.ssh/id_ecdsa", "~/.ssh/id_rsa"];
+var CLEAR_ANSWER = "-";
+async function askPort(prompter, question, current) {
+  for (; ; ) {
+    const answer = await prompter.ask(question, String(current));
+    const parsed = Number(answer);
+    if (Number.isInteger(parsed) == true && parsed > 0 && parsed <= 65535) {
+      return parsed;
+    }
+    prompter.write("  Enter a port number between 1 and 65535.\n");
+  }
+}
+async function askOptional(prompter, question, current) {
+  const answer = await prompter.ask(question, current);
+  if (answer === "" || answer === CLEAR_ANSWER) {
+    return void 0;
+  }
+  return answer;
+}
+async function askOptionalSecret(prompter, question, current) {
+  let suffix = " (empty for none)";
+  if (current != null) {
+    suffix = ` [keep current, ${CLEAR_ANSWER} to clear]`;
+  }
+  const answer = await prompter.askSecret(`${question}${suffix}`);
+  if (answer === CLEAR_ANSWER) {
+    return void 0;
+  }
+  if (answer === "") {
+    return current;
+  }
+  return answer;
+}
+async function askHostQuestions(prompter, existing) {
+  if (existing != null) {
+    prompter.write(`  Enter keeps the value in brackets; ${CLEAR_ANSWER} clears an optional one.
+
+`);
+  }
+  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;
+    }
+    prompter.write("  Use letters, digits, '-' and '_' only (max 48) \u2014 the name becomes part of every tool name.\n");
+  }
+  const auth = await prompter.askChoice(
+    "Authentication",
+    [
+      { key: "key", label: "private key file  (recommended \u2014 only the path is stored)" },
+      { key: "password", label: "password  (stored in the config file in plain text)" },
+      { key: "agent", label: "ssh agent  (SSH_AUTH_SOCK / OpenSSH agent pipe)" }
+    ],
+    existing?.auth ?? "key"
+  );
+  let keyPath;
+  let passphrase;
+  let password;
+  if (auth === "key") {
+    let defaultKeyPath = existing?.keyPath;
+    if (defaultKeyPath == null) {
+      defaultKeyPath = DEFAULT_KEY_CANDIDATES.find((candidate) => fs7.existsSync(expandHomePath(candidate)) == true);
+    }
+    for (; ; ) {
+      keyPath = await prompter.askRequired("Private key path", defaultKeyPath);
+      if (fs7.existsSync(expandHomePath(keyPath)) == true) {
+        break;
+      }
+      prompter.write(`  ${expandHomePath(keyPath)} does not exist.
+`);
+      const useAnyway = await prompter.askYesNo("Use this path anyway?", false);
+      if (useAnyway == true) {
+        break;
+      }
+    }
+    passphrase = await askOptionalSecret(prompter, "Key passphrase", existing?.passphrase);
+  }
+  if (auth === "password") {
+    prompter.write("  The password is written into the config file as plain text. A key file is safer.\n");
+    password = await askOptionalSecret(prompter, "Password", existing?.password);
+    if (password == null) {
+      prompter.write("  No password given \u2014 falling back to the ssh agent.\n");
+    }
+  }
+  let jumpHost;
+  let jumpPort;
+  let jumpUser;
+  const viaJump = await prompter.askYesNo("Reach it through a jump host (ssh -J)?", existing?.jumpHost != null);
+  if (viaJump == true) {
+    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);
+  }
+  let proxyCommand;
+  const viaProxy = await prompter.askYesNo("Start a proxy command for the first hop (e.g. cloudflared)?", existing?.proxyCommand != null);
+  if (viaProxy == true) {
+    prompter.write("  %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 (what the host is for)", 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(",");
+  }
+  let allowedPaths = [];
+  const allowedPathsAnswer = await askOptional(
+    prompter,
+    "Restrict file tools to these path prefixes (comma-separated, empty = unrestricted)",
+    currentAllowedPaths
+  );
+  if (allowedPathsAnswer != null) {
+    allowedPaths = allowedPathsAnswer.split(",").map((item) => item.trim()).filter((item) => item !== "");
+  }
+  let resolvedAuth = auth;
+  if (auth === "password" && password == null) {
+    resolvedAuth = "agent";
+  }
+  const answers = {
+    name,
+    host,
+    port,
+    username,
+    auth: resolvedAuth,
+    keyPath,
+    passphrase,
+    password,
+    description,
+    jumpHost,
+    jumpPort,
+    jumpUser,
+    proxyCommand,
+    readonly,
+    allowedPaths,
+    extraEnv: existing?.extraEnv ?? {}
+  };
+  if (existing != null && existing.host === host && existing.port === port) {
+    answers.hostKeyFingerprint = existing.hostKeyFingerprint;
+  }
+  if (existing != null && existing.jumpHost === jumpHost && existing.jumpPort === jumpPort) {
+    answers.jumpHostKeyFingerprint = existing.jumpHostKeyFingerprint;
+  }
+  return answers;
+}
+function toMcpServerEntry(value) {
+  if (typeof value !== "object" || value == null) {
+    return null;
+  }
+  const record = value;
+  if (typeof record.command !== "string") {
+    return null;
+  }
+  let args = [];
+  if (Array.isArray(record.args) == true) {
+    args = record.args.filter((item) => typeof item === "string");
+  }
+  const env = {};
+  if (typeof record.env === "object" && record.env != null) {
+    for (const [key, item] of Object.entries(record.env)) {
+      if (typeof item === "string") {
+        env[key] = item;
+      }
+    }
+  }
+  return { command: record.command, args, env };
+}
+function readMcpServersJson(document) {
+  if (typeof document !== "object" || document == null || Array.isArray(document) == true) {
+    throw new Error("the config file is not a JSON object");
+  }
+  const entries = {};
+  const servers = document.mcpServers;
+  if (typeof servers !== "object" || servers == null) {
+    return entries;
+  }
+  for (const [name, value] of Object.entries(servers)) {
+    const entry = toMcpServerEntry(value);
+    if (entry != null) {
+      entries[name] = entry;
+    }
+  }
+  return entries;
+}
+function readDocument(filePath) {
+  if (fs7.existsSync(filePath) == false) {
+    return {};
+  }
+  const text = fs7.readFileSync(filePath, "utf8");
+  if (text.trim() === "") {
+    return {};
+  }
+  let document;
+  try {
+    document = JSON.parse(text);
+  } catch (ex) {
+    let detail = String(ex);
+    if (ex instanceof Error) {
+      detail = ex.message;
+    }
+    throw new Error(`${filePath} is not valid JSON: ${detail}`);
+  }
+  if (typeof document !== "object" || document == null || Array.isArray(document) == true) {
+    throw new Error(`${filePath} is not a JSON object`);
+  }
+  return document;
+}
+function createJsonFileTarget(options) {
+  const { id, label, filePath } = options;
+  function writeDocument(document) {
+    fs7.mkdirSync(path.dirname(filePath), { recursive: true });
+    fs7.writeFileSync(filePath, `${JSON.stringify(document, null, 4)}
+`, "utf8");
+  }
+  return {
+    id,
+    label,
+    location: filePath,
+    detected: fs7.existsSync(filePath),
+    readEntries() {
+      const document = readDocument(filePath);
+      return readMcpServersJson(document);
+    },
+    writeEntry(name, entry) {
+      const document = readDocument(filePath);
+      let servers = document.mcpServers;
+      if (typeof servers !== "object" || servers == null || Array.isArray(servers) == true) {
+        servers = {};
+      }
+      servers[name] = entry;
+      document.mcpServers = servers;
+      writeDocument(document);
+      return { status: "written", detail: filePath };
+    },
+    removeEntry(name) {
+      const document = readDocument(filePath);
+      const servers = document.mcpServers;
+      if (typeof servers !== "object" || servers == null || Array.isArray(servers) == true) {
+        return { status: "written", detail: filePath };
+      }
+      delete servers[name];
+      writeDocument(document);
+      return { status: "written", detail: filePath };
+    }
+  };
+}
+
+// src/modules/manage/targets/claude-code.ts
+var CLAUDE_CODE_CONFIG_PATH = path.join(os4.homedir(), ".claude.json");
+var CMD_META_CHARACTER_PATTERN = /([()\][%!^"`<>&|;, *?])/g;
+function toClaudeAddJsonPayload(entry) {
+  return JSON.stringify({ type: "stdio", command: entry.command, args: entry.args, env: entry.env });
+}
+function formatClaudeAddCommand(name, entry) {
+  const payload = toClaudeAddJsonPayload(entry);
+  return `claude mcp add-json ${name} '${payload}' -s user`;
+}
+function escapeCmdArgument(argument) {
+  let escaped = argument.replace(/(\\*)"/g, '$1$1\\"');
+  escaped = escaped.replace(/(\\*)$/, "$1$1");
+  escaped = `"${escaped}"`;
+  escaped = escaped.replace(CMD_META_CHARACTER_PATTERN, "^$1");
+  escaped = escaped.replace(CMD_META_CHARACTER_PATTERN, "^$1");
+  return escaped;
+}
+function runCliCommand(executable, args) {
+  const isBatchShim = /\.(cmd|bat)$/i.test(executable) == true;
+  if (process.platform !== "win32" || isBatchShim == false) {
+    const result2 = spawnSync(executable, args, { encoding: "utf8", windowsHide: true });
+    return result2;
+  }
+  const commandLine = [executable.replace(CMD_META_CHARACTER_PATTERN, "^$1"), ...args.map(escapeCmdArgument)].join(" ");
+  const result = spawnSync(process.env.ComSpec ?? "cmd.exe", ["/d", "/s", "/c", `"${commandLine}"`], {
+    encoding: "utf8",
+    windowsHide: true,
+    windowsVerbatimArguments: true
+  });
+  return result;
+}
+function runClaude(executable, args) {
+  const result = runCliCommand(executable, args);
+  if (result.error != null) {
+    return { status: "unavailable", detail: `could not run claude: ${result.error.message}` };
+  }
+  if (result.status !== 0) {
+    let output = (result.stderr ?? "").trim();
+    if (output === "") {
+      output = (result.stdout ?? "").trim();
+    }
+    return { status: "unavailable", detail: `claude exited with ${result.status}: ${output}` };
+  }
+  return { status: "written", detail: CLAUDE_CODE_CONFIG_PATH };
+}
+function readClaudeEntries() {
+  if (fs7.existsSync(CLAUDE_CODE_CONFIG_PATH) == false) {
+    return {};
+  }
+  const text = fs7.readFileSync(CLAUDE_CODE_CONFIG_PATH, "utf8");
+  let document;
+  try {
+    document = JSON.parse(text);
+  } catch (ex) {
+    let detail = String(ex);
+    if (ex instanceof Error) {
+      detail = ex.message;
+    }
+    throw new Error(`${CLAUDE_CODE_CONFIG_PATH} is not valid JSON: ${detail}`);
+  }
+  return readMcpServersJson(document);
+}
+function createClaudeCodeTarget() {
+  const executable = findExecutable("claude");
+  return {
+    id: "claude-code",
+    label: "Claude Code (user scope)",
+    location: CLAUDE_CODE_CONFIG_PATH,
+    detected: executable != null || fs7.existsSync(CLAUDE_CODE_CONFIG_PATH) == true,
+    readEntries: readClaudeEntries,
+    writeEntry(name, entry) {
+      if (executable == null) {
+        return {
+          status: "unavailable",
+          detail: `the claude CLI is not on PATH \u2014 run this yourself:
+  ${formatClaudeAddCommand(name, entry)}`
+        };
+      }
+      const previous = readClaudeEntries()[name];
+      if (previous != null) {
+        const removed = runClaude(executable, ["mcp", "remove", name, "-s", "user"]);
+        if (removed.status === "unavailable") {
+          return removed;
+        }
+      }
+      const added = runClaude(executable, ["mcp", "add-json", name, toClaudeAddJsonPayload(entry), "-s", "user"]);
+      if (added.status === "unavailable" && previous != null) {
+        runClaude(executable, ["mcp", "add-json", name, toClaudeAddJsonPayload(previous), "-s", "user"]);
+        return { status: "unavailable", detail: `${added.detail}
+  the previous entry was restored` };
+      }
+      return added;
+    },
+    removeEntry(name) {
+      if (executable == null) {
+        return {
+          status: "unavailable",
+          detail: `the claude CLI is not on PATH \u2014 run this yourself:
+  claude mcp remove ${name} -s user`
+        };
+      }
+      return runClaude(executable, ["mcp", "remove", name, "-s", "user"]);
+    }
+  };
+}
+
+// src/modules/manage/targets/toml-subset.ts
+var BARE_KEY_PATTERN = /^[A-Za-z0-9_-]+$/;
+var ANY_HEADER_PATTERN = /^\s*\[/;
+var SERVER_HEADER_PATTERN = /^\s*\[\s*mcp_servers\s*\.\s*([A-Za-z0-9_-]+|"(?:[^"\\]|\\.)*")\s*((?:\.[^\]]*)?)\]\s*(?:#.*)?$/;
+var KEY_VALUE_PATTERN = /^\s*([A-Za-z0-9_-]+|"(?:[^"\\]|\\.)*")\s*=\s*(.*)$/;
+var OWNED_TABLE_KEYS = ["command", "args", "env"];
+var TomlValueParser = class {
+  constructor(text) {
+    this.text = text;
+    this.position = 0;
+  }
+  parse() {
+    const value = this.parseValue();
+    return value;
+  }
+  skipWhitespace() {
+    while (this.position < this.text.length && /\s/.test(this.text[this.position]) == true) {
+      this.position += 1;
+    }
+  }
+  parseValue() {
+    this.skipWhitespace();
+    const current = this.text[this.position];
+    if (current === '"') {
+      return this.parseBasicString();
+    }
+    if (current === "'") {
+      return this.parseLiteralString();
+    }
+    if (current === "[") {
+      return this.parseArray();
+    }
+    if (current === "{") {
+      return this.parseInlineTable();
+    }
+    throw new Error(`unsupported toml value at offset ${this.position}`);
+  }
+  parseBasicString() {
+    this.position += 1;
+    let result = "";
+    while (this.position < this.text.length) {
+      const current = this.text[this.position];
+      if (current === '"') {
+        this.position += 1;
+        return result;
+      }
+      if (current !== "\\") {
+        result += current;
+        this.position += 1;
+        continue;
+      }
+      const escaped = this.text[this.position + 1];
+      this.position += 2;
+      if (escaped === "n") {
+        result += "\n";
+      } else if (escaped === "t") {
+        result += "	";
+      } else if (escaped === "r") {
+        result += "\r";
+      } else if (escaped === "u" || escaped === "U") {
+        let length = 4;
+        if (escaped === "U") {
+          length = 8;
+        }
+        const hex = this.text.slice(this.position, this.position + length);
+        result += String.fromCodePoint(Number.parseInt(hex, 16));
+        this.position += length;
+      } else {
+        result += escaped;
+      }
+    }
+    throw new Error("unterminated toml string");
+  }
+  parseLiteralString() {
+    const end = this.text.indexOf("'", this.position + 1);
+    if (end < 0) {
+      throw new Error("unterminated toml literal string");
+    }
+    const result = this.text.slice(this.position + 1, end);
+    this.position = end + 1;
+    return result;
+  }
+  parseArray() {
+    this.position += 1;
+    const items = [];
+    for (; ; ) {
+      this.skipWhitespace();
+      if (this.position >= this.text.length) {
+        throw new Error("unterminated toml array");
+      }
+      if (this.text[this.position] === "]") {
+        this.position += 1;
+        return items;
+      }
+      items.push(this.parseValue());
+      this.skipWhitespace();
+      if (this.text[this.position] === ",") {
+        this.position += 1;
+      }
+    }
+  }
+  parseInlineTable() {
+    this.position += 1;
+    const table = {};
+    for (; ; ) {
+      this.skipWhitespace();
+      if (this.position >= this.text.length) {
+        throw new Error("unterminated toml inline table");
+      }
+      if (this.text[this.position] === "}") {
+        this.position += 1;
+        return table;
+      }
+      let key;
+      if (this.text[this.position] === '"') {
+        key = this.parseBasicString();
+      } else {
+        const match = /^[A-Za-z0-9_-]+/.exec(this.text.slice(this.position));
+        if (match == null) {
+          throw new Error(`invalid inline table key at offset ${this.position}`);
+        }
+        key = match[0];
+        this.position += key.length;
+      }
+      this.skipWhitespace();
+      if (this.text[this.position] !== "=") {
+        throw new Error(`expected '=' at offset ${this.position}`);
+      }
+      this.position += 1;
+      table[key] = this.parseValue();
+      this.skipWhitespace();
+      if (this.text[this.position] === ",") {
+        this.position += 1;
+      }
+    }
+  }
+};
+function unquoteKey(rawKey) {
+  if (rawKey.startsWith('"') == false) {
+    return rawKey;
+  }
+  const parsed = new TomlValueParser(rawKey).parse();
+  return parsed;
+}
+function bracketBalance(text) {
+  let balance = 0;
+  let quote = null;
+  for (let index = 0; index < text.length; index += 1) {
+    const current = text[index];
+    if (quote != null) {
+      if (current === "\\" && quote === '"') {
+        index += 1;
+      } else if (current === quote) {
+        quote = null;
+      }
+      continue;
+    }
+    if (current === '"' || current === "'") {
+      quote = current;
+    } else if (current === "#") {
+      break;
+    } else if (current === "[" || current === "{") {
+      balance += 1;
+    } else if (current === "]" || current === "}") {
+      balance -= 1;
+    }
+  }
+  return balance;
+}
+function stripComment(text) {
+  let quote = null;
+  for (let index = 0; index < text.length; index += 1) {
+    const current = text[index];
+    if (quote != null) {
+      if (current === "\\" && quote === '"') {
+        index += 1;
+      } else if (current === quote) {
+        quote = null;
+      }
+      continue;
+    }
+    if (current === '"' || current === "'") {
+      quote = current;
+    } else if (current === "#") {
+      return text.slice(0, index);
+    }
+  }
+  return text;
+}
+function readStatements(body) {
+  const statements = [];
+  let index = 0;
+  while (index < body.length) {
+    const match = KEY_VALUE_PATTERN.exec(body[index]);
+    if (match == null) {
+      index += 1;
+      continue;
+    }
+    const start = index;
+    let rawValue = stripComment(match[2]);
+    let balance = bracketBalance(rawValue);
+    index += 1;
+    while (balance > 0 && index < body.length) {
+      const continuation = stripComment(body[index]);
+      rawValue += `
+${continuation}`;
+      balance += bracketBalance(continuation);
+      index += 1;
+    }
+    statements.push({ key: unquoteKey(match[1]), rawValue, start, end: index });
+  }
+  return statements;
+}
+function splitSections(lines) {
+  const sections = [{ header: null, serverName: null, subPath: "", body: [] }];
+  let balance = 0;
+  for (const line of lines) {
+    const current = sections[sections.length - 1];
+    if (balance > 0) {
+      current.body.push(line);
+      balance += bracketBalance(stripComment(line));
+      continue;
+    }
+    if (ANY_HEADER_PATTERN.test(line) == true) {
+      const serverMatch = SERVER_HEADER_PATTERN.exec(line);
+      let serverName = null;
+      let subPath = "";
+      if (serverMatch != null) {
+        serverName = unquoteKey(serverMatch[1]);
+        subPath = serverMatch[2].replace(/^\./, "").replace(/\s+/g, "");
+      }
+      sections.push({ header: line, serverName, subPath, body: [] });
+      continue;
+    }
+    current.body.push(line);
+    const keyValueMatch = KEY_VALUE_PATTERN.exec(line);
+    if (keyValueMatch != null) {
+      balance = bracketBalance(stripComment(keyValueMatch[2]));
+    }
+  }
+  return sections;
+}
+function parseStatementValue(statement) {
+  try {
+    const value = new TomlValueParser(statement.rawValue).parse();
+    return value;
+  } catch {
+    return null;
+  }
+}
+function parseMcpServersToml(text) {
+  const sections = splitSections(text.split(/\r?\n/));
+  const entries = {};
+  const envTables = {};
+  for (const section of sections) {
+    if (section.serverName == null) {
+      continue;
+    }
+    if (section.subPath === "env") {
+      const envTable = {};
+      for (const statement of readStatements(section.body)) {
+        const value = parseStatementValue(statement);
+        if (typeof value === "string") {
+          envTable[statement.key] = value;
+        }
+      }
+      envTables[section.serverName] = envTable;
+      continue;
+    }
+    if (section.subPath !== "") {
+      continue;
+    }
+    let command = null;
+    let args = [];
+    const env = {};
+    for (const statement of readStatements(section.body)) {
+      const value = parseStatementValue(statement);
+      if (statement.key === "command" && typeof value === "string") {
+        command = value;
+      } else if (statement.key === "args" && Array.isArray(value) == true) {
+        args = value.filter((item) => typeof item === "string");
+      } else if (statement.key === "env" && value != null && typeof value === "object" && Array.isArray(value) == false) {
+        for (const [key, item] of Object.entries(value)) {
+          if (typeof item === "string") {
+            env[key] = item;
+          }
+        }
+      }
+    }
+    if (command != null) {
+      entries[section.serverName] = { command, args, env };
+    }
+  }
+  for (const [name, envTable] of Object.entries(envTables)) {
+    if (entries[name] != null) {
+      Object.assign(entries[name].env, envTable);
+    }
+  }
+  return entries;
+}
+function quoteTomlString(value) {
+  const escaped = value.replace(/\\/g, "\\\\").replace(/"/g, '\\"').replace(/\n/g, "\\n").replace(/\r/g, "\\r").replace(/\t/g, "\\t");
+  return `"${escaped}"`;
+}
+function formatTomlKey(key) {
+  if (BARE_KEY_PATTERN.test(key) == true) {
+    return key;
+  }
+  return quoteTomlString(key);
+}
+function renderOwnedLines(entry) {
+  return [
+    `command = ${quoteTomlString(entry.command)}`,
+    `args = [${entry.args.map((argument) => quoteTomlString(argument)).join(", ")}]`
+  ];
+}
+function renderEnvLines(entry) {
+  return Object.entries(entry.env).map(([key, value]) => `${formatTomlKey(key)} = ${quoteTomlString(value)}`);
+}
+function renderMcpServerTable(name, entry) {
+  const tableKey = formatTomlKey(name);
+  const lines = [`[mcp_servers.${tableKey}]`, ...renderOwnedLines(entry)];
+  const envLines = renderEnvLines(entry);
+  if (envLines.length > 0) {
+    lines.push("");
+    lines.push(`[mcp_servers.${tableKey}.env]`);
+    lines.push(...envLines);
+  }
+  return `${lines.join("\n")}
+`;
+}
+function isBlank(line) {
+  return line.trim() === "";
+}
+function joinSections(sections, eol) {
+  const lines = [];
+  for (const section of sections) {
+    if (section.header != null) {
+      lines.push(section.header);
+    }
+    lines.push(...section.body);
+  }
+  return lines.join(eol);
+}
+function writeMcpServerToml(text, name, entry) {
+  let eol = "\n";
+  if (text.includes("\r\n") == true) {
+    eol = "\r\n";
+  }
+  const sections = splitSections(text.split(/\r?\n/));
+  const isOwn = (section) => section.serverName === name;
+  if (entry == null) {
+    const kept = sections.filter((section) => isOwn(section) == false);
+    const removedText = joinSections(kept, eol);
+    return removedText;
+  }
+  const tableKey = formatTomlKey(name);
+  const envLines = renderEnvLines(entry);
+  const tableIndex = sections.findIndex((section) => isOwn(section) == true && section.subPath === "");
+  if (tableIndex < 0) {
+    const withoutStrayEnv = sections.filter((section) => (isOwn(section) == true && section.subPath === "env") == false);
+    let prefix = joinSections(withoutStrayEnv, eol);
+    if (prefix.trim() === "") {
+      prefix = "";
+    } else {
+      prefix = prefix.replace(/(\r?\n)*$/, "");
+      prefix = `${prefix}${eol}${eol}`;
+    }
+    const block = renderMcpServerTable(name, entry).replace(/\n/g, eol);
+    return `${prefix}${block}`;
+  }
+  const table = sections[tableIndex];
+  const ownedLineIndexes = /* @__PURE__ */ new Set();
+  for (const statement of readStatements(table.body)) {
+    if (OWNED_TABLE_KEYS.includes(statement.key) == true) {
+      for (let index = statement.start; index < statement.end; index += 1) {
+        ownedLineIndexes.add(index);
+      }
+    }
+  }
+  const userLines = table.body.filter((_line, index) => ownedLineIndexes.has(index) == false);
+  let trailingBlankCount = 0;
+  while (trailingBlankCount < userLines.length && isBlank(userLines[userLines.length - 1 - trailingBlankCount]) == true) {
+    trailingBlankCount += 1;
+  }
+  const trailingBlanks = userLines.slice(userLines.length - trailingBlankCount);
+  const userContent = userLines.slice(0, userLines.length - trailingBlankCount);
+  const rebuilt = [];
+  for (let index = 0; index < sections.length; index += 1) {
+    const section = sections[index];
+    if (isOwn(section) == true && section.subPath === "env") {
+      continue;
+    }
+    if (index !== tableIndex) {
+      rebuilt.push(section);
+      continue;
+    }
+    if (envLines.length === 0) {
+      rebuilt.push({ ...section, body: [...renderOwnedLines(entry), ...userContent, ...trailingBlanks] });
+      continue;
+    }
+    rebuilt.push({ ...section, body: [...renderOwnedLines(entry), ...userContent, ""] });
+    rebuilt.push({
+      header: `[mcp_servers.${tableKey}.env]`,
+      serverName: name,
+      subPath: "env",
+      body: [...envLines, ...trailingBlanks]
+    });
+  }
+  const rebuiltText = joinSections(rebuilt, eol);
+  return rebuiltText;
+}
+
+// src/modules/manage/targets/codex.ts
+var CODEX_CONFIG_PATH = path.join(os4.homedir(), ".codex", "config.toml");
+function createCodexTarget() {
+  function readText() {
+    if (fs7.existsSync(CODEX_CONFIG_PATH) == false) {
+      return "";
+    }
+    return fs7.readFileSync(CODEX_CONFIG_PATH, "utf8");
+  }
+  function writeText(text) {
+    fs7.mkdirSync(path.dirname(CODEX_CONFIG_PATH), { recursive: true });
+    fs7.writeFileSync(CODEX_CONFIG_PATH, text, "utf8");
+    return { status: "written", detail: CODEX_CONFIG_PATH };
+  }
+  return {
+    id: "codex",
+    label: "Codex CLI",
+    location: CODEX_CONFIG_PATH,
+    detected: findExecutable("codex") != null || fs7.existsSync(CODEX_CONFIG_PATH) == true,
+    readEntries() {
+      const text = readText();
+      return parseMcpServersToml(text);
+    },
+    writeEntry(name, entry) {
+      const text = readText();
+      const updated = writeMcpServerToml(text, name, entry);
+      return writeText(updated);
+    },
+    removeEntry(name) {
+      const text = readText();
+      const updated = writeMcpServerToml(text, name, null);
+      return writeText(updated);
+    }
+  };
 }
-function readIntegerEnv(name) {
-  const value = readEnv(name);
-  if (value == null) {
-    return void 0;
+
+// src/modules/manage/targets/index.ts
+function claudeDesktopConfigPath() {
+  if (process.platform === "win32") {
+    const appData = process.env.APPDATA ?? path.join(os4.homedir(), "AppData", "Roaming");
+    return path.join(appData, "Claude", "claude_desktop_config.json");
   }
-  const parsed = Number(value);
-  if (Number.isInteger(parsed) == false || parsed <= 0) {
-    throw new Error(`${name} must be a positive integer (got "${value}")`);
+  if (process.platform === "darwin") {
+    return path.join(os4.homedir(), "Library", "Application Support", "Claude", "claude_desktop_config.json");
   }
-  return parsed;
+  return path.join(os4.homedir(), ".config", "Claude", "claude_desktop_config.json");
 }
-function readListEnv(name) {
-  const value = readEnv(name);
-  if (value == null) {
-    return void 0;
+function listConfigTargets() {
+  const targets = [
+    createClaudeCodeTarget(),
+    createCodexTarget(),
+    createJsonFileTarget({ id: "claude-desktop", label: "Claude Desktop", filePath: claudeDesktopConfigPath() }),
+    createJsonFileTarget({ id: "cursor", label: "Cursor", filePath: path.join(os4.homedir(), ".cursor", "mcp.json") })
+  ];
+  const detected = targets.filter((target) => target.detected == true);
+  const others = targets.filter((target) => target.detected == false);
+  return [...detected, ...others];
+}
+
+// src/modules/manage/index.ts
+var SECRET_ENV_NAMES = [
+  SINGLE_HOST_ENV.PASSWORD,
+  SINGLE_HOST_ENV.PASSPHRASE,
+  SINGLE_HOST_ENV.JUMP_PASSWORD,
+  SINGLE_HOST_ENV.JUMP_PASSPHRASE
+];
+function errorMessage(error) {
+  if (error instanceof Error) {
+    return error.message;
   }
-  const items = value.split(",").map((item) => item.trim()).filter((item) => item !== "");
-  if (items.length === 0) {
-    return void 0;
+  return String(error);
+}
+function maskSecrets(entry) {
+  const env = {};
+  for (const [name, value] of Object.entries(entry.env)) {
+    if (SECRET_ENV_NAMES.includes(name) == true) {
+      env[name] = "********";
+      continue;
+    }
+    env[name] = value;
   }
-  return items;
+  return { ...entry, env };
 }
-function compileDenyPatterns(sources) {
-  return sources.map((source) => {
-    try {
-      return new RegExp(source, "i");
-    } catch (ex) {
-      const _logger = $logger.child({ context: "compileDenyPatterns" });
-      _logger.error(ex, "denyPatterns entry is not a valid regular expression");
-      let detail = String(ex);
-      if (ex instanceof Error) {
-        detail = ex.message;
+function formatForTarget(target, name, entry) {
+  if (target.id === "codex") {
+    return renderMcpServerTable(name, entry);
+  }
+  return `"${name}": ${JSON.stringify(entry, null, 4)}
+`;
+}
+function indent(text) {
+  return text.replace(/\n$/, "").split("\n").map((line) => `    ${line}`).join("\n");
+}
+function reportWrite(output, result, action) {
+  if (result.status === "written") {
+    output.write(`  ${action} \u2014 ${result.detail}
+`);
+    output.write("  Restart the client (or reconnect it from its MCP menu) to pick up the change.\n\n");
+    return;
+  }
+  output.write(`  Not ${action.toLowerCase()}: ${result.detail}
+
+`);
+}
+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 the host key ${result.hostKeyFingerprint}? (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 ${result.jumpHostKeyFingerprint}?`, 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;
+        }
       }
-      throw new Error(`${SINGLE_HOST_ENV.DENY_PATTERNS} has an invalid entry /${source}/: ${detail}`);
     }
-  });
+    const next = await prompter.askChoice(
+      "What now?",
+      [
+        { key: "r", label: "retry the check" },
+        { key: "e", label: "edit the answers" },
+        { key: "w", label: "write it anyway" },
+        { key: "c", label: "cancel" }
+      ],
+      "e"
+    );
+    if (next === "c") {
+      return null;
+    }
+    if (next === "w") {
+      return answers;
+    }
+    if (next === "e") {
+      output.write("\n");
+      answers = await askHostQuestions(prompter, answers);
+    }
+  }
 }
-function loadHostProfile() {
-  const host = readEnv(SINGLE_HOST_ENV.HOST);
-  if (host == null) {
-    const _startupLogger = $logger.child({ context: "loadHostProfile" });
-    _startupLogger.warn("no host is registered; set the connection variables and restart", {
-      env_vars: [SINGLE_HOST_ENV.HOST, SINGLE_HOST_ENV.USER]
-    });
+async function addOrEditHost(prompter, output, target, entries, existingName) {
+  let existing;
+  if (existingName != null) {
+    existing = entryToAnswers(existingName, entries[existingName]);
+    output.write(`
+Editing ${existingName}
+`);
+  } else {
+    output.write("\nAdding a host\n");
+  }
+  const asked = await askHostQuestions(prompter, existing);
+  output.write("\n");
+  const answers = await verifyAnswers(prompter, output, asked);
+  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(`
+  This goes into ${target.location}:
+
+`);
+  output.write(`${indent(formatForTarget(target, answers.name, maskSecrets(entry)))}
+
+`);
+  const confirmed = await prompter.askYesNo("Write it?", true);
+  if (confirmed == false) {
+    output.write("  Not written. The print view (p) gives the same entry ready to paste.\n\n");
+    return;
+  }
+  const written = target.writeEntry(answers.name, entry);
+  reportWrite(output, written, "Written");
+  if (written.status === "written" && existingName != null && existingName !== answers.name) {
+    const removed = target.removeEntry(existingName);
+    if (removed.status === "unavailable") {
+      output.write(`  The old name ${existingName} is still there: ${removed.detail}
+
+`);
+    }
+  }
+}
+async function checkHost(prompter, output, target, name, entry) {
+  output.write("\n");
+  const profile = profileFromEntry(output, entry);
+  if (profile == null) {
+    output.write("\n");
+    return;
+  }
+  const result = await runConnectionCheck(profile, output);
+  output.write("\n");
+  if (result.connected == false) {
+    return;
+  }
+  const env = { ...entry.env };
+  let changed = false;
+  if (result.hostKeyFingerprint != null && env[SINGLE_HOST_ENV.HOST_KEY] == null) {
+    const pin = await prompter.askYesNo(`Pin the host key ${result.hostKeyFingerprint}?`, true);
+    if (pin == true) {
+      env[SINGLE_HOST_ENV.HOST_KEY] = result.hostKeyFingerprint;
+      changed = true;
+    }
+  }
+  if (result.jumpHostKeyFingerprint != null && env[SINGLE_HOST_ENV.JUMP_HOST_KEY] == null) {
+    const pin = await prompter.askYesNo(`Pin the jump host key ${result.jumpHostKeyFingerprint}?`, true);
+    if (pin == true) {
+      env[SINGLE_HOST_ENV.JUMP_HOST_KEY] = result.jumpHostKeyFingerprint;
+      changed = true;
+    }
+  }
+  if (changed == true) {
+    const written = target.writeEntry(name, { ...entry, env });
+    reportWrite(output, written, "Pinned");
+  }
+}
+function printHost(output, name, entry) {
+  output.write('\n  JSON \u2014 Claude Desktop, Cursor, .mcp.json (inside "mcpServers"):\n\n');
+  output.write(`${indent(`"${name}": ${JSON.stringify(entry, null, 4)}`)}
+
+`);
+  output.write("  TOML \u2014 Codex (~/.codex/config.toml):\n\n");
+  output.write(`${indent(renderMcpServerTable(name, entry))}
+
+`);
+  output.write("  Claude Code CLI (bash / zsh / Git Bash):\n\n");
+  output.write(`${indent(formatClaudeAddCommand(name, entry))}
+
+`);
+}
+async function pickHost(prompter, output, names) {
+  if (names.length === 0) {
+    output.write("  No hosts yet \u2014 add one with a.\n\n");
     return null;
   }
-  const username = readEnv(SINGLE_HOST_ENV.USER);
-  if (username == null) {
-    throw new Error(`${SINGLE_HOST_ENV.HOST} is set, so ${SINGLE_HOST_ENV.USER} is required`);
+  if (names.length === 1) {
+    return names[0];
   }
-  const name = readEnv(SINGLE_HOST_ENV.NAME) ?? host;
-  const _logger = $logger.child({ context: "loadHostProfile", profile: name });
-  const allowCommands = readListEnv(SINGLE_HOST_ENV.ALLOW_COMMANDS) ?? [];
-  if (allowCommands.length > 0 && allowCommands.includes("pwd") == false) {
-    allowCommands.push("pwd");
+  for (; ; ) {
+    const answer = await prompter.ask("Which host (number or name, empty to go back)");
+    if (answer === "") {
+      return null;
+    }
+    const index = Number(answer);
+    if (Number.isInteger(index) == true && index >= 1 && index <= names.length) {
+      return names[index - 1];
+    }
+    if (names.includes(answer) == true) {
+      return answer;
+    }
+    output.write(`  No host "${answer}".
+`);
   }
-  const policy = {
-    readonly: readBooleanEnv(SINGLE_HOST_ENV.READONLY) ?? false,
-    allowSudo: readBooleanEnv(SINGLE_HOST_ENV.ALLOW_SUDO) ?? true,
-    execTimeoutMs: readIntegerEnv(SINGLE_HOST_ENV.EXEC_TIMEOUT_MS) ?? DEFAULT_EXEC_TIMEOUT_MS,
-    connectTimeoutMs: readIntegerEnv(SINGLE_HOST_ENV.CONNECT_TIMEOUT_MS) ?? DEFAULT_CONNECT_TIMEOUT_MS,
-    maxOutputCharacters: readIntegerEnv(SINGLE_HOST_ENV.MAX_OUTPUT_CHARACTERS) ?? DEFAULT_MAX_OUTPUT_CHARACTERS,
-    maxReadFileBytes: readIntegerEnv(SINGLE_HOST_ENV.MAX_READ_FILE_BYTES) ?? DEFAULT_MAX_READ_FILE_BYTES,
-    allowCommands,
-    denyPatterns: compileDenyPatterns(readListEnv(SINGLE_HOST_ENV.DENY_PATTERNS) ?? []),
-    allowedPaths: readListEnv(SINGLE_HOST_ENV.ALLOWED_PATHS) ?? []
-  };
-  const profile = {
-    name,
-    host,
-    port: readIntegerEnv(SINGLE_HOST_ENV.PORT) ?? DEFAULT_SSH_PORT,
-    username,
-    description: readEnv(SINGLE_HOST_ENV.DESCRIPTION),
-    passphrase: readEnv(SINGLE_HOST_ENV.PASSPHRASE),
-    password: readEnv(SINGLE_HOST_ENV.PASSWORD),
-    hostKeyFingerprint: readEnv(SINGLE_HOST_ENV.HOST_KEY),
-    defaultCwd: readEnv(SINGLE_HOST_ENV.CWD),
-    policy
-  };
-  const keyPath = readEnv(SINGLE_HOST_ENV.KEY);
-  if (keyPath != null) {
-    const expandedKeyPath = expandHomePath(keyPath);
-    profile.privateKeyPath = expandedKeyPath;
-    if (fs.existsSync(expandedKeyPath) == false) {
-      _logger.warn(`${SINGLE_HOST_ENV.KEY} does not exist; connections will fail`, {
-        private_key_path: expandedKeyPath
-      });
+}
+function renderHostList(output, target, entries) {
+  const names = Object.keys(entries).filter((name) => isOurEntry(entries[name]) == true);
+  const otherCount = Object.keys(entries).length - names.length;
+  output.write(`
+${target.label} \u2014 ${target.location}
+
+`);
+  if (names.length === 0) {
+    output.write("  No SSH hosts registered here yet.\n");
+  } else {
+    const rows = names.map((name, index) => {
+      const summary = summarizeEntry(entries[name]);
+      return [String(index + 1), name, summary.endpoint, summary.auth, summary.notes];
+    });
+    const header = ["#", "Server", "Endpoint", "Auth", "Notes"];
+    const widths = header.map((title, column) => Math.max(title.length, ...rows.map((row) => row[column].length)));
+    for (const row of [header, ...rows]) {
+      const line = row.map((cell, column) => cell.padEnd(widths[column])).join("  ").trimEnd();
+      output.write(`  ${line}
+`);
     }
   }
-  _logger.info("host profile loaded", {
-    host,
-    port: profile.port,
-    username,
-    readonly: policy.readonly
-  });
-  return profile;
+  if (otherCount > 0) {
+    output.write(`
+  ${otherCount} other MCP server(s) in this file are not managed here.
+`);
+  }
+  output.write("\n");
+  return names;
 }
-function toHostSummary(profile) {
-  let authMethod = "agent";
-  if (profile.privateKeyPath != null) {
-    authMethod = "privateKey";
-  } else if (profile.password != null) {
-    authMethod = "password";
+async function runConfigCommand(options) {
+  const { input, output } = options;
+  const targets = options.targets ?? listConfigTargets();
+  let target = targets[0];
+  if (options.targetId != null) {
+    const requested = targets.find((candidate) => candidate.id === options.targetId);
+    if (requested == null) {
+      output.write(`Unknown client "${options.targetId}". One of: ${targets.map((candidate) => candidate.id).join(", ")}
+`);
+      return 1;
+    }
+    target = requested;
+  }
+  const prompter = new Prompter(input, output);
+  try {
+    for (; ; ) {
+      let entries = {};
+      let names = [];
+      let readable = true;
+      try {
+        entries = target.readEntries();
+        names = renderHostList(output, target, entries);
+      } catch (ex) {
+        readable = false;
+        output.write(`
+${target.label} \u2014 ${target.location}
+
+  Cannot read it: ${errorMessage(ex)}
+  Fix the file by hand, or switch to another client.
+
+`);
+      }
+      let menu = "  t) switch client   q) quit";
+      if (readable == true && names.length > 0) {
+        menu = "  a) add   e) edit   r) remove   c) check   p) print   t) switch client   q) quit";
+      } else if (readable == true) {
+        menu = "  a) add   t) switch client   q) quit";
+      }
+      output.write(`${menu}
+`);
+      const action = (await prompter.ask("Choice")).toLowerCase();
+      if (action === "q" || action === "quit") {
+        return 0;
+      }
+      if (action === "t") {
+        const picked = await prompter.askChoice(
+          "Which client?",
+          targets.map((candidate) => {
+            let mark = "";
+            if (candidate.detected == true) {
+              mark = "  (detected)";
+            }
+            return { key: candidate.id, label: `${candidate.label} \u2014 ${candidate.location}${mark}` };
+          }),
+          target.id
+        );
+        target = targets.find((candidate) => candidate.id === picked) ?? target;
+        continue;
+      }
+      if (readable == false) {
+        output.write("  Not available while the file cannot be read.\n");
+        continue;
+      }
+      try {
+        if (action === "a") {
+          await addOrEditHost(prompter, output, target, entries);
+          continue;
+        }
+        if (action === "e" || action === "r" || action === "c" || action === "p") {
+          const name = await pickHost(prompter, output, names);
+          if (name == null) {
+            continue;
+          }
+          if (action === "e") {
+            await addOrEditHost(prompter, output, target, entries, name);
+          } else if (action === "r") {
+            const remove = await prompter.askYesNo(`Remove ${name} from ${target.location}?`, false);
+            if (remove == true) {
+              reportWrite(output, target.removeEntry(name), "Removed");
+            }
+          } else if (action === "c") {
+            await checkHost(prompter, output, target, name, entries[name]);
+          } else {
+            printHost(output, name, entries[name]);
+          }
+          continue;
+        }
+        output.write(`  Unknown choice "${action}".
+`);
+      } catch (ex) {
+        if (ex instanceof PromptClosedError) {
+          throw ex;
+        }
+        output.write(`  Failed: ${errorMessage(ex)}
+
+`);
+      }
+    }
+  } catch (ex) {
+    if (ex instanceof PromptClosedError) {
+      output.write("\n");
+      return 0;
+    }
+    throw ex;
+  } finally {
+    prompter.close();
   }
-  return {
-    name: profile.name,
-    host: profile.host,
-    port: profile.port,
-    username: profile.username,
-    description: profile.description,
-    authMethod,
-    readonly: profile.policy.readonly,
-    allowSudo: profile.policy.allowSudo,
-    allowedPaths: profile.policy.allowedPaths,
-    allowCommands: profile.policy.allowCommands
-  };
 }
 
 // src/modules/tools/format.ts
@@ -2136,6 +4058,16 @@ function formatHostProfile(profile) {
   if (summary.description != null) {
     lines.push(`    ${summary.description}`);
   }
+  const routeParts = [];
+  if (summary.viaProxyCommand == true) {
+    routeParts.push("proxy command");
+  }
+  if (summary.jump != null) {
+    routeParts.push(`jump host ${summary.jump.username}@${summary.jump.host}:${summary.jump.port}`);
+  }
+  if (routeParts.length > 0) {
+    lines.push(`    via ${routeParts.join(" \u2192 ")}`);
+  }
   if (summary.allowedPaths.length > 0) {
     lines.push(`    file tools limited to: ${summary.allowedPaths.join(", ")} (does not restrict ssh_exec)`);
   }
@@ -2516,7 +4448,7 @@ ${file.content}`);
         const { profile, session: openSession } = resolveProfile(context, { session });
         const resolvedLocalPath = expandHomePath(localPath);
         requirePermittedLocalPath(resolvedLocalPath, "read");
-        if (fs.existsSync(resolvedLocalPath) == false) {
+        if (fs7.existsSync(resolvedLocalPath) == false) {
           return textResult(`local file not found: ${resolvedLocalPath}`);
         }
         const transferredBytes = await withHostConnection(profile, openSession, async (connection) => {
@@ -2556,7 +4488,7 @@ ${file.content}`);
         const { profile, session: openSession } = resolveProfile(context, { session });
         const resolvedLocalPath = expandHomePath(localPath);
         requirePermittedLocalPath(resolvedLocalPath, "write");
-        fs.mkdirSync(path2.dirname(resolvedLocalPath), { recursive: true });
+        fs7.mkdirSync(path.dirname(resolvedLocalPath), { recursive: true });
         const transferredBytes = await withHostConnection(profile, openSession, async (connection) => {
           return await downloadFile(connection, remotePath, resolvedLocalPath);
         });
@@ -2780,8 +4712,23 @@ function createSshMcpServer() {
 
 // src/cli.ts
 function parseArguments(argv) {
-  const parsed = { showHelp: false, showVersion: false, checkOnly: false };
-  for (const argument of argv) {
+  const parsed = { showHelp: false, showVersion: false, checkOnly: false, configMode: false };
+  let rest = argv;
+  if (argv[0] === "config") {
+    parsed.configMode = true;
+    rest = argv.slice(1);
+  }
+  for (let index = 0; index < rest.length; index += 1) {
+    const argument = rest[index];
+    if (argument === "--target") {
+      parsed.targetId = rest[index + 1];
+      index += 1;
+      continue;
+    }
+    if (argument.startsWith("--target=") == true) {
+      parsed.targetId = argument.slice("--target=".length);
+      continue;
+    }
     if (argument === "--help" || argument === "-h") {
       parsed.showHelp = true;
       continue;
@@ -2802,10 +4749,18 @@ var HELP_TEXT = [
   "",
   "Usage:",
   "  akms-mcp-ssh [--check]",
+  "  akms-mcp-ssh config [--target <client>]",
+  "",
+  "Commands:",
+  "  config               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",
+  "                       (default: the first one installed)",
   "  -v, --version        Print the version and exit",
   "  -h, --help           Print this help and exit",
   "",
@@ -2820,6 +4775,11 @@ var HELP_TEXT = [
   `  ${SINGLE_HOST_ENV.NAME}          Alias shown to the model; defaults to the hostname`,
   `  ${SINGLE_HOST_ENV.DESCRIPTION}   Shown to the model \u2014 say what the host is for`,
   `  ${SINGLE_HOST_ENV.CWD}           Directory new sessions start in`,
+  `  ${SINGLE_HOST_ENV.PROXY_COMMAND} Command carrying the SSH stream on its stdin/stdout (OpenSSH ProxyCommand);`,
+  "                     %h / %p / %r expand to the first hop's host, port and user",
+  `  ${SINGLE_HOST_ENV.JUMP_HOST}     Jump host the target is reached through (OpenSSH ProxyJump / -J)`,
+  `  ${SINGLE_HOST_ENV.JUMP_PORT} / ${SINGLE_HOST_ENV.JUMP_USER} / ${SINGLE_HOST_ENV.JUMP_KEY} / ${SINGLE_HOST_ENV.JUMP_PASSPHRASE} / ${SINGLE_HOST_ENV.JUMP_PASSWORD} / ${SINGLE_HOST_ENV.JUMP_HOST_KEY}`,
+  `                     Jump host connection; user and key default to ${SINGLE_HOST_ENV.USER} / ${SINGLE_HOST_ENV.KEY}`,
   `  ${SINGLE_HOST_ENV.READONLY}      Reject write commands, redirections, uploads  (default false)`,
   `  ${SINGLE_HOST_ENV.ALLOW_SUDO}    Allow sudo / su / doas  (default true)`,
   `  ${SINGLE_HOST_ENV.ALLOW_COMMANDS}  Comma-separated allow-list of binaries`,
@@ -2831,60 +4791,14 @@ var HELP_TEXT = [
   "",
   "The server speaks MCP over stdio; run it from an MCP client, not interactively."
 ].join("\n");
-function describeAuth(profile) {
-  if (profile.privateKeyPath != null) {
-    return `key ${profile.privateKeyPath}`;
-  }
-  if (profile.password != null) {
-    return "password";
-  }
-  return "ssh agent";
-}
-async function runConnectionCheck(profile) {
+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}.
+    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
 `);
     return 1;
   }
-  const endpoint = `${profile.username}@${profile.host}:${profile.port}`;
-  const auth = describeAuth(profile);
-  process.stdout.write(`Checking ${profile.name}  \u2192  ${endpoint}
-
-`);
-  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;
-    }
-  } finally {
-    connection.disconnect();
-  }
-  const durationMs = Date.now() - startedAt;
-  if (connected == true) {
-    process.stdout.write(`  OK      ${endpoint}  (${auth}, ${durationMs}ms)
-`);
-  } else {
-    process.stdout.write(`  FAILED  ${endpoint}  (${auth})
-`);
-    process.stdout.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";
-    }
-    process.stdout.write(`          host key ${connection.hostKeyFingerprint}  (${pinNote})
-`);
-  }
-  if (connected == true) {
+  const result = await runConnectionCheck(profile, process.stdout);
+  if (result.connected == true) {
     return 0;
   }
   return 1;
@@ -2902,12 +4816,23 @@ async function main() {
 `);
     return;
   }
+  if (cliArguments.configMode == true) {
+    if (process.env[LOG_LEVEL_ENV] == null) {
+      process.env[LOG_LEVEL_ENV] = "warn";
+    }
+    const exitCode = await runConfigCommand({
+      input: process.stdin,
+      output: process.stdout,
+      targetId: cliArguments.targetId
+    });
+    process.exit(exitCode);
+  }
   if (cliArguments.checkOnly == true && process.env[LOG_LEVEL_ENV] == null) {
-    process.env[LOG_LEVEL_ENV] = "silent";
+    process.env[LOG_LEVEL_ENV] = "warn";
   }
   const instance = createSshMcpServer();
   if (cliArguments.checkOnly == true) {
-    const exitCode = await runConnectionCheck(instance.profile);
+    const exitCode = await runCheckCommand(instance.profile);
     instance.shutdown();
     process.exit(exitCode);
   }