@adversity/coding-tool-x 2.4.1 → 2.5.0

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/workspace-service.js

@@ -611,51 +611,72 @@ function removeProjectFromWorkspace(workspaceId, projectName, removeWorktrees =
 
 /**
  * 获取所有渠道（Claude/Codex/Gemini）的项目并集
- * @returns {Array} 去重后的项目列表
+ * @returns {Promise<Array>} 去重后的项目列表
  */
-function getAllAvailableProjects() {
-  const { NATIVE_PATHS } = require('../../config/paths');
+async function getAllAvailableProjects() {
+  const { loadConfig } = require('../../config/loader');
   const sessionsService = require('./sessions');
+  const codexSessionsService = require('./codex-sessions');
+  const geminiSessionsService = require('./gemini-sessions');
+  const { isCodexInstalled } = require('./codex-config');
+  const { isGeminiInstalled } = require('./gemini-config');
 
   const allProjects = [];
-  const seenPaths = new Set();
+  const seenKeys = new Set();
+
+  function addProject(channel, project) {
+    if (!project || !project.name) return;
+
+    const projectPath = project.fullPath || project.path || null;
+    const keyBase = projectPath || project.name;
+    const projectKey = `${channel}:${keyBase}`;
+    if (seenKeys.has(projectKey)) return;
+    seenKeys.add(projectKey);
+
+    const displayName = project.displayName || (projectPath ? path.basename(projectPath) : project.name);
+    const lastUsedValue = project.lastUsed || project.lastUpdated || null;
+    const lastUsed = typeof lastUsedValue === 'string'
+      ? new Date(lastUsedValue).getTime()
+      : (lastUsedValue || 0);
+
+    allProjects.push({
+      name: project.name,
+      displayName,
+      fullPath: projectPath || project.name,
+      channel,
+      sessionCount: project.sessionCount || 0,
+      lastUsed,
+      isGitRepo: projectPath ? isGitRepo(projectPath) : false
+    });
+  }
 
-  // 定义渠道配置
-  const channels = [
-    { name: 'claude', projectsDir: NATIVE_PATHS.claude.projects },
-    { name: 'codex', projectsDir: NATIVE_PATHS.codex.sessions },
-    { name: 'gemini', projectsDir: NATIVE_PATHS.gemini.tmp }
-  ];
+  try {
+    const config = loadConfig();
+    const claudeProjects = await sessionsService.getProjectsWithStats(config, { force: true });
+    const list = Array.isArray(claudeProjects) ? claudeProjects : [];
+    list.forEach(project => addProject('claude', project));
+  } catch (error) {
+    console.error('获取 claude 项目失败:', error.message);
+  }
 
-  for (const channel of channels) {
-    try {
-      if (!fs.existsSync(channel.projectsDir)) {
-        continue;
-      }
+  try {
+    if (isCodexInstalled()) {
+      const codexProjects = codexSessionsService.getProjects();
+      const list = Array.isArray(codexProjects) ? codexProjects : [];
+      list.forEach(project => addProject('codex', project));
+    }
+  } catch (error) {
+    console.error('获取 codex 项目失败:', error.message);
+  }
 
-      const config = { projectsDir: channel.projectsDir };
-      const projects = sessionsService.getProjectsWithStats(config, { force: true });
-
-      for (const proj of projects) {
-        // 使用 fullPath + channel 组合去重,允许同一项目在不同渠道显示
-        const projectPath = proj.fullPath;
-        const projectKey = `${projectPath}:${channel.name}`;
-        if (projectPath && !seenPaths.has(projectKey)) {
-          seenPaths.add(projectKey);
-          allProjects.push({
-            name: proj.name,
-            displayName: proj.displayName,
-            fullPath: projectPath,
-            channel: channel.name,
-            sessionCount: proj.sessionCount || 0,
-            lastUsed: proj.lastUsed,
-            isGitRepo: isGitRepo(projectPath)
-          });
-        }
-      }
-    } catch (error) {
-      console.error(`获取 ${channel.name} 项目失败:`, error.message);
+  try {
+    if (isGeminiInstalled()) {
+      const geminiProjects = geminiSessionsService.getProjects();
+      const list = Array.isArray(geminiProjects) ? geminiProjects : [];
+      list.forEach(project => addProject('gemini', project));
     }
+  } catch (error) {
+    console.error('获取 gemini 项目失败:', error.message);
   }
 
   // 按最后使用时间排序

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',