coding-tool-x 3.5.8 → 3.5.9

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-Clf0l3wc.js"></script>
+    <script type="module" crossorigin src="/assets/index-Duc7QP4e.js"></script>
     <link rel="modulepreload" crossorigin href="/assets/markdown-DyTJGI4N.js">
     <link rel="modulepreload" crossorigin href="/assets/vue-vendor-BxIT0uQq.js">
     <link rel="modulepreload" crossorigin href="/assets/vendors-Bsp-dq2d.js">

package/package.json

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

package/src/server/api/codex-sessions.js

@@ -468,6 +468,7 @@ module.exports = (config) => {
       }
 
       const { sessionId } = req.params;
+      const fork = Boolean(req.body?.fork);
       const fs = require('fs');
 
       // 获取会话详情
@@ -510,7 +511,7 @@ module.exports = (config) => {
       broadcastLog({
         type: 'action',
         action: 'launch_codex_session',
-        message: `复制 Codex 会话启动命令 ${alias || sessionId.substring(0, 8)}`,
+        message: `${fork ? '复制 Codex 会话 Fork 命令' : '复制 Codex 会话启动命令'} ${alias || sessionId.substring(0, 8)}`,
         sessionId: sessionId,
         alias: alias || null,
         timestamp: Date.now()
@@ -519,7 +520,7 @@ module.exports = (config) => {
       const { command, copyCommand } = buildLaunchCommand({
         cwd,
         executable: 'codex',
-        args: ['resume', sessionId]
+        args: fork ? ['fork', sessionId] : ['resume', sessionId]
       });
 
       res.json({
@@ -528,6 +529,7 @@ module.exports = (config) => {
         sessionFile: session.filePath,
         sessionId,
         tool: 'codex',
+        fork,
         command,
         copyCommand
       });

package/src/server/api/opencode-sessions.js

@@ -342,6 +342,7 @@ module.exports = (config) => {
       }
 
       const { projectName, sessionId } = req.params;
+      const fork = Boolean(req.body?.fork);
 
       const session = getSessionById(sessionId);
       if (!session) {
@@ -354,13 +355,13 @@ module.exports = (config) => {
       const { command, copyCommand } = buildLaunchCommand({
         cwd,
         executable: 'opencode',
-        args: ['-r', sessionId]
+        args: fork ? ['--session', sessionId, '--fork'] : ['--session', sessionId]
       });
 
       broadcastLog({
         type: 'action',
         action: 'launch_opencode_session',
-        message: `复制 OpenCode 会话启动命令 ${sessionId.substring(0, 8)}`,
+        message: `${fork ? '复制 OpenCode 会话 Fork 命令' : '复制 OpenCode 会话启动命令'} ${sessionId.substring(0, 8)}`,
         sessionId,
         tool: 'opencode',
         timestamp: Date.now()
@@ -371,6 +372,7 @@ module.exports = (config) => {
         cwd,
         sessionId,
         tool: 'opencode',
+        fork,
         command,
         copyCommand
       });

package/src/server/api/sessions.js

@@ -472,6 +472,7 @@ module.exports = (config) => {
   router.post('/:projectName/:sessionId/launch', async (req, res) => {
     try {
       const { projectName, sessionId } = req.params;
+      const fork = Boolean(req.body?.fork);
       const path = require('path');
       const fs = require('fs');
 
@@ -564,7 +565,7 @@ module.exports = (config) => {
       broadcastLog({
         type: 'action',
         action: 'launch_session',
-        message: `复制会话启动命令 ${alias || sessionId.substring(0, 8)} (claude)`,
+        message: `${fork ? '复制会话 Fork 命令' : '复制会话启动命令'} ${alias || sessionId.substring(0, 8)} (claude)`,
         sessionId,
         alias: alias || null,
         tool: 'claude',
@@ -574,7 +575,7 @@ module.exports = (config) => {
       const { command, copyCommand } = buildLaunchCommand({
         cwd,
         executable: 'claude',
-        args: ['-r', sessionId]
+        args: fork ? ['-r', sessionId, '--fork-session'] : ['-r', sessionId]
       });
 
       res.json({
@@ -583,6 +584,7 @@ module.exports = (config) => {
         sessionFile,
         sessionId,
         tool: 'claude',
+        fork,
         command,
         copyCommand
       });

package/src/server/services/opencode-sessions.js

@@ -513,7 +513,13 @@ function getProjects() {
 
 // 根据项目ID获取会话列表
 function getSessionsByProjectId(projectId) {
-  const sessions = getSessionRowsByProjectId(projectId).map(session => normalizeSession(session, projectId));
+  const { getForkRelations } = require('./sessions');
+  const forkRelations = getForkRelations();
+  const sessions = getSessionRowsByProjectId(projectId).map((session) => {
+    const normalized = normalizeSession(session, projectId);
+    normalized.forkedFrom = forkRelations[normalized.sessionId] || null;
+    return normalized;
+  });
   const order = getSessionOrder(projectId);
 
   const fallbackSorted = sessions.sort(
@@ -558,7 +564,11 @@ function getSessionById(sessionId) {
     return null;
   }
 
-  return normalizeSession(location.sessionData, location.projectId);
+  const { getForkRelations } = require('./sessions');
+  const forkRelations = getForkRelations();
+  const normalized = normalizeSession(location.sessionData, location.projectId);
+  normalized.forkedFrom = forkRelations[normalized.sessionId] || null;
+  return normalized;
 }
 
 function buildSessionMessages(sessionId) {

package/src/server/services/session-launch-command.js

@@ -1,28 +1,11 @@
-const { isWindowsLikePlatform } = require('../../utils/home-dir');
-
 function escapeForDoubleQuotes(value) {
   return String(value).replace(/"/g, '\\"');
 }
 
-function escapeForPowerShellSingleQuotes(value) {
-  return String(value).replace(/'/g, "''");
-}
-
 function buildDisplayCommand(executable, args = []) {
   return [String(executable || ''), ...args.map(arg => String(arg))].filter(Boolean).join(' ').trim();
 }
 
-function buildWindowsCopyCommand(cwd, executable, args = []) {
-  const quotedCwd = `'${escapeForPowerShellSingleQuotes(cwd)}'`;
-  const quotedExecutable = `'${escapeForPowerShellSingleQuotes(executable)}'`;
-  const quotedArgs = args.map(arg => `'${escapeForPowerShellSingleQuotes(arg)}'`).join(' ');
-  const invokeCommand = quotedArgs
-    ? `& ${quotedExecutable} ${quotedArgs}`
-    : `& ${quotedExecutable}`;
-
-  return `powershell -NoProfile -ExecutionPolicy Bypass -Command "& { Set-Location -LiteralPath ${quotedCwd}; ${invokeCommand} }"`;
-}
-
 function buildPosixCopyCommand(cwd, command) {
   const quotedCwd = `"${escapeForDoubleQuotes(cwd)}"`;
   return `cd ${quotedCwd} && ${command}`;
@@ -41,10 +24,6 @@ function buildCopyCommand({
     return resolvedCommand;
   }
 
-  if (isWindowsLikePlatform(runtimePlatform, runtimeEnv)) {
-    return buildWindowsCopyCommand(cwd, executable, args);
-  }
-
   return buildPosixCopyCommand(cwd, resolvedCommand);
 }
 
@@ -74,8 +53,6 @@ module.exports = {
   _test: {
     buildDisplayCommand,
     buildCopyCommand,
-    buildWindowsCopyCommand,
-    buildPosixCopyCommand,
-    escapeForPowerShellSingleQuotes
+    buildPosixCopyCommand
   }
 };

package/src/server/services/sessions.js

@@ -20,6 +20,29 @@ const PROJECT_PATH_CACHE_TTL_MS = 5 * 60 * 1000;
 const MAX_PROJECT_PATH_CACHE_ENTRIES = 500;
 let projectPathResolutionCache = new Map();
 
+function getProjectsStatsCacheKey(config) {
+  return `${CacheKeys.PROJECTS}${config?.projectsDir || '__default__'}`;
+}
+
+function getProjectSessionsCacheKey(projectName) {
+  return `${CacheKeys.SESSIONS}${projectName}`;
+}
+
+function invalidateProjectStatsCache(config) {
+  invalidateProjectsCache(config);
+  globalCache.delete(getProjectsStatsCacheKey(config));
+}
+
+function invalidateProjectSessionCache(projectName) {
+  if (!projectName) return;
+  globalCache.delete(getProjectSessionsCacheKey(projectName));
+}
+
+function invalidateProjectCaches(config, projectName) {
+  invalidateProjectStatsCache(config);
+  invalidateProjectSessionCache(projectName);
+}
+
 // Base directory for cc-tool data
 function getCcToolDir() {
   return PATHS.base;
@@ -313,6 +336,41 @@ function validateProjectPath(candidatePath) {
   return null;
 }
 
+function scanSessionsDir(sessionsDir) {
+  if (!sessionsDir || !fs.existsSync(sessionsDir)) {
+    return [];
+  }
+
+  return fs.readdirSync(sessionsDir)
+    .filter(file => file.endsWith('.jsonl') && !file.startsWith('agent-'))
+    .map((file) => {
+      const filePath = path.join(sessionsDir, file);
+      const stats = fs.statSync(filePath);
+      return {
+        sessionId: file.replace('.jsonl', ''),
+        filePath,
+        size: stats.size,
+        mtime: stats.mtime
+      };
+    });
+}
+
+function getProjectSessionsDir(config, projectName) {
+  return path.join(config.projectsDir, projectName);
+}
+
+function getProjectSessionFiles(config, projectName) {
+  return scanSessionsDir(getProjectSessionsDir(config, projectName)).sort((a, b) => b.mtime - a.mtime);
+}
+
+function resolveSessionFile(config, projectName, sessionId) {
+  const sessionFile = path.join(getProjectSessionsDir(config, projectName), `${sessionId}.jsonl`);
+  if (fs.existsSync(sessionFile)) {
+    return sessionFile;
+  }
+  return '';
+}
+
 function tryResolvePathFromSessions(encodedName) {
   try {
     const projectDir = path.join(CLAUDE_PROJECTS_DIR, encodedName);
@@ -365,7 +423,7 @@ function extractCwdFromSessionHeader(sessionFile) {
 async function getProjectsWithStats(config, options = {}) {
   if (!options.force) {
     // Check enhanced cache first
-    const cacheKey = `${CacheKeys.PROJECTS}${config.projectsDir}`;
+    const cacheKey = getProjectsStatsCacheKey(config);
     const enhancedCached = globalCache.get(cacheKey);
     if (enhancedCached) {
       return enhancedCached;
@@ -386,7 +444,7 @@ async function getProjectsWithStats(config, options = {}) {
       return [];
     }
     setCachedProjects(config, data);
-    globalCache.set(`${CacheKeys.PROJECTS}${config.projectsDir}`, data, 300000);
+    globalCache.set(getProjectsStatsCacheKey(config), data, 300000);
     return data;
   } catch (err) {
     console.error(`[getProjectsWithStats] Failed to build projects for ${config.projectsDir}:`, err);
@@ -418,14 +476,10 @@ async function buildProjectsWithStats(config) {
       let lastUsed = null;
 
       try {
-        const files = await fs.promises.readdir(projectPath);
-        const jsonlFiles = files.filter(f => f.endsWith('.jsonl') && !f.startsWith('agent-'));
-
         const sessionChecks = await Promise.all(
-          jsonlFiles.map(async (fileName) => {
-            const filePath = path.join(projectPath, fileName);
-            const stats = await fs.promises.stat(filePath);
-            const hasMessages = await hasActualMessages(filePath, stats);
+          getProjectSessionFiles(config, projectName).map(async (session) => {
+            const stats = await fs.promises.stat(session.filePath);
+            const hasMessages = await hasActualMessages(session.filePath, stats);
             return hasMessages ? stats.mtime.getTime() : null;
           })
         );
@@ -469,10 +523,8 @@ function getProjectAndSessionCounts(config) {
       return;
     }
     projectCount += 1;
-    const projectPath = path.join(projectsDir, entry.name);
     try {
-      const files = fs.readdirSync(projectPath);
-      sessionCount += files.filter(file => file.endsWith('.jsonl') && !file.startsWith('agent-')).length;
+      sessionCount += getProjectSessionFiles(config, entry.name).length;
     } catch (err) {
       // 忽略单个项目的读取错误
     }
@@ -575,14 +627,14 @@ function scanSessionFileForMessagesAsync(filePath) {
 // Get sessions for a project - async version
 async function getSessionsForProject(config, projectName) {
   // Check cache first
-  const cacheKey = `${CacheKeys.SESSIONS}${projectName}`;
+  const cacheKey = getProjectSessionsCacheKey(projectName);
   const cached = globalCache.get(cacheKey);
   if (cached) {
     return cached;
   }
 
   const projectConfig = { ...config, currentProject: projectName };
-  const sessions = getAllSessions(projectConfig);
+  const sessions = getProjectSessionFiles(projectConfig, projectName);
   const forkRelations = getForkRelations();
   const savedOrder = getSessionOrder(projectName);
 
@@ -627,8 +679,10 @@ async function getSessionsForProject(config, projectName) {
     }
 
     // Add remaining sessions (new ones not in saved order)
-    ordered.push(...sessionMap.values());
-    orderedSessions = ordered;
+    const newSessions = [...sessionMap.values()].sort((a, b) => {
+      return new Date(b.mtime).getTime() - new Date(a.mtime).getTime();
+    });
+    orderedSessions = [...newSessions, ...ordered];
   }
 
   const result = {
@@ -643,24 +697,22 @@ async function getSessionsForProject(config, projectName) {
 
 // Delete a session
 function deleteSession(config, projectName, sessionId) {
-  const projectDir = path.join(config.projectsDir, projectName);
-  const sessionFile = path.join(projectDir, sessionId + '.jsonl');
+  const sessionFile = resolveSessionFile(config, projectName, sessionId);
 
-  if (!fs.existsSync(sessionFile)) {
+  if (!sessionFile || !fs.existsSync(sessionFile)) {
     throw new Error('Session not found');
   }
 
   fs.unlinkSync(sessionFile);
-  invalidateProjectsCache(config);
+  invalidateProjectCaches(config, projectName);
   return { success: true };
 }
 
 // Fork a session
 function forkSession(config, projectName, sessionId) {
-  const projectDir = path.join(config.projectsDir, projectName);
-  const sessionFile = path.join(projectDir, sessionId + '.jsonl');
+  const sessionFile = resolveSessionFile(config, projectName, sessionId);
 
-  if (!fs.existsSync(sessionFile)) {
+  if (!sessionFile || !fs.existsSync(sessionFile)) {
     throw new Error('Session not found');
   }
 
@@ -669,7 +721,7 @@ function forkSession(config, projectName, sessionId) {
 
   // Generate new session ID (UUID v4)
   const newSessionId = crypto.randomUUID();
-  const newSessionFile = path.join(projectDir, newSessionId + '.jsonl');
+  const newSessionFile = path.join(path.dirname(sessionFile), newSessionId + '.jsonl');
 
   // Write to new file
   fs.writeFileSync(newSessionFile, content, 'utf8');
@@ -678,7 +730,13 @@ function forkSession(config, projectName, sessionId) {
   const forkRelations = getForkRelations();
   forkRelations[newSessionId] = sessionId;
   saveForkRelations(forkRelations);
-  invalidateProjectsCache(config);
+
+  const savedOrder = getSessionOrder(projectName);
+  if (savedOrder.length > 0) {
+    saveSessionOrder(projectName, [newSessionId, ...savedOrder.filter(id => id !== newSessionId)]);
+  }
+
+  invalidateProjectCaches(config, projectName);
 
   return { newSessionId, forkedFrom: sessionId };
 }
@@ -720,6 +778,7 @@ function saveSessionOrder(projectName, order) {
   // Update order for this project
   allOrders[projectName] = order;
   fs.writeFileSync(orderFile, JSON.stringify(allOrders, null, 2), 'utf8');
+  invalidateProjectSessionCache(projectName);
 }
 
 // Delete a project (remove the entire project directory)
@@ -739,7 +798,7 @@ function deleteProject(config, projectName) {
     saveProjectOrder(config, newOrder);
   }
 
-  invalidateProjectsCache(config);
+  invalidateProjectCaches(config, projectName);
   clearProjectPathResolutionCache(projectName);
   return {
     success: true,
@@ -749,20 +808,12 @@ function deleteProject(config, projectName) {
 
 // Search sessions for keyword
 function searchSessions(config, projectName, keyword, contextLength = 15) {
-  const projectDir = path.join(config.projectsDir, projectName);
-
-  if (!fs.existsSync(projectDir)) {
-    return [];
-  }
-
   const results = [];
-  const files = fs.readdirSync(projectDir);
-  const jsonlFiles = files.filter(f => f.endsWith('.jsonl') && !f.startsWith('agent-'));
   const aliases = loadAliases();
 
-  for (const file of jsonlFiles) {
-    const sessionId = file.replace('.jsonl', '');
-    const filePath = path.join(projectDir, file);
+  for (const session of getProjectSessionFiles(config, projectName)) {
+    const sessionId = session.sessionId;
+    const filePath = session.filePath;
 
     // Skip sessions with no actual messages
     if (!hasActualMessages(filePath)) {
@@ -836,7 +887,7 @@ async function getRecentSessions(config, limit = 5) {
   // Collect all sessions from all projects
   projects.forEach(projectName => {
     const projectConfig = { ...config, currentProject: projectName };
-    const sessions = getAllSessions(projectConfig);
+    const sessions = getProjectSessionFiles(projectConfig, projectName);
     const { projectName: displayName, fullPath } = parseRealProjectPath(projectName);
 
     sessions.forEach(session => {

package/dist/web/assets/SessionList-CfPtcq6Y.css

@@ -1 +0,0 @@
-.session-list-container[data-v-e76934ff]{width:100%}.sessions-list[data-v-e76934ff]{position:relative;overflow:hidden}.session-header[data-v-e76934ff]{align-items:flex-start;gap:14px}.session-header-main[data-v-e76934ff]{display:flex;align-items:flex-start;gap:12px;min-width:0;flex:1}.back-button[data-v-e76934ff]{flex-shrink:0}.title-section[data-v-e76934ff]{flex:1;min-width:0}.title-with-count[data-v-e76934ff]{display:flex;align-items:center;gap:6px;margin-bottom:0;flex-wrap:wrap}.title-section h2[data-v-e76934ff]{margin:0}.session-page-title[data-v-e76934ff]{font-size:clamp(22px,1.75vw,27px);line-height:1.08;letter-spacing:-.03em}.session-count[data-v-e76934ff]{font-size:13px;color:var(--text-secondary)}.total-size-tag[data-v-e76934ff]{margin-left:0}.project-path[data-v-e76934ff]{margin-top:0}.header-actions[data-v-e76934ff]{display:flex;align-items:center;gap:12px;flex-wrap:wrap}.session-toolbar[data-v-e76934ff]{min-width:min(420px,100%)}.search-input[data-v-e76934ff]{width:300px;min-width:min(300px,100%)}.search-input[data-v-e76934ff] .n-input{border-radius:14px;background:var(--surface-panel-strong);border:1px solid var(--border-primary);transition:all .2s ease}.search-input[data-v-e76934ff] .n-input:hover{border-color:var(--border-secondary);box-shadow:var(--shadow-sm)}.search-input[data-v-e76934ff] .n-input:focus-within{border-color:var(--primary-color);box-shadow:var(--focus-ring)}.loading-container[data-v-e76934ff]{display:flex;justify-content:center;align-items:center;min-height:400px}.session-item[data-v-e76934ff]{display:flex;align-items:center;gap:12px;padding:18px;background:var(--surface-panel);border:1px solid var(--border-primary);border-radius:18px;margin-bottom:10px;transition:all .22s ease;cursor:pointer;box-shadow:var(--shadow-sm)}.session-item[data-v-e76934ff]:hover{border-color:#18a05842;box-shadow:var(--shadow-md);transform:translateY(-1px)}.session-item-selection-mode[data-v-e76934ff]{cursor:default}.session-item-selected[data-v-e76934ff]{border-color:#18a0585c;box-shadow:0 0 0 3px #18a0581f;background:#18a0580a}.drag-handle[data-v-e76934ff]{cursor:move;width:24px;height:24px;padding:4px;opacity:.4;transition:all .2s;flex-shrink:0;display:flex;align-items:center;justify-content:center}.session-item:hover .drag-handle[data-v-e76934ff]{opacity:1;background-color:#18a0581a;border-radius:10px}.selection-checkbox[data-v-e76934ff]{width:24px;min-width:24px;display:flex;align-items:center;justify-content:center}.session-left[data-v-e76934ff]{flex:1;display:flex;align-items:center;gap:16px;min-width:0}.session-icon[data-v-e76934ff]{flex-shrink:0}.session-info[data-v-e76934ff]{flex:1;min-width:0}.session-header[data-v-e76934ff]{display:flex;align-items:center;margin-bottom:6px}.session-title-row[data-v-e76934ff]{display:flex;align-items:center;gap:8px}.session-title[data-v-e76934ff]{font-size:15px;font-weight:650;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;flex-shrink:1;min-width:0}.session-meta[data-v-e76934ff]{display:flex;align-items:center;gap:8px;margin-bottom:6px;font-size:13px}.session-message[data-v-e76934ff]{display:block;max-width:680px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;font-size:13px}.session-message-empty[data-v-e76934ff]{font-style:italic;opacity:.5}.session-right[data-v-e76934ff]{display:flex;flex-direction:column;justify-content:flex-start;align-items:flex-end;min-width:248px;flex-shrink:0;gap:12px}.session-tags-area[data-v-e76934ff]{min-height:24px;display:flex;align-items:flex-start;justify-content:flex-end}.session-actions[data-v-e76934ff]{display:flex;align-items:center;margin-top:auto}.session-actions[data-v-e76934ff] .n-button{border-radius:12px}.ghost[data-v-e76934ff]{opacity:.4}.chosen[data-v-e76934ff]{box-shadow:0 4px 16px #00000026}.search-result-item[data-v-e76934ff]{margin-bottom:16px;padding:14px;border:1px solid var(--border-primary);border-radius:14px;background:var(--surface-panel);box-shadow:var(--shadow-sm)}.search-result-header[data-v-e76934ff]{display:flex;align-items:center;justify-content:space-between;margin-bottom:8px}.search-result-title[data-v-e76934ff]{display:flex;align-items:center;gap:8px}.search-match[data-v-e76934ff]{display:flex;align-items:flex-start;gap:8px;margin-top:8px;padding:10px 12px;background:var(--surface-panel-muted);border-radius:12px}.search-match-text[data-v-e76934ff]{flex:1;line-height:1.6}@media (max-width: 1024px){.session-header[data-v-e76934ff]{align-items:stretch}.session-toolbar[data-v-e76934ff]{width:100%;min-width:0}.search-input[data-v-e76934ff]{width:100%}}@media (max-width: 900px){.session-page-title[data-v-e76934ff]{font-size:20px}.session-item[data-v-e76934ff]{flex-direction:column;align-items:stretch}.session-right[data-v-e76934ff]{min-width:0;align-items:flex-start}.session-tags-area[data-v-e76934ff],.session-actions[data-v-e76934ff]{width:100%;justify-content:flex-start}}