@huaqiu/dsh-tool-plugin-update 0.6.11 → 0.6.13

package/lib/client.js

@@ -317,8 +317,8 @@ window.__ModuleLoader__.load({
 		* to `current`: the plugin is at (or ahead of) the offered release, there is
 		* nothing to install, and no install control may be offered for it. Every
 		* other state passes through untouched — `install` (plugin absent locally)
-		* has no local version to compare, and `blocked`/`ignored`/`current` are
-		* already non-actionable. Unknown server fields are preserved verbatim: the
+		* has no local version to compare, and `ignored`/`current` are already
+		* non-actionable. Unknown server fields are preserved verbatim: the
 		* client stays a thin reader of the hq-edge report shape.
 		*/
 		function normalizePluginUpdateItem(item) {
@@ -503,10 +503,32 @@ window.__ModuleLoader__.load({
 			return request("/check", { method: "POST" }).then(normalizePluginUpdateReport);
 		}
 		/** POST the install transaction for the confirmed set version. */
-		function installSet(setVersion) {
+		function installSet(setVersion, pluginNames) {
 			return request("/install", {
 				method: "POST",
-				body: JSON.stringify({ setVersion })
+				body: JSON.stringify({
+					setVersion,
+					...pluginNames ? { pluginNames } : {}
+				})
+			});
+		}
+		/** Persist a per-plugin decision for this release set. */
+		function ignorePlugin(setVersion, name) {
+			return request("/plugin-ignore", {
+				method: "POST",
+				body: JSON.stringify({
+					setVersion,
+					name
+				})
+			});
+		}
+		function unignorePlugin(setVersion, name) {
+			return request("/plugin-unignore", {
+				method: "POST",
+				body: JSON.stringify({
+					setVersion,
+					name
+				})
 			});
 		}
 		/** POST ignore for the current offer (set-scoped, persists across restarts). */
@@ -588,7 +610,7 @@ window.__ModuleLoader__.load({
 			entryTooltip: "查看可用的插件更新",
 			viewTitle: "插件更新",
 			viewIntro: "检查并安装可用的插件更新",
-			viewInfo: "在这里查看插件集的更新。标注为「被阻止」的插件因主机或 HQ Edge 版本不兼容而无法安装；已是最新的插件无需操作。",
+			viewInfo: "在这里查看插件集的更新；已是最新的插件无需操作。",
 			refresh: "刷新",
 			close: "关闭",
 			loading: "正在读取插件更新…",
@@ -596,6 +618,7 @@ window.__ModuleLoader__.load({
 			checkFailed: "检查更新失败，请重试",
 			installAll: (count) => `安装整套更新（${count} 项）`,
 			installOne: "安装整套",
+			installOnePlugin: "安装此插件",
 			installOneTip: "将安装整套 N 项更新并自动重启 DSH，而不仅是此插件",
 			installing: "正在安装…（DSH 将自动重启）",
 			retry: "重试",
@@ -609,22 +632,9 @@ window.__ModuleLoader__.load({
 			groupCount: (count) => `${count} 个插件`,
 			group: {
 				actionable: "待处理",
-				blocked: "无法安装",
 				ignored: "已忽略",
 				current: "已是最新"
 			},
-			state: {
-				current: "当前",
-				update: "可更新",
-				install: "待安装",
-				ignored: "已忽略",
-				blocked: "被阻止"
-			},
-			blockedReason: {
-				host: "不适用于当前 EDA 主机",
-				"hq-edge-version": "当前 HQ Edge 版本不兼容",
-				"runtime-unknown": "HQ Edge 版本未知，无法校验"
-			},
 			runtime: {
 				title: "HQ Edge 运行时",
 				current: "当前版本",
@@ -759,10 +769,9 @@ window.__ModuleLoader__.load({
 				allChangelog: "展开全部更新日志",
 				changelogBtn: "日志",
 				changelogTitle: "更新内容:",
-				blockedBadge: "无法安装",
 				footerCount: (n) => `准备安装 ${n} 项兼容插件`,
 				footerSet: (v) => `版本集: v${v}`,
-				installAllSet: (v) => `一键更新全套插件 (v${v})`,
+				installAllSet: (v) => `更新插件集 (v${v})`,
 				ignoreBtn: "忽略",
 				footnote: "更新将自动应用并重启 DSH 视图，不影响 EDA 图纸数据"
 			}
@@ -781,7 +790,7 @@ window.__ModuleLoader__.load({
 				entryTooltip: "Review available plugin updates",
 				viewTitle: "Plugin Updates",
 				viewIntro: "Check for and install available plugin updates",
-				viewInfo: "Review the plugin set updates here. A plugin marked Blocked cannot be installed because its host or HQ Edge version is incompatible; a plugin marked Current needs no action.",
+				viewInfo: "Review the plugin set updates here. Plugins that are up to date need no action.",
 				refresh: "Refresh",
 				close: "Close",
 				loading: "Reading plugin updates…",
@@ -789,6 +798,7 @@ window.__ModuleLoader__.load({
 				checkFailed: "Failed to check for updates — please retry",
 				installAll: (count) => `Install whole set (${count})`,
 				installOne: "Install set",
+				installOnePlugin: "Install this plugin",
 				installOneTip: "Installs the whole set of N updates and restarts DSH — not just this plugin",
 				installing: "Installing… (DSH will restart)",
 				retry: "Retry",
@@ -802,22 +812,9 @@ window.__ModuleLoader__.load({
 				groupCount: (count) => `${count} plugin${count === 1 ? "" : "s"}`,
 				group: {
 					actionable: "Actionable",
-					blocked: "Blocked",
 					ignored: "Ignored",
 					current: "Up to date"
 				},
-				state: {
-					current: "Current",
-					update: "Update",
-					install: "Install",
-					ignored: "Ignored",
-					blocked: "Blocked"
-				},
-				blockedReason: {
-					host: "Not applicable to the current EDA host",
-					"hq-edge-version": "Incompatible with the current HQ Edge version",
-					"runtime-unknown": "HQ Edge version unknown — cannot verify"
-				},
 				runtime: {
 					title: "HQ Edge Runtime",
 					current: "Current version",
@@ -952,7 +949,6 @@ window.__ModuleLoader__.load({
 					allChangelog: "Expand all changelogs",
 					changelogBtn: "Log",
 					changelogTitle: "What changed:",
-					blockedBadge: "Cannot install",
 					footerCount: (n) => `Ready to install ${n} compatible plugin${n === 1 ? "" : "s"}`,
 					footerSet: (v) => `Set: v${v}`,
 					installAllSet: (v) => `Update all plugins (v${v})`,
@@ -1059,19 +1055,6 @@ window.__ModuleLoader__.load({
 		function shortName(name) {
 			return (name.startsWith("@") ? name.slice(name.indexOf("/") + 1) : name).replace(/^dsh-(?:host-|client-)?/, "");
 		}
-		/** Normalize the server's block reason to a list (it may arrive as a string). */
-		function blockedByList(item) {
-			const by = item.blockedBy;
-			if (Array.isArray(by)) return by.filter((entry) => typeof entry === "string");
-			return typeof by === "string" && by.length > 0 ? [by] : [];
-		}
-		function blockedReason(item, copy) {
-			const by = blockedByList(item);
-			if (by.includes("host")) return copy.blockedReason.host;
-			if (by.includes("hq-edge-version")) return copy.blockedReason["hq-edge-version"];
-			if (by.includes("runtime-unknown")) return copy.blockedReason["runtime-unknown"];
-			return by.length > 0 ? by.join(", ") : void 0;
-		}
 		/** Two-letter avatar initials for a card (CJK-safe). */
 		function avatarInitials(item) {
 			const src = typeof item.displayName === "string" && item.displayName.trim().length > 0 ? item.displayName.trim() : shortName(item.name);
@@ -1081,22 +1064,37 @@ window.__ModuleLoader__.load({
 			return src.replace(/^@/, "").slice(0, 2).toUpperCase();
 		}
 		/** Shared per-card changelog toggle drawer (the per-plugin changes[] list). */
-		function changelogDrawer(item, copy, open) {
+		function changelogDrawer(item, copy, open, onInstall, onIgnore) {
 			const drawer = el("div", "hqpu-changelog-drawer");
 			drawer.style.display = open ? "" : "none";
 			drawer.append(el("div", "hqpu-changelog-drawer-title", copy.ui.changelogTitle));
 			const ul = el("ul");
 			for (const change of item.changes ?? []) if (typeof change === "string" && change.length > 0) ul.append(el("li", "", change));
-			drawer.append(ul);
+			if (ul.childElementCount > 0) drawer.append(ul);
+			const actions = el("div", "hqpu-changelog-actions");
+			if (item.state === "update" || item.state === "install") {
+				const install = el("button", "hqpu-card-action hqpu-card-action--install", copy.installOnePlugin);
+				install.type = "button";
+				install.title = copy.installOneTip;
+				install.addEventListener("click", onInstall);
+				const ignore = el("button", "hqpu-card-action", copy.ignore);
+				ignore.type = "button";
+				ignore.addEventListener("click", onIgnore);
+				actions.append(install, ignore);
+			} else if (item.state === "ignored") {
+				const show = el("button", "hqpu-card-action hqpu-card-action--install", copy.unignore);
+				show.type = "button";
+				show.addEventListener("click", onIgnore);
+				actions.append(show);
+			}
+			if (actions.childElementCount > 0) drawer.append(actions);
 			return drawer;
 		}
 		/** One package card per the mockup: avatar initials, display name + package
 		*  subtitle, old→new version row (new in emerald), a 日志 toggle expanding the
-		*  inline changelog. Blocked/incompatible cards are dimmed with a rose
-		*  无法安装 badge and a reason line, and carry NO install button. */
-		function packageCard(item, copy, open, onToggle) {
-			const blocked = item.state === "blocked";
-			const card = el("li", blocked ? "hqpu-card hqpu-card--blocked" : "hqpu-card");
+		*  inline changelog. */
+		function packageCard(item, copy, open, onToggle, onInstall, onIgnore) {
+			const card = el("li", "hqpu-card");
 			card.dataset.pluginName = item.name;
 			card.dataset.state = item.state;
 			const head = el("div", "hqpu-card-head");
@@ -1117,8 +1115,8 @@ window.__ModuleLoader__.load({
 			main.append(ver);
 			left.append(avatar, main);
 			const right = el("div", "hqpu-card-end");
-			if (blocked) right.append(el("span", "hqpu-blocked-badge", copy.ui.blockedBadge));
-			else if (Array.isArray(item.changes) && item.changes.length > 0) {
+			const hasDetails = Array.isArray(item.changes) && item.changes.length > 0 || item.state === "update" || item.state === "install" || item.state === "ignored";
+			if (hasDetails) {
 				const toggle = el("button", "hqpu-log-toggle");
 				toggle.type = "button";
 				toggle.dataset.open = open ? "true" : "false";
@@ -1128,21 +1126,11 @@ window.__ModuleLoader__.load({
 			}
 			head.append(left, right);
 			card.append(head);
-			if (!blocked && Array.isArray(item.changes) && item.changes.length > 0) card.append(changelogDrawer(item, copy, open));
-			if (blocked) {
-				const reason = blockedReason(item, copy);
-				const entries = [...reason !== void 0 ? [reason] : [], ...[...item.reasons ?? [], ...item.notes ?? []].filter((e) => typeof e === "string" && e.length > 0)];
-				for (const entry of entries) {
-					const line = el("p", "hqpu-reason-line");
-					line.innerHTML = `<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 16 16" fill="none" stroke="currentColor" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"><path d="M8 5V8.5M8 11.25h.01M14.5 8a6.5 6.5 0 11-13 0 6.5 6.5 0 0113 0Z"/></svg>`;
-					line.append(document.createTextNode(entry));
-					card.append(line);
-				}
-			}
+			if (hasDetails) card.append(changelogDrawer(item, copy, open, onInstall, onIgnore));
 			return card;
 		}
 		/** A section: head (title + count pill + expand-all toggle) then its cards. */
-		function group(heading, items, copy, changelogOpen, allOpen, onToggle, onToggleAll) {
+		function group(heading, items, copy, changelogOpen, allOpen, onToggle, onToggleAll, onInstall, onIgnore) {
 			if (items.length === 0) return null;
 			const section = el("section", "hqpu-group");
 			section.dataset.group = heading;
@@ -1151,14 +1139,14 @@ window.__ModuleLoader__.load({
 			titleWrap.append(el("span", "", heading));
 			titleWrap.append(el("span", "hqpu-count-pill", String(items.length)));
 			head.append(titleWrap);
-			if (items.some((i) => i.state !== "blocked" && Array.isArray(i.changes) && i.changes.length > 0)) {
+			if (items.some((i) => Array.isArray(i.changes) && i.changes.length > 0)) {
 				const all = el("button", "hqpu-all-changelog", copy.ui.allChangelog);
 				all.type = "button";
 				all.addEventListener("click", onToggleAll);
 				head.append(all);
 			}
 			const list = el("ul", "hqpu-cards");
-			for (const item of items) list.append(packageCard(item, copy, allOpen || changelogOpen.has(item.name), () => onToggle(item.name)));
+			for (const item of items) list.append(packageCard(item, copy, allOpen || changelogOpen.has(item.name), () => onToggle(item.name), () => onInstall(item.name), () => onIgnore(item)));
 			section.append(head, list);
 			return section;
 		}
@@ -1634,7 +1622,7 @@ window.__ModuleLoader__.load({
 			} else if (typeof runtime.lastError === "string" && runtime.lastError.length > 0) card.append(el("p", "hqpu-status", `${copy.lastError}: ${runtime.lastError}`));
 			return card;
 		}
-		function renderList(section, report, copy, changelogOpen, allOpen, onToggleCard, onToggleAll, onRetryCheck) {
+		function renderList(section, report, copy, changelogOpen, allOpen, onToggleCard, onToggleAll, onRetryCheck, onInstall, onIgnore) {
 			section.textContent = "";
 			if (report === null) {
 				section.append(skeleton(copy));
@@ -1651,12 +1639,11 @@ window.__ModuleLoader__.load({
 			const byState = (state) => report.items.filter((item) => item.state === state);
 			const order = [
 				[copy.group.actionable, [...byState("update"), ...byState("install")]],
-				[copy.group.blocked, byState("blocked")],
 				[copy.group.ignored, byState("ignored")],
 				[copy.group.current, byState("current")]
 			];
 			for (const [heading, items] of order) {
-				const node = group(heading, items, copy, changelogOpen, allOpen, onToggleCard, onToggleAll);
+				const node = group(heading, items, copy, changelogOpen, allOpen, onToggleCard, onToggleAll, onInstall, onIgnore);
 				if (node !== null) section.append(node);
 			}
 		}
@@ -1669,7 +1656,7 @@ window.__ModuleLoader__.load({
 			if (engine !== null) section.append(engine);
 		}
 		/** Run the install transaction (a new durable job), then let the store poll it. */
-		async function runInstall(store, copy) {
+		async function runInstall(store, copy, pluginNames) {
 			const report = store.report();
 			if (report === null) return;
 			if (report.manifestVersion === null) {
@@ -1678,7 +1665,7 @@ window.__ModuleLoader__.load({
 			}
 			store.setInstalling(true);
 			try {
-				const result = await installSet(report.manifestVersion);
+				const result = await installSet(report.manifestVersion, pluginNames);
 				if (result.error !== void 0) {
 					store.setInstalling(false);
 					showToast(`${copy.installError}: ${result.error}`, "error");
@@ -1742,7 +1729,7 @@ window.__ModuleLoader__.load({
 		* The sticky footer: left meta ("准备安装 N 项兼容插件" / "版本集: vX"), a
 		* full-width primary "一键更新全套插件 (vX)" (install = one durable job),
 		* a secondary 忽略 wired to the existing ignore/unignore affordance, and the
-		* footnote. The count EXCLUDES blocked / ignored / already-current entries.
+		* footnote. The count EXCLUDES ignored / already-current entries.
 		*/
 		function renderFooter(footer, installBtn, ignoreBtn, countEl, setEl, report, copy, installing, store) {
 			if (report === null) {
@@ -2036,6 +2023,12 @@ window.__ModuleLoader__.load({
 					render();
 				}, () => {
 					store.check();
+				}, (name) => {
+					runInstall(store, copy, [name]);
+				}, (item) => {
+					const report = store.report();
+					if (report?.manifestVersion === null || report?.manifestVersion === void 0) return;
+					(item.state === "ignored" ? unignorePlugin(report.manifestVersion, item.name) : ignorePlugin(report.manifestVersion, item.name)).then(() => store.check()).catch(() => void 0);
 				});
 				renderRuntime(runtimeSection, report, copy, runtimeActions, dismissedAlert, () => {
 					dismissedAlert = true;
@@ -3426,6 +3419,7 @@ window.__ModuleLoader__.load({
   align-items: start;
 }
 .hqpu-card {
+  position: relative;
   margin: 0;
   padding: 10px;
   border-radius: 8px;
@@ -3491,6 +3485,30 @@ window.__ModuleLoader__.load({
 .hqpu-log-toggle:hover { color: var(--hq-text); }
 .hqpu-log-toggle svg { width: 12px; height: 12px; transition: transform 0.15s ease; }
 .hqpu-log-toggle[data-open='true'] svg { transform: rotate(180deg); }
+.hqpu-changelog-actions {
+  display: flex;
+  gap: 8px;
+  margin-top: 10px;
+  padding-top: 8px;
+  border-top: 0.5px solid var(--hq-border);
+}
+.hqpu-card-action {
+  height: 28px;
+  padding: 0 10px;
+  border: 0.5px solid var(--hq-border-strong);
+  border-radius: 6px;
+  background: var(--hq-card);
+  color: var(--hq-text);
+  font-size: 10px;
+  cursor: pointer;
+}
+.hqpu-card-action:hover { border-color: var(--hq-brand-soft); color: var(--hq-brand-soft); }
+.hqpu-card-action--install {
+  border-color: var(--hq-brand);
+  background: var(--hq-brand);
+  color: var(--hq-brand-fg);
+}
+.hqpu-card-action--install:hover { border-color: var(--hq-brand-soft); background: var(--hq-brand-soft); color: var(--hq-brand-fg); }
 .hqpu-changelog-drawer {
   margin-top: 8px;
   padding: 8px;
@@ -3513,40 +3531,6 @@ window.__ModuleLoader__.load({
   line-height: 16px;
 }
 
-/* Blocked / incompatible card: dimmed, rose badge, no install button */
-.hqpu-card--blocked {
-  opacity: 0.8;
-  background: color-mix(in srgb, var(--hq-card) 60%, transparent);
-  border-color: var(--hq-border);
-}
-.hqpu-card--blocked .hqpu-avatar {
-  background: color-mix(in srgb, var(--hq-card) 50%, transparent);
-  border-color: var(--hq-border);
-  color: var(--hq-faint);
-}
-.hqpu-card--blocked .hqpu-card-title { color: var(--hq-muted); }
-.hqpu-blocked-badge {
-  font-size: 9px;
-  padding: 2px 6px;
-  border-radius: 4px;
-  color: var(--hq-rose);
-  background: color-mix(in srgb, var(--hq-rose) 18%, transparent);
-  border: 0.5px solid color-mix(in srgb, var(--hq-rose) 40%, transparent);
-}
-.hqpu-reason-line {
-  display: flex;
-  align-items: flex-start;
-  gap: 4px;
-  margin: 8px 0 0;
-  padding: 6px;
-  border-radius: 5px;
-  border: 0.5px solid color-mix(in srgb, var(--hq-rose) 20%, transparent);
-  background: color-mix(in srgb, var(--hq-rose) 8%, transparent);
-  font-size: 10px;
-  color: var(--hq-rose);
-}
-.hqpu-reason-line svg { width: 12px; height: 12px; flex: none; margin-top: 1px; }
-
 /* Sticky footer */
 .hqpu-footer {
   flex: none;
@@ -3776,7 +3760,7 @@ window.__ModuleLoader__.load({
 				if (report.runtime?.updateAvailable) count += 1;
 				if (count === 0) {
 					const latest = this.recent[0];
-					if (latest !== void 0 && (latest.phase === "failed" || latest.phase === "rolled-back")) count = 1;
+					if (latest !== void 0 && TERMINAL_PHASES.has(latest.phase)) count = 1;
 				}
 				return count;
 			}