@noob-stupid/dsh-plugin-console 0.3.28 → 0.3.31

package/lib/index.js

@@ -621,8 +621,24 @@ const DEFAULT_SOURCES = {
     { id: 'github', name: 'GitHub', type: 'builtin' },
     { id: 'gitee', name: 'Gitee', type: 'builtin' },
   ],
+  // 市场静态索引源（按主→备依次尝试；内网可整体替换为自建镜像，实现完全离线的市场浏览）
+  indexSources: [
+    { id: 'jsdelivr', name: 'jsDelivr CDN', url: 'https://cdn.jsdelivr.net/gh/Noob-stupid/dsh-plugin-hub@main/marketplace/index.json', primary: true },
+    { id: 'ghproxy', name: 'ghproxy 镜像', url: 'https://ghproxy.net/https://raw.githubusercontent.com/Noob-stupid/dsh-plugin-hub/main/marketplace/index.json', primary: false },
+  ],
+  // Git 克隆源（{owner}/{repo} 占位符；按主→备依次尝试）。
+  // 可替换为 Gitee / GitLab / 自建 Gitea / 任意镜像代理，实现「换一个网站下载仓库内容」。
+  gitSources: [
+    { id: 'ghproxy-git', name: 'ghproxy 镜像', urlTemplate: 'https://ghproxy.net/https://github.com/{owner}/{repo}.git', primary: true },
+    { id: 'github-git', name: 'GitHub 直连', urlTemplate: 'https://github.com/{owner}/{repo}.git', primary: false },
+  ],
+  // 索引合并模式：true = 所有索引源结果合并去重（公共索引 + 内网私有索引同时可见）；
+  // false = 主→备只用一个（内网优先，更快）
+  indexMerge: false,
   gitee: { clientId: '', clientSecret: '', token: '', login: '' },
 }
+/** 市场索引落盘缓存（网络不可达时降级展示上次成功结果，避免内网/断网下市场空白）。 */
+const MARKET_INDEX_CACHE_FILE = join(dshHome(), 'plugin-console-market-index-cache.json')
 
 /** 源地址校验（模块顶层，readSources 与 sources 路由共用）：https 任意；http 仅限私网/本机地址（内网 npm registry、内网搜索服务常用 http）。 */
 function isAllowedSourceUrl(url) {
@@ -644,6 +660,12 @@ function isAllowedSourceUrl(url) {
   }
 }
 
+/** Git 源地址校验：在通用校验之上额外允许 file:// 本地裸仓库（完全离线/内网共享盘场景）。 */
+function isAllowedGitSourceUrl(url) {
+  if (/^file:\/\/\/\S+$/u.test(url)) return true
+  return isAllowedSourceUrl(url)
+}
+
 /** 读取 Gitee OAuth 配置（clientId/clientSecret/token/login）。 */
 function readGiteeConfig(data) {
   const gitee = data && typeof data === 'object' && data.gitee && typeof data.gitee === 'object' ? data.gitee : {}
@@ -700,6 +722,36 @@ function readSources() {
       })
       .filter((s) => s !== null)
     const giteeBase = readGiteeConfig(data)
+    // 索引源：老配置无该字段时用默认；URL 必须是合法 https 或本机/私网 http
+    const indexSources = (Array.isArray(data.indexSources) ? data.indexSources : [])
+      .filter((s) => s && typeof s.url === 'string' && isAllowedSourceUrl(s.url))
+      .map((s) => ({
+        id: String(s.id ?? '').slice(0, 40) || `idx-${Math.random().toString(36).slice(2, 8)}`,
+        name: String(s.name ?? s.url).slice(0, 60) || s.url,
+        url: s.url,
+        primary: s.primary === true,
+      }))
+    const indexFinal = indexSources.length > 0
+      ? (() => {
+        if (!indexSources.some((s) => s.primary)) indexSources[0].primary = true
+        return indexSources
+      })()
+      : defaults.indexSources
+    // Git 克隆源：模板必须同时含 {owner} 与 {repo}；老配置无该字段时用默认
+    const gitSources = (Array.isArray(data.gitSources) ? data.gitSources : [])
+      .filter((s) => s && typeof s.urlTemplate === 'string' && s.urlTemplate.includes('{owner}') && s.urlTemplate.includes('{repo}') && isAllowedGitSourceUrl(s.urlTemplate))
+      .map((s) => ({
+        id: String(s.id ?? '').slice(0, 40) || `git-${Math.random().toString(36).slice(2, 8)}`,
+        name: String(s.name ?? s.urlTemplate).slice(0, 60) || s.urlTemplate,
+        urlTemplate: s.urlTemplate,
+        primary: s.primary === true,
+      }))
+    const gitFinal = gitSources.length > 0
+      ? (() => {
+        if (!gitSources.some((s) => s.primary)) gitSources[0].primary = true
+        return gitSources
+      })()
+      : defaults.gitSources
     const gitee = {
       ...giteeBase,
       clientSecret: secrets.gitee?.clientSecret ?? giteeBase.clientSecret,
@@ -707,7 +759,7 @@ function readSources() {
     }
     if (registries.length > 0) {
       if (!registries.some((r) => r.primary)) registries[0].primary = true
-      return { registries, searchSources, gitee }
+      return { registries, searchSources, indexSources: indexFinal, gitSources: gitFinal, indexMerge: data.indexMerge === true, gitee }
     }
   } catch {}
   return defaults
@@ -769,6 +821,9 @@ function maskSources(sources) {
   }
   return {
     registries: sources.registries,
+    indexSources: sources.indexSources ?? DEFAULT_SOURCES.indexSources,
+    indexMerge: sources.indexMerge === true,
+    gitSources: sources.gitSources ?? DEFAULT_SOURCES.gitSources,
     searchSources: (sources.searchSources ?? []).map((s) => {
       if (s && typeof s.headers === 'object' && Object.keys(s.headers).length > 0) {
         const masked = {}
@@ -1588,6 +1643,7 @@ async function curlText(url, timeout = 10000) {
 /** 任意 https JSON 接口（Gitee/自定义源用）：curl 优先、node:https 兜底；4xx/5xx 确定性失败直接抛出。 */
 async function fetchJsonUrl(url, timeout = 15000, headers = {}) {
   let lastError
+  const isHttps = /^https:\/\//u.test(url)
   for (let attempt = 0; attempt < 2; attempt += 1) {
     if (attempt > 0) await new Promise((resolve) => setTimeout(resolve, 1000))
     try {
@@ -1597,6 +1653,9 @@ async function fetchJsonUrl(url, timeout = 15000, headers = {}) {
       if (error instanceof Error && /^请求失败 \(HTTP \d+\)$/u.test(error.message)) throw error
       lastError = error
     }
+    // node:https 兜底仅对 https 有效：私网 http 镜像只走 curl 通道，
+    // 否则会抛出 "Protocol http: not supported" 掩盖 curl 的真实连接错误
+    if (!isHttps) continue
     try {
       const res = await githubRequest(url, { headers })
       const status = res.statusCode ?? 0
@@ -2166,8 +2225,32 @@ async function githubReleaseInstall(profileDir, repo, packageName) {
  * 读已装包的 bundle patch → 检查每个 insert 引用的包是否存在 → 缺失补装（pnpm/curl）→
  * 仍缺则在用户 patch 层自动禁用该行（防崩兜底）+ 返回报告供面板提示。
  */
-async function ensureBundlePatchIntegrity(profileDir, pkgName, userPatchPath) {
-  const report = { checked: 0, installed: [], disabled: [], missing: [] }
+/** 读取聚合包 cordis.patch.yml 的 insert 行 name 列表（注册前校验用）。 */
+function readBundlePatchRefNames(profileDir, pkgName) {
+  try {
+    const pkgJsonPath = join(profileDir, 'node_modules', pkgName, 'package.json')
+    if (!existsSync(pkgJsonPath)) return []
+    const pkg = JSON.parse(readFileSync(pkgJsonPath, 'utf8'))
+    const patchRel = pkg.dsh?.bundle?.patch
+    if (typeof patchRel !== 'string') return []
+    const text = readFileSync(join(profileDir, 'node_modules', pkgName, patchRel), 'utf8')
+    const names = []
+    const lines = text.split(/\r?\n/u)
+    let inInsert = false
+    for (let i = 0; i < lines.length; i += 1) {
+      const line = lines[i]
+      if (/^- insert:\s*$/u.test(line)) { inInsert = true; continue }
+      if (/^- /u.test(line) && !/^ {4}- /u.test(line)) inInsert = false
+      if (!inInsert) continue
+      const nameM = (lines[i + 1] ?? '').match(/^ {6}name: ['"]([^'"]+)['"]\s*$/u)
+      if (nameM) names.push(nameM[1])
+    }
+    return names
+  } catch { return [] }
+}
+
+async function ensureBundlePatchIntegrity(profileDir, pkgName, userPatchPath, transientAllow = []) {
+  const report = { checked: 0, installed: [], disabled: [], missing: [], pending: [] }
   try {
     const pkgJsonPath = join(profileDir, 'node_modules', pkgName, 'package.json')
     if (!existsSync(pkgJsonPath)) return report
@@ -2199,6 +2282,12 @@ async function ensureBundlePatchIntegrity(profileDir, pkgName, userPatchPath) {
       // 无版本约束补装会覆盖框架正确版本导致服务崩溃——见 backfillMissingDeps 注释）
       if (/^@deepseek-ai\//u.test(ref.name)) continue
       if (existsSync(join(profileDir, 'node_modules', ref.name))) continue
+      // 2026-09-06 加固：本次作业刚完成版本同步的包（transientAllow）此刻缺失=更新中途的瞬时态
+      // （pnpm 原子替换/替换失败窗口），不应按"缺失→自动禁用"处理——跳过本次判定，下次校验时再检查。
+      if (transientAllow.includes(ref.name)) {
+        report.pending.push(ref.name)
+        continue
+      }
       let ok = false
       try {
         await pnpmInstall(profileDir, ref.name, registries[0], 60000)
@@ -2333,6 +2422,7 @@ function installJobView(job) {
     skillNote: job.skillNote ?? null,
     suiteReport: job.suiteReport ?? null,
     suiteNote: job.suiteNote ?? null,
+    hint: job.hint ?? null,
   }
 }
 
@@ -2418,18 +2508,45 @@ function packageEntryExists(dir, pkg) {
   return candidates.some((c) => existsSync(join(dir, c)))
 }
 
+/** git 非交互环境：禁止任何登录/凭据窗口弹出（私有仓库或不可达源直接失败，不做交互式重试）。 */
+function gitEnv() {
+  return {
+    ...process.env,
+    GIT_TERMINAL_PROMPT: '0',
+    GCM_INTERACTIVE: 'never',
+    GIT_ASKPASS: 'echo',
+    SSH_ASKPASS: 'echo',
+  }
+}
+
+/** Git 克隆 URL 列表（按主→备顺序）。来源在「功能包 → 软件源 → Git 源」中自定义，
+ * 可替换为 Gitee / GitLab / 自建 Gitea / 任意镜像代理，实现「换一个网站下载仓库内容」。 */
+function gitCloneUrls(repoFullName, source = 'github') {
+  if (source === 'gitee') return [`https://gitee.com/${repoFullName}.git`]
+  const [owner = '', repo = ''] = String(repoFullName).split('/')
+  let list = []
+  try {
+    list = readSources().gitSources ?? []
+  } catch {
+    list = DEFAULT_SOURCES.gitSources
+  }
+  const ordered = [...list].sort((a, b) => (b.primary === true ? 1 : 0) - (a.primary === true ? 1 : 0))
+  const urls = ordered
+    .map((s) => String(s.urlTemplate).replace(/\{owner\}/gu, owner).replace(/\{repo\}/gu, repo))
+    .filter((u) => u !== '')
+  return urls.length > 0 ? urls : [`https://github.com/${repoFullName}.git`]
+}
+
 /** git clone（镜像→直连；gitee 直连），返回或抛错。 */
 async function gitCloneRepo(repo, dest, source = 'github', timeout = 180000) {
-  const urls = source === 'gitee'
-    ? [`https://gitee.com/${repo}.git`]
-    : [`https://ghproxy.net/https://github.com/${repo}.git`, `https://github.com/${repo}.git`]
+  const urls = gitCloneUrls(repo, source)
   let lastError = null
   for (const url of urls) {
     try {
       await execFileAsync('git', ['clone', '--depth', '1', '--quiet', url, dest], {
         timeout,
         windowsHide: true,
-        env: { ...process.env, GIT_TERMINAL_PROMPT: '0' },
+        env: gitEnv(),
       })
       return
     } catch (error) {
@@ -2592,9 +2709,7 @@ async function runSkillInstallJob(job, ctx) {
     job.stage = 'preparing'
     const shortName = String(job.repo).split('/').pop() || job.repo
     mkdirSync(tmpDir, { recursive: true })
-    const urls = job.source === 'gitee'
-      ? [`https://gitee.com/${job.repo}.git`]
-      : [`https://ghproxy.net/https://github.com/${job.repo}.git`, `https://github.com/${job.repo}.git`]
+    const urls = gitCloneUrls(job.repo, job.source)
     let cloned = false
     let lastError = null
     for (const url of urls) {
@@ -2602,7 +2717,7 @@ async function runSkillInstallJob(job, ctx) {
         await execFileAsync('git', ['clone', '--depth', '1', '--quiet', url, tmpDir], {
           timeout: 120000,
           windowsHide: true,
-          env: { ...process.env, GIT_TERMINAL_PROMPT: '0' },
+          env: gitEnv(),
         })
         cloned = true
         break
@@ -3167,6 +3282,30 @@ async function aiEmpowerPlan(job, ctx, profileDir) {
     job.finishedAt = Date.now()
     return
   }
+  // 优先用「Git 源」把目标仓库克隆到本地，让子代理读本地材料：
+  // 内网/离线环境下 api.github.com 与 raw 通道不可达时，这是唯一可行的调研通道。
+  let materialDir = null
+  if (/^[A-Za-z0-9_.-]+\/[A-Za-z0-9_.-]+$/u.test(String(job.source ?? '').trim())) {
+    const srcDir = join(tmpdir(), `dsh-ai-src-${job.id}-${Date.now().toString(36)}`)
+    try {
+      mkdirSync(srcDir, { recursive: true })
+      for (const url of gitCloneUrls(job.source)) {
+        try {
+          await execFileAsync('git', ['clone', '--depth', '1', '--quiet', url, srcDir], { timeout: 120000, windowsHide: true, env: gitEnv() })
+          materialDir = srcDir
+          break
+        } catch {}
+      }
+    } catch {}
+    if (materialDir === null) {
+      try { rmSync(srcDir, { recursive: true, force: true }) } catch {}
+    } else {
+      job.materialDir = srcDir
+      // 30 分钟后自动清理（规划+执行通常早已结束）
+      const timer = setTimeout(() => { try { rmSync(srcDir, { recursive: true, force: true }) } catch {} }, 30 * 60 * 1000)
+      if (typeof timer?.unref === 'function') timer.unref()
+    }
+  }
   const prompt = [
     '你是 DSH 插件控制台挂载的「AI 赋能」部署规划器。用户想把下面的组件完整部署到本机。',
     `目标来源：${job.source}`,
@@ -3175,7 +3314,9 @@ async function aiEmpowerPlan(job, ctx, profileDir) {
     frameworkCheckPromptText(job.frameworkCheck),
     '',
     '【任务】只做只读调研与规划，禁止执行任何安装/写文件/启动服务/杀进程命令（curl 的 GET 抓取、gh api 查询、读取文件是允许的）。',
-    '调研材料：npm README / GitHub README / docs/ 目录 / package.json / install 说明。',
+    materialDir !== null
+      ? `调研材料：目标仓库已由控制台通过「Git 源」克隆到本地目录 ${materialDir} —— 直接读取该目录下的 README / package.json / docs/ / install 说明即可（无需联网，内网/离线环境同样可用）。`
+      : '调研材料：npm README / GitHub README / docs/ 目录 / package.json / install 说明。',
     '全部调研完成后，输出且只输出一个 ```json ... ``` 代码块，内容为部署计划；代码块之外不要输出任何文字。',
     '',
     '计划 schema（严格遵循）',
@@ -3768,6 +3909,15 @@ function frameworkCheckPromptText(fc) {
 async function runInstallJob(job, ctx) {
   try {
     job.stage = 'preparing'
+    // 2026-09-06 事故（室友机器）：对 deepseek-ai/deepseek-harness（框架本体仓库）点「添加到本地/安装」
+    // 会按 bundle 规则注册其 patch，其中 deepseek-ai-dsh-root 等框架级行的包只存在于 npx 缓存/框架树，
+    // profile node_modules 不存在 → 整服务启动崩溃。直接拦截。
+    const repoNorm = String(job.repo ?? '').toLowerCase().replace(/^git\+/u, '').replace(/\.git$/u, '')
+    if (repoNorm === 'deepseek-ai/deepseek-harness') {
+      job.status = 'failed'
+      job.error = '这是 DSH 框架本体仓库，不能按插件安装（其组件引用框架内部包，安装后会导致服务启动失败）。如需升级框架请用「框架升级」按钮；如需生态插件请选择 dsh-plugin 插件仓库。'
+      return
+    }
     let candidates = [job.packageName].filter((name) => typeof name === 'string' && name !== '')
     let subpackageMode = false
     if (candidates.length === 0) {
@@ -3791,8 +3941,17 @@ async function runInstallJob(job, ctx) {
       const branch = meta?.default_branch ?? 'main'
       const pkg = await fetchRepoPackage(job.repo, branch)
       if (pkg === null) {
+        // 无 package.json：先探测是否技能仓库（含 SKILL.md）→ 自动转技能安装；
+        // 否则标记 hint=repo-land，前端给出「仓库落地」一键入口（克隆到本地目录）。
+        const skillProbe = await detectSkillRepo(job.repo, branch)
+        if (skillProbe.hasSkill) {
+          job.kind = 'skill'
+          await runSkillInstallJob(job, ctx)
+          return
+        }
         job.status = 'failed'
-        job.error = `仓库 ${job.repo} 没有可用的 package.json，无法作为 npm 包安装`
+        job.hint = 'repo-land'
+        job.error = `仓库 ${job.repo} 没有 package.json（也不是技能仓库），无法作为插件安装——可改用「仓库落地」克隆到本地目录。`
         return
       }
       if (pkg.private === true) {
@@ -3922,7 +4081,7 @@ async function runInstallJob(job, ctx) {
           const gitSpecs = job.source === 'gitee'
             ? [`git+https://gitee.com/${job.repo}.git`]
             : [
-                `git+https://ghproxy.net/https://github.com/${job.repo}.git`,
+                ...gitCloneUrls(job.repo).map((u) => `git+${u}`),
                 `github:${job.repo}`,
               ]
           for (const spec of gitSpecs) {
@@ -4003,13 +4162,15 @@ async function runInstallJob(job, ctx) {
         job.bundleNote = (job.bundleNote ? job.bundleNote + '；' : '') + `子包版本对齐：更新 ${synced.length} 个（${synced.join('、')}）`
       }
     } catch {}
-    // 聚合包完整性保障（防崩）：bundle patch 引用的包缺失 → 补装；仍缺自动禁用该行
+    // 聚合包完整性保障（防崩）：bundle patch 引用的包缺失 → 补装；仍缺自动禁用该行。
+    // 本次作业刚同步过版本的包（syncedNames）处于更新瞬时态，跳过"缺失自动禁用"判定。
     try {
-      const integrity = await ensureBundlePatchIntegrity(profileDir, installedName, patchPath)
+      const integrity = await ensureBundlePatchIntegrity(profileDir, installedName, patchPath, [...syncedNames, installedName])
       if (integrity.checked > 0) {
         job.bundleNote = `聚合包完整性：检查 ${integrity.checked} 个引用`
           + (integrity.installed.length > 0 ? `，补装 ${integrity.installed.length} 个（${integrity.installed.join('、')}）` : '')
           + (integrity.disabled.length > 0 ? `，自动禁用缺失行 ${integrity.disabled.length} 个（${integrity.disabled.join('、')}）` : '')
+          + (integrity.pending.length > 0 ? `，本次已同步包跳过缺失判定 ${integrity.pending.length} 个（${integrity.pending.join('、')}）` : '')
           + (integrity.missing.length > 0 ? `，仍缺失 ${integrity.missing.join('、')}（网络恢复后建议重新更新）` : '')
       }
     } catch {}
@@ -4019,11 +4180,37 @@ async function runInstallJob(job, ctx) {
       if (adapt !== null && adapt.ran === true) job.compatNote = adapt.note
     } catch {}
     job.stage = 'configuring'
+    // 2026-09-06 事故（i18n 更新变重复行）：@linxin666/dsh-i18n 声明了 dsh.bundle.patch，
+    // 更新流程按「bundle 安装规则」把它追加进 bundles → 与全家桶内的 web-ui-i18n 行（同包）重复。
+    // 防护：该包已被现有行提供 → 只更新包，不注册任何新行/bundle。
+    const alreadyServed = listEntries(ctx).some((e) => String(e.moduleName).startsWith(installedName)
+      || String(e.moduleName) === installedName
+      || packageNameOf(e.moduleName) === installedName)
     if (await detectBundleOnly(profileDir, installedName)) {
       // 官方 dsh plugin add 行为：声明 dsh.bundle 的包追加为 profile bundle 层，
       // 其 cordis.patch.yml 在下次启动时参与组合（含皮肤包与 web-ui-settings 这类有入口的包）
-      await addBundleToManifest(profileDir, installedName)
-      job.bundle = true
+      if (!alreadyServed) {
+        // 通用防线（2026-09-06 事故：装 dsh-desktop 类插件时,其 bundle patch 引用 @deepseek-ai/dsh-root 等
+        // 框架级行,包不在 profile node_modules → 注册后整服务启动崩溃）：
+        // 注册前校验 bundle patch 引用的行模块全部可解析（**含 @deepseek-ai/* —— 正是室友崩塌的那些框架级包**）,
+        // 缺失即拒绝注册并给出清单。
+        const refs = readBundlePatchRefNames(profileDir, installedName)
+        const missing = refs.filter((n) => resolvePackageJson(n, profileDir) === null)
+        if (missing.length > 0) {
+          job.status = 'failed'
+          job.error = `该聚合包（${installedName}）的插件组引用以下未安装模块：${missing.join('、')}。若这些是框架内部包（@deepseek-ai/*）,该包不能作为插件安装（会导致服务启动失败）；若为本应随包安装的依赖,请重试或检查网络。已取消注册。`
+          return
+        }
+        await addBundleToManifest(profileDir, installedName)
+        job.bundle = true
+      } else {
+        job.bundleNote = (job.bundleNote ? job.bundleNote + '；' : '') + `${installedName} 已由已安装聚合包提供，仅更新包本身，不再注册重复行`
+      }
+      job.status = 'done'
+      return
+    }
+    if (alreadyServed) {
+      job.note = `${installedName} 已由已安装条目提供，仅更新包本身，不重复注册`
       job.status = 'done'
       return
     }
@@ -4302,7 +4489,10 @@ async function handle(ctx, req, res) {
     return
   }
 
-  if (method !== 'POST') {
+  // GET 兼容白名单：只读且无副作用的接口允许 GET 调用
+  // （market-index 曾被客户端以 GET 调用，落进 405 后错误被静默吞掉，导致静态索引长期未生效）
+  const GET_COMPAT = new Set([`${ROUTE_PREFIX}/market-index`])
+  if (method !== 'POST' && !(method === 'GET' && GET_COMPAT.has(pathname))) {
     sendError(res, 405, '不支持的方法')
     return
   }
@@ -4647,7 +4837,7 @@ async function handle(ctx, req, res) {
       // 纯命令（无注释，CMD/PowerShell 通用）；不再关闭 TLS 校验；
       // 脚本用 powershell -File 调用，CMD 里也能跑
       installCommand = [
-        `git clone --recurse-submodules https://github.com/${repo}.git`,
+        `git clone --recurse-submodules ${gitCloneUrls(repo)[0]}`,
         `cd ${short}`,
         hasInstallScript
           ? `powershell -ExecutionPolicy Bypass -File install.ps1`
@@ -4801,8 +4991,168 @@ async function handle(ctx, req, res) {
       sendJson(res, 200, { ok: true, sources: maskSources(sources) })
       return
     }
+    if (action === 'add-index') {
+      const name = typeof body.name === 'string' ? body.name.trim() : ''
+      const url = typeof body.url === 'string' ? body.url.trim() : ''
+      if (!isAllowedSourceUrl(url)) {
+        sendError(res, 400, '索引地址必须是 https:// 开头（或本机/私网 http://）的合法 URL')
+        return
+      }
+      if ((sources.indexSources ?? []).some((s) => s.url === url)) {
+        sendError(res, 400, '该索引源已存在')
+        return
+      }
+      sources.indexSources = [...(sources.indexSources ?? []), {
+        id: `idx-${Date.now().toString(36)}`,
+        name: name || url,
+        url,
+        primary: (sources.indexSources ?? []).length === 0,
+      }]
+      marketIndexCache = null
+      await writeSources(sources)
+      sendJson(res, 200, { ok: true, sources: maskSources(sources) })
+      return
+    }
+    if (action === 'edit-index') {
+      const id = typeof body.id === 'string' ? body.id : ''
+      const name = typeof body.name === 'string' ? body.name.trim() : ''
+      const url = typeof body.url === 'string' ? body.url.trim() : ''
+      if (!isAllowedSourceUrl(url)) {
+        sendError(res, 400, '索引地址必须是 https:// 开头（或本机/私网 http://）的合法 URL')
+        return
+      }
+      const target = (sources.indexSources ?? []).find((s) => s.id === id)
+      if (!target) {
+        sendError(res, 404, '没有这个索引源')
+        return
+      }
+      target.name = name || url
+      target.url = url
+      marketIndexCache = null
+      await writeSources(sources)
+      sendJson(res, 200, { ok: true, sources: maskSources(sources) })
+      return
+    }
+    if (action === 'set-index-primary') {
+      const id = typeof body.id === 'string' ? body.id : ''
+      const list = sources.indexSources ?? []
+      if (!list.some((s) => s.id === id)) {
+        sendError(res, 404, '没有这个索引源')
+        return
+      }
+      for (const s of list) s.primary = s.id === id
+      marketIndexCache = null
+      await writeSources(sources)
+      sendJson(res, 200, { ok: true, sources: maskSources(sources) })
+      return
+    }
+    if (action === 'remove-index') {
+      const id = typeof body.id === 'string' ? body.id : ''
+      const list = sources.indexSources ?? []
+      if (!list.some((s) => s.id === id)) {
+        sendError(res, 404, '没有这个索引源')
+        return
+      }
+      const rest = list.filter((s) => s.id !== id)
+      if (rest.length === 0) {
+        sendError(res, 400, '至少保留一个索引源（可先添加自建镜像再删除默认源）')
+        return
+      }
+      if (!rest.some((s) => s.primary)) rest[0].primary = true
+      sources.indexSources = rest
+      marketIndexCache = null
+      await writeSources(sources)
+      sendJson(res, 200, { ok: true, sources: maskSources(sources) })
+      return
+    }
+    if (action === 'set-index-merge') {
+      sources.indexMerge = body.merge === true
+      marketIndexCache = null
+      await writeSources(sources)
+      sendJson(res, 200, { ok: true, sources: maskSources(sources) })
+      return
+    }
+    if (action === 'add-git') {
+      const name = typeof body.name === 'string' ? body.name.trim() : ''
+      const urlTemplate = typeof body.urlTemplate === 'string' ? body.urlTemplate.trim() : ''
+      if (!urlTemplate.includes('{owner}') || !urlTemplate.includes('{repo}')) {
+        sendError(res, 400, 'Git 源模板必须同时包含 {owner} 与 {repo} 占位符')
+        return
+      }
+      if (!isAllowedGitSourceUrl(urlTemplate)) {
+        sendError(res, 400, 'Git 源地址必须是 https://（或本机/私网 http://、file:// 本地裸仓库）的合法 URL')
+        return
+      }
+      if ((sources.gitSources ?? []).some((s) => s.urlTemplate === urlTemplate)) {
+        sendError(res, 400, '该 Git 源已存在')
+        return
+      }
+      sources.gitSources = [...(sources.gitSources ?? []), {
+        id: `git-${Date.now().toString(36)}`,
+        name: name || urlTemplate,
+        urlTemplate,
+        primary: (sources.gitSources ?? []).length === 0,
+      }]
+      await writeSources(sources)
+      sendJson(res, 200, { ok: true, sources: maskSources(sources) })
+      return
+    }
+    if (action === 'edit-git') {
+      const id = typeof body.id === 'string' ? body.id : ''
+      const name = typeof body.name === 'string' ? body.name.trim() : ''
+      const urlTemplate = typeof body.urlTemplate === 'string' ? body.urlTemplate.trim() : ''
+      if (!urlTemplate.includes('{owner}') || !urlTemplate.includes('{repo}')) {
+        sendError(res, 400, 'Git 源模板必须同时包含 {owner} 与 {repo} 占位符')
+        return
+      }
+      if (!isAllowedGitSourceUrl(urlTemplate)) {
+        sendError(res, 400, 'Git 源地址必须是 https://（或本机/私网 http://、file:// 本地裸仓库）的合法 URL')
+        return
+      }
+      const target = (sources.gitSources ?? []).find((s) => s.id === id)
+      if (!target) {
+        sendError(res, 404, '没有这个 Git 源')
+        return
+      }
+      target.name = name || urlTemplate
+      target.urlTemplate = urlTemplate
+      await writeSources(sources)
+      sendJson(res, 200, { ok: true, sources: maskSources(sources) })
+      return
+    }
+    if (action === 'set-git-primary') {
+      const id = typeof body.id === 'string' ? body.id : ''
+      const list = sources.gitSources ?? []
+      if (!list.some((s) => s.id === id)) {
+        sendError(res, 404, '没有这个 Git 源')
+        return
+      }
+      for (const s of list) s.primary = s.id === id
+      await writeSources(sources)
+      sendJson(res, 200, { ok: true, sources: maskSources(sources) })
+      return
+    }
+    if (action === 'remove-git') {
+      const id = typeof body.id === 'string' ? body.id : ''
+      const list = sources.gitSources ?? []
+      if (!list.some((s) => s.id === id)) {
+        sendError(res, 404, '没有这个 Git 源')
+        return
+      }
+      const rest = list.filter((s) => s.id !== id)
+      if (rest.length === 0) {
+        sendError(res, 400, '至少保留一个 Git 源（可先添加自建镜像再删除默认源）')
+        return
+      }
+      if (!rest.some((s) => s.primary)) rest[0].primary = true
+      sources.gitSources = rest
+      await writeSources(sources)
+      sendJson(res, 200, { ok: true, sources: maskSources(sources) })
+      return
+    }
     if (action === 'reset') {
       const defaults = JSON.parse(JSON.stringify(DEFAULT_SOURCES))
+      marketIndexCache = null
       await writeSources(defaults)
       sendJson(res, 200, { ok: true, sources: maskSources(defaults) })
       return
@@ -4829,34 +5179,86 @@ async function handle(ctx, req, res) {
       sendJson(res, 200, { ok: true, sources: maskSources(sources) })
       return
     }
-    sendError(res, 400, '未知操作（add / edit / set-primary / remove / add-search / remove-search / gitee-setup / gitee-clear / reset）')
+    sendError(res, 400, '未知操作（add / edit / set-primary / remove / add-search / remove-search / add-index / edit-index / set-index-primary / remove-index / set-index-merge / add-git / edit-git / set-git-primary / remove-git / gitee-setup / gitee-clear / reset）')
     return
   }
 
   if (pathname === `${ROUTE_PREFIX}/market-index`) {
-    // 静态插件索引（jsDelivr CDN）：curl 拉取 + 10 分钟内存缓存，市场秒开、零 GitHub API 调用
+    // 静态插件索引：按「软件源 → 索引源」主→备顺序拉取 + 10 分钟内存缓存（市场秒开、零 GitHub API 调用）。
+    // 全部索引源失败时回退落盘缓存（内网/断网仍可浏览，响应带 offline 标记），无缓存则区分错误类型。
     if (marketIndexCache !== null && Date.now() - marketIndexCache.at < 600000) {
-      sendJson(res, 200, { ok: true, ...marketIndexCache.data })
+      sendJson(res, 200, { ok: true, sourceName: marketIndexCache.sourceName ?? null, ...marketIndexCache.data })
       return
     }
-    const urls = [
-      'https://cdn.jsdelivr.net/gh/Noob-stupid/dsh-plugin-hub@main/marketplace/index.json',
-      'https://ghproxy.net/https://raw.githubusercontent.com/Noob-stupid/dsh-plugin-hub/main/marketplace/index.json',
-    ]
+    const indexConf = readSources()
+    let indexList = [...(indexConf.indexSources ?? [])].sort((a, b) => (b.primary === true ? 1 : 0) - (a.primary === true ? 1 : 0))
+    // 合并模式：并发拉取所有索引源并去重合并（公共索引 + 内网私有索引同时可见）
+    if (indexConf.indexMerge === true && indexList.length > 1) {
+      const fetched = await Promise.all(indexList.map(async (src) => {
+        try {
+          // 各源独立短超时：单个慢源（被墙镜像/不可达内网）不该拖垮整体
+          const data = await fetchJsonUrl(src.url, 8000)
+          return data && Array.isArray(data.items) ? { src, data } : null
+        } catch { return null }
+      }))
+      const good = fetched.filter((x) => x !== null)
+      if (good.length > 0) {
+        const seen = new Set()
+        const skillSeen = new Set()
+        const items = []
+        const skills = []
+        for (const { data } of good) {
+          for (const it of data.items) {
+            const key = typeof it?.fullName === 'string' ? it.fullName : JSON.stringify(it)
+            if (seen.has(key)) continue
+            seen.add(key)
+            items.push(it)
+          }
+          for (const sk of (Array.isArray(data.skills) ? data.skills : [])) {
+            const key = typeof sk?.fullName === 'string' ? sk.fullName : JSON.stringify(sk)
+            if (skillSeen.has(key)) continue
+            skillSeen.add(key)
+            skills.push(sk)
+          }
+        }
+        const sourceName = good.map((g) => g.src.name).join(' + ')
+        const merged = { items, skills, skillCount: skills.length, merged: true, sourceName }
+        marketIndexCache = { at: Date.now(), data: merged, sourceName }
+        try { await writeFile(MARKET_INDEX_CACHE_FILE, JSON.stringify({ at: Date.now(), data: merged, sourceName }), 'utf8') } catch {}
+        sendJson(res, 200, { ok: true, ...merged })
+        return
+      }
+      // 所有源都失败 → 跳过逐个重试，直接进入下方缓存兜底
+      indexList = []
+    }
     let lastError = null
-    for (const url of urls) {
+    let formatError = null
+    for (const src of indexList) {
       try {
-        const data = await fetchJsonUrl(url, 15000)
+        const data = await fetchJsonUrl(src.url, 15000)
         if (data && Array.isArray(data.items)) {
-          marketIndexCache = { at: Date.now(), data }
-          sendJson(res, 200, { ok: true, ...data })
+          marketIndexCache = { at: Date.now(), data, sourceName: src.name }
+          try { await writeFile(MARKET_INDEX_CACHE_FILE, JSON.stringify({ at: Date.now(), data, sourceName: src.name }), 'utf8') } catch {}
+          sendJson(res, 200, { ok: true, sourceName: src.name, ...data })
           return
         }
+        formatError = `索引格式异常（${src.name} 未返回 items 数组）`
       } catch (error) {
         lastError = error
       }
     }
-    sendError(res, 500, `索引加载失败：${lastError?.message ?? '未知'}`)
+    try {
+      const cached = JSON.parse(readFileSync(MARKET_INDEX_CACHE_FILE, 'utf8'))
+      if (cached && cached.data && Array.isArray(cached.data.items)) {
+        marketIndexCache = { at: Date.now(), data: cached.data, sourceName: cached.sourceName ?? null }
+        sendJson(res, 200, { ok: true, offline: true, cachedAt: typeof cached.at === 'number' ? cached.at : null, sourceName: cached.sourceName ?? null, ...cached.data })
+        return
+      }
+    } catch {}
+    const reason = formatError !== null
+      ? formatError
+      : `网络不可达（${indexList.length} 个索引源全部失败）：${lastError?.message ?? '未知错误'}`
+    sendError(res, 500, `索引加载失败：${reason}`)
     return
   }
 
@@ -4917,7 +5319,8 @@ async function handle(ctx, req, res) {
     const profileDir = dirname(patchPath)
     const targets = (pending?.pending ?? []).filter((p) => (p.status ?? 'pending') === 'pending' && (p.moduleName === root || String(p.moduleName).startsWith(root + '/')))
     if (targets.length === 0) {
-      sendError(res, 404, '该全家桶没有待适配行（或已全部解锁）')
+      // 无待适配行=全部已适配/已解锁，属正常状态：返回友好提示而非错误（点击「一键启用已适配」不应报"操作失败"）
+      sendJson(res, 200, { ok: true, unlocked: [], kept: [], note: '该全家桶没有待适配行（已全部适配/解锁），无需操作' })
       return
     }
     const fwVer = typeof pending.frameworkVersion === 'string' ? pending.frameworkVersion : '?'
@@ -5973,16 +6376,22 @@ async function handle(ctx, req, res) {
   }
 
   if (pathname === `${ROUTE_PREFIX}/repo-clone`) {
-    // 仓库落地：从 GitHub 克隆任意项目到 <配置路径>/<owner>/<name>（不限于 DSH 插件）
+    // 仓库落地：克隆任意项目到 <配置路径>/<owner>/<name>（地址由「软件源 → Git 源」决定，
+    // 因此这里接受任意平台的仓库链接：GitHub / Gitee / GitLab / 自建 Gitea / 镜像代理前缀）
     const raw = typeof body.repo === 'string' ? body.repo.trim() : ''
+    // 循环剥离协议/域名前缀：镜像代理链接可能叠两层（ghproxy.net/https://github.com/...）
     let repo = raw
-      .replace(/^https?:\/\/github\.com\//u, '')
-      .replace(/^git@github\.com:/u, '')
-      .replace(/\.git$/u, '')
-      .replace(/\/+$/u, '')
+    for (let guard = 0; guard < 4; guard += 1) {
+      const next = repo
+        .replace(/^https?:\/\/[^/]+\//u, '')
+        .replace(/^git@[^:]+:/u, '')
+      if (next === repo) break
+      repo = next
+    }
+    repo = repo.replace(/\.git$/u, '').replace(/\/+$/u, '')
     const m = /^([A-Za-z0-9_.-]+)\/([A-Za-z0-9_.-]+)$/u.exec(repo)
     if (!m) {
-      sendError(res, 400, '仓库格式不正确：请提供 owner/repo 或 GitHub 仓库链接')
+      sendError(res, 400, '仓库格式不正确：请提供 owner/repo 或仓库链接（如 https://gitee.com/owner/repo）')
       return
     }
     const [, owner, name] = m
@@ -5994,8 +6403,24 @@ async function handle(ctx, req, res) {
     }
     try {
       mkdirSync(root, { recursive: true })
-      await execFileAsync('git.exe', ['clone', '--depth', '1', `https://github.com/${owner}/${name}.git`, target], { cwd: root, timeout: 600000, windowsHide: true, maxBuffer: 4 * 1024 * 1024 })
-      sendJson(res, 200, { ok: true, owner, name, path: target })
+      const urls = gitCloneUrls(`${owner}/${name}`)
+      let lastError = null
+      let cloned = false
+      let usedUrl = ''
+      for (const url of urls) {
+        try {
+          await execFileAsync('git.exe', ['clone', '--depth', '1', url, target], { cwd: root, timeout: 600000, windowsHide: true, maxBuffer: 4 * 1024 * 1024, env: gitEnv() })
+          cloned = true
+          usedUrl = url
+          break
+        } catch (error) {
+          lastError = error
+          // 失败可能留下半成品目录，清理后再试下一个源，否则会因目标已存在而连环失败
+          try { rmSync(target, { recursive: true, force: true }) } catch {}
+        }
+      }
+      if (!cloned) throw lastError ?? new Error('未知错误')
+      sendJson(res, 200, { ok: true, owner, name, path: target, url: usedUrl })
     } catch (error) {
       sendError(res, 500, `克隆失败：${error instanceof Error ? error.message : String(error)}`)
     }