mcp-ssh-pty 1.2.0 → 1.2.2

package/dist/shell-manager.d.ts

@@ -3,6 +3,7 @@ import { ShellResult, ShellConfig } from "./types.js";
 export declare class ShellManager {
     private shell;
     private localProcess;
+    private ptyProcess;
     private outputBuffer;
     private outputLines;
     private lastOutputTime;
@@ -14,7 +15,7 @@ export declare class ShellManager {
      */
     open(client: Client): Promise<void>;
     /**
-     * 打开本地 Shell
+     * 打开本地 Shell（使用 node-pty 创建真正的 PTY）
      */
     openLocal(): Promise<void>;
     /**

package/dist/shell-manager.js

@@ -1,4 +1,4 @@
-import { spawn } from "child_process";
+import * as pty from "node-pty";
 const DEFAULT_CONFIG = {
     quickTimeout: 2000,
     maxTimeout: 5000,
@@ -8,6 +8,7 @@ const DEFAULT_CONFIG = {
 export class ShellManager {
     shell = null;
     localProcess = null;
+    ptyProcess = null;
     outputBuffer = "";
     outputLines = [];
     lastOutputTime = 0;
@@ -37,42 +38,39 @@ export class ShellManager {
         });
     }
     /**
-     * 打开本地 Shell
+     * 打开本地 Shell（使用 node-pty 创建真正的 PTY）
      */
     async openLocal() {
         return new Promise((resolve, reject) => {
             try {
                 // 检测系统默认 shell
-                const shellPath = process.env.SHELL || (process.platform === "win32" ? "cmd.exe" : "/bin/sh");
-                const proc = spawn(shellPath, [], {
-                    stdio: ["pipe", "pipe", "pipe"],
-                    env: { ...process.env, TERM: "xterm-256color" },
+                const shellPath = process.env.SHELL || (process.platform === "win32" ? "powershell.exe" : "/bin/sh");
+                // 使用 node-pty 创建真正的 PTY
+                const ptyProc = pty.spawn(shellPath, [], {
+                    name: "xterm-256color",
+                    cols: 120,
+                    rows: 40,
+                    cwd: process.cwd(),
+                    env: process.env,
                 });
-                this.localProcess = proc;
+                this.ptyProcess = ptyProc;
                 this.isLocal = true;
                 // 创建统一的 stream 接口
                 const dataListeners = [];
                 const closeListeners = [];
                 const errorListeners = [];
-                proc.stdout?.on("data", (data) => {
-                    dataListeners.forEach((l) => l(data));
+                ptyProc.onData((data) => {
+                    dataListeners.forEach((l) => l(Buffer.from(data)));
                 });
-                proc.stderr?.on("data", (data) => {
-                    dataListeners.forEach((l) => l(data));
-                });
-                proc.on("close", () => {
+                ptyProc.onExit(() => {
                     closeListeners.forEach((l) => l());
                 });
-                proc.on("error", (err) => {
-                    errorListeners.forEach((l) => l(err));
-                });
                 const stream = {
                     write: (data) => {
-                        proc.stdin?.write(data);
+                        ptyProc.write(data);
                     },
                     end: () => {
-                        proc.stdin?.end();
-                        proc.kill();
+                        ptyProc.kill();
                     },
                     on: ((event, listener) => {
                         if (event === "data") {
@@ -88,10 +86,10 @@ export class ShellManager {
                 };
                 this.shell = stream;
                 this.setupStream(stream);
-                // 等待初始化
+                // 等待初始提示符
                 setTimeout(() => {
                     resolve();
-                }, 300);
+                }, 500);
             }
             catch (error) {
                 reject(new Error(`无法打开本地 shell: ${error instanceof Error ? error.message : String(error)}`));
@@ -124,6 +122,7 @@ export class ShellManager {
         stream.on("close", () => {
             this.shell = null;
             this.localProcess = null;
+            this.ptyProcess = null;
         });
         stream.on("error", (err) => {
             console.error("Shell error:", err.message);
@@ -223,6 +222,10 @@ export class ShellManager {
             this.localProcess.kill();
             this.localProcess = null;
         }
+        if (this.ptyProcess) {
+            this.ptyProcess.kill();
+            this.ptyProcess = null;
+        }
         this.outputLines = [];
         this.outputBuffer = "";
         this.isLocal = false;
@@ -248,8 +251,14 @@ export class ShellManager {
                 const newLines = this.outputLines.slice(startLineCount);
                 const currentOutput = newLines.join("\n") +
                     (this.outputBuffer ? "\n" + this.outputBuffer : "");
-                const lastLine = this.outputBuffer ||
+                // 获取最后一行用于提示符检测
+                // 处理 \r（回车）：取最后一个 \r 后面的内容，因为那才是当前可见的行
+                let lastLine = this.outputBuffer ||
                     (newLines.length > 0 ? newLines[newLines.length - 1] : "");
+                const lastCR = lastLine.lastIndexOf("\r");
+                if (lastCR !== -1) {
+                    lastLine = lastLine.slice(lastCR + 1);
+                }
                 const hasPrompt = this.detectPrompt(lastLine);
                 // 检测输出是否稳定（连续 3 次检查没有新输出）
                 if (this.lastOutputTime <= lastCheckTime) {
@@ -296,8 +305,13 @@ export class ShellManager {
      * 私有方法：检测提示符
      */
     detectPrompt(line) {
-        // 移除 ANSI 转义序列
-        const cleanLine = line.replace(/\x1b\[[0-9;]*m/g, "").trim();
+        // 移除 ANSI 转义序列（更完整的正则）
+        const cleanLine = line
+            .replace(/\x1b\[[0-9;]*[a-zA-Z]/g, "") // 标准 ANSI 序列
+            .replace(/\x1b\][^\x07]*\x07/g, "") // OSC 序列 (如 \e]2;...\a)
+            .replace(/\x1b\][^\x1b]*\x1b\\/g, "") // OSC 序列 (如 \e]7;...\e\)
+            .replace(/[\x00-\x1f]/g, "") // 其他控制字符
+            .trim();
         if (!cleanLine)
             return false;
         // 常见提示符模式
@@ -310,6 +324,10 @@ export class ShellManager {
             /\)\s*[$#>]\s*$/, // )$ 或 )# 结尾（一些自定义 PS1）
             /~\s*[$#>]\s*$/, // ~$ 结尾
             /@.*:\s*[$#>]\s*$/, // user@host: $ 格式
+            /^➜\s+/, // oh-my-zsh robbyrussell 主题 (➜ 开头)
+            /❯\s*$/, // pure/starship 主题
+            /λ\s*$/, // lambda 主题
+            /^\s*%\s*$/, // zsh 默认提示符
         ];
         return patterns.some((p) => p.test(cleanLine));
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mcp-ssh-pty",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "description": "MCP Server for SSH remote command execution with PTY shell support",
   "type": "module",
   "main": "dist/index.js",
@@ -33,6 +33,7 @@
     "@inquirer/prompts": "^8.1.0",
     "@modelcontextprotocol/sdk": "^1.0.0",
     "commander": "^14.0.2",
+    "node-pty": "^1.1.0",
     "ssh2": "^1.16.0",
     "zod": "^3.24.0"
   },