@yawlabs/ssh-mcp 0.5.0 → 0.7.0

package/README.md

@@ -98,6 +98,18 @@ All connections respect your `~/.ssh/config`. Host aliases, custom ports, userna
 
 **ProxyJump / bastion hosts** are supported automatically. If your SSH config has `ProxyJump bastion` for a host, ssh-mcp connects through the bastion transparently. Chained proxies work too.
 
+### Host key verification
+
+All remote operations verify the server's host key against `~/.ssh/known_hosts`:
+
+- **Known host, key matches** — accept.
+- **Known host, key changed** — reject (MITM protection).
+- **Unknown host** — accept on first connection (TOFU). Use `ssh_known_hosts_fix` to pin the key for future mismatch detection.
+
+For stricter environments, set `SSH_MCP_STRICT_HOST_KEY=1` to reject unknown hosts. Add them explicitly with `ssh_known_hosts_fix` first.
+
+The diagnostic tools (`ssh_test`, `ssh_diagnose`) use `StrictHostKeyChecking=no` for their probe commands. Those probes only run `echo SSH_OK` — no credentials or data pass through — so the relaxed setting is safe for connectivity testing. Real operations always go through the `hostVerifier`.
+
 ### Windows support
 
 On Windows, ssh-mcp detects the OpenSSH Authentication Agent service automatically (via the `\\.\pipe\openssh-ssh-agent` named pipe). No `SSH_AUTH_SOCK` needed — just make sure the OpenSSH agent service is running.

package/dist/index.js

@@ -15,16 +15,21 @@ import { existsSync, readFileSync, readdirSync } from "fs";
 import { homedir } from "os";
 import { join } from "path";
 function isValidHostname(host) {
-  return /^[a-zA-Z0-9._\-:[\]]+$/.test(host) && host.length <= 253;
+  if (host.length === 0 || host.length > 253) return false;
+  if (host.startsWith("[")) {
+    return /^\[[0-9a-fA-F:]+\]$/.test(host);
+  }
+  return /^[a-zA-Z0-9._\-]+$/.test(host);
 }
 function runArgs(cmd, args) {
   try {
     const stdout = execFileSync(cmd, args, { encoding: "utf8", timeout: 1e4, stdio: ["pipe", "pipe", "pipe"] });
     return { stdout: stdout.trim(), ok: true };
   } catch (e) {
-    const stdout = e.stdout?.toString().trim() || "";
-    const stderr = e.stderr?.toString().trim() || "";
-    const output = [stdout, stderr].filter(Boolean).join("\n") || e.message || "";
+    const err = e;
+    const stdout = err.stdout?.toString().trim() || "";
+    const stderr = err.stderr?.toString().trim() || "";
+    const output = [stdout, stderr].filter(Boolean).join("\n") || err.message || "";
     return { stdout: output, ok: false };
   }
 }
@@ -42,12 +47,10 @@ ${stdout2}` };
         message: "Windows OpenSSH agent is running but has no keys loaded. Run: ssh-add <key-path>"
       };
     }
-    if (!stdout2.includes("Error connecting") && !stdout2.includes("unable to")) {
-      return {
-        status: "warning",
-        message: "Windows OpenSSH Authentication Agent may not be running. Start it: Get-Service ssh-agent | Set-Service -StartupType Automatic; Start-Service ssh-agent"
-      };
-    }
+    return {
+      status: "error",
+      message: "Windows OpenSSH Authentication Agent is not running. Start it: Get-Service ssh-agent | Set-Service -StartupType Automatic; Start-Service ssh-agent"
+    };
   }
   if (!sock) {
     return {
@@ -111,6 +114,9 @@ function checkSshKeys() {
   return { status: "ok", message: `Found SSH keys: ${found.join(", ")}` };
 }
 function checkKnownHosts(host) {
+  if (!isValidHostname(host)) {
+    return { status: "error", message: `Invalid hostname: "${host}"` };
+  }
   const knownHostsPath = join(homedir(), ".ssh", "known_hosts");
   if (!existsSync(knownHostsPath)) {
     return {
@@ -118,9 +124,6 @@ function checkKnownHosts(host) {
       message: "~/.ssh/known_hosts does not exist. First connection to any host will prompt for verification."
     };
   }
-  if (!isValidHostname(host)) {
-    return { status: "error", message: `Invalid hostname: "${host}"` };
-  }
   const { stdout, ok } = runArgs("ssh-keygen", ["-F", host]);
   if (!ok || !stdout.trim()) {
     return {
@@ -287,14 +290,50 @@ function resolveFromSshConfig(host) {
     return null;
   }
 }
+function readKnownHostsKeys(host, port) {
+  if (!isValidHostname(host)) return [];
+  const targets = port && port !== 22 ? [`[${host}]:${port}`, host] : [host];
+  const keys = [];
+  for (const target of targets) {
+    const { stdout, ok } = runArgs("ssh-keygen", ["-F", target]);
+    if (!ok || !stdout.trim()) continue;
+    for (const line of stdout.split("\n")) {
+      const trimmed = line.trim();
+      if (!trimmed || trimmed.startsWith("#")) continue;
+      const parts = trimmed.split(/\s+/);
+      if (parts.length < 3) continue;
+      try {
+        keys.push(Buffer.from(parts[2], "base64"));
+      } catch {
+      }
+    }
+  }
+  return keys;
+}
+function buildHostVerifier(hosts, port) {
+  const strict = process.env.SSH_MCP_STRICT_HOST_KEY === "1";
+  return (key) => {
+    const known = hosts.flatMap((h) => readKnownHostsKeys(h, port));
+    if (known.length === 0) {
+      return !strict;
+    }
+    return known.some((k) => k.equals(key));
+  };
+}
 function resolveConfig(config) {
   const sshConfig = resolveFromSshConfig(config.host);
+  const port = config.port || (sshConfig ? Number.parseInt(sshConfig.port, 10) : 22);
+  const verifierHosts = [config.host];
+  if (sshConfig?.hostname && sshConfig.hostname !== config.host) {
+    verifierHosts.push(sshConfig.hostname);
+  }
   const connectConfig = {
     host: sshConfig?.hostname || config.host,
-    port: config.port || (sshConfig ? Number.parseInt(sshConfig.port, 10) : 22),
+    port,
     username: config.username || sshConfig?.user || process.env.USER || process.env.USERNAME || "root",
     keepaliveInterval: 15e3,
-    keepaliveCountMax: 3
+    keepaliveCountMax: 3,
+    hostVerifier: buildHostVerifier(verifierHosts, port)
   };
   const agentSock = config.agent || process.env.SSH_AUTH_SOCK || (process.platform === "win32" ? "\\\\.\\pipe\\openssh-ssh-agent" : void 0);
   if (agentSock) {
@@ -423,9 +462,21 @@ function getSftp(client) {
     });
   });
 }
-async function readFile(client, remotePath) {
+var DEFAULT_MAX_READ_BYTES = 10 * 1024 * 1024;
+async function readFile(client, remotePath, maxBytes = DEFAULT_MAX_READ_BYTES) {
   const sftp = await getSftp(client);
   try {
+    const stats = await new Promise((resolve, reject) => {
+      sftp.stat(remotePath, (err, stats2) => {
+        if (err) return reject(err);
+        resolve(stats2);
+      });
+    });
+    if (stats.size > maxBytes) {
+      throw new Error(
+        `File is ${(stats.size / 1024 / 1024).toFixed(1)} MB, exceeds ${(maxBytes / 1024 / 1024).toFixed(0)} MB limit. Use ssh_exec with head/tail to read a portion.`
+      );
+    }
     return await new Promise((resolve, reject) => {
       sftp.readFile(remotePath, (err, data) => {
         if (err) return reject(err);
@@ -493,8 +544,10 @@ async function listDir(client, remotePath) {
 var ConnectionPool = class {
   entries = /* @__PURE__ */ new Map();
   idleTtlMs;
+  maxPoolSize;
   constructor(options) {
     this.idleTtlMs = options?.idleTtlMs ?? 6e4;
+    this.maxPoolSize = options?.maxPoolSize ?? 100;
   }
   async acquire(config) {
     const resolved = resolveConfig(config);
@@ -512,6 +565,24 @@ var ConnectionPool = class {
     if (existing?.dead) {
       this.entries.delete(key);
     }
+    if (this.entries.size >= this.maxPoolSize) {
+      let evicted = false;
+      for (const [k, e] of this.entries) {
+        if (e.refCount === 0) {
+          if (e.idleTimer) clearTimeout(e.idleTimer);
+          try {
+            e.client.end();
+          } catch {
+          }
+          this.entries.delete(k);
+          evicted = true;
+          break;
+        }
+      }
+      if (!evicted) {
+        throw new Error(`Connection pool is full (${this.maxPoolSize} active connections)`);
+      }
+    }
     try {
       const client = await connectWithProxy(resolved);
       const entry = { client, key, refCount: 1, idleTimer: null, dead: false };
@@ -924,7 +995,18 @@ async function multiExec(pool, hosts, command, timeoutMs = 3e4) {
     };
   });
 }
+var VALID_FIND_SIZE = /^\d+[kMGTP]?$/;
 async function find(client, options, timeoutMs = 3e4) {
+  if (options.minsize && !VALID_FIND_SIZE.test(options.minsize)) {
+    throw new Error(
+      `Invalid minsize format: "${options.minsize}". Expected: digits followed by optional k/M/G/T/P (e.g. "1M", "100k")`
+    );
+  }
+  if (options.maxsize && !VALID_FIND_SIZE.test(options.maxsize)) {
+    throw new Error(
+      `Invalid maxsize format: "${options.maxsize}". Expected: digits followed by optional k/M/G/T/P (e.g. "10M", "500k")`
+    );
+  }
   const args = [shellQuote(options.path)];
   if (options.maxdepth !== void 0) args.push("-maxdepth", String(options.maxdepth));
   if (options.type) args.push("-type", options.type);
@@ -967,11 +1049,11 @@ async function serviceStatus(client, serviceName, timeoutMs = 3e4) {
 
 // src/tools.ts
 var HostSchema = z.string().describe("SSH hostname or IP address");
-var PortSchema = z.number().optional().describe("SSH port (default: 22)");
+var PortSchema = z.number().int().min(1).max(65535).optional().describe("SSH port (default: 22)");
 var UsernameSchema = z.string().optional().describe("SSH username (default: current user)");
 var KeyPathSchema = z.string().optional().describe("Path to SSH private key");
 var PasswordSchema = z.string().optional().describe("SSH password (prefer keys)");
-var TimeoutSchema = z.number().optional().describe("Command timeout in milliseconds (default: 30000)");
+var TimeoutSchema = z.number().int().positive().optional().describe("Command timeout in milliseconds (default: 30000)");
 var connectionParams = {
   host: HostSchema,
   port: PortSchema,
@@ -983,10 +1065,10 @@ function registerTools(server, pool) {
   const connectionPool = pool ?? new ConnectionPool();
   server.tool(
     "ssh_exec",
-    "Execute a command on a remote host via SSH. Returns stdout, stderr, and exit code.",
+    "Execute a command on a remote host via SSH. The command is interpreted by the remote login shell \u2014 pipes, redirects, globs, and other shell metacharacters work as expected. Returns stdout, stderr, and exit code.",
     {
       ...connectionParams,
-      command: z.string().describe("Shell command to execute on the remote host"),
+      command: z.string().describe("Shell command to execute on the remote host (interpreted by the remote login shell)"),
       timeout: TimeoutSchema
     },
     async ({ host, port, username, privateKeyPath, password, command, timeout }) => {
@@ -1099,7 +1181,7 @@ ${result.stderr}`);
           lines.push(`  - ${s}`);
         }
       }
-      return { content: [{ type: "text", text: lines.join("\n") }] };
+      return { content: [{ type: "text", text: lines.join("\n") }], isError: report.overall === "error" };
     }
   );
   server.tool(
@@ -1236,13 +1318,14 @@ ${result.stderr}`);
     {
       hosts: z.array(z.string()).describe("List of SSH hostnames or IPs"),
       command: z.string().describe("Shell command to execute on all hosts"),
+      port: PortSchema,
       username: UsernameSchema,
       privateKeyPath: KeyPathSchema,
       password: PasswordSchema,
       timeout: TimeoutSchema
     },
-    async ({ hosts, command, username, privateKeyPath, password, timeout }) => {
-      const hostConfigs = hosts.map((host) => ({ host, username, privateKeyPath, password }));
+    async ({ hosts, command, port, username, privateKeyPath, password, timeout }) => {
+      const hostConfigs = hosts.map((host) => ({ host, port, username, privateKeyPath, password }));
       const results = await multiExec(connectionPool, hostConfigs, command, timeout || 3e4);
       const lines = [];
       for (const r of results) {
@@ -1353,7 +1436,7 @@ ${files.join("\n")}` }] };
 function createServer(pool) {
   const server = new McpServer({
     name: "ssh-mcp",
-    version: "0.5.0"
+    version: "0.7.0"
   });
   registerTools(server, pool);
   return server;

package/dist/server.d.ts

@@ -18,13 +18,14 @@ interface ResolvedConfig {
     connectConfig: ConnectConfig;
     proxyJump?: string;
 }
+declare function readKnownHostsKeys(host: string, port?: number): Buffer[];
 declare function resolveConfig(config: SSHConfig): ResolvedConfig;
 declare function formatDiagnostics(host: string): string;
 declare function connectRaw(connectConfig: ConnectConfig): Promise<Client>;
 declare function connectWithProxy(resolved: ResolvedConfig): Promise<Client>;
 declare function connect(config: SSHConfig): Promise<Client>;
 declare function exec(client: Client, command: string, timeoutMs?: number): Promise<ExecResult>;
-declare function readFile(client: Client, remotePath: string): Promise<string>;
+declare function readFile(client: Client, remotePath: string, maxBytes?: number): Promise<string>;
 declare function writeFile(client: Client, remotePath: string, content: string): Promise<void>;
 declare function uploadFile(client: Client, localPath: string, remotePath: string): Promise<void>;
 declare function downloadFile(client: Client, remotePath: string, localPath: string): Promise<void>;
@@ -33,10 +34,13 @@ declare function listDir(client: Client, remotePath: string): Promise<string[]>;
 interface PoolOptions {
     /** Milliseconds before an idle connection is closed. Default: 60000 (60s) */
     idleTtlMs?: number;
+    /** Maximum number of connections in the pool. Default: 100 */
+    maxPoolSize?: number;
 }
 declare class ConnectionPool {
     private entries;
     private idleTtlMs;
+    private maxPoolSize;
     constructor(options?: PoolOptions);
     acquire(config: SSHConfig): Promise<Client>;
     release(client: Client): void;
@@ -161,4 +165,4 @@ declare function testConnection(host: string, port?: number): {
 
 declare function createServer(pool?: ConnectionPool): McpServer;
 
-export { type AgentResult, type ConfigLookupResult, ConnectionPool, type DiagnosticReport, type DiagnosticResult, type ExecResult, type FindOptions, type KeyInfo, type MultiExecHost, type MultiExecResult, type PoolOptions, type ResolvedConfig, type SSHConfig, type ServiceStatus, checkConnectivity, checkGitSsh, checkKnownHosts, checkSshAgent, checkSshConfig, checkSshKeys, configLookup, connect, connectRaw, connectWithProxy, createServer, diagnose, downloadFile, ensureAgent, exec, find, fixKnownHosts, formatDiagnostics, listDir, listSshKeys, loadKey, multiExec, readFile, registerTools, resolveConfig, serviceStatus, tail, testConnection, uploadFile, writeFile };
+export { type AgentResult, type ConfigLookupResult, ConnectionPool, type DiagnosticReport, type DiagnosticResult, type ExecResult, type FindOptions, type KeyInfo, type MultiExecHost, type MultiExecResult, type PoolOptions, type ResolvedConfig, type SSHConfig, type ServiceStatus, checkConnectivity, checkGitSsh, checkKnownHosts, checkSshAgent, checkSshConfig, checkSshKeys, configLookup, connect, connectRaw, connectWithProxy, createServer, diagnose, downloadFile, ensureAgent, exec, find, fixKnownHosts, formatDiagnostics, listDir, listSshKeys, loadKey, multiExec, readFile, readKnownHostsKeys, registerTools, resolveConfig, serviceStatus, tail, testConnection, uploadFile, writeFile };

package/dist/server.js

@@ -10,16 +10,21 @@ import { existsSync, readFileSync, readdirSync } from "fs";
 import { homedir } from "os";
 import { join } from "path";
 function isValidHostname(host) {
-  return /^[a-zA-Z0-9._\-:[\]]+$/.test(host) && host.length <= 253;
+  if (host.length === 0 || host.length > 253) return false;
+  if (host.startsWith("[")) {
+    return /^\[[0-9a-fA-F:]+\]$/.test(host);
+  }
+  return /^[a-zA-Z0-9._\-]+$/.test(host);
 }
 function runArgs(cmd, args) {
   try {
     const stdout = execFileSync(cmd, args, { encoding: "utf8", timeout: 1e4, stdio: ["pipe", "pipe", "pipe"] });
     return { stdout: stdout.trim(), ok: true };
   } catch (e) {
-    const stdout = e.stdout?.toString().trim() || "";
-    const stderr = e.stderr?.toString().trim() || "";
-    const output = [stdout, stderr].filter(Boolean).join("\n") || e.message || "";
+    const err = e;
+    const stdout = err.stdout?.toString().trim() || "";
+    const stderr = err.stderr?.toString().trim() || "";
+    const output = [stdout, stderr].filter(Boolean).join("\n") || err.message || "";
     return { stdout: output, ok: false };
   }
 }
@@ -37,12 +42,10 @@ ${stdout2}` };
         message: "Windows OpenSSH agent is running but has no keys loaded. Run: ssh-add <key-path>"
       };
     }
-    if (!stdout2.includes("Error connecting") && !stdout2.includes("unable to")) {
-      return {
-        status: "warning",
-        message: "Windows OpenSSH Authentication Agent may not be running. Start it: Get-Service ssh-agent | Set-Service -StartupType Automatic; Start-Service ssh-agent"
-      };
-    }
+    return {
+      status: "error",
+      message: "Windows OpenSSH Authentication Agent is not running. Start it: Get-Service ssh-agent | Set-Service -StartupType Automatic; Start-Service ssh-agent"
+    };
   }
   if (!sock) {
     return {
@@ -106,6 +109,9 @@ function checkSshKeys() {
   return { status: "ok", message: `Found SSH keys: ${found.join(", ")}` };
 }
 function checkKnownHosts(host) {
+  if (!isValidHostname(host)) {
+    return { status: "error", message: `Invalid hostname: "${host}"` };
+  }
   const knownHostsPath = join(homedir(), ".ssh", "known_hosts");
   if (!existsSync(knownHostsPath)) {
     return {
@@ -113,9 +119,6 @@ function checkKnownHosts(host) {
       message: "~/.ssh/known_hosts does not exist. First connection to any host will prompt for verification."
     };
   }
-  if (!isValidHostname(host)) {
-    return { status: "error", message: `Invalid hostname: "${host}"` };
-  }
   const { stdout, ok } = runArgs("ssh-keygen", ["-F", host]);
   if (!ok || !stdout.trim()) {
     return {
@@ -578,14 +581,50 @@ function resolveFromSshConfig(host) {
     return null;
   }
 }
+function readKnownHostsKeys(host, port) {
+  if (!isValidHostname(host)) return [];
+  const targets = port && port !== 22 ? [`[${host}]:${port}`, host] : [host];
+  const keys = [];
+  for (const target of targets) {
+    const { stdout, ok } = runArgs("ssh-keygen", ["-F", target]);
+    if (!ok || !stdout.trim()) continue;
+    for (const line of stdout.split("\n")) {
+      const trimmed = line.trim();
+      if (!trimmed || trimmed.startsWith("#")) continue;
+      const parts = trimmed.split(/\s+/);
+      if (parts.length < 3) continue;
+      try {
+        keys.push(Buffer.from(parts[2], "base64"));
+      } catch {
+      }
+    }
+  }
+  return keys;
+}
+function buildHostVerifier(hosts, port) {
+  const strict = process.env.SSH_MCP_STRICT_HOST_KEY === "1";
+  return (key) => {
+    const known = hosts.flatMap((h) => readKnownHostsKeys(h, port));
+    if (known.length === 0) {
+      return !strict;
+    }
+    return known.some((k) => k.equals(key));
+  };
+}
 function resolveConfig(config) {
   const sshConfig = resolveFromSshConfig(config.host);
+  const port = config.port || (sshConfig ? Number.parseInt(sshConfig.port, 10) : 22);
+  const verifierHosts = [config.host];
+  if (sshConfig?.hostname && sshConfig.hostname !== config.host) {
+    verifierHosts.push(sshConfig.hostname);
+  }
   const connectConfig = {
     host: sshConfig?.hostname || config.host,
-    port: config.port || (sshConfig ? Number.parseInt(sshConfig.port, 10) : 22),
+    port,
     username: config.username || sshConfig?.user || process.env.USER || process.env.USERNAME || "root",
     keepaliveInterval: 15e3,
-    keepaliveCountMax: 3
+    keepaliveCountMax: 3,
+    hostVerifier: buildHostVerifier(verifierHosts, port)
   };
   const agentSock = config.agent || process.env.SSH_AUTH_SOCK || (process.platform === "win32" ? "\\\\.\\pipe\\openssh-ssh-agent" : void 0);
   if (agentSock) {
@@ -732,9 +771,21 @@ function getSftp(client) {
     });
   });
 }
-async function readFile(client, remotePath) {
+var DEFAULT_MAX_READ_BYTES = 10 * 1024 * 1024;
+async function readFile(client, remotePath, maxBytes = DEFAULT_MAX_READ_BYTES) {
   const sftp = await getSftp(client);
   try {
+    const stats = await new Promise((resolve, reject) => {
+      sftp.stat(remotePath, (err, stats2) => {
+        if (err) return reject(err);
+        resolve(stats2);
+      });
+    });
+    if (stats.size > maxBytes) {
+      throw new Error(
+        `File is ${(stats.size / 1024 / 1024).toFixed(1)} MB, exceeds ${(maxBytes / 1024 / 1024).toFixed(0)} MB limit. Use ssh_exec with head/tail to read a portion.`
+      );
+    }
     return await new Promise((resolve, reject) => {
       sftp.readFile(remotePath, (err, data) => {
         if (err) return reject(err);
@@ -824,7 +875,18 @@ async function multiExec(pool, hosts, command, timeoutMs = 3e4) {
     };
   });
 }
+var VALID_FIND_SIZE = /^\d+[kMGTP]?$/;
 async function find(client, options, timeoutMs = 3e4) {
+  if (options.minsize && !VALID_FIND_SIZE.test(options.minsize)) {
+    throw new Error(
+      `Invalid minsize format: "${options.minsize}". Expected: digits followed by optional k/M/G/T/P (e.g. "1M", "100k")`
+    );
+  }
+  if (options.maxsize && !VALID_FIND_SIZE.test(options.maxsize)) {
+    throw new Error(
+      `Invalid maxsize format: "${options.maxsize}". Expected: digits followed by optional k/M/G/T/P (e.g. "10M", "500k")`
+    );
+  }
   const args = [shellQuote(options.path)];
   if (options.maxdepth !== void 0) args.push("-maxdepth", String(options.maxdepth));
   if (options.type) args.push("-type", options.type);
@@ -869,8 +931,10 @@ async function serviceStatus(client, serviceName, timeoutMs = 3e4) {
 var ConnectionPool = class {
   entries = /* @__PURE__ */ new Map();
   idleTtlMs;
+  maxPoolSize;
   constructor(options) {
     this.idleTtlMs = options?.idleTtlMs ?? 6e4;
+    this.maxPoolSize = options?.maxPoolSize ?? 100;
   }
   async acquire(config) {
     const resolved = resolveConfig(config);
@@ -888,6 +952,24 @@ var ConnectionPool = class {
     if (existing?.dead) {
       this.entries.delete(key);
     }
+    if (this.entries.size >= this.maxPoolSize) {
+      let evicted = false;
+      for (const [k, e] of this.entries) {
+        if (e.refCount === 0) {
+          if (e.idleTimer) clearTimeout(e.idleTimer);
+          try {
+            e.client.end();
+          } catch {
+          }
+          this.entries.delete(k);
+          evicted = true;
+          break;
+        }
+      }
+      if (!evicted) {
+        throw new Error(`Connection pool is full (${this.maxPoolSize} active connections)`);
+      }
+    }
     try {
       const client = await connectWithProxy(resolved);
       const entry = { client, key, refCount: 1, idleTimer: null, dead: false };
@@ -978,11 +1060,11 @@ ${diag}`);
 
 // src/tools.ts
 var HostSchema = z.string().describe("SSH hostname or IP address");
-var PortSchema = z.number().optional().describe("SSH port (default: 22)");
+var PortSchema = z.number().int().min(1).max(65535).optional().describe("SSH port (default: 22)");
 var UsernameSchema = z.string().optional().describe("SSH username (default: current user)");
 var KeyPathSchema = z.string().optional().describe("Path to SSH private key");
 var PasswordSchema = z.string().optional().describe("SSH password (prefer keys)");
-var TimeoutSchema = z.number().optional().describe("Command timeout in milliseconds (default: 30000)");
+var TimeoutSchema = z.number().int().positive().optional().describe("Command timeout in milliseconds (default: 30000)");
 var connectionParams = {
   host: HostSchema,
   port: PortSchema,
@@ -994,10 +1076,10 @@ function registerTools(server, pool) {
   const connectionPool = pool ?? new ConnectionPool();
   server.tool(
     "ssh_exec",
-    "Execute a command on a remote host via SSH. Returns stdout, stderr, and exit code.",
+    "Execute a command on a remote host via SSH. The command is interpreted by the remote login shell \u2014 pipes, redirects, globs, and other shell metacharacters work as expected. Returns stdout, stderr, and exit code.",
     {
       ...connectionParams,
-      command: z.string().describe("Shell command to execute on the remote host"),
+      command: z.string().describe("Shell command to execute on the remote host (interpreted by the remote login shell)"),
       timeout: TimeoutSchema
     },
     async ({ host, port, username, privateKeyPath, password, command, timeout }) => {
@@ -1110,7 +1192,7 @@ ${result.stderr}`);
           lines.push(`  - ${s}`);
         }
       }
-      return { content: [{ type: "text", text: lines.join("\n") }] };
+      return { content: [{ type: "text", text: lines.join("\n") }], isError: report.overall === "error" };
     }
   );
   server.tool(
@@ -1247,13 +1329,14 @@ ${result.stderr}`);
     {
       hosts: z.array(z.string()).describe("List of SSH hostnames or IPs"),
       command: z.string().describe("Shell command to execute on all hosts"),
+      port: PortSchema,
       username: UsernameSchema,
       privateKeyPath: KeyPathSchema,
       password: PasswordSchema,
       timeout: TimeoutSchema
     },
-    async ({ hosts, command, username, privateKeyPath, password, timeout }) => {
-      const hostConfigs = hosts.map((host) => ({ host, username, privateKeyPath, password }));
+    async ({ hosts, command, port, username, privateKeyPath, password, timeout }) => {
+      const hostConfigs = hosts.map((host) => ({ host, port, username, privateKeyPath, password }));
       const results = await multiExec(connectionPool, hostConfigs, command, timeout || 3e4);
       const lines = [];
       for (const r of results) {
@@ -1364,7 +1447,7 @@ ${files.join("\n")}` }] };
 function createServer(pool) {
   const server = new McpServer({
     name: "ssh-mcp",
-    version: "0.5.0"
+    version: "0.7.0"
   });
   registerTools(server, pool);
   return server;
@@ -1394,6 +1477,7 @@ export {
   loadKey,
   multiExec,
   readFile,
+  readKnownHostsKeys,
   registerTools,
   resolveConfig,
   serviceStatus,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yawlabs/ssh-mcp",
-  "version": "0.5.0",
+  "version": "0.7.0",
   "description": "MCP server for SSH operations with built-in diagnostics",
   "type": "module",
   "bin": {