mcp-ssh-server-tool 1.0.4 → 1.0.6

package/index.js

@@ -248,20 +248,51 @@ const tools = [
   },
   {
     name: 'ssh_exec',
-    description: 'Execute a command on an active SSH session',
+    description: 'Execute a command on an SSH session. Use session_id if you have an active session, or provide host/username/password to connect directly.',
     inputSchema: {
       type: 'object',
       properties: {
         session_id: {
           type: 'string',
-          description: 'The SSH session ID from ssh_connect',
+          description: 'The SSH session ID from ssh_connect (optional if providing host/username/password)',
         },
         command: {
           type: 'string',
           description: 'The command to execute',
         },
+        host: {
+          type: 'string',
+          description: 'Server hostname (optional, used if session_id not provided)',
+        },
+        port: {
+          type: 'number',
+          description: 'SSH port (default: 22)',
+          default: 22,
+        },
+        username: {
+          type: 'string',
+          description: 'SSH username (optional)',
+        },
+        password: {
+          type: 'string',
+          description: 'SSH password (optional)',
+        },
+        auth_type: {
+          type: 'string',
+          enum: ['password', 'public_key'],
+          description: 'Authentication type (default: password)',
+          default: 'password',
+        },
+        private_key_path: {
+          type: 'string',
+          description: 'Private key path (for public_key auth)',
+        },
+        passphrase: {
+          type: 'string',
+          description: 'Passphrase for private key',
+        },
       },
-      required: ['session_id', 'command'],
+      required: ['command'],
     },
   },
   {
@@ -394,9 +425,38 @@ function handleRequest(request) {
     }
 
     if (name === 'ssh_exec') {
-      const execResult = sshManager.execCommand(toolArgs.session_id, toolArgs.command);
-      if (execResult && typeof execResult.then === 'function') {
-        execResult.then((result) => {
+      // 如果有 session_id，使用现有会话
+      if (toolArgs.session_id) {
+        const execResult = sshManager.execCommand(toolArgs.session_id, toolArgs.command);
+        if (execResult && typeof execResult.then === 'function') {
+          execResult.then((result) => {
+            send({
+              jsonrpc: '2.0',
+              id,
+              result: {
+                content: [
+                  {
+                    type: 'text',
+                    text: JSON.stringify(result),
+                  },
+                ],
+              },
+            });
+          }).catch((err) => {
+            send({
+              jsonrpc: '2.0',
+              id,
+              result: {
+                content: [
+                  {
+                    type: 'text',
+                    text: JSON.stringify({ success: false, error: err.message }),
+                  },
+                ],
+              },
+            });
+          });
+        } else {
           send({
             jsonrpc: '2.0',
             id,
@@ -404,12 +464,29 @@ function handleRequest(request) {
               content: [
                 {
                   type: 'text',
-                  text: JSON.stringify(result),
+                  text: JSON.stringify(execResult),
                 },
               ],
             },
           });
-        }).catch((err) => {
+        }
+        return;
+      }
+
+      // 如果没有 session_id，但提供了认证参数，直接连接、执行、断开
+      if (toolArgs.host && toolArgs.username) {
+        const connResult = await sshManager.connect({
+          host: toolArgs.host,
+          port: toolArgs.port,
+          username: toolArgs.username,
+          authType: toolArgs.auth_type || 'password',
+          password: toolArgs.password,
+          privateKeyPath: toolArgs.private_key_path,
+          passphrase: toolArgs.passphrase,
+          timeout: toolArgs.timeout,
+        });
+
+        if (!connResult.success) {
           send({
             jsonrpc: '2.0',
             id,
@@ -417,13 +494,17 @@ function handleRequest(request) {
               content: [
                 {
                   type: 'text',
-                  text: JSON.stringify({ success: false, error: err.message }),
+                  text: JSON.stringify(connResult),
                 },
               ],
             },
           });
-        });
-      } else {
+          return;
+        }
+
+        const execResult = await sshManager.execCommand(connResult.sessionId, toolArgs.command);
+        sshManager.disconnect(connResult.sessionId);
+
         send({
           jsonrpc: '2.0',
           id,
@@ -436,7 +517,22 @@ function handleRequest(request) {
             ],
           },
         });
+        return;
       }
+
+      // 既没有 session_id 也没有认证参数
+      send({
+        jsonrpc: '2.0',
+        id,
+        result: {
+          content: [
+            {
+              type: 'text',
+              text: JSON.stringify({ success: false, error: 'Either session_id or host/username is required' }),
+            },
+          ],
+        },
+      });
       return;
     }
 

package/package.json

@@ -1,15 +1,12 @@
 {
   "name": "mcp-ssh-server-tool",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "MCP Server for SSH connections and remote command execution",
   "main": "index.js",
   "type": "module",
-  "bin": {
-    "mcp-ssh-server-tool": "./bin/cli.js"
-  },
+  "bin": "bin/cli.js",
   "scripts": {
-    "start": "node index.js",
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "start": "node index.js"
   },
   "keywords": ["mcp", "ssh", "server", "mcp-server", "remote-execution"],
   "author": "",