coding-tool-x 3.3.4 → 3.3.6

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) {

package/src/server/index.js

@@ -3,7 +3,7 @@ const path = require('path');
 const chalk = require('chalk');
 const inquirer = require('inquirer');
 const { loadConfig } = require('../config/loader');
-const { ensureStorageDirMigrated } = require('../config/paths');
+const { PATHS, ensureStorageDirMigrated } = require('../config/paths');
 const { startWebSocketServer: attachWebSocketServer } = require('./websocket-server');
 const { isPortInUse, killProcessByPort, waitForPortRelease } = require('../utils/port-helper');
 const { isProxyConfig } = require('./services/settings-manager');
@@ -266,14 +266,10 @@ async function startServer(port, host = '127.0.0.1', options = {}) {
 // 自动恢复代理状态
 function autoRestoreProxies() {
   const config = loadConfig();
-  const os = require('os');
   const fs = require('fs');
-  const path = require('path');
-
-  const ccToolDir = path.join(os.homedir(), '.cc-tool');
 
   // 检查 Claude 代理状态文件
-  const claudeActiveFile = path.join(ccToolDir, 'active-channel.json');
+  const claudeActiveFile = PATHS.activeChannel.claude;
   if (fs.existsSync(claudeActiveFile)) {
     console.log(chalk.cyan('\n🔄 检测到 Claude 代理状态文件，正在自动启动...'));
     const proxyPort = config.ports?.proxy || 20088;
@@ -287,7 +283,7 @@ function autoRestoreProxies() {
   }
 
   // 检查 Codex 代理状态文件
-  const codexActiveFile = path.join(ccToolDir, 'codex-active-channel.json');
+  const codexActiveFile = PATHS.activeChannel.codex;
   if (fs.existsSync(codexActiveFile)) {
     console.log(chalk.cyan('\n🔄 检测到 Codex 代理状态文件，正在自动启动...'));
     const codexProxyPort = config.ports?.codexProxy || 20089;
@@ -312,7 +308,7 @@ function autoRestoreProxies() {
   }
 
   // 检查 Gemini 代理状态文件
-  const geminiActiveFile = path.join(ccToolDir, 'gemini-active-channel.json');
+  const geminiActiveFile = PATHS.activeChannel.gemini;
   if (fs.existsSync(geminiActiveFile)) {
     console.log(chalk.cyan('\n🔄 检测到 Gemini 代理状态文件，正在自动启动...'));
     const geminiProxyPort = config.ports?.geminiProxy || 20090;
@@ -332,7 +328,7 @@ function autoRestoreProxies() {
   }
 
   // 检查 OpenCode 代理状态文件
-  const opencodeActiveFile = path.join(ccToolDir, 'opencode-active-channel.json');
+  const opencodeActiveFile = PATHS.activeChannel.opencode;
   if (fs.existsSync(opencodeActiveFile)) {
     console.log(chalk.cyan('\n🔄 检测到 OpenCode 代理状态文件，正在自动启动...'));
     const opencodeProxyPort = config.ports?.opencodeProxy || 20091;

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

@@ -12,18 +12,21 @@ const toml = require('toml');
 const tomlStringify = require('@iarna/toml').stringify;
 const { RepoScannerBase } = require('./repo-scanner-base');
 const { NATIVE_PATHS } = require('../../config/paths');
+const { resolvePreferredHomeDir } = require('../../utils/home-dir');
 
 // 默认仓库源
 const DEFAULT_REPOS = [];
 const SUPPORTED_PLATFORMS = ['claude', 'codex', 'opencode'];
 const OPENCODE_CONFIG_DIR = NATIVE_PATHS.opencode.config;
 const CODEX_CONFIG_PATH = NATIVE_PATHS.codex.config;
-const CODEX_AGENTS_DIR = path.join(os.homedir(), '.codex', 'agents');
+const HOME_DIR = resolvePreferredHomeDir(process.platform, process.env, os.homedir());
+const CODEX_AGENTS_DIR = path.join(path.dirname(CODEX_CONFIG_PATH), 'agents');
+const CLAUDE_AGENTS_DIR = path.join(path.dirname(NATIVE_PATHS.claude.settings), 'agents');
 const CODEX_CONFIG_MODES = new Set(['none', 'managed', 'custom']);
 
 const PLATFORM_CONFIG = {
   claude: {
-    userAgentsDir: path.join(os.homedir(), '.claude', 'agents'),
+    userAgentsDir: CLAUDE_AGENTS_DIR,
     projectAgentsDir: (projectPath) => path.join(projectPath, '.claude', 'agents'),
     repoType: 'agents'
   },
@@ -206,7 +209,7 @@ function resolveCodexConfigPath(configPath) {
   if (!normalized) return '';
 
   if (normalized.startsWith('~/')) {
-    return path.join(os.homedir(), normalized.slice(2));
+    return path.join(HOME_DIR, normalized.slice(2));
   }
 
   if (path.isAbsolute(normalized)) {

package/src/server/services/channels.js

@@ -1,26 +1,25 @@
 const fs = require('fs');
-const path = require('path');
-const os = require('os');
 const { isProxyConfig } = require('./settings-manager');
+const { PATHS, NATIVE_PATHS } = require('../../config/paths');
 
 function getChannelsFilePath() {
-  const dir = path.join(os.homedir(), '.cc-tool');
+  const dir = PATHS.base;
   if (!fs.existsSync(dir)) {
     fs.mkdirSync(dir, { recursive: true });
   }
-  return path.join(dir, 'channels.json');
+  return PATHS.channels.claude;
 }
 
 function getActiveChannelIdPath() {
-  const dir = path.join(os.homedir(), '.cc-tool');
+  const dir = PATHS.base;
   if (!fs.existsSync(dir)) {
     fs.mkdirSync(dir, { recursive: true });
   }
-  return path.join(dir, 'active-channel.json');
+  return PATHS.activeChannel.claude;
 }
 
 function getClaudeSettingsPath() {
-  return path.join(os.homedir(), '.claude', 'settings.json');
+  return NATIVE_PATHS.claude.settings;
 }
 
 function saveActiveChannelId(channelId) {

package/src/server/services/codex-channels.js

@@ -4,9 +4,12 @@ const os = require('os');
 const crypto = require('crypto');
 const toml = require('toml');
 const tomlStringify = require('@iarna/toml').stringify;
+const { resolvePreferredHomeDir } = require('../../utils/home-dir');
 const { getCodexDir } = require('./codex-config');
 const { injectEnvToShell, removeEnvFromShell, isProxyConfig } = require('./codex-settings-manager');
 
+const HOME_DIR = resolvePreferredHomeDir(process.platform, process.env, os.homedir());
+
 /**
  * Codex 渠道管理服务（多渠道架构）
  *
@@ -30,7 +33,7 @@ function normalizeGatewaySourceType(value, fallback = 'codex') {
 
 // 获取渠道存储文件路径
 function getChannelsFilePath() {
-  const ccToolDir = path.join(os.homedir(), '.cc-tool');
+  const ccToolDir = path.join(HOME_DIR, '.cc-tool');
   if (!fs.existsSync(ccToolDir)) {
     fs.mkdirSync(ccToolDir, { recursive: true });
   }

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

@@ -2,12 +2,15 @@ const fs = require('fs');
 const path = require('path');
 const os = require('os');
 const toml = require('toml');
+const { resolvePreferredHomeDir } = require('../../utils/home-dir');
+
+const HOME_DIR = resolvePreferredHomeDir(process.platform, process.env, os.homedir());
 
 /**
  * 获取 Codex 配置目录
  */
 function getCodexDir() {
-  return path.join(os.homedir(), '.codex');
+  return path.join(HOME_DIR, '.codex');
 }
 
 /**

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

@@ -3,23 +3,26 @@ const path = require('path');
 const os = require('os');
 const toml = require('toml');
 const tomlStringify = require('@iarna/toml').stringify;
+const { resolvePreferredHomeDir, isWindowsLikePlatform } = require('../../utils/home-dir');
+
+const HOME_DIR = resolvePreferredHomeDir(process.platform, process.env, os.homedir());
 
 // Codex 配置文件路径
 function getConfigPath() {
-  return path.join(os.homedir(), '.codex', 'config.toml');
+  return path.join(HOME_DIR, '.codex', 'config.toml');
 }
 
 function getAuthPath() {
-  return path.join(os.homedir(), '.codex', 'auth.json');
+  return path.join(HOME_DIR, '.codex', 'auth.json');
 }
 
 // 备份文件路径
 function getConfigBackupPath() {
-  return path.join(os.homedir(), '.codex', 'config.toml.cc-tool-backup');
+  return path.join(HOME_DIR, '.codex', 'config.toml.cc-tool-backup');
 }
 
 function getAuthBackupPath() {
-  return path.join(os.homedir(), '.codex', 'auth.json.cc-tool-backup');
+  return path.join(HOME_DIR, '.codex', 'auth.json.cc-tool-backup');
 }
 
 // 检查配置文件是否存在
@@ -74,7 +77,7 @@ function writeFileAtomic(filePath, content) {
 
 function normalizeHomePath(filePath) {
   const normalizedPath = String(filePath || '').replace(/\\/g, '/');
-  const normalizedHome = os.homedir().replace(/\\/g, '/');
+  const normalizedHome = HOME_DIR.replace(/\\/g, '/');
   if (normalizedPath.startsWith(normalizedHome)) {
     return `~${normalizedPath.slice(normalizedHome.length)}`;
   }
@@ -111,11 +114,13 @@ function isPowerShellProfile(filePath) {
 }
 
 function getShellConfigCandidates() {
-  const homeDir = os.homedir();
+  const homeDir = HOME_DIR;
   const shell = String(process.env.SHELL || '').toLowerCase();
   const candidates = [];
 
-  if (process.platform === 'win32') {
+  if (isWindowsLikePlatform(process.platform, process.env)) {
+    const oneDriveDir = process.env.OneDrive || process.env.ONEDRIVE || '';
+
     if (shell.includes('zsh')) {
       candidates.push(path.join(homeDir, '.zshrc'));
     }
@@ -127,6 +132,10 @@ function getShellConfigCandidates() {
 
     candidates.push(path.join(homeDir, 'Documents', 'PowerShell', 'Microsoft.PowerShell_profile.ps1'));
     candidates.push(path.join(homeDir, 'Documents', 'WindowsPowerShell', 'Microsoft.PowerShell_profile.ps1'));
+    if (oneDriveDir) {
+      candidates.push(path.join(oneDriveDir, 'Documents', 'PowerShell', 'Microsoft.PowerShell_profile.ps1'));
+      candidates.push(path.join(oneDriveDir, 'Documents', 'WindowsPowerShell', 'Microsoft.PowerShell_profile.ps1'));
+    }
     candidates.push(path.join(homeDir, '.bashrc'));
     candidates.push(path.join(homeDir, '.profile'));
   } else if (shell.includes('zsh')) {
@@ -154,7 +163,7 @@ function getShellConfigCandidates() {
 
 function getShellReloadCommand(configPath) {
   if (!configPath) {
-    return process.platform === 'win32' ? '重启终端' : 'source ~/.zshrc';
+    return isWindowsLikePlatform(process.platform, process.env) ? '重启终端' : 'source ~/.zshrc';
   }
 
   const displayPath = normalizeHomePath(configPath);
@@ -176,7 +185,7 @@ function getShellReloadCommand(configPath) {
     return 'source ~/.profile';
   }
 
-  if (process.platform === 'win32') {
+  if (isWindowsLikePlatform(process.platform, process.env)) {
     return '. $PROFILE';
   }
 

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

@@ -7,7 +7,6 @@
 
 const fs = require('fs');
 const path = require('path');
-const os = require('os');
 const { RepoScannerBase } = require('./repo-scanner-base');
 const { NATIVE_PATHS } = require('../../config/paths');
 const {
@@ -19,10 +18,11 @@ const {
 const DEFAULT_REPOS = [];
 const SUPPORTED_PLATFORMS = ['claude', 'opencode'];
 const OPENCODE_CONFIG_DIR = NATIVE_PATHS.opencode.config;
+const CLAUDE_COMMANDS_DIR = path.join(path.dirname(NATIVE_PATHS.claude.settings), 'commands');
 
 const PLATFORM_CONFIG = {
   claude: {
-    userCommandsDir: path.join(os.homedir(), '.claude', 'commands'),
+    userCommandsDir: CLAUDE_COMMANDS_DIR,
     projectCommandsDir: (projectPath) => path.join(projectPath, '.claude', 'commands'),
     repoType: 'commands'
   },

package/src/server/services/config-export-service.js

@@ -5,24 +5,28 @@
 
 const fs = require('fs');
 const path = require('path');
-const os = require('os');
 const AdmZip = require('adm-zip');
 const configTemplatesService = require('./config-templates-service');
 const channelsService = require('./channels');
+const codexChannelsService = require('./codex-channels');
+const geminiChannelsService = require('./gemini-channels');
+const opencodeChannelsService = require('./opencode-channels');
 const { AgentsService } = require('./agents-service');
 const { CommandsService } = require('./commands-service');
 const { SkillService } = require('./skill-service');
+const { PATHS, NATIVE_PATHS } = require('../../config/paths');
 
 const CONFIG_VERSION = '1.2.0';
 const SKILL_FILE_ENCODING = 'base64';
 const SKILL_IGNORE_DIRS = new Set(['.git']);
 const SKILL_IGNORE_FILES = new Set(['.DS_Store']);
-const CC_TOOL_DIR = path.join(os.homedir(), '.cc-tool');
-const LEGACY_CC_TOOL_DIR = path.join(os.homedir(), '.cc-tool');
-const CLAUDE_SETTINGS_PATH = path.join(os.homedir(), '.claude', 'settings.json');
+const CC_TOOL_DIR = PATHS.base;
+const LEGACY_CC_TOOL_DIR = PATHS.base;
+const CLAUDE_SETTINGS_PATH = NATIVE_PATHS.claude.settings;
 const LEGACY_PLUGINS_DIR = path.join(LEGACY_CC_TOOL_DIR, 'plugins', 'installed');
 const LEGACY_PLUGINS_REGISTRY = path.join(LEGACY_CC_TOOL_DIR, 'plugins', 'registry.json');
-const NATIVE_PLUGINS_REGISTRY = path.join(os.homedir(), '.claude', 'plugins', 'installed_plugins.json');
+const CLAUDE_PLUGINS_DIR = path.join(path.dirname(NATIVE_PATHS.claude.settings), 'plugins');
+const NATIVE_PLUGINS_REGISTRY = path.join(CLAUDE_PLUGINS_DIR, 'installed_plugins.json');
 const PLUGIN_IGNORE_DIRS = new Set(['.git', 'node_modules', '.DS_Store']);
 const PLUGIN_IGNORE_FILES = new Set(['.DS_Store']);
 const PLUGIN_SENSITIVE_PATTERNS = [
@@ -413,6 +417,14 @@ function writeTextFile(baseDir, relativePath, content, overwrite) {
   return 'success';
 }
 
+function getAllChannelsByType() {
+  const claude = channelsService.getAllChannels() || [];
+  const codex = codexChannelsService.getChannels()?.channels || [];
+  const gemini = geminiChannelsService.getChannels()?.channels || [];
+  const opencode = opencodeChannelsService.getChannels()?.channels || [];
+  return { claude, codex, gemini, opencode };
+}
+
 /**
  * 导出所有配置为JSON
  * @returns {Object} 配置导出对象
@@ -423,8 +435,9 @@ function exportAllConfigs() {
     const allConfigTemplates = configTemplatesService.getAllTemplates();
     const customConfigTemplates = allConfigTemplates.filter(t => !t.isBuiltin);
 
-    // 获取所有频道配置
-    const channels = channelsService.getAllChannels() || [];
+    // 获取所有频道配置（向后兼容：channels 仍保留 Claude 渠道）
+    const channelsByType = getAllChannelsByType();
+    const channels = channelsByType.claude || [];
 
     // 获取工作区配置
     const workspaceService = require('./workspace-service');
@@ -513,6 +526,7 @@ function exportAllConfigs() {
       data: {
         configTemplates: customConfigTemplates,
         channels: channels || [],
+        channelsByType,
         workspaces: workspaces || { workspaces: [] },
         favorites: favorites || { favorites: [] },
         agents: agents || [],
@@ -601,6 +615,7 @@ async function importConfigs(importData, options = {}) {
     const {
       configTemplates = [],
       channels = [],
+      channelsByType = null,
       workspaces = null,
       favorites = null,
       agents = [],
@@ -615,6 +630,16 @@ async function importConfigs(importData, options = {}) {
       claudeHooks = null
     } = importData.data;
 
+    const hasTypedChannels = channelsByType && typeof channelsByType === 'object';
+    const importChannelsByType = {
+      claude: hasTypedChannels && Array.isArray(channelsByType.claude)
+        ? channelsByType.claude
+        : (Array.isArray(channels) ? channels : []),
+      codex: hasTypedChannels && Array.isArray(channelsByType.codex) ? channelsByType.codex : [],
+      gemini: hasTypedChannels && Array.isArray(channelsByType.gemini) ? channelsByType.gemini : [],
+      opencode: hasTypedChannels && Array.isArray(channelsByType.opencode) ? channelsByType.opencode : []
+    };
+
     // 导入配置模板
     for (const template of configTemplates) {
       try {
@@ -642,29 +667,72 @@ async function importConfigs(importData, options = {}) {
       }
     }
 
-    // 导入频道配置
-    for (const channel of channels) {
-      try {
-        const existingChannels = channelsService.getAllChannels() || [];
-        const existing = existingChannels.find(c => c.id === channel.id);
-
-        if (existing && !overwrite) {
-          results.channels.skipped++;
-          continue;
-        }
+    // 导入频道配置（兼容旧结构 channels 和新结构 channelsByType）
+    const importTypedChannels = (type, service, createChannel, findExisting = null) => {
+      const sourceChannels = importChannelsByType[type];
+      for (const channel of sourceChannels) {
+        try {
+          const existingChannels = service.getChannels
+            ? (service.getChannels()?.channels || [])
+            : (service.getAllChannels?.() || []);
+          const existing = typeof findExisting === 'function'
+            ? findExisting(existingChannels, channel)
+            : existingChannels.find(c => c.id === channel.id);
+
+          if (existing && !overwrite) {
+            results.channels.skipped++;
+            continue;
+          }
 
-        if (existing && overwrite) {
-          channelsService.updateChannel(channel.id, channel);
-        } else {
-          const { name, baseUrl, apiKey, websiteUrl, ...extraConfig } = channel;
-          channelsService.createChannel(name, baseUrl, apiKey, websiteUrl, extraConfig);
+          if (existing && overwrite) {
+            service.updateChannel(existing.id, { ...channel, id: existing.id });
+          } else {
+            createChannel(channel);
+          }
+          results.channels.success++;
+        } catch (err) {
+          console.error(`[ConfigImport] 导入${type}频道失败: ${channel.name}`, err);
+          results.channels.failed++;
         }
-        results.channels.success++;
-      } catch (err) {
-        console.error(`[ConfigImport] 导入频道失败: ${channel.name}`, err);
-        results.channels.failed++;
       }
-    }
+    };
+
+    importTypedChannels('claude', channelsService, channel => {
+      const { name, baseUrl, apiKey, websiteUrl, ...extraConfig } = channel;
+      channelsService.createChannel(name, baseUrl, apiKey, websiteUrl, extraConfig);
+    }, (existingChannels, channel) => existingChannels.find(c => c.id === channel.id));
+
+    importTypedChannels('codex', codexChannelsService, channel => {
+      const {
+        name,
+        providerKey,
+        baseUrl,
+        apiKey,
+        wireApi,
+        ...extraConfig
+      } = channel;
+      codexChannelsService.createChannel(name, providerKey, baseUrl, apiKey, wireApi, extraConfig);
+    }, (existingChannels, channel) => existingChannels.find(c =>
+      (channel.id && c.id === channel.id) ||
+      (channel.providerKey && c.providerKey === channel.providerKey)
+    ));
+
+    importTypedChannels('gemini', geminiChannelsService, channel => {
+      const { name, baseUrl, apiKey, model, ...extraConfig } = channel;
+      geminiChannelsService.createChannel(name, baseUrl, apiKey, model, extraConfig);
+    }, (existingChannels, channel) => existingChannels.find(c =>
+      (channel.id && c.id === channel.id) ||
+      (channel.name && c.name === channel.name)
+    ));
+
+    importTypedChannels('opencode', opencodeChannelsService, channel => {
+      const { name, baseUrl, apiKey, ...extraConfig } = channel;
+      opencodeChannelsService.createChannel(name, baseUrl, apiKey, extraConfig);
+    }, (existingChannels, channel) => existingChannels.find(c =>
+      (channel.id && c.id === channel.id) ||
+      (channel.providerKey && c.providerKey === channel.providerKey) ||
+      (channel.name && channel.baseUrl && c.name === channel.name && c.baseUrl === channel.baseUrl)
+    ));
 
     // 导入工作区配置
     if (workspaces && overwrite) {
@@ -799,7 +867,7 @@ async function importConfigs(importData, options = {}) {
                 results.plugins.failed++;
                 continue;
               }
-              targetDir = path.join(os.homedir(), '.claude', 'plugins', pluginId);
+              targetDir = path.join(CLAUDE_PLUGINS_DIR, pluginId);
               registryPath = NATIVE_PLUGINS_REGISTRY;
             } else {
               console.warn(`[ConfigImport] Unknown plugin type: ${pluginType}`);

package/src/server/services/config-registry-service.js

@@ -9,19 +9,20 @@
 
 const fs = require('fs');
 const path = require('path');
-const os = require('os');
+const { PATHS, NATIVE_PATHS } = require('../../config/paths');
 
 // Configuration paths
-const CC_TOOL_DIR = path.join(os.homedir(), '.cc-tool');
+const CC_TOOL_DIR = PATHS.base;
 const REGISTRY_FILE = path.join(CC_TOOL_DIR, 'config-registry.json');
 const CONFIGS_DIR = path.join(CC_TOOL_DIR, 'configs');
 
 // Claude Code native directories
+const CLAUDE_HOME_DIR = path.dirname(NATIVE_PATHS.claude.settings);
 const CLAUDE_DIRS = {
-  skills: path.join(os.homedir(), '.claude', 'skills'),
-  commands: path.join(os.homedir(), '.claude', 'commands'),
-  agents: path.join(os.homedir(), '.claude', 'agents'),
-  plugins: path.join(os.homedir(), '.claude', 'plugins')
+  skills: path.join(CLAUDE_HOME_DIR, 'skills'),
+  commands: path.join(CLAUDE_HOME_DIR, 'commands'),
+  agents: path.join(CLAUDE_HOME_DIR, 'agents'),
+  plugins: path.join(CLAUDE_HOME_DIR, 'plugins')
 };
 
 // Valid config types

package/src/server/services/config-sync-manager.js

@@ -20,10 +20,10 @@ const os = require('os');
 const toml = require('toml');
 const tomlStringify = require('@iarna/toml').stringify;
 const { convertSkillToCodex, convertCommandToCodex } = require('./format-converter');
-const { PATHS, NATIVE_PATHS, ensureStorageDirMigrated } = require('../../config/paths');
+const { PATHS, NATIVE_PATHS, HOME_DIR, ensureStorageDirMigrated } = require('../../config/paths');
 
 // Paths
-const HOME = os.homedir();
+const HOME = HOME_DIR || os.homedir();
 const CC_TOOL_CONFIGS = path.join(PATHS.base, 'configs');
 const CLAUDE_CODE_DIR = path.join(HOME, '.claude');
 const CODEX_DIR = path.join(HOME, '.codex');