coding-tool-x 3.7.7 → 3.7.8

package/dist/web/index.html

@@ -5,7 +5,7 @@
     <link rel="icon" href="/favicon.ico">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>coding-tool-x · AI 编程工作台</title>
-    <script type="module" crossorigin src="/assets/index-DxkAvn4g.js"></script>
+    <script type="module" crossorigin src="/assets/index-CeTaG4IX.js"></script>
     <link rel="modulepreload" crossorigin href="/assets/markdown-BNJfEgCA.js">
     <link rel="modulepreload" crossorigin href="/assets/vue-vendor-B5RqjEjQ.js">
     <link rel="modulepreload" crossorigin href="/assets/naive-ui-CVyvdmg1.js">

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "coding-tool-x",
-  "version": "3.7.7",
+  "version": "3.7.8",
   "description": "Vibe Coding 增强工作助手 - 智能会话管理、动态渠道切换、全局搜索、实时监控",
   "main": "src/index.js",
   "bin": {

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/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-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,