coding-tool-x 3.6.12 → 3.6.13

package/dist/web/index.html

@@ -5,7 +5,7 @@
     <link rel="icon" href="/favicon.ico">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>coding-tool-x · AI 编程工作台</title>
-    <script type="module" crossorigin src="/assets/index-y-eEayxR.js"></script>
+    <script type="module" crossorigin src="/assets/index-BpBFF3b2.js"></script>
     <link rel="modulepreload" crossorigin href="/assets/markdown-BNJfEgCA.js">
     <link rel="modulepreload" crossorigin href="/assets/vue-vendor-B5RqjEjQ.js">
     <link rel="modulepreload" crossorigin href="/assets/naive-ui-kcWDeJwl.js">

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "coding-tool-x",
-  "version": "3.6.12",
+  "version": "3.6.13",
   "description": "Vibe Coding 增强工作助手 - 智能会话管理、动态渠道切换、全局搜索、实时监控",
   "main": "src/index.js",
   "bin": {

package/src/commands/port-config.js

@@ -2,7 +2,6 @@
 const chalk = require('chalk');
 const inquirer = require('inquirer');
 const { loadConfig, saveConfig } = require('../config/loader');
-const { HOME_DIR } = require('../config/paths');
 
 /**
  * 配置端口
@@ -112,7 +111,6 @@ async function handlePortConfig() {
   // 保存配置（保留其余字段）
   saveConfig({
     ...config,
-    projectsDir: config.projectsDir.replace(HOME_DIR, '~'),
     ports: config.ports,
   });
 

package/src/commands/switch.js

@@ -3,7 +3,6 @@ const chalk = require('chalk');
 const { getAvailableProjects } = require('../utils/session');
 const { promptSelectProject } = require('../ui/prompts');
 const { saveConfig } = require('../config/loader');
-const { HOME_DIR } = require('../config/paths');
 
 /**
  * 切换项目
@@ -29,10 +28,7 @@ async function switchProject(config) {
   config.defaultProject = selectedProject;
 
   // 保存到配置文件（保留其余字段）
-  saveConfig({
-    ...config,
-    projectsDir: config.projectsDir.replace(HOME_DIR, '~')
-  });
+  saveConfig({ ...config });
 
   // 使用解析后的名称显示
   const { parseRealProjectPath } = require('../server/services/sessions');

package/src/commands/workspace.js

@@ -188,6 +188,8 @@ async function createWorkspace() {
 
       let createWorktree = false;
       let branch = '';
+      let branchMode = 'existing';
+      let baseBranch = '';
 
       if (isGit) {
         const { shouldCreateWorktree } = await inquirer.prompt([
@@ -200,11 +202,24 @@ async function createWorkspace() {
         ]);
 
         if (shouldCreateWorktree) {
+          const { selectedBranchMode } = await inquirer.prompt([
+            {
+              type: 'list',
+              name: 'selectedBranchMode',
+              message: '选择 worktree 分支模式:',
+              choices: [
+                { name: '使用已有分支', value: 'existing' },
+                { name: '新建分支', value: 'new' }
+              ],
+              default: 'existing'
+            }
+          ]);
+
           const { branchName } = await inquirer.prompt([
             {
               type: 'input',
               name: 'branchName',
-              message: '输入分支名:',
+              message: selectedBranchMode === 'new' ? '输入新分支名:' : '输入已有分支名:',
               validate: input => {
                 if (!input || !input.trim()) {
                   return '分支名不能为空';
@@ -214,7 +229,20 @@ async function createWorkspace() {
             }
           ]);
 
+          if (selectedBranchMode === 'new') {
+            const { baseBranchName } = await inquirer.prompt([
+              {
+                type: 'input',
+                name: 'baseBranchName',
+                message: '输入基础分支（可选，如 main）:',
+                default: ''
+              }
+            ]);
+            baseBranch = baseBranchName;
+          }
+
           createWorktree = true;
+          branchMode = selectedBranchMode;
           branch = branchName;
         }
       }
@@ -223,7 +251,9 @@ async function createWorkspace() {
         sourcePath,
         name: linkName,
         createWorktree,
-        branch
+        branch,
+        branchMode,
+        baseBranch
       });
 
       console.log(chalk.green(`\n[v] 已添加: ${linkName}\n`));
@@ -245,7 +275,9 @@ async function createWorkspace() {
     projects.forEach((proj, index) => {
       console.log(chalk.gray(`  ${index + 1}. ${proj.name} → ${proj.sourcePath}`));
       if (proj.createWorktree) {
-        console.log(chalk.gray(`     (创建 worktree: ${proj.branch})`));
+        const modeLabel = proj.branchMode === 'new' ? '新建分支' : '已有分支';
+        const baseLabel = proj.branchMode === 'new' && proj.baseBranch ? `，基于 ${proj.baseBranch}` : '';
+        console.log(chalk.gray(`     (创建 worktree: ${modeLabel} ${proj.branch}${baseLabel})`));
       }
     });
     console.log('');

package/src/config/default.js

@@ -1,13 +1,7 @@
 // 默认配置
-const path = require('path');
-const os = require('os');
-const { resolvePreferredHomeDir } = require('../utils/home-dir');
 const modelMetadataConfig = require('./model-metadata.json');
 
-const HOME_DIR = resolvePreferredHomeDir(process.platform, process.env, os.homedir());
-
 const DEFAULT_CONFIG = {
-  projectsDir: path.join(HOME_DIR, '.claude', 'projects'),
   defaultProject: null,
   maxDisplaySessions: 100,
   pageSize: 15,

package/src/config/loader.js

@@ -3,7 +3,7 @@ const fs = require('fs');
 const path = require('path');
 const os = require('os');
 const DEFAULT_CONFIG = require('./default');
-const { PATHS, ensureStorageDirMigrated } = require('./paths');
+const { PATHS, NATIVE_PATHS, ensureStorageDirMigrated } = require('./paths');
 const { resolvePreferredHomeDir } = require('../utils/home-dir');
 const eventBus = require('../plugins/event-bus');
 
@@ -23,12 +23,79 @@ function getConfigFilePath() {
  * 展开 ~ 为用户主目录
  */
 function expandHome(filepath) {
+  if (typeof filepath !== 'string') {
+    return filepath;
+  }
   if (filepath.startsWith('~')) {
     return path.join(HOME_DIR, filepath.slice(1));
   }
   return filepath;
 }
 
+function collapseHome(filepath) {
+  if (typeof filepath !== 'string') {
+    return filepath;
+  }
+  if (filepath === HOME_DIR) {
+    return '~';
+  }
+  const prefix = `${HOME_DIR}${path.sep}`;
+  if (filepath.startsWith(prefix)) {
+    return path.join('~', filepath.slice(prefix.length));
+  }
+  return filepath;
+}
+
+function getNativeClaudeProjectsDir() {
+  return NATIVE_PATHS?.claude?.projects || path.join(HOME_DIR, '.claude', 'projects');
+}
+
+function hasExplicitProjectsDir(config = {}) {
+  return Object.prototype.hasOwnProperty.call(config, 'projectsDir') &&
+    typeof config.projectsDir === 'string' &&
+    config.projectsDir.trim() !== '';
+}
+
+function resolveClaudeProjectsDir(config = {}) {
+  if (!hasExplicitProjectsDir(config) || isDefaultProjectsDir(config.projectsDir)) {
+    return getNativeClaudeProjectsDir();
+  }
+  return expandHome(config.projectsDir);
+}
+
+function normalizeComparablePath(filepath) {
+  if (typeof filepath !== 'string' || !filepath.trim()) {
+    return '';
+  }
+  return path.normalize(expandHome(filepath.trim()));
+}
+
+function isDefaultProjectsDir(projectsDir) {
+  const normalized = normalizeComparablePath(projectsDir);
+  if (!normalized) {
+    return true;
+  }
+  const nativeDefault = normalizeComparablePath(getNativeClaudeProjectsDir());
+  const legacyHomeDefault = normalizeComparablePath(path.join(HOME_DIR, '.claude', 'projects'));
+  if (normalized === nativeDefault || normalized === legacyHomeDefault) {
+    return true;
+  }
+  const normalizedParts = normalized.replace(/\\/g, '/').split('/').filter(Boolean);
+  const last = normalizedParts[normalizedParts.length - 1];
+  const previous = normalizedParts[normalizedParts.length - 2];
+  return previous === '.claude' && last === 'projects' && !fs.existsSync(normalized);
+}
+
+function normalizeConfigForSave(config = {}) {
+  const normalized = { ...config };
+  if (isDefaultProjectsDir(normalized.projectsDir)) {
+    delete normalized.projectsDir;
+  } else if (typeof normalized.projectsDir === 'string') {
+    normalized.projectsDir = collapseHome(normalized.projectsDir);
+  }
+  return normalized;
+}
+
 function mergePricing(defaultPricing, overrides = {}) {
   const merged = {};
   Object.keys(defaultPricing).forEach((key) => {
@@ -96,7 +163,7 @@ function loadConfig() {
     if (fs.existsSync(configFilePath)) {
       const userConfig = readJsonFile(configFilePath);
       const config = { ...DEFAULT_CONFIG, ...userConfig };
-      config.projectsDir = expandHome(config.projectsDir || DEFAULT_CONFIG.projectsDir);
+      config.projectsDir = resolveClaudeProjectsDir(userConfig);
 
       // 合并 ports 配置
       config.ports = { ...DEFAULT_CONFIG.ports, ...userConfig.ports };
@@ -120,7 +187,7 @@ function loadConfig() {
   }
   const defaultConfig = {
     ...DEFAULT_CONFIG,
-    projectsDir: expandHome(DEFAULT_CONFIG.projectsDir),
+    projectsDir: resolveClaudeProjectsDir(),
     currentProject: DEFAULT_CONFIG.defaultProject
   };
   eventBus.emitSync('config:loaded', { config: defaultConfig });
@@ -137,8 +204,9 @@ function saveConfig(config) {
     if (!fs.existsSync(dir)) {
       fs.mkdirSync(dir, { recursive: true });
     }
-    fs.writeFileSync(configFilePath, JSON.stringify(config, null, 2), 'utf8');
-    eventBus.emitSync('config:saved', { config });
+    const normalizedConfig = normalizeConfigForSave(config);
+    fs.writeFileSync(configFilePath, JSON.stringify(normalizedConfig, null, 2), 'utf8');
+    eventBus.emitSync('config:saved', { config: normalizedConfig });
   } catch (error) {
     console.error(`保存配置失败 (${configFilePath}):`, error.message);
   }
@@ -148,5 +216,8 @@ module.exports = {
   loadConfig,
   saveConfig,
   expandHome,
+  resolveClaudeProjectsDir,
+  normalizeConfigForSave,
+  isDefaultProjectsDir,
   getConfigFilePath
 };

package/src/server/api/config.js

@@ -330,7 +330,6 @@ router.post('/default-models', (req, res) => {
     // Save config
     const newConfig = {
       ...config,
-      projectsDir: config.projectsDir.replace(require('os').homedir(), '~'),
       defaultModels: newDefaultModels
     };
 
@@ -378,7 +377,6 @@ router.post('/default-models/reset', (req, res) => {
     // Save config
     const newConfig = {
       ...config,
-      projectsDir: config.projectsDir.replace(require('os').homedir(), '~'),
       defaultModels: newDefaultModels
     };
 
@@ -489,7 +487,6 @@ router.post('/advanced', (req, res) => {
     // 更新配置
     const newConfig = {
       ...config,
-      projectsDir: config.projectsDir.replace(require('os').homedir(), '~'),
       ports: normalizedPorts,
       maxLogs: maxLogs !== undefined ? parseInt(maxLogs) : config.maxLogs,
       statsInterval: statsInterval !== undefined ? parseInt(statsInterval) : config.statsInterval,

package/src/server/api/settings.js

@@ -90,7 +90,6 @@ function handleSaveModelSettings(req, res) {
     const config = loadConfig();
     const newConfig = {
       ...config,
-      projectsDir: config.projectsDir.replace(require('os').homedir(), '~'),
       modelMetadataOverrides: overrides && typeof overrides === 'object'
         ? overrides
         : (config.modelMetadataOverrides || {})
@@ -124,7 +123,6 @@ function handleDeleteModelOverride(req, res) {
 
     const newConfig = {
       ...config,
-      projectsDir: config.projectsDir.replace(require('os').homedir(), '~'),
       modelMetadataOverrides: overrides
     };
     saveConfig(newConfig);

package/src/server/api/workspaces.js

@@ -33,6 +33,24 @@ function validateBranchName(branchName) {
   }
 }
 
+function normalizeBranchMode(branchMode) {
+  if (typeof branchMode !== 'string' || !branchMode.trim()) {
+    return '';
+  }
+  return branchMode.trim();
+}
+
+function validateBranchMode(branchMode) {
+  const normalized = normalizeBranchMode(branchMode);
+  if (!normalized) {
+    return { valid: true, normalized: '' };
+  }
+  if (normalized !== 'existing' && normalized !== 'new') {
+    return { valid: false, normalized, message: `分支模式不合法: ${normalized}` };
+  }
+  return { valid: true, normalized };
+}
+
 /**
  * GET /api/workspaces
  * 获取所有工作区列表
@@ -226,6 +244,17 @@ router.post('/', (req, res) => {
         });
       }
 
+      const branchModeValidation = validateBranchMode(proj.branchMode);
+      if (!branchModeValidation.valid) {
+        return res.status(400).json({
+          success: false,
+          message: branchModeValidation.message
+        });
+      }
+      if (branchModeValidation.normalized) {
+        proj.branchMode = branchModeValidation.normalized;
+      }
+
       const normalizedBranch = normalizeBranchName(proj.branch);
       if (normalizedBranch) {
         const branchValidation = validateBranchName(normalizedBranch);
@@ -329,9 +358,10 @@ router.put('/:id/last-used', (req, res) => {
 router.post('/:id/projects', (req, res) => {
   try {
     const { id } = req.params;
-    const { sourcePath, name, createWorktree, branch, baseBranch } = req.body;
+    const { sourcePath, name, createWorktree, branch, baseBranch, branchMode } = req.body;
     const normalizedBranch = normalizeBranchName(branch);
     const normalizedBaseBranch = normalizeBranchName(baseBranch);
+    const branchModeValidation = validateBranchMode(branchMode);
 
     if (!sourcePath || !sourcePath.trim()) {
       return res.status(400).json({
@@ -340,6 +370,13 @@ router.post('/:id/projects', (req, res) => {
       });
     }
 
+    if (!branchModeValidation.valid) {
+      return res.status(400).json({
+        success: false,
+        message: branchModeValidation.message
+      });
+    }
+
     if (normalizedBranch) {
       const branchValidation = validateBranchName(normalizedBranch);
       if (!branchValidation.valid) {
@@ -364,6 +401,7 @@ router.post('/:id/projects', (req, res) => {
       sourcePath,
       name,
       createWorktree,
+      branchMode: branchModeValidation.normalized || branchMode,
       branch: normalizedBranch || branch,
       baseBranch: normalizedBaseBranch || baseBranch
     });

package/src/server/services/sessions.js

@@ -17,6 +17,17 @@ const CLAUDE_PROJECTS_DIR = NATIVE_PATHS.claude.projects;
 const CODEX_PROJECTS_DIR = path.join(path.dirname(NATIVE_PATHS.codex.config), 'projects');
 const GEMINI_PROJECTS_DIR = path.join(path.dirname(NATIVE_PATHS.gemini.env), 'projects');
 
+function resolveProjectsDir(config = {}) {
+  return config.projectsDir || CLAUDE_PROJECTS_DIR;
+}
+
+function withResolvedProjectsDir(config = {}) {
+  return {
+    ...config,
+    projectsDir: resolveProjectsDir(config)
+  };
+}
+
 // Base directory for cc-tool data
 function getCcToolDir() {
   return PATHS.base;
@@ -182,7 +193,7 @@ function sliceClaudeSessionContentByUserMessage(content, afterUserMessageNumber)
 
 // Get all projects with stats (async version)
 async function getProjects(config) {
-  const projectsDir = config.projectsDir;
+  const projectsDir = resolveProjectsDir(config);
 
   if (!fs.existsSync(projectsDir)) {
     return [];
@@ -383,16 +394,17 @@ function extractCwdFromSessionHeader(sessionFile) {
 
 // Get projects with detailed stats (with caching) - async version
 async function getProjectsWithStats(config, options = {}) {
+  const resolvedConfig = withResolvedProjectsDir(config);
   if (!options.force) {
     // Check enhanced cache first
-    const cacheKey = `${CacheKeys.PROJECTS}${config.projectsDir}`;
+    const cacheKey = `${CacheKeys.PROJECTS}${resolvedConfig.projectsDir}`;
     const enhancedCached = globalCache.get(cacheKey);
     if (enhancedCached) {
       return enhancedCached;
     }
 
     // Check old cache
-    const cached = getCachedProjects(config);
+    const cached = getCachedProjects(resolvedConfig);
     if (cached) {
       globalCache.set(cacheKey, cached, 300000); // 5分钟
       return cached;
@@ -400,22 +412,22 @@ async function getProjectsWithStats(config, options = {}) {
   }
 
   try {
-    const data = await buildProjectsWithStats(config);
+    const data = await buildProjectsWithStats(resolvedConfig);
     if (!Array.isArray(data)) {
-      console.warn(`[getProjectsWithStats] Unexpected non-array result for ${config.projectsDir}, returning empty array.`);
+      console.warn(`[getProjectsWithStats] Unexpected non-array result for ${resolvedConfig.projectsDir}, returning empty array.`);
       return [];
     }
-    setCachedProjects(config, data);
-    globalCache.set(`${CacheKeys.PROJECTS}${config.projectsDir}`, data, 300000);
+    setCachedProjects(resolvedConfig, data);
+    globalCache.set(`${CacheKeys.PROJECTS}${resolvedConfig.projectsDir}`, data, 300000);
     return data;
   } catch (err) {
-    console.error(`[getProjectsWithStats] Failed to build projects for ${config.projectsDir}:`, err);
+    console.error(`[getProjectsWithStats] Failed to build projects for ${resolvedConfig.projectsDir}:`, err);
     return [];
   }
 }
 
 async function buildProjectsWithStats(config) {
-  const projectsDir = config.projectsDir;
+  const projectsDir = resolveProjectsDir(config);
 
   if (!fs.existsSync(projectsDir)) {
     return [];
@@ -482,7 +494,7 @@ async function buildProjectsWithStats(config) {
 
 // 获取 Claude 项目/会话数量（轻量统计）
 function getProjectAndSessionCounts(config) {
-  const projectsDir = config.projectsDir;
+  const projectsDir = resolveProjectsDir(config);
   if (!fs.existsSync(projectsDir)) {
     return { projectCount: 0, sessionCount: 0 };
   }
@@ -670,7 +682,8 @@ async function getSessionsForProject(config, projectName) {
 
 // Delete a session
 function deleteSession(config, projectName, sessionId) {
-  const projectDir = path.join(config.projectsDir, projectName);
+  const resolvedConfig = withResolvedProjectsDir(config);
+  const projectDir = path.join(resolvedConfig.projectsDir, projectName);
   const sessionFile = path.join(projectDir, sessionId + '.jsonl');
 
   if (!fs.existsSync(sessionFile)) {
@@ -678,14 +691,15 @@ function deleteSession(config, projectName, sessionId) {
   }
 
   fs.unlinkSync(sessionFile);
-  invalidateProjectsCache(config);
+  invalidateProjectsCache(resolvedConfig);
   invalidateSessionResultCache(projectName);
   return { success: true };
 }
 
 // Fork a session
 function forkSession(config, projectName, sessionId, options = {}) {
-  const projectDir = path.join(config.projectsDir, projectName);
+  const resolvedConfig = withResolvedProjectsDir(config);
+  const projectDir = path.join(resolvedConfig.projectsDir, projectName);
   const sessionFile = path.join(projectDir, sessionId + '.jsonl');
 
   if (!fs.existsSync(sessionFile)) {
@@ -714,7 +728,7 @@ function forkSession(config, projectName, sessionId, options = {}) {
     const { setAlias } = require('./alias');
     setAlias(newSessionId, options.alias);
   }
-  invalidateProjectsCache(config);
+  invalidateProjectsCache(resolvedConfig);
   invalidateSessionResultCache(projectName);
 
   return {
@@ -766,7 +780,8 @@ function saveSessionOrder(projectName, order) {
 
 // Delete a project (remove the entire project directory)
 function deleteProject(config, projectName) {
-  const projectDir = path.join(config.projectsDir, projectName);
+  const resolvedConfig = withResolvedProjectsDir(config);
+  const projectDir = path.join(resolvedConfig.projectsDir, projectName);
 
   if (!fs.existsSync(projectDir)) {
     throw new Error('Project not found');
@@ -776,19 +791,20 @@ function deleteProject(config, projectName) {
   fs.rmSync(projectDir, { recursive: true, force: true });
 
   // Remove from order file if exists
-  const order = getProjectOrder(config);
+  const order = getProjectOrder(resolvedConfig);
   const newOrder = order.filter(name => name !== projectName);
   if (newOrder.length !== order.length) {
-    saveProjectOrder(config, newOrder);
+    saveProjectOrder(resolvedConfig, newOrder);
   }
 
-  invalidateProjectsCache(config);
+  invalidateProjectsCache(resolvedConfig);
   return { success: true };
 }
 
 // Search sessions for keyword
 function searchSessions(config, projectName, keyword, contextLength = 15) {
-  const projectDir = path.join(config.projectsDir, projectName);
+  const resolvedConfig = withResolvedProjectsDir(config);
+  const projectDir = path.join(resolvedConfig.projectsDir, projectName);
 
   if (!fs.existsSync(projectDir)) {
     return [];