@adversity/coding-tool-x 2.4.0 → 2.4.2

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

@@ -396,27 +396,44 @@ function deleteWorkspace(id, removeFiles = false) {
 
   const workspace = data.workspaces[index];
 
-  // 如果需要删除物理文件
-  if (removeFiles && fs.existsSync(workspace.path)) {
-    try {
-      // 清理 worktrees
-      for (const proj of workspace.projects) {
-        if (proj.worktrees && proj.worktrees.length > 0) {
-          for (const wt of proj.worktrees) {
-            if (fs.existsSync(wt.path)) {
-              try {
-                execSync(`git worktree remove "${wt.path}" --force`, {
-                  cwd: proj.sourcePath,
-                  stdio: 'pipe'
-                });
-              } catch (error) {
-                console.error(`删除 worktree 失败: ${wt.path}`, error.message);
+  // 清理 worktrees (无论是否删除工作区目录,都应该清理 worktree)
+  for (const proj of workspace.projects) {
+    if (proj.isGitRepo && proj.sourcePath && fs.existsSync(proj.sourcePath)) {
+      try {
+        // 重新扫描实际的 worktrees,确保获取最新状态
+        const actualWorktrees = getGitWorktrees(proj.sourcePath);
+        for (const wt of actualWorktrees) {
+          // 只删除属于这个工作区的 worktree (通过 -ws- 标识符识别)
+          if (wt.path && wt.path.includes('-ws-')) {
+            try {
+              console.log(`清理 worktree: ${wt.path}`);
+              execSync(`git worktree remove "${wt.path}" --force`, {
+                cwd: proj.sourcePath,
+                stdio: 'pipe'
+              });
+            } catch (error) {
+              console.error(`删除 worktree 失败: ${wt.path}`, error.message);
+              // 如果 git worktree remove 失败,尝试手动删除目录
+              if (fs.existsSync(wt.path)) {
+                try {
+                  fs.rmSync(wt.path, { recursive: true, force: true });
+                  console.log(`手动删除 worktree 目录: ${wt.path}`);
+                } catch (rmError) {
+                  console.error(`手动删除 worktree 目录失败: ${wt.path}`, rmError.message);
+                }
               }
             }
           }
         }
+      } catch (error) {
+        console.error(`扫描 worktree 失败: ${proj.sourcePath}`, error.message);
       }
+    }
+  }
 
+  // 如果需要删除物理文件
+  if (removeFiles && fs.existsSync(workspace.path)) {
+    try {
       // 删除工作区目录
       fs.rmSync(workspace.path, { recursive: true, force: true });
     } catch (error) {
@@ -594,50 +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 去重
-        const projectPath = proj.fullPath;
-        if (projectPath && !seenPaths.has(projectPath)) {
-          seenPaths.add(projectPath);
-          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

@@ -175,7 +175,10 @@ function startWebSocketServer(httpServer) {
       console.log(`✅ WebSocket server started on ws://127.0.0.1:${port}/ws`);
     }
 
-    wss.on('connection', (ws) => {
+    wss.on('connection', (ws, req) => {
+      const clientIp = req.socket.remoteAddress;
+      console.log(`[WebSocket] New connection from ${clientIp}`);
+
       wsClients.add(ws);
 
       // 标记客户端存活