@yawlabs/ssh-mcp 0.8.0 → 0.9.0

package/dist/server.d.ts

@@ -57,8 +57,6 @@ declare class ConnectionPool {
     get connectCount(): number;
 }
 
-declare function registerTools(server: McpServer, pool?: ConnectionPool): void;
-
 interface DiagnosticResult {
     status: "ok" | "warning" | "error";
     message: string;
@@ -77,43 +75,6 @@ declare function checkConnectivity(host: string, port?: number): DiagnosticResul
 declare function checkSshConfig(host: string): DiagnosticResult;
 declare function diagnose(host: string, port?: number): DiagnosticReport;
 
-interface MultiExecResult {
-    host: string;
-    stdout: string;
-    stderr: string;
-    code: number;
-    error?: string;
-}
-interface MultiExecHost {
-    host: string;
-    port?: number;
-    username?: string;
-    privateKeyPath?: string;
-    password?: string;
-}
-declare function multiExec(pool: ConnectionPool, hosts: MultiExecHost[], command: string, timeoutMs?: number): Promise<MultiExecResult[]>;
-interface FindOptions {
-    path: string;
-    name?: string;
-    type?: "f" | "d" | "l";
-    maxdepth?: number;
-    minsize?: string;
-    maxsize?: string;
-    newer?: string;
-}
-declare function find(client: Client, options: FindOptions, timeoutMs?: number): Promise<string[]>;
-declare function tail(client: Client, path: string, lines?: number, grep?: string, timeoutMs?: number): Promise<string>;
-interface ServiceStatus {
-    name: string;
-    active: boolean;
-    status: string;
-    description?: string;
-    since?: string;
-    pid?: number;
-    raw: string;
-}
-declare function serviceStatus(client: Client, serviceName: string, timeoutMs?: number): Promise<ServiceStatus>;
-
 interface KeyInfo {
     name: string;
     path: string;
@@ -167,6 +128,45 @@ declare function testConnection(host: string, port?: number): {
     message: string;
 };
 
+interface MultiExecResult {
+    host: string;
+    stdout: string;
+    stderr: string;
+    code: number;
+    error?: string;
+}
+interface MultiExecHost {
+    host: string;
+    port?: number;
+    username?: string;
+    privateKeyPath?: string;
+    password?: string;
+}
+declare function multiExec(pool: ConnectionPool, hosts: MultiExecHost[], command: string, timeoutMs?: number): Promise<MultiExecResult[]>;
+interface FindOptions {
+    path: string;
+    name?: string;
+    type?: "f" | "d" | "l";
+    maxdepth?: number;
+    minsize?: string;
+    maxsize?: string;
+    newer?: string;
+}
+declare function find(client: Client, options: FindOptions, timeoutMs?: number): Promise<string[]>;
+declare function tail(client: Client, path: string, lines?: number, grep?: string, timeoutMs?: number): Promise<string>;
+interface ServiceStatus {
+    name: string;
+    active: boolean;
+    status: string;
+    description?: string;
+    since?: string;
+    pid?: number;
+    raw: string;
+}
+declare function serviceStatus(client: Client, serviceName: string, timeoutMs?: number): Promise<ServiceStatus>;
+
+declare function registerTools(server: McpServer, pool?: ConnectionPool): void;
+
 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, readKnownHostsKeys, registerTools, resolveConfig, serviceStatus, tail, testConnection, uploadFile, writeFile };

package/dist/server.js

@@ -1,4 +1,7 @@
 // src/server.ts
+import { readFileSync as readFileSync4 } from "fs";
+import { dirname, join as join4 } from "path";
+import { fileURLToPath } from "url";
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 
 // src/tools.ts
@@ -6,7 +9,7 @@ import { z } from "zod";
 
 // src/diagnose.ts
 import { execFileSync } from "child_process";
-import { existsSync, readFileSync, readdirSync } from "fs";
+import { existsSync, readdirSync, readFileSync } from "fs";
 import { homedir } from "os";
 import { join } from "path";
 function isValidHostname(host) {
@@ -14,7 +17,7 @@ function isValidHostname(host) {
   if (host.startsWith("[")) {
     return /^\[[0-9a-fA-F:]+\]$/.test(host);
   }
-  return /^[a-zA-Z0-9._\-]+$/.test(host);
+  return /^[a-zA-Z0-9._-]+$/.test(host);
 }
 function runArgs(cmd, args) {
   try {
@@ -256,7 +259,7 @@ function diagnose(host, port = 22) {
 }
 
 // src/env.ts
-import { appendFileSync, existsSync as existsSync2, readFileSync as readFileSync2, readdirSync as readdirSync2, statSync } from "fs";
+import { appendFileSync, existsSync as existsSync2, readdirSync as readdirSync2, readFileSync as readFileSync2, statSync } from "fs";
 import { homedir as homedir2 } from "os";
 import { join as join2 } from "path";
 function probeAgent(socket, agentLabel) {
@@ -273,6 +276,7 @@ function probeAgent(socket, agentLabel) {
     message: keys.length > 0 ? `${agentLabel} running with ${keys.length} key(s) loaded` : `${agentLabel} running but no keys loaded. Use ssh_key_load to add one.`
   };
 }
+var startedAgentPid = null;
 function ensureAgent() {
   const sock = process.env.SSH_AUTH_SOCK;
   if (sock) {
@@ -289,7 +293,10 @@ function ensureAgent() {
     const pidMatch = stdout.match(/SSH_AGENT_PID=([^;]+)/);
     if (sockMatch) {
       process.env.SSH_AUTH_SOCK = sockMatch[1];
-      if (pidMatch) process.env.SSH_AGENT_PID = pidMatch[1];
+      if (pidMatch) {
+        process.env.SSH_AGENT_PID = pidMatch[1];
+        startedAgentPid = Number.parseInt(pidMatch[1], 10);
+      }
       return {
         running: true,
         reachable: true,
@@ -746,6 +753,7 @@ var DEFAULT_MAX_EXEC_BYTES = 10 * 1024 * 1024;
 function exec(client, command, timeoutMs = 3e4, maxBytes = DEFAULT_MAX_EXEC_BYTES) {
   return new Promise((resolve, reject) => {
     let settled = false;
+    let activeStream = null;
     const settle = (fn) => {
       if (settled) return;
       settled = true;
@@ -753,6 +761,16 @@ function exec(client, command, timeoutMs = 3e4, maxBytes = DEFAULT_MAX_EXEC_BYTE
       fn();
     };
     const timer = setTimeout(() => {
+      if (activeStream) {
+        try {
+          activeStream.signal("TERM");
+        } catch {
+        }
+        try {
+          activeStream.close();
+        } catch {
+        }
+      }
       settle(() => reject(new Error(`Command timed out after ${timeoutMs}ms`)));
     }, timeoutMs);
     client.exec(command, (err, stream) => {
@@ -760,6 +778,7 @@ function exec(client, command, timeoutMs = 3e4, maxBytes = DEFAULT_MAX_EXEC_BYTE
         settle(() => reject(err));
         return;
       }
+      activeStream = stream;
       const stdoutChunks = [];
       const stderrChunks = [];
       let stdoutBytes = 0;
@@ -935,7 +954,7 @@ async function find(client, options, timeoutMs = 3e4) {
       `Invalid maxsize format: "${options.maxsize}". Expected: digits followed by optional k/M/G/T/P (e.g. "10M", "500k")`
     );
   }
-  const args = [shellQuote(options.path)];
+  const args = ["--", shellQuote(options.path)];
   if (options.maxdepth !== void 0) args.push("-maxdepth", String(options.maxdepth));
   if (options.type) args.push("-type", options.type);
   if (options.name) args.push("-name", shellQuote(options.name));
@@ -950,9 +969,9 @@ async function find(client, options, timeoutMs = 3e4) {
   return result.stdout.split("\n").filter(Boolean);
 }
 async function tail(client, path, lines = 100, grep, timeoutMs = 3e4) {
-  let command = `tail -n ${lines} ${shellQuote(path)}`;
+  let command = `tail -n ${lines} -- ${shellQuote(path)}`;
   if (grep) {
-    command += ` | grep -i ${shellQuote(grep)}`;
+    command += ` | grep -i -e ${shellQuote(grep)}`;
   }
   const result = await exec(client, command, timeoutMs);
   if (result.stderr.trim()) {
@@ -961,16 +980,17 @@ async function tail(client, path, lines = 100, grep, timeoutMs = 3e4) {
   return result.stdout;
 }
 async function serviceStatus(client, serviceName, timeoutMs = 3e4) {
-  const result = await exec(client, `systemctl status ${shellQuote(serviceName)} 2>&1`, timeoutMs);
+  const result = await exec(client, `systemctl status -- ${shellQuote(serviceName)} 2>&1`, timeoutMs);
   const raw = result.stdout;
   const activeMatch = raw.match(/Active:\s+(\S+)\s+\(([^)]+)\)/);
   const descMatch = raw.match(/^\s+.*?-\s+(.+)$/m);
   const pidMatch = raw.match(/Main PID:\s+(\d+)/);
   const sinceMatch = raw.match(/since\s+(.+?);/);
+  const fallbackStatus = result.code === 0 ? "active" : "inactive";
   return {
     name: serviceName,
     active: activeMatch?.[1] === "active",
-    status: activeMatch ? `${activeMatch[1]} (${activeMatch[2]})` : result.code === 0 ? "active" : "unknown",
+    status: activeMatch ? `${activeMatch[1]} (${activeMatch[2]})` : fallbackStatus,
     description: descMatch?.[1]?.trim(),
     since: sinceMatch?.[1]?.trim(),
     pid: pidMatch ? Number.parseInt(pidMatch[1], 10) : void 0,
@@ -1525,10 +1545,12 @@ ${files.join("\n")}` }] };
 }
 
 // src/server.ts
+var pkgPath = join4(dirname(fileURLToPath(import.meta.url)), "..", "package.json");
+var { version } = JSON.parse(readFileSync4(pkgPath, "utf8"));
 function createServer(pool) {
   const server = new McpServer({
     name: "ssh-mcp",
-    version: "0.7.0"
+    version
   });
   registerTools(server, pool);
   return server;

package/package.json

@@ -1,61 +1,61 @@
-{
-  "name": "@yawlabs/ssh-mcp",
-  "version": "0.8.0",
-  "description": "MCP server for SSH operations with built-in diagnostics",
-  "type": "module",
-  "bin": {
-    "ssh-mcp": "dist/index.js"
-  },
-  "exports": {
-    ".": {
-      "import": "./dist/server.js",
-      "types": "./dist/server.d.ts"
-    }
-  },
-  "files": [
-    "dist",
-    "LICENSE",
-    "README.md"
-  ],
-  "scripts": {
-    "build": "tsup",
-    "dev": "tsup --watch",
-    "lint": "biome check src/",
-    "lint:fix": "biome check --write src/",
-    "typecheck": "tsc --noEmit",
-    "test": "vitest run",
-    "test:integration": "docker compose -f test/docker/docker-compose.yml up -d --build --wait && SSH_MCP_INTEGRATION=1 vitest run src/tests/integration.test.ts; docker compose -f test/docker/docker-compose.yml down",
-    "test:ci": "npm run build && npm test",
-    "prepublishOnly": "npm run build"
-  },
-  "keywords": [
-    "mcp",
-    "ssh",
-    "remote",
-    "model-context-protocol",
-    "ai",
-    "devops"
-  ],
-  "author": "Yaw Labs <contact@yaw.sh>",
-  "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/YawLabs/ssh-mcp.git"
-  },
-  "engines": {
-    "node": ">=18"
-  },
-  "dependencies": {
-    "@modelcontextprotocol/sdk": "^1.29.0",
-    "ssh2": "^1.16.0",
-    "zod": "^3.24.4"
-  },
-  "devDependencies": {
-    "@biomejs/biome": "^1.9.4",
-    "@types/node": "^22.15.2",
-    "@types/ssh2": "^1.15.4",
-    "tsup": "^8.5.1",
-    "typescript": "^5.8.3",
-    "vitest": "^3.2.4"
-  }
-}
+{
+  "name": "@yawlabs/ssh-mcp",
+  "version": "0.9.0",
+  "description": "MCP server for SSH operations with built-in diagnostics",
+  "type": "module",
+  "bin": {
+    "ssh-mcp": "dist/index.js"
+  },
+  "exports": {
+    ".": {
+      "import": "./dist/server.js",
+      "types": "./dist/server.d.ts"
+    }
+  },
+  "files": [
+    "dist",
+    "LICENSE",
+    "README.md"
+  ],
+  "scripts": {
+    "build": "tsup",
+    "dev": "tsup --watch",
+    "lint": "biome check src/",
+    "lint:fix": "biome check --write src/",
+    "typecheck": "tsc --noEmit",
+    "test": "vitest run",
+    "test:integration": "docker compose -f test/docker/docker-compose.yml up -d --build --wait && SSH_MCP_INTEGRATION=1 vitest run src/tests/integration.test.ts; docker compose -f test/docker/docker-compose.yml down",
+    "test:ci": "npm run build && npm test",
+    "prepublishOnly": "npm run build"
+  },
+  "keywords": [
+    "mcp",
+    "ssh",
+    "remote",
+    "model-context-protocol",
+    "ai",
+    "devops"
+  ],
+  "author": "Yaw Labs <contact@yaw.sh>",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/YawLabs/ssh-mcp.git"
+  },
+  "engines": {
+    "node": ">=18"
+  },
+  "dependencies": {
+    "@modelcontextprotocol/sdk": "^1.29.0",
+    "ssh2": "^1.16.0",
+    "zod": "^4.3.6"
+  },
+  "devDependencies": {
+    "@biomejs/biome": "^2.4.13",
+    "@types/node": "^25.6.0",
+    "@types/ssh2": "^1.15.4",
+    "tsup": "^8.5.1",
+    "typescript": "^6.0.3",
+    "vitest": "^4.1.5"
+  }
+}