dsh-plugin-marketplace 0.4.0 → 0.4.1

package/README.md

@@ -1,5 +1,12 @@
 # dsh-plugin-marketplace
 
+## v0.4.1: desktop request handling
+
+- Installation targets the active Host profile and home, resolves the Desktop Host `cli.js`, and runs Electron with `ELECTRON_RUN_AS_NODE=1` and `--expose-internals`.
+- Install and AI-explain requests start outside the settings/HMR transaction. Transient state-write refusals are retried; spawn failures return an installation error.
+- The UI shows progress while awaiting Host acknowledgement, and an error after 15 seconds without acknowledgement. This does not cap installation or model response time.
+- Update to this release and restart DSH. Repositories without a matching npm package still return an explicit installation error.
+
 ## Configuration page (DSH 0.2.0-rc.2 and later)
 
 Open **Plugins → Installed → dsh-plugin-marketplace** from the homepage sidebar to configure and save this plugin. The page uses the official `plugins.bundle.config` interface, without a duplicate entry in global Settings. Web and Desktop share the page. This version requires DSH 0.2.0-rc.2 or a later 0.2.x host; existing configuration is retained.

package/README.zh.md

@@ -1,5 +1,12 @@
 # dsh-plugin-marketplace
 
+## v0.4.1：桌面端请求闭环
+
+- 一键安装使用当前 Host 的 profile 和数据目录，解析桌面 Host 的 `cli.js`；Electron 子进程启用 `ELECTRON_RUN_AS_NODE=1` 与 `--expose-internals`。
+- 安装和 AI 解释请求延后到 settings/HMR 事务之外处理，状态回写遇到暂时拒绝会重试，启动进程失败会返回安装错误。
+- UI 在等待宿主确认时显示进度；15 秒未确认会显示错误。此超时只针对请求确认，不限制实际安装或模型响应时间。
+- 需要更新到本版本并重启 DSH。GitHub 仓库没有同名 npm 包时，安装仍会明确报错。
+
 ## 配置入口（DSH 0.2.0-rc.2 起）
 
 在首页侧边栏打开 **插件 → 已安装 → dsh-plugin-marketplace**，直接在插件详情页配置并保存。配置页注册到官方的 `plugins.bundle.config` 接口；全局设置页不再重复显示配置入口。Web 与桌面版使用相同界面，本版要求 DSH 0.2.0-rc.2 或更新的 0.2.x 版本。现有配置无需迁移。

package/client.js

@@ -78,6 +78,7 @@ window.__ModuleLoader__.load({
       installOk: "已安装：{msg}",
       installErr: "安装失败：{msg}",
       installIdle: "",
+      hostTimeout: "宿主在 15 秒内没有确认请求，请检查插件是否启用并重启 DSH 后重试。",
       installingHint: "正在后台执行 dsh plugin add，请稍候…",
       aiExplain: "🤖 AI 解释",
       aiExplaining: "AI 解释中，请稍候…",
@@ -109,6 +110,7 @@ window.__ModuleLoader__.load({
       installOk: "Installed: {msg}",
       installErr: "Install failed: {msg}",
       installIdle: "",
+      hostTimeout: "The Host did not acknowledge the request within 15 seconds. Check that the plugin is enabled and restart DSH before retrying.",
       installingHint: "Running dsh plugin add in the background…",
       aiExplain: "🤖 AI Explain",
       aiExplaining: "AI is explaining…",
@@ -337,6 +339,30 @@ window.__ModuleLoader__.load({
         var un = typeof scope.subscribe === "function" ? scope.subscribe(sync) : null;
         return function () { alive = false; if (un) un(); if (scope.dispose) scope.dispose(); };
       }, [scope]);
+      var channel = installState && installState.status === "ready" ? installState.value : {};
+      var installRequest = channel.install || {};
+      var explainRequest = channel.aiExplain || {};
+      react.useEffect(function () {
+        if (!installRequest.pkg || !installRequest.ts) return;
+        var timer = setTimeout(function () {
+          set(function (prev) { return Object.assign({}, prev, { installError: t("hostTimeout") }); });
+        }, 15000);
+        return function () { clearTimeout(timer); };
+      }, [installRequest.pkg, installRequest.ts, t]);
+      react.useEffect(function () {
+        if (!explainRequest.repo || !explainRequest.ts) return;
+        var timer = setTimeout(function () {
+          set(function (prev) { return Object.assign({}, prev, { explainError: t("hostTimeout") }); });
+        }, 15000);
+        return function () { clearTimeout(timer); };
+      }, [explainRequest.repo, explainRequest.ts, t]);
+      // Pending requests immediately show progress, before the Host acknowledges.
+      var visibleInstall = installRequest.pkg ? {
+        status: s.installError ? "error" : "running", pkg: installRequest.pkg, message: s.installError || ""
+      } : channel.installState;
+      var visibleExplain = explainRequest.repo ? {
+        status: s.explainError ? "error" : "running", repo: explainRequest.repo, text: s.explainError || ""
+      } : channel.aiExplainResult;
       // Older hosts can still return settings-not-exposed. Recommend upgrading
       // instead of mutating the installed DSH package on disk.
       var mutateError = function (detail, fallback) {
@@ -425,7 +451,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, bundleInfo: s.bundleInfo }) : 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: visibleInstall, onInstall: onInstall, ghError: t("ghError"), explainState: visibleExplain, explainError: s.explainError, onExplain: onExplain, bundleInfo: s.bundleInfo }) : null
             );
           })
         ),

package/index.js

@@ -1,314 +1,278 @@
-/**
- * dsh-plugin-marketplace — node half.
- *
- * Host side of the marketplace: owns a `plugin-marketplace` settings
- * namespace used as a message channel between the browser UI and this
- * process. The client writes an `install` request; the settings watch here
- * spawns `dsh plugin --profile <p> add <pkg>` (npm install into the profile)
- * and appends the mount row to the profile's cordis.patch.yml, then reports
- * progress/result back through `installState`.
- *
- * The settings section UI itself lives in the browser half (exports["./client"]).
- */
-import { execFile } from "node:child_process";
-import { existsSync, readFileSync, writeFileSync } from "node:fs";
-import { join } from "node:path";
-import os from "node:os";
-import z from "@deepseek-ai/schemastery";
-import { BlockAssembler, createUserMessage } from "@deepseek-ai/dsh-llm";
-
-/** Cordis plugin name. */
-const name = "plugin-marketplace";
-/** Services this plugin needs injected from the host tree (ctx.get requires inject). */
-const inject = ["llm", "agentDefaultModel"];
-/** Settings namespace owned by this plugin (Web UI settings section + install channel). */
-const NS = "plugin-marketplace";
-
-/** Runtime schema: the install request + the install state report. */
-const Config = z.object({
-  install: z.object({
-    /** npm package name to install ("" = no pending request). */
-    pkg: z.string().default(""),
-    /** client-set timestamp; host dedups on it. */
-    ts: z.number().default(0),
-  }),
+/**
+ * dsh-plugin-marketplace — node half.
+ *
+ * Host side of the marketplace: owns a `plugin-marketplace` settings
+ * namespace used as a message channel between the browser UI and this
+ * process. The client writes an `install` request; the settings watch here
+ * spawns `dsh plugin --profile <p> add <pkg>` (npm install into the profile)
+ * and appends the mount row to the profile's cordis.patch.yml, then reports
+ * progress/result back through `installState`.
+ *
+ * The settings section UI itself lives in the browser half (exports["./client"]).
+ */
+import { existsSync, readFileSync, writeFileSync } from "node:fs";
+import { AsyncResource } from "node:async_hooks";
+import { join } from "node:path";
+import { activeProfile, runInstall, writeState } from "./runtime.js";
+import z from "@deepseek-ai/schemastery";
+import { BlockAssembler, createUserMessage } from "@deepseek-ai/dsh-llm";
+
+/** Cordis plugin name. */
+const name = "plugin-marketplace";
+/** Services this plugin needs injected from the host tree (ctx.get requires inject). */
+const inject = ["settings", "profileContext", "llm", "agentDefaultModel"];
+/** Settings namespace owned by this plugin (Web UI settings section + install channel). */
+const NS = "plugin-marketplace";
+
+/** Runtime schema: the install request + the install state report. */
+const Config = z.object({
+  install: z.object({
+    /** npm package name to install ("" = no pending request). */
+    pkg: z.string().default(""),
+    /** client-set timestamp; host dedups on it. */
+    ts: z.number().default(0),
+  }),
   installState: z.object({
     status: z.string().default("idle"), // idle | running | ok | error
     message: z.string().default(""),
     pkg: z.string().default(""),
     ts: z.number().default(0),
-  }),
-  /** AI-explain request (client writes repo/desc/readme, host answers). */
-  aiExplain: z.object({
-    repo: z.string().default(""),
-    desc: z.string().default(""),
-    readme: z.string().default(""),
-    ts: z.number().default(0),
-  }),
-  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),
-  }),
+  }),
+  /** AI-explain request (client writes repo/desc/readme, host answers). */
+  aiExplain: z.object({
+    repo: z.string().default(""),
+    desc: z.string().default(""),
+    readme: z.string().default(""),
+    ts: z.number().default(0),
+  }),
+  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),
+  }),
 }).volatile();
-
-/** npm package-name shape (scope/name, no spaces, no path chars). */
-const PKG_NAME = /^@?[a-z0-9][a-z0-9-._]*(?:\/[a-z0-9][a-z0-9-._]*)?$/;
-
+
+/** npm package-name shape (scope/name, no spaces, no path chars). */
+const PKG_NAME = /^@?[a-z0-9][a-z0-9-._]*(?:\/[a-z0-9][a-z0-9-._]*)?$/;
+
 function apply(ctx, config) {
   const sourceGetter = () => typeof config.get === "function" ? config.get() : config;
-  let lastTs = 0;
-  let lastExplainTs = 0;
-
-  // ── settings-backed configuration ─────────────────────────────────────────
-  // The browser half edits this namespace; every write fires the onChange
-  // handler below, which is what turns an `install` request into a real
-  // install.
-  // Compat shim: dsh-settings 0.1.2-rc.1 removed the module-level
-  // `installSettingsSection` export (the provider now lives at ctx.settings).
-  // Inline the same logic via ctx.inject(["settings"]) — works on both
-  // 0.1.1 (module export wrapper) and 0.1.2 (ctx.settings) hosts.
-  // DSH 0.1.7 stores live plugin fields in the profile patch. Config is a
-  // volatile proxy, and the settings service emits after a committed edit.
+  let lastTs = 0;
+  let lastExplainTs = 0;
+
+  // settings/document-updated may fire inside the Host's HMR transaction.
+  // Start consumption on the next task, and cancel scheduled work on unload.
+  let scheduled;
+  let disposed = false;
+  // Capture the plugin's startup context. A timer created by an HMR event
+  // inherits its AsyncLocalStorage transaction even after that transaction
+  // settles; consume requests in this resource's context instead.
+  const consumer = new AsyncResource("plugin-marketplace-requests");
+  function scheduleRequests() {
+    if (disposed || scheduled !== undefined) return;
+    scheduled = setTimeout(() => {
+      scheduled = undefined;
+      consumer.runInAsyncScope(() => {
+        void maybeRunInstall();
+        void maybeRunExplain();
+      });
+    }, 0);
+  }
   ctx.on("settings/document-updated", (id) => {
-    if (id !== NS) return;
-    void maybeRunInstall();
-    void maybeRunExplain();
-  });
-  queueMicrotask(() => {
-    void maybeRunInstall();
-    void maybeRunExplain();
+    if (id === NS) scheduleRequests();
   });
-
-  // DSH 0.1.0-rc.7+ exposes registered settings namespaces natively, allowing
-  // the browser client to write install requests without modifying host files.
-  /** Resolved current config (settings layer over the entry). */
-  function current() {
+  ctx.effect(() => () => { disposed = true; clearTimeout(scheduled); consumer.emitDestroy(); });
+  scheduleRequests();
+
+  /** Resolved current config (settings layer over the entry). */
+  function current() {
     return sourceGetter();
-  }
-
-  /** Write the install-state report (and clear the consumed request). */
-  async function report(status, message, pkg) {
-    const settings = ctx.get("settings");
-    if (!settings) return;
-    const ts = Date.now();
-    await settings.update(NS, {
-      installState: { status, message, ts, pkg: pkg || "" },
-      install: { pkg: "", ts: 0 },
-    }).catch((error) => {
-      ctx.logger.warn(`[plugin-marketplace] state write failed: ${String(error)}`);
-    });
-  }
-
-  /** Find the active profile name from the process args ("web" default). */
-  function profileName() {
-    const argv = process.argv;
-    const i = argv.indexOf("--profile");
-    if (i >= 0 && argv[i + 1]) return argv[i + 1];
-    return "web";
-  }
-
-  /** The dsh CLI entry used to boot this process (its own bin.js). */
-  function dshBin() {
-    return process.argv[1];
-  }
-
-  /** 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. 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) || 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)";
-    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");
-    return " (mounted in cordis.patch.yml)";
-  }
-
-  /** Run the install; resolve {code, stdout, stderr}. */
-  function runInstall(pkg, profile) {
-    const bin = dshBin();
-    const node = process.execPath;
-    return new Promise((resolve) => {
-      execFile(node, [bin, "plugin", "--profile", profile, "add", pkg], {
-        timeout: 5 * 60 * 1000,
-        maxBuffer: 8 * 1024 * 1024,
-        windowsHide: true,
-      }, (error, stdout, stderr) => {
-        resolve({ code: error ? (error.code ?? 1) : 0, stdout, stderr });
-      });
-    });
-  }
-
-  async function maybeRunInstall() {
-    try {
-      const cfg = current();
-      const req = cfg?.install;
-      if (!req || !req.pkg || req.ts === lastTs || req.ts === 0) return;
-      lastTs = req.ts;
-      const pkg = String(req.pkg).trim();
-      if (!PKG_NAME.test(pkg)) {
-        await report("error", `invalid package name: ${pkg}`, pkg);
-        return;
-      }
-      const profile = profileName();
-      ctx.logger.info(`[plugin-marketplace] installing ${pkg} (profile=${profile})…`);
-      await report("running", `installing ${pkg}…`, pkg);
-      const result = await runInstall(pkg, profile);
-      if (result.code !== 0) {
-        const output = (result.stderr || result.stdout || "").trim();
-        const tail = output.includes("ERR_PNPM_IGNORED_BUILDS")
-          ? "dependency build scripts were blocked by pnpm; the plugin author must make native build dependencies opt-in"
-          : output.split("\n").slice(-3).join(" ");
-        ctx.logger.warn(`[plugin-marketplace] install failed (${result.code}): ${tail}`);
-        await report("error", `install failed: ${tail || "unknown error"}`, pkg);
-        return;
-      }
-      const mountNote = ensureMounted(pkg, profile);
-      ctx.logger.info(`[plugin-marketplace] ${pkg} installed${mountNote}`);
-      await report("ok", `${pkg} installed${mountNote}. Restart dsh web to load it.`, pkg);
-    } catch (error) {
-      ctx.logger.warn(`[plugin-marketplace] install flow failed: ${String(error)}`);
-      await report("error", String(error instanceof Error ? error.message : error));
-    }
-  }
-
-  /** Write the AI-explain result report (and clear the consumed request). */
-  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, repo: repo || "", ts },
-      aiExplain: { repo: "", desc: "", readme: "", ts: 0 },
-    }).catch((error) => {
-      ctx.logger.warn(`[plugin-marketplace] explain state write failed: ${String(error)}`);
-    });
-  }
-
-  /**
-   * Answer an aiExplain request with the deployment's default model: tell the
-   * user in plain Chinese what this plugin roughly does. Uses the same
-   * 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.", repo);
-        return;
-      }
-      // Route through the deployment's default model when one is configured.
-      let route = null;
-      try {
-        const defaults = ctx.agentDefaultModel?.currentSelection?.();
-        if (defaults?.provider && defaults?.model) route = defaults;
-      } catch { /* no default model service; fall back to the adapter default */ }
-      const desc = String(req.desc || "").trim();
-      const readme = String(req.readme || "").trim().slice(0, 1500);
-      const prompt =
-        `插件仓库：${repo}\n` +
-        (desc ? `简介：${desc}\n` : "") +
-        (readme ? `README 摘要：\n${readme}\n` : "") +
-        `\n请用简体中文、3~5 句话直接告诉我这个插件大概是干嘛的（核心用途、解决什么问题、适合谁）。不要复述仓库名，不要罗列安装步骤。`;
-      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 }],
-        source: { kind: "plugin", plugin: "dsh-plugin-marketplace" },
-      })];
-      const options = {
-        messages,
-        maxTokens: 400,
-        purpose: "plugin-marketplace-explain",
-      };
-      if (route) {
-        options.provider = route.provider;
-        options.model = route.model;
-      }
-      const assembler = new BlockAssembler();
-      for await (const chunk of ctx.llm.stream(options)) assembler.push(chunk);
-      const blocks = assembler.blocks();
-      const text = blocks
-        .filter((block) => block.type === "text")
-        .map((block) => block.text)
-        .join(" ")
-        .trim();
-      if (!text) throw new Error("model produced no 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), repo);
-    }
-  }
-}
-
-export { Config, apply, inject, name };
+  }
+
+  /** Write the install-state report (and clear the consumed request). */
+  async function report(status, message, pkg) {
+    await writeState(ctx.get("settings"), NS, {
+      installState: { status, message, ts: Date.now(), pkg: pkg || "" },
+      install: { pkg: "", ts: 0 },
+    });
+  }
+
+  /** Read the profile manifest (its `dsh.profile.bundles` list), or null. */
+  function profileManifest(profile) {
+    try {
+      return JSON.parse(readFileSync(join(profile.dir, "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 manifest = JSON.parse(readFileSync(join(profile.dir, "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. 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 patchPath = join(profile.dir, "cordis.patch.yml");
+    if (!existsSync(patchPath)) return " (patch file not found; mount manually)";
+    const bundles = profileManifest(profile)?.dsh?.profile?.bundles ?? [];
+    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)";
+    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");
+    return " (mounted in cordis.patch.yml)";
+  }
+
+  async function maybeRunInstall() {
+    let pkg = "";
+    try {
+      const cfg = current();
+      const req = cfg?.install;
+      if (!req || !req.pkg || req.ts === lastTs || req.ts === 0) return;
+      lastTs = req.ts;
+      pkg = String(req.pkg).trim();
+      if (!PKG_NAME.test(pkg)) {
+        await report("error", `invalid package name: ${pkg}`, pkg);
+        return;
+      }
+      const profile = activeProfile(ctx);
+      ctx.logger.info(`[plugin-marketplace] installing ${pkg} (profile=${profile.name})…`);
+      await report("running", `installing ${pkg}…`, pkg);
+      const result = await runInstall(pkg, profile);
+      if (result.code !== 0) {
+        const output = (result.stderr || result.stdout || "").trim();
+        const tail = output.includes("ERR_PNPM_IGNORED_BUILDS")
+          ? "dependency build scripts were blocked by pnpm; the plugin author must make native build dependencies opt-in"
+          : output.split("\n").slice(-3).join(" ");
+        ctx.logger.warn(`[plugin-marketplace] install failed (${result.code}): ${tail}`);
+        await report("error", `install failed: ${tail || "unknown error"}`, pkg);
+        return;
+      }
+      const mountNote = ensureMounted(pkg, profile);
+      ctx.logger.info(`[plugin-marketplace] ${pkg} installed${mountNote}`);
+      await report("ok", `${pkg} installed${mountNote}. Restart DSH to load it.`, pkg);
+    } catch (error) {
+      ctx.logger.warn(`[plugin-marketplace] install flow failed: ${String(error)}`);
+      await report("error", String(error instanceof Error ? error.message : error), pkg)
+        .catch((writeError) => ctx.logger.warn(`[plugin-marketplace] error state write failed: ${String(writeError)}`));
+    }
+  }
+
+  /** Write the AI-explain result report (and clear the consumed request). */
+  async function reportExplain(status, text, repo) {
+    await writeState(ctx.get("settings"), NS, {
+      aiExplainResult: { status, text, repo: repo || "", ts: Date.now() },
+      aiExplain: { repo: "", desc: "", readme: "", ts: 0 },
+    });
+  }
+
+  /**
+   * Answer an aiExplain request with the deployment's default model: tell the
+   * user in plain Chinese what this plugin roughly does. Uses the same
+   * 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.", repo);
+        return;
+      }
+      // Route through the deployment's default model when one is configured.
+      let route = null;
+      try {
+        const defaults = ctx.agentDefaultModel?.currentSelection?.();
+        if (defaults?.provider && defaults?.model) route = defaults;
+      } catch { /* no default model service; fall back to the adapter default */ }
+      const desc = String(req.desc || "").trim();
+      const readme = String(req.readme || "").trim().slice(0, 1500);
+      const prompt =
+        `插件仓库：${repo}\n` +
+        (desc ? `简介：${desc}\n` : "") +
+        (readme ? `README 摘要：\n${readme}\n` : "") +
+        `\n请用简体中文、3~5 句话直接告诉我这个插件大概是干嘛的（核心用途、解决什么问题、适合谁）。不要复述仓库名，不要罗列安装步骤。`;
+      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 }],
+        source: { kind: "plugin", plugin: "dsh-plugin-marketplace" },
+      })];
+      const options = {
+        messages,
+        maxTokens: 400,
+        purpose: "plugin-marketplace-explain",
+      };
+      if (route) {
+        options.provider = route.provider;
+        options.model = route.model;
+      }
+      const assembler = new BlockAssembler();
+      for await (const chunk of ctx.llm.stream(options)) assembler.push(chunk);
+      const blocks = assembler.blocks();
+      const text = blocks
+        .filter((block) => block.type === "text")
+        .map((block) => block.text)
+        .join(" ")
+        .trim();
+      if (!text) throw new Error("model produced no 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), repo)
+        .catch((writeError) => ctx.logger.warn(`[plugin-marketplace] explain error state write failed: ${String(writeError)}`));
+    }
+  }
+}
+
+export { Config, apply, inject, name };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "dsh-plugin-marketplace",
-    "version": "0.4.0",
+    "version": "0.4.1",
     "description": "DeepSeek Harness Web UI 内置插件市场：在设置页直接浏览 github.com/topics/dsh-plugin，支持搜索、按 Star 排序、查看安装方式。",
     "type": "module",
     "main": "index.js",
@@ -37,10 +37,11 @@
         }
     },
     "scripts": {
-        "test": "node --test tests/settings-write-verify.test.mjs && node --test tests/plugin-page.test.mjs"
+        "test": "node --test tests/settings-write-verify.test.mjs tests/runtime.test.mjs && node --test tests/plugin-page.test.mjs"
     },
     "files": [
         "index.js",
+        "runtime.js",
         "client.js",
         "cordis.patch.yml",
         "README.md",
@@ -68,11 +69,15 @@
         "url": "https://github.com/Scorp1o117/dsh-plugin-marketplace/issues"
     },
     "peerDependencies": {
-        "react": "^18.2.0",
+        "@deepseek-ai/dsh-llm": ">=0.2.0-rc.2 <0.3.0",
         "@deepseek-ai/dsh-settings": ">=0.2.0-rc.2 <0.3.0",
-        "@deepseek-ai/dsh-llm": ">=0.2.0-rc.2 <0.3.0"
+        "react": "^18.2.0"
     },
     "dependencies": {
         "@deepseek-ai/schemastery": "^3.18.4"
+    },
+    "devDependencies": {
+        "@deepseek-ai/dsh-llm": "0.2.0-rc.2",
+        "@deepseek-ai/dsh-settings": "0.2.0-rc.2"
     }
 }

package/runtime.js

@@ -0,0 +1,82 @@
+import { execFile } from "node:child_process";
+import { existsSync } from "node:fs";
+import { createRequire } from "node:module";
+import { basename, dirname, join } from "node:path";
+import os from "node:os";
+
+const require = createRequire(import.meta.url);
+
+/** Prefer the active Host profile; never infer it from other installed profiles. */
+function activeProfile(ctx, runtime = process) {
+  const profile = ctx.get("profileContext");
+  const document = ctx.get("settings")?.documentPath;
+  const dir = profile?.dir || (document ? dirname(document) : "");
+  if (dir) return { name: profile?.name || basename(dir), dir, home: profile?.home || dirname(dirname(dir)) };
+  const i = runtime.argv.indexOf("--profile");
+  const inline = runtime.argv.find((arg) => arg.startsWith("--profile="));
+  const name = (i >= 0 ? runtime.argv[i + 1] : "") || inline?.slice(10)
+    || runtime.env.DSH_PROFILE || (runtime.versions?.electron ? "desktop" : "web");
+  const home = runtime.env.DSH_HOME?.trim() || join(os.homedir(), ".dsh");
+  return { name, home, dir: join(home, "profiles", name) };
+}
+
+/** Desktop Host index.js is not a CLI; use its sibling cli.js instead. */
+function cliEntry(runtime = process, exists = existsSync) {
+  const candidates = [];
+  const boot = runtime.argv[1];
+  if (typeof boot === "string") {
+    if (/[\\/]dsh-desktop-host[\\/]lib[\\/]index\.js$/.test(boot)) {
+      candidates.push(join(dirname(boot), "cli.js"));
+    } else if (/[\\/]dsh[\\/]lib[\\/]bin\.js$/.test(boot)
+      || /[\\/]dsh-desktop-host[\\/]lib[\\/]cli\.js$/.test(boot)) candidates.push(boot);
+  }
+  if (runtime.resourcesPath) candidates.push(join(runtime.resourcesPath,
+    "app.asar", "dsh", "node_modules", "@deepseek-ai", "dsh-desktop-host", "lib", "cli.js"));
+  // In Electron's Node child resourcesPath can be absent, but execPath is still
+  // the app binary. macOS stores resources next to MacOS; Windows/Linux beside it.
+  if (runtime.versions?.electron) {
+    for (const resources of [join(dirname(runtime.execPath), "resources"), join(dirname(runtime.execPath), "..", "Resources")]) {
+      candidates.push(join(resources, "app.asar", "dsh", "node_modules", "@deepseek-ai", "dsh-desktop-host", "lib", "cli.js"));
+    }
+  }
+  if (!runtime.versions?.electron) {
+    try { candidates.push(join(dirname(require.resolve("@deepseek-ai/dsh/package.json")), "lib", "bin.js")); } catch { /* optional CLI */ }
+  }
+  return candidates.find((candidate) => exists(candidate));
+}
+
+function runInstall(pkg, profile, runtime = process, execute = execFile, exists = existsSync) {
+  const bin = cliEntry(runtime, exists);
+  if (!bin) return Promise.resolve({ code: 1, stdout: "", stderr: "cannot locate the dsh CLI entry" });
+  const args = [...(runtime.versions?.electron ? ["--expose-internals"] : []),
+    bin, "plugin", "--profile", profile.name, "add", pkg];
+  return new Promise((resolve) => {
+    try {
+      execute(runtime.execPath, args, {
+        env: { ...runtime.env, DSH_HOME: profile.home, ELECTRON_RUN_AS_NODE: "1" },
+        timeout: 5 * 60 * 1000,
+        maxBuffer: 8 * 1024 * 1024,
+        windowsHide: true,
+      }, (error, stdout, stderr) => resolve({ code: error ? (error.code ?? 1) : 0, stdout, stderr }));
+    } catch (error) {
+      resolve({ code: 1, stdout: "", stderr: String(error.message || error) });
+    }
+  });
+}
+
+/** Let the current HMR transaction finish, and retry transient write refusals. */
+async function writeState(settings, ns, patch, wait = (ms) => new Promise((resolve) => setTimeout(resolve, ms))) {
+  if (!settings) throw new Error("settings service unavailable");
+  for (let attempt = 1; attempt <= 6; attempt++) {
+    try {
+      const result = await settings.update(ns, patch);
+      if (result === false) throw new Error("settings state write refused");
+      return;
+    } catch (error) {
+      if (attempt === 6) throw error;
+      await wait(400 * attempt);
+    }
+  }
+}
+
+export { activeProfile, cliEntry, runInstall, writeState };