coding-tool-x 3.6.13 → 3.7.1

package/src/commands/toggle-proxy.js

@@ -5,6 +5,7 @@ const inquirer = require('inquirer');
 const { loadConfig } = require('../config/loader');
 const { PATHS } = require('../config/paths');
 const { clearNativeOAuth } = require('../server/services/native-oauth-adapters');
+const { normalizePlatformKey } = require('../shared/platforms');
 const SETTINGS_MANAGERS = {
   claude: () => require('../server/services/settings-manager'),
   codex: () => require('../server/services/codex-settings-manager'),
@@ -16,10 +17,11 @@ const SETTINGS_MANAGERS = {
  * 获取当前类型的代理服务
  */
 function getProxyServices(cliType) {
-  if (cliType === 'claude') {
+  const normalizedCliType = normalizePlatformKey(cliType || 'claude');
+  if (normalizedCliType === 'claude') {
     const { getProxyStatus, startProxyServer, stopProxyServer } = require('../server/proxy-server');
     return { getProxyStatus, startProxyServer, stopProxyServer, defaultPort: 20088 };
-  } else if (cliType === 'codex') {
+  } else if (normalizedCliType === 'codex') {
     const { getCodexProxyStatus, startCodexProxyServer, stopCodexProxyServer } = require('../server/codex-proxy-server');
     return {
       getProxyStatus: getCodexProxyStatus,
@@ -27,7 +29,7 @@ function getProxyServices(cliType) {
       stopProxyServer: stopCodexProxyServer,
       defaultPort: 20089
     };
-  } else if (cliType === 'gemini') {
+  } else if (normalizedCliType === 'gemini') {
     const { getGeminiProxyStatus, startGeminiProxyServer, stopGeminiProxyServer } = require('../server/gemini-proxy-server');
     return {
       getProxyStatus: getGeminiProxyStatus,
@@ -35,7 +37,7 @@ function getProxyServices(cliType) {
       stopProxyServer: stopGeminiProxyServer,
       defaultPort: 20090
     };
-  } else if (cliType === 'opencode') {
+  } else if (normalizedCliType === 'opencode') {
     const { getOpenCodeProxyStatus, startOpenCodeProxyServer, stopOpenCodeProxyServer } = require('../server/opencode-proxy-server');
     return {
       getProxyStatus: getOpenCodeProxyStatus,
@@ -43,11 +45,24 @@ function getProxyServices(cliType) {
       stopProxyServer: stopOpenCodeProxyServer,
       defaultPort: 20091
     };
+  } else if (normalizedCliType === 'omp') {
+    const { getOmpProxyStatus, startOmpProxyServer, stopOmpProxyServer } = require('../server/omp-proxy-server');
+    const config = loadConfig();
+    return {
+      getProxyStatus: getOmpProxyStatus,
+      startProxyServer: startOmpProxyServer,
+      stopProxyServer: stopOmpProxyServer,
+      defaultPort: config.ports?.ompProxy || 20092,
+      managedProviderConfig: true
+    };
   }
+
+  return null;
 }
 
 function getSettingsManager(cliType) {
-  const loader = SETTINGS_MANAGERS[cliType] || SETTINGS_MANAGERS.claude;
+  const normalizedCliType = normalizePlatformKey(cliType || 'claude');
+  const loader = SETTINGS_MANAGERS[normalizedCliType] || SETTINGS_MANAGERS.claude;
   const manager = loader();
   return {
     setProxyConfig: manager.setProxyConfig,
@@ -58,7 +73,8 @@ function getSettingsManager(cliType) {
 }
 
 function removeActiveChannelMarker(cliType) {
-  const markerPath = PATHS.activeChannel?.[cliType];
+  const normalizedCliType = normalizePlatformKey(cliType || 'claude');
+  const markerPath = PATHS.activeChannel?.[normalizedCliType];
   if (!markerPath) {
     return;
   }
@@ -73,7 +89,8 @@ function removeActiveChannelMarker(cliType) {
 }
 
 function loadActiveChannelId(cliType) {
-  const markerPath = PATHS.activeChannel?.[cliType];
+  const normalizedCliType = normalizePlatformKey(cliType || 'claude');
+  const markerPath = PATHS.activeChannel?.[normalizedCliType];
   if (!markerPath) {
     return null;
   }
@@ -116,27 +133,28 @@ function pickRestoredChannel(cliType, channels = []) {
 }
 
 function restoreSingleChannelMode(cliType) {
-  if (cliType === 'claude') {
+  const normalizedCliType = normalizePlatformKey(cliType || 'claude');
+  if (normalizedCliType === 'claude') {
     const { getAllChannels, applyChannelToSettings } = require('../server/services/channels');
-    const target = pickRestoredChannel(cliType, getAllChannels());
+    const target = pickRestoredChannel(normalizedCliType, getAllChannels());
     return target ? applyChannelToSettings(target.id) : null;
   }
 
-  if (cliType === 'codex') {
+  if (normalizedCliType === 'codex') {
     const { getChannels, applyChannelToSettings } = require('../server/services/codex-channels');
-    const target = pickRestoredChannel(cliType, getChannels().channels || []);
+    const target = pickRestoredChannel(normalizedCliType, getChannels().channels || []);
     return target ? applyChannelToSettings(target.id) : null;
   }
 
-  if (cliType === 'gemini') {
+  if (normalizedCliType === 'gemini') {
     const { getChannels, applyChannelToSettings } = require('../server/services/gemini-channels');
-    const target = pickRestoredChannel(cliType, getChannels().channels || []);
+    const target = pickRestoredChannel(normalizedCliType, getChannels().channels || []);
     return target ? applyChannelToSettings(target.id) : null;
   }
 
-  if (cliType === 'opencode') {
+  if (normalizedCliType === 'opencode') {
     const { getChannels, applyChannelToSettings } = require('../server/services/opencode-channels');
-    const target = pickRestoredChannel(cliType, getChannels().channels || []);
+    const target = pickRestoredChannel(normalizedCliType, getChannels().channels || []);
     return target ? applyChannelToSettings(target.id) : null;
   }
 
@@ -148,7 +166,7 @@ function restoreSingleChannelMode(cliType) {
  */
 async function handleToggleProxy() {
   const config = loadConfig();
-  const cliType = config.currentCliType || 'claude';
+  const cliType = normalizePlatformKey(config.currentCliType || 'claude');
   const services = getProxyServices(cliType);
   if (!services) {
     console.log(chalk.red(`\n[ERROR] 当前 CLI 类型 (${cliType}) 暂不支持动态切换\n`));
@@ -179,21 +197,33 @@ async function handleStartProxy(cliType, services) {
     claude: 'Claude Code',
     codex: 'Codex',
     gemini: 'Gemini',
-    opencode: 'OpenCode'
+    opencode: 'OpenCode',
+    omp: 'OMP'
   };
   const toolName = toolNameMap[cliType] || 'Claude Code';
   const defaultPort = services.defaultPort;
 
   console.log(chalk.cyan('动态切换功能说明:'));
-  console.log(chalk.gray('• 开启后会在本地启动一个代理服务'));
-  console.log(chalk.gray(`• 可以在不重启 ${toolName} 的情况下动态管理渠道`));
-  console.log(chalk.gray('• 通过 Web UI 或"渠道管理"功能快速调整启用的线路'));
-  console.log(chalk.gray(`• 代理服务地址: http://127.0.0.1:${defaultPort}\n`));
+  if (services.managedProviderConfig) {
+    console.log(chalk.gray('• 开启后会把已启用的 OMP 渠道写入受管 models.yml provider 配置'));
+    console.log(chalk.gray(`• 可以通过 Web UI 或"渠道管理"功能调整启用的 ${toolName} provider`));
+    console.log(chalk.gray(`• 状态端口: http://127.0.0.1:${defaultPort}\n`));
+  } else {
+    console.log(chalk.gray('• 开启后会在本地启动一个代理服务'));
+    console.log(chalk.gray(`• 可以在不重启 ${toolName} 的情况下动态管理渠道`));
+    console.log(chalk.gray('• 通过 Web UI 或"渠道管理"功能快速调整启用的线路'));
+    console.log(chalk.gray(`• 代理服务地址: http://127.0.0.1:${defaultPort}\n`));
+  }
 
   console.log(chalk.yellow('[WARN]  重要提示:'));
-  console.log(chalk.yellow('• 开启期间请勿关闭 CLI 终端窗口'));
-  console.log(chalk.yellow('• 如果异常关闭导致代理失效，请运行: ctx reset'));
-  console.log(chalk.yellow('• 或使用主菜单的"恢复默认配置"功能\n'));
+  if (services.managedProviderConfig) {
+    console.log(chalk.yellow('• 启用后会写入 Coding-Tool 管理的 OMP models.yml provider 配置'));
+    console.log(chalk.yellow('• 关闭会移除受管 provider，不会清理 OMP 原生 auth.json\n'));
+  } else {
+    console.log(chalk.yellow('• 开启期间请勿关闭 CLI 终端窗口'));
+    console.log(chalk.yellow('• 如果异常关闭导致代理失效，请运行: ctx reset'));
+    console.log(chalk.yellow('• 或使用主菜单的"恢复默认配置"功能\n'));
+  }
 
   const { confirm } = await inquirer.prompt([
     {
@@ -210,29 +240,47 @@ async function handleStartProxy(cliType, services) {
   }
 
   try {
-    console.log(chalk.cyan('\n[START] 正在启动代理服务...\n'));
+    console.log(chalk.cyan(services.managedProviderConfig
+      ? '\n[START] 正在启用 OMP models.yml 受管 provider...\n'
+      : '\n[START] 正在启动代理服务...\n'));
 
     // 启动代理服务器
     const proxyResult = await services.startProxyServer();
 
     if (!proxyResult.success) {
-      throw new Error('代理服务器启动失败');
+      throw new Error(services.managedProviderConfig ? 'OMP 受管 provider 启用失败' : '代理服务器启动失败');
     }
 
-    console.log(chalk.green(`[OK] 代理服务已启动: http://127.0.0.1:${proxyResult.port}`));
+    if (services.managedProviderConfig) {
+      console.log(chalk.green('[OK] OMP models.yml 受管 provider 已启用'));
+      if (proxyResult.port) {
+        console.log(chalk.gray(`状态端口: http://127.0.0.1:${proxyResult.port}`));
+      }
+      (proxyResult.warnings || []).forEach((warning) => {
+        console.log(chalk.yellow(`[WARN]  ${warning}`));
+      });
+    } else {
+      console.log(chalk.green(`[OK] 代理服务已启动: http://127.0.0.1:${proxyResult.port}`));
+    }
 
     // 修改配置文件
-    const settingsManager = getSettingsManager(cliType);
-    clearNativeOAuth(cliType);
-    settingsManager.setProxyConfig(proxyResult.port);
-    console.log(chalk.green('[OK] 配置文件已更新'));
-
-    if (settingsManager.hasBackup()) {
-      console.log(chalk.green('[OK] 原配置已备份'));
+    if (!services.managedProviderConfig) {
+      const settingsManager = getSettingsManager(cliType);
+      clearNativeOAuth(cliType);
+      settingsManager.setProxyConfig(proxyResult.port);
+      console.log(chalk.green('[OK] 配置文件已更新'));
+
+      if (settingsManager.hasBackup()) {
+        console.log(chalk.green('[OK] 原配置已备份'));
+      }
     }
 
-    console.log(chalk.cyan('\n[TIP] 动态切换已启用！'));
-    console.log(chalk.gray(`   现在可以通过"渠道管理"功能快速调整，无需重启 ${toolName}\n`));
+    console.log(chalk.cyan(services.managedProviderConfig ? '\n[TIP] OMP 受管 provider 已启用！' : '\n[TIP] 动态切换已启用！'));
+    if (services.managedProviderConfig) {
+      console.log(chalk.gray('   现在可以通过"渠道管理"功能调整已启用的 OMP provider，并重新同步 models.yml\n'));
+    } else {
+      console.log(chalk.gray(`   现在可以通过"渠道管理"功能快速调整，无需重启 ${toolName}\n`));
+    }
 
     await inquirer.prompt([
       {
@@ -267,20 +315,32 @@ async function handleStopProxy(cliType, services) {
     claude: 'Claude Code',
     codex: 'Codex',
     gemini: 'Gemini',
-    opencode: 'OpenCode'
+    opencode: 'OpenCode',
+    omp: 'OMP'
   };
   const toolName = toolNameMap[cliType] || 'Claude Code';
   const proxyStatus = services.getProxyStatus();
 
   console.log(chalk.cyan('当前状态:'));
-  console.log(chalk.gray(`• 代理服务: ${chalk.green('运行中')}`));
-  console.log(chalk.gray(`• 代理端口: ${proxyStatus.port}`));
-  console.log(chalk.gray(`• 代理地址: http://127.0.0.1:${proxyStatus.port}\n`));
+  if (services.managedProviderConfig) {
+    console.log(chalk.gray(`• 受管配置: ${chalk.green('已启用')}`));
+    console.log(chalk.gray(`• 配置模式: ${proxyStatus.mode || 'models-yml-provider-config'}`));
+    console.log(chalk.gray(`• 状态端口: http://127.0.0.1:${proxyStatus.port || proxyStatus.defaultPort}\n`));
+  } else {
+    console.log(chalk.gray(`• 代理服务: ${chalk.green('运行中')}`));
+    console.log(chalk.gray(`• 代理端口: ${proxyStatus.port}`));
+    console.log(chalk.gray(`• 代理地址: http://127.0.0.1:${proxyStatus.port}\n`));
+  }
 
   console.log(chalk.yellow('关闭后:'));
-  console.log(chalk.gray('• 代理服务将被停止'));
-  console.log(chalk.gray('• 配置将恢复为当前激活渠道的单渠道模式'));
-  console.log(chalk.gray(`• 之后管理渠道将需要重启 ${toolName}\n`));
+  if (services.managedProviderConfig) {
+    console.log(chalk.gray('• OMP 受管 models.yml provider 配置将被移除'));
+    console.log(chalk.gray(`• 之后调整 ${toolName} provider 需要重新启用受管配置\n`));
+  } else {
+    console.log(chalk.gray('• 代理服务将被停止'));
+    console.log(chalk.gray('• 配置将恢复为当前激活渠道的单渠道模式'));
+    console.log(chalk.gray(`• 之后管理渠道将需要重启 ${toolName}\n`));
+  }
 
   const { confirm } = await inquirer.prompt([
     {
@@ -297,25 +357,38 @@ async function handleStopProxy(cliType, services) {
   }
 
   try {
-    console.log(chalk.cyan('\n[STOP]  正在停止代理服务...\n'));
+    console.log(chalk.cyan(services.managedProviderConfig
+      ? '\n[STOP]  正在移除 OMP models.yml 受管 provider...\n'
+      : '\n[STOP]  正在停止代理服务...\n'));
 
     // 停止代理服务器
     await services.stopProxyServer();
-    console.log(chalk.green('[OK] 代理服务已停止'));
+    console.log(chalk.green(services.managedProviderConfig
+      ? '[OK] OMP models.yml 受管 provider 已移除'
+      : '[OK] 代理服务已停止'));
 
     // 恢复配置文件
-    const settingsManager = getSettingsManager(cliType);
-    settingsManager.deleteBackup?.();
-    const restoredChannel = restoreSingleChannelMode(cliType);
-    removeActiveChannelMarker(cliType);
-    if (restoredChannel?.name) {
-      console.log(chalk.green(`[OK] 已恢复到渠道: ${restoredChannel.name}`));
+    if (!services.managedProviderConfig) {
+      const settingsManager = getSettingsManager(cliType);
+      settingsManager.deleteBackup?.();
+      const restoredChannel = restoreSingleChannelMode(cliType);
+      removeActiveChannelMarker(cliType);
+      if (restoredChannel?.name) {
+        console.log(chalk.green(`[OK] 已恢复到渠道: ${restoredChannel.name}`));
+      } else {
+        console.log(chalk.green('[OK] 已清理代理接管状态'));
+      }
     } else {
+      removeActiveChannelMarker(cliType);
       console.log(chalk.green('[OK] 已清理代理接管状态'));
     }
 
-    console.log(chalk.cyan('\n[TIP] 动态切换已关闭'));
-    console.log(chalk.gray(`   现在调整渠道需要重启 ${toolName} 才能生效\n`));
+    console.log(chalk.cyan(services.managedProviderConfig ? '\n[TIP] OMP 受管 provider 已关闭' : '\n[TIP] 动态切换已关闭'));
+    if (services.managedProviderConfig) {
+      console.log(chalk.gray('   如需恢复受管 provider 配置，请再次运行 ctx omp start\n'));
+    } else {
+      console.log(chalk.gray(`   现在调整渠道需要重启 ${toolName} 才能生效\n`));
+    }
 
     await inquirer.prompt([
       {
@@ -339,4 +412,9 @@ async function handleStopProxy(cliType, services) {
 
 module.exports = {
   handleToggleProxy,
+  _test: {
+    getProxyServices,
+    pickRestoredChannel,
+    restoreSingleChannelMode
+  }
 };

package/src/commands/ui.js

@@ -3,14 +3,13 @@ const { startServer } = require('../server');
 const open = require('open');
 const { getProxyStatus } = require('../server/proxy-server');
 const { loadConfig } = require('../config/loader');
-const { hasHostFlag } = require('../utils/cli-flags');
 
 async function handleUI() {
   // 检查是否为 daemon 模式（PM2 启动）
   const isDaemon = process.argv.includes('--daemon');
 
-  // 检查是否启用 LAN 访问 (--host/--hosts 标志)
-  const enableHost = hasHostFlag();
+  // 检查是否启用 LAN 访问 (--host 标志)
+  const enableHost = process.argv.includes('--host');
   const enableHttps = process.argv.includes('--https');
   const host = enableHost ? '0.0.0.0' : '127.0.0.1';
   const protocol = enableHttps ? 'https' : 'http';
@@ -19,7 +18,7 @@ async function handleUI() {
     console.clear();
     console.log(chalk.cyan.bold('\n[NET] 启动 Coding-Tool Web UI...\n'));
     if (enableHost) {
-      console.log(chalk.yellow('[WARN]  LAN 访问已启用 (--host/--hosts)\n'));
+      console.log(chalk.yellow('[WARN]  LAN 访问已启用 (--host)\n'));
     }
     if (enableHttps) {
       console.log(chalk.yellow('[LOCK] 已启用本地 HTTPS 模式 (--https)\n'));

package/src/commands/workspace.js

@@ -188,8 +188,6 @@ async function createWorkspace() {
 
       let createWorktree = false;
       let branch = '';
-      let branchMode = 'existing';
-      let baseBranch = '';
 
       if (isGit) {
         const { shouldCreateWorktree } = await inquirer.prompt([
@@ -202,24 +200,11 @@ async function createWorkspace() {
         ]);
 
         if (shouldCreateWorktree) {
-          const { selectedBranchMode } = await inquirer.prompt([
-            {
-              type: 'list',
-              name: 'selectedBranchMode',
-              message: '选择 worktree 分支模式:',
-              choices: [
-                { name: '使用已有分支', value: 'existing' },
-                { name: '新建分支', value: 'new' }
-              ],
-              default: 'existing'
-            }
-          ]);
-
           const { branchName } = await inquirer.prompt([
             {
               type: 'input',
               name: 'branchName',
-              message: selectedBranchMode === 'new' ? '输入新分支名:' : '输入已有分支名:',
+              message: '输入分支名:',
               validate: input => {
                 if (!input || !input.trim()) {
                   return '分支名不能为空';
@@ -229,20 +214,7 @@ async function createWorkspace() {
             }
           ]);
 
-          if (selectedBranchMode === 'new') {
-            const { baseBranchName } = await inquirer.prompt([
-              {
-                type: 'input',
-                name: 'baseBranchName',
-                message: '输入基础分支（可选，如 main）:',
-                default: ''
-              }
-            ]);
-            baseBranch = baseBranchName;
-          }
-
           createWorktree = true;
-          branchMode = selectedBranchMode;
           branch = branchName;
         }
       }
@@ -251,9 +223,7 @@ async function createWorkspace() {
         sourcePath,
         name: linkName,
         createWorktree,
-        branch,
-        branchMode,
-        baseBranch
+        branch
       });
 
       console.log(chalk.green(`\n[v] 已添加: ${linkName}\n`));
@@ -275,9 +245,7 @@ async function createWorkspace() {
     projects.forEach((proj, index) => {
       console.log(chalk.gray(`  ${index + 1}. ${proj.name} → ${proj.sourcePath}`));
       if (proj.createWorktree) {
-        const modeLabel = proj.branchMode === 'new' ? '新建分支' : '已有分支';
-        const baseLabel = proj.branchMode === 'new' && proj.baseBranch ? `，基于 ${proj.baseBranch}` : '';
-        console.log(chalk.gray(`     (创建 worktree: ${modeLabel} ${proj.branch}${baseLabel})`));
+        console.log(chalk.gray(`     (创建 worktree: ${proj.branch})`));
       }
     });
     console.log('');

package/src/config/default.js

@@ -1,17 +1,27 @@
 // 默认配置
+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 CLAUDE_CONFIG_DIR = (typeof process.env.CLAUDE_CONFIG_DIR === 'string' && process.env.CLAUDE_CONFIG_DIR.trim())
+  ? process.env.CLAUDE_CONFIG_DIR.trim()
+  : path.join(HOME_DIR, '.claude');
+
 const DEFAULT_CONFIG = {
+  projectsDir: path.join(CLAUDE_CONFIG_DIR, 'projects'),
   defaultProject: null,
   maxDisplaySessions: 100,
   pageSize: 15,
-  currentCliType: 'claude',  // 当前CLI工具类型: claude, codex, gemini, opencode
+  currentCliType: 'claude',  // 当前CLI工具类型: claude, codex, gemini, opencode, omp
   ports: {
     webUI: 19999,       // Web UI 页面端口 (同时用于 WebSocket)
     proxy: 20088,       // Claude 代理服务端口
     codexProxy: 20089,  // Codex 代理服务端口
     geminiProxy: 20090, // Gemini 代理服务端口
-    opencodeProxy: 20091  // OpenCode 代理服务端口
+    opencodeProxy: 20091, // OpenCode 代理服务端口
+    ompProxy: 20092       // OMP 托管 provider 状态端口占位
   },
   maxLogs: 100,
   statsInterval: 30,
@@ -62,6 +72,13 @@ const DEFAULT_CONFIG = {
       output: 15,
       cacheRead: 0.25,
       models: {}
+    },
+    omp: {
+      mode: 'auto',
+      input: 2.5,
+      output: 15,
+      cacheRead: 0.25,
+      models: {}
     }
   }
 };

package/src/config/loader.js

@@ -3,7 +3,7 @@ const fs = require('fs');
 const path = require('path');
 const os = require('os');
 const DEFAULT_CONFIG = require('./default');
-const { PATHS, NATIVE_PATHS, ensureStorageDirMigrated } = require('./paths');
+const { PATHS, ensureStorageDirMigrated } = require('./paths');
 const { resolvePreferredHomeDir } = require('../utils/home-dir');
 const eventBus = require('../plugins/event-bus');
 
@@ -23,79 +23,12 @@ function getConfigFilePath() {
  * 展开 ~ 为用户主目录
  */
 function expandHome(filepath) {
-  if (typeof filepath !== 'string') {
-    return filepath;
-  }
   if (filepath.startsWith('~')) {
     return path.join(HOME_DIR, filepath.slice(1));
   }
   return filepath;
 }
 
-function collapseHome(filepath) {
-  if (typeof filepath !== 'string') {
-    return filepath;
-  }
-  if (filepath === HOME_DIR) {
-    return '~';
-  }
-  const prefix = `${HOME_DIR}${path.sep}`;
-  if (filepath.startsWith(prefix)) {
-    return path.join('~', filepath.slice(prefix.length));
-  }
-  return filepath;
-}
-
-function getNativeClaudeProjectsDir() {
-  return NATIVE_PATHS?.claude?.projects || path.join(HOME_DIR, '.claude', 'projects');
-}
-
-function hasExplicitProjectsDir(config = {}) {
-  return Object.prototype.hasOwnProperty.call(config, 'projectsDir') &&
-    typeof config.projectsDir === 'string' &&
-    config.projectsDir.trim() !== '';
-}
-
-function resolveClaudeProjectsDir(config = {}) {
-  if (!hasExplicitProjectsDir(config) || isDefaultProjectsDir(config.projectsDir)) {
-    return getNativeClaudeProjectsDir();
-  }
-  return expandHome(config.projectsDir);
-}
-
-function normalizeComparablePath(filepath) {
-  if (typeof filepath !== 'string' || !filepath.trim()) {
-    return '';
-  }
-  return path.normalize(expandHome(filepath.trim()));
-}
-
-function isDefaultProjectsDir(projectsDir) {
-  const normalized = normalizeComparablePath(projectsDir);
-  if (!normalized) {
-    return true;
-  }
-  const nativeDefault = normalizeComparablePath(getNativeClaudeProjectsDir());
-  const legacyHomeDefault = normalizeComparablePath(path.join(HOME_DIR, '.claude', 'projects'));
-  if (normalized === nativeDefault || normalized === legacyHomeDefault) {
-    return true;
-  }
-  const normalizedParts = normalized.replace(/\\/g, '/').split('/').filter(Boolean);
-  const last = normalizedParts[normalizedParts.length - 1];
-  const previous = normalizedParts[normalizedParts.length - 2];
-  return previous === '.claude' && last === 'projects' && !fs.existsSync(normalized);
-}
-
-function normalizeConfigForSave(config = {}) {
-  const normalized = { ...config };
-  if (isDefaultProjectsDir(normalized.projectsDir)) {
-    delete normalized.projectsDir;
-  } else if (typeof normalized.projectsDir === 'string') {
-    normalized.projectsDir = collapseHome(normalized.projectsDir);
-  }
-  return normalized;
-}
-
 function mergePricing(defaultPricing, overrides = {}) {
   const merged = {};
   Object.keys(defaultPricing).forEach((key) => {
@@ -163,7 +96,7 @@ function loadConfig() {
     if (fs.existsSync(configFilePath)) {
       const userConfig = readJsonFile(configFilePath);
       const config = { ...DEFAULT_CONFIG, ...userConfig };
-      config.projectsDir = resolveClaudeProjectsDir(userConfig);
+      config.projectsDir = expandHome(config.projectsDir || DEFAULT_CONFIG.projectsDir);
 
       // 合并 ports 配置
       config.ports = { ...DEFAULT_CONFIG.ports, ...userConfig.ports };
@@ -187,7 +120,7 @@ function loadConfig() {
   }
   const defaultConfig = {
     ...DEFAULT_CONFIG,
-    projectsDir: resolveClaudeProjectsDir(),
+    projectsDir: expandHome(DEFAULT_CONFIG.projectsDir),
     currentProject: DEFAULT_CONFIG.defaultProject
   };
   eventBus.emitSync('config:loaded', { config: defaultConfig });
@@ -204,9 +137,8 @@ function saveConfig(config) {
     if (!fs.existsSync(dir)) {
       fs.mkdirSync(dir, { recursive: true });
     }
-    const normalizedConfig = normalizeConfigForSave(config);
-    fs.writeFileSync(configFilePath, JSON.stringify(normalizedConfig, null, 2), 'utf8');
-    eventBus.emitSync('config:saved', { config: normalizedConfig });
+    fs.writeFileSync(configFilePath, JSON.stringify(config, null, 2), 'utf8');
+    eventBus.emitSync('config:saved', { config });
   } catch (error) {
     console.error(`保存配置失败 (${configFilePath}):`, error.message);
   }
@@ -216,8 +148,5 @@ module.exports = {
   loadConfig,
   saveConfig,
   expandHome,
-  resolveClaudeProjectsDir,
-  normalizeConfigForSave,
-  isDefaultProjectsDir,
   getConfigFilePath
 };