dsh-plugin-manager-plus 1.3.0 → 1.3.1

package/README.md

@@ -79,6 +79,8 @@ dsh plugin --profile web add dsh-plugin-manager-plus
 >       name: dsh-plugin-manager-plus
 > ```
 
+**bundle 形态插件（自带 `dsh.bundle.patch` 的包）**：v1.3.1 起自动识别——安装时**不再**写入家级插入行（bundle 层已由官方 CLI 自动挂载，再写一条会触发同包双 Loader 源致命错误），只记录到 manifest 供 UI 管理。此类插件在「插件管理」中显示为社区来源、可启停/卸载，其激活行随包安装/卸载自动存在/消失。
+
 ### 方式二：git clone + 接线脚本（本地开发）
 
 ```powershell

package/lib/index.mjs

@@ -15,7 +15,7 @@ import { homedir } from 'node:os';
 export const name = 'dsh-plugin-manager-plus';
 export const inject = ['loader', 'webServer'];
 
-const PLUGIN_VERSION = '1.3.0';
+const PLUGIN_VERSION = '1.3.1';
 
 /** 读取宿主 dsh 包版本（后端进程 argv[1] 即 dsh 的 bin.js，其上级即包根） */
 function readHostDshVersion() {
@@ -935,7 +935,11 @@ export function apply(ctx) {
         if (pathname === '/plugin-manager/api/inventory' && req.method === 'GET') {
           const { insertEntries, overrideEntries } = getHomePatchEntries();
           const manifest = readManifest();
-          const manifestEntryIds = new Set(manifest.map(m => m.entryId));
+          const manifestEntryIds = new Set();
+          for (const m of manifest) {
+            manifestEntryIds.add(m.entryId);
+            for (const rid of (m.bundleRowIds || [])) manifestEntryIds.add(rid);
+          }
 
           const list = [];
           const seenCleanIds = new Set();
@@ -965,6 +969,8 @@ export function apply(ctx) {
               const source = isHomeInsert ? 'home' : 'builtin';
               const cat = determineCategory(source, cId || entryId, moduleName, manifestEntryIds);
               const funcCat = determineFuncCategory(moduleName);
+              // bundle 形态插件（行由包内 bundle 层挂载、经 manifest 跟踪）也可管理
+              const manifestTracked = manifestEntryIds.has(cId || entryId);
 
               list.push({
                 entryId: cId || entryId,
@@ -972,7 +978,7 @@ export function apply(ctx) {
                 enabled,
                 phase: rawFiberPhase ?? 'unobserved',
                 source,
-                manageable: isHomeInsert,
+                manageable: isHomeInsert || manifestTracked,
                 category: cat,
                 funcCategory: funcCat
               });
@@ -1079,26 +1085,50 @@ export function apply(ctx) {
             }
 
             let installedVersion = version || '';
+            let isBundle = false;
+            let bundleRowIds = [];
             try {
               const installedPkg = JSON.parse(readFileSync(targetPkgJsonPath, 'utf8'));
               installedVersion = installedPkg.version || installedVersion;
+              // 探测 bundle 形态：包内 dsh.bundle.patch 由官方 CLI 自动挂载为
+              // profile 的 bundle 层，行随包安装/卸载自动存在/消失——此时
+              // **不得**再写家级插入行（同包双 Loader 源 = 致命错误）。
+              const bundlePatchRel = installedPkg?.dsh?.bundle?.patch;
+              if (typeof bundlePatchRel === 'string' && bundlePatchRel) {
+                const bundlePatchPath = join(WEB_PROFILE_DIR, 'node_modules', ...pkgName.split('/'), bundlePatchRel.replace(/^\.\//, ''));
+                if (existsSync(bundlePatchPath)) {
+                  const { blocks } = parsePatchYaml(readFileSync(bundlePatchPath, 'utf8'));
+                  for (const b of blocks) {
+                    if (b.type === 'insert') for (const e of b.entries) bundleRowIds.push(e.id);
+                  }
+                }
+                if (bundleRowIds.length > 0) isBundle = true;
+              }
             } catch {}
 
-            // 更新 Patch 文件
-            patchAddInstallEntry(pkgName, entryId);
+            if (!isBundle) {
+              // 非 bundle 形态：包装上没有激活行，需要插件管理器在家级补丁登记激活
+              patchAddInstallEntry(pkgName, entryId);
+              logger.info(`插件 ${pkgSpec} 已登记至家级补丁 (${entryId})`);
+            } else {
+              // bundle 形态：bundle 层已自动挂载激活行，绝不写家级插入行
+              logger.info(`插件 ${pkgSpec} 为 bundle 形态（bundle 层行 id: ${bundleRowIds.join(', ')}），跳过家级登记（避免双 Loader 源）`);
+            }
 
             // 更新 Manifest 记录
             const manifest = readManifest();
-            const filtered = manifest.filter(m => m.entryId !== entryId);
+            const filtered = manifest.filter(m => m.entryId !== entryId && !(m.bundleRowIds || []).includes(entryId));
             filtered.push({
               entryId,
               packageName: pkgName,
               version: installedVersion,
-              installedAt: new Date().toISOString()
+              installedAt: new Date().toISOString(),
+              bundle: isBundle,
+              bundleRowIds
             });
             saveManifest(filtered);
 
-            logger.info(`插件 ${pkgSpec} 安装成功并已登记至 cordis.patch.yml`);
+            logger.info(`插件 ${pkgSpec} 安装成功${isBundle ? '（bundle 形态，无家级登记）' : '并已登记至 cordis.patch.yml'}`);
             return { ok: true, version: installedVersion, log: installRes.log };
           });
 
@@ -1131,7 +1161,7 @@ export function apply(ctx) {
             const { insertEntries } = getHomePatchEntries();
             const homeEntry = insertEntries.get(entryId);
             const manifest = readManifest();
-            const manifestRecord = manifest.find(m => m.entryId === entryId);
+            const manifestRecord = manifest.find(m => m.entryId === entryId || (m.bundleRowIds || []).includes(entryId));
 
             // 1. 由插件管理器安装的 npm 包
             if (manifestRecord) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-plugin-manager-plus",
   "description": "DeepSeek Harness (DSH) 插件管理器：设置面板内的社区插件市场（npm 搜索一键安装）+ 已安装插件管理（来源/用途/状态三维筛选、启停热重载、一键卸载、持久化）。Plugin manager & marketplace for DeepSeek Harness.",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "type": "module",
   "main": "./lib/index.mjs",
   "exports": {