coding-tool-x 3.7.6 → 3.7.8

package/src/server/services/model-detector.js

@@ -233,6 +233,9 @@ const MODEL_ALIASES = {
 };
 
 const TEST_TIMEOUT_MS = 10000; // 10 seconds per model test
+const MODEL_LIST_CACHE_TTL_MS = 24 * 60 * 60 * 1000;
+const MODEL_LIST_FAILURE_TTL_MS = 5 * 60 * 1000;
+const MODEL_LIST_AUTH_FAILURE_TTL_MS = 60 * 60 * 1000;
 const CLAUDE_CODE_BETA_HEADER = 'claude-code-20250219,interleaved-thinking-2025-05-14';
 
 const MODEL_UNAVAILABLE_HINTS = [
@@ -797,6 +800,84 @@ function isSignatureCacheValid(cacheEntry, signatureKey, expectedSignature) {
   return cacheEntry[signatureKey] === expectedSignature;
 }
 
+function getCacheAgeMs(timestamp, now = Date.now()) {
+  const checkedAt = Date.parse(timestamp || '');
+  return Number.isFinite(checkedAt) ? Math.max(0, now - checkedAt) : Infinity;
+}
+
+function isCacheFresh(timestamp, ttlMs, now = Date.now()) {
+  return getCacheAgeMs(timestamp, now) < ttlMs;
+}
+
+function getModelListFailureTtl(statusCode) {
+  return [401, 403, 404, 429].includes(Number(statusCode))
+    ? MODEL_LIST_AUTH_FAILURE_TTL_MS
+    : MODEL_LIST_FAILURE_TTL_MS;
+}
+
+function buildCachedModelListResult(entry, listSignature, forceRefresh) {
+  if (forceRefresh || !isSignatureCacheValid(entry, 'listSignature', listSignature)) {
+    return null;
+  }
+
+  const failure = entry.modelListFailure;
+  if (failure && Date.parse(failure.retryAfter || '') > Date.now()) {
+    return {
+      models: Array.isArray(entry.fetchedModels) ? entry.fetchedModels : [],
+      supported: true,
+      cached: true,
+      stale: true,
+      backoff: true,
+      fallbackUsed: false,
+      error: failure.error || '模型列表暂时不可用',
+      errorHint: failure.errorHint || '请稍后重试，或手动填写模型名称',
+      statusCode: failure.statusCode,
+      lastChecked: entry.lastChecked || failure.failedAt || null,
+      retryAfter: failure.retryAfter
+    };
+  }
+
+  if (!Array.isArray(entry.fetchedModels)) {
+    return null;
+  }
+
+  const stale = !isCacheFresh(entry.lastChecked, MODEL_LIST_CACHE_TTL_MS);
+  const result = {
+    models: entry.fetchedModels,
+    supported: true,
+    cached: true,
+    fallbackUsed: false,
+    error: null,
+    lastChecked: entry.lastChecked || null
+  };
+  if (stale) {
+    result.stale = true;
+    result.errorHint = '模型目录缓存已过期；可点击“刷新可选模型”更新。';
+  }
+  return result;
+}
+
+function saveModelListFailure(cache, cacheKey, listSignature, result = {}) {
+  const now = new Date();
+  const ttlMs = getModelListFailureTtl(result.statusCode);
+  const previous = cache[cacheKey] || {};
+  const failure = {
+    error: result.error || '模型列表暂时不可用',
+    errorHint: result.errorHint || '请稍后重试，或手动填写模型名称',
+    statusCode: result.statusCode || null,
+    failedAt: now.toISOString(),
+    retryAfter: new Date(now.getTime() + ttlMs).toISOString()
+  };
+  cache[cacheKey] = {
+    ...previous,
+    fetchedModels: Array.isArray(previous.fetchedModels) ? previous.fetchedModels : [],
+    listSignature,
+    modelListFailure: failure
+  };
+  saveModelCache(cache);
+  return failure;
+}
+
 /**
  * Test if a specific model is available for a channel
  * @param {Object} channel - Channel configuration
@@ -869,8 +950,10 @@ async function probeModelAvailability(channel, channelType, options = {}) {
   });
   const cacheKey = getChannelCacheKey(channel, probeSignature);
 
-  // Return cached result if channel and probe options are unchanged
-  if (!forceRefresh && isSignatureCacheValid(cache[cacheKey], 'probeSignature', probeSignature)) {
+  // Return cached result only while the matching probe result is still fresh.
+  if (!forceRefresh
+    && isSignatureCacheValid(cache[cacheKey], 'probeSignature', probeSignature)
+    && isCacheFresh(cache[cacheKey].lastChecked, MODEL_LIST_CACHE_TTL_MS)) {
     return {
       availableModels: cache[cacheKey].availableModels || [],
       preferredTestModel: cache[cacheKey].preferredTestModel || null,
@@ -1026,21 +1109,17 @@ async function fetchModelsFromProvider(channel, channelType, options = {}) {
   });
   const cacheKey = getChannelCacheKey(channel, listSignature);
 
-  // Check cache first, and only reuse when channel/list context is unchanged
-  if (!forceRefresh
-    && isSignatureCacheValid(cache[cacheKey], 'listSignature', listSignature)
-    && Array.isArray(cache[cacheKey].fetchedModels)) {
-    return {
-      models: cache[cacheKey].fetchedModels || [],
-      supported: true,
-      cached: true,
-      fallbackUsed: false,
-      error: null,
-      lastChecked: cache[cacheKey].lastChecked
-    };
-  }
+  // Reuse a fresh catalog immediately. Expired catalogs are also returned as
+  // stale data so opening the editor never blocks on the provider; the user
+  // can explicitly request a refresh.
+  const cachedResult = buildCachedModelListResult(cache[cacheKey], listSignature, forceRefresh);
+  if (cachedResult) return cachedResult;
 
   return new Promise((resolve) => {
+    const resolveFailure = (result) => {
+      saveModelListFailure(cache, cacheKey, listSignature, result);
+      resolve(result);
+    };
     try {
       const baseUrl = channel.baseUrl.trim().replace(/\/+$/, '');
       const endpoint = capability.modelListEndpoint; // e.g. '/v1/models'
@@ -1095,7 +1174,8 @@ async function fetchModelsFromProvider(channel, channelType, options = {}) {
                   availableModels: cache[cacheKey]?.availableModels || [],
                   preferredTestModel: cache[cacheKey]?.preferredTestModel || null,
                   probeSignature: cache[cacheKey]?.probeSignature || null,
-                  listSignature
+                  listSignature,
+                  modelListFailure: null
                 };
 
                 cache[cacheKey] = cacheEntry;
@@ -1113,7 +1193,7 @@ async function fetchModelsFromProvider(channel, channelType, options = {}) {
                 });
               } catch (parseError) {
                 console.error(`[ModelDetector] Failed to parse models response: ${parseError.message}`);
-                resolve({
+                resolveFailure({
                   models: [],
                   supported: true,
                   cached: false,
@@ -1133,7 +1213,7 @@ async function fetchModelsFromProvider(channel, channelType, options = {}) {
               errorMessage = 'Cloudflare 防护拦截，无法自动获取模型列表';
               errorHint = '该 API 端点受 Cloudflare 保护，请手动填写模型名称';
               console.warn(`[ModelDetector] Cloudflare protection detected for ${channel.name}, no fallback models injected`);
-              resolve({
+              resolveFailure({
                 models: [],
                 supported: false,
                 cached: false,
@@ -1146,7 +1226,7 @@ async function fetchModelsFromProvider(channel, channelType, options = {}) {
               errorMessage = 'API 密钥认证失败';
               errorHint = '请检查 API 密钥是否正确配置';
               console.error(`[ModelDetector] Authentication failed for ${channel.name}: ${res.statusCode} - ${errorMessage}`);
-              resolve({
+              resolveFailure({
                 models: [],
                 supported: true,
                 cached: false,
@@ -1159,7 +1239,7 @@ async function fetchModelsFromProvider(channel, channelType, options = {}) {
               errorMessage = '访问被拒绝';
               errorHint = '请检查 API 密钥权限或联系服务提供商';
               console.error(`[ModelDetector] Access denied for ${channel.name}: ${res.statusCode} - ${errorMessage}`);
-              resolve({
+              resolveFailure({
                 models: [],
                 supported: true,
                 cached: false,
@@ -1171,7 +1251,7 @@ async function fetchModelsFromProvider(channel, channelType, options = {}) {
             }
             } else if (res.statusCode === 404) {
               console.warn(`[ModelDetector] Model list endpoint not found for ${channel.name}`);
-              resolve({
+              resolveFailure({
                 models: [],
                 supported: false,
                 cached: false,
@@ -1182,7 +1262,7 @@ async function fetchModelsFromProvider(channel, channelType, options = {}) {
               });
             } else if (res.statusCode === 429) {
               console.warn(`[ModelDetector] Rate limited for ${channel.name}`);
-              resolve({
+              resolveFailure({
                 models: [],
                 supported: true,
                 cached: false,
@@ -1206,7 +1286,7 @@ async function fetchModelsFromProvider(channel, channelType, options = {}) {
           })
           .catch((error) => {
             console.error(`[ModelDetector] Failed to read models response: ${error.message}`);
-            resolve({
+            resolveFailure({
               models: [],
               supported: true,
               cached: false,
@@ -1218,7 +1298,7 @@ async function fetchModelsFromProvider(channel, channelType, options = {}) {
 
       req.on('error', (error) => {
         console.error(`[ModelDetector] Network error fetching models from ${channel.name}: ${error.message}`);
-        resolve({
+        resolveFailure({
           models: [],
           supported: true,
           cached: false,
@@ -1230,7 +1310,7 @@ async function fetchModelsFromProvider(channel, channelType, options = {}) {
       req.on('timeout', () => {
         req.destroy();
         console.error(`[ModelDetector] Timeout fetching models from ${channel.name}`);
-        resolve({
+        resolveFailure({
           models: [],
           supported: true,
           cached: false,
@@ -1243,7 +1323,7 @@ async function fetchModelsFromProvider(channel, channelType, options = {}) {
 
     } catch (error) {
       console.error(`[ModelDetector] Error in fetchModelsFromProvider: ${error.message}`);
-      resolve({
+      resolveFailure({
         models: [],
         supported: true,
         cached: false,

package/src/server/services/omp-auth-providers.js

@@ -351,6 +351,7 @@ function warmOmpAuthProviderSnapshot(options = {}) {
   try {
     const child = fork(workerPath, [], {
       stdio: ['ignore', 'ignore', 'ignore', 'ipc'],
+      windowsHide: true,
       env: {
         ...process.env,
         CC_TOOL_OMP_AUTH_PROVIDER_WORKER: '1'

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

@@ -229,6 +229,28 @@ function readTextFile(filePath, fallback = '') {
 }
 
 function getOmpStatus(env = process.env, options = {}) {
+  if (options.resolveRuntime === false) {
+    const paths = getOmpPaths(env, options);
+    return {
+      installed: fs.existsSync(paths.agentDir),
+      runtime: 'omp',
+      command: getOmpCommand(env),
+      commandSource: 'not-probed',
+      agentDir: paths.agentDir,
+      settingsPath: paths.settings,
+      authPath: paths.auth,
+      modelsPath: paths.modelsYml,
+      modelsYmlPath: paths.modelsYml,
+      modelsJsonLegacyPath: paths.modelsJsonLegacy,
+      sessionsDir: paths.sessions,
+      skillsDir: paths.skills,
+      promptsDir: paths.prompts,
+      commandsDir: paths.commands,
+      extensionsDir: paths.extensions,
+      themesDir: paths.themes,
+      packagesDir: paths.packages
+    };
+  }
   const runtime = resolveOmpRuntime(env, options);
   const paths = getOmpPaths(env, { ...options, runtime });
   return {

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

@@ -20,8 +20,11 @@ const THINKING_MODES = new Set([
 
 let lastManagedOmpSyncResult = null;
 
-function getOmpPaths(...args) {
-  return ompConfig.getOmpPaths(...args);
+function getOmpPaths(env = process.env, options = {}) {
+  // Channel CRUD only needs the native OMP file layout. Do not start OMP just
+  // to discover a path: OMP_CONFIG_DIR, OMP_PROFILE and OMP_CODING_AGENT_DIR
+  // are sufficient to derive it, and a blocked CLI must not block a save.
+  return ompConfig.getOmpPaths(env, { ...options, resolveRuntime: false });
 }
 
 function ensureOmpDir(...args) {
@@ -257,7 +260,8 @@ function readOmpCatalogModels(command, providerId, options = {}) {
       ...process.env,
       ...(options.env || {})
     },
-    timeout: options.catalogTimeout || 5000
+    timeout: options.catalogTimeout || 5000,
+    windowsHide: true
   });
   const status = result?.status === undefined || result?.status === null ? 0 : result.status;
   if (result?.error || status !== 0) return [];
@@ -270,6 +274,9 @@ function readOmpCatalogModels(command, providerId, options = {}) {
 }
 
 function buildCatalogIndex(channel = {}, options = {}) {
+  if (options.catalogFromCli !== true) {
+    return new Map();
+  }
   const runtime = options.runtime
     || (typeof ompConfig.resolveOmpRuntime === 'function'
       ? ompConfig.resolveOmpRuntime(options.env || process.env, options.runtimeOptions || {})
@@ -499,7 +506,8 @@ function runModelsJson(command, env, options = {}) {
       ...process.env,
       ...env
     },
-    timeout: options.timeout || 5000
+    timeout: options.timeout || 5000,
+    windowsHide: true
   });
   if (typeof result === 'string' || Buffer.isBuffer(result)) {
     return { status: 0, stdout: result, stderr: '' };
@@ -515,7 +523,8 @@ function collectVisibleProviderIds(command, env, options = {}) {
       ...process.env,
       ...env
     },
-    timeout: options.visibilityTimeout || options.timeout || 5000
+    timeout: options.visibilityTimeout || options.timeout || 5000,
+    windowsHide: true
   });
   const status = result?.status === undefined || result?.status === null ? 0 : result.status;
   if (result?.error || status !== 0) return [];
@@ -658,15 +667,17 @@ function collectManagedVisibility(channels = [], modelsConfig = { providers: {}
       }
     });
 
-  const env = options.env || process.env;
-  const runtime = options.runtime
-    || (typeof ompConfig.resolveOmpRuntime === 'function'
-      ? ompConfig.resolveOmpRuntime(env, options.runtimeOptions || {})
-      : null);
-  if (runtime && runtime.runtime === 'omp' && runtime.installed && options.discoverDisabledProviders !== false) {
-    collectVisibleProviderIds(runtime.command, env, options)
-      .filter(providerId => providerId && !isManagedProviderId(providerId))
-      .forEach(providerId => pushUnique(managedDisabledProviders, providerId));
+  if (options.discoverDisabledProviders === true) {
+    const env = options.env || process.env;
+    const runtime = options.runtime
+      || (typeof ompConfig.resolveOmpRuntime === 'function'
+        ? ompConfig.resolveOmpRuntime(env, options.runtimeOptions || {})
+        : null);
+    if (runtime && runtime.runtime === 'omp' && runtime.installed) {
+      collectVisibleProviderIds(runtime.command, env, options)
+        .filter(providerId => providerId && !isManagedProviderId(providerId))
+        .forEach(providerId => pushUnique(managedDisabledProviders, providerId));
+    }
   }
 
   return {
@@ -874,7 +885,9 @@ function writeManagedOmpProviders(channels = [], options = {}) {
   const backupPath = createModelsBackupIfNeeded(paths.modelsYml, options);
   writeModelsConfig(config, paths.modelsYml);
   const visibility = syncManagedOmpVisibility(channels, config, options);
-  const validation = validateOmpModelsConfig(options);
+  const validation = options.validateWithCli === true
+    ? validateOmpModelsConfig(options)
+    : { skipped: true, reason: 'cli-validation-disabled', warnings: [] };
   const warnings = [
     ...(visibility.warnings || []),
     ...(validation.warnings || [])
@@ -916,7 +929,9 @@ function removeManagedOmpProviders(options = {}) {
   if (before !== after) {
     backupPath = createModelsBackupIfNeeded(paths.modelsYml, options);
     writeModelsConfig(config, paths.modelsYml);
-    validation = validateOmpModelsConfig(options);
+    validation = options.validateWithCli === true
+      ? validateOmpModelsConfig(options)
+      : { skipped: true, reason: 'cli-validation-disabled', warnings: [] };
   }
   recordManagedOmpSyncResult({
     path: paths.modelsYml,

package/src/server/services/session-snapshots.js

@@ -46,6 +46,7 @@ function runSessionSnapshotWorker(source, projectName, config = {}, options = {}
     const workerPath = path.join(__dirname, 'session-snapshot-worker.js');
     const child = fork(workerPath, [], {
       stdio: ['ignore', 'ignore', 'pipe', 'ipc'],
+      windowsHide: true,
       env: {
         ...process.env,
         CC_TOOL_SESSION_SNAPSHOT_WORKER: '1'

package/src/server/services/sessions.js

@@ -17,6 +17,17 @@ const CLAUDE_PROJECTS_DIR = NATIVE_PATHS.claude.projects;
 const CODEX_PROJECTS_DIR = path.join(path.dirname(NATIVE_PATHS.codex.config), 'projects');
 const GEMINI_PROJECTS_DIR = path.join(path.dirname(NATIVE_PATHS.gemini.env), 'projects');
 
+function resolveProjectsDir(config = {}) {
+  return config.projectsDir || CLAUDE_PROJECTS_DIR;
+}
+
+function withResolvedProjectsDir(config = {}) {
+  return {
+    ...config,
+    projectsDir: resolveProjectsDir(config)
+  };
+}
+
 // Base directory for cc-tool data
 function getCcToolDir() {
   return PATHS.base;
@@ -182,7 +193,7 @@ function sliceClaudeSessionContentByUserMessage(content, afterUserMessageNumber)
 
 // Get all projects with stats (async version)
 async function getProjects(config) {
-  const projectsDir = config.projectsDir;
+  const projectsDir = resolveProjectsDir(config);
 
   if (!fs.existsSync(projectsDir)) {
     return [];
@@ -383,16 +394,17 @@ function extractCwdFromSessionHeader(sessionFile) {
 
 // Get projects with detailed stats (with caching) - async version
 async function getProjectsWithStats(config, options = {}) {
+  const resolvedConfig = withResolvedProjectsDir(config);
   if (!options.force) {
     // Check enhanced cache first
-    const cacheKey = `${CacheKeys.PROJECTS}${config.projectsDir}`;
+    const cacheKey = `${CacheKeys.PROJECTS}${resolvedConfig.projectsDir}`;
     const enhancedCached = globalCache.get(cacheKey);
     if (enhancedCached) {
       return enhancedCached;
     }
 
     // Check old cache
-    const cached = getCachedProjects(config);
+    const cached = getCachedProjects(resolvedConfig);
     if (cached) {
       globalCache.set(cacheKey, cached, 300000); // 5分钟
       return cached;
@@ -400,22 +412,22 @@ async function getProjectsWithStats(config, options = {}) {
   }
 
   try {
-    const data = await buildProjectsWithStats(config);
+    const data = await buildProjectsWithStats(resolvedConfig);
     if (!Array.isArray(data)) {
-      console.warn(`[getProjectsWithStats] Unexpected non-array result for ${config.projectsDir}, returning empty array.`);
+      console.warn(`[getProjectsWithStats] Unexpected non-array result for ${resolvedConfig.projectsDir}, returning empty array.`);
       return [];
     }
-    setCachedProjects(config, data);
-    globalCache.set(`${CacheKeys.PROJECTS}${config.projectsDir}`, data, 300000);
+    setCachedProjects(resolvedConfig, data);
+    globalCache.set(`${CacheKeys.PROJECTS}${resolvedConfig.projectsDir}`, data, 300000);
     return data;
   } catch (err) {
-    console.error(`[getProjectsWithStats] Failed to build projects for ${config.projectsDir}:`, err);
+    console.error(`[getProjectsWithStats] Failed to build projects for ${resolvedConfig.projectsDir}:`, err);
     return [];
   }
 }
 
 async function buildProjectsWithStats(config) {
-  const projectsDir = config.projectsDir;
+  const projectsDir = resolveProjectsDir(config);
 
   if (!fs.existsSync(projectsDir)) {
     return [];
@@ -482,7 +494,7 @@ async function buildProjectsWithStats(config) {
 
 // 获取 Claude 项目/会话数量（轻量统计）
 function getProjectAndSessionCounts(config) {
-  const projectsDir = config.projectsDir;
+  const projectsDir = resolveProjectsDir(config);
   if (!fs.existsSync(projectsDir)) {
     return { projectCount: 0, sessionCount: 0 };
   }
@@ -672,7 +684,8 @@ async function getSessionsForProject(config, projectName, options = {}) {
 
 // Delete a session
 function deleteSession(config, projectName, sessionId) {
-  const projectDir = path.join(config.projectsDir, projectName);
+  const resolvedConfig = withResolvedProjectsDir(config);
+  const projectDir = path.join(resolvedConfig.projectsDir, projectName);
   const sessionFile = path.join(projectDir, sessionId + '.jsonl');
 
   if (!fs.existsSync(sessionFile)) {
@@ -680,14 +693,15 @@ function deleteSession(config, projectName, sessionId) {
   }
 
   fs.unlinkSync(sessionFile);
-  invalidateProjectsCache(config);
+  invalidateProjectsCache(resolvedConfig);
   invalidateSessionResultCache(projectName);
   return { success: true };
 }
 
 // Fork a session
 function forkSession(config, projectName, sessionId, options = {}) {
-  const projectDir = path.join(config.projectsDir, projectName);
+  const resolvedConfig = withResolvedProjectsDir(config);
+  const projectDir = path.join(resolvedConfig.projectsDir, projectName);
   const sessionFile = path.join(projectDir, sessionId + '.jsonl');
 
   if (!fs.existsSync(sessionFile)) {
@@ -716,7 +730,7 @@ function forkSession(config, projectName, sessionId, options = {}) {
     const { setAlias } = require('./alias');
     setAlias(newSessionId, options.alias);
   }
-  invalidateProjectsCache(config);
+  invalidateProjectsCache(resolvedConfig);
   invalidateSessionResultCache(projectName);
 
   return {
@@ -768,7 +782,8 @@ function saveSessionOrder(projectName, order) {
 
 // Delete a project (remove the entire project directory)
 function deleteProject(config, projectName) {
-  const projectDir = path.join(config.projectsDir, projectName);
+  const resolvedConfig = withResolvedProjectsDir(config);
+  const projectDir = path.join(resolvedConfig.projectsDir, projectName);
 
   if (!fs.existsSync(projectDir)) {
     throw new Error('Project not found');
@@ -778,19 +793,20 @@ function deleteProject(config, projectName) {
   fs.rmSync(projectDir, { recursive: true, force: true });
 
   // Remove from order file if exists
-  const order = getProjectOrder(config);
+  const order = getProjectOrder(resolvedConfig);
   const newOrder = order.filter(name => name !== projectName);
   if (newOrder.length !== order.length) {
-    saveProjectOrder(config, newOrder);
+    saveProjectOrder(resolvedConfig, newOrder);
   }
 
-  invalidateProjectsCache(config);
+  invalidateProjectsCache(resolvedConfig);
   return { success: true };
 }
 
 // Search sessions for keyword
 function searchSessions(config, projectName, keyword, contextLength = 15) {
-  const projectDir = path.join(config.projectsDir, projectName);
+  const resolvedConfig = withResolvedProjectsDir(config);
+  const projectDir = path.join(resolvedConfig.projectsDir, projectName);
 
   if (!fs.existsSync(projectDir)) {
     return [];

package/src/server/services/web-build.js

@@ -101,7 +101,8 @@ function runWebBuild(options = {}) {
     const child = spawn(npmCommand, ['run', 'build'], {
       cwd: sourceRoot,
       env,
-      stdio
+      stdio,
+      windowsHide: true
     });
 
     child.once('error', (error) => {