coding-tool-x 3.3.4 → 3.3.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "coding-tool-x",
-  "version": "3.3.4",
+  "version": "3.3.5",
   "description": "Vibe Coding 增强工作助手 - 智能会话管理、动态渠道切换、全局搜索、实时监控",
   "main": "src/index.js",
   "bin": {
@@ -12,6 +12,7 @@
     "test:basic": "node scripts/test-basic.js",
     "test:api": "node scripts/test-api-consistency.js",
     "test:codex-agents": "node scripts/test-codex-agents.js",
+    "test:windows": "node scripts/test-windows-regression.js",
     "benchmark:codex": "node scripts/benchmark-codex-loading.js",
     "build:web": "cd src/web && npm run build",
     "dev:web": "cd src/web && npm run dev",

package/src/commands/doctor.js

@@ -1,10 +1,10 @@
 const chalk = require('chalk');
 const fs = require('fs');
 const path = require('path');
-const os = require('os');
 const { exec } = require('child_process');
 const { promisify } = require('util');
 const { loadConfig, getConfigFilePath } = require('../config/loader');
+const { PATHS, NATIVE_PATHS } = require('../config/paths');
 const { isPortInUse } = require('../utils/port-helper');
 
 const execAsync = promisify(exec);
@@ -185,7 +185,7 @@ async function checkPorts() {
  * 检查 Claude Code 配置
  */
 async function checkClaudeConfig() {
-  const settingsPath = path.join(os.homedir(), '.claude/settings.json');
+  const settingsPath = NATIVE_PATHS.claude.settings;
   const exists = fs.existsSync(settingsPath);
 
   if (exists) {
@@ -208,7 +208,7 @@ async function checkClaudeConfig() {
  * 检查日志目录
  */
 async function checkLogsDirectory() {
-  const logsDir = path.join(os.homedir(), '.cc-tool', 'logs');
+  const logsDir = PATHS.logs;
   const exists = fs.existsSync(logsDir);
 
   if (exists) {

package/src/commands/export-config.js

@@ -1,8 +1,8 @@
 const fs = require('fs');
 const path = require('path');
-const os = require('os');
 const archiver = require('archiver');
 const chalk = require('chalk');
+const { HOME_DIR } = require('../config/paths');
 
 /**
  * 导出 Claude Code 配置为 ZIP 压缩包
@@ -14,7 +14,7 @@ async function exportConfig(options = {}) {
   try {
     console.log(chalk.blue('🚀 开始导出 Claude Code 配置...'));
 
-    const homeDir = os.homedir();
+    const homeDir = HOME_DIR;
     const claudeDir = path.join(homeDir, '.claude');
     const currentDir = process.cwd();
 

package/src/commands/logs.js

@@ -1,10 +1,10 @@
 const chalk = require('chalk');
 const fs = require('fs');
 const path = require('path');
-const os = require('os');
 const { spawn } = require('child_process');
+const { PATHS } = require('../config/paths');
 
-const LOGS_DIR = path.join(os.homedir(), '.cc-tool', 'logs');
+const LOGS_DIR = PATHS.logs;
 
 const LOG_FILES = {
   ui: 'cc-tool-out.log',
@@ -145,29 +145,59 @@ function showLastLines(filePath, lines) {
 /**
  * 实时跟踪日志文件
  */
+function buildFollowProcessSpec(filePath, runtimePlatform = process.platform) {
+  if (runtimePlatform === 'win32') {
+    return {
+      command: 'powershell',
+      args: [
+        '-NoProfile',
+        '-Command',
+        `Get-Content -Path '${String(filePath).replace(/'/g, "''")}' -Tail 50 -Wait`
+      ],
+      options: { windowsHide: true }
+    };
+  }
+
+  return {
+    command: 'tail',
+    args: ['-n', '50', '-f', filePath],
+    options: {}
+  };
+}
+
 function tailFile(filePath) {
   console.log(chalk.gray('按 Ctrl+C 停止跟踪\n'));
 
-  const tail = spawn('tail', ['-f', filePath]);
+  const followSpec = buildFollowProcessSpec(filePath);
+  const isWindows = followSpec.command.toLowerCase() === 'powershell';
+  const followProcess = spawn(followSpec.command, followSpec.args, followSpec.options);
 
-  tail.stdout.on('data', (data) => {
+  followProcess.stdout.on('data', (data) => {
     process.stdout.write(data.toString());
   });
 
-  tail.stderr.on('data', (data) => {
+  followProcess.stderr.on('data', (data) => {
     process.stderr.write(chalk.red(data.toString()));
   });
 
-  tail.on('error', (err) => {
+  followProcess.on('error', (err) => {
     console.error(chalk.red(`\n❌ 跟踪日志失败: ${err.message}\n`));
+    if (isWindows) {
+      console.log(chalk.gray('提示: 请确认系统可用 powershell 命令。\n'));
+    }
     process.exit(1);
   });
 
   // 处理退出信号
-  process.on('SIGINT', () => {
-    tail.kill();
+  const handleSigint = () => {
+    followProcess.kill();
     console.log(chalk.gray('\n\n已停止跟踪日志\n'));
     process.exit(0);
+  };
+
+  process.once('SIGINT', handleSigint);
+  followProcess.once('close', () => {
+    process.removeListener('SIGINT', handleSigint);
   });
 }
 
@@ -257,5 +287,8 @@ function getTypeColor(type) {
 }
 
 module.exports = {
-  handleLogs
+  handleLogs,
+  _test: {
+    buildFollowProcessSpec
+  }
 };

package/src/commands/port-config.js

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

package/src/commands/switch.js

@@ -1,9 +1,9 @@
 // 切换项目命令
 const chalk = require('chalk');
-const os = require('os');
 const { getAvailableProjects } = require('../utils/session');
 const { promptSelectProject } = require('../ui/prompts');
 const { saveConfig } = require('../config/loader');
+const { HOME_DIR } = require('../config/paths');
 
 /**
  * 切换项目
@@ -31,7 +31,7 @@ async function switchProject(config) {
   // 保存到配置文件（保留其余字段）
   saveConfig({
     ...config,
-    projectsDir: config.projectsDir.replace(os.homedir(), '~')
+    projectsDir: config.projectsDir.replace(HOME_DIR, '~')
   });
 
   // 使用解析后的名称显示

package/src/config/default.js

@@ -1,10 +1,13 @@
 // 默认配置
 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(os.homedir(), '.claude', 'projects'),
+  projectsDir: path.join(HOME_DIR, '.claude', 'projects'),
   defaultProject: null,
   maxDisplaySessions: 100,
   pageSize: 15,

package/src/config/loader.js

@@ -4,11 +4,14 @@ const path = require('path');
 const os = require('os');
 const DEFAULT_CONFIG = require('./default');
 const { PATHS, ensureStorageDirMigrated } = require('./paths');
+const { resolvePreferredHomeDir } = require('../utils/home-dir');
 const eventBus = require('../plugins/event-bus');
 
+const HOME_DIR = resolvePreferredHomeDir(process.platform, process.env, os.homedir());
+
 const LEGACY_CONFIG_FILES = [
   path.join(__dirname, '../../config.json'),
-  path.join(os.homedir(), '.claude', 'config.json')
+  path.join(HOME_DIR, '.claude', 'config.json')
 ];
 
 function getConfigFilePath() {
@@ -21,7 +24,7 @@ function getConfigFilePath() {
  */
 function expandHome(filepath) {
   if (filepath.startsWith('~')) {
-    return path.join(os.homedir(), filepath.slice(1));
+    return path.join(HOME_DIR, filepath.slice(1));
   }
   return filepath;
 }

package/src/config/paths.js

@@ -3,16 +3,19 @@
 const fs = require('fs');
 const path = require('path');
 const os = require('os');
+const { resolvePreferredHomeDir } = require('../utils/home-dir');
+
+const HOME_DIR = resolvePreferredHomeDir(process.platform, process.env, os.homedir());
 
 // 基础目录
-const CC_TOOL_BASE_DIR = path.join(os.homedir(), '.cc-tool');
+const CC_TOOL_BASE_DIR = path.join(HOME_DIR, '.cc-tool');
 // 兼容旧变量名，避免外部调用方断裂
 const CTX_BASE_DIR = CC_TOOL_BASE_DIR;
 
 // 旧目录（升级时自动合并到 ~/.cc-tool）
 const LEGACY_BASE_DIRS = [
-  path.join(os.homedir(), '.claude', 'ctx'),
-  path.join(os.homedir(), '.claude', 'cc-tool')
+  path.join(HOME_DIR, '.claude', 'ctx'),
+  path.join(HOME_DIR, '.claude', 'cc-tool')
 ];
 
 let migrationChecked = false;
@@ -127,7 +130,7 @@ const PATHS = {
   notifyHook: path.join(CC_TOOL_BASE_DIR, 'notify-hook.js'),
 
   // Skills 安装目录（注意：这个仍使用 Claude 原生路径）
-  skills: path.join(os.homedir(), '.claude', 'skills'),
+  skills: path.join(HOME_DIR, '.claude', 'skills'),
 
   // MCP 配置（注意：这个仍使用 Claude 原生路径）
   mcpConfig: path.join(CC_TOOL_BASE_DIR, 'mcp-config.json'),
@@ -148,41 +151,42 @@ const PATHS = {
 const NATIVE_PATHS = {
   // Claude Code 原生配置
   claude: {
-    settings: path.join(os.homedir(), '.claude', 'settings.json'),
-    settingsBackup: path.join(os.homedir(), '.claude', 'settings.json.cc-tool-backup'),
-    projects: path.join(os.homedir(), '.claude', 'projects')
+    settings: path.join(HOME_DIR, '.claude', 'settings.json'),
+    settingsBackup: path.join(HOME_DIR, '.claude', 'settings.json.cc-tool-backup'),
+    projects: path.join(HOME_DIR, '.claude', 'projects')
   },
 
   // Codex 原生配置
   codex: {
-    config: path.join(os.homedir(), '.codex', 'config.toml'),
-    configBackup: path.join(os.homedir(), '.codex', 'config.toml.cc-tool-backup'),
-    auth: path.join(os.homedir(), '.codex', 'auth.json'),
-    authBackup: path.join(os.homedir(), '.codex', 'auth.json.cc-tool-backup'),
-    sessions: path.join(os.homedir(), '.codex', 'sessions')
+    config: path.join(HOME_DIR, '.codex', 'config.toml'),
+    configBackup: path.join(HOME_DIR, '.codex', 'config.toml.cc-tool-backup'),
+    auth: path.join(HOME_DIR, '.codex', 'auth.json'),
+    authBackup: path.join(HOME_DIR, '.codex', 'auth.json.cc-tool-backup'),
+    sessions: path.join(HOME_DIR, '.codex', 'sessions')
   },
 
   // Gemini 原生配置
   gemini: {
-    env: path.join(os.homedir(), '.gemini', '.env'),
-    envBackup: path.join(os.homedir(), '.gemini', '.env.cc-tool-backup'),
-    tmp: path.join(os.homedir(), '.gemini', 'tmp')
+    env: path.join(HOME_DIR, '.gemini', '.env'),
+    envBackup: path.join(HOME_DIR, '.gemini', '.env.cc-tool-backup'),
+    tmp: path.join(HOME_DIR, '.gemini', 'tmp')
   },
 
   // OpenCode 原生配置
   opencode: {
-    data: path.join(os.homedir(), '.local', 'share', 'opencode'),
-    config: path.join(os.homedir(), '.config', 'opencode'),
-    sessions: path.join(os.homedir(), '.local', 'share', 'opencode', 'storage', 'session'),
-    projects: path.join(os.homedir(), '.local', 'share', 'opencode', 'storage', 'project'),
-    messages: path.join(os.homedir(), '.local', 'share', 'opencode', 'storage', 'message'),
-    log: path.join(os.homedir(), '.local', 'share', 'opencode', 'log')
+    data: path.join(HOME_DIR, '.local', 'share', 'opencode'),
+    config: path.join(HOME_DIR, '.config', 'opencode'),
+    sessions: path.join(HOME_DIR, '.local', 'share', 'opencode', 'storage', 'session'),
+    projects: path.join(HOME_DIR, '.local', 'share', 'opencode', 'storage', 'project'),
+    messages: path.join(HOME_DIR, '.local', 'share', 'opencode', 'storage', 'message'),
+    log: path.join(HOME_DIR, '.local', 'share', 'opencode', 'log')
   }
 };
 
 module.exports = {
   PATHS,
   NATIVE_PATHS,
+  HOME_DIR,
   CTX_BASE_DIR,
   CC_TOOL_BASE_DIR,
   LEGACY_BASE_DIRS,

package/src/reset-config.js

@@ -1,7 +1,5 @@
 const fs = require('fs');
-const path = require('path');
-const os = require('os');
-const { PATHS, ensureStorageDirMigrated } = require('./config/paths');
+const { PATHS, NATIVE_PATHS, ensureStorageDirMigrated } = require('./config/paths');
 
 // 恢复配置到默认状态
 async function resetConfig() {
@@ -25,8 +23,8 @@ async function resetConfig() {
     }
 
     // 2. 检查并恢复 settings.json
-    const settingsPath = path.join(os.homedir(), '.claude', 'settings.json');
-    const backupPath = path.join(os.homedir(), '.claude', 'settings.json.cc-tool-backup');
+    const settingsPath = NATIVE_PATHS.claude.settings;
+    const backupPath = NATIVE_PATHS.claude.settingsBackup;
 
     if (fs.existsSync(backupPath)) {
       console.log('发现备份文件，正在恢复...');

package/src/server/api/agents.js

@@ -6,15 +6,14 @@
 
 const express = require('express');
 const fs = require('fs');
-const os = require('os');
 const path = require('path');
 const { AgentsService } = require('../services/agents-service');
-const { PATHS } = require('../../config/paths');
+const { PATHS, HOME_DIR } = require('../../config/paths');
 
 const router = express.Router();
 const SUPPORTED_PLATFORMS = ['claude', 'codex', 'opencode'];
 const agentServices = new Map();
-const DEFAULT_PROJECT_ALLOWED_ROOTS = [os.homedir(), process.cwd()];
+const DEFAULT_PROJECT_ALLOWED_ROOTS = [HOME_DIR, process.cwd()];
 
 function isSupportedPlatform(platform) {
   return SUPPORTED_PLATFORMS.includes(platform);

package/src/server/api/claude-hooks.js

@@ -5,18 +5,21 @@ const path = require('path');
 const os = require('os');
 const https = require('https');
 const http = require('http');
+const { resolvePreferredHomeDir, normalizeWindowsHomePath } = require('../../utils/home-dir');
+
+// 检测操作系统
+const platform = os.platform(); // 'darwin' | 'win32' | 'linux'
+
+const HOME_DIR = resolvePreferredHomeDir(platform, process.env, os.homedir());
 
 // Claude settings.json 路径
-const CLAUDE_SETTINGS_PATH = path.join(os.homedir(), '.claude', 'settings.json');
+const CLAUDE_SETTINGS_PATH = path.join(HOME_DIR, '.claude', 'settings.json');
 
 // UI 配置路径（记录用户是否主动关闭过、飞书配置等）
-const UI_CONFIG_PATH = path.join(os.homedir(), '.cc-tool', 'ui-config.json');
+const UI_CONFIG_PATH = path.join(HOME_DIR, '.cc-tool', 'ui-config.json');
 
 // 通知脚本路径（用于飞书通知）
-const NOTIFY_SCRIPT_PATH = path.join(os.homedir(), '.cc-tool', 'notify-hook.js');
-
-// 检测操作系统
-const platform = os.platform(); // 'darwin' | 'win32' | 'linux'
+const NOTIFY_SCRIPT_PATH = path.join(HOME_DIR, '.cc-tool', 'notify-hook.js');
 
 // 读取 Claude settings.json
 function readClaudeSettings() {
@@ -197,6 +200,42 @@ function parseNotifyTypeMarker(command) {
   return marker ? marker[2].toLowerCase() : null;
 }
 
+function getStopHookCommand(settings) {
+  const hooks = settings?.hooks?.Stop;
+  if (!Array.isArray(hooks) || hooks.length === 0) {
+    return '';
+  }
+  const firstHook = hooks[0]?.hooks;
+  if (!Array.isArray(firstHook) || firstHook.length === 0) {
+    return '';
+  }
+  return firstHook[0]?.command || '';
+}
+
+function normalizePathForCompare(rawPath) {
+  return String(rawPath || '').replace(/\\/g, '/');
+}
+
+function shouldRepairStopHook(settings, expectedScriptPath = NOTIFY_SCRIPT_PATH, fileExists = fs.existsSync) {
+  const command = getStopHookCommand(settings);
+  if (!command || !command.includes('notify-hook.js')) {
+    return false;
+  }
+
+  const markerType = parseNotifyTypeMarker(command);
+  if (!markerType) {
+    return false;
+  }
+
+  const normalizedCommand = normalizePathForCompare(command);
+  const normalizedExpected = normalizePathForCompare(expectedScriptPath);
+  if (!normalizedCommand.includes(normalizedExpected)) {
+    return true;
+  }
+
+  return !fileExists(expectedScriptPath);
+}
+
 function buildStopHookCommand(type) {
   const notifyType = type === 'dialog' ? 'dialog' : 'notification';
   return `node "${NOTIFY_SCRIPT_PATH}" --cc-notify-type=${notifyType}`;
@@ -302,7 +341,9 @@ function updateStopHook(systemNotification, feishu) {
     }
   } else {
     // 生成并写入通知脚本
-    writeNotifyScript({ systemNotification, feishu });
+    if (!writeNotifyScript({ systemNotification, feishu })) {
+      return false;
+    }
 
     // 更新 Stop hook 指向通知脚本
     settings.hooks = settings.hooks || {};
@@ -335,9 +376,22 @@ function initDefaultHooks() {
     const settings = readClaudeSettings();
     const currentStatus = parseStopHookStatus(settings);
 
-    // 如果已经有 Stop hook 配置，不覆盖
+    // 如果已经有 Stop hook 配置，优先尝试自愈旧路径，再决定是否跳过
     if (currentStatus.enabled) {
-      console.log('[Claude Hooks] 已存在 Stop hook 配置，跳过初始化');
+      if (shouldRepairStopHook(settings)) {
+        const systemNotification = {
+          enabled: true,
+          type: currentStatus.type || 'notification'
+        };
+        const feishu = getFeishuConfig();
+        if (updateStopHook(systemNotification, feishu)) {
+          console.log('[Claude Hooks] 检测到旧版 Stop hook 路径，已自动修复');
+        } else {
+          console.warn('[Claude Hooks] Stop hook 路径修复失败，保留原配置');
+        }
+      } else {
+        console.log('[Claude Hooks] 已存在 Stop hook 配置，跳过初始化');
+      }
       return;
     }
 
@@ -499,5 +553,8 @@ module.exports._test = {
   generateSystemNotificationCommand,
   parseStopHookStatus,
   parseNotifyTypeMarker,
-  buildStopHookCommand
+  buildStopHookCommand,
+  normalizeWindowsHomePath,
+  resolvePreferredHomeDir,
+  shouldRepairStopHook
 };

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

@@ -14,7 +14,7 @@ const {
 } = require('../services/opencode-sessions');
 const { loadAliases } = require('../services/alias');
 const { broadcastLog } = require('../websocket-server');
-const os = require('os');
+const { HOME_DIR } = require('../../config/paths');
 
 function isNotFoundError(error) {
   if (!error || !error.message) {
@@ -295,7 +295,7 @@ module.exports = (config) => {
 
       const projects = getProjects();
       const project = projects.find(p => p.name === projectName);
-      const cwd = session.directory || project?.fullPath || os.homedir();
+      const cwd = session.directory || project?.fullPath || HOME_DIR;
       const command = `opencode -r ${sessionId}`;
       const quotedCwd = `"${String(cwd).replace(/"/g, '\\"')}"`;
       const copyCommand = `cd ${quotedCwd} && ${command}`;

package/src/server/api/pm2-autostart.js

@@ -3,11 +3,18 @@ const { exec } = require('child_process');
 const { promisify } = require('util');
 const path = require('path');
 const fs = require('fs');
-const os = require('os');
 const pm2 = require('pm2');
+const { HOME_DIR } = require('../../config/paths');
 
 const execAsync = promisify(exec);
 
+function getExecOptions(timeout = 30000, runtimePlatform = process.platform) {
+  if (runtimePlatform === 'win32') {
+    return { timeout };
+  }
+  return { shell: '/bin/bash', timeout };
+}
+
 /**
  * Check if PM2 autostart is enabled
  * by looking for PM2 startup script in system
@@ -18,7 +25,7 @@ async function checkAutoStartStatus() {
 
     if (platform === 'darwin') {
       // macOS - check for LaunchDaemon
-      const launchDaemonsPath = path.join(os.homedir(), 'Library/LaunchDaemons');
+      const launchDaemonsPath = path.join(HOME_DIR, 'Library/LaunchDaemons');
       const pm2Files = fs.existsSync(launchDaemonsPath)
         ? fs.readdirSync(launchDaemonsPath).filter(f => f.includes('pm2'))
         : [];
@@ -27,11 +34,11 @@ async function checkAutoStartStatus() {
     } else if (platform === 'linux') {
       // Linux - check for systemd service
       const systemdPath = '/etc/systemd/system/pm2-root.service';
-      const userSystemdPath = path.join(os.homedir(), '.config/systemd/user/pm2-*.service');
+      const userSystemdPath = path.join(HOME_DIR, '.config/systemd/user/pm2-*.service');
 
       const rootExists = fs.existsSync(systemdPath);
-      const userExists = fs.existsSync(path.join(os.homedir(), '.config/systemd/user')) &&
-        fs.readdirSync(path.join(os.homedir(), '.config/systemd/user')).some(f => f.includes('pm2'));
+      const userExists = fs.existsSync(path.join(HOME_DIR, '.config/systemd/user')) &&
+        fs.readdirSync(path.join(HOME_DIR, '.config/systemd/user')).some(f => f.includes('pm2'));
 
       return { enabled: rootExists || userExists, platform: 'linux' };
     } else if (platform === 'win32') {
@@ -104,7 +111,7 @@ async function enableAutoStart() {
 
           console.log(`Running startup command: ${command}`);
 
-          exec(command, { shell: '/bin/bash', timeout: 30000 }, (execErr, stdout, stderr) => {
+          exec(command, getExecOptions(30000), (execErr, stdout, stderr) => {
             pm2.disconnect();
 
             if (execErr) {
@@ -163,7 +170,7 @@ async function disableAutoStart() {
 
       console.log(`Running unstartup command: ${command}`);
 
-      exec(command, { shell: '/bin/bash', timeout: 30000 }, (execErr, stdout, stderr) => {
+      exec(command, getExecOptions(30000), (execErr, stdout, stderr) => {
         pm2.disconnect();
 
         if (execErr) {
@@ -195,7 +202,7 @@ async function disableAutoStart() {
   });
 }
 
-module.exports = () => {
+function createPm2AutostartRouter() {
   const router = express.Router();
 
   /**
@@ -266,4 +273,9 @@ module.exports = () => {
   });
 
   return router;
+}
+
+module.exports = createPm2AutostartRouter;
+module.exports._test = {
+  getExecOptions
 };

package/src/server/api/proxy.js

@@ -12,10 +12,9 @@ const {
 } = require('../services/settings-manager');
 const { getAllChannels } = require('../services/channels');
 const { clearAllLogs } = require('../websocket-server');
-const { PATHS, ensureStorageDirMigrated } = require('../../config/paths');
+const { PATHS, NATIVE_PATHS, ensureStorageDirMigrated } = require('../../config/paths');
 const fs = require('fs');
 const path = require('path');
-const os = require('os');
 
 function sanitizeChannelForResponse(channel) {
   if (!channel) return null;
@@ -285,7 +284,7 @@ router.post('/stop', async (req, res) => {
 
     // 3. 删除备份文件和active-channel.json
     if (hasBackup()) {
-      const backupPath = path.join(os.homedir(), '.claude', 'settings.json.cc-tool-backup');
+      const backupPath = NATIVE_PATHS.claude.settingsBackup;
       if (fs.existsSync(backupPath)) {
         fs.unlinkSync(backupPath);
         console.log('✅ Removed backup file');

package/src/server/api/sessions.js

@@ -2,11 +2,12 @@ const express = require('express');
 const router = express.Router();
 const path = require('path');
 const fs = require('fs');
-const os = require('os');
 const readline = require('readline');
 const { getSessionsForProject, deleteSession, forkSession, saveSessionOrder, parseRealProjectPath, searchSessions, getRecentSessions, searchSessionsAcrossProjects, hasActualMessages } = require('../services/sessions');
 const { loadAliases } = require('../services/alias');
 const { broadcastLog } = require('../websocket-server');
+const { NATIVE_PATHS } = require('../../config/paths');
+const CLAUDE_PROJECTS_DIR = NATIVE_PATHS.claude.projects;
 
 module.exports = (config) => {
   // GET /api/sessions/search/global - Search sessions across all projects
@@ -120,12 +121,12 @@ module.exports = (config) => {
         const year = now.getFullYear();
         const month = String(now.getMonth() + 1).padStart(2, '0');
         const day = String(now.getDate()).padStart(2, '0');
-        sessionDir = path.join(os.homedir(), '.codex', 'sessions', String(year), month, day);
+        sessionDir = path.join(NATIVE_PATHS.codex.sessions, String(year), month, day);
         sessionFile = path.join(sessionDir, `${newSessionId}.jsonl`);
       } else if (toolType === 'gemini') {
         // Gemini: ~/.gemini/tmp/{hash}/chats/{sessionId}.json
         const pathHash = crypto.createHash('sha256').update(fullPath).digest('hex');
-        sessionDir = path.join(os.homedir(), '.gemini', 'tmp', pathHash, 'chats');
+        sessionDir = path.join(NATIVE_PATHS.gemini.tmp, pathHash, 'chats');
         sessionFile = path.join(sessionDir, `${newSessionId}.json`);
       } else {
         return res.status(400).json({ error: 'Invalid toolType. Must be claude, codex, or gemini' });
@@ -243,7 +244,7 @@ module.exports = (config) => {
       let sessionFile = null;
       const possiblePaths = [
         path.join(fullPath, '.claude', 'sessions', sessionId + '.jsonl'),
-        path.join(os.homedir(), '.claude', 'projects', projectName, sessionId + '.jsonl')
+        path.join(CLAUDE_PROJECTS_DIR, projectName, sessionId + '.jsonl')
       ];
 
       console.log(`[Messages API] Trying paths:`, possiblePaths);
@@ -423,7 +424,6 @@ module.exports = (config) => {
       const { projectName, sessionId } = req.params;
       const path = require('path');
       const fs = require('fs');
-      const os = require('os');
 
       // Parse real project path (important for cross-project sessions)
       const { fullPath } = parseRealProjectPath(projectName);
@@ -436,7 +436,7 @@ module.exports = (config) => {
       const possiblePaths = [
         projectSessionFile,
         // Location 2: User's .claude/projects directory (ClaudeCode default)
-        path.join(os.homedir(), '.claude', 'projects', projectName, sessionId + '.jsonl')
+        path.join(CLAUDE_PROJECTS_DIR, projectName, sessionId + '.jsonl')
       ];
 
       for (const testPath of possiblePaths) {