coding-tool-x 3.6.13 → 3.7.1

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

@@ -1,6 +1,11 @@
 const fs = require('fs');
 const path = require('path');
 const { PATHS } = require('../../config/paths');
+const {
+  DEFAULT_HOME_CLI_COLUMNS,
+  normalizeCustomCliPlatforms,
+  normalizeHomeCliColumns
+} = require('../../shared/platforms');
 
 const UI_CONFIG_FILE = PATHS.uiConfig;
 
@@ -17,18 +22,27 @@ const DEFAULT_UI_CONFIG = {
   channelLocks: {
     claude: false,
     codex: false,
-    gemini: false
+    gemini: false,
+    opencode: false,
+    omp: false
   },
   channelCollapse: {
     claude: [],
     codex: [],
-    gemini: []
+    gemini: [],
+    opencode: [],
+    omp: []
   },
   channelOrder: {
     claude: [],
     codex: [],
-    gemini: []
-  }
+    gemini: [],
+    opencode: [],
+    omp: []
+  },
+  dashboardChannelOrder: DEFAULT_HOME_CLI_COLUMNS,
+  homeCliColumns: DEFAULT_HOME_CLI_COLUMNS,
+  customCliPlatforms: []
 };
 
 // 内存缓存
@@ -55,7 +69,7 @@ function readUIConfigFromFile() {
     const content = fs.readFileSync(UI_CONFIG_FILE, 'utf8');
     const data = JSON.parse(content);
     // Merge with defaults to ensure all keys exist
-    return {
+    return normalizeUIConfig({
       ...DEFAULT_UI_CONFIG,
       ...data,
       theme: data.theme || DEFAULT_UI_CONFIG.theme,
@@ -64,13 +78,34 @@ function readUIConfigFromFile() {
       channelLocks: { ...DEFAULT_UI_CONFIG.channelLocks, ...data.channelLocks },
       channelCollapse: { ...DEFAULT_UI_CONFIG.channelCollapse, ...data.channelCollapse },
       channelOrder: { ...DEFAULT_UI_CONFIG.channelOrder, ...data.channelOrder }
-    };
+    });
   } catch (error) {
     console.error('Error loading UI config:', error);
-    return { ...DEFAULT_UI_CONFIG };
+    return normalizeUIConfig({ ...DEFAULT_UI_CONFIG });
   }
 }
 
+function normalizeUIConfig(config = {}) {
+  const customCliPlatforms = normalizeCustomCliPlatforms(config.customCliPlatforms);
+  const legacyOrder = Array.isArray(config.homeCliColumns)
+    ? config.homeCliColumns
+    : config.dashboardChannelOrder;
+  const homeCliColumns = normalizeHomeCliColumns(legacyOrder, customCliPlatforms);
+
+  return {
+    ...DEFAULT_UI_CONFIG,
+    ...config,
+    panelVisibility: { ...DEFAULT_UI_CONFIG.panelVisibility, ...(config.panelVisibility || {}) },
+    channelBalance: { ...DEFAULT_UI_CONFIG.channelBalance, ...(config.channelBalance || {}) },
+    channelLocks: { ...DEFAULT_UI_CONFIG.channelLocks, ...(config.channelLocks || {}) },
+    channelCollapse: { ...DEFAULT_UI_CONFIG.channelCollapse, ...(config.channelCollapse || {}) },
+    channelOrder: { ...DEFAULT_UI_CONFIG.channelOrder, ...(config.channelOrder || {}) },
+    dashboardChannelOrder: homeCliColumns,
+    homeCliColumns,
+    customCliPlatforms
+  };
+}
+
 // 初始化缓存（延迟初始化）
 function initializeCache() {
   if (cacheInitialized) return;
@@ -100,9 +135,10 @@ function saveUIConfig(config) {
   ensureConfigDir();
 
   try {
-    fs.writeFileSync(UI_CONFIG_FILE, JSON.stringify(config, null, 2), 'utf8');
+    const normalizedConfig = normalizeUIConfig(config);
+    fs.writeFileSync(UI_CONFIG_FILE, JSON.stringify(normalizedConfig, null, 2), 'utf8');
     // 同时更新缓存
-    uiConfigCache = JSON.parse(JSON.stringify(config));
+    uiConfigCache = JSON.parse(JSON.stringify(normalizedConfig));
   } catch (error) {
     console.error('Error saving UI config:', error);
     throw error;
@@ -114,7 +150,7 @@ function updateUIConfig(key, value) {
   const config = loadUIConfig();
   config[key] = value;
   saveUIConfig(config);
-  return config;
+  return loadUIConfig();
 }
 
 // Update nested config
@@ -125,12 +161,14 @@ function updateNestedUIConfig(parentKey, childKey, value) {
   }
   config[parentKey][childKey] = value;
   saveUIConfig(config);
-  return config;
+  return loadUIConfig();
 }
 
 module.exports = {
   loadUIConfig,
   saveUIConfig,
   updateUIConfig,
-  updateNestedUIConfig
+  updateNestedUIConfig,
+  normalizeUIConfig,
+  DEFAULT_UI_CONFIG
 };

package/src/server/services/workspace-service.js

@@ -1,6 +1,5 @@
 // 多项目工作区服务
 const fs = require('fs');
-const os = require('os');
 const path = require('path');
 const { execFileSync } = require('child_process');
 const { PATHS } = require('../../config/paths');
@@ -47,206 +46,6 @@ function resolveCurrentBranch(repoPath) {
   }
 }
 
-function getGitErrorMessage(error) {
-  const stderr = error && error.stderr ? error.stderr.toString().trim() : '';
-  return stderr || (error && error.message) || String(error);
-}
-
-function normalizeString(value) {
-  return typeof value === 'string' ? value.trim() : '';
-}
-
-function normalizeBranchMode(projectConfig = {}) {
-  const branchMode = normalizeString(projectConfig.branchMode);
-  if (branchMode === 'new' || branchMode === 'existing') {
-    return branchMode;
-  }
-  return normalizeString(projectConfig.baseBranch) ? 'new' : 'existing';
-}
-
-function normalizeGitBranchRef(branchName) {
-  return normalizeString(branchName).replace(/^refs\/heads\//, '');
-}
-
-function parseGitWorktrees(output) {
-  const worktrees = [];
-  const lines = output.split('\n');
-  let current = {};
-
-  for (const line of lines) {
-    if (line.startsWith('worktree ')) {
-      if (current.path) {
-        worktrees.push(current);
-      }
-      current = { path: line.substring(9) };
-    } else if (line.startsWith('branch ')) {
-      current.branch = line.substring(7);
-    } else if (line.startsWith('HEAD ')) {
-      current.head = line.substring(5);
-    }
-  }
-
-  if (current.path) {
-    worktrees.push(current);
-  }
-
-  return worktrees;
-}
-
-function listGitWorktrees(repoPath) {
-  const output = runGitCommand(['worktree', 'list', '--porcelain'], {
-    cwd: repoPath
-  });
-  return parseGitWorktrees(output);
-}
-
-function hasGitRef(repoPath, ref) {
-  try {
-    runGitCommand(['show-ref', '--verify', '--quiet', ref], {
-      cwd: repoPath,
-      stdio: 'ignore'
-    });
-    return true;
-  } catch (_) {
-    return false;
-  }
-}
-
-function findWorktreeForBranch(repoPath, branchName) {
-  const normalizedBranch = normalizeGitBranchRef(branchName);
-  const refName = `refs/heads/${normalizedBranch}`;
-  return listGitWorktrees(repoPath).find(wt => wt.branch === refName);
-}
-
-function pullBaseBranch(worktreePath, baseBranch) {
-  try {
-    runGitCommand(['pull', '--ff-only'], { cwd: worktreePath });
-  } catch (error) {
-    try {
-      runGitCommand(['remote', 'get-url', 'origin'], { cwd: worktreePath });
-    } catch (_) {
-      return;
-    }
-    const normalizedBaseBranch = normalizeGitBranchRef(baseBranch);
-    runGitCommand(['pull', '--ff-only', 'origin', normalizedBaseBranch], {
-      cwd: worktreePath
-    });
-  }
-}
-
-function removeTemporaryWorktree(repoPath, tempWorktreePath) {
-  try {
-    runGitCommand(['worktree', 'remove', tempWorktreePath, '--force'], {
-      cwd: repoPath
-    });
-  } catch (error) {
-    console.warn(`移除临时 worktree 失败: ${tempWorktreePath}`, error.message);
-  } finally {
-    if (fs.existsSync(tempWorktreePath)) {
-      fs.rmSync(tempWorktreePath, { recursive: true, force: true });
-    }
-  }
-}
-
-function updateBaseBranch(repoPath, baseBranch) {
-  const normalizedBaseBranch = normalizeGitBranchRef(baseBranch);
-  if (!normalizedBaseBranch) {
-    return null;
-  }
-
-  runGitCommand(['fetch', '--all', '--prune'], { cwd: repoPath });
-
-  const localRef = `refs/heads/${normalizedBaseBranch}`;
-  const remoteRef = `refs/remotes/origin/${normalizedBaseBranch}`;
-  const hasLocalBranch = hasGitRef(repoPath, localRef);
-  const hasRemoteBranch = hasGitRef(repoPath, remoteRef);
-  if (!hasLocalBranch && !hasRemoteBranch) {
-    throw new Error(`基础分支不存在: ${normalizedBaseBranch}`);
-  }
-
-  const existingWorktree = hasLocalBranch ? findWorktreeForBranch(repoPath, normalizedBaseBranch) : null;
-  if (existingWorktree) {
-    pullBaseBranch(existingWorktree.path, normalizedBaseBranch);
-    return normalizedBaseBranch;
-  }
-
-  const tempParent = fs.mkdtempSync(path.join(os.tmpdir(), 'ctx-base-'));
-  const tempWorktreePath = path.join(tempParent, 'worktree');
-  try {
-    if (hasLocalBranch) {
-      runGitCommand(['worktree', 'add', tempWorktreePath, normalizedBaseBranch], {
-        cwd: repoPath
-      });
-    } else {
-      runGitCommand(['worktree', 'add', tempWorktreePath, '-b', normalizedBaseBranch, `origin/${normalizedBaseBranch}`], {
-        cwd: repoPath
-      });
-    }
-    pullBaseBranch(tempWorktreePath, normalizedBaseBranch);
-    return normalizedBaseBranch;
-  } finally {
-    removeTemporaryWorktree(repoPath, tempWorktreePath);
-    if (fs.existsSync(tempParent)) {
-      fs.rmSync(tempParent, { recursive: true, force: true });
-    }
-  }
-}
-
-function createGitWorktree({ sourcePath, worktreePath, branch, baseBranch, branchMode, actionLabel }) {
-  let targetBranch = normalizeString(branch);
-  if (!targetBranch) {
-    try {
-      targetBranch = resolveCurrentBranch(sourcePath);
-    } catch (e) {
-      targetBranch = 'main';
-    }
-  }
-
-  const resolvedBranchMode = branchMode === 'new' ? 'new' : 'existing';
-
-  if (resolvedBranchMode === 'new') {
-    const worktreeArgs = ['worktree', 'add', worktreePath, '-b', targetBranch];
-    const updatedBaseBranch = updateBaseBranch(sourcePath, baseBranch);
-    if (updatedBaseBranch) {
-      worktreeArgs.push(updatedBaseBranch);
-    }
-
-    try {
-      runGitCommand(worktreeArgs, { cwd: sourcePath });
-      return { branch: targetBranch, path: worktreePath };
-    } catch (error) {
-      throw new Error(`创建 worktree 失败: ${getGitErrorMessage(error)}`);
-    }
-  }
-
-  try {
-    runGitCommand(['worktree', 'add', worktreePath, targetBranch], {
-      cwd: sourcePath
-    });
-    return { branch: targetBranch, path: worktreePath };
-  } catch (error) {
-    const message = getGitErrorMessage(error);
-    if (/already (checked out|used by worktree)/i.test(message)) {
-      try {
-        runGitCommand(['worktree', 'add', '--force', worktreePath, targetBranch], {
-          cwd: sourcePath
-        });
-        return { branch: targetBranch, path: worktreePath };
-      } catch (forceError) {
-        throw new Error(
-          `无法${actionLabel}：分支 '${targetBranch}' 已在其他工作树中检出。\n` +
-          `仓库路径: ${sourcePath}\n` +
-          `错误详情: ${getGitErrorMessage(forceError)}\n\n` +
-          `解决方案：\n` +
-          `1. 指定不同的分支名\n` +
-          `2. 或者禁用 worktree 模式（设置 createWorktree: false）`
-        );
-      }
-    }
-    throw new Error(`创建 worktree 失败: ${message}`);
-  }
-}
-
 /**
  * 生成唯一工作区 ID
  */
@@ -348,7 +147,31 @@ function getGitWorktrees(repoPath) {
     if (!isGitRepo(repoPath)) {
       return [];
     }
-    const worktrees = listGitWorktrees(repoPath);
+    const output = runGitCommand(['worktree', 'list', '--porcelain'], {
+      cwd: repoPath
+    });
+
+    const worktrees = [];
+    const lines = output.split('\n');
+    let current = {};
+
+    for (const line of lines) {
+      if (line.startsWith('worktree ')) {
+        if (current.path) {
+          worktrees.push(current);
+        }
+        current = { path: line.substring(9) };
+      } else if (line.startsWith('branch ')) {
+        current.branch = line.substring(7);
+      } else if (line.startsWith('HEAD ')) {
+        current.head = line.substring(5);
+      }
+    }
+
+    if (current.path) {
+      worktrees.push(current);
+    }
+
     return worktrees.filter(wt => wt.path !== repoPath); // 排除主仓库
   } catch (error) {
     console.error('获取 worktree 列表失败:', error.message);
@@ -485,19 +308,48 @@ function createWorkspace(options) {
 
       // Git 仓库且需要创建 worktree：直接在工作区目录内创建，无需额外 symlink
       if (isGit && useWorktree) {
+        // 获取当前分支作为默认分支
+        let targetBranch = branch;
+        if (!targetBranch) {
+          try {
+            targetBranch = resolveCurrentBranch(sourcePath);
+          } catch (e) {
+            targetBranch = 'main';
+          }
+        }
+
         // worktree 直接创建到工作区目录内的项目路径
         const worktreePath = symlinkPath;
-        const createdWorktree = createGitWorktree({
-          sourcePath,
-          worktreePath,
-          branch,
-          baseBranch,
-          branchMode: normalizeBranchMode(proj),
-          actionLabel: '创建 worktree'
-        });
+
+        try {
+          // 尝试检出已有分支
+          runGitCommand(['worktree', 'add', worktreePath, targetBranch], {
+            cwd: sourcePath
+          });
+        } catch (error) {
+          // 如果分支不存在，尝试创建新分支
+          try {
+            const worktreeArgs = ['worktree', 'add', worktreePath, '-b', targetBranch];
+            if (baseBranch && baseBranch.trim()) {
+              worktreeArgs.push(baseBranch.trim());
+            }
+            runGitCommand(worktreeArgs, {
+              cwd: sourcePath
+            });
+          } catch (err) {
+            if (err.message.includes('already checked out')) {
+              throw new Error(
+                `无法创建 worktree：分支 '${targetBranch}' 已在其他工作树中检出。\n` +
+                `错误详情: ${err.message}\n\n` +
+                `提示：请为此项目指定不同的分支名，或禁用 worktree 模式。`
+              );
+            }
+            throw new Error(`创建 worktree 失败: ${err.message}`);
+          }
+        }
 
         targetPath = worktreePath;
-        worktrees.push(createdWorktree);
+        worktrees.push({ branch: targetBranch, path: worktreePath });
       } else if (isGit) {
         // Git 仓库但不创建 worktree：symlink 指向源路径，记录已有 worktrees
         worktrees = getGitWorktrees(sourcePath);
@@ -657,18 +509,44 @@ function addProjectToWorkspace(workspaceId, projectConfig) {
 
   // Git 仓库且需要创建 worktree：直接在工作区目录内创建，无需额外 symlink
   if (isGit && useWorktree) {
+    let targetBranch = branch;
+    if (!targetBranch) {
+      try {
+        targetBranch = resolveCurrentBranch(sourcePath);
+      } catch (e) {
+        targetBranch = 'main';
+      }
+    }
+
     const worktreePath = symlinkPath;
-    const createdWorktree = createGitWorktree({
-      sourcePath,
-      worktreePath,
-      branch,
-      baseBranch,
-      branchMode: normalizeBranchMode(projectConfig),
-      actionLabel: '添加项目'
-    });
+
+    try {
+      runGitCommand(['worktree', 'add', worktreePath, targetBranch], {
+        cwd: sourcePath
+      });
+    } catch (error) {
+      try {
+        const worktreeArgs = ['worktree', 'add', worktreePath, '-b', targetBranch];
+        if (baseBranch && baseBranch.trim()) {
+          worktreeArgs.push(baseBranch.trim());
+        }
+        runGitCommand(worktreeArgs, { cwd: sourcePath });
+      } catch (err) {
+        if (err.message && err.message.includes('already checked out')) {
+          throw new Error(
+            `无法添加项目：分支 '${targetBranch}' 已在其他工作树中检出。\n` +
+            `仓库路径: ${sourcePath}\n\n` +
+            `解决方案：\n` +
+            `1. 指定不同的分支名\n` +
+            `2. 或者禁用 worktree 模式（设置 createWorktree: false）`
+          );
+        }
+        throw new Error(`创建 worktree 失败: ${err.message}`);
+      }
+    }
 
     targetPath = worktreePath;
-    worktrees.push(createdWorktree);
+    worktrees.push({ branch: targetBranch, path: worktreePath });
   } else if (isGit) {
     // Git 仓库但不创建 worktree：symlink 指向源路径
     worktrees = getGitWorktrees(sourcePath);
@@ -743,7 +621,7 @@ function removeProjectFromWorkspace(workspaceId, projectName) {
 
 
 /**
- * 获取所有渠道（Claude/Codex/Gemini）的项目并集
+ * 获取所有渠道（Claude/Codex/Gemini/OpenCode/OMP）的项目并集
  * @returns {Promise<Array>} 去重后的项目列表
  */
 async function getAllAvailableProjects() {
@@ -752,6 +630,7 @@ async function getAllAvailableProjects() {
   const codexSessionsService = require('./codex-sessions');
   const geminiSessionsService = require('./gemini-sessions');
   const opencodeSessionsService = require('./opencode-sessions');
+  const ompSessionsService = require('./omp-sessions');
   const { isCodexInstalled } = require('./codex-config');
   const { isGeminiInstalled } = require('./gemini-config');
   const { isOpenCodeInstalled } = require('./opencode-sessions');
@@ -769,7 +648,7 @@ async function getAllAvailableProjects() {
     seenKeys.add(projectKey);
 
     const displayName = project.displayName || (projectPath ? path.basename(projectPath) : project.name);
-    const lastUsedValue = project.lastUsed || project.lastUpdated || null;
+    const lastUsedValue = project.lastUsed || project.lastUpdated || project.mtimeMs || null;
     const lastUsed = typeof lastUsedValue === 'string'
       ? new Date(lastUsedValue).getTime()
       : (lastUsedValue || 0);
@@ -824,6 +703,16 @@ async function getAllAvailableProjects() {
     console.error('获取 opencode 项目失败:', error.message);
   }
 
+  try {
+    const ompProjects = ompSessionsService.getProjects();
+    const list = Array.isArray(ompProjects) ? ompProjects : [];
+    if (list.length > 0 || ompSessionsService.isOmpInstalled()) {
+      list.forEach(project => addProject('omp', project));
+    }
+  } catch (error) {
+    console.error('获取 OMP 项目失败:', error.message);
+  }
+
   // 按最后使用时间排序
   allProjects.sort((a, b) => (b.lastUsed || 0) - (a.lastUsed || 0));
 
@@ -833,7 +722,7 @@ async function getAllAvailableProjects() {
 /**
  * 在工作区中启动 CLI 工具
  * @param {string} workspaceId 工作区 ID
- * @param {string} tool 工具名称 (claude/codex/gemini/opencode)
+ * @param {string} tool 工具名称 (claude/codex/gemini/opencode/omp/omp)
  * @param {string} projectName 可选，工作区内的项目名
  * @returns {object} 启动信息
  */
@@ -860,15 +749,18 @@ function getLaunchCommand(workspaceId, tool, projectName = null) {
     }
   }
 
+  const normalizedTool = tool === 'omp' ? 'omp' : tool;
+
   // 根据工具类型生成启动命令
   const commands = {
     claude: 'claude',
     codex: 'codex',
     gemini: 'gemini',
-    opencode: 'opencode'
+    opencode: 'opencode',
+    omp: 'omp'
   };
 
-  const cmd = commands[tool];
+  const cmd = commands[normalizedTool];
   if (!cmd) {
     throw new Error(`不支持的工具: ${tool}`);
   }

package/src/server/websocket-server.js

@@ -182,18 +182,24 @@ function inferSource(log) {
   if (log.toolType) {
     if (log.toolType.includes('codex')) return 'codex';
     if (log.toolType.includes('gemini')) return 'gemini';
+    if (log.toolType.includes('opencode')) return 'opencode';
+    if (log.toolType.includes('omp')) return 'omp';
   }
   if (typeof log.model === 'string') {
     const model = log.model.toLowerCase();
     if (model.includes('gemini')) return 'gemini';
+    if (model.includes('opencode')) return 'opencode';
+    if (model.includes('omp')) return 'omp';
     if (model.includes('gpt') || model.includes('o1') || model.includes('o3')) return 'codex';
     if (model.includes('claude')) return 'claude';
   }
   if (typeof log.action === 'string') {
     if (log.action.includes('codex')) return 'codex';
     if (log.action.includes('gemini')) return 'gemini';
+    if (log.action.includes('opencode')) return 'opencode';
+    if (log.action.includes('omp')) return 'omp';
   }
-  if (log.channelType === 'codex' || log.channelType === 'gemini') {
+  if (log.channelType === 'codex' || log.channelType === 'gemini' || log.channelType === 'opencode' || log.channelType === 'omp') {
     return log.channelType;
   }
   return 'claude';