@1e0zj/dsh-plugin-mall 0.4.6 → 0.4.12

package/src/client.js

@@ -28,6 +28,8 @@ window.__ModuleLoader__.load({
       ".mkt_btnDanger:hover:not(:disabled){border-color:var(--dsw-alias-state-error-primary);color:var(--dsw-alias-state-error-primary)}",
       ".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)}",
@@ -43,8 +45,9 @@ window.__ModuleLoader__.load({
       ".mkt_panelTitle{font-size:13px;font-weight:600;color:var(--dsw-alias-label-primary);margin:0}",
       ".mkt_panelRow{display:flex;align-items:center;gap:8px}",
       ".mkt_panelRow .mkt_link{margin-left:auto}",
-      ".mkt_pre{font-family:Consolas,Monaco,monospace;font-size:11.5px;line-height:16px;color:var(--dsw-alias-label-secondary);background:var(--dsw-alias-markdown-code-block);border-radius:6px;padding:8px;max-height:220px;overflow:auto;white-space:pre-wrap;word-break:break-all}",
+      ".mkt_pre{box-sizing:border-box;width:100%;max-width:100%;min-width:0;font-family:Consolas,Monaco,monospace;font-size:11.5px;line-height:16px;color:var(--dsw-alias-label-secondary);background:var(--dsw-alias-markdown-code-block);border-radius:6px;padding:8px;max-height:280px;overflow:auto;white-space:pre;word-break:normal}",
       ".mkt_ok{color:var(--dsw-alias-state-success-primary)}",
+      ".mkt_warn{color:var(--dsw-alias-state-warn-label)}",
       ".mkt_badge{display:inline-block;border-radius:999px;padding:1px 8px;font-size:11px;border:1px solid var(--dsw-alias-border-l2);color:var(--dsw-alias-label-tertiary)}",
       ".mkt_badgeOk{border-color:var(--dsw-alias-state-success-primary);color:var(--dsw-alias-state-success-primary)}",
       ".mkt_badgeWarn{border-color:var(--dsw-alias-state-warn-primary);color:var(--dsw-alias-state-warn-label)}",
@@ -57,13 +60,31 @@ window.__ModuleLoader__.load({
       ".mkt_depList{display:flex;flex-direction:column;gap:6px;margin-top:8px}",
       ".mkt_depRow{display:flex;justify-content:space-between;align-items:center;gap:8px}",
       ".mkt_depActions{display:flex;align-items:center;gap:6px;flex-wrap:wrap}",
-      ".mkt_approve{display:flex;flex-direction:column;gap:8px;border:1px solid var(--dsw-alias-state-error-primary);border-radius:8px;padding:10px 12px;margin:4px 0}",
-      ".mkt_approveHead{font-size:13px;font-weight:600;color:var(--dsw-alias-state-error-primary)}",
+      ".mkt_decision{display:flex;flex-direction:column;border:1px solid var(--dsw-alias-state-warn-secondary);border-radius:6px;overflow:hidden;margin-top:4px}",
+      ".mkt_decisionError{border-color:var(--dsw-alias-state-error-primary)}",
+      ".mkt_decisionHead{display:flex;align-items:baseline;gap:8px;flex-wrap:wrap;padding:8px 10px;background:var(--dsw-alias-state-warn-tertiary);color:var(--dsw-alias-state-warn-label)}",
+      ".mkt_decisionError .mkt_decisionHead{background:var(--dsw-alias-bg-layer-2);color:var(--dsw-alias-state-error-primary)}",
+      ".mkt_decisionTitle{font-size:13px;font-weight:600}",
+      ".mkt_decisionBody{display:flex;flex-direction:column;gap:8px;min-width:0;padding:10px;max-height:300px;overflow:auto}",
+      ".mkt_decisionActions{display:flex;justify-content:flex-end;align-items:center;gap:8px;padding:8px 10px;border-top:1px solid var(--dsw-alias-border-l2);background:var(--dsw-alias-bg-layer-3)}",
       ".mkt_approvePkg{display:flex;flex-direction:column;gap:4px}",
       ".mkt_approveName{font-size:13px;font-weight:600;color:var(--dsw-alias-label-primary);margin-right:8px;overflow-wrap:anywhere}",
       ".mkt_approveCmd{max-height:none;margin:0}",
       ".mkt_jobDone{display:flex;align-items:center;gap:8px;flex-wrap:wrap;margin-top:2px}",
-      ".mkt_logBlock{display:flex;flex-direction:column;gap:4px;align-items:flex-start}",
+      ".mkt_logBlock{display:flex;flex-direction:column;gap:4px;align-items:stretch;min-width:0;max-width:100%}",
+      ".mkt_linkButton{align-self:flex-start;border:0;background:none;padding:0;color:var(--dsw-alias-state-business-primary);font:inherit;font-size:12px;cursor:pointer}",
+      ".mkt_job{display:flex;flex-direction:column;gap:6px;min-width:0;max-width:100%;padding-top:10px;border-top:1px solid var(--dsw-alias-border-l2)}",
+      ".mkt_panelRow + .mkt_job{padding-top:0;border-top:0}",
+      ".mkt_jobHead{display:flex;align-items:center;gap:8px;min-width:0}",
+      ".mkt_jobIdentity{display:flex;align-items:center;gap:7px;min-width:0;font-size:12px;color:var(--dsw-alias-label-tertiary)}",
+      ".mkt_jobHead .mkt_btn{margin-left:auto;flex:none}",
+      ".mkt_stateDot{width:7px;height:7px;border-radius:50%;background:var(--dsw-alias-label-caption);flex:none}",
+      ".mkt_stateRunning{background:var(--dsw-alias-state-business-primary);animation:mktPulse 1.6s ease-in-out infinite}",
+      ".mkt_stateDone{background:var(--dsw-alias-state-success-primary)}",
+      ".mkt_stateWarn{background:var(--dsw-alias-state-warn-primary)}",
+      ".mkt_stateError{background:var(--dsw-alias-state-error-primary)}",
+      "@keyframes mktPulse{0%,100%{opacity:.45}50%{opacity:1}}",
+      "@media (prefers-reduced-motion:reduce){.mkt_stateRunning{animation:none}.mkt_switch,.mkt_switchKnob{transition:none}}",
       ".mkt_depOff{opacity:.5;text-decoration:line-through}",
       ".mkt_switch{position:relative;width:34px;height:18px;border-radius:999px;border:1px solid var(--dsw-alias-border-l2);background:var(--dsw-alias-bg-module-platform);cursor:pointer;padding:0;transition:background .15s,border-color .15s}",
       ".mkt_switch:disabled{opacity:.55;cursor:default}",
@@ -71,11 +92,16 @@ window.__ModuleLoader__.load({
       ".mkt_switchKnob{position:absolute;top:1px;left:1px;width:14px;height:14px;border-radius:50%;background:var(--dsw-alias-label-primary-foreground);transition:transform .15s;box-shadow:var(--dsw-shadow-lv1)}",
       ".mkt_switchOn .mkt_switchKnob{transform:translateX(16px)}",
       ".mkt_issueList{list-style:none;display:flex;flex-direction:column;gap:8px;margin:0;padding:0}",
-      ".mkt_issue{border:1px solid var(--dsw-alias-border-l2);border-radius:8px;padding:8px 10px;background:var(--dsw-alias-bg-layer-3)}",
+      ".mkt_issue{border:1px solid var(--dsw-alias-border-l2);border-radius:6px;padding:8px 10px;background:var(--dsw-alias-bg-layer-3)}",
       ".mkt_issueBlock{border-color:var(--dsw-alias-state-error-primary)}",
       ".mkt_issueWarn{border-color:var(--dsw-alias-state-warn-primary)}",
       ".mkt_issueTitle{font-size:13px;font-weight:600;color:var(--dsw-alias-label-primary)}",
       ".mkt_issueDetail{font-size:12px;color:var(--dsw-alias-label-secondary);margin-top:4px;line-height:18px;overflow-wrap:anywhere}",
+      ".mkt_modalMask{position:fixed;inset:0;z-index:1000;display:flex;align-items:center;justify-content:center;padding:20px;background:var(--dsw-alias-bg-mask-3)}",
+      ".mkt_modal{width:min(420px,100%);max-height:min(520px,calc(100vh - 40px));display:flex;flex-direction:column;border:1px solid var(--dsw-alias-border-l2);border-radius:8px;background:var(--dsw-alias-bg-layer-3);box-shadow:var(--dsw-shadow-lv3)}",
+      ".mkt_modalHead{padding:14px 16px 8px;font-size:15px;font-weight:600;color:var(--dsw-alias-label-primary)}",
+      ".mkt_modalBody{padding:0 16px 14px;font-size:12.5px;line-height:19px;color:var(--dsw-alias-label-secondary);overflow:auto}",
+      ".mkt_modalActions{display:flex;justify-content:flex-end;gap:8px;padding:10px 16px;border-top:1px solid var(--dsw-alias-border-l2)}",
     ].join("\n");
     var tagId = "@1e0zj/dsh-plugin-mall/market-tab.css";
     if (typeof document !== "undefined" && document.querySelector("style[data-plugin-css=" + JSON.stringify(tagId) + "]") === null) {
@@ -102,6 +128,10 @@ window.__ModuleLoader__.load({
       return String(e && e.message ? e.message : e);
     }
 
+    function isJobActive(status) {
+      return status === "running" || status === "stopping";
+    }
+
     function kindLabel(kind) {
       if (kind === "bundle") return "宿主插件层";
       if (kind === "client") return "浏览器UI插件";
@@ -159,7 +189,7 @@ window.__ModuleLoader__.load({
           var current = jobsRef.current;
           var running = Object.keys(current).filter(function (id) {
             var job = current[id];
-            return job && job.status !== "completed" && job.status !== "failed" && job.status !== "killed";
+            return job && isJobActive(job.status);
           });
           if (running.length === 0) return;
           running.forEach(function (id) {
@@ -211,21 +241,23 @@ window.__ModuleLoader__.load({
           delete next[carryFromId];
         }
         for (var key in next) {
-          if (key !== id && next[key] && next[key].spec === spec && next[key].status !== "running") {
+          if (key !== id && next[key] && next[key].spec === spec && !isJobActive(next[key].status)) {
             delete next[key];
           }
         }
         next[id] = { status: "running", spec: spec, output: carried };
         commit(next);
       }, [commit]);
-      var clear = useCallback(function () {
-        commit({});
-      }, [commit]);
       var drop = useCallback(function (id) {
         var next = Object.assign({}, jobsRef.current);
         delete next[id];
         commit(next);
       }, [commit]);
+      var setStatus = useCallback(function (id, status) {
+        var current = jobsRef.current[id];
+        if (!current) return;
+        commit(Object.assign({}, jobsRef.current, { [id]: Object.assign({}, current, { status: status }) }));
+      }, [commit]);
       // 恢复后端任务记录（tracker.list 的形状）：安装事务改写
       // cordis.patch.yml 会让 dsh 重放装配树、整个市场 UI 重挂载，React
       // state 全丢——任务面板、完成提醒、重启按钮一起消失（真实事故：
@@ -269,7 +301,7 @@ window.__ModuleLoader__.load({
         for (var key in next) {
           if (serverIds[key]) continue;
           var stale = next[key];
-          if (stale.status === "running") {
+          if (isJobActive(stale.status)) {
             next[key] = Object.assign({}, stale, {
               status: "killed",
               detail: "宿主进程已重启，该任务的记录随之丢失",
@@ -282,7 +314,7 @@ window.__ModuleLoader__.load({
         }
         commit(next);
       }, [commit]);
-      return { jobs: jobs, track: track, clear: clear, drop: drop, restore: restore };
+      return { jobs: jobs, track: track, drop: drop, setStatus: setStatus, restore: restore };
     }
 
     // ── plugin verification badge ───────────────────────────────────────────
@@ -319,7 +351,10 @@ window.__ModuleLoader__.load({
       var installLabel = props.alreadyInstalled === true ? "已装" : "安装";
       var installDisabled = installing || props.alreadyInstalled === true;
       if (!installing && job) {
-        if (job.status === "running") { installLabel = "安装中…"; installDisabled = true; }
+        if (isJobActive(job.status)) {
+          installLabel = job.status === "stopping" ? "停止中…" : "安装中…";
+          installDisabled = true;
+        }
         else if (job.status === "completed") { installLabel = "已装 · 重启生效"; installDisabled = true; }
         else if (job.status === "failed") { installLabel = "安装失败 · 见任务日志"; }
         else { installLabel = "已取消 · 重试"; }
@@ -346,11 +381,69 @@ window.__ModuleLoader__.load({
       );
     }
 
+    function DecisionPanel(props) {
+      var tone = props.tone === "error" ? " mkt_decisionError" : "";
+      return h("div", { className: "mkt_decision" + tone },
+        h("div", { className: "mkt_decisionHead" },
+          h("span", { className: "mkt_decisionTitle" }, props.title),
+          props.meta ? h("span", { className: "mkt_meta" }, props.meta) : null),
+        h("div", { className: "mkt_decisionBody" }, props.children),
+        h("div", { className: "mkt_decisionActions" }, props.actions));
+    }
+
+    function ErrorNotice(props) {
+      if (!props.message) return null;
+      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) {
+          if (event.key === "Escape" && props.busy !== true) props.onCancel();
+        }
+        document.addEventListener("keydown", onKeyDown);
+        return function () { document.removeEventListener("keydown", onKeyDown); };
+      }, [props.busy, props.onCancel]);
+      return h("div", {
+        className: "mkt_modalMask",
+        onMouseDown: function (event) {
+          if (event.target === event.currentTarget && props.busy !== true) props.onCancel();
+        },
+      }, h("div", { className: "mkt_modal", role: "dialog", "aria-modal": "true", "aria-labelledby": "mkt-restart-title" },
+        h("div", { id: "mkt-restart-title", className: "mkt_modalHead" }, "重启 dsh"),
+        h("div", { className: "mkt_modalBody" }, props.activeCount > 0
+          ? "当前有 " + props.activeCount + " 个任务仍在进行。重启会中断这些任务，未完成的改动将由事务恢复逻辑处理。"
+          : "重启后，已经完成的插件安装、更新或卸载才会生效。"),
+        h("div", { className: "mkt_modalActions" },
+          h("button", { className: "mkt_btn", disabled: props.busy === true, autoFocus: true, onClick: props.onCancel }, "取消"),
+          h("button", { className: "mkt_btn mkt_btnPrimary", disabled: props.busy === true, onClick: props.onConfirm }, props.busy ? "重启中…" : "确认重启"))));
+    }
+
     // ── install-script approval ─────────────────────────────────────────────
     function ApprovalRequest(props) {
       var pkgs = props.needsApproval || [];
-      return h("div", { className: "mkt_approve" },
-        h("div", { className: "mkt_approveHead" }, "需要你确认：这次安装会执行安装期代码"),
+      var actions = [
+        h("button", { key: "cancel", className: "mkt_btn mkt_btnSm", disabled: props.busy === true, onClick: props.onDismiss }, "取消"),
+        h("button", {
+          key: "allow",
+          className: "mkt_btn mkt_btnPrimary mkt_btnSm",
+          disabled: props.busy === true,
+          onClick: function () { props.onApprove(pkgs.map(function (p) { return p.name; })); },
+        }, props.busy ? "继续中…" : "允许并继续"),
+      ];
+      return h(DecisionPanel, {
+        title: "安装期代码需要确认",
+        meta: clip(props.spec || "", 50),
+        actions: actions,
+      },
+        props.detail ? h("div", { className: "mkt_desc" }, props.detail) : null,
         pkgs.map(function (p, index) {
           var facts = [];
           if (typeof p.weeklyDownloads === "number") facts.push("周下载 " + p.weeklyDownloads.toLocaleString());
@@ -370,16 +463,7 @@ window.__ModuleLoader__.load({
             h("div", { className: "mkt_meta" }, facts.join(" · "))
           );
         }),
-        h("div", { className: "mkt_meta" }, "这些命令会以你的权限在你的机器上运行，早于任何插件代码加载。"),
-        h("div", { className: "mkt_row" },
-          h("button", {
-            className: "mkt_btn mkt_btnPrimary mkt_btnSm",
-            disabled: props.busy === true,
-            onClick: function () { props.onApprove(pkgs.map(function (p) { return p.name; })); },
-          }, props.busy ? "继续中…" : "允许并继续"),
-          h("button", { className: "mkt_btn mkt_btnSm", onClick: props.onDismiss }, "取消")
-        )
-      );
+        h("div", { className: "mkt_meta" }, "这些命令会以你的权限在你的机器上运行，早于任何插件代码加载。"));
     }
 
     // ── preflight result card ────────────────────────────────────────────────
@@ -391,11 +475,23 @@ window.__ModuleLoader__.load({
       var blocked = report.verdict === "blocked";
       var title = blocked ? "安装被阻止" : "安装存在风险";
       var issues = report.issues || [];
-      return h("div", { className: "mkt_card" },
-        h("div", { className: "mkt_panelRow" },
-          h("p", { className: "mkt_panelTitle" + (blocked ? " mkt_error" : "") }, title),
-          h("span", { className: "mkt_meta" }, clip(props.spec, 50))
-        ),
+      var actions = blocked
+        ? h("button", { className: "mkt_btn mkt_btnSm", onClick: props.onClose }, "关闭")
+        : [
+          h("button", { key: "cancel", className: "mkt_btn mkt_btnSm", disabled: props.busy === true, onClick: props.onClose }, "取消"),
+          h("button", {
+            key: "confirm",
+            className: "mkt_btn mkt_btnPrimary mkt_btnSm",
+            disabled: props.busy === true,
+            onClick: props.onConfirm,
+          }, props.busy ? "安装中…" : "了解风险并继续"),
+        ];
+      return h(DecisionPanel, {
+        tone: blocked ? "error" : "warning",
+        title: title,
+        meta: clip(props.spec, 50),
+        actions: actions,
+      },
         report.summary ? h("div", { className: "mkt_desc" }, report.summary) : null,
         issues.length > 0 ? h("ul", { className: "mkt_issueList" },
           issues.map(function (issue) {
@@ -406,21 +502,7 @@ window.__ModuleLoader__.load({
               h("div", { className: "mkt_issueTitle" }, issue.title),
               issue.detail ? h("div", { className: "mkt_issueDetail" }, issue.detail) : null);
           })
-        ) : null,
-        h("div", { className: "mkt_row" },
-          blocked
-            ? h("button", { className: "mkt_btn mkt_btnSm", onClick: props.onClose }, "关闭")
-            : [
-              h("button", { key: "cancel", className: "mkt_btn mkt_btnSm", onClick: props.onClose }, "取消"),
-              h("button", {
-                key: "confirm",
-                className: "mkt_btn mkt_btnPrimary mkt_btnSm",
-                disabled: props.busy === true,
-                onClick: props.onConfirm,
-              }, props.busy ? "安装中…" : "我已了解风险，继续安装"),
-            ]
-        )
-      );
+        ) : null);
     }
 
     var MARKET_PACKAGE = "@1e0zj/dsh-plugin-mall";
@@ -435,64 +517,99 @@ window.__ModuleLoader__.load({
       if (status === "completed") return "完成";
       if (status === "failed") return "失败";
       if (status === "killed") return "已取消";
+      if (status === "stopping") return "停止中";
       return "进行中";
     }
 
     function jobStatusClass(status) {
       if (status === "completed") return "mkt_ok";
-      if (status === "failed" || status === "killed") return "mkt_error";
+      if (status === "failed") return "mkt_error";
+      if (status === "killed" || status === "stopping") return "mkt_warn";
       return "";
     }
 
+    function jobStateDotClass(status, awaitingDecision) {
+      if (awaitingDecision || status === "killed" || status === "stopping") return "mkt_stateWarn";
+      if (status === "completed") return "mkt_stateDone";
+      if (status === "failed") return "mkt_stateError";
+      return "mkt_stateRunning";
+    }
+
     // 任务日志：跑的时候只露尾部几行（够看进度，不霸屏），落定后默认折叠
     // ——成功的日志没人回头读，失败的才需要，点开即可。
-    var LOG_TAIL_LINES = 8;
+    var LOG_TAIL_LINES = 12;
     function JobLog(props) {
       var _open = useState(false);
       var open = _open[0];
       var setOpen = _open[1];
       var text = String(props.output || "").trimEnd();
+      var failed = props.status === "failed";
+      useEffect(function () {
+        if (failed) setOpen(true);
+      }, [failed]);
       if (text.length === 0) return null;
       var lines = text.split("\n");
-      var collapsed = props.done && !open;
-      var shown = (props.done || lines.length <= LOG_TAIL_LINES) ? lines : lines.slice(-LOG_TAIL_LINES);
+      var settled = !isJobActive(props.status);
+      var collapsed = settled && !open;
+      var shown = settled || lines.length <= LOG_TAIL_LINES ? lines : lines.slice(-LOG_TAIL_LINES);
+      var rendered = shown.join("\n");
+      if (rendered.length > 64000) rendered = "…前部日志已截断…\n" + rendered.slice(-64000);
       // 展开/收起始终在日志块上方：放在下方的话，点开后按钮会被推到长长的
       // 日志末尾，想收起还得先滚回去。
       return h("div", { className: "mkt_logBlock" },
-        props.done
-          ? h("span", {
-            className: "mkt_link",
+        settled
+          ? h("button", {
+            type: "button",
+            className: "mkt_linkButton",
+            "aria-expanded": open ? "true" : "false",
             onClick: function () { setOpen(!open); },
           }, open ? "收起日志" : "查看日志（" + lines.length + " 行）")
           : lines.length > LOG_TAIL_LINES
             ? h("div", { className: "mkt_meta" }, "只显示最后 " + LOG_TAIL_LINES + " 行")
             : null,
-        collapsed ? null : h("pre", { className: "mkt_pre" }, shown.join("\n").slice(-4000))
+        collapsed ? null : h("pre", { className: "mkt_pre", "aria-label": "任务日志" }, rendered)
       );
     }
 
     // ── jobs panel ──────────────────────────────────────────────────────────
     function JobsPanel(props) {
       var ids = Object.keys(props.jobs);
-      if (ids.length === 0) return null;
+      if (ids.length === 0 && !props.error) return null;
+      var hasSettled = ids.some(function (id) {
+        var job = props.jobs[id];
+        var hasDecision = (props.preflight && props.preflight.jobId === id)
+          || (job.needsApproval && job.needsApproval.length > 0);
+        return !isJobActive(job.status) && !hasDecision;
+      });
       return h("div", { className: "mkt_card" },
         h("div", { className: "mkt_panelRow" },
           h("p", { className: "mkt_panelTitle" }, "任务"),
-          props.onClear ? h("span", { className: "mkt_link", onClick: props.onClear }, "清空") : null
+          props.onClear && hasSettled ? h("span", { className: "mkt_link", onClick: props.onClear }, "清空已结束") : null
         ),
+        h(ErrorNotice, { message: props.error }),
         ids.map(function (id) {
           var job = props.jobs[id];
           var done = job.status === "completed" || job.status === "failed" || job.status === "killed";
-          return h("div", { key: id, style: { display: "flex", flexDirection: "column", gap: "4px" } },
+          var preflightDecision = props.preflight && props.preflight.jobId === id ? props.preflight : null;
+          var awaitingDecision = preflightDecision !== null || (job.needsApproval && job.needsApproval.length > 0);
+          return h("div", { key: id, className: "mkt_job" },
             // 不再显示 market-N 这种内部 id——对用户没有意义，反而让人以为
             // 自己点了两次。只说清「在做什么 · 到哪一步了」。
-            // 状态词单独上色（完成绿、失败/取消红），前半段保持灰——整行
-            // 都染色会喧宾夺主，只有结论需要一眼看见。
-            h("div", { className: "mkt_meta" },
-              jobKindLabel(job.kind) + clip(job.spec || "", 44) + " · ",
-              h("span", { className: jobStatusClass(job.status) }, jobStatusLabel(job.status))),
+            // 状态词和状态点表达结论，任务类型与目标保持次要色。
+            h("div", { className: "mkt_jobHead" },
+              h("div", { className: "mkt_jobIdentity" },
+                h("span", { className: "mkt_stateDot " + jobStateDotClass(job.status, awaitingDecision), "aria-hidden": "true" }),
+                h("span", null, jobKindLabel(job.kind) + clip(job.spec || "", 44) + " · "),
+                h("span", { className: awaitingDecision ? "mkt_warn" : jobStatusClass(job.status) }, awaitingDecision ? "待确认" : jobStatusLabel(job.status))),
+              isJobActive(job.status) ? h("button", {
+                className: "mkt_btn mkt_btnSm",
+                disabled: job.status === "stopping",
+                onClick: function () { props.onCancel(id); },
+              }, job.status === "stopping" ? "停止中…" : "停止") : null),
             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) {
@@ -505,7 +622,15 @@ window.__ModuleLoader__.load({
                 },
                 onDismiss: function () { props.onDismiss(id); },
               })
-              : job.detail ? h("div", { className: "mkt_desc" }, job.detail) : null,
+              : preflightDecision
+                ? h(PreflightCard, {
+                  spec: preflightDecision.spec,
+                  report: preflightDecision.report,
+                  busy: props.preflightBusy === true,
+                  onConfirm: props.onConfirmPreflight,
+                  onClose: props.onClosePreflight,
+                })
+                : job.detail ? h("div", { className: job.status === "failed" ? "mkt_error" : "mkt_desc" }, job.detail) : null,
             // 预检完成不提示重启——它没有改动任何东西，接下来才是安装。
             // 也不再重复一个绿色「完成」：状态行已经写了「· 完成」。
             done && job.status === "completed" && job.kind !== "dsh-plugin-preflight"
@@ -520,10 +645,8 @@ window.__ModuleLoader__.load({
                     disabled: props.restarting === true,
                     onClick: props.onRestart,
                   }, props.restarting ? "重启中…" : "重启 dsh 生效"))
-              : job.status === "failed" && !(job.needsApproval && job.needsApproval.length > 0)
-                ? h("div", { className: "mkt_error" }, "失败，见下方输出")
-                : null,
-            h(JobLog, { output: job.output, done: done })
+              : null,
+            h(JobLog, { output: job.output, status: job.status })
           );
         })
       );
@@ -548,6 +671,7 @@ window.__ModuleLoader__.load({
           h("span", { className: "mkt_badge" }, count + " 个"),
           h("span", { className: "mkt_meta mkt_installedToggle" }, open ? "收起" : "展开")
         ),
+        h(ErrorNotice, { message: props.error }),
         installed.error
           ? h("div", { className: "mkt_error" }, installed.error)
           : !open ? null
@@ -604,6 +728,9 @@ window.__ModuleLoader__.load({
       var _error = useState(null);
       var error = _error[0];
       var setError = _error[1];
+      var reportError = useCallback(function (scope, value) {
+        setError({ scope: scope, message: errorText(value) });
+      }, []);
       var _installed = useState(null);
       var installed = _installed[0];
       var setInstalled = _installed[1];
@@ -645,6 +772,12 @@ 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];
       // 本次宿主进程的启动时间（jobs 端点带回）：完成时间早于它的任务，
       // 其「重启 dsh 生效」按钮已经兑现，改显示「重启已生效」。
       var _hostStartedAt = useState(0);
@@ -714,11 +847,11 @@ window.__ModuleLoader__.load({
           setCompat({});
           verifyPage(value.items);
         }).catch(function (e) {
-          setError(errorText(e));
+          reportError("search", e);
         }).finally(function () {
           setLoading(false);
         });
-      }, [call, query, sort, verifyPage]);
+      }, [call, query, reportError, sort, verifyPage]);
 
       var canLoadMore = results !== null && results.items.length < results.total && !reachedLimit;
       var loadMoreLock = useRef(false);
@@ -744,13 +877,13 @@ window.__ModuleLoader__.load({
             return { total: value.total, items: merged };
           });
         }).catch(function (e) {
-          setError(errorText(e));
+          reportError("search", e);
           setRetryAt(Date.now() + 60000);
         }).finally(function () {
           loadMoreLock.current = false;
           setLoadingMore(false);
         });
-      }, [call, canLoadMore, loading, loadingMore, page, query, sort, retryAt, verifyPage]);
+      }, [call, canLoadMore, loading, loadingMore, page, query, reportError, sort, retryAt, verifyPage]);
 
       useEffect(function () {
         var node = sentinelRef.current;
@@ -775,7 +908,7 @@ window.__ModuleLoader__.load({
             return prev && !prev.error ? Object.assign({}, prev, { entries: value.entries }) : prev;
           });
         }).catch(function (e) {
-          setError(errorText(e));
+          reportError("installed", e);
         }).finally(function () {
           setToggling(function (prev) {
             var next = Object.assign({}, prev);
@@ -783,7 +916,7 @@ window.__ModuleLoader__.load({
             return next;
           });
         });
-      }, [call]);
+      }, [call, reportError]);
 
       var refreshInstalled = useCallback(function () {
         call("installed", {}).then(function (value) {
@@ -821,8 +954,8 @@ window.__ModuleLoader__.load({
       var polling = useJobPolling(call, onJobSettled, onApprovalToken, onPreflightSettled);
       var track = polling.track;
       var jobs = polling.jobs;
-      var clearJobs = polling.clear;
       var dropJob = polling.drop;
+      var setJobStatus = polling.setStatus;
 
       useEffect(function () {
         doSearch();
@@ -848,7 +981,7 @@ window.__ModuleLoader__.load({
           track(value.jobId, spec, carryFromId);
         }).catch(function (e) {
           delete approvalTokensRef.current[spec];
-          setError(errorText(e));
+          reportError("tasks", e);
         }).finally(function () {
           setInstalling(function (prev) {
             var next = Object.assign({}, prev);
@@ -856,7 +989,7 @@ window.__ModuleLoader__.load({
             return next;
           });
         });
-      }, [call, track]);
+      }, [call, reportError, track]);
 
       var doApprove = useCallback(function (spec, names, token, carryFromId) {
         var extra = { allowBuildScripts: names };
@@ -872,7 +1005,7 @@ window.__ModuleLoader__.load({
       useEffect(function () {
         preflightHandlerRef.current = function (spec, report, jobId) {
           if (!report || !report.verdict) {
-            setError("预检没有返回结论，请重试");
+            reportError("tasks", "预检没有返回结论，请重试");
             return;
           }
           if (report.verdict === "safe") {
@@ -882,7 +1015,7 @@ window.__ModuleLoader__.load({
             setPreflight({ spec: spec, report: report, jobId: jobId });
           }
         };
-      }, [doRawInstall]);
+      }, [doRawInstall, reportError]);
 
       // 点安装 = 立刻起一个预检 job，面板马上有东西看、日志实时流。
       // 结论由轮询经 onPreflightSettled 交回上面的 handler，这里不等待。
@@ -892,25 +1025,30 @@ window.__ModuleLoader__.load({
         call("preflight", { spec: spec }).then(function (value) {
           track(value.jobId, value.spec || spec);
         }).catch(function (e) {
-          setError(errorText(e));
+          reportError("tasks", e);
         });
-      }, [call, track]);
+      }, [call, reportError, track]);
 
       var doInstall = useCallback(function (repo) {
         preflightAndInstall("github:" + repo);
       }, [preflightAndInstall]);
 
       var doRestart = useCallback(function () {
-        if (typeof window !== "undefined" && typeof window.confirm === "function") {
-          if (window.confirm("重启 dsh？正在进行的任务会中断。") !== true) return;
-        }
         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) {
@@ -921,7 +1059,8 @@ window.__ModuleLoader__.load({
             if (tries > 40) {
               clearRestartPing();
               setRestarting(false);
-              setError("2 分钟内未检测到 dsh 重启完成，请手动检查 dsh 状态后刷新页面。");
+              reportError("restart", "2 分钟内未检测到 dsh 重启完成，请手动检查 dsh 状态后刷新页面。"
+                + (scheduledLogPath ? "输出与日志：" + scheduledLogPath : ""));
               return;
             }
             // Prefer identity change over wall-clock ordering: NTP may move the
@@ -944,9 +1083,10 @@ window.__ModuleLoader__.load({
           if (restartControlRef.current.mounted !== true) return;
           clearRestartPing();
           setRestarting(false);
-          setError(errorText(e));
+          setRestartNote(null);
+          reportError("restart", e);
         });
-      }, [call, clearRestartPing, hostStartedAt]);
+      }, [call, clearRestartPing, hostStartedAt, reportError]);
 
       var doUninstall = useCallback(function (name) {
         delete approvalTokensRef.current[name];
@@ -958,7 +1098,7 @@ window.__ModuleLoader__.load({
         call("uninstall", { package: name }).then(function (value) {
           track(value.jobId, name);
         }).catch(function (e) {
-          setError(errorText(e));
+          reportError("installed", e);
         }).finally(function () {
           setRemoving(function (prev) {
             var next = Object.assign({}, prev);
@@ -966,7 +1106,7 @@ window.__ModuleLoader__.load({
             return next;
           });
         });
-      }, [call, track]);
+      }, [call, reportError, track]);
 
       useEffect(function () {
         refreshInstalled();
@@ -978,6 +1118,9 @@ window.__ModuleLoader__.load({
         return v !== undefined && (v.kind === "bundle" || v.kind === "client")
           && !(v.hostDeps !== undefined && v.hostDeps.length > 0);
       });
+      var activeJobCount = Object.keys(jobs).filter(function (id) {
+        return jobs[id] && isJobActive(jobs[id].status);
+      }).length;
       resultsRef.current = results;
       var verifyPending = results !== null && results.items.some(function (it) { return verified[it.fullName] === undefined; });
 
@@ -1000,12 +1143,13 @@ window.__ModuleLoader__.load({
             h("option", { value: "forks" }, "按 fork")
           ),
           h("button", { className: "mkt_btn mkt_btnPrimary", disabled: loading, onClick: doSearch }, loading ? "搜索中…" : "搜索"),
-          h("button", { className: "mkt_btn mkt_btnDanger", disabled: restarting, onClick: doRestart }, restarting ? "重启中…" : "重启 dsh"),
+          h("button", { className: "mkt_btn mkt_btnDanger", disabled: restarting, onClick: function () { setRestartConfirm(true); } }, restarting ? "重启中…" : "重启 dsh"),
           h("label", { className: "mkt_check" },
             h("input", { type: "checkbox", checked: verifiedOnly, onChange: function (e) { setVerifiedOnly(e.target.checked); } }),
             "只看已验证插件")
         ),
-        error ? h("div", { className: "mkt_error" }, error) : null,
+        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,
@@ -1015,19 +1159,50 @@ window.__ModuleLoader__.load({
           onToggle: doToggle,
           onUninstall: doUninstall,
           onInstallSpec: preflightAndInstall,
+          error: error && error.scope === "installed" ? error.message : null,
         }),
         h(JobsPanel, {
           jobs: jobs,
+          error: error && error.scope === "tasks" ? error.message : null,
+          preflight: preflight,
+          preflightBusy: preflight ? installing[preflight.spec] === true : false,
           onClear: function () {
             Object.keys(jobs).forEach(function (id) {
               var job = jobs[id];
+              var hasDecision = job && ((preflight && preflight.jobId === id)
+                || (job.needsApproval && job.needsApproval.length > 0));
+              if (!job || isJobActive(job.status) || hasDecision) return;
               var token = job && job.approvalToken ? job.approvalToken : (job && job.spec ? approvalTokensRef.current[job.spec] : undefined);
               call("jobDismiss", { jobId: id, token: token }).catch(function () {});
+              if (job.spec) delete approvalTokensRef.current[job.spec];
+              dropJob(id);
+            });
+          },
+          onCancel: function (id) {
+            var job = jobs[id];
+            if (!job || job.status !== "running") return;
+            setJobStatus(id, "stopping");
+            call("jobCancel", { jobId: id }).catch(function (e) {
+              setJobStatus(id, "running");
+              reportError("tasks", e);
             });
-            approvalTokensRef.current = {};
-            clearJobs();
           },
           onApprove: doApprove,
+          onConfirmPreflight: function () {
+            if (!preflight) return;
+            var spec = preflight.spec;
+            var carry = preflight.jobId;
+            var report = preflight.report;
+            setPreflight(null);
+            // consentDigest 来自预检 job 的 extras，装的时候与当前报告比对：
+            // 用户点「继续」到安装真正开跑之间候选包或 profile 变了，
+            // 布尔同意不得沿用，要重新看新的警告。
+            doRawInstall(spec, { acceptWarnings: true, acceptedReportDigest: report.consentDigest }, carry);
+          },
+          onClosePreflight: function () {
+            if (preflight && preflight.spec) delete approvalTokensRef.current[preflight.spec];
+            setPreflight(null);
+          },
           onDismiss: function (id) {
             var job = jobs[id];
             var token = job && job.approvalToken ? job.approvalToken : (job && job.spec ? approvalTokensRef.current[job.spec] : undefined);
@@ -1036,29 +1211,11 @@ window.__ModuleLoader__.load({
             dropJob(id);
           },
           onDrop: dropJob,
-          onRestart: doRestart,
+          onRestart: function () { setRestartConfirm(true); },
           restarting: restarting,
           hostStartedAt: hostStartedAt,
           approving: Object.keys(installing).filter(function (s) { return installing[s]; })[0],
         }),
-        preflight ? h(PreflightCard, {
-          spec: preflight.spec,
-          report: preflight.report,
-          busy: installing[preflight.spec] === true,
-          onConfirm: function () {
-            var spec = preflight.spec;
-            var carry = preflight.jobId;
-            setPreflight(null);
-            // consentDigest 来自预检 job 的 extras，装的时候与当前报告比对：
-            // 用户点「继续」到安装真正开跑之间候选包或 profile 变了，
-            // 布尔同意不得沿用，要重新看新的警告。
-            doRawInstall(spec, { acceptWarnings: true, acceptedReportDigest: preflight.report.consentDigest }, carry);
-          },
-          onClose: function () {
-            if (preflight && preflight.spec) delete approvalTokensRef.current[preflight.spec];
-            setPreflight(null);
-          },
-        }) : null,
         h("div", { className: "mkt_list" },
           results == null
             ? h("div", { className: "mkt_meta mkt_listHead" }, loading ? "正在加载最热插件…" : "—")
@@ -1095,7 +1252,16 @@ window.__ModuleLoader__.load({
                   ? h("div", { className: "mkt_loadMore", ref: sentinelRef }, loadingMore ? "加载中…" : Date.now() < retryAt ? "GitHub 限流中，稍后再下滑加载" : "下滑加载更多")
                   : h("div", { className: "mkt_loadMore" }, reachedLimit ? "已达 GitHub 搜索上限（前 1000 个结果）" : "已显示全部 " + results.items.length + " 个")
               )
-        )
+        ),
+        restartConfirm ? h(RestartDialog, {
+          activeCount: activeJobCount,
+          busy: restarting,
+          onCancel: function () { setRestartConfirm(false); },
+          onConfirm: function () {
+            setRestartConfirm(false);
+            doRestart();
+          },
+        }) : null
       );
     }