dsh-plugin-upgrader 1.0.2 → 1.1.1

package/lib/client.js

@@ -61,6 +61,9 @@ window.__ModuleLoader__.load({
       upToDate: "\u5168\u90E8\u5DF2\u662F\u6700\u65B0",
       upgrade: "\u5347\u7EA7",
       upgrading: "\u5347\u7EA7\u4E2D\u2026",
+      selfUpdate: "\u7528\u9875\u9762\u5B89\u88C5\u5668\u5347\u7EA7",
+      selfUpdateHint: "\u63D2\u4EF6\u4E0D\u80FD\u5378\u8F7D\u81EA\u5DF1\u518D\u88C5\u56DE\u81EA\u5DF1\uFF0C\u6240\u4EE5\u8FD9\u4E00\u6B65\u4EA4\u7ED9\u63D2\u4EF6\u9875\u81EA\u5DF1\u7684\u5B89\u88C5\u6D41\u7A0B",
+      selfUpdateUnavailable: "\u8FD9\u4E00\u9875\u6CA1\u6709\u63D0\u4F9B\u5B89\u88C5\u5165\u53E3\uFF0C\u8BF7\u5728\u300C\u5DF2\u5B89\u88C5\u300D\u91CC\u7528\u5B98\u65B9\u5B89\u88C5\u5BF9\u8BDD\u6846\u5347\u7EA7\u672C\u63D2\u4EF6\u3002",
       history: "\u5386\u53F2\u7248\u672C",
       hideHistory: "\u6536\u8D77\u5386\u53F2",
       github: "GitHub \u4E3B\u9875",
@@ -82,19 +85,32 @@ window.__ModuleLoader__.load({
       openPage: "\u5728\u5DF2\u5B89\u88C5\u4E2D\u67E5\u770B",
       noHistory: "\u6CA1\u6709\u53EF\u7528\u7684\u7248\u672C\u8BB0\u5F55",
       noHistoryWhy: "\u8FD9\u4E2A\u5305\u4E0D\u662F\u4ECE npm \u6CE8\u518C\u8868\u5B89\u88C5\u7684\uFF0C\u6CA1\u6709\u53D1\u5E03\u5386\u53F2\u3002",
+      historyFailed: "\u7248\u672C\u5217\u8868\u8BFB\u53D6\u5931\u8D25\uFF0C\u70B9\u300C\u68C0\u67E5\u66F4\u65B0\u300D\u53EF\u91CD\u8BD5",
       versions: (n) => `${n} \u4E2A\u7248\u672C`,
       showingNewest: (n) => `\u5217\u51FA\u6700\u65B0 ${n} \u4E2A`,
       progress: (done, total) => `\u6B63\u5728\u5904\u7406 ${done}/${total}`,
+      elapsed: (text) => `\u5DF2\u7528\u65F6 ${text}`,
+      phaseInstalling: "\u6B63\u5728\u4E0B\u8F7D\u5E76\u5B89\u88C5",
+      phaseApplying: "\u6B63\u5728\u5199\u5165\u914D\u7F6E",
+      phaseCancelling: "\u6B63\u5728\u53D6\u6D88",
+      phaseWaiting: "\u51C6\u5907\u4E2D",
+      registryAttempt: (index, total) => `\u6CE8\u518C\u8868 ${index}/${total}\uFF0C\u4E0A\u4E00\u4E2A\u8D85\u65F6\u4F1A\u81EA\u52A8\u6362\u6E90`,
+      slowHint: "\u9996\u6B21\u5B89\u88C5\u6216\u9700\u8981\u6821\u9A8C\u4F9D\u8D56\u65F6\u4F1A\u6BD4\u8F83\u6162\uFF0C\u65E5\u5FD7\u91CC\u80FD\u770B\u5230\u771F\u5B9E\u8FDB\u5EA6\u3002",
+      cancelRequested: "\u5DF2\u8BF7\u6C42\u53D6\u6D88",
+      stalled: "\u8FD9\u4E00\u6B65\u5DF2\u7ECF\u5F88\u4E45\u6CA1\u6709\u8F93\u51FA\u4E86\uFF0C\u53EF\u4EE5\u53D6\u6D88\u540E\u91CD\u8BD5\u3002",
+      staleSnapshot: "\u72B6\u6001\u5DF2\u505C\u6B62\u66F4\u65B0\uFF0C\u8BF7\u68C0\u67E5\u66F4\u65B0",
       cancel: "\u53D6\u6D88",
       cancelling: "\u6B63\u5728\u53D6\u6D88\u2026",
       restart: "\u9700\u8981\u91CD\u542F DSH \u624D\u4F1A\u751F\u6548\u3002",
       restartHint: "\u5DF2\u4FDD\u5B58\u7684\u6539\u52A8\u5728\u4E0B\u6B21\u542F\u52A8\u65F6\u751F\u6548\u3002",
+      reloadForAppearance: "\u4E3B\u9898\u63D2\u4EF6\u5DF2\u66F4\u65B0\uFF0C\u6B63\u5728\u91CD\u65B0\u52A0\u8F7D\u9875\u9762\u4EE5\u6062\u590D\u4E3B\u9898\u5916\u89C2\uFF08\u4E3B\u9898\u914D\u7F6E\u4FDD\u5B58\u5728\u78C1\u76D8\u4E0A\uFF0C\u4E0D\u4F1A\u4E22\u5931\uFF09\u3002",
       done: "\u5B8C\u6210",
       failed: "\u5931\u8D25",
       failedSome: (n) => `${n} \u4E2A\u5931\u8D25`,
       jobDone: "\u6279\u91CF\u5347\u7EA7\u5B8C\u6210",
       jobCancelled: "\u5DF2\u53D6\u6D88",
       busyAdopted: "\u5DF2\u6709\u4E00\u6279\u5347\u7EA7\u6B63\u5728\u8FDB\u884C\uFF0C\u5DF2\u63A5\u7740\u663E\u793A\u5B83\u7684\u8FDB\u5EA6\u3002",
+      lostJob: "\u5347\u7EA7\u8FDB\u5EA6\u5DF2\u5931\u53BB\u8054\u7CFB\uFF08\u5BBF\u4E3B\u53EF\u80FD\u91CD\u542F\u8FC7\uFF09\u3002\u8BF7\u68C0\u67E5\u66F4\u65B0\uFF0C\u786E\u8BA4\u63D2\u4EF6\u5F53\u524D\u7248\u672C\u3002",
       log: "\u8FD0\u884C\u65E5\u5FD7",
       showLog: "\u67E5\u770B\u65E5\u5FD7",
       hideLog: "\u6536\u8D77\u65E5\u5FD7",
@@ -126,6 +142,9 @@ window.__ModuleLoader__.load({
       upToDate: "Everything is up to date",
       upgrade: "Upgrade",
       upgrading: "Upgrading\u2026",
+      selfUpdate: "Upgrade via the page",
+      selfUpdateHint: "A plugin cannot uninstall and reinstall itself, so this runs the plugin page own installer",
+      selfUpdateUnavailable: "This page offers no install entry; upgrade this plugin from the Installed tab instead.",
       history: "Version history",
       hideHistory: "Hide history",
       github: "GitHub page",
@@ -147,19 +166,32 @@ window.__ModuleLoader__.load({
       openPage: "Open in Installed",
       noHistory: "No published versions found",
       noHistoryWhy: "This package was not installed from an npm registry, so it has no published history.",
+      historyFailed: 'Could not read the version list; "Check for updates" retries it',
       versions: (n) => `${n} versions`,
       showingNewest: (n) => `showing newest ${n}`,
       progress: (done, total) => `Working on ${done}/${total}`,
+      elapsed: (text) => `${text} elapsed`,
+      phaseInstalling: "Downloading and installing",
+      phaseApplying: "Writing the profile",
+      phaseCancelling: "Cancelling",
+      phaseWaiting: "Preparing",
+      registryAttempt: (index, total) => `Registry ${index}/${total}; a timeout falls back to the next`,
+      slowHint: "A first install, or one that must verify dependencies, takes a while \u2014 the log shows what is happening.",
+      cancelRequested: "Cancellation requested",
+      stalled: "This step has produced no output for a long time; cancel it and retry.",
+      staleSnapshot: "status stopped updating \u2014 check for updates",
       cancel: "Cancel",
       cancelling: "Cancelling\u2026",
       restart: "Restart DSH to finish.",
       restartHint: "Saved changes take effect on the next start.",
+      reloadForAppearance: "The theme plugin was updated; reloading the page to restore its look (its settings are on disk and are not lost).",
       done: "done",
       failed: "failed",
       failedSome: (n) => `${n} failed`,
       jobDone: "Batch upgrade finished",
       jobCancelled: "Cancelled",
       busyAdopted: "A batch is already running; showing its progress instead.",
+      lostJob: "Lost contact with the upgrade (the host may have restarted). Check for updates to confirm the installed version.",
       log: "Run log",
       showLog: "Show log",
       hideLog: "Hide log",
@@ -205,6 +237,16 @@ window.__ModuleLoader__.load({
         window.open(url, "_blank", "noopener,noreferrer");
       }
     }
+    function formatElapsed(ms) {
+      if (!Number.isFinite(ms) || ms < 0) return "0s";
+      const total = Math.floor(ms / 1e3);
+      if (total < 60) return `${total}s`;
+      const minutes = Math.floor(total / 60);
+      const seconds = total % 60;
+      if (minutes < 60) return `${minutes}m ${String(seconds).padStart(2, "0")}s`;
+      const hours = Math.floor(minutes / 60);
+      return `${hours}h ${String(minutes % 60).padStart(2, "0")}m`;
+    }
     function resolveVersionLink(row, version) {
       const raw = typeof version.href === "string" ? version.href : typeof version.url === "string" && typeof row.repoUrl === "string" && version.url.startsWith("/") ? `${row.repoUrl}${version.url}` : version.url;
       return typeof raw === "string" && /^https?:\/\//i.test(raw) ? raw : void 0;
@@ -335,6 +377,16 @@ window.__ModuleLoader__.load({
       );
       return alive;
     }
+    var APPEARANCE_PATTERN = /(^|[/@-])(skin|theme|dream-skin|wallpaper|appearance)([/@.-]|$)/i;
+    function isAppearancePackage(name2) {
+      return APPEARANCE_PATTERN.test(name2);
+    }
+    function replacedAppearance(results) {
+      if (!Array.isArray(results)) return false;
+      return results.some(
+        (result) => result.ok === true && result.changed !== false && typeof result.name === "string" && isAppearancePackage(result.name)
+      );
+    }
 
     // src/client/styles.ts
     var STYLE_ID = "dsh-plugin-upgrader-style";
@@ -352,7 +404,7 @@ window.__ModuleLoader__.load({
     .dsh-pu-btn { display: inline-flex; align-items: center; gap: 6px; height: 30px; padding: 0 12px; border-radius: 8px; font-size: 12px; font-weight: 500; cursor: pointer; border: 1px solid var(--dsw-alias-border-l1); background: var(--dsw-alias-bg-layer-1); color: var(--dsw-alias-label-primary); transition: background .15s ease, border-color .15s ease, opacity .15s ease; font-family: inherit; }
     .dsh-pu-btn:hover:not(:disabled) { background: var(--dsw-alias-interactive-bg-hover); border-color: var(--dsw-alias-border-l2); }
     .dsh-pu-btn:disabled { opacity: .5; cursor: default; }
-    .dsh-pu-btn.is-primary { background: var(--dsw-alias-button-primary-fill); border-color: transparent; color: #fff; }
+    .dsh-pu-btn.is-primary { background: var(--dsw-alias-button-primary-fill); border-color: transparent; color: var(--dsw-alias-label-primary-inverted, #fff); }
     .dsh-pu-btn.is-primary:hover:not(:disabled) { background: var(--dsw-alias-button-primary-hover); }
     .dsh-pu-btn.is-ghost { background: transparent; border-color: transparent; color: var(--dsw-alias-label-secondary); padding: 0 8px; }
     .dsh-pu-btn.is-ghost:hover:not(:disabled) { background: var(--dsw-alias-interactive-bg-hover); color: var(--dsw-alias-label-primary); }
@@ -384,6 +436,8 @@ window.__ModuleLoader__.load({
     .dsh-pu-name { font-size: 13px; font-weight: 600; display: flex; align-items: center; gap: 8px; min-width: 0; }
     .dsh-pu-name span { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
     .dsh-pu-desc { font-size: 11px; color: var(--dsw-alias-label-tertiary); overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
+    .dsh-pu-note { font-size: 11px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
+    .dsh-pu-note.is-err { color: var(--dsw-alias-state-error-primary); }
     .dsh-pu-mono { font-family: ui-monospace, SFMono-Regular, Menlo, Consolas, monospace; font-size: 11px; color: var(--dsw-alias-label-secondary); }
     .dsh-pu-tag { font-size: 10px; line-height: 1; padding: 3px 6px; border-radius: 999px; border: 1px solid var(--dsw-alias-border-l1); color: var(--dsw-alias-label-secondary); font-weight: 500; white-space: nowrap; }
     .dsh-pu-tag.is-new { border-color: var(--dsw-alias-brand-primary); color: var(--dsw-alias-brand-primary); background: color-mix(in srgb, var(--dsw-alias-brand-primary) 14%, transparent); }
@@ -412,7 +466,10 @@ window.__ModuleLoader__.load({
     .dsh-pu-job-head { display: flex; align-items: center; gap: 10px; font-size: 12px; }
     .dsh-pu-job-head .dsh-pu-grow { flex: 1; min-width: 0; }
     .dsh-pu-bar { height: 4px; border-radius: 999px; background: var(--dsw-alias-bg-layer-3); overflow: hidden; }
-    .dsh-pu-bar div { height: 100%; border-radius: 999px; background: var(--dsw-alias-brand-primary); transition: width .25s ease; }
+    .dsh-pu-bar-inner { height: 100%; border-radius: 999px; background: var(--dsw-alias-brand-primary); transition: width .25s ease; }
+    .dsh-pu-bar-inner.is-busy { width: 40%; transition: none; animation: dsh-pu-indeterminate 1.4s ease-in-out infinite; }
+    @keyframes dsh-pu-indeterminate { 0% { transform: translateX(-100%); } 100% { transform: translateX(250%); } }
+    .dsh-pu-hint { font-size: 11px; color: var(--dsw-alias-label-tertiary); }
     .dsh-pu-log { max-height: 160px; overflow: auto; font-family: ui-monospace, SFMono-Regular, Menlo, Consolas, monospace; font-size: 10.5px; line-height: 1.55; color: var(--dsw-alias-label-secondary); white-space: pre-wrap; word-break: break-word; border-top: 1px dashed var(--dsw-alias-border-l1); padding-top: 8px; margin: 0; }
     .dsh-pu-banner { display: flex; align-items: center; gap: 8px; font-size: 11.5px; padding: 7px 10px; border-radius: 8px; border: 1px solid var(--dsw-alias-border-l1); background: var(--dsw-alias-bg-layer-2); color: var(--dsw-alias-label-secondary); }
     .dsh-pu-banner.is-warn { border-color: var(--dsw-alias-state-warn-primary); color: var(--dsw-alias-state-warn-primary); }
@@ -420,10 +477,23 @@ window.__ModuleLoader__.load({
     .dsh-pu-foot { display: flex; align-items: center; gap: 10px; font-size: 11px; color: var(--dsw-alias-label-tertiary); flex-wrap: wrap; }
     .dsh-pu-spin { width: 12px; height: 12px; border-radius: 50%; border: 2px solid var(--dsw-alias-border-l2); border-top-color: var(--dsw-alias-brand-primary); animation: dsh-pu-spin .8s linear infinite; flex: none; }
     @keyframes dsh-pu-spin { to { transform: rotate(360deg); } }
-    @media (prefers-reduced-motion: reduce) { .dsh-pu-spin { animation-duration: 2.4s; } }
+    @media (prefers-reduced-motion: reduce) { .dsh-pu-spin { animation-duration: 2.4s; } .dsh-pu-bar-inner.is-busy { animation-duration: 3s; } }
     `;
 
     // src/client/components/JobPanel.ts
+    var CLOCK_MS = 1e3;
+    var STALE_SNAPSHOT_MS = 20 * 1e3;
+    function useNow(running, from) {
+      const React = getReact();
+      const [now, setNow] = React.useState(() => Date.now());
+      React.useEffect(() => {
+        if (!running || from === void 0) return void 0;
+        setNow(Date.now());
+        const timer = setInterval(() => setNow(Date.now()), CLOCK_MS);
+        return () => clearInterval(timer);
+      }, [running, from]);
+      return now;
+    }
     function JobPanel(props) {
       const h = getH();
       const React = getReact();
@@ -434,6 +504,16 @@ window.__ModuleLoader__.load({
       const percent = total === 0 ? 0 : Math.round(done / total * 100);
       const running = job.status === "running" || job.status === "queued";
       const failed = job.failed ?? 0;
+      const inStep = running && job.current !== void 0;
+      const now = useNow(inStep, job.stepStartedAt);
+      const stamp = `${job.id}|${job.stepStartedAt ?? ""}|${job.done ?? 0}|${job.status}`;
+      const lastChange = React.useRef({ stamp, at: Date.now() });
+      if (lastChange.current.stamp !== stamp) lastChange.current = { stamp, at: Date.now() };
+      const stale = inStep && Date.now() - lastChange.current.at > STALE_SNAPSHOT_MS;
+      const stepMs = job.stepStartedAt === void 0 ? 0 : Math.max(0, now - job.stepStartedAt);
+      const phaseKey = job.phase === "installing" ? "phaseInstalling" : job.phase === "applying" ? "phaseApplying" : job.phase === "cancelling" ? "phaseCancelling" : "phaseWaiting";
+      const phaseText = job.attempt !== void 0 && job.attempt.total > 1 ? t("registryAttempt", job.attempt.index, job.attempt.total) : t(phaseKey);
+      const headline = running ? t("progress", done, total) : job.status === "cancelled" ? t("jobCancelled") : t("jobDone");
       return h(
         "div",
         { className: "dsh-pu-job" },
@@ -444,8 +524,17 @@ window.__ModuleLoader__.load({
           h(
             "span",
             { className: "dsh-pu-grow" },
-            running ? t("progress", done, total) : job.status === "cancelled" ? t("jobCancelled") : t("jobDone"),
-            job.current === void 0 ? null : h("span", { className: "dsh-pu-mono" }, ` ${job.current}`)
+            headline,
+            job.current === void 0 ? null : h("span", { className: "dsh-pu-mono" }, ` ${job.current}`),
+            inStep ? h(
+              "span",
+              { className: "dsh-pu-dim" },
+              ` \xB7 ${phaseText} \xB7 ${t("elapsed", formatElapsed(stepMs))}`
+            ) : null,
+            // Once the snapshot stops moving the clock is reporting a number nobody
+            // is updating, so say so instead of letting it climb.
+            stale ? h("span", { className: "dsh-pu-dim" }, ` \xB7 ${t("staleSnapshot")}`) : null,
+            job.abandoned === true ? h("span", { className: "dsh-pu-dim" }, ` \xB7 ${t("stalled")}`) : null
           ),
           failed > 0 ? h("span", { className: "dsh-pu-tag is-err" }, t("failedSome", failed)) : null,
           running ? h(
@@ -459,7 +548,12 @@ window.__ModuleLoader__.load({
             showLog ? t("hideLog") : t("showLog")
           )
         ),
-        h("div", { className: "dsh-pu-bar" }, h("div", { style: { width: `${percent}%` } })),
+        h(
+          "div",
+          { className: "dsh-pu-bar" },
+          inStep ? h("div", { className: "dsh-pu-bar-inner is-busy" }) : h("div", { className: "dsh-pu-bar-inner", style: { width: `${percent}%` } })
+        ),
+        inStep ? h("div", { className: "dsh-pu-hint" }, t("slowHint")) : null,
         showLog && Array.isArray(job.log) ? h("pre", { className: "dsh-pu-log" }, job.log.join("\n")) : null
       );
     }
@@ -508,7 +602,13 @@ window.__ModuleLoader__.load({
             disabled: busy || version.current === true,
             onClick: () => onSwitch(row, version.version)
           },
-          version.version === row.latest ? t("back") : t("switchTo")
+          /*
+           * "Back to latest" is only meaningful when the row is not already on it.
+           * The label used to key on `version.version === row.latest` alone, so the
+           * version the user is running offered to switch to itself whenever the
+           * host had not marked it current.
+           */
+          version.version === row.latest && version.current !== true ? t("back") : t("switchTo")
         )
       );
     }
@@ -518,12 +618,17 @@ window.__ModuleLoader__.load({
       const h = getH();
       const React = getReact();
       const { row, t, busy, picked, onToggle, onUpgrade, onSwitch, onApprove, onOpenPage } = props;
+      const { self, onInstallSelf } = props;
+      const { onRetryHistory } = props;
       const [open, setOpen] = React.useState(false);
       const versions = Array.isArray(row.versions) ? row.versions : [];
       const hasHistory = versions.length > 0;
-      const selectable = row.upgradable === true;
+      const selfUpdate = self === true && row.latest !== void 0 && row.latest !== row.version;
+      const selectable = row.upgradable === true && self !== true;
       const status = row.error !== void 0 && row.error !== null ? "err" : row.upgradable ? "new" : "idle";
-      const versionNote = row.versionError !== void 0 ? row.versionError === "not a profile-managed package" ? t("sourcePath") : row.versionError : void 0;
+      const failure = row.versionError !== void 0 && row.versionError !== "" ? row.versionError : void 0;
+      const retriable = failure !== void 0 && /unreachable|timeout|registry \d|github/i.test(failure);
+      const versionNote = failure === void 0 ? void 0 : failure === "not a profile-managed package" ? t("sourcePath") : failure;
       const pendingBuilds = Array.isArray(row.pendingBuilds) ? row.pendingBuilds : [];
       return h(
         "div",
@@ -566,7 +671,22 @@ window.__ModuleLoader__.load({
               "div",
               { className: "dsh-pu-desc" },
               row.description !== void 0 && row.description !== "" ? row.description : versionNote ?? row.name
-            )
+            ),
+            failure !== void 0 && retriable ? h(
+              "div",
+              { className: "dsh-pu-note is-err", title: failure },
+              `${t("historyFailed")}: ${failure}`,
+              typeof onRetryHistory === "function" ? h(
+                "button",
+                {
+                  type: "button",
+                  className: "dsh-pu-btn is-ghost is-tiny",
+                  disabled: busy,
+                  onClick: onRetryHistory
+                },
+                t("retry")
+              ) : null
+            ) : null
           ),
           h(
             "div",
@@ -587,6 +707,16 @@ window.__ModuleLoader__.load({
                 onClick: () => onUpgrade(row)
               },
               t("upgrade")
+            ) : selfUpdate && typeof onInstallSelf === "function" ? h(
+              "button",
+              {
+                type: "button",
+                className: "dsh-pu-btn is-primary is-tiny",
+                disabled: busy,
+                title: `${t("selfUpdateHint")} \u2192${row.latest}`,
+                onClick: () => onInstallSelf(row, row.latest)
+              },
+              t("selfUpdate")
             ) : null,
             typeof row.repoUrl === "string" ? h(
               "button",
@@ -654,6 +784,8 @@ window.__ModuleLoader__.load({
     }
 
     // src/client/components/Tab.ts
+    var SELF_NAME = "dsh-plugin-upgrader";
+    var APPEARANCE_RELOAD_DELAY_MS = 1200;
     function Tab(props) {
       const h = getH();
       const React = getReact();
@@ -675,14 +807,27 @@ window.__ModuleLoader__.load({
           setBusyName(void 0);
           setCancelling(false);
           reload(false);
+          if (settled === void 0) {
+            setJob(void 0);
+            setBanner({ tone: "warn", text: t("lostJob") });
+            return settled;
+          }
           const failures = Array.isArray(settled?.results) ? settled.results.filter((result) => result.ok !== true) : [];
           if (failures.length > 0) {
             setBanner({
               tone: "err",
-              text: failures.map((failure) => `${failure.name}: ${failure.message ?? failure.detail ?? "error"}`).join(" \xB7 ")
+              text: failures.map((failure) => {
+                const code = failure.message ?? "error";
+                return failure.detail === void 0 ? `${failure.name}: ${code}` : `${failure.name}: ${failure.detail} (${code})`;
+              }).join(" \xB7 ")
             });
           } else if (settled?.results?.some((result) => result.application === "restart-required") === true) {
             setBanner({ tone: "warn", text: t("restart") });
+          } else if (replacedAppearance(settled?.results)) {
+            setBanner({ tone: "info", text: t("reloadForAppearance") });
+            window.setTimeout(() => {
+              window.location.reload();
+            }, APPEARANCE_RELOAD_DELAY_MS);
           }
           return settled;
         },
@@ -703,31 +848,23 @@ window.__ModuleLoader__.load({
           if (steps.length === 0) return;
           setBanner(void 0);
           setBusyName(label);
+          setJob({ id: "", status: "queued", total: steps.length, done: 0, failed: 0, log: [] });
           const outcome = await submitJob(steps, watch);
           if (!alive.current) return;
-          if (outcome.kind === "started") {
-            setJob({
-              id: outcome.id,
-              status: "queued",
-              total: steps.length,
-              done: 0,
-              failed: 0,
-              log: []
-            });
-            return;
-          }
-          if (outcome.kind === "adopted") {
-            setBanner({ tone: "warn", text: t("busyAdopted") });
+          if (outcome.kind === "started" || outcome.kind === "adopted") {
+            if (outcome.kind === "adopted") setBanner({ tone: "warn", text: t("busyAdopted") });
             return;
           }
           setBusyName(void 0);
+          setJob(void 0);
           const failure = outcome.error;
           setBanner({ tone: "err", text: failure instanceof Error ? failure.message : String(failure) });
         },
         [alive, t, watch]
       );
       const rows = Array.isArray(data?.bundles) ? data.bundles : [];
-      const upgradable = rows.filter((row) => row.upgradable === true);
+      const batchable = (row) => row.upgradable === true && row.name !== SELF_NAME;
+      const upgradable = rows.filter(batchable);
       const needle = query.trim().toLowerCase();
       const filtered = needle === "" ? rows : rows.filter(
         (row) => row.name.toLowerCase().includes(needle) || String(row.title ?? "").toLowerCase().includes(needle)
@@ -751,6 +888,18 @@ window.__ModuleLoader__.load({
         const pendingBuilds = Array.isArray(row.pendingBuilds) ? row.pendingBuilds : [];
         void run([stepOf(row, row.latest ?? row.version ?? "", "upgrade", pendingBuilds)], row.name);
       };
+      const installSelf = React.useCallback(
+        (row, version) => {
+          const install = props.install;
+          if (typeof install !== "function") {
+            setBanner({ tone: "warn", text: t("selfUpdateUnavailable") });
+            return;
+          }
+          setBanner(void 0);
+          install({ spec: `${row.name}@${version}`, title: row.title, version });
+        },
+        [props.install, t]
+      );
       const upgradeAll = () => {
         void run(
           upgradable.map((row) => stepOf(row, row.latest ?? row.version ?? "", "upgrade")),
@@ -908,7 +1057,10 @@ window.__ModuleLoader__.load({
               onUpgrade: upgradeOne,
               onSwitch: switchOne,
               onApprove: approveAndRetry,
-              onOpenPage: typeof props.openPackage === "function" ? props.openPackage : void 0
+              onOpenPage: typeof props.openPackage === "function" ? props.openPackage : void 0,
+              self: row.name === SELF_NAME,
+              onInstallSelf: installSelf,
+              onRetryHistory: () => reload(true)
             })
           )
         ),

package/lib/host/install.d.ts

@@ -10,6 +10,15 @@
 import type { ChangeResult, PluginManager, StepRecord } from './manager.ts';
 /** Progress sink for one job. */
 export type LogSink = (message: string) => void;
+/**
+ * Called with the id of the installation currently in flight.
+ *
+ * `runStep` mints the id it hands the manager, and cancellation needs exactly
+ * that id: the manager answers `not-running` for anything else. Reporting it
+ * here lets the job record stay cancellable across the whole step, including
+ * the removal a version replacement starts with.
+ */
+export type RequestIdSink = (requestId: string) => void;
 /** One step's outcome, including every failure stage. */
 export interface StepOutcome {
     name: string;
@@ -58,9 +67,10 @@ export declare function restoreEnabledState(manager: PluginManager, step: Pick<S
  * @param manager - the plugin manager.
  * @param step - the requested change.
  * @param log - progress sink.
+ * @param announce - receives the request id the step installs under.
  * @returns the outcome record.
  */
-export declare function runStep(manager: PluginManager, step: StepRecord, log: LogSink): Promise<StepOutcome>;
+export declare function runStep(manager: PluginManager, step: StepRecord, log: LogSink, announce?: RequestIdSink): Promise<StepOutcome>;
 /**
  * Whether a step names something this plugin is willing to install.
  *

package/lib/host/install.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"install.d.ts","sourceRoot":"","sources":["../../src/host/install.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAE3E,iCAAiC;AACjC,MAAM,MAAM,OAAO,GAAG,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAA;AAE/C,yDAAyD;AACzD,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,MAAM,CAAA;IACZ,SAAS,EAAE,MAAM,CAAA;IACjB,EAAE,EAAE,OAAO,CAAA;IACX,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,WAAW,CAAC,EAAE,YAAY,CAAC,aAAa,CAAC,CAAA;IACzC,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,KAAK,CAAC,EAAE,SAAS,GAAG,QAAQ,GAAG,QAAQ,CAAA;IACvC,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,aAAa,CAAC,EAAE,MAAM,EAAE,CAAA;IACxB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;IACnB,aAAa,CAAC,EAAE;QACd,QAAQ,EAAE,MAAM,CAAA;QAChB,IAAI,CAAC,EAAE,MAAM,CAAA;QACb,QAAQ,CAAC,EAAE,OAAO,CAAA;QAClB,IAAI,CAAC,EAAE,MAAM,CAAA;KACd,CAAA;CACF;AAED,gCAAgC;AAChC,eAAO,MAAM,OAAO,aAAyC,CAAA;AAE7D;;;;;;;;;;;GAWG;AACH,wBAAsB,mBAAmB,CACvC,OAAO,EAAE,aAAa,EACtB,IAAI,EAAE,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,EAC9B,MAAM,EAAE,OAAO,GAAG,SAAS,EAC3B,GAAG,EAAE,OAAO,GACX,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,CAuB9B;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,OAAO,CAC3B,OAAO,EAAE,aAAa,EACtB,IAAI,EAAE,UAAU,EAChB,GAAG,EAAE,OAAO,GACX,OAAO,CAAC,WAAW,CAAC,CA4FtB;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAM9D"}
+{"version":3,"file":"install.d.ts","sourceRoot":"","sources":["../../src/host/install.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,KAAK,EAAc,YAAY,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAEvF,iCAAiC;AACjC,MAAM,MAAM,OAAO,GAAG,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAA;AAE/C;;;;;;;GAOG;AACH,MAAM,MAAM,aAAa,GAAG,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAA;AAEvD,yDAAyD;AACzD,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,MAAM,CAAA;IACZ,SAAS,EAAE,MAAM,CAAA;IACjB,EAAE,EAAE,OAAO,CAAA;IACX,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,WAAW,CAAC,EAAE,YAAY,CAAC,aAAa,CAAC,CAAA;IACzC,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,KAAK,CAAC,EAAE,SAAS,GAAG,QAAQ,GAAG,QAAQ,CAAA;IACvC,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,aAAa,CAAC,EAAE,MAAM,EAAE,CAAA;IACxB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;IACnB,aAAa,CAAC,EAAE;QACd,QAAQ,EAAE,MAAM,CAAA;QAChB,IAAI,CAAC,EAAE,MAAM,CAAA;QACb,QAAQ,CAAC,EAAE,OAAO,CAAA;QAClB,IAAI,CAAC,EAAE,MAAM,CAAA;KACd,CAAA;CACF;AAED,gCAAgC;AAChC,eAAO,MAAM,OAAO,aAAyC,CAAA;AA6K7D;;;;;;;;;;;GAWG;AACH,wBAAsB,mBAAmB,CACvC,OAAO,EAAE,aAAa,EACtB,IAAI,EAAE,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,EAC9B,MAAM,EAAE,OAAO,GAAG,SAAS,EAC3B,GAAG,EAAE,OAAO,GACX,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,CAuB9B;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,OAAO,CAC3B,OAAO,EAAE,aAAa,EACtB,IAAI,EAAE,UAAU,EAChB,GAAG,EAAE,OAAO,EACZ,QAAQ,CAAC,EAAE,aAAa,GACvB,OAAO,CAAC,WAAW,CAAC,CAgHtB;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAM9D"}