coding-tool-x 3.3.4 → 3.3.6

package/src/server/services/session-converter.js

@@ -6,6 +6,11 @@ const { getSessionById: getClaudeSessionById } = require('./sessions');
 const { getSessionById: getCodexSessionById } = require('./codex-sessions');
 const { getSessionById: getGeminiSessionById, getProjectPath } = require('./gemini-sessions');
 const { readJSONL, parseSession: parseCodexFull } = require('./codex-parser');
+const { NATIVE_PATHS, HOME_DIR } = require('../../config/paths');
+
+const CLAUDE_PROJECTS_DIR = NATIVE_PATHS.claude.projects;
+const CODEX_SESSIONS_DIR = NATIVE_PATHS.codex.sessions;
+const GEMINI_TMP_DIR = NATIVE_PATHS.gemini.tmp;
 
 /**
  * 统一中间格式
@@ -192,7 +197,7 @@ function parseGeminiToUnified(filePath) {
 
   return {
     sessionId: session.sessionId || crypto.randomUUID(),
-    cwd: projectPath || os.homedir(),
+    cwd: projectPath || HOME_DIR,
     gitBranch: null, // Gemini 不记录 git branch
     startTime: session.startTime || new Date().toISOString(),
     messages,
@@ -380,7 +385,7 @@ function generateTargetPath(targetType, unified, options = {}) {
 
   if (targetType === 'claude') {
     // Claude: ~/.claude/projects/{encoded-path}/{uuid}.jsonl
-    const projectsDir = path.join(os.homedir(), '.claude', 'projects');
+    const projectsDir = CLAUDE_PROJECTS_DIR;
     const encodedPath = options.targetProject
       ? encodePath(options.targetProject)
       : encodePath(unified.cwd);
@@ -388,7 +393,7 @@ function generateTargetPath(targetType, unified, options = {}) {
     return path.join(projectsDir, encodedPath, `${newSessionId}.jsonl`);
   } else if (targetType === 'codex') {
     // Codex: ~/.codex/sessions/{YYYY}/{MM}/{DD}/rollout-{timestamp}-{uuid}.jsonl
-    const sessionsDir = path.join(os.homedir(), '.codex', 'sessions');
+    const sessionsDir = CODEX_SESSIONS_DIR;
     const now = new Date();
     const year = now.getFullYear();
     const month = String(now.getMonth() + 1).padStart(2, '0');
@@ -401,7 +406,7 @@ function generateTargetPath(targetType, unified, options = {}) {
       `rollout-${timestamp}-${newSessionId}.jsonl`);
   } else if (targetType === 'gemini') {
     // Gemini: ~/.gemini/tmp/{project_hash}/chats/session-{timestamp}-{shortId}.json
-    const geminiDir = path.join(os.homedir(), '.gemini', 'tmp');
+    const geminiDir = GEMINI_TMP_DIR;
     const projectHash = unified.metadata.projectHash ||
       crypto.createHash('sha256').update(unified.cwd).digest('hex');
     const timestamp = new Date().toISOString().replace(/:/g, '-').replace(/\..+/, '');

package/src/server/services/sessions.js

@@ -1,6 +1,5 @@
 const fs = require('fs');
 const path = require('path');
-const os = require('os');
 const crypto = require('crypto');
 const { getAllSessions, parseSessionInfoFast } = require('../../utils/session');
 const { loadAliases } = require('./alias');
@@ -12,7 +11,11 @@ const {
   rememberHasMessages
 } = require('./session-cache');
 const { globalCache, CacheKeys } = require('./enhanced-cache');
-const { PATHS } = require('../../config/paths');
+const { PATHS, NATIVE_PATHS } = require('../../config/paths');
+
+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');
 
 // Base directory for cc-tool data
 function getCcToolDir() {
@@ -238,7 +241,7 @@ function validateProjectPath(candidatePath) {
 
 function tryResolvePathFromSessions(encodedName) {
   try {
-    const projectDir = path.join(os.homedir(), '.claude', 'projects', encodedName);
+    const projectDir = path.join(CLAUDE_PROJECTS_DIR, encodedName);
     if (!fs.existsSync(projectDir)) {
       return null;
     }
@@ -824,7 +827,7 @@ async function searchSessionsAcrossProjects(config, keyword, contextLength = 35)
 
   try {
     // Search in Codex projects
-    const codexProjectsDir = path.join(os.homedir(), '.codex', 'projects');
+    const codexProjectsDir = CODEX_PROJECTS_DIR;
     if (fs.existsSync(codexProjectsDir)) {
       const codexConfig = { ...config, projectsDir: codexProjectsDir };
       const codexProjects = await getProjects(codexConfig);
@@ -849,7 +852,7 @@ async function searchSessionsAcrossProjects(config, keyword, contextLength = 35)
 
   try {
     // Search in Gemini projects
-    const geminiProjectsDir = path.join(os.homedir(), '.gemini', 'projects');
+    const geminiProjectsDir = GEMINI_PROJECTS_DIR;
     if (fs.existsSync(geminiProjectsDir)) {
       const geminiConfig = { ...config, projectsDir: geminiProjectsDir };
       const geminiProjects = await getProjects(geminiConfig);

package/src/server/services/settings-manager.js

@@ -1,15 +1,14 @@
 const fs = require('fs');
-const path = require('path');
-const os = require('os');
+const { NATIVE_PATHS } = require('../../config/paths');
 
 // Claude Code 配置文件路径
 function getSettingsPath() {
-  return path.join(os.homedir(), '.claude', 'settings.json');
+  return NATIVE_PATHS.claude.settings;
 }
 
 // 备份文件路径
 function getBackupPath() {
-  return path.join(os.homedir(), '.claude', 'settings.json.cc-tool-backup');
+  return NATIVE_PATHS.claude.settingsBackup;
 }
 
 // 检查配置文件是否存在

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

@@ -16,7 +16,7 @@ const AdmZip = require('adm-zip');
 const {
   parseSkillContent,
 } = require('./format-converter');
-const { NATIVE_PATHS } = require('../../config/paths');
+const { NATIVE_PATHS, HOME_DIR } = require('../../config/paths');
 
 const SUPPORTED_PLATFORMS = ['claude', 'codex', 'gemini', 'opencode'];
 const OPENCODE_SKILL_NAME_REGEX = /^[a-z0-9]+(-[a-z0-9]+)*$/;
@@ -46,17 +46,17 @@ const DEFAULT_REPOS_BY_PLATFORM = {
 
 const PLATFORM_CONFIG = {
   claude: {
-    installDir: path.join(os.homedir(), '.claude', 'skills'),
+    installDir: path.join(HOME_DIR, '.claude', 'skills'),
     reposFile: 'skill-repos.json',
     cacheFile: 'skills-cache.json'
   },
   codex: {
-    installDir: path.join(os.homedir(), '.codex', 'skills'),
+    installDir: path.join(HOME_DIR, '.codex', 'skills'),
     reposFile: 'codex-skill-repos.json',
     cacheFile: 'codex-skills-cache.json'
   },
   gemini: {
-    installDir: path.join(os.homedir(), '.gemini', 'skills'),
+    installDir: path.join(HOME_DIR, '.gemini', 'skills'),
     reposFile: 'gemini-skill-repos.json',
     cacheFile: 'gemini-skills-cache.json'
   },
@@ -73,7 +73,7 @@ const CACHE_TTL = 5 * 60 * 1000;
 class SkillService {
   constructor(platform = 'claude') {
     this.platform = normalizePlatform(platform);
-    this.configDir = path.join(os.homedir(), '.cc-tool');
+    this.configDir = path.join(HOME_DIR, '.cc-tool');
 
     const platformConfig = PLATFORM_CONFIG[this.platform];
     this.installDir = platformConfig.installDir;

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

@@ -1,6 +1,6 @@
 const fs = require('fs');
 const path = require('path');
-const os = require('os');
+const { PATHS } = require('../../config/paths');
 
 // 北京时间辅助（UTC+8），统一所有时间计算
 const CST_OFFSET_MS = 8 * 60 * 60 * 1000;
@@ -39,7 +39,7 @@ function getCSTHour(ts) {
 
 // 获取基础目录
 function getBaseDir() {
-  const dir = path.join(os.homedir(), '.cc-tool');
+  const dir = PATHS.base;
   if (!fs.existsSync(dir)) {
     fs.mkdirSync(dir, { recursive: true });
   }

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

@@ -1,9 +1,8 @@
 const fs = require('fs');
-const path = require('path');
-const os = require('os');
+const { PATHS } = require('../../config/paths');
 
-const UI_CONFIG_DIR = path.join(os.homedir(), '.cc-tool');
-const UI_CONFIG_FILE = path.join(UI_CONFIG_DIR, 'ui-config.json');
+const UI_CONFIG_DIR = PATHS.base;
+const UI_CONFIG_FILE = PATHS.uiConfig;
 
 // Default UI config
 const DEFAULT_UI_CONFIG = {

package/src/server/websocket-server.js

@@ -2,8 +2,8 @@ const WebSocket = require('ws');
 const chalk = require('chalk');
 const fs = require('fs');
 const path = require('path');
-const os = require('os');
 const { loadConfig } = require('../config/loader');
+const { PATHS } = require('../config/paths');
 const {
   normalizeAddress,
   isLoopbackAddress,
@@ -159,7 +159,7 @@ function installOriginGuard(server) {
 
 // 日志持久化文件路径
 function getLogsFilePath() {
-  const ccToolDir = path.join(os.homedir(), '.cc-tool');
+  const ccToolDir = PATHS.base;
   if (!fs.existsSync(ccToolDir)) {
     fs.mkdirSync(ccToolDir, { recursive: true });
   }

package/src/utils/home-dir.js

@@ -0,0 +1,82 @@
+const path = require('path');
+
+function isWindowsLikePlatform(platform = process.platform, env = process.env) {
+  if (platform === 'win32' || platform === 'cygwin' || platform === 'msys') {
+    return true;
+  }
+
+  const hasWindowsEnv = Boolean(env.SYSTEMROOT || env.WINDIR || env.COMSPEC || env.ComSpec);
+  const hasWindowsHome = /^[a-zA-Z]:[\\/]/.test(env.USERPROFILE || '') ||
+    (Boolean(env.HOMEDRIVE) && Boolean(env.HOMEPATH));
+  return hasWindowsEnv && hasWindowsHome;
+}
+
+function normalizeWindowsHomePath(rawPath, env = process.env) {
+  if (!rawPath || typeof rawPath !== 'string') {
+    return '';
+  }
+
+  let value = rawPath.trim();
+  if (!value) {
+    return '';
+  }
+
+  const msysDriveMatch = value.match(/^\/([a-zA-Z])\/(.+)$/);
+  if (msysDriveMatch) {
+    const drive = msysDriveMatch[1].toUpperCase();
+    const rest = msysDriveMatch[2].replace(/\//g, '\\');
+    value = `${drive}:\\${rest}`;
+  } else if (/^\/Users\//i.test(value)) {
+    const drive = (env.SYSTEMDRIVE || env.HOMEDRIVE || 'C:').replace(/\\+$/, '');
+    const rest = value.replace(/^\/+/, '').replace(/\//g, '\\');
+    value = `${drive}\\${rest}`;
+  } else {
+    value = value.replace(/\//g, '\\');
+  }
+
+  if (/^[a-zA-Z]:[^\\]/.test(value)) {
+    value = `${value.slice(0, 2)}\\${value.slice(2)}`;
+  }
+
+  if (!path.win32.isAbsolute(value)) {
+    return '';
+  }
+
+  return path.win32.normalize(value);
+}
+
+function isGitInstallHomePath(homePath) {
+  return /[\\/]Program Files[\\/]Git[\\/]Users[\\/]/i.test(homePath || '');
+}
+
+function resolvePreferredHomeDir(platform = process.platform, env = process.env, fallbackHome = '') {
+  if (!isWindowsLikePlatform(platform, env)) {
+    return fallbackHome;
+  }
+
+  const candidates = [];
+  if (env.USERPROFILE) {
+    candidates.push(env.USERPROFILE);
+  }
+  if (env.HOMEDRIVE && env.HOMEPATH) {
+    candidates.push(`${env.HOMEDRIVE}${env.HOMEPATH}`);
+  }
+  if (env.HOME) {
+    candidates.push(env.HOME);
+  }
+  candidates.push(fallbackHome);
+
+  const normalizedCandidates = candidates
+    .map(candidate => normalizeWindowsHomePath(candidate, env))
+    .filter(Boolean);
+
+  const preferredHome = normalizedCandidates.find(candidate => !isGitInstallHomePath(candidate));
+  return preferredHome || normalizedCandidates[0] || fallbackHome;
+}
+
+module.exports = {
+  isWindowsLikePlatform,
+  normalizeWindowsHomePath,
+  resolvePreferredHomeDir,
+  isGitInstallHomePath
+};

package/src/utils/port-helper.js

@@ -1,5 +1,31 @@
 const { execSync } = require('child_process');
 const net = require('net');
+const { isWindowsLikePlatform } = require('./home-dir');
+
+function isWindowsLikeRuntime(platform = process.platform, env = process.env) {
+  return isWindowsLikePlatform(platform, env);
+}
+
+function parsePidsFromNetstatOutput(output, port) {
+  const target = `:${port}`;
+  const pids = new Set();
+
+  String(output || '').split(/\r?\n/).forEach((line) => {
+    const row = line.trim();
+    if (!row || !row.includes(target)) {
+      return;
+    }
+    if (row.startsWith('UDP') && !row.includes(`${target} `) && !row.endsWith(target)) {
+      return;
+    }
+    const match = row.match(/\s+(\d+)\s*$/);
+    if (match && match[1] !== '0') {
+      pids.add(match[1]);
+    }
+  });
+
+  return Array.from(pids);
+}
 
 /**
  * 检查端口是否被占用
@@ -43,18 +69,12 @@ function isPortInUse(port, host = '127.0.0.1') {
  * 查找占用端口的进程PID（跨平台）
  */
 function findProcessByPort(port) {
-  const isWindows = process.platform === 'win32';
+  const isWindows = isWindowsLikeRuntime();
   if (isWindows) {
     try {
-      // Windows: netstat -ano 列出所有连接，findstr 过滤端口
-      const result = execSync(`netstat -ano | findstr ":${port} "`, { encoding: 'utf-8' });
-      const pids = new Set();
-      result.split('\n').forEach(line => {
-        // 格式: "  TCP  0.0.0.0:9999  0.0.0.0:0  LISTENING  1234"
-        const match = line.trim().match(/\s+(\d+)\s*$/);
-        if (match) pids.add(match[1]);
-      });
-      return Array.from(pids).filter(pid => pid && pid !== '0');
+      // Windows: 直接解析 netstat 输出，避免依赖 findstr/lsof
+      const result = execSync('netstat -ano', { encoding: 'utf-8' });
+      return parsePidsFromNetstatOutput(result, port);
     } catch (e) {
       return [];
     }
@@ -85,7 +105,7 @@ function killProcessByPort(port) {
       return false;
     }
 
-    const isWindows = process.platform === 'win32';
+    const isWindows = isWindowsLikeRuntime();
     pids.forEach(pid => {
       try {
         if (isWindows) {
@@ -125,5 +145,7 @@ module.exports = {
   isPortInUse,
   findProcessByPort,
   killProcessByPort,
-  waitForPortRelease
+  waitForPortRelease,
+  isWindowsLikeRuntime,
+  parsePidsFromNetstatOutput
 };