coding-tool-x 3.7.0 → 3.7.2

package/src/server/services/config-sync-manager.js

@@ -30,7 +30,7 @@ const CLAUDE_CODE_DIR = NATIVE_PATHS.claude.dir || path.dirname(NATIVE_PATHS.cla
 const CODEX_DIR = path.join(HOME, '.codex');
 const GEMINI_DIR = path.join(HOME, '.gemini');
 const OPENCODE_DIR = NATIVE_PATHS.opencode.config;
-const PI_AGENT_DIR = NATIVE_PATHS.pi.dir;
+const OMP_AGENT_DIR = NATIVE_PATHS.omp.dir;
 const CODEX_CONFIG_PATH = NATIVE_PATHS.codex.config;
 
 // Config type definitions
@@ -47,8 +47,8 @@ const CONFIG_TYPES = {
     opencodeTarget: 'skills',
     opencodeLegacyTarget: 'skill',
     opencodeSupported: true,
-    piTarget: 'skills',
-    piSupported: true
+    ompTarget: 'skills',
+    ompSupported: true
   },
   commands: {
     isDirectory: false,
@@ -63,8 +63,8 @@ const CONFIG_TYPES = {
     opencodeTarget: 'commands',
     opencodeLegacyTarget: 'command',
     opencodeSupported: true,
-    piTarget: 'commands',
-    piSupported: true
+    ompTarget: 'commands',
+    ompSupported: true
   },
   agents: {
     isDirectory: false,
@@ -76,7 +76,7 @@ const CONFIG_TYPES = {
     opencodeTarget: 'agents',
     opencodeLegacyTarget: 'agent',
     opencodeSupported: true,
-    piSupported: false
+    ompSupported: false
   },
   plugins: {
     isDirectory: true,
@@ -86,8 +86,8 @@ const CONFIG_TYPES = {
     opencodeTarget: 'plugins',
     opencodeLegacyTarget: 'plugin',
     opencodeSupported: true,
-    piTarget: 'extensions',
-    piSupported: true
+    ompTarget: 'extensions',
+    ompSupported: true
   }
 };
 
@@ -99,7 +99,7 @@ class ConfigSyncManager {
     this.codexDir = CODEX_DIR;
     this.geminiDir = GEMINI_DIR;
     this.opencodeDir = OPENCODE_DIR;
-    this.piDir = PI_AGENT_DIR;
+    this.ompDir = OMP_AGENT_DIR;
     this.configTypes = CONFIG_TYPES;
   }
 
@@ -588,13 +588,13 @@ class ConfigSyncManager {
    * Sync a config item to OMP.
    * OMP treats commands as slash-command files and plugins as extensions/packages.
    */
-  syncToPi(type, name) {
+  syncToOmp(type, name) {
     const config = this.configTypes[type];
     if (!config) {
       return { success: false, error: `Unknown config type: ${type}` };
     }
 
-    if (!config.piSupported) {
+    if (!config.ompSupported) {
       console.log(`[ConfigSyncManager] ${type} not supported natively by OMP, skipping`);
       return { success: true, skipped: true, reason: 'Not supported natively by OMP' };
     }
@@ -610,7 +610,7 @@ class ConfigSyncManager {
       return { success: false, error: 'Source not found' };
     }
 
-    const targetPath = path.join(this.piDir, config.piTarget, safeName);
+    const targetPath = path.join(this.ompDir, config.ompTarget, safeName);
     try {
       if (config.isDirectory) {
         this._ensureDir(path.dirname(targetPath));
@@ -629,7 +629,7 @@ class ConfigSyncManager {
     }
   }
 
-  removeFromPi(type, name) {
+  removeFromOmp(type, name) {
     const config = this.configTypes[type];
     if (!config) {
       return { success: false, error: `Unknown config type: ${type}` };
@@ -640,11 +640,11 @@ class ConfigSyncManager {
       return { success: false, error: 'Invalid config item name' };
     }
 
-    if (!config.piSupported) {
+    if (!config.ompSupported) {
       return { success: true, skipped: true, reason: 'Not supported natively by OMP' };
     }
 
-    const targetPath = path.join(this.piDir, config.piTarget, safeName);
+    const targetPath = path.join(this.ompDir, config.ompTarget, safeName);
     if (!fs.existsSync(targetPath)) {
       return { success: true, message: 'Already removed' };
     }
@@ -654,7 +654,7 @@ class ConfigSyncManager {
         this._removeRecursive(targetPath);
       } else {
         fs.unlinkSync(targetPath);
-        this._cleanupEmptyParents(path.dirname(targetPath), path.join(this.piDir, config.piTarget));
+        this._cleanupEmptyParents(path.dirname(targetPath), path.join(this.ompDir, config.ompTarget));
       }
       console.log(`[ConfigSyncManager] Removed ${type}/${name} from OMP`);
       return { success: true };
@@ -667,7 +667,7 @@ class ConfigSyncManager {
   /**
    * Batch sync based on registry data
    * @param {string} type - Config type
-   * @param {Object} registryItems - Registry items { name: { enabled, platforms: { claude, codex, gemini, opencode, pi } } }
+   * @param {Object} registryItems - Registry items { name: { enabled, platforms: { claude, codex, gemini, opencode, omp } } }
    * @returns {Object} Results summary
    */
   syncAll(type, registryItems) {
@@ -753,17 +753,17 @@ class ConfigSyncManager {
           }
         }
 
-        if (platforms.pi) {
-          const result = this.syncToPi(type, name);
+        if (platforms.omp) {
+          const result = this.syncToOmp(type, name);
           if (result.success && !result.skipped) {
-            results.synced.push({ type, name, platform: 'pi' });
+            results.synced.push({ type, name, platform: 'omp' });
           } else if (!result.success) {
-            results.errors.push({ type, name, platform: 'pi', error: result.error });
+            results.errors.push({ type, name, platform: 'omp', error: result.error });
           }
         } else {
-          const result = this.removeFromPi(type, name);
+          const result = this.removeFromOmp(type, name);
           if (result.success && !result.message && !result.skipped) {
-            results.removed.push({ type, name, platform: 'pi' });
+            results.removed.push({ type, name, platform: 'omp' });
           }
         }
       } else {
@@ -788,9 +788,9 @@ class ConfigSyncManager {
           results.removed.push({ type, name, platform: 'opencode' });
         }
 
-        const piResult = this.removeFromPi(type, name);
-        if (piResult.success && !piResult.message && !piResult.skipped) {
-          results.removed.push({ type, name, platform: 'pi' });
+        const ompResult = this.removeFromOmp(type, name);
+        if (ompResult.success && !ompResult.message && !ompResult.skipped) {
+          results.removed.push({ type, name, platform: 'omp' });
         }
       }
     }

package/src/server/services/config-templates-service.js

@@ -25,7 +25,7 @@ const AI_CONFIG_MAP = {
   codex: { fileName: 'AGENTS.md', name: 'Codex' },
   gemini: { fileName: 'GEMINI.md', name: 'Gemini' },
   opencode: { fileName: '.opencode/AGENTS.md', name: 'OpenCode' },
-  pi: { fileName: null, name: 'OMP command templates' }
+  omp: { fileName: null, name: 'OMP command templates' }
 };
 
 const CLI_DEFAULT_AI_TYPE = {
@@ -33,7 +33,7 @@ const CLI_DEFAULT_AI_TYPE = {
   codex: 'codex',
   gemini: 'gemini',
   opencode: 'opencode',
-  pi: 'pi'
+  omp: 'omp'
 };
 
 /**
@@ -115,7 +115,7 @@ function normalizeAiConfigs(aiConfigs = {}, claudeMd = null) {
     codex: { enabled: false, content: '' },
     gemini: { enabled: false, content: '' },
     opencode: { enabled: false, content: '' },
-    pi: { enabled: false, content: '' }
+    omp: { enabled: false, content: '' }
   };
 
   for (const key of Object.keys(normalized)) {
@@ -374,7 +374,7 @@ function readCurrentConfig(targetDir) {
  */
 function getAvailableConfigs() {
   const agentPlatforms = ['claude', 'codex', 'gemini', 'opencode'];
-  const commandPlatforms = ['claude', 'codex', 'gemini', 'opencode', 'pi'];
+  const commandPlatforms = ['claude', 'codex', 'gemini', 'opencode', 'omp'];
   const agentMap = new Map();
   const commandMap = new Map();
   const agentsByPlatform = {};
@@ -428,7 +428,7 @@ function getAvailableConfigs() {
 
   // 按平台分别获取 skills（每个平台有独立的安装目录）
   const skillsByPlatform = {};
-  for (const platform of ['claude', 'codex', 'gemini', 'opencode', 'pi']) {
+  for (const platform of ['claude', 'codex', 'gemini', 'opencode', 'omp']) {
     const service = new SkillService(platform);
     skillsByPlatform[platform] = service.getInstalledSkills().map(skill => ({
       directory: skill.directory,
@@ -537,14 +537,14 @@ function writeYamlFile(filePath, data) {
   }), 'utf-8');
 }
 
-function mergePiProjectPackages(targetDir, plugins = []) {
+function mergeOmpProjectPackages(targetDir, plugins = []) {
   const packages = plugins.map(plugin => plugin.name).filter(Boolean);
   if (packages.length === 0) {
     return false;
   }
 
-  const piDir = path.join(targetDir, '.omp');
-  const settingsPath = path.join(piDir, 'config.yml');
+  const ompDir = path.join(targetDir, '.omp');
+  const settingsPath = path.join(ompDir, 'config.yml');
   let settings = {};
   if (fs.existsSync(settingsPath)) {
     try {
@@ -629,7 +629,7 @@ function convertToOmpMcpSpec(spec = {}) {
  * @param {string} targetDir - 目标项目目录
  * @param {string} templateId - 模板 ID
  * @param {object} options - 可选配置
- * @param {string|string[]} options.aiConfigTypes - 选择的 AI 配置类型数组: ['claude', 'codex', 'gemini', 'opencode', 'pi']
+ * @param {string|string[]} options.aiConfigTypes - 选择的 AI 配置类型数组: ['claude', 'codex', 'gemini', 'opencode', 'omp']
  * @param {string} options.aiConfigType - (兼容旧版) 单个 AI 配置类型
  */
 function applyTemplateToProject(targetDir, templateId, options = {}) {
@@ -697,7 +697,7 @@ function applyTemplateToProject(targetDir, templateId, options = {}) {
       if (aiConfigTypes.includes('codex')) {
         pushSkipped(results.skipped, 'agent', fileName, 'Codex agents 仅支持用户级配置，项目目录应用时已跳过');
       }
-      if (aiConfigTypes.includes('pi')) {
+      if (aiConfigTypes.includes('omp')) {
         pushSkipped(results.skipped, 'agent', fileName, 'OMP agents 需通过扩展或包提供，项目目录应用时已跳过');
       }
       if (written) {
@@ -720,8 +720,8 @@ function applyTemplateToProject(targetDir, templateId, options = {}) {
     if (aiConfigTypes.includes('gemini')) {
       commandTargets.push({ baseDir: path.join(targetDir, '.gemini', 'commands'), prefix: '.gemini/commands', format: 'gemini' });
     }
-    if (aiConfigTypes.includes('pi')) {
-      commandTargets.push({ baseDir: path.join(targetDir, '.omp', 'commands'), prefix: '.omp/commands', format: 'pi' });
+    if (aiConfigTypes.includes('omp')) {
+      commandTargets.push({ baseDir: path.join(targetDir, '.omp', 'commands'), prefix: '.omp/commands', format: 'omp' });
     }
 
     for (const target of commandTargets) {
@@ -758,7 +758,7 @@ function applyTemplateToProject(targetDir, templateId, options = {}) {
 
   if (template.plugins?.length > 0) {
     results.plugins.items = template.plugins.map(p => p.name);
-    if (aiConfigTypes.includes('opencode') || aiConfigTypes.includes('pi')) {
+    if (aiConfigTypes.includes('opencode') || aiConfigTypes.includes('omp')) {
       results.plugins.applied = template.plugins.length;
     } else {
       for (const plugin of template.plugins) {
@@ -768,11 +768,11 @@ function applyTemplateToProject(targetDir, templateId, options = {}) {
   }
 
   const hasMcp = template.mcpServers?.length > 0;
-  const writesGenericMcpConfig = hasMcp && aiConfigTypes.some(type => type !== 'pi');
-  const writesOmpMcpConfig = hasMcp && aiConfigTypes.includes('pi');
+  const writesGenericMcpConfig = hasMcp && aiConfigTypes.some(type => type !== 'omp');
+  const writesOmpMcpConfig = hasMcp && aiConfigTypes.includes('omp');
   const hasPluginsForOpenCode = aiConfigTypes.includes('opencode') && template.plugins?.length > 0;
-  const hasPluginsForPi = aiConfigTypes.includes('pi') && template.plugins?.length > 0;
-  if (hasMcp || hasPluginsForOpenCode || hasPluginsForPi) {
+  const hasPluginsForOmp = aiConfigTypes.includes('omp') && template.plugins?.length > 0;
+  if (hasMcp || hasPluginsForOpenCode || hasPluginsForOmp) {
     const mcpConfig = { mcpServers: {} };
     const ompMcpConfig = { mcpServers: {} };
     const opencodeConfig = { mcp: {}, plugin: [] };
@@ -825,8 +825,8 @@ function applyTemplateToProject(targetDir, templateId, options = {}) {
       writeJsonFile(opencodePath, opencodeConfig);
     }
 
-    if (hasPluginsForPi) {
-      mergePiProjectPackages(targetDir, template.plugins || []);
+    if (hasPluginsForOmp) {
+      mergeOmpProjectPackages(targetDir, template.plugins || []);
     }
   }
 
@@ -858,7 +858,7 @@ function applyTemplateToProject(targetDir, templateId, options = {}) {
  * @param {string} targetDir - 目标项目目录
  * @param {string} templateId - 模板 ID
  * @param {object} options - 可选配置
- * @param {string|string[]} options.aiConfigTypes - 选择的 AI 配置类型数组: ['claude', 'codex', 'gemini', 'opencode', 'pi']
+ * @param {string|string[]} options.aiConfigTypes - 选择的 AI 配置类型数组: ['claude', 'codex', 'gemini', 'opencode', 'omp']
  * @param {string} options.aiConfigType - (兼容旧版) 单个 AI 配置类型
  */
 function previewTemplateApplication(targetDir, templateId, options = {}) {
@@ -930,7 +930,7 @@ function previewTemplateApplication(targetDir, templateId, options = {}) {
       if (aiConfigTypes.includes('codex')) {
         pushSkipped(preview.skipped, 'agent', fileName, 'Codex agents 仅支持用户级配置，项目目录预览时已跳过');
       }
-      if (aiConfigTypes.includes('pi')) {
+      if (aiConfigTypes.includes('omp')) {
         pushSkipped(preview.skipped, 'agent', fileName, 'OMP agents 需通过扩展或包提供，项目目录预览时已跳过');
       }
       if (applicable) {
@@ -945,7 +945,7 @@ function previewTemplateApplication(targetDir, templateId, options = {}) {
     if (aiConfigTypes.includes('codex')) commandPrefixes.push('.codex/prompts');
     if (aiConfigTypes.includes('opencode')) commandPrefixes.push('.opencode/commands');
     if (aiConfigTypes.includes('gemini')) commandPrefixes.push('.gemini/commands');
-    if (aiConfigTypes.includes('pi')) commandPrefixes.push('.omp/commands');
+    if (aiConfigTypes.includes('omp')) commandPrefixes.push('.omp/commands');
 
     for (const command of template.commands) {
       const commandName = resolveItemName(command.name, null, 'command');
@@ -969,8 +969,8 @@ function previewTemplateApplication(targetDir, templateId, options = {}) {
     }
   }
 
-  const writesGenericMcpConfig = template.mcpServers?.length > 0 && aiConfigTypes.some(type => type !== 'pi');
-  const writesOmpMcpConfig = template.mcpServers?.length > 0 && aiConfigTypes.includes('pi');
+  const writesGenericMcpConfig = template.mcpServers?.length > 0 && aiConfigTypes.some(type => type !== 'omp');
+  const writesOmpMcpConfig = template.mcpServers?.length > 0 && aiConfigTypes.includes('omp');
   const allServers = mcpService.getAllServers();
   const presets = mcpService.getPresets();
   let resolvableMcpCount = 0;
@@ -1021,11 +1021,11 @@ function previewTemplateApplication(targetDir, templateId, options = {}) {
   }
 
   if (template.plugins?.length > 0) {
-    if (aiConfigTypes.includes('opencode') || aiConfigTypes.includes('pi')) {
+    if (aiConfigTypes.includes('opencode') || aiConfigTypes.includes('omp')) {
       preview.summary.plugins = template.plugins.length;
-      if (aiConfigTypes.includes('pi')) {
-        const piSettingsPath = path.join(targetDir, '.omp/config.yml');
-        if (fs.existsSync(piSettingsPath)) {
+      if (aiConfigTypes.includes('omp')) {
+        const ompSettingsPath = path.join(targetDir, '.omp/config.yml');
+        if (fs.existsSync(ompSettingsPath)) {
           preview.willOverwrite.push('.omp/config.yml');
         } else {
           preview.willCreate.push('.omp/config.yml');

package/src/server/services/mcp-service.js

@@ -28,8 +28,8 @@ const OPENCODE_CONFIG_PATHS = {
   json: path.join(OPENCODE_CONFIG_DIR, 'opencode.json'),
   legacy: path.join(OPENCODE_CONFIG_DIR, 'config.json')
 };
-const PI_MCP_CONFIG_PATH = NATIVE_PATHS.pi?.mcp
-  || path.join(NATIVE_PATHS.pi?.dir || path.join(HOME_DIR, '.omp', 'agent'), 'mcp.json');
+const OMP_MCP_CONFIG_PATH = NATIVE_PATHS.omp?.mcp
+  || path.join(NATIVE_PATHS.omp?.dir || path.join(HOME_DIR, '.omp', 'agent'), 'mcp.json');
 
 // MCP 客户端连接池
 // serverId -> { client, timestamp }
@@ -38,8 +38,8 @@ const POOL_TTL = 5 * 60 * 1000; // 5 minutes
 const STREAMABLE_HTTP_TYPE = 'streamable_http';
 const MCP_SERVER_TYPES = ['stdio', STREAMABLE_HTTP_TYPE, 'sse'];
 const REMOTE_MCP_SERVER_TYPES = [STREAMABLE_HTTP_TYPE, 'sse'];
-const MCP_PLATFORM_KEYS = ['claude', 'codex', 'gemini', 'opencode', 'pi'];
-const OMP_MCP_SCHEMA_URL = 'https://raw.githubusercontent.com/can1357/oh-my-pi/main/packages/coding-agent/src/config/mcp-schema.json';
+const MCP_PLATFORM_KEYS = ['claude', 'codex', 'gemini', 'opencode', 'omp'];
+const OMP_MCP_SCHEMA_URL = 'https://raw.githubusercontent.com/can1357/oh-my-omp/main/packages/coding-agent/src/config/mcp-schema.json';
 const OMP_SERVER_NAME_PATTERN = /^[a-zA-Z0-9_.-]{1,100}$/;
 
 function normalizeServerSpec(spec = {}) {
@@ -538,7 +538,7 @@ const DEFAULT_SERVER_APPS = {
   codex: false,
   gemini: false,
   opencode: false,
-  pi: false
+  omp: false
 };
 
 function normalizeServerApps(apps = {}, fallbackApps = DEFAULT_SERVER_APPS) {
@@ -547,7 +547,7 @@ function normalizeServerApps(apps = {}, fallbackApps = DEFAULT_SERVER_APPS) {
     codex: apps.codex !== undefined ? !!apps.codex : !!fallbackApps.codex,
     gemini: apps.gemini !== undefined ? !!apps.gemini : !!fallbackApps.gemini,
     opencode: apps.opencode !== undefined ? !!apps.opencode : !!fallbackApps.opencode,
-    pi: apps.pi !== undefined ? !!apps.pi : !!fallbackApps.pi
+    omp: apps.omp !== undefined ? !!apps.omp: !!fallbackApps.omp
   };
 }
 
@@ -763,7 +763,7 @@ async function syncServerToPlatform(server, platform) {
       case 'opencode':
         syncToOpenCodeConfig(server);
         break;
-      case 'pi':
+      case 'omp':
         syncToOmpMcpConfig(server);
         break;
     }
@@ -792,7 +792,7 @@ async function removeServerFromPlatform(serverId, platform) {
       case 'opencode':
         removeFromOpenCodeConfig(serverId);
         break;
-      case 'pi':
+      case 'omp':
         removeFromOmpMcpConfig(serverId);
         break;
     }
@@ -954,7 +954,7 @@ function validateOmpServerName(serverId) {
 }
 
 function readOmpMcpConfig() {
-  const config = readJsonFile(PI_MCP_CONFIG_PATH, { mcpServers: {} });
+  const config = readJsonFile(OMP_MCP_CONFIG_PATH, { mcpServers: {} });
   if (!config || typeof config !== 'object' || Array.isArray(config)) {
     return { mcpServers: {} };
   }
@@ -1059,14 +1059,14 @@ function syncToOmpMcpConfig(server) {
   validateOmpServerName(server.id);
   const config = readOmpMcpConfig();
   config.mcpServers[server.id] = convertToOmpMcpFormat(server.server);
-  writeJsonFile(PI_MCP_CONFIG_PATH, config);
+  writeJsonFile(OMP_MCP_CONFIG_PATH, config);
 }
 
 function removeFromOmpMcpConfig(serverId) {
   const config = readOmpMcpConfig();
   if (config.mcpServers && config.mcpServers[serverId]) {
     delete config.mcpServers[serverId];
-    writeJsonFile(PI_MCP_CONFIG_PATH, config);
+    writeJsonFile(OMP_MCP_CONFIG_PATH, config);
   }
 }
 
@@ -1231,7 +1231,7 @@ async function importFromPlatform(platform) {
     case 'opencode':
       importedCount = importFromOpenCode(servers);
       break;
-    case 'pi':
+    case 'omp':
       importedCount = importFromOmp(servers);
       break;
     default:
@@ -1389,8 +1389,8 @@ function importFromOmp(servers) {
 
     if (servers[id]) {
       servers[id].apps = normalizeServerApps(servers[id].apps);
-      if (!servers[id].apps.pi) {
-        servers[id].apps.pi = true;
+      if (!servers[id].apps.omp) {
+        servers[id].apps.omp = true;
         count++;
       }
     } else {
@@ -1398,7 +1398,7 @@ function importFromOmp(servers) {
         id,
         name: id,
         server: convertedSpec,
-        apps: { claude: false, codex: false, gemini: false, opencode: false, pi: true },
+        apps: { claude: false, codex: false, gemini: false, opencode: false, omp: true },
         createdAt: Date.now(),
         updatedAt: Date.now()
       };
@@ -1471,7 +1471,7 @@ function getStats() {
     codex: serverList.filter(s => s.apps?.codex).length,
     gemini: serverList.filter(s => s.apps?.gemini).length,
     opencode: serverList.filter(s => s.apps?.opencode).length,
-    pi: serverList.filter(s => s.apps?.pi).length
+    omp: serverList.filter(s => s.apps?.omp).length
   };
 }
 
@@ -1923,7 +1923,7 @@ function updateServerOrder(serverIds) {
 
 /**
  * 导出所有 MCP 配置
- * @param {string} format - 导出格式: 'json' | 'claude' | 'codex' | 'opencode' | 'gemini' | 'pi'
+ * @param {string} format - 导出格式: 'json' | 'claude' | 'codex' | 'opencode' | 'gemini' | 'omp'
  */
 function exportServers(format = 'json') {
   const servers = getAllServers();
@@ -1937,7 +1937,7 @@ function exportServers(format = 'json') {
       return exportForOpenCode(servers);
     case 'gemini':
       return exportForGemini(servers);
-    case 'pi':
+    case 'omp':
       return exportForOmp(servers);
     case 'json':
     default:
@@ -2045,14 +2045,14 @@ function exportForOmp(servers) {
   const mcpServers = {};
 
   for (const [id, server] of Object.entries(servers)) {
-    if (server.apps?.pi) {
+    if (server.apps?.omp) {
       validateOmpServerName(id);
       mcpServers[id] = convertToOmpMcpFormat(server.server);
     }
   }
 
   return {
-    format: 'pi',
+    format: 'omp',
     content: JSON.stringify({ $schema: OMP_MCP_SCHEMA_URL, mcpServers }, null, 2),
     filename: 'omp-mcp-config.json'
   };

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

@@ -95,6 +95,13 @@ function getModelPriority(channelType, options = {}) {
     console.warn(`[ModelDetector] Failed to load default models config: ${error.message}`);
   }
 
+  for (const toolType of candidateTypes) {
+    const models = MODEL_PRIORITY[toolType];
+    if (Array.isArray(models) && models.length > 0) {
+      return normalizeModelCandidates(models);
+    }
+  }
+
   return [];
 }
 
@@ -779,6 +786,12 @@ function buildChannelCacheSignature(channel, payload = {}) {
   return crypto.createHash('sha1').update(raw).digest('hex');
 }
 
+function getChannelCacheKey(channel, signature) {
+  const id = String(channel?.id || '').trim();
+  if (id) return id;
+  return `temporary:${signature}`;
+}
+
 function isSignatureCacheValid(cacheEntry, signatureKey, expectedSignature) {
   if (!cacheEntry || !signatureKey || !expectedSignature) return false;
   return cacheEntry[signatureKey] === expectedSignature;
@@ -846,7 +859,6 @@ async function probeModelAvailability(channel, channelType, options = {}) {
   const toolType = options.toolType;
   const stopOnFirstAvailable = !!options.stopOnFirstAvailable;
   const cache = loadModelCache();
-  const cacheKey = channel.id;
   const preferredModels = normalizeModelCandidates(options.preferredModels);
   const probeSignature = buildChannelCacheSignature(channel, {
     type: 'probe',
@@ -855,6 +867,7 @@ async function probeModelAvailability(channel, channelType, options = {}) {
     stopOnFirstAvailable,
     preferredModels
   });
+  const cacheKey = getChannelCacheKey(channel, probeSignature);
 
   // Return cached result if channel and probe options are unchanged
   if (!forceRefresh && isSignatureCacheValid(cache[cacheKey], 'probeSignature', probeSignature)) {
@@ -1007,11 +1020,11 @@ async function fetchModelsFromProvider(channel, channelType, options = {}) {
   }
 
   const cache = loadModelCache();
-  const cacheKey = channel.id;
   const listSignature = buildChannelCacheSignature(channel, {
     type: 'model-list',
     channelType: String(channelType || '').trim().toLowerCase()
   });
+  const cacheKey = getChannelCacheKey(channel, listSignature);
 
   // Check cache first, and only reuse when channel/list context is unchanged
   if (!forceRefresh