coding-tool-x 3.7.6 → 3.7.8

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, ensureStorageDirMigrated } = require('./paths');
+const { PATHS, NATIVE_PATHS, ensureStorageDirMigrated } = require('./paths');
 const { resolvePreferredHomeDir } = require('../utils/home-dir');
 const eventBus = require('../plugins/event-bus');
 
@@ -23,12 +23,79 @@ 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) => {
@@ -96,7 +163,7 @@ function loadConfig() {
     if (fs.existsSync(configFilePath)) {
       const userConfig = readJsonFile(configFilePath);
       const config = { ...DEFAULT_CONFIG, ...userConfig };
-      config.projectsDir = expandHome(config.projectsDir || DEFAULT_CONFIG.projectsDir);
+      config.projectsDir = resolveClaudeProjectsDir(userConfig);
 
       // 合并 ports 配置
       config.ports = { ...DEFAULT_CONFIG.ports, ...userConfig.ports };
@@ -120,7 +187,7 @@ function loadConfig() {
   }
   const defaultConfig = {
     ...DEFAULT_CONFIG,
-    projectsDir: expandHome(DEFAULT_CONFIG.projectsDir),
+    projectsDir: resolveClaudeProjectsDir(),
     currentProject: DEFAULT_CONFIG.defaultProject
   };
   eventBus.emitSync('config:loaded', { config: defaultConfig });
@@ -137,8 +204,9 @@ function saveConfig(config) {
     if (!fs.existsSync(dir)) {
       fs.mkdirSync(dir, { recursive: true });
     }
-    fs.writeFileSync(configFilePath, JSON.stringify(config, null, 2), 'utf8');
-    eventBus.emitSync('config:saved', { config });
+    const normalizedConfig = normalizeConfigForSave(config);
+    fs.writeFileSync(configFilePath, JSON.stringify(normalizedConfig, null, 2), 'utf8');
+    eventBus.emitSync('config:saved', { config: normalizedConfig });
   } catch (error) {
     console.error(`保存配置失败 (${configFilePath}):`, error.message);
   }
@@ -148,5 +216,8 @@ module.exports = {
   loadConfig,
   saveConfig,
   expandHome,
+  resolveClaudeProjectsDir,
+  normalizeConfigForSave,
+  isDefaultProjectsDir,
   getConfigFilePath
 };

package/src/index.js

@@ -17,6 +17,7 @@ const { ensureStorageDirMigrated } = require('./config/paths');
 const { normalizePlatformKey } = require('./shared/platforms');
 const PluginManager = require('./plugins/plugin-manager');
 const eventBus = require('./plugins/event-bus');
+const { hasHostFlag } = require('./utils/cli-flags');
 const chalk = require('chalk');
 const path = require('path');
 const fs = require('fs');
@@ -54,9 +55,12 @@ function showHelp() {
   console.log('  ctx ui                  前台启动 Web UI（仅本地访问）');
   console.log('  ctx ui --https          前台启动 Web UI（本地 HTTPS）');
   console.log('  ctx ui --host           前台启动 Web UI（允许 LAN 访问，默认允许远程写操作）');
+  console.log('  ctx ui --hosts          前台启动 Web UI（同 --host）');
+  console.log('  ctx --hosts             前台启动 Web UI（同 ctx ui --host）');
   console.log('  ctx ui start            后台启动 Web UI');
   console.log('  ctx ui start --https    后台启动 Web UI（本地 HTTPS）');
   console.log('  ctx ui start --host     后台启动 Web UI（允许 LAN 访问，默认允许远程写操作）');
+  console.log('  ctx ui start --hosts    后台启动 Web UI（同 --host）');
   console.log('  ctx ui stop             停止 Web UI');
   console.log('  ctx ui restart          重启 Web UI\n');
   console.log(chalk.gray('  提示: 如需禁止 LAN 远程写操作，可设置 CC_TOOL_ALLOW_REMOTE_WRITE=false\n'));
@@ -149,6 +153,13 @@ async function main() {
   // 处理命令行参数
   const args = process.argv.slice(2);
 
+  // LAN 快捷入口，等同于 ctx ui --host/--hosts
+  if (hasHostFlag(process.argv) && !args.some((arg) => arg && !arg.startsWith('-'))) {
+    const { handleUI } = require('./commands/ui');
+    await handleUI();
+    return;
+  }
+
   // --version 或 -v - 显示版本号
   if (args[0] === '--version' || args[0] === '-v') {
     console.log(getVersion());

package/src/server/api/config.js

@@ -330,7 +330,6 @@ router.post('/default-models', (req, res) => {
     // Save config
     const newConfig = {
       ...config,
-      projectsDir: config.projectsDir.replace(require('os').homedir(), '~'),
       defaultModels: newDefaultModels
     };
 
@@ -378,7 +377,6 @@ router.post('/default-models/reset', (req, res) => {
     // Save config
     const newConfig = {
       ...config,
-      projectsDir: config.projectsDir.replace(require('os').homedir(), '~'),
       defaultModels: newDefaultModels
     };
 
@@ -490,7 +488,6 @@ router.post('/advanced', (req, res) => {
     // 更新配置
     const newConfig = {
       ...config,
-      projectsDir: config.projectsDir.replace(require('os').homedir(), '~'),
       ports: normalizedPorts,
       maxLogs: maxLogs !== undefined ? parseInt(maxLogs) : config.maxLogs,
       statsInterval: statsInterval !== undefined ? parseInt(statsInterval) : config.statsInterval,

package/src/server/api/omp-channels.js

@@ -24,8 +24,7 @@ const {
 const {
   findAuthProviderForKey,
   getCachedOmpAuthProviderSnapshot,
-  getOmpAuthProviderCacheMeta,
-  warmOmpAuthProviderSnapshot
+  getOmpAuthProviderCacheMeta
 } = require('../services/omp-auth-providers');
 
 const CHANNEL_LIST_AUTH_OPTIONS = { accountCheck: false, includeStatus: false };
@@ -77,6 +76,8 @@ async function discoverOmpModels(channel, gatewaySourceType, { forceRefresh = fa
       models: preferredModels,
       supported: preferredModels.length > 0,
       cached: false,
+      stale: false,
+      retryAfter: null,
       fallbackUsed: true,
       fetchedAt: new Date().toISOString(),
       error: preferredModels.length > 0 ? null : 'OAuth 渠道未配置 API Key，无法直接调用远端模型列表接口',
@@ -91,11 +92,27 @@ async function discoverOmpModels(channel, gatewaySourceType, { forceRefresh = fa
   });
   const listedModels = Array.isArray(listResult.models) ? uniqueModels(listResult.models) : [];
 
+  if (listResult.backoff || listResult.stale) {
+    return {
+      models: listedModels,
+      supported: listedModels.length > 0,
+      cached: !!listResult.cached,
+      stale: true,
+      retryAfter: listResult.retryAfter || null,
+      fallbackUsed: false,
+      fetchedAt: listResult.lastChecked || new Date().toISOString(),
+      error: listResult.error || (listedModels.length > 0 ? null : '模型目录缓存已过期'),
+      errorHint: listResult.errorHint || '可点击“刷新可选模型”更新，或手动填写模型名称。'
+    };
+  }
+
   if (listedModels.length > 0) {
     return {
       models: listedModels,
       supported: true,
       cached: !!listResult.cached,
+      stale: false,
+      retryAfter: null,
       fallbackUsed: false,
       fetchedAt: listResult.lastChecked || new Date().toISOString(),
       error: null,
@@ -114,6 +131,8 @@ async function discoverOmpModels(channel, gatewaySourceType, { forceRefresh = fa
     models: probedModels,
     supported: probedModels.length > 0,
     cached: !!probe.cached || !!listResult.cached,
+    stale: false,
+    retryAfter: null,
     fallbackUsed: probedModels.length > 0,
     fetchedAt: probe.lastChecked || listResult.lastChecked || new Date().toISOString(),
     error: probedModels.length > 0 ? null : (listResult.error || '无法获取可用模型'),
@@ -142,17 +161,12 @@ function attachAuthProvider(channel, snapshot) {
 
 function getAuthSnapshotForChannelList() {
   const snapshot = getCachedOmpAuthProviderSnapshot(CHANNEL_LIST_AUTH_OPTIONS);
-  const shouldWarm = !snapshot || snapshot.stale;
-  if (shouldWarm) {
-    warmOmpAuthProviderSnapshot(CHANNEL_LIST_AUTH_OPTIONS);
-  }
   const meta = getOmpAuthProviderCacheMeta(CHANNEL_LIST_AUTH_OPTIONS);
   return {
     snapshot,
     meta: {
       ...meta,
       stale: !snapshot || Boolean(snapshot.stale),
-      refreshing: shouldWarm || meta.refreshing,
       fallback: !snapshot
     }
   };
@@ -241,7 +255,8 @@ module.exports = () => {
         model,
         speedTestModel,
         allowedModels,
-        modelRedirects
+        modelRedirects,
+        forceRefresh
       } = req.body || {};
       if (!baseUrl) {
         return res.status(400).json({ error: 'baseUrl is required' });
@@ -259,11 +274,14 @@ module.exports = () => {
         modelRedirects: Array.isArray(modelRedirects) ? modelRedirects : []
       };
       const resolvedGatewaySourceType = resolveGatewaySourceType(tempChannel);
-      const result = await discoverOmpModels(tempChannel, resolvedGatewaySourceType, { forceRefresh: true });
+      const result = await discoverOmpModels(tempChannel, resolvedGatewaySourceType, { forceRefresh: forceRefresh === true });
       res.json({
         models: result.models,
         supported: result.supported,
         fallbackUsed: result.fallbackUsed,
+        cached: result.cached,
+        stale: result.stale,
+        retryAfter: result.retryAfter,
         error: result.error,
         errorHint: result.errorHint
       });
@@ -291,6 +309,8 @@ module.exports = () => {
         models: result.models,
         supported: result.supported,
         cached: result.cached,
+        stale: result.stale,
+        retryAfter: result.retryAfter,
         fallbackUsed: result.fallbackUsed,
         fetchedAt: result.fetchedAt,
         error: result.error,

package/src/server/api/omp-config.js

@@ -6,8 +6,7 @@ const {
   getOmpPaths,
   getOmpStatus,
   readJsonFile,
-  readYamlFile,
-  readOmpSettings
+  readYamlFile
 } = require('../services/omp-config');
 const {
   getOmpAuthProviderSnapshot
@@ -89,13 +88,12 @@ function buildCapabilities() {
 
 router.get('/', (req, res) => {
   try {
-    const paths = getOmpPaths();
-    const settings = readOmpSettings();
+    const paths = getOmpPaths(process.env, { resolveRuntime: false });
+    const settings = readYamlFile(paths.settings, readJsonFile(paths.settingsJsonLegacy, {}));
     const resources = {
       config: readYamlFile(paths.config, {}),
       settings: readYamlFile(paths.settings, {}),
       auth: fs.existsSync(paths.auth) ? { exists: true, path: paths.auth } : { exists: false, path: paths.auth },
-      authProviders: getOmpAuthProviderSnapshot({ accountCheck: false }),
       models: readYamlFile(paths.modelsYml, {}),
       legacyModels: readJsonFile(paths.modelsJsonLegacy, {}),
       packages: normalizeArray(settings.packages),
@@ -110,7 +108,7 @@ router.get('/', (req, res) => {
 
     res.json({
       success: true,
-      status: getOmpStatus(),
+      status: getOmpStatus(process.env, { resolveRuntime: false }),
       capabilities: buildCapabilities(),
       resources
     });
@@ -143,8 +141,8 @@ router.get('/auth-providers', (req, res) => {
 
 router.get('/resources', (req, res) => {
   try {
-    const paths = getOmpPaths();
-    const settings = readOmpSettings();
+    const paths = getOmpPaths(process.env, { resolveRuntime: false });
+    const settings = readYamlFile(paths.settings, readJsonFile(paths.settingsJsonLegacy, {}));
     res.json({
       success: true,
       paths,

package/src/server/api/settings.js

@@ -90,7 +90,6 @@ function handleSaveModelSettings(req, res) {
     const config = loadConfig();
     const newConfig = {
       ...config,
-      projectsDir: config.projectsDir.replace(require('os').homedir(), '~'),
       modelMetadataOverrides: overrides && typeof overrides === 'object'
         ? overrides
         : (config.modelMetadataOverrides || {})
@@ -124,7 +123,6 @@ function handleDeleteModelOverride(req, res) {
 
     const newConfig = {
       ...config,
-      projectsDir: config.projectsDir.replace(require('os').homedir(), '~'),
       modelMetadataOverrides: overrides
     };
     saveConfig(newConfig);

package/src/server/api/workspaces.js

@@ -33,6 +33,24 @@ function validateBranchName(branchName) {
   }
 }
 
+function normalizeBranchMode(branchMode) {
+  if (typeof branchMode !== 'string' || !branchMode.trim()) {
+    return '';
+  }
+  return branchMode.trim();
+}
+
+function validateBranchMode(branchMode) {
+  const normalized = normalizeBranchMode(branchMode);
+  if (!normalized) {
+    return { valid: true, normalized: '' };
+  }
+  if (normalized !== 'existing' && normalized !== 'new') {
+    return { valid: false, normalized, message: `分支模式不合法: ${normalized}` };
+  }
+  return { valid: true, normalized };
+}
+
 /**
  * GET /api/workspaces
  * 获取所有工作区列表
@@ -226,6 +244,17 @@ router.post('/', (req, res) => {
         });
       }
 
+      const branchModeValidation = validateBranchMode(proj.branchMode);
+      if (!branchModeValidation.valid) {
+        return res.status(400).json({
+          success: false,
+          message: branchModeValidation.message
+        });
+      }
+      if (branchModeValidation.normalized) {
+        proj.branchMode = branchModeValidation.normalized;
+      }
+
       const normalizedBranch = normalizeBranchName(proj.branch);
       if (normalizedBranch) {
         const branchValidation = validateBranchName(normalizedBranch);
@@ -329,9 +358,10 @@ router.put('/:id/last-used', (req, res) => {
 router.post('/:id/projects', (req, res) => {
   try {
     const { id } = req.params;
-    const { sourcePath, name, createWorktree, branch, baseBranch } = req.body;
+    const { sourcePath, name, createWorktree, branch, baseBranch, branchMode } = req.body;
     const normalizedBranch = normalizeBranchName(branch);
     const normalizedBaseBranch = normalizeBranchName(baseBranch);
+    const branchModeValidation = validateBranchMode(branchMode);
 
     if (!sourcePath || !sourcePath.trim()) {
       return res.status(400).json({
@@ -340,6 +370,13 @@ router.post('/:id/projects', (req, res) => {
       });
     }
 
+    if (!branchModeValidation.valid) {
+      return res.status(400).json({
+        success: false,
+        message: branchModeValidation.message
+      });
+    }
+
     if (normalizedBranch) {
       const branchValidation = validateBranchName(normalizedBranch);
       if (!branchValidation.valid) {
@@ -364,6 +401,7 @@ router.post('/:id/projects', (req, res) => {
       sourcePath,
       name,
       createWorktree,
+      branchMode: branchModeValidation.normalized || branchMode,
       branch: normalizedBranch || branch,
       baseBranch: normalizedBaseBranch || baseBranch
     });

package/src/server/services/dashboard-snapshot-worker.js

@@ -130,6 +130,7 @@ function runDashboardSnapshotWorker(kind, source, config = {}, options = {}) {
   return new Promise((resolve, reject) => {
     const child = fork(__filename, [], {
       stdio: ['ignore', 'ignore', 'pipe', 'ipc'],
+      windowsHide: true,
       env: {
         ...process.env,
         CC_TOOL_DASHBOARD_SNAPSHOT_WORKER: '1'

package/src/server/services/https-cert.js

@@ -42,7 +42,7 @@ function resolveOpenSslCommand() {
 
   for (const command of commands) {
     try {
-      execFileSync(command, ['version'], { stdio: 'ignore' });
+      execFileSync(command, ['version'], { stdio: 'ignore', windowsHide: true });
       return command;
     } catch {
       // Try next candidate.
@@ -96,7 +96,8 @@ function generatePemCertificateWithOpenSsl(command) {
     '-config',
     configPath
   ], {
-    stdio: 'ignore'
+    stdio: 'ignore',
+    windowsHide: true
   });
 
   writeMeta({