@1e0zj/dsh-plugin-mall 0.4.7 → 0.4.14

package/src/client.js

@@ -29,6 +29,7 @@ window.__ModuleLoader__.load({
       ".mkt_btnSm{padding:3px 10px;font-size:12px}",
       ".mkt_error{color:var(--dsw-alias-state-error-primary);font-size:12px;line-height:18px}",
       ".mkt_notice{border-left:3px solid var(--dsw-alias-state-error-primary);background:var(--dsw-alias-bg-layer-2);color:var(--dsw-alias-state-error-primary);padding:7px 10px;font-size:12px;line-height:18px;overflow-wrap:anywhere}",
+      ".mkt_noticeInfo{border-left-color:var(--dsw-alias-state-accent-primary);color:inherit}",
       ".mkt_list{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:10px;align-items:stretch;min-width:0}",
       "@media (max-width:820px){.mkt_list{grid-template-columns:minmax(0,1fr)}}",
       ".mkt_listHead{grid-column:1/-1;font-size:12px;color:var(--dsw-alias-label-tertiary)}",
@@ -395,6 +396,13 @@ window.__ModuleLoader__.load({
       return h("div", { className: "mkt_notice", role: "alert" }, props.message);
     }
 
+    // 状态性提示（区别于 ErrorNotice 的 role=alert）：「重启已调度」这类
+    // 成功路径的进展信息，页面自动重连后随刷新自然消失。
+    function StatusNotice(props) {
+      if (!props.message) return null;
+      return h("div", { className: "mkt_notice mkt_noticeInfo", role: "status" }, props.message);
+    }
+
     function RestartDialog(props) {
       useEffect(function () {
         function onKeyDown(event) {
@@ -435,7 +443,7 @@ window.__ModuleLoader__.load({
         meta: clip(props.spec || "", 50),
         actions: actions,
       },
-        props.detail ? h("div", { className: "mkt_desc" }, props.detail) : null,
+        h("div", { className: "mkt_desc" }, "pnpm 已拦截下列安装脚本，尚未执行任何插件代码。允许后会先复核制品再运行；暂不允许时，重启 dsh 会自动撤回这次安装。"),
         pkgs.map(function (p, index) {
           var facts = [];
           if (typeof p.weeklyDownloads === "number") facts.push("周下载 " + p.weeklyDownloads.toLocaleString());
@@ -601,7 +609,6 @@ window.__ModuleLoader__.load({
             job.needsApproval && job.needsApproval.length > 0
               ? h(ApprovalRequest, {
                 spec: job.spec,
-                detail: job.detail,
                 needsApproval: job.needsApproval,
                 busy: props.approving === job.spec,
                 onApprove: function (names) {
@@ -764,6 +771,9 @@ window.__ModuleLoader__.load({
       var _restarting = useState(false);
       var restarting = _restarting[0];
       var setRestarting = _restarting[1];
+      var _restartNote = useState(null);
+      var restartNote = _restartNote[0];
+      var setRestartNote = _restartNote[1];
       var _restartConfirm = useState(false);
       var restartConfirm = _restartConfirm[0];
       var setRestartConfirm = _restartConfirm[1];
@@ -1026,10 +1036,18 @@ window.__ModuleLoader__.load({
         clearRestartPing();
         setRestarting(true);
         setError(null);
+        setRestartNote(null);
         var requestedAt = Date.now();
         var previousHostStartedAt = Number(hostStartedAt);
-        call("restart", {}).then(function () {
+        var scheduledLogPath = null;
+        call("restart", {}).then(function (value) {
           if (restartControlRef.current.mounted !== true) return;
+          // 响应语义是「已调度交接」而不是「重启成功」：新宿主何时接管
+          // 由下面的轮询判断。这里只把输出会出现在哪里告诉用户。
+          scheduledLogPath = value && value.logPath ? String(value.logPath) : null;
+          setRestartNote(value && value.mode === "visible"
+            ? "重启已调度——dsh 正在新的控制台窗口中启动，窗口里 Ctrl+C 可停止；输出同时写入 " + scheduledLogPath
+            : "重启已调度，输出与日志：" + (scheduledLogPath || "<home>/guard/ 下"));
           var tries = 0;
           var ping = setInterval(function () {
             if (restartControlRef.current.mounted !== true) {
@@ -1040,7 +1058,8 @@ window.__ModuleLoader__.load({
             if (tries > 40) {
               clearRestartPing();
               setRestarting(false);
-              reportError("restart", "2 分钟内未检测到 dsh 重启完成，请手动检查 dsh 状态后刷新页面。");
+              reportError("restart", "2 分钟内未检测到 dsh 重启完成，请手动检查 dsh 状态后刷新页面。"
+                + (scheduledLogPath ? "输出与日志：" + scheduledLogPath : ""));
               return;
             }
             // Prefer identity change over wall-clock ordering: NTP may move the
@@ -1063,6 +1082,7 @@ window.__ModuleLoader__.load({
           if (restartControlRef.current.mounted !== true) return;
           clearRestartPing();
           setRestarting(false);
+          setRestartNote(null);
           reportError("restart", e);
         });
       }, [call, clearRestartPing, hostStartedAt, reportError]);
@@ -1128,6 +1148,7 @@ window.__ModuleLoader__.load({
             "只看已验证插件")
         ),
         h(ErrorNotice, { message: error && (error.scope === "search" || error.scope === "restart") ? error.message : null }),
+        restarting ? h(StatusNotice, { message: restartNote }) : null,
         h(InstalledPanel, {
           installed: installed,
           removing: removing,

package/src/guard.js

@@ -24,8 +24,10 @@ import {
 import { homedir, tmpdir } from "node:os";
 import { basename, delimiter, dirname, isAbsolute, join, relative, resolve, sep } from "node:path";
 import { createRequire } from "node:module";
+import { createHash } from "node:crypto";
 import { JSON_SCHEMA, Type, load } from "js-yaml";
 import { satisfies, validRange } from "semver";
+import { stripTerminalControlSequences } from "./terminal.js";
 
 // Official patches (e.g. @deepseek-ai/dsh-base, dsh-web-app) mark raw JS
 // expressions with the scalar tag `!!js`. Construct the loader's own marker —
@@ -1450,6 +1452,84 @@ export function validateInstalledProfile(profileDir) {
   };
 }
 
+/** Stable identity for one installed-profile blocker across a transaction. */
+function staticBlockerFingerprint(entry) {
+  const canonical = (value) => {
+    if (Array.isArray(value)) return value.map(canonical);
+    if (value !== null && typeof value === "object") {
+      return Object.fromEntries(Object.keys(value).sort().map((key) => [key, canonical(value[key])]));
+    }
+    return value;
+  };
+  return createHash("sha256").update(JSON.stringify(canonical(entry))).digest("hex");
+}
+
+function staticBlockerFingerprints(validation) {
+  return validation.issues
+    .filter((entry) => entry.severity === "block")
+    .map(staticBlockerFingerprint);
+}
+
+/**
+ * Validate the live profile relative to the state captured before a pending
+ * transaction. An unchanged blocker that was already present did not come
+ * from this install/remove and must not make the transaction roll back. New
+ * markers carry the baseline; old markers do not, and deliberately retain the
+ * old fail-closed behaviour.
+ */
+export function validatePendingProfile(profileDir, pending = readValidatedPendingSnapshot(profileDir)) {
+  const validation = validateInstalledProfile(profileDir);
+  if (!Array.isArray(pending?.baselineBlockers)) {
+    return { ...validation, allIssues: validation.issues, preexistingIssues: [] };
+  }
+
+  const candidateName = pending.preflight?.candidate?.name ?? pending.candidate?.name;
+  const remaining = new Map();
+  for (const fingerprint of pending.baselineBlockers) {
+    remaining.set(fingerprint, (remaining.get(fingerprint) ?? 0) + 1);
+  }
+  const issues = [];
+  const preexistingIssues = [];
+  for (const entry of validation.issues) {
+    if (entry.severity !== "block") {
+      issues.push(entry);
+      continue;
+    }
+    // Updating the package that owns (or participates in) an old blocker must
+    // prove that blocker was actually fixed. Only unrelated historical issues
+    // receive baseline treatment.
+    const candidateRelated = entry.package === candidateName
+      || (Array.isArray(entry.conflictsWith) && entry.conflictsWith.includes(candidateName));
+    if (candidateRelated) {
+      issues.push(entry);
+      continue;
+    }
+    const fingerprint = staticBlockerFingerprint(entry);
+    const count = remaining.get(fingerprint) ?? 0;
+    if (count > 0) {
+      preexistingIssues.push(entry);
+      remaining.set(fingerprint, count - 1);
+    } else {
+      issues.push(entry);
+    }
+  }
+  const blockers = issues.filter((entry) => entry.severity === "block");
+  const warnings = issues.filter((entry) => entry.severity === "warn");
+  const verdict = blockers.length > 0 ? "blocked" : warnings.length > 0 ? "warning" : "safe";
+  return {
+    ok: blockers.length === 0,
+    verdict,
+    issues,
+    allIssues: validation.issues,
+    preexistingIssues,
+    summary: blockers.length > 0
+      ? `发现 ${blockers.length} 个本次新增阻断问题、${preexistingIssues.length} 个既有阻断问题、${warnings.length} 个警告`
+      : preexistingIssues.length > 0
+        ? `本次变更未新增阻断问题（保留 ${preexistingIssues.length} 个既有阻断问题）`
+        : validation.summary,
+  };
+}
+
 /**
  * Remove leftover `node_modules` entries for packages that are no longer part
  * of the profile's declared dependencies. pnpm hoists each direct dependency
@@ -1723,7 +1803,7 @@ function spawnCapture(command, args, options, onOutput, { signal, treeKill = fal
     let child;
     const chunks = [];
     const push = (value) => {
-      const text = value.toString();
+      const text = stripTerminalControlSequences(value);
       chunks.push(text);
       onOutput?.(text);
     };
@@ -1831,7 +1911,7 @@ export async function preflightInstall({ profileDir, spec, onOutput, signal }) {
     const result = await spawnCapture(
       plan.command,
       probeAddArgs(spec),
-      { cwd: probeDir, env: process.env, shell: plan.shell },
+      { cwd: probeDir, env: pnpmGuardEnv(process.env), shell: plan.shell },
       onOutput,
       { signal, treeKill: plan.treeKill },
     );
@@ -1998,6 +2078,9 @@ function assertStoredTransactionMatches(pending) {
   if (pending.operation === "remove" && stored.metadata.packageName !== pending.metadata.packageName) {
     throw new Error("pending remove packageName does not match snapshot.json — refusing to act on it (left untouched for manual inspection)");
   }
+  if (JSON.stringify(stored.baselineBlockers) !== JSON.stringify(pending.baselineBlockers)) {
+    throw new Error("pending marker baseline blockers do not match snapshot.json — refusing to act on it (left untouched for manual inspection)");
+  }
 }
 
 /**
@@ -2037,6 +2120,12 @@ function sanitizeSnapshot(marker, home) {
   if (!Array.isArray(marker.dependencies) || marker.dependencies.some((name) => typeof name !== "string" || !NPM_PACKAGE_NAME_RE.test(name))) {
     throw new Error("pending marker has missing or corrupt dependency metadata — refusing to act on it (left untouched for manual inspection)");
   }
+  if (marker.baselineBlockers !== undefined && (
+    !Array.isArray(marker.baselineBlockers)
+    || marker.baselineBlockers.some((fingerprint) => typeof fingerprint !== "string" || !/^[a-f0-9]{64}$/.test(fingerprint))
+  )) {
+    throw new Error("pending marker has corrupt baseline blocker metadata — refusing to act on it (left untouched for manual inspection)");
+  }
   validatePendingTransaction(marker);
   const profileDir = resolve(String(marker.profileDir ?? ""));
   const profilesRoot = resolve(join(home, "profiles"));
@@ -2090,7 +2179,12 @@ export function createProfileSnapshot(profileDir, metadata = {}) {
   } catch {
     /* manifest unreadable — the rest of the snapshot still captures the bytes */
   }
-  const snapshot = { version: SNAPSHOT_VERSION, id, dir, profileDir, createdAt: Date.now(), files, dependencies, operation: normalizedMetadata.operation, metadata: normalizedMetadata };
+  // Static validation after an install must judge what THIS transaction
+  // changed. Without this baseline, an unrelated legacy plugin that already
+  // shadowed host modules made every later update look guilty and forced the
+  // marketplace itself back to its old version on restart.
+  const baselineBlockers = staticBlockerFingerprints(validateInstalledProfile(profileDir));
+  const snapshot = { version: SNAPSHOT_VERSION, id, dir, profileDir, createdAt: Date.now(), files, dependencies, baselineBlockers, operation: normalizedMetadata.operation, metadata: normalizedMetadata };
   writeFileSync(join(dir, "snapshot.json"), JSON.stringify(snapshot, undefined, 2) + "\n");
   return snapshot;
 }
@@ -2127,7 +2221,7 @@ export function markPendingSnapshot(snapshot, record = {}) {
   if (existsSync(markerPath)) {
     throw new Error(`profile already has a pending install marker at ${markerPath} — run \`dsh-plugin-guard guard recover\` (or let dsh startup recovery consume it) before installing again`);
   }
-  const pending = { ...snapshot, ...record, pendingAt: Date.now() };
+  const pending = { ...snapshot, ...record, baselineBlockers: snapshot.baselineBlockers, pendingAt: Date.now() };
   // Reject producer bugs before persisting them. The read/recovery boundary
   // repeats this validation because the marker is attacker-controllable.
   validatePendingTransaction(pending);
@@ -2212,6 +2306,13 @@ function addedDependencyNames(pending, originalDependencies = pending?.dependenc
 export function pnpmGuardEnv(base = process.env) {
   return {
     ...base,
+    // Browser jobs render plain text rather than a terminal. Prevent pnpm from
+    // emitting colours at the source; output capture also strips CSI controls
+    // defensively in case a child ignores these conventional switches.
+    NO_COLOR: "1",
+    FORCE_COLOR: "0",
+    npm_config_color: "false",
+    NPM_CONFIG_COLOR: "false",
     npm_config_auto_install_peers: "false",
     NPM_CONFIG_AUTO_INSTALL_PEERS: "false",
   };
@@ -2855,7 +2956,7 @@ export function recoverProfile(profileDir) {
       rebuild: rolled?.rebuild,
     };
   }
-  const validation = validateInstalledProfile(profileDir);
+  const validation = validatePendingProfile(profileDir, pending);
   const candidateName = pending.preflight?.candidate?.name ?? pending.candidate?.name;
   const removeValidation = isRemove
     ? validateRemoveCompletion(pending.profileDir, candidateName)
@@ -3958,6 +4059,58 @@ async function selfTest() {
       if (existsSync(snap.dir)) throw new Error("recoverProfile commit should delete the snapshot dir");
     }
 
+    // A blocker that predates the transaction is still a real profile problem,
+    // but it is not evidence that this update broke the profile. This is the
+    // reported marketplace self-update failure: an unrelated legacy plugin
+    // shadows host modules, so the new mall version used to be rolled back.
+    {
+      const p = join(root, "profiles", "preexisting-blocker");
+      mkdirSync(join(p, "node_modules", "legacy"), { recursive: true });
+      mkdirSync(join(p, "node_modules", "good"), { recursive: true });
+      writeFileSync(join(p, "package.json"), JSON.stringify({ dependencies: { legacy: "1.0.0", good: "1.0.0" } }));
+      writeFileSync(join(p, "cordis.patch.yml"), "[]\n");
+      writeFileSync(join(p, "node_modules", "legacy", "package.json"), JSON.stringify({
+        name: "legacy", version: "1.0.0", dependencies: { "@deepseek-ai/dsh-llm": "*" },
+      }));
+      writeFileSync(join(p, "node_modules", "good", "package.json"), JSON.stringify({ name: "good", version: "1.0.0" }));
+      if (validateInstalledProfile(p).issues.filter((entry) => entry.code === "host-module-shadow").length !== 1) {
+        throw new Error("pre-existing blocker fixture prerequisite failed");
+      }
+      const snap = createProfileSnapshot(p, { fixture: true });
+      markPendingSnapshot(snap, { spec: "good@2.0.0", preflight: { candidate: { name: "good", version: "2.0.0", kind: "plain" } } });
+      writeFileSync(join(p, "package.json"), JSON.stringify({ dependencies: { legacy: "1.0.0", good: "2.0.0" } }));
+      writeFileSync(join(p, "node_modules", "good", "package.json"), JSON.stringify({ name: "good", version: "2.0.0" }));
+      const relative = validatePendingProfile(p);
+      if (!relative.ok || relative.preexistingIssues.length !== 1 || relative.issues.some((entry) => entry.severity === "block")) {
+        throw new Error(`unchanged pre-existing blocker must not condemn this update: ${JSON.stringify(relative)}`);
+      }
+      const rec = recoverProfile(p);
+      if (rec.action !== "committed") throw new Error(`unchanged pre-existing blocker should commit this update, got ${rec.action}`);
+      if (readJson(join(p, "node_modules", "good", "package.json")).version !== "2.0.0") {
+        throw new Error("committing past a pre-existing blocker must keep the updated candidate");
+      }
+      console.log("PASS pending 基线：既有宿主模块 blocker 不再回滚无关更新");
+
+      const candidateProfile = join(root, "profiles", "candidate-own-blocker");
+      mkdirSync(join(candidateProfile, "node_modules", "legacy"), { recursive: true });
+      writeFileSync(join(candidateProfile, "package.json"), JSON.stringify({ dependencies: { legacy: "1.0.0" } }));
+      writeFileSync(join(candidateProfile, "cordis.patch.yml"), "[]\n");
+      writeFileSync(join(candidateProfile, "node_modules", "legacy", "package.json"), JSON.stringify({
+        name: "legacy", version: "1.0.0", dependencies: { "@deepseek-ai/dsh-llm": "*" },
+      }));
+      const ownSnap = createProfileSnapshot(candidateProfile, { fixture: true });
+      markPendingSnapshot(ownSnap, { spec: "legacy@2.0.0", preflight: { candidate: { name: "legacy", version: "2.0.0", kind: "plain" } } });
+      writeFileSync(join(candidateProfile, "node_modules", "legacy", "package.json"), JSON.stringify({
+        name: "legacy", version: "2.0.0", dependencies: { "@deepseek-ai/dsh-llm": "*" },
+      }));
+      const own = validatePendingProfile(candidateProfile);
+      if (own.ok || !own.issues.some((entry) => entry.code === "host-module-shadow")) {
+        throw new Error("an updated candidate must not inherit an exemption for its own old blocker");
+      }
+      commitPendingSnapshot(candidateProfile);
+      console.log("PASS pending 基线：候选自身的既有 blocker 必须在更新中修复");
+    }
+
     // Approval-pause mark, part 1: a paused marker must NEVER commit on
     // recovery — not even when the static validation would pass (the version
     // sits there with its build scripts never approved; committing would drop
@@ -4602,6 +4755,21 @@ async function selfTest() {
       if (env.npm_config_auto_install_peers !== "false" || env.NPM_CONFIG_AUTO_INSTALL_PEERS !== "false") {
         throw new Error("pnpmGuardEnv must disable peer auto-install");
       }
+      if (env.NO_COLOR !== "1" || env.FORCE_COLOR !== "0"
+        || env.npm_config_color !== "false" || env.NPM_CONFIG_COLOR !== "false") {
+        throw new Error("pnpmGuardEnv must disable terminal colours for browser job logs");
+      }
+
+      let streamed = "";
+      const coloured = await spawnCapture(
+        process.execPath,
+        ["-e", "process.stdout.write('\\u001b[96mprobe ok\\u001b[39m\\n')"],
+        { env: process.env, shell: false },
+        (text) => { streamed += text; },
+      );
+      if (coloured.exitCode !== 0 || coloured.output !== "probe ok\n" || streamed !== "probe ok\n") {
+        throw new Error(`spawnCapture must strip terminal controls from captured and streamed logs: ${JSON.stringify({ coloured, streamed })}`);
+      }
     }
 
     // candidateRestoredCompatible: version vs the restored dependency spec.
@@ -5279,4 +5447,4 @@ if (process.argv[1]?.endsWith("guard.js") && process.argv.includes("--self-test"
     console.error(`FAIL ${error.stack ?? error.message}`);
     process.exitCode = 1;
   });
-}
+}