@adversity/coding-tool-x 3.1.0 → 3.1.2

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

@@ -6,7 +6,7 @@ const os = require('os');
  * 统计服务 - 数据采集和存储
  *
  * 文件结构：
- * ~/.claude/cc-tool/
+ * ~/.cc-tool/
  *   ├── statistics.json              # 总体统计（实时更新）
  *   ├── daily-stats/
  *   │   ├── 2025-11-22.json         # 每日汇总统计
@@ -20,7 +20,7 @@ const os = require('os');
 
 // 获取基础目录
 function getBaseDir() {
-  const dir = path.join(os.homedir(), '.claude', 'cc-tool');
+  const dir = path.join(os.homedir(), '.cc-tool');
   if (!fs.existsSync(dir)) {
     fs.mkdirSync(dir, { recursive: true });
   }

package/src/server/services/terminal-commands.js

@@ -8,7 +8,7 @@ const path = require('path');
 const os = require('os');
 
 // 配置文件路径
-const CONFIG_DIR = path.join(os.homedir(), '.claude', 'cc-tool');
+const CONFIG_DIR = path.join(os.homedir(), '.cc-tool');
 const CONFIG_FILE = path.join(CONFIG_DIR, 'terminal-commands.json');
 
 // 默认命令配置
@@ -30,6 +30,12 @@ const DEFAULT_COMMANDS = {
     newSession: 'gemini',
     resumeSession: 'gemini -r {sessionId}',
     description: 'Google Gemini CLI'
+  },
+  opencode: {
+    name: 'OpenCode',
+    newSession: 'opencode',
+    resumeSession: 'opencode -r {sessionId}',
+    description: 'OpenCode AI coding agent for the terminal'
   }
 };
 
@@ -58,7 +64,8 @@ function loadTerminalCommands() {
       return {
         claude: { ...DEFAULT_COMMANDS.claude, ...saved.claude },
         codex: { ...DEFAULT_COMMANDS.codex, ...saved.codex },
-        gemini: { ...DEFAULT_COMMANDS.gemini, ...saved.gemini }
+        gemini: { ...DEFAULT_COMMANDS.gemini, ...saved.gemini },
+        opencode: { ...DEFAULT_COMMANDS.opencode, ...saved.opencode }
       };
     }
   } catch (err) {
@@ -79,7 +86,7 @@ function saveTerminalCommands(commands) {
 
     // 验证配置格式
     const validated = {};
-    for (const channel of ['claude', 'codex', 'gemini']) {
+    for (const channel of ['claude', 'codex', 'gemini', 'opencode']) {
       if (commands[channel]) {
         validated[channel] = {
           name: commands[channel].name || DEFAULT_COMMANDS[channel].name,

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

@@ -7,7 +7,7 @@ const { detectAvailableTerminals, getDefaultTerminal, getSystemShell } = require
  * 获取配置文件路径
  */
 function getConfigFilePath() {
-  const ccToolDir = path.join(os.homedir(), '.claude', 'cc-tool');
+  const ccToolDir = path.join(os.homedir(), '.cc-tool');
   if (!fs.existsSync(ccToolDir)) {
     fs.mkdirSync(ccToolDir, { recursive: true });
   }

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

@@ -2,7 +2,7 @@ const fs = require('fs');
 const path = require('path');
 const os = require('os');
 
-const UI_CONFIG_DIR = path.join(os.homedir(), '.claude', 'cc-tool');
+const UI_CONFIG_DIR = path.join(os.homedir(), '.cc-tool');
 const UI_CONFIG_FILE = path.join(UI_CONFIG_DIR, 'ui-config.json');
 
 // Default UI config

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

@@ -1,14 +1,32 @@
 // 多项目工作区服务
 const fs = require('fs');
 const path = require('path');
-const { execSync } = require('child_process');
+const { execFileSync } = require('child_process');
 const { PATHS } = require('../../config/paths');
 const configTemplatesService = require('./config-templates-service');
-const permissionTemplatesService = require('./permission-templates-service');
 
 // 工作区配置文件路径
 const WORKSPACES_CONFIG = path.join(PATHS.base, 'workspaces.json');
 
+function runGitCommand(args, options = {}) {
+  const execOptions = {
+    encoding: 'utf8',
+    stdio: ['ignore', 'pipe', 'pipe'],
+    ...options
+  };
+  return execFileSync('git', args, execOptions);
+}
+
+function resolveCurrentBranch(repoPath) {
+  try {
+    return runGitCommand(['rev-parse', '--abbrev-ref', 'HEAD'], {
+      cwd: repoPath
+    }).trim();
+  } catch (error) {
+    return 'main';
+  }
+}
+
 /**
  * 生成唯一工作区 ID
  */
@@ -110,9 +128,8 @@ function getGitWorktrees(repoPath) {
     if (!isGitRepo(repoPath)) {
       return [];
     }
-    const output = execSync('git worktree list --porcelain', {
-      cwd: repoPath,
-      encoding: 'utf8'
+    const output = runGitCommand(['worktree', 'list', '--porcelain'], {
+      cwd: repoPath
     });
 
     const worktrees = [];
@@ -152,7 +169,7 @@ function getGitWorktrees(repoPath) {
  * @param {Array} options.projects - 项目列表 [{sourcePath, name, createWorktree, branch}]
  */
 function createWorkspace(options) {
-  const { name, description = '', baseDir, projects = [], configTemplateId, permissionTemplate } = options;
+  const { name, description = '', baseDir, projects = [], configTemplateId } = options;
 
   if (!name || name.trim() === '') {
     throw new Error('工作区名称不能为空');
@@ -208,10 +225,7 @@ function createWorkspace(options) {
       let targetBranch = branch;
       if (!targetBranch) {
         try {
-          targetBranch = execSync('git rev-parse --abbrev-ref HEAD', {
-            cwd: sourcePath,
-            encoding: 'utf8'
-          }).trim();
+          targetBranch = resolveCurrentBranch(sourcePath);
         } catch (e) {
           targetBranch = 'main';
         }
@@ -279,10 +293,7 @@ function createWorkspace(options) {
         let targetBranch = branch;
         if (!targetBranch) {
           try {
-            targetBranch = execSync('git rev-parse --abbrev-ref HEAD', {
-              cwd: sourcePath,
-              encoding: 'utf8'
-            }).trim();
+            targetBranch = resolveCurrentBranch(sourcePath);
           } catch (e) {
             targetBranch = 'main';
           }
@@ -305,9 +316,8 @@ function createWorkspace(options) {
         } else {
           try {
             // 尝试检出已有分支
-            execSync(`git worktree add "${worktreePath}" "${targetBranch}"`, {
-              cwd: sourcePath,
-              stdio: 'pipe'
+            runGitCommand(['worktree', 'add', worktreePath, targetBranch], {
+              cwd: sourcePath
             });
 
             targetPath = worktreePath;
@@ -318,17 +328,12 @@ function createWorkspace(options) {
           } catch (error) {
             // 如果分支不存在，尝试创建新分支
             try {
-              // 构建 git worktree add 命令
-              let worktreeCmd = `git worktree add "${worktreePath}" -b "${targetBranch}"`;
-
-              // 如果指定了基础分支，添加到命令中
+              const worktreeArgs = ['worktree', 'add', worktreePath, '-b', targetBranch];
               if (baseBranch && baseBranch.trim()) {
-                worktreeCmd += ` "${baseBranch}"`;
+                worktreeArgs.push(baseBranch.trim());
               }
-
-              execSync(worktreeCmd, {
-                cwd: sourcePath,
-                stdio: 'pipe'
+              runGitCommand(worktreeArgs, {
+                cwd: sourcePath
               });
               targetPath = worktreePath;
               worktrees.push({
@@ -387,55 +392,6 @@ function createWorkspace(options) {
       }
     }
 
-    // 应用权限模板（如果指定）
-    let permissionInfo = null;
-    if (permissionTemplate) {
-      try {
-        // 从权限模板服务获取模板
-        const template = permissionTemplatesService.getTemplateById(permissionTemplate);
-
-        if (template && template.permissions) {
-          // 为工作区中的每个项目应用权限设置
-          for (const proj of workspaceProjects) {
-            const projSettingsDir = path.join(proj.targetPath, '.claude');
-            const projSettingsFile = path.join(projSettingsDir, 'settings.json');
-
-            // 确保 .claude 目录存在
-            if (!fs.existsSync(projSettingsDir)) {
-              fs.mkdirSync(projSettingsDir, { recursive: true });
-            }
-
-            // 读取现有设置或创建新的
-            let settings = {};
-            if (fs.existsSync(projSettingsFile)) {
-              try {
-                settings = JSON.parse(fs.readFileSync(projSettingsFile, 'utf8'));
-              } catch (e) {
-                settings = {};
-              }
-            }
-
-            // 更新权限设置
-            settings.permissions = {
-              allow: template.permissions.allow || [],
-              deny: template.permissions.deny || []
-            };
-
-            // 保存设置
-            fs.writeFileSync(projSettingsFile, JSON.stringify(settings, null, 2), 'utf8');
-          }
-
-          permissionInfo = {
-            template: permissionTemplate,
-            appliedAt: new Date().toISOString()
-          };
-        }
-      } catch (permError) {
-        console.warn('应用权限模板失败:', permError.message);
-        // 不中断工作区创建流程
-      }
-    }
-
     // 保存工作区配置
     const workspaceId = generateWorkspaceId();
     const workspace = {
@@ -445,7 +401,6 @@ function createWorkspace(options) {
       path: workspacePath,
       projects: workspaceProjects,
       configTemplate: templateInfo,
-      permissionTemplate: permissionInfo,
       createdAt: new Date().toISOString(),
       lastUsed: new Date().toISOString()
     };
@@ -494,9 +449,8 @@ function deleteWorkspace(id, removeFiles = false) {
           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'
+              runGitCommand(['worktree', 'remove', wt.path, '--force'], {
+                cwd: proj.sourcePath
               });
             } catch (error) {
               console.error(`删除 worktree 失败: ${wt.path}`, error.message);
@@ -585,10 +539,7 @@ function addProjectToWorkspace(workspaceId, projectConfig) {
     let targetBranch = branch;
     if (!targetBranch) {
       try {
-        targetBranch = execSync('git rev-parse --abbrev-ref HEAD', {
-          cwd: sourcePath,
-          encoding: 'utf8'
-        }).trim();
+        targetBranch = resolveCurrentBranch(sourcePath);
       } catch (e) {
         targetBranch = 'main';
       }
@@ -605,9 +556,8 @@ function addProjectToWorkspace(workspaceId, projectConfig) {
       worktrees.push({ branch: targetBranch, path: worktreePath });
     } else {
       try {
-        execSync(`git worktree add "${worktreePath}" "${targetBranch}"`, {
-          cwd: sourcePath,
-          stdio: 'pipe'
+        runGitCommand(['worktree', 'add', worktreePath, targetBranch], {
+          cwd: sourcePath
         });
         targetPath = worktreePath;
         worktrees.push({ branch: targetBranch, path: worktreePath });
@@ -626,17 +576,12 @@ function addProjectToWorkspace(workspaceId, projectConfig) {
 
         // Branch doesn't exist, try creating it
         try {
-          // 构建 git worktree add 命令
-          let worktreeCmd = `git worktree add "${worktreePath}" -b "${targetBranch}"`;
-
-          // 如果指定了基础分支，添加到命令中
+          const worktreeArgs = ['worktree', 'add', worktreePath, '-b', targetBranch];
           if (baseBranch && baseBranch.trim()) {
-            worktreeCmd += ` "${baseBranch}"`;
+            worktreeArgs.push(baseBranch.trim());
           }
-
-          execSync(worktreeCmd, {
-            cwd: sourcePath,
-            stdio: 'pipe'
+          runGitCommand(worktreeArgs, {
+            cwd: sourcePath
           });
           targetPath = worktreePath;
           worktrees.push({ branch: targetBranch, path: worktreePath });
@@ -711,9 +656,8 @@ function removeProjectFromWorkspace(workspaceId, projectName, removeWorktrees =
     for (const wt of project.worktrees) {
       if (fs.existsSync(wt.path)) {
         try {
-          execSync(`git worktree remove "${wt.path}" --force`, {
-            cwd: project.sourcePath,
-            stdio: 'pipe'
+          runGitCommand(['worktree', 'remove', wt.path, '--force'], {
+            cwd: project.sourcePath
           });
         } catch (error) {
           console.error(`删除 worktree 失败: ${wt.path}`, error.message);
@@ -739,8 +683,10 @@ async function getAllAvailableProjects() {
   const sessionsService = require('./sessions');
   const codexSessionsService = require('./codex-sessions');
   const geminiSessionsService = require('./gemini-sessions');
+  const opencodeSessionsService = require('./opencode-sessions');
   const { isCodexInstalled } = require('./codex-config');
   const { isGeminiInstalled } = require('./gemini-config');
+  const { isOpenCodeInstalled } = require('./opencode-sessions');
 
   const allProjects = [];
   const seenKeys = new Set();
@@ -800,6 +746,16 @@ async function getAllAvailableProjects() {
     console.error('获取 gemini 项目失败:', error.message);
   }
 
+  try {
+    if (isOpenCodeInstalled()) {
+      const opencodeProjects = opencodeSessionsService.getProjects();
+      const list = Array.isArray(opencodeProjects) ? opencodeProjects : [];
+      list.forEach(project => addProject('opencode', project));
+    }
+  } catch (error) {
+    console.error('获取 opencode 项目失败:', error.message);
+  }
+
   // 按最后使用时间排序
   allProjects.sort((a, b) => (b.lastUsed || 0) - (a.lastUsed || 0));
 
@@ -809,7 +765,7 @@ async function getAllAvailableProjects() {
 /**
  * 在工作区中启动 CLI 工具
  * @param {string} workspaceId 工作区 ID
- * @param {string} tool 工具名称 (claude/codex/gemini)
+ * @param {string} tool 工具名称 (claude/codex/gemini/opencode)
  * @param {string} projectName 可选，工作区内的项目名
  * @returns {object} 启动信息
  */
@@ -840,7 +796,8 @@ function getLaunchCommand(workspaceId, tool, projectName = null) {
   const commands = {
     claude: 'claude',
     codex: 'codex',
-    gemini: 'gemini'
+    gemini: 'gemini',
+    opencode: 'opencode'
   };
 
   const cmd = commands[tool];

package/src/server/websocket-server.js

@@ -5,6 +5,11 @@ const path = require('path');
 const os = require('os');
 const { loadConfig } = require('../config/loader');
 const { ptyManager } = require('./services/pty-manager');
+const {
+  normalizeAddress,
+  isLoopbackAddress,
+  isLoopbackRequest
+} = require('./services/network-access');
 
 const MAX_PERSISTED_LOGS = 500;
 
@@ -24,10 +29,139 @@ function getMaxLogsLimit() {
 
 let wss = null;
 let wsClients = new Set();
+let websocketOptions = {
+  host: '127.0.0.1',
+  allowRemoteTerminal: false
+};
+const HISTORY_CHUNK_SIZE = 50;
+
+function sendPersistedLogsInChunks(ws, logs) {
+  let index = 0;
+
+  const sendChunk = () => {
+    if (ws.readyState !== WebSocket.OPEN) {
+      return;
+    }
+
+    const end = Math.min(index + HISTORY_CHUNK_SIZE, logs.length);
+    for (let i = index; i < end; i++) {
+      ws.send(JSON.stringify(logs[i]));
+    }
+    index = end;
+
+    if (index < logs.length) {
+      setImmediate(sendChunk);
+    }
+  };
+
+  setImmediate(sendChunk);
+}
+
+function parseHostHeader(hostHeader) {
+  const value = String(hostHeader || '').trim();
+  if (!value) {
+    return { hostname: '', port: '' };
+  }
+
+  if (value.startsWith('[')) {
+    const closingBracket = value.indexOf(']');
+    if (closingBracket > 0) {
+      const hostname = value.slice(1, closingBracket);
+      const rest = value.slice(closingBracket + 1);
+      const port = rest.startsWith(':') ? rest.slice(1) : '';
+      return { hostname, port };
+    }
+  }
+
+  const separator = value.lastIndexOf(':');
+  if (separator > -1 && value.indexOf(':') === separator) {
+    return {
+      hostname: value.slice(0, separator),
+      port: value.slice(separator + 1)
+    };
+  }
+
+  return { hostname: value, port: '' };
+}
+
+function defaultPortForProtocol(protocol) {
+  if (protocol === 'https:') {
+    return '443';
+  }
+  return '80';
+}
+
+function isAllowedWebSocketOrigin(req) {
+  if (!req || !req.headers) {
+    return false;
+  }
+
+  const originHeader = req.headers.origin;
+  if (!originHeader) {
+    // 非浏览器客户端通常不会携带 Origin，仅允许本机来源
+    return isLoopbackRequest(req);
+  }
+
+  let originUrl;
+  try {
+    originUrl = new URL(originHeader);
+  } catch (error) {
+    return false;
+  }
+
+  if (originUrl.protocol !== 'http:' && originUrl.protocol !== 'https:') {
+    return false;
+  }
+
+  const requestHost = parseHostHeader(req.headers.host);
+  const requestProtocol = req.socket && req.socket.encrypted ? 'https:' : 'http:';
+  const requestHostname = normalizeAddress(requestHost.hostname).toLowerCase();
+  const requestPort = requestHost.port || defaultPortForProtocol(requestProtocol);
+
+  const originHostname = normalizeAddress(originUrl.hostname).toLowerCase();
+  const originPort = originUrl.port || defaultPortForProtocol(originUrl.protocol);
+
+  if (!requestHostname || !originHostname) {
+    return false;
+  }
+
+  // 同源直接放行
+  if (originHostname === requestHostname && originPort === requestPort) {
+    return true;
+  }
+
+  // 允许本机开发代理（例如 Vite 5000 -> 19999）
+  if (isLoopbackRequest(req) && isLoopbackAddress(originHostname) && isLoopbackAddress(requestHostname)) {
+    return true;
+  }
+
+  return false;
+}
+
+function installOriginGuard(server) {
+  if (!server || typeof server.shouldHandle !== 'function') {
+    return;
+  }
+
+  const originalShouldHandle = server.shouldHandle.bind(server);
+  server.shouldHandle = (req) => {
+    if (!originalShouldHandle(req)) {
+      return false;
+    }
+
+    const allowed = isAllowedWebSocketOrigin(req);
+    if (!allowed) {
+      const origin = req.headers.origin || 'unknown';
+      const clientIp = req.socket && req.socket.remoteAddress ? req.socket.remoteAddress : 'unknown';
+      console.warn(`[WebSocket] Rejected connection from ${clientIp}, origin: ${origin}`);
+    }
+    return allowed;
+  };
+}
 
 // 日志持久化文件路径
 function getLogsFilePath() {
-  const ccToolDir = path.join(os.homedir(), '.claude', 'cc-tool');
+  const ccToolDir = path.join(os.homedir(), '.cc-tool');
   if (!fs.existsSync(ccToolDir)) {
     fs.mkdirSync(ccToolDir, { recursive: true });
   }
@@ -141,12 +275,17 @@ function saveLogsToFile(logs) {
 let logsCache = [];
 
 // 启动 WebSocket 服务器（附加到现有的 HTTP 服务器）
-function startWebSocketServer(httpServer) {
+function startWebSocketServer(httpServer, options = {}) {
   if (wss) {
     console.log('WebSocket server already running');
     return;
   }
 
+  websocketOptions = {
+    host: options.host || '127.0.0.1',
+    allowRemoteTerminal: options.allowRemoteTerminal === true
+  };
+
   // 加载持久化的日志到缓存
   logsCache = loadPersistedLogs();
   const counts = logsCache.reduce((acc, log) => {
@@ -163,15 +302,17 @@ function startWebSocketServer(httpServer) {
         server: httpServer,
         path: '/ws'  // 指定 WebSocket 路径
       });
+      installOriginGuard(wss);
       console.log(`✅ WebSocket server attached to HTTP server at /ws`);
     } else {
       // 创建独立的 WebSocket 服务器，使用配置的 webUI 端口
       const config = loadConfig();
-      const port = config.ports?.webUI || 10099;
+      const port = config.ports?.webUI || 19999;
       wss = new WebSocket.Server({
         port,
         path: '/ws'
       });
+      installOriginGuard(wss);
       console.log(`✅ WebSocket server started on ws://127.0.0.1:${port}/ws`);
     }
 
@@ -185,14 +326,13 @@ function startWebSocketServer(httpServer) {
       ws.isAlive = true;
       // 终端绑定信息
       ws.terminalId = null;
+      const isLoopback = isLoopbackRequest(req);
+      const lanMode = websocketOptions.host === '0.0.0.0';
+      ws.terminalAllowed = !(lanMode && !isLoopback && !websocketOptions.allowRemoteTerminal);
 
       // 发送历史日志给新连接的客户端
       if (logsCache.length > 0) {
-        logsCache.forEach(log => {
-          if (ws.readyState === WebSocket.OPEN) {
-            ws.send(JSON.stringify(log));
-          }
-        });
+        sendPersistedLogsInChunks(ws, logsCache);
       }
 
       // 处理客户端消息
@@ -400,6 +540,14 @@ const { getWebTerminalShellConfig } = require('./services/terminal-config');
 function handleTerminalMessage(ws, message) {
   const { type } = message;
 
+  if (String(type || '').startsWith('terminal:') && ws.terminalAllowed === false) {
+    ws.send(JSON.stringify({
+      type: 'terminal:error',
+      error: '出于安全考虑，LAN 模式下仅允许本机使用 Web 终端。可设置 CC_TOOL_ALLOW_REMOTE_TERMINAL=true 覆盖。'
+    }));
+    return;
+  }
+
   switch (type) {
     case 'terminal:create':
       handleTerminalCreate(ws, message);