@adversity/coding-tool-x 2.4.2 → 2.5.1

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

@@ -18,6 +18,61 @@ function detectAvailableTerminals() {
   }
 }
 
+/**
+ * 获取系统 Shell 路径
+ */
+function getSystemShell() {
+  if (process.platform === 'win32') {
+    const candidates = [];
+    if (process.env.COMSPEC) {
+      candidates.push(process.env.COMSPEC);
+    }
+    const systemRoot = process.env.SystemRoot || process.env.windir;
+    if (systemRoot) {
+      candidates.push(path.join(systemRoot, 'System32', 'cmd.exe'));
+    }
+    return candidates.find((candidate) => candidate && fs.existsSync(candidate)) || null;
+  }
+
+  if (process.env.SHELL && fs.existsSync(process.env.SHELL)) {
+    return process.env.SHELL;
+  }
+
+  const commonShells = [
+    '/bin/zsh',
+    '/bin/bash',
+    '/bin/sh',
+    '/usr/bin/zsh',
+    '/usr/bin/bash',
+    '/usr/bin/sh'
+  ];
+
+  for (const shell of commonShells) {
+    if (fs.existsSync(shell)) {
+      return shell;
+    }
+  }
+
+  return null;
+}
+
+function createSystemShellEntry(isDefault = false) {
+  const shell = getSystemShell();
+  if (!shell) {
+    return null;
+  }
+
+  return {
+    id: 'system-shell',
+    name: '系统 Shell',
+    available: true,
+    isDefault,
+    command: 'Web 终端（系统 Shell）',
+    supportsLocalLaunch: false,
+    shell
+  };
+}
+
 /**
  * Windows 终端检测
  * 只保留经过验证、确定能自动执行命令的终端
@@ -82,6 +137,11 @@ function detectWindowsTerminals() {
     }
   }
 
+  const systemShell = createSystemShellEntry(false);
+  if (systemShell) {
+    terminals.push(systemShell);
+  }
+
   return terminals;
 }
 
@@ -245,6 +305,11 @@ function detectMacTerminals() {
     // Rio 不可用
   }
 
+  const systemShell = createSystemShellEntry(false);
+  if (systemShell) {
+    terminals.push(systemShell);
+  }
+
   return terminals;
 }
 
@@ -254,6 +319,8 @@ function detectMacTerminals() {
 function detectLinuxTerminals() {
   const terminals = [];
 
+  const systemShell = createSystemShellEntry(false);
+
   const terminalConfigs = [
     { id: 'gnome-terminal', name: 'GNOME Terminal', cmd: 'gnome-terminal', args: '-- bash -c "cd \'{cwd}\' && claude -r {sessionId}; exec bash"' },
     { id: 'konsole', name: 'Konsole', cmd: 'konsole', args: '-e bash -c "cd \'{cwd}\' && claude -r {sessionId}; exec bash"' },
@@ -288,6 +355,13 @@ function detectLinuxTerminals() {
     }
   });
 
+  if (systemShell) {
+    if (!terminals.find(t => t.isDefault)) {
+      systemShell.isDefault = true;
+    }
+    terminals.push(systemShell);
+  }
+
   return terminals;
 }
 
@@ -302,5 +376,6 @@ function getDefaultTerminal() {
 
 module.exports = {
   detectAvailableTerminals,
-  getDefaultTerminal
+  getDefaultTerminal,
+  getSystemShell
 };

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

@@ -53,6 +53,8 @@ function readUIConfigFromFile() {
     const data = JSON.parse(content);
     // Merge with defaults to ensure all keys exist
     return {
+      ...DEFAULT_UI_CONFIG,
+      ...data,
       theme: data.theme || DEFAULT_UI_CONFIG.theme,
       panelVisibility: { ...DEFAULT_UI_CONFIG.panelVisibility, ...data.panelVisibility },
       channelLocks: { ...DEFAULT_UI_CONFIG.channelLocks, ...data.channelLocks },

package/src/server/websocket-server.js

@@ -392,6 +392,7 @@ function broadcastSchedulerState(source, schedulerState) {
 // ============ 终端 WebSocket 消息处理 ============
 
 const { getCommandForChannel } = require('./services/terminal-commands');
+const { getWebTerminalShellConfig } = require('./services/terminal-config');
 
 /**
  * 处理终端相关的 WebSocket 消息
@@ -444,13 +445,16 @@ function handleTerminalCreate(ws, message) {
     // 获取启动命令
     const startCommand = getCommandForChannel(channel, sessionId, workDir);
 
+    const shellConfig = getWebTerminalShellConfig();
+
     // 创建终端
     const terminal = ptyManager.create({
       cwd: workDir,
       channel,
       sessionId,
       projectName,
-      startCommand
+      startCommand,
+      ...shellConfig
     });
 
     // 绑定 WebSocket
@@ -476,7 +480,7 @@ function handleTerminalCreate(ws, message) {
  * 绑定到已有终端
  */
 function handleTerminalAttach(ws, message) {
-  const { terminalId } = message;
+  const { terminalId, includeHistory, cols, rows } = message;
 
   if (!terminalId) {
     ws.send(JSON.stringify({
@@ -498,7 +502,14 @@ function handleTerminalAttach(ws, message) {
 
   // 绑定 WebSocket
   ws.terminalId = terminalId;
-  ptyManager.attachWebSocket(terminalId, ws);
+  const shouldIncludeHistory = typeof includeHistory === 'boolean' ? includeHistory : true;
+  if (Number.isFinite(cols) && Number.isFinite(rows) && cols > 0 && rows > 0) {
+    ptyManager.resize(terminalId, cols, rows);
+  }
+  ptyManager.attachWebSocket(terminalId, ws, {
+    includeHistory: shouldIncludeHistory,
+    trimLastLine: true
+  });
 
   ws.send(JSON.stringify({
     type: 'terminal:attached',