dsh-plugin-pack 1.0.11 → 1.0.12

package/lib/import-plugin.js

@@ -33,15 +33,20 @@ export function describeLocalPlugin(dir) {
     throw error;
   }
   const entry = resolveEntry(target, meta);
-  const patchRel = typeof meta?.dsh?.bundle?.patch === 'string' ? meta.dsh.bundle.patch : null;
+  // dsh.bundle.patch 可能是字符串或数组（一个插件可声明多个 patch 文件）
+  const patchSpec = meta?.dsh?.bundle?.patch;
+  const patchRels = (Array.isArray(patchSpec) ? patchSpec : [patchSpec]).filter(
+    (rel) => typeof rel === 'string' && rel.trim(),
+  );
   return {
     dir: target,
     name: meta.name.trim(),
     version: meta.version ?? '0.0.0',
     description: typeof meta.description === 'string' ? meta.description : '',
     entry,
-    hasPatch: patchRel ? isFile(path.join(target, patchRel)) : false,
-    patchRel,
+    hasPatch: patchRels.some((rel) => isFile(path.join(target, rel))),
+    patchRel: patchRels[0] ?? null,
+    patchRels,
     client: meta.dsh?.client ?? null,
     deps: Object.keys(meta.dependencies ?? {}).filter((dep) => !dep.startsWith('@deepseek-ai/')),
   };
@@ -96,7 +101,11 @@ export function importLocalPlugin(options = {}) {
   const insertRows = [];
   const skippedRows = [];
   if (info.hasPatch) {
-    const ownPatch = readText(path.join(info.dir, info.patchRel), '') ?? '';
+    // 多 patch 文件的插件要把每一份都读进来合并，只读第一个会丢配置
+    const ownPatch = (info.patchRels ?? [info.patchRel])
+      .filter(Boolean)
+      .map((rel) => readText(path.join(info.dir, rel), '') ?? '')
+      .join('\n');
     const target = { name: info.name, dirs: [info.dir] };
     for (const entry of splitTopLevel(ownPatch)) {
       if (entry.kind === 'insert') {

package/lib/scan.js

@@ -557,6 +557,17 @@ async function buildPlugin(item, { profileDir, dshHome, topEntries, includeSecre
   if (!entry && meta) pluginWarnings.push('找不到入口文件，导入后可能加载失败');
   if (pluginWarnings.length) warnings.push(...pluginWarnings.map((text) => `${name}: ${text}`));
 
+  /**
+   * `dsh.bundle.patch` 可能是字符串，也可能是数组
+   * （一个插件声明多个 patch 文件，实测 dsh-agentic-pet 就是数组）。
+   * 早先只当字符串处理，遇到数组会让 path.join 抛
+   * ERR_INVALID_ARG_TYPE: The "path" argument must be of type string。
+   */
+  const patchSpec = meta?.dsh?.bundle?.patch;
+  const patchRels = (Array.isArray(patchSpec) ? patchSpec : [patchSpec]).filter(
+    (rel) => typeof rel === 'string' && rel.trim(),
+  );
+
   return {
     name,
     version: meta?.version ?? '0.0.0',
@@ -568,8 +579,10 @@ async function buildPlugin(item, { profileDir, dshHome, topEntries, includeSecre
     inBundles: item.inBundles,
     bundleIndex: item.bundleIndex,
     sources: [...item.sources],
-    hasPatch: Boolean(meta?.dsh?.bundle?.patch) && isFile(path.join(item.dir, meta.dsh.bundle.patch)),
-    patchRel: typeof meta?.dsh?.bundle?.patch === 'string' ? meta.dsh.bundle.patch : null,
+    hasPatch: patchRels.some((rel) => isFile(path.join(item.dir, rel))),
+    // 主 patch 路径（多文件时取第一个，其余在 patchRels 里）
+    patchRel: patchRels[0] ?? null,
+    patchRels,
     client: meta?.dsh?.client ?? null,
     entry,
     deps,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-plugin-pack",
-  "version": "1.0.11",
+  "version": "1.0.12",
   "description": "DeepSeek Harness 插件整合包：一键把当前 profile 的第三方插件连依赖和配置导出成 zip（内部每个插件是标准 npm tgz），换机/换 profile 拖进去就能还原。",
   "type": "module",
   "main": "lib/index.js",