@adversity/coding-tool-x 2.4.2 → 2.5.1

package/src/server/services/pty-manager.js

@@ -10,6 +10,8 @@ const fs = require('fs');
 // 尝试加载 node-pty，如果失败则提示
 let pty = null;
 let ptyError = null;
+let HeadlessTerminal = null;
+let headlessError = null;
 
 try {
   // 优先使用 @lydell/node-pty (支持更新的 Node.js 版本)
@@ -24,6 +26,14 @@ try {
   }
 }
 
+try {
+  const headless = require('@xterm/headless');
+  HeadlessTerminal = headless.Terminal || headless.default?.Terminal || headless.default || null;
+} catch (err) {
+  headlessError = err.message;
+  console.warn('Warning: @xterm/headless failed to load:', err.message);
+}
+
 class PtyManager {
   constructor() {
     // 终端进程池: terminalId -> { pty, ws, metadata }
@@ -32,6 +42,89 @@ class PtyManager {
 
     // 清理已退出的进程
     this.cleanupInterval = setInterval(() => this.cleanupDeadTerminals(), 30000);
+    // 避免在未启用 Web 终端时阻止进程退出
+    if (typeof this.cleanupInterval.unref === 'function') {
+      this.cleanupInterval.unref();
+    }
+  }
+
+  createScreen(cols, rows) {
+    if (!HeadlessTerminal) {
+      return null;
+    }
+    try {
+      return new HeadlessTerminal({
+        cols: Math.max(cols, 80),
+        rows: Math.max(rows, 24),
+        scrollback: 10000,
+        convertEol: true
+      });
+    } catch (err) {
+      console.warn('Failed to create headless terminal:', err.message);
+      return null;
+    }
+  }
+
+  buildScreenSnapshot(terminal) {
+    if (!terminal?.screen || !terminal.screen.buffer?.active) {
+      return { data: '' };
+    }
+    const screen = terminal.screen;
+    const buffer = screen.buffer.active;
+    const end = buffer.length;
+    const cols = screen.cols || terminal.metadata?.cols || 80;
+    const rows = screen.rows || terminal.metadata?.rows || 24;
+    const cursorLineIndex = Math.max(0, (buffer.baseY || 0) + (buffer.cursorY || 0));
+    const cursorCol = Math.max(0, buffer.cursorX || 0);
+    const lastLineIndex = end > 0 ? end - 1 : -1;
+    let output = '';
+    let hasOutput = false;
+    for (let i = 0; i <= lastLineIndex; i++) {
+      const line = buffer.getLine(i);
+      if (!line) {
+        if (hasOutput) {
+          output += '\r\n';
+        } else {
+          output = '';
+          hasOutput = true;
+        }
+        continue;
+      }
+      let text = '';
+      try {
+        text = line.translateToString(true);
+      } catch (err) {
+        try {
+          text = line.translateToString(false);
+        } catch (err2) {
+          text = '';
+        }
+      }
+      const isWrapped = Boolean(line.isWrapped);
+      if (!hasOutput) {
+        output = text;
+        hasOutput = true;
+      } else if (isWrapped) {
+        output += text;
+      } else {
+        output += '\r\n' + text;
+      }
+    }
+    const data = hasOutput ? output : '';
+    const topIndex = Math.max(0, lastLineIndex - rows + 1);
+    let cursorRow = cursorLineIndex - topIndex + 1;
+    if (!Number.isFinite(cursorRow)) {
+      cursorRow = rows;
+    }
+    cursorRow = Math.min(Math.max(cursorRow, 1), rows);
+    const cursorColSafe = Math.min(Math.max(cursorCol + 1, 1), cols);
+    return {
+      data,
+      cursorRow,
+      cursorCol: cursorColSafe,
+      rows,
+      cols
+    };
   }
 
   /**
@@ -164,9 +257,14 @@ class PtyManager {
       pty: ptyProcess,
       ws: null,
       buffer: [], // 缓存未发送的输出（用于 WebSocket 断开期间）
-      history: [], // 持久历史记录（用于重连时恢复）
+      history: [], // 断线期间的输出缓冲（仅用于补发）
       historySize: 0, // 历史记录字节大小
       maxHistorySize: 100 * 1024, // 最大历史记录大小 100KB
+      screen: this.createScreen(cols, rows),
+      pendingOutput: [],
+      snapshotInProgress: false,
+      outputSeq: 0,
+      snapshotSeq: 0,
       metadata: {
         cwd,
         shell,
@@ -183,23 +281,36 @@ class PtyManager {
 
     // 监听 PTY 输出
     ptyProcess.onData((data) => {
-      // 始终保存到历史记录（用于重连时恢复）
-      terminal.history.push(data);
-      terminal.historySize += data.length;
-
-      // 如果历史记录超出限制，裁剪前面的内容
-      while (terminal.historySize > terminal.maxHistorySize && terminal.history.length > 1) {
-        const removed = terminal.history.shift();
-        terminal.historySize -= removed.length;
+      terminal.outputSeq += 1;
+      const outputEntry = { seq: terminal.outputSeq, data };
+      if (terminal.screen) {
+        terminal.screen.write(data);
       }
 
       if (terminal.ws && terminal.ws.readyState === 1) { // WebSocket.OPEN
-        terminal.ws.send(JSON.stringify({
-          type: 'terminal:output',
-          terminalId,
-          data
-        }));
-      } else {
+        if (terminal.snapshotInProgress) {
+          terminal.pendingOutput.push(outputEntry);
+        } else {
+          terminal.ws.send(JSON.stringify({
+            type: 'terminal:output',
+            terminalId,
+            data
+          }));
+        }
+        return;
+      }
+
+      if (!terminal.screen) {
+        // 仅在断开期间缓存输出，避免重连时重复回放
+        terminal.history.push(data);
+        terminal.historySize += data.length;
+
+        // 如果历史记录超出限制，裁剪前面的内容
+        while (terminal.historySize > terminal.maxHistorySize && terminal.history.length > 1) {
+          const removed = terminal.history.shift();
+          terminal.historySize -= removed.length;
+        }
+
         // 缓存输出，等待 WebSocket 连接
         terminal.buffer.push(data);
         // 限制缓存大小
@@ -225,6 +336,7 @@ class PtyManager {
       // 标记为已退出，稍后清理
       terminal.exited = true;
       terminal.exitCode = exitCode;
+      terminal.exitedAt = Date.now();
     });
 
     this.terminals.set(terminalId, terminal);
@@ -253,7 +365,7 @@ class PtyManager {
    * @param {WebSocket} ws - WebSocket 连接
    * @returns {boolean} 是否成功
    */
-  attachWebSocket(terminalId, ws) {
+  attachWebSocket(terminalId, ws, options = {}) {
     const terminal = this.terminals.get(terminalId);
     if (!terminal) {
       console.warn(`Terminal ${terminalId} not found`);
@@ -261,20 +373,114 @@ class PtyManager {
     }
 
     terminal.ws = ws;
+    terminal.snapshotInProgress = false;
+    terminal.pendingOutput = [];
+    terminal.snapshotSeq = 0;
 
-    // 发送历史记录（用于重连时恢复之前的输出）
-    if (terminal.history.length > 0) {
-      const historyData = terminal.history.join('');
-      ws.send(JSON.stringify({
-        type: 'terminal:output',
-        terminalId,
-        data: historyData
-      }));
-      console.log(`Sent ${terminal.history.length} history chunks (${terminal.historySize} bytes) to terminal ${terminalId}`);
-    }
+    const { includeHistory = true, trimLastLine = false } = options;
+
+    const trimHistoryLastLine = (data) => {
+      if (!data) return '';
+      if (data.endsWith('\r\n')) {
+        return data.slice(0, -2);
+      }
+      if (data.endsWith('\n')) {
+        return data.slice(0, -1);
+      }
+      return data;
+    };
+
+    if (terminal.screen && includeHistory) {
+      terminal.snapshotInProgress = true;
+      terminal.pendingOutput = [];
+      terminal.snapshotSeq = terminal.outputSeq;
+      terminal.buffer = [];
+      terminal.history = [];
+      terminal.historySize = 0;
+
+      const sendSnapshot = () => {
+        try {
+          const snapshot = this.buildScreenSnapshot(terminal);
+          if (snapshot?.data && ws.readyState === 1) {
+            ws.send(JSON.stringify({
+              type: 'terminal:output',
+              terminalId,
+              data: snapshot.data
+            }));
+          }
+          if (snapshot?.cursorRow && snapshot?.cursorCol && ws.readyState === 1) {
+            ws.send(JSON.stringify({
+              type: 'terminal:output',
+              terminalId,
+              data: `\x1b[${snapshot.cursorRow};${snapshot.cursorCol}H`
+            }));
+          }
+          const pendingTail = terminal.pendingOutput
+            .filter(item => item && item.seq > terminal.snapshotSeq)
+            .map(item => item.data);
+          if (pendingTail.length > 0 && ws.readyState === 1) {
+            ws.send(JSON.stringify({
+              type: 'terminal:output',
+              terminalId,
+              data: pendingTail.join('')
+            }));
+          }
+        } catch (err) {
+          console.warn(`Failed to send terminal snapshot ${terminalId}:`, err.message);
+        } finally {
+          terminal.pendingOutput = [];
+          terminal.snapshotInProgress = false;
+          terminal.snapshotSeq = 0;
+        }
+      };
 
-    // 清空临时缓冲区（已经包含在历史记录中了）
-    terminal.buffer = [];
+      if (typeof terminal.screen.write === 'function') {
+        terminal.screen.write('', sendSnapshot);
+      } else {
+        sendSnapshot();
+      }
+    } else {
+      // 发送历史记录（用于重连时恢复之前的输出）
+      let sentHistory = false;
+      if (includeHistory) {
+        if (terminal.history.length > 0) {
+          let historyData = terminal.history.join('');
+          if (trimLastLine) {
+            historyData = trimHistoryLastLine(historyData);
+          }
+          if (historyData) {
+            ws.send(JSON.stringify({
+              type: 'terminal:output',
+              terminalId,
+              data: historyData
+            }));
+            console.log(`Sent ${terminal.history.length} history chunks (${terminal.historySize} bytes) to terminal ${terminalId}`);
+            sentHistory = true;
+          }
+        } else if (terminal.buffer.length > 0) {
+          let bufferData = terminal.buffer.join('');
+          if (trimLastLine) {
+            bufferData = trimHistoryLastLine(bufferData);
+          }
+          if (bufferData) {
+            ws.send(JSON.stringify({
+              type: 'terminal:output',
+              terminalId,
+              data: bufferData
+            }));
+            console.log(`Sent ${terminal.buffer.length} buffered chunks to terminal ${terminalId}`);
+            sentHistory = true;
+          }
+        }
+      }
+
+      // 清空临时缓冲区（已经包含在历史记录中了）
+      terminal.buffer = [];
+      if (sentHistory) {
+        terminal.history = [];
+        terminal.historySize = 0;
+      }
+    }
 
     // 如果终端已退出，通知客户端
     if (terminal.exited) {
@@ -297,6 +503,9 @@ class PtyManager {
     const terminal = this.terminals.get(terminalId);
     if (terminal) {
       terminal.ws = null;
+      terminal.snapshotInProgress = false;
+      terminal.pendingOutput = [];
+      terminal.snapshotSeq = 0;
     }
   }
 
@@ -331,10 +540,16 @@ class PtyManager {
 
     const newCols = Math.max(cols, 80);
     const newRows = Math.max(rows, 24);
+    if (terminal.metadata.cols === newCols && terminal.metadata.rows === newRows) {
+      return true;
+    }
 
     terminal.pty.resize(newCols, newRows);
     terminal.metadata.cols = newCols;
     terminal.metadata.rows = newRows;
+    if (terminal.screen && typeof terminal.screen.resize === 'function') {
+      terminal.screen.resize(newCols, newRows);
+    }
 
     return true;
   }
@@ -369,6 +584,10 @@ class PtyManager {
       }
     }
 
+    if (terminal.screen && typeof terminal.screen.dispose === 'function') {
+      terminal.screen.dispose();
+    }
+
     this.terminals.delete(terminalId);
     console.log(`Destroyed terminal ${terminalId}`);
 
@@ -423,6 +642,9 @@ class PtyManager {
       if (terminal.exited && !terminal.ws) {
         const exitedTime = terminal.exitedAt || now;
         if (now - exitedTime > 5 * 60 * 1000) {
+          if (terminal.screen && typeof terminal.screen.dispose === 'function') {
+            terminal.screen.dispose();
+          }
           this.terminals.delete(id);
           console.log(`Cleaned up dead terminal ${id}`);
         }

package/src/server/services/security-config.js

@@ -0,0 +1,131 @@
+const fs = require('fs');
+const path = require('path');
+const os = require('os');
+const crypto = require('crypto');
+
+const SECURITY_DIR = path.join(os.homedir(), '.claude', 'cc-tool');
+const SECURITY_FILE = path.join(SECURITY_DIR, 'security.json');
+
+const DEFAULT_SECURITY_CONFIG = {
+  passwordHash: '',
+  salt: '',
+  updatedAt: null
+};
+
+const PBKDF2_ITERATIONS = 120000;
+const PBKDF2_KEYLEN = 64;
+const PBKDF2_DIGEST = 'sha512';
+
+function ensureSecurityDir() {
+  if (!fs.existsSync(SECURITY_DIR)) {
+    fs.mkdirSync(SECURITY_DIR, { recursive: true });
+  }
+}
+
+function readSecurityConfig() {
+  ensureSecurityDir();
+
+  if (!fs.existsSync(SECURITY_FILE)) {
+    return { ...DEFAULT_SECURITY_CONFIG };
+  }
+
+  try {
+    const content = fs.readFileSync(SECURITY_FILE, 'utf8');
+    const data = JSON.parse(content);
+    return {
+      ...DEFAULT_SECURITY_CONFIG,
+      ...data
+    };
+  } catch (error) {
+    console.error('Error loading security config:', error);
+    return { ...DEFAULT_SECURITY_CONFIG };
+  }
+}
+
+function writeSecurityConfig(config) {
+  ensureSecurityDir();
+  fs.writeFileSync(SECURITY_FILE, JSON.stringify(config, null, 2), 'utf8');
+  try {
+    fs.chmodSync(SECURITY_FILE, 0o600);
+  } catch (error) {
+    console.warn('Failed to set security config permissions:', error);
+  }
+}
+
+function hasPassword(config) {
+  return Boolean(config.passwordHash && config.salt);
+}
+
+function hashPassword(password, salt) {
+  return crypto
+    .pbkdf2Sync(password, salt, PBKDF2_ITERATIONS, PBKDF2_KEYLEN, PBKDF2_DIGEST)
+    .toString('hex');
+}
+
+function safeEqualHash(a, b) {
+  try {
+    const bufferA = Buffer.from(a, 'hex');
+    const bufferB = Buffer.from(b, 'hex');
+    if (bufferA.length !== bufferB.length) {
+      return false;
+    }
+    return crypto.timingSafeEqual(bufferA, bufferB);
+  } catch (error) {
+    return false;
+  }
+}
+
+function getSecurityStatus() {
+  const config = readSecurityConfig();
+  return { hasPassword: hasPassword(config) };
+}
+
+function verifySecurityPassword(password) {
+  const config = readSecurityConfig();
+  if (!hasPassword(config)) {
+    return { ok: false, reason: 'not_set' };
+  }
+  const hash = hashPassword(password, config.salt);
+  return { ok: safeEqualHash(hash, config.passwordHash) };
+}
+
+function setSecurityPassword({ currentPassword, newPassword }) {
+  if (typeof newPassword !== 'string' || newPassword.length < 4) {
+    const error = new Error('新密码至少 4 位');
+    error.code = 'WEAK_PASSWORD';
+    throw error;
+  }
+
+  const config = readSecurityConfig();
+  if (hasPassword(config)) {
+    if (typeof currentPassword !== 'string' || !currentPassword) {
+      const error = new Error('请输入当前密码');
+      error.code = 'CURRENT_REQUIRED';
+      throw error;
+    }
+    const verifyResult = verifySecurityPassword(currentPassword);
+    if (!verifyResult.ok) {
+      const error = new Error('当前密码错误');
+      error.code = 'INVALID_PASSWORD';
+      throw error;
+    }
+  }
+
+  const salt = crypto.randomBytes(16).toString('hex');
+  const passwordHash = hashPassword(newPassword, salt);
+  const nextConfig = {
+    ...config,
+    passwordHash,
+    salt,
+    updatedAt: new Date().toISOString()
+  };
+
+  writeSecurityConfig(nextConfig);
+  return { hasPassword: true };
+}
+
+module.exports = {
+  getSecurityStatus,
+  verifySecurityPassword,
+  setSecurityPassword
+};

package/src/server/services/terminal-config.js

@@ -1,7 +1,7 @@
 const fs = require('fs');
 const path = require('path');
 const os = require('os');
-const { detectAvailableTerminals, getDefaultTerminal } = require('./terminal-detector');
+const { detectAvailableTerminals, getDefaultTerminal, getSystemShell } = require('./terminal-detector');
 
 /**
  * 获取配置文件路径
@@ -77,6 +77,78 @@ function getSelectedTerminal() {
   return selectedTerminal || getDefaultTerminal();
 }
 
+function getSystemRoot() {
+  return process.env.SystemRoot || process.env.windir || null;
+}
+
+function resolveWindowsShellPath(selectedTerminalId) {
+  const systemRoot = getSystemRoot();
+
+  if (selectedTerminalId === 'cmd') {
+    const candidates = [];
+    if (process.env.COMSPEC) {
+      candidates.push(process.env.COMSPEC);
+    }
+    if (systemRoot) {
+      candidates.push(path.join(systemRoot, 'System32', 'cmd.exe'));
+    }
+    return candidates.find((candidate) => candidate && fs.existsSync(candidate)) || null;
+  }
+
+  if (selectedTerminalId === 'powershell') {
+    const candidates = [];
+    if (systemRoot) {
+      candidates.push(path.join(systemRoot, 'System32', 'WindowsPowerShell', 'v1.0', 'powershell.exe'));
+    }
+    const programFiles = process.env.ProgramFiles || 'C:\\Program Files';
+    candidates.push(path.join(programFiles, 'PowerShell', '7', 'pwsh.exe'));
+    return candidates.find((candidate) => candidate && fs.existsSync(candidate)) || null;
+  }
+
+  if (selectedTerminalId === 'git-bash') {
+    const terminals = detectAvailableTerminals();
+    const gitBash = terminals.find(t => t.id === 'git-bash');
+    if (gitBash && gitBash.executablePath && fs.existsSync(gitBash.executablePath)) {
+      return gitBash.executablePath;
+    }
+  }
+
+  return null;
+}
+
+function getWebTerminalShellConfig() {
+  const config = loadTerminalConfig();
+  const selectedTerminalId = config.selectedTerminal;
+
+  if (!selectedTerminalId) {
+    return {};
+  }
+
+  if (selectedTerminalId === 'system-shell') {
+    const shell = getSystemShell();
+    if (shell) {
+      return { shell };
+    }
+    return {};
+  }
+
+  if (process.platform !== 'win32') {
+    return {};
+  }
+
+  const shell = resolveWindowsShellPath(selectedTerminalId);
+  if (!shell) {
+    return {};
+  }
+
+  const args = [];
+  if (selectedTerminalId === 'git-bash') {
+    args.push('--login', '-i');
+  }
+
+  return { shell, args };
+}
+
 /**
  * 获取终端启动命令（填充参数后）
  * @param {string} cwd - 工作目录
@@ -91,7 +163,14 @@ function getTerminalLaunchCommand(cwd, sessionId, toolType, customCliCommand) {
     throw new Error('No terminal available');
   }
 
+  if (terminal.supportsLocalLaunch === false || terminal.id === 'system-shell') {
+    throw new Error('系统 Shell 仅用于 Web 终端，请使用 Web 终端启动会话');
+  }
+
   let command = terminal.command;
+  if (!command) {
+    throw new Error('未配置终端启动命令');
+  }
 
   // 根据工具类型构建 CLI 命令
   let cliCommand;
@@ -136,5 +215,6 @@ module.exports = {
   loadTerminalConfig,
   saveTerminalConfig,
   getSelectedTerminal,
+  getWebTerminalShellConfig,
   getTerminalLaunchCommand
 };