dsh-plugin-marketplace 0.2.3 → 0.2.4

package/client.js

@@ -64,6 +64,7 @@ window.__ModuleLoader__.load({
       empty: "没有找到插件",
       install: "安装方式",
       installHint: "在 profile 目录执行 pnpm 安装，然后在 cordis.patch.yml 挂载：",
+      installHintBundle: "标准 bundle 插件：dsh plugin add 后由 bundle 层自动挂载，无需手动改 cordis.patch.yml：",
       readme: "README 摘要",
       readmeEmpty: "（该仓库没有 README）",
       openRepo: "打开 GitHub 仓库 ↗",
@@ -94,6 +95,7 @@ window.__ModuleLoader__.load({
       empty: "No plugins found",
       install: "Install",
       installHint: "Run pnpm in your profile dir, then mount in cordis.patch.yml:",
+      installHintBundle: "Standard bundle plugin: dsh plugin add auto-mounts it via its bundle layer — no manual cordis.patch.yml edit needed:",
       readme: "README summary",
       readmeEmpty: "(no README in this repo)",
       openRepo: "Open GitHub repo ↗",
@@ -163,6 +165,24 @@ window.__ModuleLoader__.load({
       for (var i = 0; i < bin.length; i++) bytes[i] = bin.charCodeAt(i);
       return new TextDecoder("utf-8").decode(bytes);
     }
+    // npm metadata (bundle detection for the install hint); CORS-enabled, cached.
+    var npmCache = new Map(); // pkg -> {isBundle} | null
+    async function fetchNpmInfo(pkg) {
+      if (npmCache.has(pkg)) return npmCache.get(pkg);
+      var promise = fetch("https://registry.npmjs.org/" + encodeURIComponent(pkg) + "/latest", {
+        headers: { Accept: "application/vnd.npm.install-v1+json" }
+      }).then(function (res) {
+        if (!res.ok) return null;
+        return res.json();
+      }).then(function (data) {
+        if (!data || !data.dsh) return { isBundle: false };
+        return { isBundle: typeof data.dsh.bundle === "object" && data.dsh.bundle !== null && typeof data.dsh.bundle.patch === "string" && data.dsh.bundle.patch.length > 0 };
+      }).catch(function () {
+        return null;
+      });
+      npmCache.set(pkg, promise);
+      return promise;
+    }
 
     // ── components ────────────────────────────────────────────────────────
     function PluginCard(props) {
@@ -224,11 +244,13 @@ window.__ModuleLoader__.load({
           h("a", { className: "__mp_link", href: "https://www.npmjs.com/search?q=" + encodeURIComponent(installName), target: "_blank", rel: "noreferrer" }, props.t("openNpm"))
         ),
         h("div", { className: "__mp_detailTitle" }, props.t("install")),
-        h("div", { className: "__mp_readme" }, props.t("installHint")),
+        h("div", { className: "__mp_readme" }, props.bundleInfo === true ? props.t("installHintBundle") : props.t("installHint")),
         h("code", { className: "__mp_code" },
           "dsh plugin --profile web add " + installName + "\n" +
-          "# then in $DSH_HOME/profiles/web/cordis.patch.yml:\n" +
-          "- insert:\n    - id: " + installName + "\n      name: '" + installName + "'"
+          (props.bundleInfo === true
+            ? "# standard bundle: auto-mounted via dsh.profile.bundles"
+            : "# then in $DSH_HOME/profiles/web/cordis.patch.yml:\n" +
+              "- insert:\n    - id: " + installName + "\n      name: '" + installName + "'")
         ),
         btn,
         statusNode,
@@ -260,7 +282,7 @@ window.__ModuleLoader__.load({
       var t = props.t;
       var scope = props.scope;
       var api = props.api;
-      var state = react.useState({ q: "", sort: "stars", page: 1, items: [], loading: false, error: null, total: 0, open: null, readme: null, readmeLoading: false, readmeError: false, readmeRateLimited: false });
+      var state = react.useState({ q: "", sort: "stars", page: 1, items: [], loading: false, error: null, total: 0, open: null, readme: null, readmeLoading: false, readmeError: false, readmeRateLimited: false, bundleInfo: null });
       var s = state[0], set = state[1];
       // install-state subscription (stable pattern: useState + subscribe, never
       // depend on getSnapshot() reference identity).
@@ -342,6 +364,14 @@ window.__ModuleLoader__.load({
             return Object.assign({}, prev, { readmeLoading: false, readmeError: !rateLimited, readmeRateLimited: rateLimited });
           });
         });
+        // npm metadata: does the target package declare dsh.bundle.patch?
+        // (determines whether the manual cordis.patch.yml row is needed)
+        fetchNpmInfo(plugin.fullName.split("/")[1]).then(function (info) {
+          set(function (prev) {
+            if (!prev.open || prev.open.fullName !== plugin.fullName) return prev;
+            return Object.assign({}, prev, { bundleInfo: info ? Boolean(info.isBundle) : null });
+          });
+        });
       }, [s.open]);
       var submit = function (e) {
         e.preventDefault();
@@ -364,7 +394,7 @@ window.__ModuleLoader__.load({
             var open = s.open && s.open.fullName === p.fullName;
             return h("div", { key: p.fullName, className: "__mp_item" },
               h(PluginCard, { plugin: p, t: t, onOpen: function () { openDetail(p); } }),
-              open ? h(DetailPanel, { plugin: s.open, t: t, readme: s.readme, readmeLoading: s.readmeLoading, readmeError: s.readmeError, readmeRateLimited: s.readmeRateLimited, lang: s.open.lang, installState: installState && installState.status === "ready" ? installState.value.installState : null, onInstall: onInstall, ghError: t("ghError"), explainState: installState && installState.status === "ready" ? installState.value.aiExplainResult : null, explainError: s.explainError, onExplain: onExplain }) : null
+              open ? h(DetailPanel, { plugin: s.open, t: t, readme: s.readme, readmeLoading: s.readmeLoading, readmeError: s.readmeError, readmeRateLimited: s.readmeRateLimited, lang: s.open.lang, installState: installState && installState.status === "ready" ? installState.value.installState : null, onInstall: onInstall, ghError: t("ghError"), explainState: installState && installState.status === "ready" ? installState.value.aiExplainResult : null, explainError: s.explainError, onExplain: onExplain, bundleInfo: s.bundleInfo }) : null
             );
           })
         ),

package/index.js

@@ -109,21 +109,63 @@ function apply(ctx, config) {
     return process.argv[1];
   }
 
-  /** Append a mount row for `pkg` to cordis.patch.yml (idempotent). */
+  /** Read the profile manifest (its `dsh.profile.bundles` list), or null. */
+  function profileManifest(profile) {
+    try {
+      const dshHome = process.env.DSH_HOME || join(os.homedir(), ".dsh");
+      return JSON.parse(readFileSync(join(dshHome, "profiles", profile, "package.json"), "utf8"));
+    } catch {
+      return null;
+    }
+  }
+
+  /** Whether the installed package declares dsh.bundle.patch (auto-mounted via its bundle layer). */
+  function isBundlePackage(pkg, profile) {
+    try {
+      const dshHome = process.env.DSH_HOME || join(os.homedir(), ".dsh");
+      const manifest = JSON.parse(readFileSync(join(dshHome, "profiles", profile, "node_modules", pkg, "package.json"), "utf8"));
+      return typeof manifest?.dsh?.bundle?.patch === "string" && manifest.dsh.bundle.patch.length > 0;
+    } catch {
+      return false;
+    }
+  }
+
+  /**
+   * Append a mount row for `pkg` to cordis.patch.yml (idempotent).
+   * Bundle plugins (already in `dsh.profile.bundles`, or whose installed
+   * package declares `dsh.bundle.patch`) are mounted by their own bundle
+   * layer — adding a manual row would create a duplicate loader entry and
+   * abort boot, so they are skipped here.
+   */
   function ensureMounted(pkg, profile) {
     const dshHome = process.env.DSH_HOME || join(os.homedir(), ".dsh");
     const patchPath = join(dshHome, "profiles", profile, "cordis.patch.yml");
     if (!existsSync(patchPath)) return " (patch file not found; mount manually)";
+    const bundles = profileManifest(profile)?.dsh?.profile?.bundles ?? [];
+    if (bundles.includes(pkg)) return " (already mounted via dsh.profile.bundles)";
+    if (isBundlePackage(pkg, profile)) return " (bundle plugin: auto-mounted via its own dsh.bundle layer)";
     const id = pkg.replace(/^@[^/]+\//, "").replace(/[^a-z0-9-]/g, "-") || pkg;
     let src = readFileSync(patchPath, "utf8");
     if (src.includes(`name: '${pkg}'`) || src.includes(`name: "${pkg}"`)) return " (already mounted)";
-    // Append under the first `- insert:` list; match its indentation (4 spaces
-    // is the convention used by dsh profiles).
-    const insertAt = src.search(/^- insert:\s*$/m);
     const row = `\n    - id: ${id}\n      name: '${pkg}'`;
+    // A flow-style empty array (`[]`, optionally after comment lines) is a
+    // valid empty patch: replace it with the block-style insert list.
+    // Appending after `[]` would produce two top-level documents in one
+    // stream and crash boot with a YAML parse error.
+    const emptyArray = /^(\s*(?:#[^\n]*\n?)*)\[\s*\]\s*$/.exec(src);
+    if (emptyArray) {
+      writeFileSync(patchPath, `${emptyArray[1]}- insert:${row}\n`, "utf8");
+      return " (mounted in cordis.patch.yml)";
+    }
+    // Insert under the first `- insert:` list; match its indentation (4
+    // spaces is the convention used by dsh profiles).
+    const insertAt = src.search(/^- insert:\s*$/m);
     if (insertAt >= 0) {
       src = src.slice(0, insertAt + "- insert:".length) + row + src.slice(insertAt + "- insert:".length);
     } else {
+      // A non-empty flow-style array cannot be safely extended with string
+      // surgery — refuse rather than corrupt the file.
+      if (/^\s*\[/.test(src)) return " (patch file uses a flow-style array; mount manually)";
       src += `\n- insert:${row}\n`;
     }
     writeFileSync(patchPath, src, "utf8");

package/package.json

@@ -1,6 +1,6 @@
 {
     "name":  "dsh-plugin-marketplace",
-    "version":  "0.2.3",
+    "version":  "0.2.4",
     "description":  "DeepSeek Harness Web UI 内置插件市场：在设置页直接浏览 github.com/topics/dsh-plugin，支持搜索、按 Star 排序、查看安装方式。",
     "type":  "module",
     "main":  "index.js",