@shellraining/dsh-plugin-updates 0.1.0 → 0.1.2

package/README.md

@@ -1,6 +1,6 @@
 # dsh-plugin-updates
 
-在插件页加一个「更新」标签，检查从 npm 安装的插件有没有新版本，可以逐个更新、全部更新，或者在插件详情页里挑一个版本安装。
+检查从 npm 安装的插件有没有新版本。插件页的「已安装插件」列表里可以逐个更新或全部更新，插件详情页里还能挑一个版本安装。
 
 ## 安装
 
@@ -11,22 +11,25 @@ dsh plugin --profile web add @shellraining/dsh-plugin-updates
 ## 使用
 
 - **已安装插件列表**：有新版本时，「已安装插件」标题旁出现「全部更新（N）」，对应插件卡片的开关左边出现「更新到 x.y.z」。点卡片其他位置照常进入详情页。
-- **更新标签**：打开侧栏的「插件」，切到「更新」，列出所有从 npm 安装的插件，以及当前版本、最新版本和检查状态。点插件名或「详情」会打开官方的插件详情页。
 - **插件详情页**：有新版本时，标题旁显示「可更新」标签，右上角多一个「更新到 x.y.z」按钮。页面底部有版本列表，每个版本都能单独安装，不兼容当前 DSH 的版本不能点。
 
 只检查依赖记录为 `包名@版本范围` 的插件。Git、本地目录、tarball 来源的插件和 DSH 官方插件都会跳过。
 
-打开标签页或详情页时检查一次，结果缓存 10 分钟，点「检查更新」会重新查询。查询直接从浏览器读 npm registry，用的是 profile 中 pnpm 配置的源，查不到时再试插件管理器配置的备选源（默认是 npmmirror）。需要认证的私有源无法检查。
+打开插件页或详情页时检查一次，结果缓存 10 分钟，过期后再打开会重新查询。查询直接从浏览器读 npm registry，用的是 profile 中 pnpm 配置的源，查不到时再试插件管理器配置的备选源（默认是 npmmirror）。需要认证的私有源无法检查。
 
 ## 更新是怎么做的
 
 插件不改 profile 文件，所有改动都调用宿主插件管理器的接口：先卸载旧版本，再安装 `包名@版本`，用精确版本号保存，并保留原来的启用状态。版本兼容检查、构建脚本审批和锁文件回滚都由宿主处理。
 
-卸载后安装失败时，插件会保持未安装状态，提示里会显示 pnpm 的输出，并提供「恢复」按钮，按原来的版本重新安装。发布不足 24 小时的版本会标为「新发布」，pnpm 开启 `minimumReleaseAge` 时，这类版本可能装不上。
+操作前会重新读取安装状态，已经是目标版本时跳过；精确版本声明与实际安装版本不一致时，会停止更新，提示先修复安装。卸载失败后不会继续安装，也不会断言安装状态完全没变。
 
-本插件不能在页面里更新自己，因为卸载自己时界面也会一起卸载。需要更新时，列表会给出对应的 `dsh plugin` 命令，退出 DSH 后在终端运行即可。
+卸载后安装失败时，已安装列表下方会保留完整错误、日志路径和「恢复」按钮，按原来的版本重新安装；恢复失败后可以再次重试。只有确认卸载成功后才提供恢复，不会覆盖随后通过其他入口安装的版本。错误摘要优先显示错误行，不会把 pnpm 开头的成功检查信息当成失败原因。
 
-官方列表没有给卡片开放扩展点，列表上的按钮靠 `data-plugin-group="bundles"`、`data-plugin-package` 和开关的 `role="switch"` 这几个语义属性定位，见 `src/client/anchors.ts`。DSH 改了这部分结构时，列表上的按钮会消失，「更新」标签和详情页不受影响。
+发布不足 24 小时的版本会标为「新发布」，pnpm 开启 `minimumReleaseAge` 时，这类版本可能装不上。如果出现 `ERR_PNPM_RESOLUTION_POLICY_VIOLATIONS_UNHANDLED`，说明 pnpm 的策略处理发生内部错误，不代表供应链校验通过就能继续安装；插件会停止操作并保留日志，不会关闭安全策略。
+
+本插件不能在页面里更新自己，因为卸载自己时界面也会一起卸载。有新版本时，它的详情页会给出对应的 `dsh plugin` 命令，退出 DSH 后在终端运行即可。
+
+官方列表没有给卡片开放扩展点，列表上的按钮靠 `data-plugin-group="bundles"`、`data-plugin-package` 和开关的 `role="switch"` 这几个语义属性定位，见 `src/client/anchors.ts`。DSH 改了这部分结构时，列表上的按钮会消失，详情页不受影响。
 
 ## 开发
 

package/lib/client.js

@@ -1265,29 +1265,14 @@ module.exports = __toCommonJS(index_exports);
 // src/client/locale.ts
 var LOCALE_NS = "dshPluginUpdates";
 var ZH = {
-  "tab": "\u66F4\u65B0",
-  "summary.loading": "\u6B63\u5728\u68C0\u67E5\u66F4\u65B0\u2026",
-  "summary.some": "{count} \u4E2A\u63D2\u4EF6\u53EF\u66F4\u65B0",
-  "summary.none": "\u6240\u6709 npm \u63D2\u4EF6\u90FD\u5DF2\u662F\u6700\u65B0\u7248\u672C",
-  "summary.empty": "\u6CA1\u6709\u4ECE npm \u5B89\u88C5\u7684\u63D2\u4EF6",
-  "summary.skipped": "{count} \u4E2A\u63D2\u4EF6\u4E0D\u662F\u4ECE npm \u5B89\u88C5\u7684\uFF0C\u672A\u68C0\u67E5",
-  "refresh": "\u68C0\u67E5\u66F4\u65B0",
-  "updateAll": "\u5168\u90E8\u66F4\u65B0",
   "updateAllCount": "\u5168\u90E8\u66F4\u65B0\uFF08{count}\uFF09",
   "updateLabel": "\u628A {name} \u66F4\u65B0\u5230 {version}",
   "updating": "\u66F4\u65B0\u4E2D\u2026",
-  "update": "\u66F4\u65B0",
   "updateTo": "\u66F4\u65B0\u5230 {version}",
   "install": "\u5B89\u88C5",
-  "details": "\u8BE6\u60C5",
-  "loadFailed": "\u8BFB\u53D6\u63D2\u4EF6\u5217\u8868\u5931\u8D25\uFF1A{reason}",
-  "retry": "\u91CD\u8BD5",
   "status.update": "\u53EF\u66F4\u65B0 {version}",
-  "status.latest": "\u5DF2\u662F\u6700\u65B0",
-  "status.checking": "\u68C0\u67E5\u4E2D",
-  "status.failed": "\u67E5\u8BE2\u5931\u8D25",
+  "versions.loading": "\u6B63\u5728\u8BFB\u53D6\u7248\u672C\u2026",
   "version.current": "\u5F53\u524D {version}",
-  "version.arrow": "{from} \u2192 {to}",
   "versions.title": "\u7248\u672C",
   "versions.registry": "\u6765\u81EA {registry}",
   "versions.showAll": "\u663E\u793A\u5168\u90E8 {count} \u4E2A\u7248\u672C",
@@ -1304,41 +1289,32 @@ var ZH = {
   "self.body": "\u5728\u9875\u9762\u91CC\u5378\u8F7D\u81EA\u5DF1\u4F1A\u8BA9\u8FD9\u4E2A\u754C\u9762\u4E00\u8D77\u6D88\u5931\u3002\u8BF7\u5148\u5B8C\u5168\u9000\u51FA DSH\uFF0C\u5728\u7EC8\u7AEF\u8FD0\u884C\u4E0B\u9762\u7684\u547D\u4EE4\uFF0C\u518D\u91CD\u65B0\u6253\u5F00\uFF1A",
   "self.copy": "\u590D\u5236\u547D\u4EE4",
   "self.copied": "\u5DF2\u590D\u5236",
+  "error.policy": "pnpm \u5904\u7406 minimumReleaseAge \u65F6\u53D1\u751F\u5185\u90E8\u9519\u8BEF\u3002\u8BF7\u5347\u7EA7\u5BBF\u4E3B\u9644\u5E26\u7684 pnpm\uFF0C\u6216\u7B49\u53D1\u5E03\u7B49\u5F85\u671F\u7ED3\u675F\u540E\u91CD\u8BD5\uFF1B\u5B8C\u6574\u9519\u8BEF\u89C1\u4E0B\u65B9\u65E5\u5FD7",
+  "error.inconsistent": "\u5B89\u88C5\u58F0\u660E\u4E0E\u5B9E\u9645\u7248\u672C\u4E0D\u4E00\u81F4\uFF0C\u8BF7\u5148\u7528\u5BBF\u4E3B\u63D2\u4EF6\u7BA1\u7406\u5668\u6216 CLI \u4FEE\u590D\u5B89\u88C5\uFF0C\u518D\u91CD\u8BD5\u66F4\u65B0",
+  "error.stateChanged": "\u63D2\u4EF6\u5B89\u88C5\u72B6\u6001\u5DF2\u53D8\u5316\uFF0C\u8BF7\u5237\u65B0\u63D2\u4EF6\u5217\u8868\u540E\u91CD\u8BD5",
+  "op.checking": "\u6B63\u5728\u6838\u5BF9 {name} \u7684\u5B89\u88C5\u72B6\u6001\u2026",
+  "op.checkFailed": "\u65E0\u6CD5\u786E\u8BA4 {name} \u7684\u5B89\u88C5\u72B6\u6001\uFF0C\u5DF2\u505C\u6B62\u64CD\u4F5C\uFF1A{reason}",
+  "op.current": "{name} \u5DF2\u662F {to}\uFF0C\u65E0\u9700\u91CD\u590D\u5B89\u88C5",
   "op.removing": "\u6B63\u5728\u5378\u8F7D {name} {from}\u2026",
   "op.installing": "\u6B63\u5728\u5B89\u88C5 {name} {to}\u2026",
   "op.restoring": "\u6B63\u5728\u6062\u590D {name} {to}\u2026",
   "op.done": "{name} \u5DF2\u5207\u6362\u5230 {to}",
   "op.restart": "{name} \u5DF2\u5207\u6362\u5230 {to}\uFF0C\u91CD\u542F DSH \u540E\u751F\u6548",
   "op.failed": "{name} \u5B89\u88C5 {to} \u5931\u8D25\uFF1A{reason}",
-  "op.removeFailed": "{name} \u5378\u8F7D\u5931\u8D25\uFF0C\u6CA1\u6709\u505A\u4EFB\u4F55\u6539\u52A8\uFF1A{reason}",
+  "op.removeFailed": "{name} \u5378\u8F7D\u672A\u5B8C\u6210\uFF0C\u5DF2\u505C\u6B62\u540E\u7EED\u5B89\u88C5\uFF1A{reason}",
   "op.restore": "\u6062\u590D {from}",
   "op.dismiss": "\u5173\u95ED",
   "op.log": "\u65E5\u5FD7\uFF1A{path}"
 };
 var EN = {
-  "tab": "Updates",
-  "summary.loading": "Checking for updates\u2026",
-  "summary.some": "{count} plugin(s) can be updated",
-  "summary.none": "All npm plugins are up to date",
-  "summary.empty": "No plugins were installed from npm",
-  "summary.skipped": "{count} plugin(s) not installed from npm were skipped",
-  "refresh": "Check for updates",
-  "updateAll": "Update all",
   "updateAllCount": "Update all ({count})",
   "updateLabel": "Update {name} to {version}",
   "updating": "Updating\u2026",
-  "update": "Update",
   "updateTo": "Update to {version}",
   "install": "Install",
-  "details": "Details",
-  "loadFailed": "Could not read the plugin list: {reason}",
-  "retry": "Retry",
   "status.update": "Update {version}",
-  "status.latest": "Up to date",
-  "status.checking": "Checking",
-  "status.failed": "Check failed",
+  "versions.loading": "Reading versions\u2026",
   "version.current": "Current {version}",
-  "version.arrow": "{from} \u2192 {to}",
   "versions.title": "Versions",
   "versions.registry": "From {registry}",
   "versions.showAll": "Show all {count} versions",
@@ -1355,13 +1331,19 @@ var EN = {
   "self.body": "Uninstalling it from the page would unload this page too. Quit DSH completely, run this command in a terminal, then start DSH again:",
   "self.copy": "Copy command",
   "self.copied": "Copied",
+  "error.policy": "pnpm hit an internal error while handling minimumReleaseAge. Upgrade the pnpm bundled with the host, or retry after the release-age waiting period; see the full error below",
+  "error.inconsistent": "The declared and installed versions differ. Repair the installation with the host plugin manager or CLI before retrying",
+  "error.stateChanged": "The installed state has changed. Refresh the plugin list and retry",
+  "op.checking": "Checking the installed version of {name}\u2026",
+  "op.checkFailed": "Could not confirm the installed state of {name}; stopped: {reason}",
+  "op.current": "{name} is already at {to}; no reinstall needed",
   "op.removing": "Uninstalling {name} {from}\u2026",
   "op.installing": "Installing {name} {to}\u2026",
   "op.restoring": "Restoring {name} {to}\u2026",
   "op.done": "{name} is now at {to}",
   "op.restart": "{name} is now at {to}; restart DSH to apply it",
   "op.failed": "Could not install {name} {to}: {reason}",
-  "op.removeFailed": "Could not uninstall {name}; nothing changed: {reason}",
+  "op.removeFailed": "Uninstalling {name} did not finish; installation was not started: {reason}",
   "op.restore": "Restore {from}",
   "op.dismiss": "Dismiss",
   "op.log": "Log: {path}"
@@ -1384,7 +1366,7 @@ function updateTarget(candidate, lookup) {
   return best !== void 0 && (0, import_gt.default)(best.version, candidate.version) ? best.version : void 0;
 }
 function isBusy(operation) {
-  return operation?.phase === "removing" || operation?.phase === "installing";
+  return operation?.phase === "checking" || operation?.phase === "removing" || operation?.phase === "installing";
 }
 function record(value) {
   return typeof value === "object" && value !== null ? value : {};
@@ -1392,6 +1374,14 @@ function record(value) {
 function errorText(error) {
   return error instanceof Error ? error.message : String(error);
 }
+function failureReason(result) {
+  if (!result.ok) return result.error.message;
+  const { error, packageResult, application } = result.value;
+  const diagnostic = error?.diagnostic?.trim();
+  const lines = (diagnostic || packageResult?.output || "").split("\n").map((line) => line.trim()).filter(Boolean);
+  const failure = lines.find((line) => /\bERR[_!\s]|\berror\b|\bfatal\b/i.test(line));
+  return failure ?? error?.code ?? diagnostic ?? application;
+}
 function npmInstalled(bundle) {
   const prefix = `${bundle.name}@`;
   return bundle.installed && !bundle.official && bundle.availability === "profile" && bundle.removable && bundle.readOnlyReason === void 0 && (0, import_valid.default)(bundle.version ?? "") !== null && bundle.source?.startsWith(prefix) === true && (0, import_valid2.default)(bundle.source.slice(prefix.length)) !== null;
@@ -1416,7 +1406,7 @@ var UpdatesStore = class {
     this.ctx = ctx;
   }
   ctx;
-  state = { status: "idle", candidates: [], skipped: 0, lookups: {} };
+  state = { status: "idle", candidates: [], lookups: {} };
   listeners = /* @__PURE__ */ new Set();
   generation = 0;
   disposed = false;
@@ -1441,25 +1431,28 @@ var UpdatesStore = class {
   setLookup(name2, lookup) {
     this.patch({ lookups: { ...this.state.lookups, [name2]: lookup } });
   }
-  /** A page opened: read the list the first time, and again once a lookup is older than the cache. */
+  /** A page opened: read the list the first time, after a failure, and once a lookup is older than the cache. */
   ensure = () => {
     const now = Date.now();
     const stale = Object.values(this.state.lookups).some((lookup) => lookup.status === "ready" && now - lookup.at > CACHE_MS);
-    if (this.state.status === "idle" || this.state.status === "ready" && stale) void this.load(false);
-  };
-  /** Re-read the list and every lookup. */
-  refresh = () => {
-    void this.load(true);
+    if (this.state.status === "idle" || this.state.status === "error" || this.state.status === "ready" && stale) void this.load();
   };
   /** Re-read the list after a Host change; lookups stay cached. */
   bundlesChanged = () => {
-    if (this.state.status !== "idle") void this.load(false);
+    if (this.state.status !== "idle") void this.load();
   };
-  async load(force) {
+  async load() {
+    try {
+      await this.loadBundles();
+    } catch {
+      if (!this.disposed) this.patch({ status: "error" });
+    }
+  }
+  async loadBundles() {
     const generation = ++this.generation;
     this.patch({ status: this.state.status === "ready" ? "ready" : "loading" });
     const pm = this.ctx.remote.pluginManager;
-    if (force || this.registries === void 0) {
+    if (this.registries === void 0) {
       const [registries, exemptions] = await Promise.all([pm.registries(), pm.listVersionExemptions()]);
       if (registries.ok) {
         const first = registries.value.registry ?? registries.value.resolved ?? DEFAULT_REGISTRY;
@@ -1470,7 +1463,7 @@ var UpdatesStore = class {
     const listed = await pm.listBundles();
     if (generation !== this.generation) return;
     if (!listed.ok) {
-      this.patch({ status: "error", error: listed.error.message });
+      this.patch({ status: "error" });
       return;
     }
     const resolve = (text) => text === void 0 ? void 0 : this.ctx.locale.resolveText(text);
@@ -1485,13 +1478,12 @@ var UpdatesStore = class {
         ...icon === void 0 ? {} : { icon }
       };
     }).sort((a, b) => a.title.localeCompare(b.title));
-    const others = listed.value.filter((bundle) => bundle.installed && !bundle.official && bundle.availability === "profile");
-    this.patch({ status: "ready", candidates, skipped: others.length - npm.length });
+    this.patch({ status: "ready", candidates });
     const now = Date.now();
     for (const candidate of candidates) {
       const lookup = this.state.lookups[candidate.name];
       const stale = lookup === void 0 || lookup.status === "error" || lookup.status === "ready" && now - lookup.at > CACHE_MS;
-      if (force || stale) void this.lookup(candidate.name);
+      if (stale) void this.lookup(candidate.name);
     }
   }
   async lookup(name2) {
@@ -1530,14 +1522,14 @@ var UpdatesStore = class {
   /** Switch one plugin to `version`: uninstall it, then install that exact version with its enabled state. */
   install = async (name2, version) => {
     const candidate = this.state.candidates.find((item) => item.name === name2);
-    if (candidate === void 0 || name2 === SELF || isBusy(this.state.operation)) return false;
+    if (this.disposed || candidate === void 0 || name2 === SELF || isBusy(this.state.operation) || (0, import_valid.default)(version) === null) return false;
     return this.run({ name: name2, from: candidate.version, to: version, enabled: candidate.enabled, restoring: false }, true);
   };
   /** Put back the version a failed switch removed; the plugin is no longer installed, so only install. */
   restore = async () => {
     const failed = this.state.operation;
-    if (failed?.phase !== "failed" || failed.restoring) return;
-    await this.run({ name: failed.name, from: failed.to, to: failed.from, enabled: failed.enabled, restoring: true }, false);
+    if (this.disposed || failed?.phase !== "failed" || !failed.recoverable) return;
+    await this.run({ name: failed.name, from: failed.from, to: failed.from, enabled: failed.enabled, restoring: true }, false);
   };
   /** The outcome toast finished; the banner in the tab keeps the result. */
   toastDone = () => {
@@ -1560,57 +1552,86 @@ var UpdatesStore = class {
   };
   async run(base, remove) {
     const pm = this.ctx.remote.pluginManager;
-    const fail = (phase, result) => {
+    let failurePhase = "check-failed";
+    let recoverable = false;
+    const fail = (result) => {
       const value = result.ok ? result.value : void 0;
-      const output = value?.packageResult?.output.trim();
+      const output = value?.packageResult?.output.trim() || value?.error?.diagnostic;
       const logPath = value?.packageResult?.logPath;
-      const reason = result.ok ? value?.error?.diagnostic?.split("\n")[0] ?? value?.error?.code ?? value?.application ?? "" : result.error.message;
-      this.patch({ operation: { ...base, phase, reason, toast: Date.now(), ...output ? { output } : {}, ...logPath ? { logPath } : {} } });
+      this.patch({ operation: {
+        ...base,
+        phase: failurePhase,
+        recoverable,
+        reason: failureReason(result),
+        toast: Date.now(),
+        ...output ? { output } : {},
+        ...logPath ? { logPath } : {}
+      } });
       return false;
     };
-    if (remove) {
-      this.patch({ operation: { ...base, phase: "removing" } });
-      const removed = await pm.removeBundle(base.name);
-      const stopProfile = removed.ok && removed.value.error?.code === "stop-profile";
-      if (!stopProfile && (!removed.ok || removed.value.application === "failed" || removed.value.application === "cancelled")) {
-        return fail("remove-failed", removed);
+    this.patch({ operation: { ...base, phase: "checking" } });
+    try {
+      const listed = await pm.listBundles();
+      if (this.disposed) return false;
+      if (!listed.ok) return fail(listed);
+      const current = listed.value.find((bundle) => bundle.name === base.name && bundle.installed);
+      if (current !== void 0 && (0, import_valid.default)(current.version ?? "") === (0, import_valid.default)(base.to)) {
+        this.patch({ operation: { ...base, phase: "current", toast: Date.now() } });
+        return true;
       }
+      if (remove) {
+        if (current === void 0 || !npmInstalled(current)) {
+          return fail({ ok: true, value: { application: "failed", error: { code: "plugin-state-changed" } } });
+        }
+        const declared = (0, import_valid.default)(current.source?.slice(`${base.name}@`.length) ?? "");
+        if (declared !== null && declared !== (0, import_valid.default)(current.version ?? "")) {
+          return fail({ ok: true, value: { application: "failed", error: { code: "installation-inconsistent" } } });
+        }
+        base = { ...base, from: current.version ?? base.from, enabled: current.enabled };
+        failurePhase = "remove-failed";
+        this.patch({ operation: { ...base, phase: "removing" } });
+        const removed = await pm.removeBundle(base.name);
+        const stopProfile = removed.ok && removed.value.error?.code === "stop-profile";
+        if (!stopProfile && (!removed.ok || removed.value.application === "failed" || removed.value.application === "cancelled")) {
+          return fail(removed);
+        }
+        recoverable = !stopProfile;
+      } else {
+        if (current !== void 0) {
+          return fail({ ok: true, value: { application: "failed", error: { code: "plugin-state-changed" } } });
+        }
+        recoverable = true;
+      }
+      if (this.disposed) return false;
+      failurePhase = "failed";
+      this.patch({ operation: { ...base, phase: "installing" } });
+      const installed = await pm.installBundle(`${base.name}@${base.to}`, {
+        enabled: base.enabled,
+        saveExact: true,
+        requestId: `${SELF}:${Date.now()}`
+      });
+      if (!installed.ok || installed.value.application === "failed" || installed.value.application === "cancelled") {
+        return fail(installed);
+      }
+      const to = installed.value.version ?? base.to;
+      this.patch({ operation: { ...base, to, toast: Date.now(), phase: installed.value.application === "restart-required" ? "restart" : "done" } });
+      return true;
+    } catch (error) {
+      return fail({ ok: false, error: { message: errorText(error) } });
+    } finally {
+      if (!this.disposed) await this.load();
     }
-    this.patch({ operation: { ...base, phase: "installing" } });
-    const installed = await pm.installBundle(`${base.name}@${base.to}`, {
-      enabled: base.enabled,
-      saveExact: true,
-      requestId: `${SELF}:${Date.now()}`
-    });
-    if (!installed.ok || installed.value.application === "failed" || installed.value.application === "cancelled") {
-      return fail("failed", installed);
-    }
-    const to = installed.value.version ?? base.to;
-    this.patch({ operation: { ...base, to, toast: Date.now(), phase: installed.value.application === "restart-required" ? "restart" : "done" } });
-    return true;
   }
 };
 
 // src/client/styles.ts
 var STYLE_ID = "@shellraining/dsh-plugin-updates";
 var CSS = `
-.dpu-tab, .dpu-section { display: flex; flex-direction: column; gap: 12px; min-width: 0; color: var(--dsw-alias-label-primary); }
+.dpu-section { display: flex; flex-direction: column; gap: 12px; min-width: 0; color: var(--dsw-alias-label-primary); }
 .dpu-head { display: flex; align-items: center; flex-wrap: wrap; gap: 8px; min-height: 28px; }
 .dpu-summary { flex: 1; min-width: 0; color: var(--dsw-alias-label-secondary); font-size: 13px; line-height: 20px; }
 .dpu-caption { color: var(--dsw-alias-label-caption); font-size: 12px; line-height: 18px; }
 .dpu-title { margin: 0; font-size: 14px; font-weight: 500; line-height: 20px; }
-.dpu-list { display: flex; flex-direction: column; margin: 0; padding: 0; list-style: none; }
-.dpu-card { display: flex; align-items: center; gap: 14px; min-width: 0; margin: 0 -8px; padding: 8px; border-radius: var(--dsw-radius-xl); }
-.dpu-card:hover { background: var(--dsw-alias-interactive-bg-hover); }
-.dpu-icon { flex: none; display: inline-flex; align-items: center; justify-content: center; width: 40px; height: 40px; overflow: hidden; border: .5px solid var(--dsw-alias-border-l3); border-radius: var(--dsw-radius-lg); color: var(--dsw-alias-label-secondary); }
-.dpu-icon img { width: 100%; height: 100%; object-fit: cover; }
-.dpu-main { flex: 1; display: flex; flex-direction: column; gap: 2px; min-width: 0; }
-.dpu-name-row { display: flex; align-items: center; flex-wrap: wrap; gap: 8px; min-width: 0; }
-.dpu-name { min-width: 0; padding: 0; overflow: hidden; border: 0; background: none; color: inherit; font: inherit; font-size: 14px; font-weight: 500; line-height: 20px; text-align: left; text-overflow: ellipsis; white-space: nowrap; cursor: pointer; }
-.dpu-name:hover { text-decoration: underline; }
-.dpu-name:focus-visible { outline: 2px solid var(--dsw-alias-brand-primary); outline-offset: 2px; }
-.dpu-meta { color: var(--dsw-alias-label-tertiary); font-size: 13px; line-height: 18px; font-variant-numeric: tabular-nums; }
-.dpu-end { flex: none; display: inline-flex; align-items: center; gap: 8px; }
 .dpu-mono { font-family: var(--ds-font-family-code); font-variant-numeric: tabular-nums; }
 .dpu-rows { display: flex; flex-direction: column; margin: 0; padding: 0; list-style: none; border-top: .5px solid var(--dsw-alias-border-l2); }
 .dpu-row { display: flex; align-items: center; gap: 8px; min-height: 36px; padding: 2px 0; border-bottom: .5px solid var(--dsw-alias-border-l2); }
@@ -1665,10 +1686,11 @@ function scan(document2) {
     const end = card.querySelector('[role="switch"]')?.parentElement;
     if (name2 && end) cards.set(name2, mountIn(end, "card", true));
   }
-  return { ...head === void 0 ? {} : { head }, cards };
+  const status = mountIn(group, "status", false);
+  return { ...head === void 0 ? {} : { head }, status, cards };
 }
 function same(a, b) {
-  if (a.head !== b.head || a.cards.size !== b.cards.size) return false;
+  if (a.head !== b.head || a.status !== b.status || a.cards.size !== b.cards.size) return false;
   for (const [name2, node] of a.cards) if (b.cards.get(name2) !== node) return false;
   return true;
 }
@@ -1707,16 +1729,6 @@ function selfCommand(version) {
 function dateText(stamp) {
   return stamp === void 0 ? "" : new Date(stamp).toLocaleDateString();
 }
-function Artwork({ src }) {
-  const [broken, setBroken] = (0, import_react.useState)(false);
-  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "dpu-icon", "aria-hidden": "true", children: src === void 0 || broken ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_dsh_client_ui_primitives.PluginArtworkDefault, { size: 28 }) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)("img", { src, alt: "", onError: () => setBroken(true) }) });
-}
-function StatusTag({ t, candidate, lookup }) {
-  if (lookup === void 0 || lookup.status === "loading") return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_dsh_client_ui_primitives.Tag, { tone: "quiet", children: t("status.checking") });
-  if (lookup.status === "error") return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_dsh_client_ui_primitives.Tag, { tone: "warning", children: t("status.failed") });
-  const target = updateTarget(candidate, lookup);
-  return target === void 0 ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_dsh_client_ui_primitives.Tag, { tone: "quiet", children: t("status.latest") }) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_dsh_client_ui_primitives.Tag, { tone: "info", children: t("status.update", { version: target }) });
-}
 function SelfNotice({ t, version }) {
   const [copied, setCopied] = (0, import_react.useState)(false);
   const command = selfCommand(version);
@@ -1732,8 +1744,16 @@ function SelfNotice({ t, version }) {
   ] });
 }
 function operationText(t, operation) {
-  const params = { name: operation.name, from: operation.from, to: operation.to, reason: operation.reason ?? "" };
+  const raw = operation.reason ?? "";
+  const reason = raw.includes("ERR_PNPM_RESOLUTION_POLICY_VIOLATIONS_UNHANDLED") ? t("error.policy") : raw === "installation-inconsistent" ? t("error.inconsistent") : raw === "plugin-state-changed" ? t("error.stateChanged") : raw;
+  const params = { name: operation.name, from: operation.from, to: operation.to, reason };
   switch (operation.phase) {
+    case "checking":
+      return t("op.checking", params);
+    case "check-failed":
+      return t("op.checkFailed", params);
+    case "current":
+      return t("op.current", params);
     case "removing":
       return t("op.removing", params);
     case "installing":
@@ -1751,8 +1771,8 @@ function operationText(t, operation) {
 function OperationToast({ t, useUpdates, actions }) {
   const operation = useUpdates((state) => state.operation);
   if (operation?.toast === void 0) return null;
-  const failed = operation.phase === "failed" || operation.phase === "remove-failed";
-  const restorable = operation.phase === "failed" && !operation.restoring;
+  const failed = operation.phase === "failed" || operation.phase === "remove-failed" || operation.phase === "check-failed";
+  const restorable = operation.phase === "failed" && operation.recoverable;
   return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
     import_dsh_client_ui_primitives.Toast,
     {
@@ -1770,12 +1790,12 @@ function OperationToast({ t, useUpdates, actions }) {
 function OperationBanner({ t, operation, actions }) {
   const params = { from: operation.from };
   const busy = isBusy(operation);
-  const failed = operation.phase === "failed" || operation.phase === "remove-failed";
+  const failed = operation.phase === "failed" || operation.phase === "remove-failed" || operation.phase === "check-failed";
   const text = operationText(t, operation);
   return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "dpu-banner", role: failed ? "alert" : "status", ...failed ? { "data-tone": "error" } : {}, children: [
     /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "dpu-banner-row", children: [
       /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { children: text }),
-      operation.phase === "failed" && !operation.restoring ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_dsh_client_ui_primitives.Button, { size: "sm", variant: "outline", onClick: () => {
+      operation.phase === "failed" && operation.recoverable ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_dsh_client_ui_primitives.Button, { size: "sm", variant: "outline", onClick: () => {
         void actions.restore();
       }, children: t("op.restore", params) }) : null,
       busy ? null : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_dsh_client_ui_primitives.Button, { size: "sm", variant: "ghost", onClick: actions.dismiss, children: t("op.dismiss") })
@@ -1784,63 +1804,6 @@ function OperationBanner({ t, operation, actions }) {
     failed && operation.logPath !== void 0 ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "dpu-caption", children: t("op.log", { path: operation.logPath }) }) : null
   ] });
 }
-function UpdatesTab({ t, useUpdates, actions, openPackage }) {
-  const state = useUpdates((snapshot) => snapshot);
-  (0, import_react.useEffect)(() => {
-    actions.ensure();
-  }, [actions]);
-  const busy = isBusy(state.operation);
-  const lookups = Object.values(state.lookups);
-  const checking = state.status === "loading" || lookups.some((lookup) => lookup.status === "loading");
-  const outdated = state.candidates.filter((item) => updateTarget(item, state.lookups[item.name]) !== void 0);
-  const pending = outdated.filter((item) => item.name !== SELF);
-  const self = outdated.find((item) => item.name === SELF);
-  const selfTarget = self === void 0 ? void 0 : updateTarget(self, state.lookups[SELF]);
-  let summary;
-  if (state.status === "idle" || state.status === "loading" && state.candidates.length === 0) summary = t("summary.loading");
-  else if (state.candidates.length === 0) summary = t("summary.empty");
-  else if (outdated.length > 0) summary = t("summary.some", { count: outdated.length });
-  else summary = checking ? t("summary.loading") : t("summary.none");
-  return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("section", { className: "dpu-tab", "aria-busy": checking, children: [
-    /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "dpu-head", children: [
-      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "dpu-summary", role: "status", children: summary }),
-      /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_dsh_client_ui_primitives.Button, { size: "sm", variant: "outline", icon: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_dsh_client_ui_primitives2.IconRefreshOutlineRegular, { size: 13 }), disabled: checking || busy, onClick: actions.refresh, children: t("refresh") }),
-      pending.length > 0 ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_dsh_client_ui_primitives.Button, { size: "sm", variant: "primary", disabled: busy, onClick: () => {
-        void actions.updateAll();
-      }, children: t("updateAll") }) : null
-    ] }),
-    state.operation === void 0 ? null : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(OperationBanner, { t, operation: state.operation, actions }),
-    state.status === "error" ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "dpu-banner", "data-tone": "error", role: "alert", children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "dpu-banner-row", children: [
-      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { children: t("loadFailed", { reason: state.error ?? "" }) }),
-      /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_dsh_client_ui_primitives.Button, { size: "sm", variant: "outline", onClick: actions.refresh, children: t("retry") })
-    ] }) }) : null,
-    /* @__PURE__ */ (0, import_jsx_runtime.jsx)("ul", { className: "dpu-list", children: state.candidates.map((candidate) => {
-      const lookup = state.lookups[candidate.name];
-      const target = updateTarget(candidate, lookup);
-      return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("li", { className: "dpu-card", "data-plugin-updates-package": candidate.name, children: [
-        /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Artwork, { src: candidate.icon }),
-        /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "dpu-main", children: [
-          /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "dpu-name-row", children: [
-            /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { type: "button", className: "dpu-name", title: candidate.name, onClick: () => openPackage(candidate.name), children: candidate.title }),
-            /* @__PURE__ */ (0, import_jsx_runtime.jsx)(StatusTag, { t, candidate, lookup })
-          ] }),
-          /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", { className: "dpu-meta", children: [
-            /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "dpu-mono", children: target === void 0 ? candidate.version : t("version.arrow", { from: candidate.version, to: target }) }),
-            lookup?.status === "error" ? ` \xB7 ${lookup.reason}` : ""
-          ] })
-        ] }),
-        /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "dpu-end", children: [
-          target !== void 0 && candidate.name !== SELF ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_dsh_client_ui_primitives.Button, { size: "sm", variant: "outline", icon: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_dsh_client_ui_primitives2.IconDownloadOutlineRegular, { size: 13 }), disabled: busy, onClick: () => {
-            void actions.install(candidate.name, target);
-          }, children: t("update") }) : null,
-          /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_dsh_client_ui_primitives.Button, { size: "sm", variant: "ghost", onClick: () => openPackage(candidate.name), children: t("details") })
-        ] })
-      ] }, candidate.name);
-    }) }),
-    state.skipped > 0 ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "dpu-caption", children: t("summary.skipped", { count: state.skipped }) }) : null,
-    selfTarget === void 0 ? null : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(SelfNotice, { t, version: selfTarget })
-  ] });
-}
 function useSubject({ subject, useUpdates, actions }) {
   const name2 = subject.kind === "bundle" ? subject.pkg.name : void 0;
   const candidate = useUpdates((state) => state.candidates.find((item) => item.name === name2));
@@ -1888,7 +1851,7 @@ function DetailSection(props) {
   const self = candidate.name === SELF;
   const target = updateTarget(candidate, lookup);
   let body;
-  if (lookup === void 0 || lookup.status === "loading") body = /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "dpu-caption", children: t("summary.loading") });
+  if (lookup === void 0 || lookup.status === "loading") body = /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "dpu-caption", children: t("versions.loading") });
   else if (lookup.status === "error") body = /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "dpu-error", children: t("versions.failed", { reason: lookup.reason }) });
   else if (lookup.versions.length === 0) body = /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "dpu-caption", children: t("versions.empty") });
   else {
@@ -1940,6 +1903,13 @@ function ListControls({ t, useUpdates, actions }) {
     if (target !== void 0 && candidate.name !== SELF) targets.set(candidate.name, target);
   }
   const portals = [];
+  if (anchors.status !== void 0 && operation !== void 0) {
+    portals.push((0, import_react_dom.createPortal)(
+      /* @__PURE__ */ (0, import_jsx_runtime.jsx)(OperationBanner, { t, operation, actions }),
+      anchors.status,
+      "operation"
+    ));
+  }
   if (anchors.head !== void 0 && targets.size > 0) {
     portals.push((0, import_react_dom.createPortal)(
       /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_dsh_client_ui_primitives.Button, { size: "sm", variant: "outline", icon: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_dsh_client_ui_primitives2.IconDownloadOutlineRegular, { size: 13 }), disabled: busy, onClick: () => {
@@ -1983,7 +1953,6 @@ function apply(ctx) {
     hooks: { updates: store },
     actions: {
       ensure: store.ensure,
-      refresh: store.refresh,
       install: store.install,
       updateAll: store.updateAll,
       restore: store.restore,
@@ -1991,14 +1960,6 @@ function apply(ctx) {
       toastDone: store.toastDone
     }
   };
-  ctx.slots.inject("plugins.tab", () => ctx.slots.register({
-    name: "plugins.tab",
-    id: "updates",
-    order: 10,
-    label: () => t("tab"),
-    locale: LOCALE_NS,
-    inject: () => face
-  }, UpdatesTab));
   ctx.slots.inject("shell.overlay", () => ctx.slots.register({
     name: "shell.overlay",
     id: "plugin-updates.toast",

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@shellraining/dsh-plugin-updates",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "type": "module",
-  "description": "插件页的「更新」标签：检查 npm 来源插件的新版本，一键更新或安装指定版本",
+  "description": "在插件页检查 npm 来源插件的新版本，一键更新或安装指定版本",
   "main": "./lib/index.js",
   "exports": {
     ".": "./lib/index.js",
@@ -14,10 +14,6 @@
     "lib",
     "cordis.patch.yml"
   ],
-  "scripts": {
-    "typecheck": "tsc -p tsconfig.json",
-    "build": "pnpm run typecheck && node build.mjs"
-  },
   "engines": {
     "node": ">=20"
   },
@@ -59,5 +55,9 @@
   ],
   "publishConfig": {
     "access": "public"
+  },
+  "scripts": {
+    "typecheck": "tsc -p tsconfig.json",
+    "build": "pnpm run typecheck && node build.mjs"
   }
-}
+}