dsh-plugin-marketplace 0.2.4 → 0.2.6

package/README.md

@@ -4,6 +4,10 @@
 
 **GitHub**: [Scorp1o117/dsh-plugin-marketplace](https://github.com/Scorp1o117/dsh-plugin-marketplace) · **npm**: [dsh-plugin-marketplace](https://www.npmjs.com/package/dsh-plugin-marketplace)
 
+[![Enhancement Suite](https://img.shields.io/badge/part%20of-Enhancement%20Suite-3964fe)](https://github.com/Scorp1o117/dsh-enhancement-suite) [![npm](https://img.shields.io/npm/v/dsh-enhancement-suite)](https://www.npmjs.com/package/dsh-enhancement-suite)
+
+Part of the [DeepSeek Harness Enhancement Suite](https://github.com/Scorp1o117/dsh-enhancement-suite) — Vision · Soul/Persona · Long-term Memory · Plugin Marketplace.
+
 A **plugin marketplace** inside the DeepSeek Harness Web UI: browse
 [github.com/topics/dsh-plugin](https://github.com/topics/dsh-plugin) right
 from the settings page — no terminal needed.

package/README.zh.md

@@ -2,6 +2,10 @@
 
 **GitHub**: [Scorp1o117/dsh-plugin-marketplace](https://github.com/Scorp1o117/dsh-plugin-marketplace) · **npm**: [dsh-plugin-marketplace](https://www.npmjs.com/package/dsh-plugin-marketplace) · [English](README.md)
 
+[![Enhancement Suite](https://img.shields.io/badge/part%20of-Enhancement%20Suite-3964fe)](https://github.com/Scorp1o117/dsh-enhancement-suite) [![npm](https://img.shields.io/npm/v/dsh-enhancement-suite)](https://www.npmjs.com/package/dsh-enhancement-suite)
+
+属于 [DeepSeek Harness Enhancement Suite](https://github.com/Scorp1o117/dsh-enhancement-suite) —— Vision · Soul/Persona · 长期记忆 · 插件市场。
+
 在 DeepSeek Harness **Web UI 里内置的插件市场**：直接在设置页浏览
 [github.com/topics/dsh-plugin](https://github.com/topics/dsh-plugin)，无需打开终端。
 

package/client.js

@@ -207,7 +207,10 @@ window.__ModuleLoader__.load({
       var st = props.installState; // {status, message, pkg} from the settings scope
       var active = st && st.pkg === installName;
       var status = active ? st.status : "idle";
-      var explainState = props.explainState; // {status, text} from the settings scope
+      var explainState = props.explainState; // {status, text, repo} from the settings scope
+      // The settings field is namespace-global and persists across sessions,
+      // so only show it when it belongs to the plugin currently open.
+      var explainMine = !!explainState && explainState.repo === p.fullName;
       var [confirming, setConfirming] = react.useState(false);
       var statusNode = null;
       if (status === "running") {
@@ -264,14 +267,14 @@ window.__ModuleLoader__.load({
         h("div", { className: "__mp_translateRow" },
           h("button", { type: "button", className: "__mp_translateBtn",
             style: { marginTop: "8px", padding: "4px 10px", fontSize: "12px", cursor: "pointer", background: "var(--dsw-alias-bg-hover, #21262d)", color: "var(--dsw-alias-label-primary, #e6edf3)", border: "1px solid var(--dsw-alias-border, #30363d)", borderRadius: "6px" },
-            disabled: explainState && explainState.status === "running",
+            disabled: explainMine && explainState.status === "running",
             onClick: function () { props.onExplain(p.fullName, p.desc, props.readme || ""); }
           }, props.t("aiExplain")),
           h("div", { id: "__mp_translateOut", style: { fontSize: "12px", lineHeight: "1.6", color: "var(--dsw-alias-label-secondary, #8b949e)", whiteSpace: "pre-wrap", wordBreak: "break-word", marginTop: "8px", borderTop: "1px solid var(--dsw-alias-border, #21262d)", paddingTop: "8px" } },
-            props.explainError ? h("span", { style: { color: "var(--dsw-alias-state-danger-text, #f85149)" } }, props.explainError)
-              : explainState && explainState.status === "running" ? props.t("aiExplaining")
-              : explainState && explainState.status === "error" ? props.t("aiExplainErr").replace("{msg}", explainState.text || "unknown")
-              : explainState && explainState.status === "ok" ? explainState.text
+            explainMine && props.explainError ? h("span", { style: { color: "var(--dsw-alias-state-danger-text, #f85149)" } }, props.explainError)
+              : explainMine && explainState.status === "running" ? props.t("aiExplaining")
+              : explainMine && explainState.status === "error" ? props.t("aiExplainErr").replace("{msg}", explainState.text || "unknown")
+              : explainMine && explainState.status === "ok" ? explainState.text
               : ""
           )
         )

package/index.js

@@ -49,6 +49,8 @@ const Config = z.object({
   aiExplainResult: z.object({
     status: z.string().default("idle"), // idle | running | ok | error
     text: z.string().default(""),
+    /** repo this result belongs to ("owner/name"); client gates display on it. */
+    repo: z.string().default(""),
     ts: z.number().default(0),
   }),
 });
@@ -135,15 +137,24 @@ function apply(ctx, config) {
    * 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.
+   * abort boot. A STALE manual row left by an earlier non-bundle version is
+   * removed instead, so reinstalling a bundle plugin never breaks boot.
    */
   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)";
+    if (bundles.includes(pkg) || isBundlePackage(pkg, profile)) {
+      // Bundle layer auto-mounts; remove any stale manual row (pre-bundle).
+      const src = readFileSync(patchPath, "utf8");
+      const cleaned = src.replace(new RegExp(`[ \\t]*- id: [^\\n]*\\n[ \\t]*name: ['"]${pkg.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}['"]\\n?`, "g"), "");
+      if (cleaned !== src) {
+        writeFileSync(patchPath, cleaned, "utf8");
+        return " (removed stale manual mount row; bundle layer auto-mounts)";
+      }
+      return bundles.includes(pkg) ? " (already mounted via dsh.profile.bundles)" : " (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)";
@@ -218,12 +229,12 @@ function apply(ctx, config) {
   }
 
   /** Write the AI-explain result report (and clear the consumed request). */
-  async function reportExplain(status, text) {
+  async function reportExplain(status, text, repo) {
     const settings = ctx.get("settings");
     if (!settings) return;
     const ts = Date.now();
     await settings.update(NS, {
-      aiExplainResult: { status, text, ts },
+      aiExplainResult: { status, text, repo: repo || "", ts },
       aiExplain: { repo: "", desc: "", readme: "", ts: 0 },
     }).catch((error) => {
       ctx.logger.warn(`[plugin-marketplace] explain state write failed: ${String(error)}`);
@@ -236,14 +247,16 @@ function apply(ctx, config) {
    * settings-backed message channel as the install flow.
    */
   async function maybeRunExplain() {
+    let repo = "";
     try {
       const cfg = current();
       const req = cfg?.aiExplain;
       if (!req || !req.repo || req.ts === lastExplainTs || req.ts === 0) return;
       lastExplainTs = req.ts;
+      repo = String(req.repo);
       const llm = ctx.llm;
       if (!llm) {
-        await reportExplain("error", "LLM service unavailable; configure a model in Settings → Models.");
+        await reportExplain("error", "LLM service unavailable; configure a model in Settings → Models.", repo);
         return;
       }
       // Route through the deployment's default model when one is configured.
@@ -252,7 +265,6 @@ function apply(ctx, config) {
         const defaults = ctx.agentDefaultModel?.currentSelection?.();
         if (defaults?.provider && defaults?.model) route = defaults;
       } catch { /* no default model service; fall back to the adapter default */ }
-      const repo = String(req.repo);
       const desc = String(req.desc || "").trim();
       const readme = String(req.readme || "").trim().slice(0, 1500);
       const prompt =
@@ -260,7 +272,7 @@ function apply(ctx, config) {
         (desc ? `简介：${desc}\n` : "") +
         (readme ? `README 摘要：\n${readme}\n` : "") +
         `\n请用简体中文、3~5 句话直接告诉我这个插件大概是干嘛的（核心用途、解决什么问题、适合谁）。不要复述仓库名，不要罗列安装步骤。`;
-      await reportExplain("running", "");
+      await reportExplain("running", "", repo);
       ctx.logger.info(`[plugin-marketplace] explaining ${repo} (model=${route ? `${route.provider}/${route.model}` : "default"})…`);
       const messages = [createUserMessage({
         content: [{ type: "text", text: prompt }],
@@ -284,10 +296,10 @@ function apply(ctx, config) {
         .join(" ")
         .trim();
       if (!text) throw new Error("model produced no text");
-      await reportExplain("ok", text);
+      await reportExplain("ok", text, repo);
     } catch (error) {
       ctx.logger.warn(`[plugin-marketplace] explain flow failed: ${String(error)}`);
-      await reportExplain("error", String(error instanceof Error ? error.message : error));
+      await reportExplain("error", String(error instanceof Error ? error.message : error), repo);
     }
   }
 }

package/package.json

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