@noob-stupid/dsh-plugin-console 0.3.46 → 0.3.47

package/lib/index.js

@@ -6085,14 +6085,22 @@ async function handle(ctx, req, res) {
       const name = meta?.moduleName
       if (typeof name === 'string' && name !== '' && (name === root || name.startsWith(root + '/'))) bundleRowIds.add(rowId)
     }
-    const targets = (pending?.pending ?? []).filter((p) => {
-      if ((p.status ?? 'pending') !== 'pending') return false
+    const inFamily = (p) => {
       if (typeof p.moduleName === 'string' && p.moduleName !== '' && (p.moduleName === root || p.moduleName.startsWith(root + '/'))) return true
       return bundleRowIds.has(p.rowId) || info.get(p.rowId)?.moduleName === root
+    }
+    // 目标 = ① 待适配（pending）② **已记已适配、但从没通过源码扫描**（check !== 'pass'）。
+    // ② 这类正是"账面上已适配、补丁里却还禁着"的行 —— 老逻辑只挑 pending，于是用户点「一键启用已适配」
+    // 得到"没有待适配行、无需操作"，可它们其实一行都没启用（实测就是这个）。
+    const targets = (pending?.pending ?? []).filter((p) => {
+      if (!inFamily(p)) return false
+      const status = p.status ?? 'pending'
+      if (status === 'pending') return true
+      return status === 'adopted' && p.check !== 'pass'
     })
     if (targets.length === 0) {
       // 无待适配行=全部已适配/已解锁，属正常状态：返回友好提示而非错误（点击「一键启用已适配」不应报"操作失败"）
-      sendJson(res, 200, { ok: true, unlocked: [], kept: [], note: '该全家桶没有待适配行（已全部适配/解锁），无需操作' })
+      sendJson(res, 200, { ok: true, unlocked: [], kept: [], note: '该全家桶内没有待扫描/待解锁的行（全部已通过源码扫描或已解锁）' })
       return
     }
     const fwVer = typeof pending.frameworkVersion === 'string' ? pending.frameworkVersion : '?'
@@ -6125,7 +6133,17 @@ async function handle(ctx, req, res) {
       unlocked.push(p.rowId)
     }
     writeCompatPending(pending)
-    sendJson(res, 200, { ok: true, root, unlocked, kept })
+    // kept = 扫描未通过（保持禁用，并带上原因）；unlocked = 本次真解锁的行
+    sendJson(res, 200, {
+      ok: true,
+      root,
+      unlocked,
+      kept,
+      scanned: targets.length,
+      note: kept.length === 0
+        ? `已重跑源码扫描并解锁 ${unlocked.length} 行`
+        : `扫描 ${targets.length} 行：解锁 ${unlocked.length} 行，${kept.length} 行未通过（保持禁用，原因见下）`,
+    })
     return
   }
 

package/package.json

@@ -1,44 +1,44 @@
-{
-  "name": "@noob-stupid/dsh-plugin-console",
-  "version": "0.3.46",
-  "description": "DSH plugin management panel & marketplace: one-click enable/disable, multi-source market (GitHub/Gitee/custom), static-index market (500+ plugins / 300 skills), skills, suites, and one-click framework upgrade.",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/Noob-stupid/dsh-plugin-hub"
-  },
-  "type": "module",
-  "main": "./lib/index.js",
-  "exports": {
-    ".": "./lib/index.js",
-    "./client": "./lib/client.js",
-    "./package.json": "./package.json"
-  },
-  "keywords": [
-    "dsh-plugin",
-    "deepseek-harness",
-    "plugin-manager"
-  ],
-  "dsh": {
-    "bundle": {
-      "patch": "./cordis.patch.yml"
-    },
-    "client": {
-      "platform": "web",
-      "inject": [
-        "@deepseek-ai/dsh-client-runtime",
-        "@deepseek-ai/dsh-client-locale",
-        "@deepseek-ai/dsh-client-ui-settings"
-      ]
-    }
-  },
-  "files": [
-    "lib",
-    "cordis.patch.yml",
-    "SECURITY.md"
-  ],
-  "license": "MIT",
-  "scripts": {
-    "checkBom": "node -e \"const fs=require('fs');const b=fs.readFileSync('package.json');if(b[0]===0xEF){console.error('BOM detected in package.json — strip it before publish');process.exit(1)};console.log('package.json BOM check OK')\"",
-    "prepublishOnly": "npm run checkBom"
-  }
-}
+{
+  "name": "@noob-stupid/dsh-plugin-console",
+  "version": "0.3.47",
+  "description": "DSH plugin management panel & marketplace: one-click enable/disable, multi-source market (GitHub/Gitee/custom), static-index market (500+ plugins / 300 skills), skills, suites, and one-click framework upgrade.",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/Noob-stupid/dsh-plugin-hub"
+  },
+  "type": "module",
+  "main": "./lib/index.js",
+  "exports": {
+    ".": "./lib/index.js",
+    "./client": "./lib/client.js",
+    "./package.json": "./package.json"
+  },
+  "keywords": [
+    "dsh-plugin",
+    "deepseek-harness",
+    "plugin-manager"
+  ],
+  "dsh": {
+    "bundle": {
+      "patch": "./cordis.patch.yml"
+    },
+    "client": {
+      "platform": "web",
+      "inject": [
+        "@deepseek-ai/dsh-client-runtime",
+        "@deepseek-ai/dsh-client-locale",
+        "@deepseek-ai/dsh-client-ui-settings"
+      ]
+    }
+  },
+  "files": [
+    "lib",
+    "cordis.patch.yml",
+    "SECURITY.md"
+  ],
+  "license": "MIT",
+  "scripts": {
+    "checkBom": "node -e \"const fs=require('fs');const b=fs.readFileSync('package.json');if(b[0]===0xEF){console.error('BOM detected in package.json — strip it before publish');process.exit(1)};console.log('package.json BOM check OK')\"",
+    "prepublishOnly": "npm run checkBom"
+  }
+}