@1e0zj/dsh-plugin-mall 0.1.8 → 0.1.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@1e0zj/dsh-plugin-mall",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "description": "dsh 插件市场：搜索 GitHub dsh-plugin 话题下的插件仓库，一键安装到本地 dsh profile（agent 工具 + 设置页插件市场 tab）",
   "type": "module",
   "main": "src/index.js",

package/src/client.js

@@ -161,7 +161,7 @@ window.__ModuleLoader__.load({
           verifyBadge(props.verified),
           item.archived ? h("span", { className: "mkt_badge" }, "archived") : null
         ),
-        item.description ? h("div", { className: "mkt_desc" }, clip(item.description, 180)) : null,
+        item.description ? h("div", { className: "mkt_desc" }, item.description) : null,
         h("div", { className: "mkt_metaRow" },
           h("span", { className: "mkt_meta" }, "★" + item.stars),
           item.language ? h("span", { className: "mkt_meta" }, item.language) : null,
@@ -293,10 +293,17 @@ window.__ModuleLoader__.load({
       var _retryAt = useState(0);
       var retryAt = _retryAt[0];
       var setRetryAt = _retryAt[1];
+      var _restarting = useState(false);
+      var restarting = _restarting[0];
+      var setRestarting = _restarting[1];
 
       var call = useCallback(function (endpoint, payload) {
         return rpc.call("/market", endpoint, payload || {}).then(function (res) {
-          if (!res || res.ok !== true) throw new Error((res && res.error) || "market request failed");
+          if (!res || res.ok !== true) {
+            var err = res && res.error;
+            var msg = err && typeof err === "object" ? (err.message || JSON.stringify(err)) : (err || "market request failed");
+            throw new Error(msg);
+          }
           return res.value;
         });
       }, [rpc]);
@@ -418,6 +425,30 @@ window.__ModuleLoader__.load({
         doInstallSpec("github:" + repo);
       }, [doInstallSpec]);
 
+      // 一键重启：loopback-only 的 /market restart 端点会 detached 拉起新的
+      // dsh 进程后退出当前进程；这里轮询 host 恢复后自动刷新页面。
+      var doRestart = useCallback(function () {
+        if (typeof window !== "undefined" && typeof window.confirm === "function") {
+          if (window.confirm("重启 dsh？正在进行的任务会中断。") !== true) return;
+        }
+        setRestarting(true);
+        setError(null);
+        call("restart", {}).then(function () {
+          var tries = 0;
+          var ping = setInterval(function () {
+            tries++;
+            if (tries > 40) { clearInterval(ping); return; }
+            rpc.call("/market", "installed", {}).then(function () {
+              clearInterval(ping);
+              window.location.reload();
+            }).catch(function () { /* host 还在重启，继续等 */ });
+          }, 3000);
+        }).catch(function (e) {
+          setRestarting(false);
+          setError(errorText(e));
+        });
+      }, [call, rpc]);
+
       var doUninstall = useCallback(function (name) {
         setRemoving(function (prev) {
           var next = Object.assign({}, prev, { [name]: true });
@@ -478,6 +509,7 @@ window.__ModuleLoader__.load({
           ),
           h("button", { className: "mkt_btn mkt_btnPrimary", disabled: loading, onClick: doSearch }, loading ? "搜索中…" : "搜索"),
           h("button", { className: "mkt_btn", onClick: refreshInstalled }, "刷新已装"),
+          h("button", { className: "mkt_btn mkt_btnDanger", disabled: restarting, onClick: doRestart }, restarting ? "重启中…" : "重启 dsh"),
           h("label", { className: "mkt_check" },
             h("input", { type: "checkbox", checked: verifiedOnly, onChange: function (e) { setVerifiedOnly(e.target.checked); } }),
             "只看已验证插件")

package/src/index.js

@@ -17,6 +17,7 @@ import z from "@deepseek-ai/schemastery";
 import { defineTool } from "@deepseek-ai/dsh-tools";
 import { existsSync, readFileSync } from "node:fs";
 import { join } from "node:path";
+import { spawn } from "node:child_process";
 import { resolveProfileDir } from "@deepseek-ai/dsh-app-boot";
 import { repoInfo, searchPlugins, verifyPlugins, preferNpmSpec, npmPackageInfo, compareVersions } from "./github.js";
 import { ensureProfile, listInstalled, normalizeSpec, runInstall, runRemove, createJobTracker } from "./installer.js";
@@ -28,6 +29,7 @@ export const Config = z.object({
   defaultProfile: z.string().default("web"),
   apiBase: z.string().default("https://api.github.com"),
   perPageMax: z.number().default(30),
+  allowRestart: z.boolean().default(true),
 });
 
 /** Clip long strings for compact model-facing output. */
@@ -128,7 +130,10 @@ function rpcOk(value) {
 }
 
 function rpcFail(error) {
-  return { ok: false, error: error?.message ?? String(error) };
+  // dsh connection RPC 的响应信封校验（dsh-client-connection rpcResultSchema）
+  // 要求 error 为 discriminated object：{code, message, details}。code 取
+  // 通用 "internal"，否则整条错误会被 zod 以 invalid_union 吞掉。
+  return { ok: false, error: { code: "internal", message: error?.message ?? String(error), details: {} } };
 }
 
 /**
@@ -145,7 +150,7 @@ function rpcFail(error) {
  * @returns the {ok, value|error} envelope.
  */
 async function rpcDispatch(ctx, endpoint, payload, config, token, tracker) {
-  const { defaultProfile = "web", apiBase = "https://api.github.com", perPageMax = 30 } = config;
+  const { defaultProfile = "web", apiBase = "https://api.github.com", perPageMax = 30, allowRestart = true } = config;
   switch (endpoint) {
     case "search": {
       const perPage = Math.min(Math.max(Math.trunc(payload?.perPage ?? 10) || 10, 1), Math.trunc(perPageMax) || 30);
@@ -246,6 +251,25 @@ async function rpcDispatch(ctx, endpoint, payload, config, token, tracker) {
         return rpcFail(error);
       }
     }
+    case "restart": {
+      // 一键重启：detached 拉起新 dsh 进程（用当前进程的 argv 重建启动命令）
+      // 后退出自己。仅 loopback 直连可调（channel 级 authority 已限制）；
+      // allowRestart:false 时禁用（进程由 systemd/pm2 等托管时接管重启）。
+      if (allowRestart !== true) return rpcFail(new Error("restart disabled by config (allowRestart: false)"));
+      const script = process.argv[1];
+      const scriptArgs = process.argv.slice(2);
+      if (typeof script !== "string" || script.length === 0 || !existsSync(script)) {
+        return rpcFail(new Error("cannot determine the dsh launch command for an automatic restart — please restart manually"));
+      }
+      const relaunch = `"${process.execPath}" "${script}"${scriptArgs.length > 0 ? ` ${scriptArgs.map((arg) => `"${arg}"`).join(" ")}` : ""}`;
+      const launcher = process.platform === "win32"
+        ? `timeout /t 2 /nobreak >nul & ${relaunch}`
+        : `sleep 2 && ${relaunch}`;
+      const child = spawn(launcher, { shell: true, detached: true, stdio: "ignore", cwd: process.cwd(), windowsHide: true });
+      child.unref();
+      setTimeout(() => process.exit(0), 800);
+      return rpcOk({ restarting: true });
+    }
     case "jobCancel": {
       try {
         return rpcOk({ result: tracker.cancel(payload?.jobId) });

package/src/installer.js

@@ -361,6 +361,35 @@ export function createJobTracker() {
   };
 }
 
+// ── pnpm self-heal (corepack) ───────────────────────────────────────────────
+
+/**
+ * Try to provision pnpm once via `corepack enable pnpm` (corepack ships with
+ * Node). Output lands in the caller's job log; returns whether a retry of the
+ * pnpm spawn is worth attempting.
+ */
+async function enablePnpmViaCorepack(push) {
+  push("\n[dsh-plugin-mall] pnpm not found on PATH — trying `corepack enable pnpm` once\n");
+  return await new Promise((resolve) => {
+    let proc;
+    try {
+      proc = spawn("corepack", ["enable", "pnpm"], {
+        env: process.env,
+        shell: process.platform === "win32",
+        stdio: ["ignore", "pipe", "pipe"],
+        windowsHide: true,
+      });
+    } catch {
+      resolve(false);
+      return;
+    }
+    proc.on("error", () => resolve(false));
+    proc.stdout?.on("data", (data) => push(data.toString()));
+    proc.stderr?.on("data", (data) => push(data.toString()));
+    proc.on("close", (code) => resolve(code === 0));
+  });
+}
+
 // ── the background install job ──────────────────────────────────────────────
 
 /**
@@ -381,6 +410,7 @@ export function runInstall({ profile, spec }) {
     deltaQueue.push(text);
   };
   let current = undefined;
+  let pnpmSelfHealed = false;
 
   const spawnAdd = () => {
     const proc = spawn("pnpm", ["add", spec, "--reporter=append-only"], {
@@ -427,6 +457,17 @@ export function runInstall({ profile, spec }) {
 
   const settle = async (outcome) => {
     if (outcome.spawnError !== undefined) {
+      // pnpm 缺失时先尝试 corepack 自愈一次，成功则重跑安装。
+      if (outcome.spawnError.code === "ENOENT" && !pnpmSelfHealed) {
+        pnpmSelfHealed = true;
+        const healed = await enablePnpmViaCorepack(push);
+        if (healed) {
+          const retry = spawnAdd();
+          current = retry.proc;
+          return settle(await retry.done);
+        }
+        return { status: "failed", detail: "pnpm not found on PATH and `corepack enable pnpm` could not provision it — install pnpm (e.g. `npm i -g pnpm`) to manage profile plugins" };
+      }
       const hint = outcome.spawnError.code === "ENOENT"
         ? "pnpm not found on PATH — install pnpm (e.g. `corepack enable pnpm`) to manage profile plugins"
         : `could not start pnpm: ${outcome.spawnError.message}`;
@@ -490,7 +531,7 @@ function failedNow(detail) {
  * `dsh.profile.bundles` (the removed dependency's bundle entry drops out) and
  * deletes the client loader row `ensureClientRow` had registered for it.
  */
-export function runRemove({ profile, packageName }) {
+export function runRemove({ profile, packageName }, selfHealed = false) {
   let profileDir;
   try {
     profileDir = resolveProfileDir(profile);
@@ -522,8 +563,13 @@ export function runRemove({ profile, packageName }) {
   const done = new Promise((resolve) => {
     proc.on("error", (error) => resolve({ spawnError: error }));
     proc.on("close", (exitCode) => resolve({ exitCode, signal: proc.signalCode }));
-  }).then((outcome) => {
+  }).then(async (outcome) => {
     if (outcome.spawnError !== undefined) {
+      // pnpm 缺失时先 corepack 自愈一次再重试（重试在新 producer 里跑）。
+      if (outcome.spawnError.code === "ENOENT" && selfHealed !== true) {
+        const healed = await enablePnpmViaCorepack(() => {});
+        if (healed) return runRemove({ profile, packageName }, true);
+      }
       const hint = outcome.spawnError.code === "ENOENT"
         ? "pnpm not found on PATH — install pnpm (e.g. `corepack enable pnpm`) to manage profile plugins"
         : `could not start pnpm: ${outcome.spawnError.message}`;