dsh-m 0.2.9 → 0.2.11

package/lib/client.js

@@ -112,6 +112,304 @@ var init_market_state = __esm({
   }
 });
 
+// src/client/markdown.js
+var markdown_exports = {};
+__export(markdown_exports, {
+  createMarkdown: () => createMarkdown,
+  safeUrl: () => safeUrl
+});
+function safeUrl(u) {
+  const t = String(u || "").trim();
+  if (/^(https?:\/\/|mailto:)/i.test(t)) return t;
+  if (/^[/#]/.test(t)) return t;
+  return "#";
+}
+function createMarkdown(h2) {
+  function ExtLink2({ href, className, children }) {
+    return h2(
+      "a",
+      {
+        className: className || "dshm-md-a",
+        href: safeUrl(href),
+        target: "_blank",
+        rel: "noopener noreferrer",
+        onClick: (e) => e.stopPropagation()
+      },
+      children
+    );
+  }
+  function MdImg2({ src, alt }) {
+    return h2("img", {
+      className: "dshm-md-img",
+      src: safeUrl(src),
+      alt: alt || "",
+      referrerPolicy: "no-referrer",
+      onError: (e) => {
+        e.currentTarget.style.display = "none";
+      }
+    });
+  }
+  function mdInline(text, kb) {
+    const re = /(\[!\[[^\]]*\]\([^)]*\)\]\([^)]*\))|(!\[[^\]]*\]\([^)]*\))|(\[[^\]]*\]\([^)]*\))|(`[^`]+`)|(\*\*[^*]+\*\*)|(~~[^~]+~~)|(\*[^*\s][^*]*\*)|(<https?:\/\/[^>\s]+>)|(https?:\/\/[^\s<>()\[\]{}"'「」【】]+[^\s<>()\[\]{}"'「」【】.,;:!?…，。；：！？）】」"')])/g;
+    const src = String(text);
+    const nodes = [];
+    let last = 0;
+    let m;
+    let i = 0;
+    while (m = re.exec(src)) {
+      if (m.index > last) nodes.push(src.slice(last, m.index));
+      const tok = m[0];
+      const k = `${kb}-${i++}`;
+      if (tok.startsWith("[![")) {
+        const im = /^!\[([^\]]*)\]\(([^)]*)\)/.exec(tok.slice(1));
+        const lm = /\]\(([^)]*)\)\s*$/.exec(tok);
+        const img = h2(MdImg2, { src: im && im[2], alt: im && im[1] });
+        const href = lm && lm[1];
+        nodes.push(href && safeUrl(href) !== "#" ? h2(ExtLink2, { key: k, href }, img) : h2("span", { key: k }, img));
+      } else if (tok.startsWith("![") || tok.startsWith("<![")) {
+        const im = /^!\[([^\]]*)\]\(([^)]*)\)$/.exec(tok);
+        nodes.push(h2(MdImg2, { key: k, src: im && im[2], alt: im && im[1] }));
+      } else if (tok.startsWith("[")) {
+        const lm = /^\[([^\]]*)\]\(([^)]*)\)$/.exec(tok);
+        nodes.push(h2(ExtLink2, { key: k, href: lm && lm[2] }, mdInline(lm ? lm[1] : tok, k)));
+      } else if (tok.startsWith("`")) {
+        nodes.push(h2("code", { key: k }, tok.slice(1, -1)));
+      } else if (tok.startsWith("**")) {
+        nodes.push(h2("strong", { key: k }, mdInline(tok.slice(2, -2), k)));
+      } else if (tok.startsWith("~~")) {
+        nodes.push(h2("del", { key: k }, mdInline(tok.slice(2, -2), k)));
+      } else if (tok.startsWith("*")) {
+        nodes.push(h2("em", { key: k }, mdInline(tok.slice(1, -1), k)));
+      } else if (tok.startsWith("<")) {
+        const u = tok.slice(1, -1);
+        nodes.push(h2(ExtLink2, { key: k, href: u }, u));
+      } else {
+        nodes.push(h2(ExtLink2, { key: k, href: tok }, tok.length > 72 ? `${tok.slice(0, 69)}\u2026` : tok));
+      }
+      last = m.index + tok.length;
+    }
+    if (last < src.length) nodes.push(src.slice(last));
+    return nodes;
+  }
+  function mdBlocks(lines, kb) {
+    const out = [];
+    let i = 0;
+    let n = 0;
+    const isFence = (s) => /^\s*```/.test(s);
+    const isHeading = (s) => /^#{1,6}\s+/.test(s);
+    const isHr = (s) => /^\s*(-{3,}|\*{3,}|_{3,})\s*$/.test(s);
+    const isQuote = (s) => /^\s*>/.test(s);
+    const isUl = (s) => /^\s*[-*+]\s+/.test(s);
+    const isOl = (s) => /^\s*\d+[.)]\s+/.test(s);
+    const isTableRow = (s) => s.includes("|") && /^\s*\|/.test(s);
+    while (i < lines.length) {
+      const line = lines[i];
+      if (!line.trim()) {
+        i++;
+        continue;
+      }
+      const k = `${kb}-b${n++}`;
+      if (isFence(line)) {
+        const buf2 = [];
+        i++;
+        while (i < lines.length && !/^\s*```\s*$/.test(lines[i])) buf2.push(lines[i++]);
+        i++;
+        out.push(h2("pre", { key: k }, h2("code", null, buf2.join("\n"))));
+        continue;
+      }
+      if (isHeading(line)) {
+        const hm = /^(#{1,6})\s+(.*)$/.exec(line);
+        out.push(h2(`h${hm[1].length}`, { key: k }, mdInline(hm[2], k)));
+        i++;
+        continue;
+      }
+      if (isHr(line)) {
+        out.push(h2("hr", { key: k }));
+        i++;
+        continue;
+      }
+      if (isQuote(line)) {
+        const buf2 = [];
+        while (i < lines.length && isQuote(lines[i])) buf2.push(lines[i++].replace(/^\s*>\s?/, ""));
+        out.push(h2("blockquote", { key: k }, mdBlocks(buf2, k)));
+        continue;
+      }
+      if (isUl(line) || isOl(line)) {
+        const ordered = isOl(line);
+        const re = ordered ? /^\s*\d+[.)]\s+(.*)$/ : /^\s*[-*+]\s+(.*)$/;
+        const items = [];
+        while (i < lines.length && (ordered ? isOl(lines[i]) : isUl(lines[i]))) {
+          items.push(h2("li", { key: `li${items.length}` }, mdInline(re.exec(lines[i])[1], `${k}-${items.length}`)));
+          i++;
+        }
+        out.push(h2(ordered ? "ol" : "ul", { key: k }, items));
+        continue;
+      }
+      if (isTableRow(line) && i + 1 < lines.length && lines[i + 1].includes("-") && /^\s*\|?[\s:|-]+\|?\s*$/.test(lines[i + 1])) {
+        const cells = (s) => s.trim().replace(/^\|/, "").replace(/\|$/, "").split("|").map((c) => c.trim());
+        const head = cells(lines[i]);
+        i += 2;
+        const rows = [];
+        while (i < lines.length && isTableRow(lines[i])) {
+          rows.push(cells(lines[i]));
+          i++;
+        }
+        out.push(
+          h2(
+            "table",
+            { key: k },
+            h2("thead", null, h2("tr", null, head.map((c, x) => h2("th", { key: x }, mdInline(c, `${k}h${x}`))))),
+            h2("tbody", null, rows.map((r, y) => h2("tr", { key: y }, r.map((c, x) => h2("td", { key: x }, mdInline(c, `${k}${y}x${x}`))))))
+          )
+        );
+        continue;
+      }
+      const buf = [line];
+      i++;
+      while (i < lines.length && lines[i].trim() && !isFence(lines[i]) && !isHeading(lines[i]) && !isHr(lines[i]) && !isQuote(lines[i]) && !isUl(lines[i]) && !isOl(lines[i])) {
+        buf.push(lines[i]);
+        i++;
+      }
+      out.push(h2("p", { key: k }, mdInline(buf.join(" "), k)));
+    }
+    return out;
+  }
+  function renderMarkdown2(src) {
+    return mdBlocks(String(src || "").replace(/\r\n?/g, "\n").split("\n"), "md");
+  }
+  return { ExtLink: ExtLink2, MdImg: MdImg2, renderMarkdown: renderMarkdown2 };
+}
+var init_markdown = __esm({
+  "src/client/markdown.js"() {
+    "use strict";
+  }
+});
+
+// src/client/installed-view.js
+var installed_view_exports = {};
+__export(installed_view_exports, {
+  installedViewModel: () => installedViewModel,
+  registrySourceKey: () => registrySourceKey
+});
+function uninstallGuardKeys(it) {
+  if (it.source === "link") {
+    return { confirmKey: "confirm.unlink", warnKey: "warn.unlink", warnParams: { path: it.path } };
+  }
+  if (it.source === "file") {
+    return { confirmKey: "confirm.core", warnKey: "warn.core", warnParams: {} };
+  }
+  return { confirmKey: "confirm.uninstall", warnKey: null, warnParams: {} };
+}
+function installedViewModel(it) {
+  return {
+    githubRepo: it.registryGithub || it.githubRepo || (it.spec.startsWith("github:") ? it.spec.slice(7).split("#")[0] : null),
+    sourceLabelKey: { npm: "src.npm", github: "src.github", link: "src.link", file: "src.file", unknown: "src.unknown" }[it.source] || null,
+    guard: uninstallGuardKeys(it),
+    latestLabel: it.latestTag || (it.latestVersion ? `v${it.latestVersion}` : ""),
+    latestLabelDetail: it.latestTag || (it.latestVersion ? `v${it.latestVersion}` : "\u2014")
+  };
+}
+function registrySourceKey(data) {
+  if (!data) return null;
+  const map = {
+    "default-raw": "src.default.raw",
+    "default-jsdelivr": "src.default.jsdelivr",
+    "default-cache": "src.default.cache",
+    bundled: "src.bundled",
+    "custom-url": "src.custom.url",
+    "custom-file": "src.custom.file",
+    "custom-cache": "src.custom.cache",
+    "custom-unavailable": "src.custom.unavailable",
+    // 旧字段兼容
+    override: "src.override",
+    jsdelivr: "src.jsdelivr",
+    raw: "src.raw",
+    cache: "src.cache"
+  };
+  return map[data.source] || data.source;
+}
+var init_installed_view = __esm({
+  "src/client/installed-view.js"() {
+    "use strict";
+  }
+});
+
+// src/client/tool-view.js
+var tool_view_exports = {};
+__export(tool_view_exports, {
+  parseToolArgs: () => parseToolArgs,
+  pickPayload: () => pickPayload
+});
+function pickPayload(props) {
+  const found = [];
+  const visit = (node, depth) => {
+    if (!node || depth > 6) return;
+    if (typeof node === "string") {
+      const t = node.trim();
+      if ((t.startsWith("{") || t.startsWith("[")) && t.length > 8) {
+        try {
+          visit(JSON.parse(t), depth + 1);
+        } catch {
+        }
+      }
+      return;
+    }
+    if (typeof node !== "object") return;
+    if (Array.isArray(node)) {
+      for (const x of node) visit(x, depth + 1);
+      return;
+    }
+    if (Array.isArray(node.items)) found.push(node);
+    for (const key of ["block", "meta", "result", "resultView", "view", "data", "value", "payload", "content", "message"]) {
+      if (node[key] != null) visit(node[key], depth + 1);
+    }
+  };
+  visit(props, 0);
+  return found.find((x) => x && Array.isArray(x.items)) || null;
+}
+function parseToolArgs(props) {
+  const block = props?.block;
+  const raw = (block && "kind" in block ? block.call?.argsRaw : block?.argsRaw) || "";
+  if (!raw || typeof raw !== "string") return {};
+  try {
+    return JSON.parse(raw);
+  } catch {
+    return {};
+  }
+}
+var init_tool_view = __esm({
+  "src/client/tool-view.js"() {
+    "use strict";
+  }
+});
+
+// src/client/restart-wait.js
+var restart_wait_exports = {};
+__export(restart_wait_exports, {
+  RESTART_DEADLINE_MS: () => RESTART_DEADLINE_MS,
+  RESTART_POLL_MS: () => RESTART_POLL_MS,
+  isAmbiguousRestartRequestError: () => isAmbiguousRestartRequestError,
+  nextRestartWait: () => nextRestartWait
+});
+function nextRestartWait({ phase, now = 0, deadlineAt = Infinity, bootChanged = false }) {
+  if (phase === "before-ping") {
+    return now > deadlineAt ? "timeout" : "continue";
+  }
+  return bootChanged ? "done" : "continue";
+}
+function isAmbiguousRestartRequestError(error) {
+  const name = error && typeof error === "object" ? error.name : "";
+  return name === "TypeError" || name === "AbortError" || name === "NetworkError";
+}
+var RESTART_POLL_MS, RESTART_DEADLINE_MS;
+var init_restart_wait = __esm({
+  "src/client/restart-wait.js"() {
+    "use strict";
+    RESTART_POLL_MS = 2e3;
+    RESTART_DEADLINE_MS = 9e4;
+  }
+});
+
 // src/client/main.jsx
 var React = require("react");
 var rd = require("react-dom");
@@ -120,6 +418,11 @@ var { useState, useEffect, useCallback, useMemo, useRef } = React;
 var PLUGIN_ID = "dsh-m";
 var API = "/dshm";
 var { MARKET_PAGE_SIZE: MARKET_PAGE_SIZE2, normalizeMarketQuery: normalizeMarketQuery2, resetPageOnFilterChange: resetPageOnFilterChange2, normalizeMarketResponse: normalizeMarketResponse2, registryNotice: registryNotice2 } = (init_market_state(), __toCommonJS(market_state_exports));
+var { createMarkdown: createMarkdown2 } = (init_markdown(), __toCommonJS(markdown_exports));
+var { ExtLink, MdImg, renderMarkdown } = createMarkdown2(h);
+var { installedViewModel: installedViewModel2, registrySourceKey: registrySourceKey2 } = (init_installed_view(), __toCommonJS(installed_view_exports));
+var { pickPayload: pickPayload2, parseToolArgs: parseToolArgs2 } = (init_tool_view(), __toCommonJS(tool_view_exports));
+var { RESTART_POLL_MS: RESTART_POLL_MS2, RESTART_DEADLINE_MS: RESTART_DEADLINE_MS2, nextRestartWait: nextRestartWait2, isAmbiguousRestartRequestError: isAmbiguousRestartRequestError2 } = (init_restart_wait(), __toCommonJS(restart_wait_exports));
 var ZH = {
   "market.title": "\u63D2\u4EF6\u5E02\u573A",
   "tab.market": "\u5E02\u573A",
@@ -269,7 +572,7 @@ var ZH = {
   "restart.now": "\u26A1 \u4E00\u952E\u91CD\u542F",
   "restart.failed": "\u91CD\u542F\u5931\u8D25\uFF1A{err}",
   "restart.timeout": "\u91CD\u542F\u8D85\u65F6\uFF0C\u8BF7\u624B\u52A8\u68C0\u67E5 dsh web \u670D\u52A1\u72B6\u6001",
-  "restart.hint.done": "\u5DF2\u8BF7\u6C42\u91CD\u542F DSH web\uFF08via {via}\uFF09\u3002\u670D\u52A1\u51E0\u79D2\u5185\u6062\u590D\uFF0C\u4E4B\u540E\u8BA9\u7528\u6237\u5237\u65B0\u9875\u9762\u5373\u53EF\u3002",
+  "restart.hint.done": "\u5DF2\u8BF7\u6C42\u91CD\u542F DSH web\uFF08via {via}\uFF09\u3002\u670D\u52A1\u6062\u590D\u540E DSH Web \u4F1A\u5728\u540E\u53F0\u81EA\u52A8\u91CD\u8FDE\u3002",
   "phase.resolving": "\u89E3\u6790\u4F9D\u8D56",
   "phase.downloading": "\u4E0B\u8F7D",
   "phase.linking": "\u94FE\u63A5\u5B89\u88C5",
@@ -288,8 +591,6 @@ var ZH = {
 };
 var EN = {
   "market.title": "Plugin Marketplace",
-  "title.panel": "Plugin Marketplace",
-  "title.full": "DeepSeek Harness Plugin Marketplace",
   "tab.market": "Market",
   "tab.installed": "Installed",
   "tab.settings": "Settings",
@@ -437,7 +738,7 @@ var EN = {
   "restart.now": "\u26A1 Restart",
   "restart.failed": "Restart failed: {err}",
   "restart.timeout": "Restart timed out \u2014 check the dsh web service manually",
-  "restart.hint.done": "Restart requested (via {via}). The service will be back in seconds; ask the user to refresh afterwards.",
+  "restart.hint.done": "Restart requested (via {via}). DSH Web will reconnect in the background after the service returns.",
   "phase.resolving": "Resolving",
   "phase.downloading": "Downloading",
   "phase.linking": "Linking",
@@ -664,164 +965,6 @@ function Icon({ entry }) {
 function Spin() {
   return h("span", { className: "dshm-spin" });
 }
-function safeUrl(u) {
-  const t = String(u || "").trim();
-  if (/^(https?:\/\/|mailto:)/i.test(t)) return t;
-  if (/^[/#]/.test(t)) return t;
-  return "#";
-}
-function ExtLink({ href, className, children }) {
-  return h(
-    "a",
-    {
-      className: className || "dshm-md-a",
-      href: safeUrl(href),
-      target: "_blank",
-      rel: "noopener noreferrer",
-      onClick: (e) => e.stopPropagation()
-    },
-    children
-  );
-}
-function MdImg({ src, alt }) {
-  return h("img", {
-    className: "dshm-md-img",
-    src: safeUrl(src),
-    alt: alt || "",
-    referrerPolicy: "no-referrer",
-    onError: (e) => {
-      e.currentTarget.style.display = "none";
-    }
-  });
-}
-function mdInline(text, kb) {
-  const re = /(\[!\[[^\]]*\]\([^)]*\)\]\([^)]*\))|(!\[[^\]]*\]\([^)]*\))|(\[[^\]]*\]\([^)]*\))|(`[^`]+`)|(\*\*[^*]+\*\*)|(~~[^~]+~~)|(\*[^*\s][^*]*\*)|(<https?:\/\/[^>\s]+>)|(https?:\/\/[^\s<>()\[\]{}"'「」【】]+[^\s<>()\[\]{}"'「」【】.,;:!?…，。；：！？）】」"')])/g;
-  const src = String(text);
-  const nodes = [];
-  let last = 0;
-  let m;
-  let i = 0;
-  while (m = re.exec(src)) {
-    if (m.index > last) nodes.push(src.slice(last, m.index));
-    const tok = m[0];
-    const k = `${kb}-${i++}`;
-    if (tok.startsWith("[![")) {
-      const im = /^!\[([^\]]*)\]\(([^)]*)\)/.exec(tok.slice(1));
-      const lm = /\]\(([^)]*)\)\s*$/.exec(tok);
-      const img = h(MdImg, { src: im && im[2], alt: im && im[1] });
-      const href = lm && lm[1];
-      nodes.push(href && safeUrl(href) !== "#" ? h(ExtLink, { key: k, href }, img) : h("span", { key: k }, img));
-    } else if (tok.startsWith("![") || tok.startsWith("<![")) {
-      const im = /^!\[([^\]]*)\]\(([^)]*)\)$/.exec(tok);
-      nodes.push(h(MdImg, { key: k, src: im && im[2], alt: im && im[1] }));
-    } else if (tok.startsWith("[")) {
-      const lm = /^\[([^\]]*)\]\(([^)]*)\)$/.exec(tok);
-      nodes.push(h(ExtLink, { key: k, href: lm && lm[2] }, mdInline(lm ? lm[1] : tok, k)));
-    } else if (tok.startsWith("`")) {
-      nodes.push(h("code", { key: k }, tok.slice(1, -1)));
-    } else if (tok.startsWith("**")) {
-      nodes.push(h("strong", { key: k }, mdInline(tok.slice(2, -2), k)));
-    } else if (tok.startsWith("~~")) {
-      nodes.push(h("del", { key: k }, mdInline(tok.slice(2, -2), k)));
-    } else if (tok.startsWith("*")) {
-      nodes.push(h("em", { key: k }, mdInline(tok.slice(1, -1), k)));
-    } else if (tok.startsWith("<")) {
-      const u = tok.slice(1, -1);
-      nodes.push(h(ExtLink, { key: k, href: u }, u));
-    } else {
-      nodes.push(h(ExtLink, { key: k, href: tok }, tok.length > 72 ? `${tok.slice(0, 69)}\u2026` : tok));
-    }
-    last = m.index + tok.length;
-  }
-  if (last < src.length) nodes.push(src.slice(last));
-  return nodes;
-}
-function mdBlocks(lines, kb) {
-  const out = [];
-  let i = 0;
-  let n = 0;
-  const isFence = (s) => /^\s*```/.test(s);
-  const isHeading = (s) => /^#{1,6}\s+/.test(s);
-  const isHr = (s) => /^\s*(-{3,}|\*{3,}|_{3,})\s*$/.test(s);
-  const isQuote = (s) => /^\s*>/.test(s);
-  const isUl = (s) => /^\s*[-*+]\s+/.test(s);
-  const isOl = (s) => /^\s*\d+[.)]\s+/.test(s);
-  const isTableRow = (s) => s.includes("|") && /^\s*\|/.test(s);
-  while (i < lines.length) {
-    const line = lines[i];
-    if (!line.trim()) {
-      i++;
-      continue;
-    }
-    const k = `${kb}-b${n++}`;
-    if (isFence(line)) {
-      const buf2 = [];
-      i++;
-      while (i < lines.length && !/^\s*```\s*$/.test(lines[i])) buf2.push(lines[i++]);
-      i++;
-      out.push(h("pre", { key: k }, h("code", null, buf2.join("\n"))));
-      continue;
-    }
-    if (isHeading(line)) {
-      const hm = /^(#{1,6})\s+(.*)$/.exec(line);
-      out.push(h(`h${hm[1].length}`, { key: k }, mdInline(hm[2], k)));
-      i++;
-      continue;
-    }
-    if (isHr(line)) {
-      out.push(h("hr", { key: k }));
-      i++;
-      continue;
-    }
-    if (isQuote(line)) {
-      const buf2 = [];
-      while (i < lines.length && isQuote(lines[i])) buf2.push(lines[i++].replace(/^\s*>\s?/, ""));
-      out.push(h("blockquote", { key: k }, mdBlocks(buf2, k)));
-      continue;
-    }
-    if (isUl(line) || isOl(line)) {
-      const ordered = isOl(line);
-      const re = ordered ? /^\s*\d+[.)]\s+(.*)$/ : /^\s*[-*+]\s+(.*)$/;
-      const items = [];
-      while (i < lines.length && (ordered ? isOl(lines[i]) : isUl(lines[i]))) {
-        items.push(h("li", { key: `li${items.length}` }, mdInline(re.exec(lines[i])[1], `${k}-${items.length}`)));
-        i++;
-      }
-      out.push(h(ordered ? "ol" : "ul", { key: k }, items));
-      continue;
-    }
-    if (isTableRow(line) && i + 1 < lines.length && lines[i + 1].includes("-") && /^\s*\|?[\s:|-]+\|?\s*$/.test(lines[i + 1])) {
-      const cells = (s) => s.trim().replace(/^\|/, "").replace(/\|$/, "").split("|").map((c) => c.trim());
-      const head = cells(lines[i]);
-      i += 2;
-      const rows = [];
-      while (i < lines.length && isTableRow(lines[i])) {
-        rows.push(cells(lines[i]));
-        i++;
-      }
-      out.push(
-        h(
-          "table",
-          { key: k },
-          h("thead", null, h("tr", null, head.map((c, x) => h("th", { key: x }, mdInline(c, `${k}h${x}`))))),
-          h("tbody", null, rows.map((r, y) => h("tr", { key: y }, r.map((c, x) => h("td", { key: x }, mdInline(c, `${k}${y}x${x}`))))))
-        )
-      );
-      continue;
-    }
-    const buf = [line];
-    i++;
-    while (i < lines.length && lines[i].trim() && !isFence(lines[i]) && !isHeading(lines[i]) && !isHr(lines[i]) && !isQuote(lines[i]) && !isUl(lines[i]) && !isOl(lines[i])) {
-      buf.push(lines[i]);
-      i++;
-    }
-    out.push(h("p", { key: k }, mdInline(buf.join(" "), k)));
-  }
-  return out;
-}
-function renderMarkdown(src) {
-  return mdBlocks(String(src || "").replace(/\r\n?/g, "\n").split("\n"), "md");
-}
 function officialLinks({ npm, github, homepage }) {
   const links = [];
   if (github) links.push(["GitHub", `https://github.com/${github}`]);
@@ -872,17 +1015,25 @@ function RestartBanner({ note, onDone }) {
     setPhase("restarting");
     try {
       const ping0 = await api("ping");
-      await api("restart");
+      try {
+        await api("restart");
+      } catch (requestError) {
+        if (!isAmbiguousRestartRequestError2(requestError)) throw requestError;
+      }
       setPhase("waiting");
-      const deadline = Date.now() + 9e4;
+      const deadlineAt = Date.now() + RESTART_DEADLINE_MS2;
       for (; ; ) {
-        await new Promise((r) => setTimeout(r, 2e3));
-        if (Date.now() > deadline) throw new Error(lookup("restart.timeout"));
+        await new Promise((r) => setTimeout(r, RESTART_POLL_MS2));
+        if (nextRestartWait2({ phase: "before-ping", now: Date.now(), deadlineAt }) === "timeout") {
+          throw new Error(lookup("restart.timeout"));
+        }
+        let bootChanged = false;
         try {
           const ping = await api("ping");
-          if (ping.boot !== ping0.boot) break;
+          bootChanged = ping.boot !== ping0.boot;
         } catch {
         }
+        if (nextRestartWait2({ phase: "after-ping", bootChanged }) === "done") break;
       }
       setPhase("idle");
       onDone(true);
@@ -1091,18 +1242,6 @@ function ReadmeBlock({ pkg }) {
     state.truncated ? h("div", { className: "dshm-md-note" }, lookup("readme.truncated")) : null
   );
 }
-function uninstallGuard(it) {
-  if (it.source === "link") {
-    return {
-      confirm: lookup("confirm.unlink"),
-      warn: lookup("warn.unlink", { path: it.path })
-    };
-  }
-  if (it.source === "file") {
-    return { confirm: lookup("confirm.core"), warn: lookup("warn.core") };
-  }
-  return { confirm: lookup("confirm.uninstall"), warn: null };
-}
 function InstalledTab({ notify, installed }) {
   const { loading, data, error, reload } = installed;
   const [openPkg, setOpenPkg] = useState(null);
@@ -1158,33 +1297,33 @@ function InstalledTab({ notify, installed }) {
       "div",
       { className: "dshm-cards" },
       items.map((it) => {
-        const guard = uninstallGuard(it);
+        const vm = installedViewModel2(it);
         return Card({
           key: it.pkg,
-          icon: h(Icon, { entry: { name: it.name, github: it.registryGithub || it.githubRepo || (it.spec.startsWith("github:") ? it.spec.slice(7).split("#")[0] : null), icon: null } }),
+          icon: h(Icon, { entry: { name: it.name, github: vm.githubRepo, icon: null } }),
           name: it.name,
           badges: [
-            it.outdated ? h("span", { className: "dshm-badge warn", key: "u" }, `\u2B06 ${it.latestTag || (it.latestVersion ? `v${it.latestVersion}` : "")}`.trim()) : null,
+            it.outdated ? h("span", { className: "dshm-badge warn", key: "u" }, `\u2B06 ${vm.latestLabel}`.trim()) : null,
             it.registryId ? h("span", { className: "dshm-badge", key: "r" }, lookup("badge.market")) : h("span", { className: "dshm-badge info", key: "r" }, lookup("badge.nonmarket"))
           ],
           desc: it.description || "\uFF08\u65E0\u63CF\u8FF0\uFF09",
           sub: [
             `v${it.version || "?"}`,
-            { npm: lookup("src.npm"), github: lookup("src.github"), link: lookup("src.link"), file: lookup("src.file"), unknown: lookup("src.unknown") }[it.source] || it.source
+            vm.sourceLabelKey ? lookup(vm.sourceLabelKey) : it.source
           ].join(" \xB7 "),
           links: h(LinksRow, {
             npm: it.source === "npm" ? it.pkg : null,
-            github: it.registryGithub || it.githubRepo || (it.spec.startsWith("github:") ? it.spec.slice(7).split("#")[0] : null)
+            github: vm.githubRepo
           }),
           open: openPkg === it.pkg,
           onToggle: () => setOpenPkg(openPkg === it.pkg ? null : it.pkg),
           detail: readmePkg === it.pkg ? h(ReadmeBlock, { pkg: it.pkg }) : DetailRows([
             [lookup("detail.pkg"), it.pkg],
             [lookup("detail.spec"), it.spec],
-            [lookup("detail.latest"), it.latestTag || (it.latestVersion ? `v${it.latestVersion}` : "\u2014")],
+            [lookup("detail.latest"), vm.latestLabelDetail],
             [lookup("detail.listed"), it.registryId || lookup("detail.listed.no")],
             [lookup("detail.path"), it.path],
-            guard.warn ? [lookup("detail.note"), guard.warn] : null
+            vm.guard.warnKey ? [lookup("detail.note"), lookup(vm.guard.warnKey, vm.guard.warnParams)] : null
           ]),
           actions: [
             h("button", {
@@ -1211,7 +1350,7 @@ function InstalledTab({ notify, installed }) {
             h(TwoStepButton, {
               key: "un",
               label: lookup("action.uninstall"),
-              confirmLabel: guard.confirm,
+              confirmLabel: lookup(vm.guard.confirmKey),
               className: "dshm-btn sm",
               disabled: busyPkg === it.pkg,
               onConfirm: () => doUninstall(it)
@@ -1223,23 +1362,8 @@ function InstalledTab({ notify, installed }) {
   );
 }
 function regSourceLabel(data) {
-  if (!data) return "\u2014";
-  const map = {
-    "default-raw": "src.default.raw",
-    "default-jsdelivr": "src.default.jsdelivr",
-    "default-cache": "src.default.cache",
-    bundled: "src.bundled",
-    "custom-url": "src.custom.url",
-    "custom-file": "src.custom.file",
-    "custom-cache": "src.custom.cache",
-    "custom-unavailable": "src.custom.unavailable",
-    // 旧字段兼容
-    override: "src.override",
-    jsdelivr: "src.jsdelivr",
-    raw: "src.raw",
-    cache: "src.cache"
-  };
-  return lookup(map[data.source] || data.source);
+  const key = registrySourceKey2(data);
+  return key === null ? "\u2014" : lookup(key);
 }
 function configStatusLabel(status) {
   return lookup(`settings.status.${status || "loading"}` || "settings.status.loading");
@@ -1646,43 +1770,6 @@ function registerSlot(slots, options, component) {
   if (next.key == null && next.id != null) next.key = next.id;
   return slots.register(next, component);
 }
-function pickPayload(props) {
-  const found = [];
-  const visit = (node, depth) => {
-    if (!node || depth > 6) return;
-    if (typeof node === "string") {
-      const t = node.trim();
-      if ((t.startsWith("{") || t.startsWith("[")) && t.length > 8) {
-        try {
-          visit(JSON.parse(t), depth + 1);
-        } catch {
-        }
-      }
-      return;
-    }
-    if (typeof node !== "object") return;
-    if (Array.isArray(node)) {
-      for (const x of node) visit(x, depth + 1);
-      return;
-    }
-    if (Array.isArray(node.items)) found.push(node);
-    for (const key of ["block", "meta", "result", "resultView", "view", "data", "value", "payload", "content", "message"]) {
-      if (node[key] != null) visit(node[key], depth + 1);
-    }
-  };
-  visit(props, 0);
-  return found.find((x) => x && Array.isArray(x.items)) || null;
-}
-function parseToolArgs(props) {
-  const block = props?.block;
-  const raw = (block && "kind" in block ? block.call?.argsRaw : block?.argsRaw) || "";
-  if (!raw || typeof raw !== "string") return {};
-  try {
-    return JSON.parse(raw);
-  } catch {
-    return {};
-  }
-}
 function ToolCardRow({ it, onInstalled }) {
   const [busy, setBusy] = useState(false);
   const install = async (e) => {
@@ -1723,8 +1810,8 @@ function ToolCardRow({ it, onInstalled }) {
 }
 function SearchToolView(props) {
   useEffect(() => ensureCss(), []);
-  const payload = pickPayload(props);
-  const args = parseToolArgs(props);
+  const payload = pickPayload2(props);
+  const args = parseToolArgs2(props);
   const query = String(payload?.query || args.query || "").trim();
   const fromTool = Array.isArray(payload?.items) && payload.items.length ? payload.items : null;
   const running = !!(props?.block && !("kind" in props.block));
@@ -1764,7 +1851,7 @@ function SearchToolView(props) {
 }
 function ListToolView(props) {
   useEffect(() => ensureCss(), []);
-  const payload = pickPayload(props);
+  const payload = pickPayload2(props);
   const items = Array.isArray(payload?.items) ? payload.items : [];
   if (!items.length) return null;
   return h(