@adversity/coding-tool-x 3.0.6 → 3.1.1

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

@@ -7,15 +7,26 @@
 const fs = require('fs');
 const path = require('path');
 const os = require('os');
+const { NATIVE_PATHS } = require('../../config/paths');
 
 // Prompts 配置文件路径
-const CC_TOOL_DIR = path.join(os.homedir(), '.claude', 'cc-tool');
+const CC_TOOL_DIR = path.join(os.homedir(), '.cc-tool');
 const PROMPTS_FILE = path.join(CC_TOOL_DIR, 'prompts.json');
 
 // 各平台提示词文件路径
 const CLAUDE_PROMPT_PATH = path.join(os.homedir(), '.claude', 'CLAUDE.md');
 const CODEX_PROMPT_PATH = path.join(os.homedir(), '.codex', 'AGENTS.md');
 const GEMINI_PROMPT_PATH = path.join(os.homedir(), '.gemini', 'GEMINI.md');
+const OPENCODE_PROMPT_PATH = path.join(NATIVE_PATHS.opencode.config, 'AGENTS.md');
+
+function normalizeApps(apps = {}, defaults = { claude: true, codex: true, gemini: true, opencode: false }) {
+  return {
+    claude: apps.claude !== undefined ? !!apps.claude : defaults.claude,
+    codex: apps.codex !== undefined ? !!apps.codex : defaults.codex,
+    gemini: apps.gemini !== undefined ? !!apps.gemini : defaults.gemini,
+    opencode: apps.opencode !== undefined ? !!apps.opencode : defaults.opencode
+  };
+}
 
 // 内置模板（不是"默认"，只是可选模板）
 const BUILTIN_TEMPLATES = [
@@ -38,7 +49,7 @@ const BUILTIN_TEMPLATES = [
 2. 具体问题列表（按严重程度排序）
 3. 改进建议和示例代码
 `,
-    apps: { claude: true, codex: true, gemini: true },
+    apps: { claude: true, codex: true, gemini: true, opencode: true },
     isBuiltin: true
   },
   {
@@ -62,7 +73,7 @@ const BUILTIN_TEMPLATES = [
 - 建议的解决方案
 - 预防措施
 `,
-    apps: { claude: true, codex: true, gemini: true },
+    apps: { claude: true, codex: true, gemini: true, opencode: true },
     isBuiltin: true
   },
   {
@@ -85,7 +96,7 @@ const BUILTIN_TEMPLATES = [
 - 简化条件表达式
 - 消除重复代码
 `,
-    apps: { claude: true, codex: true, gemini: true },
+    apps: { claude: true, codex: true, gemini: true, opencode: true },
     isBuiltin: true
   }
 ];
@@ -198,7 +209,7 @@ function initPromptsData() {
         name: '当前使用',
         description: '从现有配置导入',
         content: existingContent,
-        apps: { claude: true, codex: false, gemini: false },
+        apps: normalizeApps({ claude: true, codex: false, gemini: false, opencode: false }),
         isBuiltin: false,
         isImported: true,
         createdAt: Date.now(),
@@ -212,6 +223,25 @@ function initPromptsData() {
     return initialData;
   }
 
+  let updated = false;
+  for (const preset of Object.values(data.presets || {})) {
+    const normalizedApps = normalizeApps(preset.apps);
+    if (
+      !preset.apps ||
+      preset.apps.claude !== normalizedApps.claude ||
+      preset.apps.codex !== normalizedApps.codex ||
+      preset.apps.gemini !== normalizedApps.gemini ||
+      preset.apps.opencode !== normalizedApps.opencode
+    ) {
+      preset.apps = normalizedApps;
+      updated = true;
+    }
+  }
+
+  if (updated) {
+    writeJsonFile(PROMPTS_FILE, data);
+  }
+
   return data;
 }
 
@@ -288,9 +318,7 @@ function savePreset(preset) {
   preset.updatedAt = Date.now();
 
   // 确保 apps 字段存在
-  if (!preset.apps) {
-    preset.apps = { claude: true, codex: true, gemini: true };
-  }
+  preset.apps = normalizeApps(preset.apps);
 
   data.presets[preset.id] = preset;
   writeJsonFile(PROMPTS_FILE, data);
@@ -359,7 +387,8 @@ async function deactivatePrompt() {
   const results = {
     claude: deleteFile(CLAUDE_PROMPT_PATH),
     codex: deleteFile(CODEX_PROMPT_PATH),
-    gemini: deleteFile(GEMINI_PROMPT_PATH)
+    gemini: deleteFile(GEMINI_PROMPT_PATH),
+    opencode: deleteFile(OPENCODE_PROMPT_PATH)
   };
 
   console.log('[Prompts] Deactivated and removed prompt files:', results);
@@ -375,7 +404,8 @@ async function deactivatePrompt() {
  * 同步预设到所有已启用的平台
  */
 async function syncPresetToAllPlatforms(preset) {
-  const { apps, content } = preset;
+  const apps = normalizeApps(preset.apps);
+  const { content } = preset;
 
   if (apps.claude) {
     writeTextFile(CLAUDE_PROMPT_PATH, content);
@@ -391,6 +421,11 @@ async function syncPresetToAllPlatforms(preset) {
     writeTextFile(GEMINI_PROMPT_PATH, content);
     console.log('[Prompts] Synced to Gemini:', GEMINI_PROMPT_PATH);
   }
+
+  if (apps.opencode) {
+    writeTextFile(OPENCODE_PROMPT_PATH, content);
+    console.log('[Prompts] Synced to OpenCode:', OPENCODE_PROMPT_PATH);
+  }
 }
 
 /**
@@ -404,6 +439,8 @@ function readPlatformPrompt(platform) {
       return readTextFile(CODEX_PROMPT_PATH, '');
     case 'gemini':
       return readTextFile(GEMINI_PROMPT_PATH, '');
+    case 'opencode':
+      return readTextFile(OPENCODE_PROMPT_PATH, '');
     default:
       throw new Error(`无效的平台: ${platform}`);
   }
@@ -428,6 +465,11 @@ function getPlatformStatus() {
       path: GEMINI_PROMPT_PATH,
       exists: fs.existsSync(GEMINI_PROMPT_PATH),
       content: readTextFile(GEMINI_PROMPT_PATH, '')
+    },
+    opencode: {
+      path: OPENCODE_PROMPT_PATH,
+      exists: fs.existsSync(OPENCODE_PROMPT_PATH),
+      content: readTextFile(OPENCODE_PROMPT_PATH, '')
     }
   };
 }
@@ -450,7 +492,7 @@ function importFromPlatform(platform, presetName) {
     name: presetName || `从 ${platform} 导入`,
     description: `从 ${platform} 导入的提示词`,
     content,
-    apps: { claude: false, codex: false, gemini: false },
+    apps: normalizeApps({ claude: false, codex: false, gemini: false, opencode: false }),
     isBuiltin: false,
     createdAt: Date.now(),
     updatedAt: Date.now()

package/src/server/services/proxy-runtime.js

@@ -3,7 +3,7 @@ const path = require('path');
 const os = require('os');
 
 function getRuntimeFilePath(proxyType) {
-  const ccToolDir = path.join(os.homedir(), '.claude', 'cc-tool');
+  const ccToolDir = path.join(os.homedir(), '.cc-tool');
   if (!fs.existsSync(ccToolDir)) {
     fs.mkdirSync(ccToolDir, { recursive: true });
   }

package/src/server/services/repo-scanner-base.js

@@ -42,7 +42,7 @@ class RepoScannerBase {
     this.fileExtension = options.fileExtension || '.md';
     this.defaultRepos = options.defaultRepos || [];
 
-    this.configDir = path.join(os.homedir(), '.claude', 'cc-tool');
+    this.configDir = path.join(os.homedir(), '.cc-tool');
     this.reposConfigPath = path.join(this.configDir, `${this.type}-repos.json`);
     this.cachePath = path.join(this.configDir, `${this.type}-cache.json`);
 

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

@@ -3,7 +3,7 @@ const path = require('path');
 const os = require('os');
 const crypto = require('crypto');
 
-const SECURITY_DIR = path.join(os.homedir(), '.claude', 'cc-tool');
+const SECURITY_DIR = path.join(os.homedir(), '.cc-tool');
 const SECURITY_FILE = path.join(SECURITY_DIR, 'security.json');
 
 const DEFAULT_SECURITY_CONFIG = {

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

@@ -11,7 +11,7 @@ let hasMessagesPersisted = {};
 let hasMessagesPersistTimer = null;
 
 function getCcToolDir() {
-  return path.join(os.homedir(), '.claude', 'cc-tool');
+  return path.join(os.homedir(), '.cc-tool');
 }
 
 function ensureDirExists(dir) {

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

@@ -19,22 +19,61 @@ const {
   convertSkillToCodex,
   convertSkillToClaude
 } = require('./format-converter');
+const { NATIVE_PATHS } = require('../../config/paths');
 
-// 默认仓库源 - 只预设官方仓库，其他由用户手动添加
-// directory 字段支持指定仓库子目录
-const DEFAULT_REPOS = [
-  { owner: 'anthropics', name: 'skills', branch: 'main', directory: '', enabled: true }
-];
+const SUPPORTED_PLATFORMS = ['claude', 'codex', 'opencode'];
+const OPENCODE_SKILL_NAME_REGEX = /^[a-z0-9]+(-[a-z0-9]+)*$/;
+
+function normalizePlatform(platform) {
+  return SUPPORTED_PLATFORMS.includes(platform) ? platform : 'claude';
+}
+
+function cloneRepos(repos = []) {
+  return repos.map(repo => ({ ...repo }));
+}
+
+const DEFAULT_REPOS_BY_PLATFORM = {
+  claude: [
+    { owner: 'anthropics', name: 'skills', branch: 'main', directory: '', enabled: true }
+  ],
+  codex: [
+    { owner: 'openai', name: 'skills', branch: 'main', directory: 'skills/.curated', enabled: true }
+  ],
+  opencode: [
+    { owner: 'darrenhinde', name: 'OpenAgentsControl', branch: 'main', directory: '.opencode/skill', enabled: true }
+  ]
+};
+
+const PLATFORM_CONFIG = {
+  claude: {
+    installDir: path.join(os.homedir(), '.claude', 'skills'),
+    reposFile: 'skill-repos.json',
+    cacheFile: 'skills-cache.json'
+  },
+  codex: {
+    installDir: path.join(os.homedir(), '.codex', 'skills'),
+    reposFile: 'codex-skill-repos.json',
+    cacheFile: 'codex-skills-cache.json'
+  },
+  opencode: {
+    installDir: path.join(NATIVE_PATHS.opencode.config, 'skills'),
+    reposFile: 'opencode-skill-repos.json',
+    cacheFile: 'opencode-skills-cache.json'
+  }
+};
 
 // 缓存有效期（5分钟）
 const CACHE_TTL = 5 * 60 * 1000;
 
 class SkillService {
-  constructor() {
-    this.installDir = path.join(os.homedir(), '.claude', 'skills');
-    this.configDir = path.join(os.homedir(), '.claude', 'cc-tool');
-    this.reposConfigPath = path.join(this.configDir, 'skill-repos.json');
-    this.cachePath = path.join(this.configDir, 'skills-cache.json');
+  constructor(platform = 'claude') {
+    this.platform = normalizePlatform(platform);
+    this.configDir = path.join(os.homedir(), '.cc-tool');
+
+    const platformConfig = PLATFORM_CONFIG[this.platform];
+    this.installDir = platformConfig.installDir;
+    this.reposConfigPath = path.join(this.configDir, platformConfig.reposFile);
+    this.cachePath = path.join(this.configDir, platformConfig.cacheFile);
 
     // 内存缓存
     this.skillsCache = null;
@@ -60,12 +99,14 @@ class SkillService {
     try {
       if (fs.existsSync(this.reposConfigPath)) {
         const data = JSON.parse(fs.readFileSync(this.reposConfigPath, 'utf-8'));
-        return data.repos || DEFAULT_REPOS;
+        if (Array.isArray(data.repos)) {
+          return data.repos;
+        }
       }
     } catch (err) {
       console.error('[SkillService] Load repos config error:', err.message);
     }
-    return DEFAULT_REPOS;
+    return cloneRepos(DEFAULT_REPOS_BY_PLATFORM[this.platform] || DEFAULT_REPOS_BY_PLATFORM.claude);
   }
 
   /**
@@ -624,6 +665,46 @@ class SkillService {
     };
   }
 
+  normalizeSkillDirectoryName(directory) {
+    if (!directory) return '';
+    return String(directory).replace(/\\/g, '/').split('/').pop();
+  }
+
+  validateOpenCodeSkillMetadata({ name, description }, directory) {
+    const expectedName = this.normalizeSkillDirectoryName(directory);
+    const normalizedName = typeof name === 'string' ? name.trim() : '';
+    const normalizedDescription = typeof description === 'string' ? description.trim() : '';
+
+    if (!expectedName) {
+      return '技能目录不能为空';
+    }
+    if (!normalizedName) {
+      return 'SKILL.md frontmatter 缺少 name';
+    }
+    if (!normalizedDescription) {
+      return 'SKILL.md frontmatter 缺少 description';
+    }
+    if (normalizedName.length < 1 || normalizedName.length > 64) {
+      return 'name 必须为 1-64 个字符';
+    }
+    if (!OPENCODE_SKILL_NAME_REGEX.test(normalizedName)) {
+      return 'name 必须为小写字母/数字，并使用单个连字符连接';
+    }
+    if (normalizedName !== expectedName) {
+      return `name 必须与目录名一致（期望: ${expectedName}）`;
+    }
+    if (normalizedDescription.length < 1 || normalizedDescription.length > 1024) {
+      return 'description 必须为 1-1024 个字符';
+    }
+
+    return null;
+  }
+
+  validateOpenCodeSkillContent(content, directory) {
+    const metadata = this.parseSkillMd(content);
+    return this.validateOpenCodeSkillMetadata(metadata, directory);
+  }
+
   /**
    * 转换技能格式
    * @param {string} content - 技能内容
@@ -799,6 +880,22 @@ class SkillService {
       fs.mkdirSync(dest, { recursive: true });
       this.copyDirRecursive(sourceDir, dest);
 
+      if (this.platform === 'codex') {
+        this.convertInstalledSkillToCodex(dest);
+      } else if (this.platform === 'opencode') {
+        const skillMdPath = path.join(dest, 'SKILL.md');
+        if (fs.existsSync(skillMdPath)) {
+          const validationError = this.validateOpenCodeSkillContent(
+            fs.readFileSync(skillMdPath, 'utf-8'),
+            directory
+          );
+          if (validationError) {
+            fs.rmSync(dest, { recursive: true, force: true });
+            throw new Error(`OpenCode skill 格式不符合要求: ${validationError}`);
+          }
+        }
+      }
+
       // 清除缓存，让列表刷新
       this.skillsCache = null;
       this.cacheTime = 0;
@@ -879,24 +976,73 @@ class SkillService {
     }
   }
 
+  /**
+   * 将安装后的 SKILL.md 转换为 Codex 兼容格式
+   */
+  convertInstalledSkillToCodex(skillDir) {
+    const skillMdPath = path.join(skillDir, 'SKILL.md');
+    if (!fs.existsSync(skillMdPath)) return;
+
+    try {
+      const content = fs.readFileSync(skillMdPath, 'utf-8');
+      const converted = convertSkillToCodex(content);
+      fs.writeFileSync(skillMdPath, converted.content, 'utf-8');
+    } catch (err) {
+      console.warn('[SkillService] Convert skill to codex format failed:', err.message);
+    }
+  }
+
   /**
    * 创建自定义技能
    */
   createCustomSkill({ name, directory, description, content }) {
     const dest = path.join(this.installDir, directory);
+    const normalizedDirectory = this.normalizeSkillDirectoryName(directory);
 
     // 检查是否已存在
     if (fs.existsSync(dest)) {
       throw new Error(`技能目录 "${directory}" 已存在`);
     }
 
+    if (this.platform === 'opencode') {
+      if (!OPENCODE_SKILL_NAME_REGEX.test(normalizedDirectory)) {
+        throw new Error('OpenCode skill 目录名必须是小写字母/数字，并使用单个连字符连接');
+      }
+    }
+
+    const normalizedDescription = (description || '').trim();
+    const skillName = this.platform === 'opencode'
+      ? normalizedDirectory
+      : (name || directory);
+
+    if (this.platform === 'opencode') {
+      const validationError = this.validateOpenCodeSkillMetadata(
+        {
+          name: skillName,
+          description: normalizedDescription
+        },
+        normalizedDirectory
+      );
+      if (validationError) {
+        throw new Error(`OpenCode skill 格式不符合要求: ${validationError}`);
+      }
+    }
+
     // 创建目录
     fs.mkdirSync(dest, { recursive: true });
 
     // 生成 SKILL.md 内容
-    const skillMdContent = `---
-name: "${name}"
-description: "${description}"
+    const skillMdContent = this.platform === 'opencode'
+      ? `---
+name: ${skillName}
+description: "${normalizedDescription}"
+---
+
+${content}
+`
+      : `---
+name: "${skillName}"
+description: "${normalizedDescription}"
 ---
 
 ${content}
@@ -905,6 +1051,10 @@ ${content}
     // 写入文件
     fs.writeFileSync(path.join(dest, 'SKILL.md'), skillMdContent, 'utf-8');
 
+    if (this.platform === 'codex') {
+      this.convertInstalledSkillToCodex(dest);
+    }
+
     // 清除缓存，让列表刷新
     this.skillsCache = null;
     this.cacheTime = 0;
@@ -920,6 +1070,7 @@ ${content}
    */
   createSkillWithFiles({ directory, files }) {
     const dest = path.join(this.installDir, directory);
+    const normalizedDirectory = this.normalizeSkillDirectoryName(directory);
 
     // 检查是否已存在
     if (fs.existsSync(dest)) {
@@ -934,6 +1085,21 @@ ${content}
       throw new Error('技能必须包含 SKILL.md 文件');
     }
 
+    if (this.platform === 'opencode') {
+      if (!OPENCODE_SKILL_NAME_REGEX.test(normalizedDirectory)) {
+        throw new Error('OpenCode skill 目录名必须是小写字母/数字，并使用单个连字符连接');
+      }
+
+      const skillMdFile = files.find(f => f.path === 'SKILL.md' || f.path.endsWith('/SKILL.md'));
+      const skillMdContent = skillMdFile
+        ? (skillMdFile.isBase64 ? Buffer.from(skillMdFile.content, 'base64').toString('utf-8') : skillMdFile.content)
+        : '';
+      const validationError = this.validateOpenCodeSkillContent(skillMdContent, normalizedDirectory);
+      if (validationError) {
+        throw new Error(`OpenCode skill 格式不符合要求: ${validationError}`);
+      }
+    }
+
     // 创建目录
     fs.mkdirSync(dest, { recursive: true });
 
@@ -956,6 +1122,10 @@ ${content}
       }
     }
 
+    if (this.platform === 'codex') {
+      this.convertInstalledSkillToCodex(dest);
+    }
+
     // 清除缓存
     this.skillsCache = null;
     this.cacheTime = 0;
@@ -1060,11 +1230,25 @@ ${content}
    */
   addSkillFiles(directory, files) {
     const skillPath = path.join(this.installDir, directory);
+    const normalizedDirectory = this.normalizeSkillDirectoryName(directory);
 
     if (!fs.existsSync(skillPath)) {
       throw new Error(`技能 "${directory}" 不存在`);
     }
 
+    if (this.platform === 'opencode') {
+      const incomingSkillMd = files.find(f => f.path === 'SKILL.md' || f.path.endsWith('/SKILL.md'));
+      if (incomingSkillMd) {
+        const content = incomingSkillMd.isBase64
+          ? Buffer.from(incomingSkillMd.content, 'base64').toString('utf-8')
+          : incomingSkillMd.content;
+        const validationError = this.validateOpenCodeSkillContent(content, normalizedDirectory);
+        if (validationError) {
+          throw new Error(`OpenCode skill 格式不符合要求: ${validationError}`);
+        }
+      }
+    }
+
     const added = [];
     for (const file of files) {
       const filePath = path.join(skillPath, file.path);
@@ -1137,6 +1321,7 @@ ${content}
    */
   updateSkillFile(directory, filePath, content, isBase64 = false) {
     const skillPath = path.join(this.installDir, directory);
+    const normalizedDirectory = this.normalizeSkillDirectoryName(directory);
 
     if (!fs.existsSync(skillPath)) {
       throw new Error(`技能 "${directory}" 不存在`);
@@ -1148,6 +1333,14 @@ ${content}
       throw new Error(`文件 "${filePath}" 不存在`);
     }
 
+    if (this.platform === 'opencode' && /(^|\/)SKILL\.md$/i.test(filePath)) {
+      const textContent = isBase64 ? Buffer.from(content, 'base64').toString('utf-8') : content;
+      const validationError = this.validateOpenCodeSkillContent(textContent, normalizedDirectory);
+      if (validationError) {
+        throw new Error(`OpenCode skill 格式不符合要求: ${validationError}`);
+      }
+    }
+
     if (isBase64) {
       fs.writeFileSync(fullPath, Buffer.from(content, 'base64'));
     } else {
@@ -1205,48 +1398,108 @@ ${content}
       };
     }
 
-    // 如果本地没有，尝试从缓存的技能列表中获取仓库信息
-    const cachedSkill = this.skillsCache?.find(s => s.directory === directory);
+    const normalizeRepoPath = (input = '') =>
+      String(input)
+        .replace(/\\/g, '/')
+        .replace(/^\/+/, '')
+        .replace(/\/+$/, '');
 
-    if (cachedSkill && cachedSkill.repoOwner && cachedSkill.repoName) {
-      // 从 GitHub 获取内容
-      try {
-        const repo = {
-          owner: cachedSkill.repoOwner,
-          name: cachedSkill.repoName,
-          branch: cachedSkill.repoBranch || 'main'
-        };
+    const parseRemoteSkillContent = (content, repo) => {
+      const metadata = this.parseSkillMd(content);
+      const bodyMatch = content.match(/^---\s*\n[\s\S]*?\n---\s*\n([\s\S]*)$/);
+      const body = bodyMatch ? bodyMatch[1].trim() : content;
 
-        // 获取文件树找到 SKILL.md 的 SHA
+      return {
+        directory,
+        name: metadata.name || directory,
+        description: metadata.description || '',
+        content: body,
+        fullContent: content,
+        installed: false,
+        source: 'github',
+        repoOwner: repo.owner,
+        repoName: repo.name
+      };
+    };
+
+    const tryLoadRemoteDetailFromRepo = async (repo, extraCandidateDirs = []) => {
+      try {
         const treeUrl = `https://api.github.com/repos/${repo.owner}/${repo.name}/git/trees/${repo.branch}?recursive=1`;
         const tree = await this.fetchGitHubApi(treeUrl);
+        if (!tree?.tree) return null;
 
-        const skillFile = tree.tree?.find(item =>
-          item.type === 'blob' && item.path === `${directory}/SKILL.md`
-        );
+        const normalizedDirectory = normalizeRepoPath(directory);
+        const candidateDirs = new Set();
+        candidateDirs.add(normalizedDirectory);
 
-        if (skillFile) {
-          const content = await this.fetchBlobContent(skillFile.sha, repo, skillFile.path);
-          const metadata = this.parseSkillMd(content);
+        for (const candidate of extraCandidateDirs) {
+          const normalized = normalizeRepoPath(candidate);
+          if (normalized) candidateDirs.add(normalized);
+        }
 
-          const bodyMatch = content.match(/^---\s*\n[\s\S]*?\n---\s*\n([\s\S]*)$/);
-          const body = bodyMatch ? bodyMatch[1].trim() : content;
+        if (repo.directory) {
+          candidateDirs.add(normalizeRepoPath(`${repo.directory}/${normalizedDirectory}`));
+        }
 
-          return {
-            directory,
-            name: metadata.name || directory,
-            description: metadata.description || '',
-            content: body,
-            fullContent: content,
-            installed: false,
-            source: 'github',
-            repoOwner: repo.owner,
-            repoName: repo.name
-          };
+        let skillFile = null;
+        for (const candidateDir of candidateDirs) {
+          if (!candidateDir) continue;
+          skillFile = tree.tree.find(item =>
+            item.type === 'blob' && item.path === `${candidateDir}/SKILL.md`
+          );
+          if (skillFile) break;
+        }
+
+        if (!skillFile) {
+          const targetBaseName = normalizedDirectory.split('/').pop();
+          skillFile = tree.tree.find(item => {
+            if (item.type !== 'blob' || !item.path.endsWith('/SKILL.md')) return false;
+            const parts = item.path.split('/');
+            const parentDir = parts.length >= 2 ? parts[parts.length - 2] : '';
+            return parentDir === targetBaseName;
+          });
         }
+
+        if (!skillFile) return null;
+
+        const content = await this.fetchBlobContent(skillFile.sha, repo, skillFile.path);
+        return parseRemoteSkillContent(content, repo);
       } catch (err) {
         console.warn('[SkillService] Fetch remote skill detail error:', err.message);
+        return null;
       }
+    };
+
+    // 先尝试使用缓存中的 repo 信息（最快）
+    const cachedSkill = this.skillsCache?.find(s => s.directory === directory);
+    if (cachedSkill && cachedSkill.repoOwner && cachedSkill.repoName) {
+      const cachedRepo = {
+        owner: cachedSkill.repoOwner,
+        name: cachedSkill.repoName,
+        branch: cachedSkill.repoBranch || 'main',
+        directory: cachedSkill.repoDirectory || ''
+      };
+
+      const detail = await tryLoadRemoteDetailFromRepo(cachedRepo, [
+        cachedSkill.fullDirectory || '',
+        cachedSkill.repoDirectory ? `${cachedSkill.repoDirectory}/${directory}` : ''
+      ]);
+      if (detail) return detail;
+    }
+
+    // 缓存缺失或过期时，回退到遍历仓库配置，避免详情页报错
+    const repos = this.loadRepos().filter(repo => repo.enabled !== false);
+    for (const repo of repos) {
+      const detail = await tryLoadRemoteDetailFromRepo(
+        {
+          owner: repo.owner,
+          name: repo.name,
+          branch: repo.branch || 'main',
+          directory: repo.directory || ''
+        },
+        [repo.directory ? `${repo.directory}/${directory}` : '']
+      );
+      if (detail) return detail;
     }
 
     throw new Error('技能不存在或无法获取');
@@ -1264,5 +1517,6 @@ ${content}
 
 module.exports = {
   SkillService,
-  DEFAULT_REPOS
+  DEFAULT_REPOS: DEFAULT_REPOS_BY_PLATFORM.claude,
+  DEFAULT_REPOS_BY_PLATFORM
 };