@adversity/coding-tool-x 3.1.0 → 3.1.1

package/src/config/loader.js

@@ -3,9 +3,18 @@ const fs = require('fs');
 const path = require('path');
 const os = require('os');
 const DEFAULT_CONFIG = require('./default');
+const { PATHS, ensureStorageDirMigrated } = require('./paths');
 const eventBus = require('../plugins/event-bus');
 
-const CONFIG_FILE = path.join(__dirname, '../../config.json');
+const LEGACY_CONFIG_FILES = [
+  path.join(__dirname, '../../config.json'),
+  path.join(os.homedir(), '.claude', 'config.json')
+];
+
+function getConfigFilePath() {
+  ensureStorageDirMigrated();
+  return PATHS.configFile;
+}
 
 /**
  * 展开 ~ 为用户主目录
@@ -31,19 +40,66 @@ function mergePricing(defaultPricing, overrides = {}) {
   return merged;
 }
 
+function mergeDefaultModels(defaultModels, overrides = {}) {
+  const merged = {};
+  Object.keys(defaultModels).forEach((key) => {
+    // If user config has this tool type, use it; otherwise use default
+    merged[key] = (overrides && overrides[key]) ? overrides[key] : defaultModels[key];
+  });
+  return merged;
+}
+
+function mergeModelDiscovery(defaultModelDiscovery, overrides = {}) {
+  return {
+    ...defaultModelDiscovery,
+    ...(overrides || {})
+  };
+}
+
+function readJsonFile(filePath) {
+  const content = fs.readFileSync(filePath, 'utf8');
+  return JSON.parse(content);
+}
+
+function migrateLegacyConfigIfNeeded(configFilePath) {
+  if (fs.existsSync(configFilePath)) return;
+
+  for (const legacyPath of LEGACY_CONFIG_FILES) {
+    try {
+      if (!legacyPath || legacyPath === configFilePath) continue;
+      if (!fs.existsSync(legacyPath)) continue;
+      const legacyConfig = readJsonFile(legacyPath);
+      const dir = path.dirname(configFilePath);
+      if (!fs.existsSync(dir)) {
+        fs.mkdirSync(dir, { recursive: true });
+      }
+      fs.writeFileSync(configFilePath, JSON.stringify(legacyConfig, null, 2), 'utf8');
+      console.log(`[Config] 已迁移历史配置: ${legacyPath} -> ${configFilePath}`);
+      return;
+    } catch (error) {
+      console.warn(`[Config] 迁移历史配置失败: ${legacyPath}`, error.message);
+    }
+  }
+}
+
 /**
  * 加载配置
  */
 function loadConfig() {
+  const configFilePath = getConfigFilePath();
+  migrateLegacyConfigIfNeeded(configFilePath);
+
   try {
-    if (fs.existsSync(CONFIG_FILE)) {
-      const userConfig = JSON.parse(fs.readFileSync(CONFIG_FILE, 'utf8'));
+    if (fs.existsSync(configFilePath)) {
+      const userConfig = readJsonFile(configFilePath);
       const config = { ...DEFAULT_CONFIG, ...userConfig };
-      config.projectsDir = expandHome(config.projectsDir);
+      config.projectsDir = expandHome(config.projectsDir || DEFAULT_CONFIG.projectsDir);
 
       // 合并 ports 配置
       config.ports = { ...DEFAULT_CONFIG.ports, ...userConfig.ports };
       config.pricing = mergePricing(DEFAULT_CONFIG.pricing, userConfig.pricing);
+      config.defaultModels = mergeDefaultModels(DEFAULT_CONFIG.defaultModels, userConfig.defaultModels);
+      config.modelDiscovery = mergeModelDiscovery(DEFAULT_CONFIG.modelDiscovery, userConfig.modelDiscovery);
 
       // 确保有 currentProject，使用 defaultProject 作为 currentProject
       if (!config.currentProject && config.defaultProject) {
@@ -54,9 +110,13 @@ function loadConfig() {
       return config;
     }
   } catch (error) {
-    console.error('加载配置文件失败，使用默认配置');
+    console.error(`加载配置文件失败，使用默认配置: ${configFilePath}`);
   }
-  const defaultConfig = { ...DEFAULT_CONFIG, currentProject: DEFAULT_CONFIG.defaultProject };
+  const defaultConfig = {
+    ...DEFAULT_CONFIG,
+    projectsDir: expandHome(DEFAULT_CONFIG.projectsDir),
+    currentProject: DEFAULT_CONFIG.defaultProject
+  };
   eventBus.emitSync('config:loaded', { config: defaultConfig });
   return defaultConfig;
 }
@@ -65,11 +125,16 @@ function loadConfig() {
  * 保存配置
  */
 function saveConfig(config) {
+  const configFilePath = getConfigFilePath();
   try {
-    fs.writeFileSync(CONFIG_FILE, JSON.stringify(config, null, 2));
+    const dir = path.dirname(configFilePath);
+    if (!fs.existsSync(dir)) {
+      fs.mkdirSync(dir, { recursive: true });
+    }
+    fs.writeFileSync(configFilePath, JSON.stringify(config, null, 2), 'utf8');
     eventBus.emitSync('config:saved', { config });
   } catch (error) {
-    console.error('保存配置失败:', error.message);
+    console.error(`保存配置失败 (${configFilePath}):`, error.message);
   }
 }
 
@@ -77,4 +142,5 @@ module.exports = {
   loadConfig,
   saveConfig,
   expandHome,
+  getConfigFilePath
 };

package/src/config/paths.js

@@ -1,90 +1,149 @@
 // CTX 工具路径配置
-// 所有路径统一使用 ~/.claude/ctx 目录，避免与原始 cc-tool 冲突
+// 所有路径统一使用 ~/.cc-tool 目录
+const fs = require('fs');
 const path = require('path');
 const os = require('os');
 
 // 基础目录
-const CTX_BASE_DIR = path.join(os.homedir(), '.claude', 'ctx');
+const CC_TOOL_BASE_DIR = path.join(os.homedir(), '.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')
+];
+
+let migrationChecked = false;
+
+function mergeDirectory(sourceDir, targetDir) {
+  if (!fs.existsSync(sourceDir)) return;
+
+  const sourceStat = fs.statSync(sourceDir);
+  if (sourceStat.isDirectory()) {
+    if (!fs.existsSync(targetDir)) {
+      fs.mkdirSync(targetDir, { recursive: true });
+    }
+
+    const entries = fs.readdirSync(sourceDir);
+    entries.forEach((entry) => {
+      mergeDirectory(path.join(sourceDir, entry), path.join(targetDir, entry));
+    });
+    return;
+  }
+
+  if (!fs.existsSync(targetDir)) {
+    fs.copyFileSync(sourceDir, targetDir);
+  }
+}
+
+function ensureStorageDirMigrated() {
+  if (migrationChecked) {
+    return CC_TOOL_BASE_DIR;
+  }
+  migrationChecked = true;
+
+  if (!fs.existsSync(CC_TOOL_BASE_DIR)) {
+    fs.mkdirSync(CC_TOOL_BASE_DIR, { recursive: true });
+  }
+
+  LEGACY_BASE_DIRS.forEach((legacyDir) => {
+    if (!fs.existsSync(legacyDir)) return;
+    try {
+      mergeDirectory(legacyDir, CC_TOOL_BASE_DIR);
+    } catch (error) {
+      console.warn(`[paths] 迁移目录失败: ${legacyDir} -> ${CC_TOOL_BASE_DIR}`, error.message);
+    }
+  });
+
+  return CC_TOOL_BASE_DIR;
+}
 
 // 路径配置
 const PATHS = {
   // 基础目录
-  base: CTX_BASE_DIR,
+  base: CC_TOOL_BASE_DIR,
 
   // 项目目录（存储项目配置和会话）
-  projects: path.join(CTX_BASE_DIR, 'projects'),
+  projects: path.join(CC_TOOL_BASE_DIR, 'projects'),
 
   // 配置文件目录
-  config: path.join(CTX_BASE_DIR, 'config'),
-  configFile: path.join(CTX_BASE_DIR, 'config.json'),
+  config: path.join(CC_TOOL_BASE_DIR, 'config'),
+  configFile: path.join(CC_TOOL_BASE_DIR, 'config.json'),
 
   // 日志目录
-  logs: path.join(CTX_BASE_DIR, 'logs'),
+  logs: path.join(CC_TOOL_BASE_DIR, 'logs'),
 
   // 别名存储
-  aliases: path.join(CTX_BASE_DIR, 'aliases.json'),
+  aliases: path.join(CC_TOOL_BASE_DIR, 'aliases.json'),
 
   // 收藏夹存储
-  favorites: path.join(CTX_BASE_DIR, 'favorites.json'),
+  favorites: path.join(CC_TOOL_BASE_DIR, 'favorites.json'),
 
   // 渠道配置
   channels: {
-    claude: path.join(CTX_BASE_DIR, 'channels.json'),
-    codex: path.join(CTX_BASE_DIR, 'codex-channels.json'),
-    gemini: path.join(CTX_BASE_DIR, 'gemini-channels.json')
+    claude: path.join(CC_TOOL_BASE_DIR, 'channels.json'),
+    codex: path.join(CC_TOOL_BASE_DIR, 'codex-channels.json'),
+    gemini: path.join(CC_TOOL_BASE_DIR, 'gemini-channels.json'),
+    opencode: path.join(CC_TOOL_BASE_DIR, 'opencode-channels.json')
   },
 
   // 激活渠道标记
   activeChannel: {
-    claude: path.join(CTX_BASE_DIR, 'active-channel.json'),
-    codex: path.join(CTX_BASE_DIR, 'codex-active-channel.json'),
-    gemini: path.join(CTX_BASE_DIR, 'gemini-active-channel.json')
+    claude: path.join(CC_TOOL_BASE_DIR, 'active-channel.json'),
+    codex: path.join(CC_TOOL_BASE_DIR, 'codex-active-channel.json'),
+    gemini: path.join(CC_TOOL_BASE_DIR, 'gemini-active-channel.json'),
+    opencode: path.join(CC_TOOL_BASE_DIR, 'opencode-active-channel.json')
   },
 
   // 统计数据
   statistics: {
-    claude: path.join(CTX_BASE_DIR, 'statistics.json'),
-    codex: path.join(CTX_BASE_DIR, 'codex-statistics.json'),
-    gemini: path.join(CTX_BASE_DIR, 'gemini-statistics.json'),
+    claude: path.join(CC_TOOL_BASE_DIR, 'statistics.json'),
+    codex: path.join(CC_TOOL_BASE_DIR, 'codex-statistics.json'),
+    gemini: path.join(CC_TOOL_BASE_DIR, 'gemini-statistics.json'),
+    opencode: path.join(CC_TOOL_BASE_DIR, 'opencode-statistics.json'),
     dailyStats: {
-      claude: path.join(CTX_BASE_DIR, 'daily-stats'),
-      codex: path.join(CTX_BASE_DIR, 'codex-daily-stats'),
-      gemini: path.join(CTX_BASE_DIR, 'gemini-daily-stats')
+      claude: path.join(CC_TOOL_BASE_DIR, 'daily-stats'),
+      codex: path.join(CC_TOOL_BASE_DIR, 'codex-daily-stats'),
+      gemini: path.join(CC_TOOL_BASE_DIR, 'gemini-daily-stats'),
+      opencode: path.join(CC_TOOL_BASE_DIR, 'opencode-daily-stats')
     }
   },
 
   // 会话缓存
-  sessionCache: path.join(CTX_BASE_DIR, 'session-cache.json'),
+  sessionCache: path.join(CC_TOOL_BASE_DIR, 'session-cache.json'),
 
   // 项目顺序
-  projectOrder: path.join(CTX_BASE_DIR, 'project-order.json'),
+  projectOrder: path.join(CC_TOOL_BASE_DIR, 'project-order.json'),
 
   // 环境备份
-  envBackups: path.join(CTX_BASE_DIR, 'env-backups'),
+  envBackups: path.join(CC_TOOL_BASE_DIR, 'env-backups'),
 
   // UI 配置
-  uiConfig: path.join(CTX_BASE_DIR, 'ui-config.json'),
+  uiConfig: path.join(CC_TOOL_BASE_DIR, 'ui-config.json'),
 
   // 飞书通知脚本
-  notifyHook: path.join(CTX_BASE_DIR, 'notify-hook.js'),
+  notifyHook: path.join(CC_TOOL_BASE_DIR, 'notify-hook.js'),
 
   // Skills 安装目录（注意：这个仍使用 Claude 原生路径）
   skills: path.join(os.homedir(), '.claude', 'skills'),
 
   // MCP 配置（注意：这个仍使用 Claude 原生路径）
-  mcpConfig: path.join(CTX_BASE_DIR, 'mcp-config.json'),
+  mcpConfig: path.join(CC_TOOL_BASE_DIR, 'mcp-config.json'),
 
   // Terminal 配置
-  terminalConfig: path.join(CTX_BASE_DIR, 'terminal-config.json'),
+  terminalConfig: path.join(CC_TOOL_BASE_DIR, 'terminal-config.json'),
 
   // Prompts
-  prompts: path.join(CTX_BASE_DIR, 'prompts.json'),
+  prompts: path.join(CC_TOOL_BASE_DIR, 'prompts.json'),
 
   // 代理运行时状态
   proxyRuntime: {
-    claude: path.join(CTX_BASE_DIR, 'proxy-runtime.json'),
-    codex: path.join(CTX_BASE_DIR, 'codex-proxy-runtime.json'),
-    gemini: path.join(CTX_BASE_DIR, 'gemini-proxy-runtime.json')
+    claude: path.join(CC_TOOL_BASE_DIR, 'proxy-runtime.json'),
+    codex: path.join(CC_TOOL_BASE_DIR, 'codex-proxy-runtime.json'),
+    gemini: path.join(CC_TOOL_BASE_DIR, 'gemini-proxy-runtime.json'),
+    opencode: path.join(CC_TOOL_BASE_DIR, 'opencode-proxy-runtime.json')
   }
 };
 
@@ -111,11 +170,24 @@ const NATIVE_PATHS = {
     env: path.join(os.homedir(), '.gemini', '.env'),
     envBackup: path.join(os.homedir(), '.gemini', '.env.cc-tool-backup'),
     tmp: path.join(os.homedir(), '.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')
   }
 };
 
 module.exports = {
   PATHS,
   NATIVE_PATHS,
-  CTX_BASE_DIR
+  CTX_BASE_DIR,
+  CC_TOOL_BASE_DIR,
+  LEGACY_BASE_DIRS,
+  ensureStorageDirMigrated
 };

package/src/index.js

@@ -20,7 +20,9 @@ const { handleProxyStart: proxyStart, handleProxyStop: proxyStop, handleProxyRes
 const { handleLogs } = require('./commands/logs');
 const { handleStats, handleStatsExport } = require('./commands/stats');
 const { handleDoctor } = require('./commands/doctor');
+const { handleUpdate } = require('./commands/update');
 const { workspaceMenu } = require('./commands/workspace');
+const { ensureStorageDirMigrated } = require('./config/paths');
 const PluginManager = require('./plugins/plugin-manager');
 const eventBus = require('./plugins/event-bus');
 const chalk = require('chalk');
@@ -61,7 +63,8 @@ function showHelp() {
   console.log('  ctx claude status       查看 Claude 代理状态');
   console.log('  ctx codex start         启动 Codex 代理');
   console.log('  ctx gemini start        启动 Gemini 代理');
-  console.log(chalk.gray('  (codex/gemini 命令与 claude 类似)\n'));
+  console.log('  ctx opencode start      启动 OpenCode 代理');
+  console.log(chalk.gray('  (codex/gemini/opencode 命令与 claude 类似)\n'));
 
   console.log(chalk.yellow('📋 日志管理:'));
   console.log('  ctx logs                查看所有日志');
@@ -78,7 +81,9 @@ function showHelp() {
   console.log('  ctx stats export        导出统计数据\n');
 
   console.log(chalk.yellow('🛠️  其他命令:'));
+  console.log('  ctx update              检查并更新到最新版本');
   console.log('  ctx doctor              系统诊断');
+  console.log('  ctx port                配置端口');
   console.log('  ctx reset               重置配置');
   console.log('  ctx security reset      关闭访问密码');
   console.log('  ctx --version, -v       显示版本');
@@ -132,6 +137,8 @@ process.on('SIGINT', async () => {
  * 主函数
  */
 async function main() {
+  ensureStorageDirMigrated();
+
   // 处理命令行参数
   const args = process.argv.slice(2);
 
@@ -147,6 +154,47 @@ async function main() {
     return;
   }
 
+  // daemon 命令兼容（保持与 README 中旧命令一致）
+  if (args[0] === 'daemon') {
+    const subCommand = args[1] || 'status';
+
+    if (subCommand === 'start') {
+      await handleStart();
+      return;
+    }
+    if (subCommand === 'stop') {
+      await handleStop();
+      return;
+    }
+    if (subCommand === 'restart') {
+      await handleRestart();
+      return;
+    }
+    if (subCommand === 'status') {
+      await handleStatus();
+      return;
+    }
+    if (subCommand === 'logs') {
+      const options = {};
+      for (let i = 2; i < args.length; i++) {
+        if (args[i] === '--lines' && args[i + 1]) {
+          options.lines = parseInt(args[i + 1], 10);
+          i++;
+        } else if (args[i] === '--follow' || args[i] === '-f') {
+          options.follow = true;
+        } else if (args[i] === '--clear') {
+          options.clear = true;
+        }
+      }
+      await handleLogs('ui', options);
+      return;
+    }
+
+    console.log(chalk.red(`\n❌ 未知 daemon 子命令: ${subCommand}\n`));
+    console.log(chalk.gray('支持的命令: start, stop, restart, status, logs\n'));
+    return;
+  }
+
   // reset 命令 - 恢复默认配置
   if (args[0] === 'reset') {
     await resetConfig();
@@ -207,8 +255,8 @@ async function main() {
     return;
   }
 
-  // claude/codex/gemini 代理管理命令
-  const channels = ['claude', 'codex', 'gemini'];
+  // claude/codex/gemini/opencode 代理管理命令
+  const channels = ['claude', 'codex', 'gemini', 'opencode'];
   if (channels.includes(args[0])) {
     const channel = args[0];
     const action = args[1] || 'status';
@@ -281,6 +329,19 @@ async function main() {
     return;
   }
 
+  // update 命令 - 检查并更新到最新版本
+  if (args[0] === 'update') {
+    const checkOnly = args.includes('--check');
+    await handleUpdate({ checkOnly });
+    return;
+  }
+
+  // port 命令 - 配置端口
+  if (args[0] === 'port') {
+    await handlePortConfig();
+    return;
+  }
+
   // 代理命令
   if (args[0] === 'proxy') {
     const { handleProxyStart, handleProxyStop, handleProxyStatus } = require('./commands/proxy');

package/src/plugins/constants.js

@@ -1,7 +1,8 @@
 const path = require('path');
-const os = require('os');
+const { PATHS, ensureStorageDirMigrated } = require('../config/paths');
 
-const PLUGINS_DIR = path.join(os.homedir(), '.claude', 'cc-tool', 'plugins');
+ensureStorageDirMigrated();
+const PLUGINS_DIR = path.join(PATHS.base, 'plugins');
 const REGISTRY_FILE = path.join(PLUGINS_DIR, 'registry.json');
 const CONFIG_DIR = path.join(PLUGINS_DIR, 'config');
 const INSTALLED_DIR = path.join(PLUGINS_DIR, 'installed');

package/src/plugins/plugin-api.js

@@ -15,7 +15,7 @@ const packageJson = require('../../package.json');
 function createPluginContext(pluginName, pluginConfig, pluginDir) {
   const commandRegistry = new Map();
 
-  // Storage API - persists plugin data to ~/.claude/cc-tool/plugins/config/<plugin-name>.json
+  // Storage API - persists plugin data to ~/.cc-tool/plugins/config/<plugin-name>.json
   const storage = createStorageAPI(pluginName);
 
   // Logger API - prefixed logging

package/src/reset-config.js

@@ -1,10 +1,12 @@
 const fs = require('fs');
 const path = require('path');
 const os = require('os');
+const { PATHS, ensureStorageDirMigrated } = require('./config/paths');
 
 // 恢复配置到默认状态
 async function resetConfig() {
   console.log('\n开始恢复默认配置...\n');
+  ensureStorageDirMigrated();
 
   try {
     // 1. 尝试停止代理服务器（如果正在运行）
@@ -42,10 +44,10 @@ async function resetConfig() {
         console.log('检测到代理配置，尝试恢复到正常渠道...');
 
         // 读取激活的渠道
-        const activeChannelPath = path.join(os.homedir(), '.claude', 'cc-tool', 'active-channel.json');
+        const activeChannelPath = PATHS.activeChannel.claude;
         if (fs.existsSync(activeChannelPath)) {
           const activeChannelData = JSON.parse(fs.readFileSync(activeChannelPath, 'utf8'));
-          const channelsPath = path.join(os.homedir(), '.claude', 'cc-tool', 'channels.json');
+          const channelsPath = PATHS.channels.claude;
 
           if (fs.existsSync(channelsPath)) {
             const channelsData = JSON.parse(fs.readFileSync(channelsPath, 'utf8'));