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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@huaqiu/dsh-tool-plugin-update",
-  "version": "0.6.11",
+  "version": "0.6.13",
   "type": "module",
   "main": "./lib/index.mjs",
   "types": "./lib/index.d.mts",
@@ -31,8 +31,8 @@
     "@deepseek-ai/dsh-host-webserver": "^0.2.1-rc.2"
   },
   "dependencies": {
-    "@huaqiu/dsh-sidebar-entry": "0.6.11",
-    "@huaqiu/dsh-plugin-log": "0.6.11"
+    "@huaqiu/dsh-plugin-log": "0.6.13",
+    "@huaqiu/dsh-sidebar-entry": "0.6.13"
   },
   "files": [
     "lib",

package/src/client/api.ts

@@ -420,13 +420,22 @@ export interface InstallResult {
 }
 
 /** POST the install transaction for the confirmed set version. */
-export function installSet(setVersion: string): Promise<InstallResult> {
+export function installSet(setVersion: string, pluginNames?: string[]): Promise<InstallResult> {
   return request<InstallResult>('/install', {
     method: 'POST',
-    body: JSON.stringify({ setVersion }),
+    body: JSON.stringify({ setVersion, ...(pluginNames ? { pluginNames } : {}) }),
   })
 }
 
+/** Persist a per-plugin decision for this release set. */
+export function ignorePlugin(setVersion: string, name: string): Promise<unknown> {
+  return request<unknown>('/plugin-ignore', { method: 'POST', body: JSON.stringify({ setVersion, name }) })
+}
+
+export function unignorePlugin(setVersion: string, name: string): Promise<unknown> {
+  return request<unknown>('/plugin-unignore', { method: 'POST', body: JSON.stringify({ setVersion, name }) })
+}
+
 /** POST ignore for the current offer (set-scoped, persists across restarts). */
 export function ignoreOffer(setVersion: string): Promise<unknown> {
   return request<unknown>('/ignore', { method: 'POST', body: JSON.stringify({ setVersion }) })

package/src/client/copy.ts

@@ -14,7 +14,7 @@ const zh = {
   entryTooltip: '查看可用的插件更新',
   viewTitle: '插件更新',
   viewIntro: '检查并安装可用的插件更新',
-  viewInfo: '在这里查看插件集的更新。标注为「被阻止」的插件因主机或 HQ Edge 版本不兼容而无法安装；已是最新的插件无需操作。',
+  viewInfo: '在这里查看插件集的更新；已是最新的插件无需操作。',
   refresh: '刷新',
   close: '关闭',
   loading: '正在读取插件更新…',
@@ -24,6 +24,7 @@ const zh = {
   // it honestly rather than per-plugin.
   installAll: (count: number) => `安装整套更新（${count} 项）`,
   installOne: '安装整套',
+  installOnePlugin: '安装此插件',  
   installOneTip: '将安装整套 N 项更新并自动重启 DSH，而不仅是此插件',
   installing: '正在安装…（DSH 将自动重启）',
   retry: '重试',
@@ -37,22 +38,9 @@ const zh = {
   groupCount: (count: number) => `${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: '当前版本',
@@ -197,11 +185,10 @@ const zh = {
     allChangelog: '展开全部更新日志',
     changelogBtn: '日志',
     changelogTitle: '更新内容:',
-    blockedBadge: '无法安装',
     // Footer
     footerCount: (n: number) => `准备安装 ${n} 项兼容插件`,
     footerSet: (v: string) => `版本集: v${v}`,
-    installAllSet: (v: string) => `一键更新全套插件 (v${v})`,
+    installAllSet: (v: string) => `更新插件集 (v${v})`,
     ignoreBtn: '忽略',
     footnote: '更新将自动应用并重启 DSH 视图，不影响 EDA 图纸数据',
   },
@@ -222,7 +209,7 @@ const en: UpdateCopy = {
   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…',
@@ -230,6 +217,7 @@ const en: UpdateCopy = {
   checkFailed: 'Failed to check for updates — please retry',
   installAll: (count: number) => `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',
@@ -243,22 +231,9 @@ const en: UpdateCopy = {
   groupCount: (count: number) => `${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',
@@ -397,7 +372,6 @@ const en: UpdateCopy = {
     allChangelog: 'Expand all changelogs',
     changelogBtn: 'Log',
     changelogTitle: 'What changed:',
-    blockedBadge: 'Cannot install',
     footerCount: (n: number) => `Ready to install ${n} compatible plugin${n === 1 ? '' : 's'}`,
     footerSet: (v: string) => `Set: v${v}`,
     installAllSet: (v: string) => `Update all plugins (v${v})`,

package/src/client/index.ts

@@ -1379,6 +1379,7 @@ const VIEW_CSS_TEXT = `
   align-items: start;
 }
 .hqpu-card {
+  position: relative;
   margin: 0;
   padding: 10px;
   border-radius: 8px;
@@ -1444,6 +1445,30 @@ const VIEW_CSS_TEXT = `
 .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;
@@ -1466,40 +1491,6 @@ const VIEW_CSS_TEXT = `
   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;
@@ -1755,7 +1746,11 @@ class UpdateStore implements UpdateStoreLike {
     if (report.runtime?.updateAvailable) count += 1
     if (count === 0) {
       const latest = this.recent[0]
-      if (latest !== undefined && (latest.phase === 'failed' || latest.phase === 'rolled-back')) {
+      // Keep a visible attention dot for every terminal outcome, including
+      // success. Without this, a background update could finish while the
+      // panel was closed and the user would have no indication that a result
+      // is waiting in the update centre.
+      if (latest !== undefined && TERMINAL_PHASES.has(latest.phase)) {
         count = 1
       }
     }

package/src/client/update-view.ts

@@ -20,12 +20,14 @@
 import {
   checkUpdates,
   ignoreOffer,
+  ignorePlugin,
   installSet,
   requestRuntimeUpdate,
   runtimeLatestVersion,
   setPluginUpdateSource,
   setRuntimeUpdateSource,
   unignoreOffer,
+  unignorePlugin,
   TERMINAL_PHASES,
   type PluginUpdateItem,
   type PluginUpdateReport,
@@ -101,44 +103,6 @@ export function shortName(name: string): string {
   return unscoped.replace(/^dsh-(?:host-|client-)?/, '')
 }
 
-/** Normalize the server's block reason to a list (it may arrive as a string). */
-function blockedByList(item: PluginUpdateItem): string[] {
-  const by = item.blockedBy
-  if (Array.isArray(by)) return by.filter((entry): entry is string => typeof entry === 'string')
-  return typeof by === 'string' && by.length > 0 ? [by] : []
-}
-
-/** The tag tone a state reads as, matching the shell's Tag palette. */
-function stateTone(item: PluginUpdateItem): 'success' | 'info' | 'warning' | 'danger' | 'neutral' {
-  switch (item.state) {
-    case 'update':
-      return 'info'
-    case 'install':
-      return 'warning'
-    case 'blocked':
-      return 'danger'
-    case 'ignored':
-      return 'neutral'
-    case 'current':
-      return 'success'
-  }
-}
-
-function stateLabel(item: PluginUpdateItem, copy: UpdateCopy): string {
-  switch (item.state) {
-    case 'current':
-      return copy.state.current
-    case 'update':
-      return copy.state.update
-    case 'install':
-      return copy.state.install
-    case 'ignored':
-      return copy.state.ignored
-    case 'blocked':
-      return copy.state.blocked
-  }
-}
-
 /** The one-line version transition under a card's title. */
 function versionLine(item: PluginUpdateItem): string {
   switch (item.state) {
@@ -154,14 +118,6 @@ function versionLine(item: PluginUpdateItem): string {
   }
 }
 
-function blockedReason(item: PluginUpdateItem, copy: UpdateCopy): string | undefined {
-  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(', ') : undefined
-}
-
 /** Two-letter avatar initials for a card (CJK-safe). */
 function avatarInitials(item: PluginUpdateItem): string {
   const src =
@@ -175,7 +131,13 @@ function avatarInitials(item: PluginUpdateItem): string {
 }
 
 /** Shared per-card changelog toggle drawer (the per-plugin changes[] list). */
-function changelogDrawer(item: PluginUpdateItem, copy: UpdateCopy, open: boolean): HTMLElement {
+function changelogDrawer(
+  item: PluginUpdateItem,
+  copy: UpdateCopy,
+  open: boolean,
+  onInstall: () => void,
+  onIgnore: () => void,
+): HTMLElement {
   const drawer = el('div', 'hqpu-changelog-drawer')
   drawer.style.display = open ? '' : 'none'
   drawer.append(el('div', 'hqpu-changelog-drawer-title', copy.ui.changelogTitle))
@@ -183,22 +145,39 @@ function changelogDrawer(item: PluginUpdateItem, copy: UpdateCopy, open: boolean
   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. */
+ *  inline changelog. */
 function packageCard(
   item: PluginUpdateItem,
   copy: UpdateCopy,
   open: boolean,
   onToggle: () => void,
+  onInstall: () => void,
+  onIgnore: () => void,
 ): HTMLLIElement {
-  const blocked = item.state === 'blocked'
-  const card = el('li', blocked ? 'hqpu-card hqpu-card--blocked' : 'hqpu-card')
+  const card = el('li', 'hqpu-card')
   card.dataset.pluginName = item.name
   card.dataset.state = item.state
 
@@ -229,9 +208,9 @@ function packageCard(
   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'
@@ -242,26 +221,10 @@ function packageCard(
   head.append(left, right)
   card.append(head)
 
-  // Inline changelog drawer (actionable items only).
-  if (!blocked && Array.isArray(item.changes) && item.changes.length > 0) {
-    card.append(changelogDrawer(item, copy, open))
-  }
-
-  // Blocked reason line(s): mapped copy plus the server's full reasons/notes.
-  if (blocked) {
-    const reason = blockedReason(item, copy)
-    const entries = [
-      ...(reason !== undefined ? [reason] : []),
-      ...[...(item.reasons ?? []), ...(item.notes ?? [])].filter(
-        (e): e is string => 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)
-    }
+  // The actions live in the expanded changelog/details drawer so cards keep
+  // their compact layout until a person asks for more information.
+  if (hasDetails) {
+    card.append(changelogDrawer(item, copy, open, onInstall, onIgnore))
   }
   return card
 }
@@ -275,6 +238,8 @@ function group(
   allOpen: boolean,
   onToggle: (name: string) => void,
   onToggleAll: () => void,
+  onInstall: (name: string) => void,
+  onIgnore: (item: PluginUpdateItem) => void,
 ): HTMLElement | null {
   if (items.length === 0) return null
   const section = el('section', 'hqpu-group')
@@ -286,7 +251,7 @@ function group(
   titleWrap.append(el('span', 'hqpu-count-pill', String(items.length)))
   head.append(titleWrap)
   // Expand-all only makes sense over actionable, changelog-bearing cards.
-  const actionable = items.some((i) => i.state !== 'blocked' && Array.isArray(i.changes) && i.changes.length > 0)
+  const actionable = items.some((i) => Array.isArray(i.changes) && i.changes.length > 0)
   if (actionable) {
     const all = el('button', 'hqpu-all-changelog', copy.ui.allChangelog)
     all.type = 'button'
@@ -296,7 +261,7 @@ function group(
 
   const list = el('ul', 'hqpu-cards')
   for (const item of items) {
-    list.append(packageCard(item, copy, allOpen || changelogOpen.has(item.name), () => onToggle(item.name)))
+    list.append(packageCard(item, copy, allOpen || changelogOpen.has(item.name), () => onToggle(item.name), () => onInstall(item.name), () => onIgnore(item)))
   }
 
   section.append(head, list)
@@ -1119,6 +1084,8 @@ function renderList(
   onToggleCard: (name: string) => void,
   onToggleAll: () => void,
   onRetryCheck: () => void,
+  onInstall: (name: string) => void,
+  onIgnore: (item: PluginUpdateItem) => void,
 ): void {
   section.textContent = ''
   if (report === null) {
@@ -1144,16 +1111,17 @@ function renderList(
   const byState = (state: PluginUpdateItem['state']): PluginUpdateItem[] =>
     report.items.filter((item) => item.state === state)
 
-  // Most important first: what can be acted on, then what is refused, then
-  // what was muted, then what is already settled.
+  // Most important first: what can be acted on, then what was muted, then what
+  // is already settled. Blocked plugins are intentionally skipped — the server
+  // still reports them, but they carry no user-actionable offer, so surfacing
+  // them only adds noise without a path forward.
   const order: Array<[string, PluginUpdateItem[]]> = [
     [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)
   }
 }
@@ -1190,7 +1158,7 @@ function renderPluginSource(
 }
 
 /** Run the install transaction (a new durable job), then let the store poll it. */
-async function runInstall(store: UpdateStoreLike, copy: UpdateCopy): Promise<void> {
+async function runInstall(store: UpdateStoreLike, copy: UpdateCopy, pluginNames?: string[]): Promise<void> {
   const report = store.report()
   if (report === null) return
   // Without an evaluated set there is nothing to install: hq-edge has not read
@@ -1204,7 +1172,7 @@ async function runInstall(store: UpdateStoreLike, copy: UpdateCopy): Promise<voi
   // dead code — runInstall never called it).
   store.setInstalling(true)
   try {
-    const result = await installSet(report.manifestVersion)
+    const result = await installSet(report.manifestVersion, pluginNames)
     if (result.error !== undefined) {
       store.setInstalling(false)
       showToast(`${copy.installError}: ${result.error}`, 'error')
@@ -1287,7 +1255,7 @@ function renderSettingsPanel(
  * 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: HTMLElement,
@@ -1685,6 +1653,17 @@ export function openUpdateView(store: UpdateStoreLike, copy: UpdateCopy): void {
         () => {
           void store.check()
         },
+        (name) => {
+          void runInstall(store, copy, [name])
+        },
+        (item) => {
+          const report = store.report()
+          if (report?.manifestVersion === null || report?.manifestVersion === undefined) return
+          const action = item.state === 'ignored'
+            ? unignorePlugin(report.manifestVersion, item.name)
+            : ignorePlugin(report.manifestVersion, item.name)
+          void action.then(() => store.check()).catch(() => undefined)
+        },
       )
     }
     renderRuntime(runtimeSection, report, copy, runtimeActions, dismissedAlert, () => {

package/src/client/version.ts

@@ -120,8 +120,8 @@ export function isVersionUpgrade(currentVersion: string | null, availableVersion
  * 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.
  */
 export function normalizePluginUpdateItem<T extends PluginUpdateItem>(item: T): T {