mcp-ssh-server-tool 2.0.0 → 2.0.1

package/index.js

@@ -5,75 +5,78 @@ const sshManager = new SSHConnectionManager();
 const tools = [
   {
     name: 'ssh_connect',
-    description: 'Establish an SSH connection. Returns session_id for subsequent commands.',
+    description: '建立 SSH 连接（仅在需要连续执行多个命令时使用，单次执行请使用 ssh_exec）',
     inputSchema: {
       type: 'object',
       properties: {
-        host: { type: 'string', description: 'Server hostname or IP' },
-        port: { type: 'number', description: 'SSH port (default: 22)', default: 22 },
-        username: { type: 'string', description: 'SSH username' },
-        password: { type: 'string', description: 'Password (for password auth)' },
-        auth_type: { type: 'string', enum: ['password', 'public_key'], description: 'Auth type' },
-        private_key_path: { type: 'string', description: 'Path to private key' },
-        passphrase: { type: 'string', description: 'Passphrase for private key' },
-        timeout: { type: 'number', description: 'Timeout in seconds (default: 10)', default: 10 },
+        host: { type: 'string', description: '服务器地址或 IP' },
+        port: { type: 'number', description: 'SSH 端口（默认: 22）', default: 22 },
+        username: { type: 'string', description: 'SSH 用户名' },
+        password: { type: 'string', description: '密码（密码认证时必填）' },
+        auth_type: { type: 'string', enum: ['password', 'public_key'], description: '认证方式' },
+        private_key_path: { type: 'string', description: '私钥路径（公钥认证时使用，二选一）' },
+        private_key_content: { type: 'string', description: '私钥文本内容（公钥认证时使用，二选一）' },
+        passphrase: { type: 'string', description: '私钥密码（可选）' },
+        timeout: { type: 'number', description: '超时时间（秒，默认: 10）', default: 10 },
       },
       required: ['host', 'username'],
     },
   },
   {
     name: 'ssh_exec',
-    description: 'Execute command(s) on SSH server. Supports direct mode (host/username) or session mode (session_id).',
+    description: '【推荐】执行 SSH 命令。单次执行直接传入 host/username/password 会自动连接、执行、断开。多次连续执行时才需要先用 ssh_connect 获取 session_id。',
     inputSchema: {
       type: 'object',
       properties: {
-        host: { type: 'string', description: 'Server hostname (use for direct execution)' },
-        port: { type: 'number', description: 'SSH port', default: 22 },
-        username: { type: 'string', description: 'SSH username' },
-        password: { type: 'string', description: 'Password' },
-        auth_type: { type: 'string', enum: ['password', 'public_key'], description: 'Auth type' },
-        private_key_path: { type: 'string', description: 'Path to private key' },
-        passphrase: { type: 'string', description: 'Passphrase for private key' },
-        timeout: { type: 'number', description: 'Timeout in seconds', default: 10 },
-        session_id: { type: 'string', description: 'Session ID from ssh_connect (use for session mode)' },
-        command: { type: 'string', description: 'Command to execute' },
-        commands: { type: 'array', items: { type: 'string' }, description: 'Multiple commands to execute sequentially' },
+        host: { type: 'string', description: '服务器地址（单次执行时必填）' },
+        port: { type: 'number', description: 'SSH 端口（默认: 22）', default: 22 },
+        username: { type: 'string', description: 'SSH 用户名（单次执行时必填）' },
+        password: { type: 'string', description: '密码（单次执行时必填）' },
+        auth_type: { type: 'string', enum: ['password', 'public_key'], description: '认证方式（默认: password）', default: 'password' },
+        private_key_path: { type: 'string', description: '私钥路径（公钥认证时使用，二选一）' },
+        private_key_content: { type: 'string', description: '私钥文本内容（公钥认证时使用，二选一）' },
+        passphrase: { type: 'string', description: '私钥密码' },
+        timeout: { type: 'number', description: '超时时间（秒）', default: 10 },
+        session_id: { type: 'string', description: '会话 ID（连续执行多命令时使用，先调用 ssh_connect 获取）' },
+        command: { type: 'string', description: '要执行的命令（单个命令）' },
+        commands: { type: 'array', items: { type: 'string' }, description: '要执行的命令列表（多个命令按顺序执行）' },
       },
     },
   },
   {
     name: 'ssh_disconnect',
-    description: 'Close an SSH session',
+    description: '关闭 SSH 会话（使用 ssh_connect 后需要手动断开）',
     inputSchema: {
       type: 'object',
       properties: {
-        session_id: { type: 'string', description: 'Session ID to disconnect' },
+        session_id: { type: 'string', description: '要断开的会话 ID'},
       },
       required: ['session_id'],
     },
   },
   {
     name: 'ssh_test',
-    description: 'Quick connection test. Connects, executes a test command, and disconnects.',
+    description: '快速测试 SSH 连接。连接成功后执行测试命令，然后自动断开。',
     inputSchema: {
       type: 'object',
       properties: {
-        host: { type: 'string', description: 'Server hostname' },
-        port: { type: 'number', description: 'SSH port', default: 22 },
-        username: { type: 'string', description: 'SSH username' },
-        password: { type: 'string', description: 'Password' },
-        auth_type: { type: 'string', enum: ['password', 'public_key'], description: 'Auth type' },
-        private_key_path: { type: 'string', description: 'Path to private key' },
-        passphrase: { type: 'string', description: 'Passphrase' },
-        timeout: { type: 'number', description: 'Timeout in seconds', default: 10 },
-        test_command: { type: 'string', description: 'Test command (default: echo test)', default: 'echo test' },
+        host: { type: 'string', description: '服务器地址' },
+        port: { type: 'number', description: 'SSH 端口', default: 22 },
+        username: { type: 'string', description: 'SSH 用户名' },
+        password: { type: 'string', description: '密码' },
+        auth_type: { type: 'string', enum: ['password', 'public_key'], description: '认证方式' },
+        private_key_path: { type: 'string', description: '私钥路径（公钥认证时使用，二选一）' },
+        private_key_content: { type: 'string', description: '私钥文本内容（公钥认证时使用，二选一）' },
+        passphrase: { type: 'string', description: '私钥密码' },
+        timeout: { type: 'number', description: '超时时间（秒）', default: 10 },
+        test_command: { type: 'string', description: '测试命令（默认: echo test）', default: 'echo test' },
       },
       required: ['host', 'username'],
     },
   },
   {
     name: 'ssh_list_sessions',
-    description: 'List active SSH sessions',
+    description: '列出当前活跃的 SSH 会话',
     inputSchema: { type: 'object', properties: {} },
   },
 ];
@@ -127,6 +130,7 @@ async function handleRequest(request) {
         username: toolArgs.username,
         password: toolArgs.password,
         privateKeyPath: toolArgs.private_key_path,
+        privateKeyContent: toolArgs.private_key_content,
         passphrase: toolArgs.passphrase,
         timeout: toolArgs.timeout,
       });
@@ -150,6 +154,7 @@ async function handleRequest(request) {
           username: toolArgs.username,
           password: toolArgs.password,
           privateKeyPath: toolArgs.private_key_path,
+          privateKeyContent: toolArgs.private_key_content,
           passphrase: toolArgs.passphrase,
           timeout: toolArgs.timeout,
         });
@@ -196,6 +201,7 @@ async function handleRequest(request) {
         username: toolArgs.username,
         password: toolArgs.password,
         privateKeyPath: toolArgs.private_key_path,
+        privateKeyContent: toolArgs.private_key_content,
         passphrase: toolArgs.passphrase,
         timeout: toolArgs.timeout,
       });

package/package.json

@@ -1,10 +1,12 @@
 {
   "name": "mcp-ssh-server-tool",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "MCP Server for SSH connections and remote command execution",
   "main": "index.js",
   "type": "module",
-  "bin": "bin/cli.js",
+  "bin": {
+    "mcp-ssh-server-tool": "bin/cli.js"
+  },
   "scripts": {
     "start": "node index.js"
   },

package/ssh_manager.js

@@ -26,7 +26,7 @@ class SSHConnectionManager {
         port: options.port || 22,
         username: options.username,
         password: options.password,
-        privateKey: options.privateKeyPath ? this._readPrivateKey(options.privateKeyPath) : undefined,
+        privateKey: options.privateKeyContent || (options.privateKeyPath ? this._readPrivateKey(options.privateKeyPath) : undefined),
         passphrase: options.passphrase,
         readyTimeout: (options.timeout || 10) * 1000,
         keepaliveInterval: 0,