@adversity/coding-tool-x 3.1.2 → 3.1.3

package/src/server/opencode-proxy-server.js

@@ -13,12 +13,12 @@ const { recordSuccess, recordFailure } = require('./services/channel-health');
 const { loadConfig } = require('../config/loader');
 const DEFAULT_CONFIG = require('../config/default');
 const { PATHS, ensureStorageDirMigrated } = require('../config/paths');
-const { resolvePricing } = require('./utils/pricing');
+const { resolveModelPricing } = require('./utils/pricing');
+const { getDefaultSpeedTestModelByToolType } = require('../config/model-metadata');
 const { recordRequest: recordOpenCodeRequest } = require('./services/opencode-statistics-service');
 const { saveProxyStartTime, clearProxyStartTime, getProxyStartTime, getProxyRuntime } = require('./services/proxy-runtime');
 const { getEnabledChannels, getEffectiveApiKey } = require('./services/opencode-channels');
-const { probeModelAvailability, fetchModelsFromProvider, getCachedModelInfo } = require('./services/model-detector');
-const { CLAUDE_MODEL_PRICING } = require('../config/model-pricing');
+const { fetchModelsFromProvider, getCachedModelInfo } = require('./services/model-detector');
 
 let proxyServer = null;
 let proxyApp = null;
@@ -32,7 +32,7 @@ const requestMetadata = new Map();
 const printedRedirectCache = new Map();
 
 // OpenAI 模型定价（每百万 tokens 的价格，单位：美元）
-// Claude 模型使用 config/model-pricing.js 中的集中定价
+// 作为 model-metadata 未覆盖时的兜底值
 const PRICING = {
   'gpt-4o': { input: 2.5, output: 10 },
   'gpt-4o-2024-11-20': { input: 2.5, output: 10 },
@@ -174,61 +174,33 @@ function resolveOpenCodeTarget(baseUrl = '', requestPath = '') {
  * 计算请求成本
  */
 function calculateCost(model, tokens) {
-  let pricing;
-
-  // 首先检查是否是 Claude 模型，使用集中定价
-  if (model.startsWith('claude-') || model.toLowerCase().includes('claude')) {
-    pricing = CLAUDE_MODEL_PRICING[model];
-
-    // 如果没有精确匹配，尝试模糊匹配 Claude 模型
-    if (!pricing) {
-      const modelLower = model.toLowerCase();
-      // 查找最接近的 Claude 模型
-      for (const [key, value] of Object.entries(CLAUDE_MODEL_PRICING)) {
-        if (key.toLowerCase().includes(modelLower) || modelLower.includes(key.toLowerCase())) {
-          pricing = value;
-          break;
-        }
-      }
-    }
-
-    // 如果仍然没有找到，使用默认 Sonnet 定价
-    if (!pricing) {
-      pricing = CLAUDE_MODEL_PRICING['claude-sonnet-4-5-20250929'];
-    }
-  } else {
-    // 非 Claude 模型，使用 PRICING 对象（OpenAI 等）
-    pricing = PRICING[model];
-
-    // 如果没有精确匹配，尝试模糊匹配
-    if (!pricing) {
-      const modelLower = model.toLowerCase();
-      if (modelLower.includes('gpt-4o-mini')) {
-        pricing = PRICING['gpt-4o-mini'];
-      } else if (modelLower.includes('gpt-4o')) {
-        pricing = PRICING['gpt-4o'];
-      } else if (modelLower.includes('gpt-4')) {
-        pricing = PRICING['gpt-4'];
-      } else if (modelLower.includes('gpt-3.5')) {
-        pricing = PRICING['gpt-3.5-turbo'];
-      } else if (modelLower.includes('o1-mini')) {
-        pricing = PRICING['o1-mini'];
-      } else if (modelLower.includes('o1-pro')) {
-        pricing = PRICING['o1-pro'];
-      } else if (modelLower.includes('o1')) {
-        pricing = PRICING['o1'];
-      } else if (modelLower.includes('o3-mini')) {
-        pricing = PRICING['o3-mini'];
-      } else if (modelLower.includes('o3')) {
-        pricing = PRICING['o3'];
-      } else if (modelLower.includes('o4-mini')) {
-        pricing = PRICING['o4-mini'];
-      }
+  let fallbackPricing = PRICING[model];
+  if (!fallbackPricing) {
+    const modelLower = String(model || '').toLowerCase();
+    if (modelLower.includes('gpt-4o-mini')) {
+      fallbackPricing = PRICING['gpt-4o-mini'];
+    } else if (modelLower.includes('gpt-4o')) {
+      fallbackPricing = PRICING['gpt-4o'];
+    } else if (modelLower.includes('gpt-4')) {
+      fallbackPricing = PRICING['gpt-4'];
+    } else if (modelLower.includes('gpt-3.5')) {
+      fallbackPricing = PRICING['gpt-3.5-turbo'];
+    } else if (modelLower.includes('o1-mini')) {
+      fallbackPricing = PRICING['o1-mini'];
+    } else if (modelLower.includes('o1-pro')) {
+      fallbackPricing = PRICING['o1-pro'];
+    } else if (modelLower.includes('o1')) {
+      fallbackPricing = PRICING['o1'];
+    } else if (modelLower.includes('o3-mini')) {
+      fallbackPricing = PRICING['o3-mini'];
+    } else if (modelLower.includes('o3')) {
+      fallbackPricing = PRICING['o3'];
+    } else if (modelLower.includes('o4-mini')) {
+      fallbackPricing = PRICING['o4-mini'];
     }
   }
 
-  // 默认使用基础定价
-  pricing = resolvePricing('opencode', pricing, OPENCODE_BASE_PRICING);
+  const pricing = resolveModelPricing('opencode', model, fallbackPricing, OPENCODE_BASE_PRICING);
   const inputRate = typeof pricing.input === 'number' ? pricing.input : OPENCODE_BASE_PRICING.input;
   const outputRate = typeof pricing.output === 'number' ? pricing.output : OPENCODE_BASE_PRICING.output;
   const cacheCreationRate = typeof pricing.cacheCreation === 'number' ? pricing.cacheCreation : inputRate * 1.25;
@@ -357,6 +329,17 @@ function normalizeGatewaySourceType(channel) {
   return 'codex';
 }
 
+function isConverterEntryChannel(channel) {
+  const presetId = String(channel?.presetId || '').trim().toLowerCase();
+  return presetId === 'entry_claude' || presetId === 'entry_codex' || presetId === 'entry_gemini';
+}
+
+function getDefaultModelsByGatewaySourceType(gatewaySourceType) {
+  if (gatewaySourceType === 'claude') return [getDefaultSpeedTestModelByToolType('claude')];
+  if (gatewaySourceType === 'gemini') return [getDefaultSpeedTestModelByToolType('gemini')];
+  return [getDefaultSpeedTestModelByToolType('codex')];
+}
+
 function mapStainlessOs() {
   switch (process.platform) {
     case 'darwin':
@@ -408,47 +391,6 @@ function isChatCompletionsPath(pathname) {
   return normalized.endsWith('/v1/chat/completions') || normalized.endsWith('/chat/completions');
 }
 
-function collectPreferredProbeModels(channel) {
-  const candidates = [];
-  if (!channel || typeof channel !== 'object') return candidates;
-
-  candidates.push(channel.model);
-  candidates.push(channel.speedTestModel);
-
-  const modelConfig = channel.modelConfig;
-  if (modelConfig && typeof modelConfig === 'object') {
-    candidates.push(modelConfig.model);
-    candidates.push(modelConfig.opusModel);
-    candidates.push(modelConfig.sonnetModel);
-    candidates.push(modelConfig.haikuModel);
-  }
-
-  if (Array.isArray(channel.modelRedirects)) {
-    channel.modelRedirects.forEach((rule) => {
-      candidates.push(rule?.from);
-      candidates.push(rule?.to);
-    });
-  }
-
-  const seen = new Set();
-  const models = [];
-  candidates.forEach((model) => {
-    if (typeof model !== 'string') return;
-    const trimmed = model.trim();
-    if (!trimmed) return;
-    const key = trimmed.toLowerCase();
-    if (seen.has(key)) return;
-    seen.add(key);
-    models.push(trimmed);
-  });
-  return models;
-}
-
-function isConverterPresetChannel(channel) {
-  const presetId = String(channel?.presetId || '').trim().toLowerCase();
-  return presetId === 'entry_claude' || presetId === 'entry_codex' || presetId === 'entry_gemini';
-}
-
 function extractTextFragments(value, fragments) {
   if (value === null || value === undefined) return;
   if (typeof value === 'string') {
@@ -4826,10 +4768,15 @@ async function collectProxyModelList(channels = [], options = {}) {
   };
 
   const forceRefresh = options.forceRefresh === true;
-  const probePreferredModels = options.probePreferredModels === true;
   const useCacheOnly = options.useCacheOnly === true;
   // 模型列表聚合改为串行探测，避免并发触发上游会话窗口限流
   for (const channel of channels) {
+    if (isConverterEntryChannel(channel)) {
+      const defaults = getDefaultModelsByGatewaySourceType(normalizeGatewaySourceType(channel));
+      defaults.forEach(add);
+      continue;
+    }
+
     if (useCacheOnly) {
       const cacheEntry = getCachedModelInfo(channel?.id);
       const cachedFetched = Array.isArray(cacheEntry?.fetchedModels) ? cacheEntry.fetchedModels : [];
@@ -4845,30 +4792,7 @@ async function collectProxyModelList(channels = [], options = {}) {
       const listedModels = Array.isArray(listResult?.models) ? listResult.models : [];
       if (listedModels.length > 0) {
         listedModels.forEach(add);
-        // 默认沿用 /v1/models 结果；仅在显式要求时继续探测默认模型。
-        if (!probePreferredModels) {
-          continue;
-        }
       }
-
-      const shouldProbeByDefault = !!listResult?.disabledByConfig;
-
-      // 默认仅入口转换器渠道执行模型探测；若已禁用 /v1/models 则对全部渠道启用默认探测。
-      // 当显式要求 probePreferredModels 时，无论 /v1/models 是否返回都执行默认模型探测。
-      if (!probePreferredModels && !shouldProbeByDefault && !isConverterPresetChannel(channel)) {
-        continue;
-      }
-
-      const channelType = normalizeGatewaySourceType(channel);
-      // eslint-disable-next-line no-await-in-loop
-      const probe = await probeModelAvailability(channel, channelType, {
-        forceRefresh,
-        stopOnFirstAvailable: false,
-        toolType: 'opencode',
-        preferredModels: collectPreferredProbeModels(channel)
-      });
-      const available = Array.isArray(probe?.availableModels) ? probe.availableModels : [];
-      available.forEach(add);
     } catch (err) {
       console.warn(`[OpenCode Proxy] Build model list failed for ${channel?.name || channel?.id || 'unknown'}:`, err.message);
     }

package/src/server/proxy-server.js

@@ -8,12 +8,11 @@ const { recordSuccess, recordFailure } = require('./services/channel-health');
 const { broadcastLog, broadcastSchedulerState } = require('./websocket-server');
 const { loadConfig } = require('../config/loader');
 const DEFAULT_CONFIG = require('../config/default');
-const { resolvePricing, resolveModelPricing } = require('./utils/pricing');
+const { resolveModelPricing } = require('./utils/pricing');
 const { recordRequest } = require('./services/statistics-service');
 const { saveProxyStartTime, clearProxyStartTime, getProxyStartTime, getProxyRuntime } = require('./services/proxy-runtime');
 const { createDecodedStream } = require('./services/response-decoder');
 const eventBus = require('../plugins/event-bus');
-const { CLAUDE_MODEL_PRICING } = require('../config/model-pricing');
 const { getEffectiveApiKey } = require('./services/channels');
 
 let proxyServer = null;
@@ -95,8 +94,7 @@ function redirectModel(originalModel, channel) {
  * @returns {number} 成本（美元）
  */
 function calculateCost(model, tokens) {
-  const hardcodedPricing = CLAUDE_MODEL_PRICING[model] || {};
-  const pricing = resolveModelPricing('claude', model, hardcodedPricing, CLAUDE_BASE_PRICING);
+  const pricing = resolveModelPricing('claude', model, {}, CLAUDE_BASE_PRICING);
 
   const inputRate = typeof pricing.input === 'number' ? pricing.input : CLAUDE_BASE_PRICING.input;
   const outputRate = typeof pricing.output === 'number' ? pricing.output : CLAUDE_BASE_PRICING.output;

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

@@ -12,9 +12,6 @@ const { RepoScannerBase } = require('./repo-scanner-base');
 const { NATIVE_PATHS } = require('../../config/paths');
 const {
   parseCommandContent,
-  detectCommandFormat,
-  convertCommandToCodex,
-  convertCommandToClaude,
   parseFrontmatter
 } = require('./format-converter');
 
@@ -569,32 +566,6 @@ class CommandsService {
 
   // ==================== 格式转换 ====================
 
-  /**
-   * 转换命令格式
-   * @param {string} content - 命令内容
-   * @param {string} targetFormat - 目标格式 ('claude' | 'codex')
-   */
-  convertCommandFormat(content, targetFormat) {
-    const sourceFormat = detectCommandFormat(content);
-
-    if (sourceFormat === targetFormat) {
-      return { content, warnings: [], format: targetFormat };
-    }
-
-    if (targetFormat === 'codex') {
-      return convertCommandToCodex(content);
-    } else {
-      return convertCommandToClaude(content);
-    }
-  }
-
-  /**
-   * 检测命令格式
-   * @param {string} content - 命令内容
-   */
-  detectFormat(content) {
-    return detectCommandFormat(content);
-  }
 }
 
 module.exports = {

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

@@ -28,6 +28,7 @@ const BUILTIN_TEMPLATES = [
     id: 'full-stack',
     name: '全栈开发',
     description: '前后端全栈开发配置，包含代码编辑、文档查询、版本控制等常用工具',
+    cliType: 'claude',
     // 兼容旧字段
     claudeMd: { enabled: false, content: '' },
     // 新的多 AI 配置
@@ -159,6 +160,7 @@ You are an experienced full-stack developer focused on delivering high-quality c
     id: 'architecture',
     name: '方案设计',
     description: '专注于技术方案设计、架构评审、系统设计，适合需求分析和技术决策场景',
+    cliType: 'claude',
     claudeMd: { enabled: false, content: '' },
     aiConfigs: {
       claude: {
@@ -308,6 +310,7 @@ You are a senior technical architect focused on system design and technical plan
     id: 'code-review',
     name: '代码审查',
     description: '专注于代码审查、质量评估、安全检查，适合 PR Review 和代码质量改进',
+    cliType: 'claude',
     claudeMd: { enabled: false, content: '' },
     aiConfigs: {
       claude: {
@@ -467,6 +470,7 @@ For each issue:
     id: 'minimal',
     name: '最小配置',
     description: '纯净环境，不添加任何额外配置，适合已有完善配置的项目',
+    cliType: 'claude',
     claudeMd: { enabled: false, content: '' },
     aiConfigs: {
       claude: { enabled: false, content: '' },
@@ -619,6 +623,7 @@ function createCustomTemplate(template) {
     id,
     name: template.name,
     description: template.description || '',
+    cliType: template.cliType || 'claude',
     claudeMd: template.claudeMd || { enabled: false, content: '' },
     aiConfigs: normalizeAiConfigs(template.aiConfigs, template.claudeMd),
     skills: template.skills || [],
@@ -651,6 +656,7 @@ function updateCustomTemplate(id, updates) {
   custom[index] = {
     ...custom[index],
     ...updates,
+    cliType: updates.cliType !== undefined ? updates.cliType : (custom[index].cliType || 'claude'),
     aiConfigs: normalizeAiConfigs(updates.aiConfigs || custom[index].aiConfigs, updates.claudeMd || custom[index].claudeMd),
     id: custom[index].id, // 保持 ID 不变
     isBuiltin: false,
@@ -971,12 +977,15 @@ function applyTemplateToProject(targetDir, templateId, options = {}) {
     }
   }
 
-  // 2. 写入 Agents
+  // 2. 写入 Agents（根据选中的 AI 类型决定写入哪些目录）
   if (template.agents?.length > 0) {
-    const agentTargets = [
-      { baseDir: path.join(targetDir, '.claude', 'agents'), prefix: '.claude/agents' },
-      { baseDir: path.join(targetDir, '.opencode', 'agents'), prefix: '.opencode/agents' }
-    ];
+    const agentTargets = [];
+    if (aiConfigTypes.includes('claude')) {
+      agentTargets.push({ baseDir: path.join(targetDir, '.claude', 'agents'), prefix: '.claude/agents' });
+    }
+    if (aiConfigTypes.includes('opencode')) {
+      agentTargets.push({ baseDir: path.join(targetDir, '.opencode', 'agents'), prefix: '.opencode/agents' });
+    }
 
     for (const target of agentTargets) {
       ensureDir(target.baseDir);
@@ -994,12 +1003,15 @@ function applyTemplateToProject(targetDir, templateId, options = {}) {
     }
   }
 
-  // 3. 写入 Commands
+  // 3. 写入 Commands（根据选中的 AI 类型决定写入哪些目录）
   if (template.commands?.length > 0) {
-    const commandTargets = [
-      { baseDir: path.join(targetDir, '.claude', 'commands'), prefix: '.claude/commands' },
-      { baseDir: path.join(targetDir, '.opencode', 'commands'), prefix: '.opencode/commands' }
-    ];
+    const commandTargets = [];
+    if (aiConfigTypes.includes('claude')) {
+      commandTargets.push({ baseDir: path.join(targetDir, '.claude', 'commands'), prefix: '.claude/commands' });
+    }
+    if (aiConfigTypes.includes('opencode')) {
+      commandTargets.push({ baseDir: path.join(targetDir, '.opencode', 'commands'), prefix: '.opencode/commands' });
+    }
 
     for (const target of commandTargets) {
       ensureDir(target.baseDir);
@@ -1189,16 +1201,16 @@ function previewTemplateApplication(targetDir, templateId, options = {}) {
     preview.summary.skills = template.skills.length;
   }
 
-  // 检查 Agents
+  // 检查 Agents（根据选中的 AI 类型决定预览哪些目录）
   if (template.agents?.length > 0) {
+    const agentPrefixes = [];
+    if (aiConfigTypes.includes('claude')) agentPrefixes.push('.claude/agents');
+    if (aiConfigTypes.includes('opencode')) agentPrefixes.push('.opencode/agents');
+
     for (const agent of template.agents) {
       const fileName = agent.fileName || agent.name.toLowerCase().replace(/\s+/g, '-');
-      const relativePaths = [
-        `.claude/agents/${fileName}.md`,
-        `.opencode/agents/${fileName}.md`
-      ];
-
-      for (const relativePath of relativePaths) {
+      for (const prefix of agentPrefixes) {
+        const relativePath = `${prefix}/${fileName}.md`;
         const fullPath = path.join(targetDir, relativePath);
         if (fs.existsSync(fullPath)) {
           preview.willOverwrite.push(relativePath);
@@ -1210,19 +1222,17 @@ function previewTemplateApplication(targetDir, templateId, options = {}) {
     }
   }
 
-  // 检查 Commands
+  // 检查 Commands（根据选中的 AI 类型决定预览哪些目录）
   if (template.commands?.length > 0) {
+    const commandPrefixes = [];
+    if (aiConfigTypes.includes('claude')) commandPrefixes.push('.claude/commands');
+    if (aiConfigTypes.includes('opencode')) commandPrefixes.push('.opencode/commands');
+
     for (const command of template.commands) {
-      const relativePaths = [
-        command.namespace
-          ? `.claude/commands/${command.namespace}/${command.name}.md`
-          : `.claude/commands/${command.name}.md`,
-        command.namespace
-          ? `.opencode/commands/${command.namespace}/${command.name}.md`
-          : `.opencode/commands/${command.name}.md`
-      ];
-
-      for (const relativePath of relativePaths) {
+      for (const prefix of commandPrefixes) {
+        const relativePath = command.namespace
+          ? `${prefix}/${command.namespace}/${command.name}.md`
+          : `${prefix}/${command.name}.md`;
         const fullPath = path.join(targetDir, relativePath);
         if (fs.existsSync(fullPath)) {
           preview.willOverwrite.push(relativePath);

package/src/server/services/env-checker.js

@@ -8,6 +8,7 @@
 const fs = require('fs');
 const path = require('path');
 const os = require('os');
+const crypto = require('crypto');
 
 // 各平台需要检测的环境变量关键词
 const PLATFORM_KEYWORDS = {
@@ -92,8 +93,10 @@ function checkEnvConflicts(platform = null) {
   // 3. 检测系统配置文件
   conflicts.push(...checkSystemConfigs(keywords));
 
-  // 去重（同一变量可能在多处定义）
-  return deduplicateConflicts(conflicts);
+  // 去重 + 只保留“真实冲突”（同名变量在多个来源且值不一致）
+  const deduplicated = deduplicateConflicts(conflicts);
+  const realConflicts = filterRealConflicts(deduplicated);
+  return sanitizeConflicts(realConflicts);
 }
 
 /**
@@ -122,6 +125,7 @@ function checkProcessEnv(keywords) {
       conflicts.push({
         varName: key,
         varValue: maskSensitiveValue(value),
+        valueFingerprint: hashValue(value),
         sourceType: 'process',
         sourcePath: 'Process Environment',
         platform: detectPlatform(key)
@@ -204,6 +208,7 @@ function parseConfigFile(filePath, keywords) {
           conflicts.push({
             varName,
             varValue: maskSensitiveValue(normalizedValue),
+            valueFingerprint: hashValue(normalizedValue),
             sourceType: 'file',
             sourcePath: `${filePath}:${i + 1}`,
             filePath,
@@ -235,17 +240,17 @@ function parseConfigFile(filePath, keywords) {
 function matchesKeywords(varName, keywords) {
   const upperName = varName.toUpperCase();
 
-  // 首先检查是否包含平台关键词
-  const hasKeyword = keywords.some(keyword => upperName.includes(keyword));
-  if (!hasKeyword) {
-    return false;
-  }
-
   // 检查是否精确匹配已知敏感变量
   if (EXACT_SENSITIVE_VARS.includes(upperName)) {
     return true;
   }
 
+  // 首先检查是否命中平台关键词（按 token 匹配，避免 OPENAI2 误判为 OPENAI）
+  const hasKeyword = keywords.some(keyword => matchesKeywordToken(upperName, keyword));
+  if (!hasKeyword) {
+    return false;
+  }
+
   // 检查是否以敏感后缀结尾
   const hasSensitiveSuffix = SENSITIVE_PATTERNS.some(suffix =>
     upperName.endsWith(suffix)
@@ -254,6 +259,16 @@ function matchesKeywords(varName, keywords) {
   return hasSensitiveSuffix;
 }
 
+function matchesKeywordToken(varName, keyword) {
+  const token = String(keyword || '').trim().toUpperCase();
+  if (!token) return false;
+
+  return varName === token ||
+    varName.startsWith(`${token}_`) ||
+    varName.endsWith(`_${token}`) ||
+    varName.includes(`_${token}_`);
+}
+
 /**
  * 检测变量属于哪个平台
  */
@@ -298,6 +313,56 @@ function maskSensitiveValue(value) {
   return value.substring(0, 4) + '****' + value.substring(value.length - 4);
 }
 
+function hashValue(value) {
+  return crypto
+    .createHash('sha256')
+    .update(String(value ?? ''), 'utf8')
+    .digest('hex');
+}
+
+function filterRealConflicts(conflicts) {
+  const grouped = new Map();
+
+  for (const conflict of conflicts) {
+    const key = String(conflict.varName || '').toUpperCase();
+    if (!grouped.has(key)) {
+      grouped.set(key, []);
+    }
+    grouped.get(key).push(conflict);
+  }
+
+  const results = [];
+  for (const group of grouped.values()) {
+    if (group.length < 2) {
+      continue;
+    }
+
+    const sourceCount = new Set(group.map(item => item.sourcePath)).size;
+    if (sourceCount < 2) {
+      continue;
+    }
+
+    const valueVariants = new Set(
+      group
+        .map(item => item.valueFingerprint)
+        .filter(Boolean)
+    );
+
+    // 同名变量在多个来源但值一致，不算冲突
+    if (valueVariants.size <= 1) {
+      continue;
+    }
+
+    results.push(...group);
+  }
+
+  return results;
+}
+
+function sanitizeConflicts(conflicts) {
+  return conflicts.map(({ valueFingerprint, ...rest }) => rest);
+}
+
 /**
  * 去重冲突列表
  */

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

@@ -703,46 +703,55 @@ class PluginsService {
   getRepos() {
     const repos = [];
     const seenRepos = new Set();
+    const pushRepo = (repo) => {
+      if (!repo || !repo.owner || !repo.name) return;
+      const key = `${repo.owner}/${repo.name}`;
+      if (seenRepos.has(key)) return;
+      repos.push(repo);
+      seenRepos.add(key);
+    };
+    const parseRepoUrl = (url) => {
+      if (!url || typeof url !== 'string') return null;
+      const match = url.match(/github\.com\/([^\/]+)\/([^\/\.]+)/);
+      if (!match) return null;
+      return { owner: match[1], name: match[2], url };
+    };
 
     // 1. Load our own config
     const config = this.loadReposConfig();
     for (const repo of config.repos || []) {
-      const key = `${repo.owner}/${repo.name}`;
-      if (!seenRepos.has(key)) {
-        repos.push(repo);
-        seenRepos.add(key);
-      }
+      pushRepo(repo);
     }
 
     // 2. Load Claude Code's native marketplace config (Claude only)
     if (!this._isOpenCode() && fs.existsSync(CLAUDE_MARKETPLACES_FILE)) {
       try {
         const marketplaces = JSON.parse(fs.readFileSync(CLAUDE_MARKETPLACES_FILE, 'utf8'));
-
-        for (const [marketplaceName, marketplaceData] of Object.entries(marketplaces)) {
-          if (marketplaceData.source && marketplaceData.source.url) {
-            const url = marketplaceData.source.url;
-            const match = url.match(/github\.com\/([^\/]+)\/([^\/\.]+)/);
-
-            if (match) {
-              const [, owner, name] = match;
-              const key = `${owner}/${name}`;
-
-              if (!seenRepos.has(key)) {
-                repos.push({
-                  owner,
-                  name,
-                  url,
-                  branch: 'main', // Default branch
-                  enabled: true,
-                  source: 'claude-native',
-                  lastUpdated: marketplaceData.lastUpdated
-                });
-                seenRepos.add(key);
-              }
-            }
+        const entries = [];
+        if (Array.isArray(marketplaces)) {
+          entries.push(...marketplaces.map(item => ({ key: '', data: item })));
+        } else if (marketplaces && typeof marketplaces === 'object') {
+          entries.push(...Object.entries(marketplaces).map(([key, data]) => ({ key, data })));
+          if (Array.isArray(marketplaces.marketplaces)) {
+            entries.push(...marketplaces.marketplaces.map(item => ({ key: item?.name || '', data: item })));
           }
         }
+
+        for (const { key, data } of entries) {
+          const sourceUrl = data?.source?.url || data?.url || data?.repoUrl || data?.repository;
+          const parsed = parseRepoUrl(sourceUrl);
+          if (!parsed) continue;
+          pushRepo({
+            owner: parsed.owner,
+            name: parsed.name,
+            url: parsed.url,
+            branch: data?.source?.branch || data?.branch || 'main',
+            enabled: data?.enabled !== false,
+            source: 'claude-native',
+            marketplace: key || data?.name || '',
+            lastUpdated: data?.lastUpdated
+          });
+        }
       } catch (err) {
         console.error('[PluginsService] Failed to read known_marketplaces.json:', err.message);
       }