coding-tool-x 3.8.4 → 3.8.5

package/src/config/loader.js

@@ -86,6 +86,42 @@ function isDefaultProjectsDir(projectsDir) {
   return previous === '.claude' && last === 'projects' && !fs.existsSync(normalized);
 }
 
+function normalizeSpeedTestModels(value) {
+  if (!value || typeof value !== 'object' || Array.isArray(value)) return {};
+  return Object.fromEntries(
+    Object.entries(value)
+      .map(([key, modelId]) => [String(key).trim(), typeof modelId === 'string' ? modelId.trim() : ''])
+      .filter(([key, modelId]) => key && modelId)
+  );
+}
+
+function isPlainObject(value) {
+  return value !== null && typeof value === 'object' && !Array.isArray(value);
+}
+
+function normalizeNativeCliLogs(value, fallback = DEFAULT_CONFIG.nativeCliLogs) {
+  const defaultConfig = isPlainObject(fallback) ? fallback : DEFAULT_CONFIG.nativeCliLogs;
+  const defaultInput = isPlainObject(defaultConfig.omp) ? defaultConfig.omp : defaultConfig;
+  const legacyOmp = isPlainObject(value?.omp) ? value.omp : {};
+  const input = isPlainObject(value) && !isPlainObject(value.omp) ? value : legacyOmp;
+  const fallbackEnabled = typeof defaultInput.enabled === 'boolean' ? defaultInput.enabled : true;
+  const fallbackInterval = Number.isInteger(defaultInput.intervalSeconds)
+    && defaultInput.intervalSeconds >= 1
+    && defaultInput.intervalSeconds <= 60
+    ? defaultInput.intervalSeconds
+    : 5;
+  const intervalSeconds = Number.isInteger(input.intervalSeconds)
+    && input.intervalSeconds >= 1
+    && input.intervalSeconds <= 60
+    ? input.intervalSeconds
+    : fallbackInterval;
+
+  return {
+    enabled: typeof input.enabled === 'boolean' ? input.enabled : fallbackEnabled,
+    intervalSeconds
+  };
+}
+
 function normalizeConfigForSave(config = {}) {
   const normalized = { ...config };
   if (isDefaultProjectsDir(normalized.projectsDir)) {
@@ -93,36 +129,29 @@ function normalizeConfigForSave(config = {}) {
   } else if (typeof normalized.projectsDir === 'string') {
     normalized.projectsDir = collapseHome(normalized.projectsDir);
   }
+  normalized.defaultSpeedTestModels = mergeDefaultSpeedTestModels(
+    DEFAULT_CONFIG.defaultSpeedTestModels,
+    normalized.defaultSpeedTestModels
+  );
+  if (Object.prototype.hasOwnProperty.call(normalized, 'nativeCliLogs')) {
+    normalized.nativeCliLogs = normalizeNativeCliLogs(normalized.nativeCliLogs);
+  }
+  // Model pricing is maintained only in modelMetadataOverrides.
+  delete normalized.pricing;
   return normalized;
 }
 
-function mergePricing(defaultPricing, overrides = {}) {
-  const merged = {};
-  Object.keys(defaultPricing).forEach((key) => {
-    merged[key] = {
-      ...defaultPricing[key],
-      ...(overrides && overrides[key] ? overrides[key] : {})
-    };
-    if (!merged[key].mode) {
-      merged[key].mode = 'auto';
-    }
-  });
-  return merged;
-}
-
 function mergeDefaultModels(defaultModels, overrides = {}) {
-  const merged = {};
-  Object.keys(defaultModels).forEach((key) => {
-    // If user config has this tool type, use it; otherwise use default
-    merged[key] = (overrides && overrides[key]) ? overrides[key] : defaultModels[key];
-  });
-  return merged;
+  return {
+    ...(defaultModels || {}),
+    ...(overrides || {})
+  };
 }
 
 function mergeDefaultSpeedTestModels(defaultModels, overrides = {}) {
   return {
-    ...defaultModels,
-    ...(overrides || {})
+    ...normalizeSpeedTestModels(defaultModels),
+    ...normalizeSpeedTestModels(overrides)
   };
 }
 
@@ -167,12 +196,18 @@ function loadConfig() {
 
       // 合并 ports 配置
       config.ports = { ...DEFAULT_CONFIG.ports, ...userConfig.ports };
-      config.pricing = mergePricing(DEFAULT_CONFIG.pricing, userConfig.pricing);
+      // Ignore the removed platform-level pricing configuration. Per-model
+      // pricing belongs in modelMetadataOverrides and is resolved centrally.
+      delete config.pricing;
       config.defaultModels = mergeDefaultModels(DEFAULT_CONFIG.defaultModels, userConfig.defaultModels);
       config.defaultSpeedTestModels = mergeDefaultSpeedTestModels(
         DEFAULT_CONFIG.defaultSpeedTestModels,
         userConfig.defaultSpeedTestModels
       );
+      config.nativeCliLogs = normalizeNativeCliLogs(
+        userConfig.nativeCliLogs,
+        DEFAULT_CONFIG.nativeCliLogs
+      );
 
       // 确保有 currentProject，使用 defaultProject 作为 currentProject
       if (!config.currentProject && config.defaultProject) {
@@ -188,7 +223,8 @@ function loadConfig() {
   const defaultConfig = {
     ...DEFAULT_CONFIG,
     projectsDir: resolveClaudeProjectsDir(),
-    currentProject: DEFAULT_CONFIG.defaultProject
+    currentProject: DEFAULT_CONFIG.defaultProject,
+    nativeCliLogs: normalizeNativeCliLogs(DEFAULT_CONFIG.nativeCliLogs)
   };
   eventBus.emitSync('config:loaded', { config: defaultConfig });
   return defaultConfig;
@@ -218,6 +254,7 @@ module.exports = {
   expandHome,
   resolveClaudeProjectsDir,
   normalizeConfigForSave,
+  normalizeNativeCliLogs,
   isDefaultProjectsDir,
   getConfigFilePath
 };

package/src/config/model-metadata.js

@@ -16,6 +16,12 @@ const DEFAULT_SPEED_TEST_MODELS = metadataConfig.defaultSpeedTestModels || {
   codex: 'gpt-5.4',
   gemini: 'gemini-2.5-pro'
 };
+const METADATA_LAST_UPDATED = metadataConfig.lastUpdated || '2026-03-06';
+const METADATA_SOURCE = {
+  name: metadataConfig.source || 'models.dev',
+  url: metadataConfig.sourceUrl || 'https://models.dev/api.json',
+  lastUpdated: METADATA_LAST_UPDATED
+};
 
 function normalizeNonEmptyString(value) {
   if (typeof value !== 'string') return null;
@@ -38,7 +44,7 @@ function loadMetadataConfigFromFile() {
 
 /**
  * Resolve model metadata (limit + pricing) for a given model ID.
- * Supports: exact match -> alias match -> prefix match -> generic Claude fallback
+ * Supports: alias match -> exact match -> prefix match
  *
  * @param {string} modelId
  * @returns {{ limit: {context, output}, pricing: {input, output, cacheCreation?, cacheRead?} } | null}
@@ -47,12 +53,7 @@ function resolveModelMetadata(modelId) {
   if (!modelId) return null;
   const id = String(modelId).toLowerCase().trim();
 
-  // Exact match
-  for (const [key, meta] of Object.entries(MODEL_METADATA)) {
-    if (id === key.toLowerCase()) return meta;
-  }
-
-  // Alias match -> canonical
+  // Alias match preserves legacy IDs even when the source also lists them.
   for (const [alias, canonical] of Object.entries(MODEL_ALIASES)) {
     if (id === alias.toLowerCase()) {
       const meta = MODEL_METADATA[canonical];
@@ -60,17 +61,14 @@ function resolveModelMetadata(modelId) {
     }
   }
 
-  // Prefix match
+  // Exact match
   for (const [key, meta] of Object.entries(MODEL_METADATA)) {
-    if (id.startsWith(key.toLowerCase())) return meta;
+    if (id === key.toLowerCase()) return meta;
   }
 
-  // Generic fallback for unknown Claude models
-  if (id.startsWith('claude-')) {
-    return {
-      limit: { context: 200000, output: 32000 },
-      pricing: { input: 3, output: 15, cacheCreation: 3.75, cacheRead: 0.3 }
-    };
+  // Prefix match
+  for (const [key, meta] of Object.entries(MODEL_METADATA)) {
+    if (id.startsWith(key.toLowerCase())) return meta;
   }
 
   return null;
@@ -90,64 +88,55 @@ function getAllModelIds() {
   return Object.keys(MODEL_METADATA);
 }
 
+function getModelIdsByToolType(toolType) {
+  const requested = String(toolType || '').trim().toLowerCase();
+  const key = requested === 'openai_compatible' ? 'opencode' : requested;
+  if (!key) return [];
+
+  return Object.entries(MODEL_METADATA)
+    .filter(([id, meta]) => {
+      if (Array.isArray(meta.toolTypes)) return meta.toolTypes.includes(key);
+      if (key === 'claude') return id.toLowerCase().startsWith('claude-');
+      if (key === 'codex') return /^(gpt-|o[134](?:-|$))/i.test(id);
+      if (key === 'gemini') return id.toLowerCase().startsWith('gemini-');
+      return false;
+    })
+    .map(([id]) => id);
+}
+
 function getDefaultModels() {
-  return {
-    claude: [...(DEFAULT_MODELS.claude || [])],
-    codex: [...(DEFAULT_MODELS.codex || [])],
-    gemini: [...(DEFAULT_MODELS.gemini || [])]
-  };
+  return Object.fromEntries(Object.entries(DEFAULT_MODELS).map(([key, models]) => [
+    key,
+    Array.isArray(models) ? [...models] : []
+  ]));
 }
 
 function getDefaultModelsByToolType(toolType) {
   const key = String(toolType || '').trim().toLowerCase();
-  if (key === 'openai_compatible') return [...(DEFAULT_MODELS.codex || [])];
-  if (key === 'claude' || key === 'codex' || key === 'gemini') {
-    return [...(DEFAULT_MODELS[key] || [])];
-  }
-  return [];
+  const alias = key === 'openai_compatible' ? 'codex' : key;
+  return Array.isArray(DEFAULT_MODELS[alias]) ? [...DEFAULT_MODELS[alias]] : [];
 }
 
 function getDefaultSpeedTestModels() {
   const fileConfig = loadMetadataConfigFromFile();
-  const raw = fileConfig.defaultSpeedTestModels || DEFAULT_SPEED_TEST_MODELS;
-  return {
-    claude: normalizeNonEmptyString(raw.claude) || DEFAULT_SPEED_TEST_MODELS.claude,
-    codex: normalizeNonEmptyString(raw.codex) || DEFAULT_SPEED_TEST_MODELS.codex,
-    gemini: normalizeNonEmptyString(raw.gemini) || DEFAULT_SPEED_TEST_MODELS.gemini
-  };
+  const configured = fileConfig?.defaultSpeedTestModels;
+  const raw = configured && typeof configured === 'object' && !Array.isArray(configured)
+    ? configured
+    : DEFAULT_SPEED_TEST_MODELS;
+  return Object.fromEntries(
+    Object.entries({ ...DEFAULT_SPEED_TEST_MODELS, ...raw })
+      .map(([key, value]) => [key, normalizeNonEmptyString(value)])
+      .filter(([, value]) => value)
+  );
 }
 
 function getDefaultSpeedTestModelByToolType(toolType) {
   const key = String(toolType || '').trim().toLowerCase();
+  const alias = key === 'openai_compatible' ? 'codex' : key;
   const defaults = getDefaultSpeedTestModels();
-  if (key === 'openai_compatible') return defaults.codex;
-  if (key === 'claude' || key === 'codex' || key === 'gemini') {
-    return defaults[key];
-  }
-  return defaults.codex;
+  return defaults[alias] || defaults.codex || null;
 }
 
-function saveDefaultSpeedTestModels(nextDefaults) {
-  const current = loadMetadataConfigFromFile();
-  const merged = {
-    ...getDefaultSpeedTestModels(),
-    ...(nextDefaults || {})
-  };
-
-  const normalized = {
-    claude: normalizeNonEmptyString(merged.claude) || DEFAULT_SPEED_TEST_MODELS.claude,
-    codex: normalizeNonEmptyString(merged.codex) || DEFAULT_SPEED_TEST_MODELS.codex,
-    gemini: normalizeNonEmptyString(merged.gemini) || DEFAULT_SPEED_TEST_MODELS.gemini
-  };
-
-  const nextConfig = {
-    ...current,
-    defaultSpeedTestModels: normalized
-  };
-  fs.writeFileSync(METADATA_FILE_PATH, `${JSON.stringify(nextConfig, null, 2)}\n`, 'utf8');
-  metadataConfig.defaultSpeedTestModels = normalized;
-  return normalized;
-}
 
 module.exports = {
   MODEL_METADATA,
@@ -158,10 +147,11 @@ module.exports = {
   resolveModelLimit,
   resolveModelPricing,
   getAllModelIds,
+  getModelIdsByToolType,
   getDefaultModels,
   getDefaultModelsByToolType,
   getDefaultSpeedTestModels,
   getDefaultSpeedTestModelByToolType,
-  saveDefaultSpeedTestModels,
-  METADATA_LAST_UPDATED: metadataConfig.lastUpdated || '2026-03-06'
+  METADATA_LAST_UPDATED,
+  METADATA_SOURCE
 };