dsh-my-guardian 0.3.5 → 0.3.6

package/CHANGELOG.md

@@ -5,14 +5,27 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [0.3.5] - 2026-09-04
+## [0.3.6] - 2026-09-04
 
 ### 变更
 
+- fix(guardian): 事件日志不再访问 entry.id getter——构造期 parent.tree 未就绪会抛错炸掉 DSH 启动（隔离实例复现）
+- fix(guardian): 诊断面板可读性 + entry 标识修复——插件失败时不再"看不懂/兜不住"
+- fix(guardian): #86 发版一致性修复——package.json 0.3.5 + CHANGELOG 0.3.5 段（rebase 冲突还原恢复）
 - chore(release): dsh-my-guardian v0.3.5（#86 依赖预检 + 验证清单）
 - feat(guardian): #86 候选区插件依赖预检 + 失败分类 (#124)
 - docs: #106 安装命令统一加 --trust-lockfile (#113)
 
+## [0.3.5] - 2026-09-04
+
+### 新增
+
+- [#86](https://github.com/baosfeng/my-dsh-plugins/issues/86) 候选区插件依赖预检 + 失败分类：热挂载前校验依赖就绪，失败按类别诊断（缺失依赖/锁定冲突/加载错误），诊断面板展示分类详情
+
+### 变更
+
+- 验证清单与效果图同步（发版前功能级验证归档）
+
 ## [0.3.4] - 2026-09-02
 
 ### 变更

package/lib/client.js

@@ -122,6 +122,7 @@ const STYLES = `
   color:var(--dsw-alias-state-success-primary); word-break:break-all; }
 .dsh-my-guardian-row-meta { display:flex; align-items:center; gap:6px; font:var(--dsw-font-xxxs-11); color:var(--dsw-alias-label-tertiary); }
 .dsh-my-guardian-attempts { color:var(--dsw-alias-state-error-primary); }
+.dsh-my-guardian-freeze-hint { font:var(--dsw-font-xxxs-11); color:var(--dsw-alias-state-warn-primary); line-height:1.6; }
 .dsh-my-guardian-link { display:inline-flex; align-items:center; gap:3px; padding:0; border:none; background:transparent; cursor:pointer;
   font:var(--dsw-font-xxxs-11); color:var(--dsw-alias-label-tertiary);
   transition:color var(--ds-transition-duration-slow) var(--ds-ease-in-out); }
@@ -199,8 +200,8 @@ const strings = {
   safeMode: () => (isZh() ? '安全模式' : 'Safe mode'),
   safeModeDesc: () =>
     isZh()
-      ? '开启后所有候选/已转正插件都不再加载，用于快速恢复环境'
-      : 'Skips every staged/promoted plugin mount — fast recovery',
+      ? '开启后所有候选/已转正插件（候选区 cordis.staged.json 中的条目）都不再加载，用于快速恢复环境。注意：安全模式只作用于启动后挂载的候选插件；若插件直接写进启动名册（cordis.patch.yml / profile），DSH 启动时仍是 all-or-nothing——请把新插件先放进候选区。'
+      : 'Skips every staged/promoted plugin mount — fast recovery. Note: this only covers entries mounted after boot (cordis.staged.json); plugins in the boot roster (cordis.patch.yml / profile) are still all-or-nothing — put new plugins in the staged file first.',
   staged: () => (isZh() ? '候选' : 'staged'),
   promoted: () => (isZh() ? '转正' : 'promoted'),
   entries: () => (isZh() ? '插件条目' : 'Plugin entries'),
@@ -228,6 +229,10 @@ const strings = {
   loading: () => (isZh() ? '加载中…' : 'Loading…'),
   events: () => (isZh() ? '最近事件' : 'Recent events'),
   attempts: (n) => (isZh() ? `失败 ${n} 次` : `failed ×${n}`),
+  frozenHint: () =>
+    isZh()
+      ? '已冻结：连续失败停止自动重试——点击刷新按钮手动重试，或移除该条目'
+      : 'Frozen: auto-retry stopped after repeated failures — retry manually or remove the entry',
   failureDependency: () => (isZh() ? '依赖缺失' : 'Dependency'),
   failureCode: () => (isZh() ? '代码错误' : 'Code error'),
   failureOther: () => (isZh() ? '其他' : 'Other'),
@@ -784,8 +789,20 @@ function RowActions({ entry, busy, onRetry, onRemove }) {
   )
 }
 
+/** 冻结行提示（连败停止自动重试，需手动操作）。 */
+function FrozenHint({ status }) {
+  if (status !== 'frozen') return null
+  return createElement('div', { className: 'dsh-my-guardian-freeze-hint' }, strings.frozenHint())
+}
+
 function EntryRow({ entry, source, onAction }) {
-  const [expanded, setExpanded] = useState(false)
+  // 失败/冻结行默认展开错误详情（用户之前必须手动点开才看得到真正报错）。
+  const [expanded, setExpanded] = useState(
+    () =>
+      typeof entry.lastError === 'string' &&
+      entry.lastError !== '' &&
+      (entry.status === 'failed' || entry.status === 'frozen'),
+  )
   const [confirming, setConfirming] = useState(false)
   const [busy, setBusy] = useState(false)
   const hasError = typeof entry.lastError === 'string' && entry.lastError !== ''
@@ -803,6 +820,7 @@ function EntryRow({ entry, source, onAction }) {
     { className: 'dsh-my-guardian-row' },
     createElement(RowHead, { entry, source }),
     createElement(RowMeta, { entry }),
+    createElement(FrozenHint, { status: entry.status }),
     installHint
       ? createElement(
           'div',
@@ -957,14 +975,19 @@ function EntryList({ rows, onAction }) {
   )
 }
 
-/** Recent guardian event log: badge + key info + time per entry. */
+/** 高频噪音事件：每次启动/热重载都会大量产生，挤掉真正重要的诊断信息。 */
+const EVENT_NOISE = new Set(['entry-init', 'entry-dispose'])
+
+/** Recent guardian event log: badge + key info + time per entry.
+ *  过滤 entry-init/entry-dispose 噪音，优先展示隔离/冻结/更新失败等关键事件。 */
 function EventList({ events }) {
-  if (events.length === 0) return null
+  const important = events.filter((event) => !EVENT_NOISE.has(event.type))
+  if (important.length === 0) return null
   return createElement(
     'div',
     { className: 'dsh-my-guardian-events' },
     createElement('div', { className: 'dsh-my-guardian-events-title' }, icon.clock(14), strings.events()),
-    events.map((event, index) =>
+    important.map((event, index) =>
       createElement(
         'div',
         {

package/lib/events.js

@@ -17,10 +17,10 @@ export function logEvent(shared, type, message) {
 /** Register the loader/HMR diagnostic listeners (R9/R10). */
 export function attachEventListeners(ctx, shared) {
   ctx.on('loader/entry-init', (entry) => {
-    logEvent(shared, 'entry-init', `entry ${entry?.options?.id ?? '?'} initialized`)
+    logEvent(shared, 'entry-init', `entry ${entryLabelOf(entry)} initialized`)
   })
   ctx.on('loader/partial-dispose', (entry) => {
-    logEvent(shared, 'entry-dispose', `entry ${entry?.options?.id ?? '?'} disposed`)
+    logEvent(shared, 'entry-dispose', `entry ${entryLabelOf(entry)} disposed`)
   })
   ctx.on('hmr/config-update-failed', (filename, error) => {
     logEvent(shared, 'update-failed', `${filename}: ${error instanceof Error ? error.message : String(error)}`)
@@ -28,3 +28,22 @@ export function attachEventListeners(ctx, shared) {
     shared.persistSoon()
   })
 }
+
+/**
+ * entry 可读标识——⚠️ 只读 options 字段，绝不访问 `entry.id` getter：
+ * loader 在 Entry **构造函数中** emit `loader/entry-init`，此时
+ * `parent.tree` 尚未就绪，访问 getter 会抛 "Cannot read properties of
+ * undefined (reading 'tree')" —— 这个异常发生在启动阶段，会让整个
+ * DSH 服务起不来（守护插件自己炸启动，实锤隔离实例复现）。
+ * （此前读 `entry?.options?.id` 安全但恒为空显示 '?'；本次改为
+ *  options.id → options.name → '?' 的回退，全部属性访问都可安全兜底。）
+ */
+function entryLabelOf(entry) {
+  if (entry === null || typeof entry !== 'object') return '?'
+  const options = entry.options
+  if (options !== null && typeof options === 'object') {
+    if (options.id !== undefined && options.id !== null) return String(options.id)
+    if (typeof options.name === 'string' && options.name !== '') return options.name
+  }
+  return '?'
+}

package/lib/parts/row.part.js

@@ -132,8 +132,20 @@ function RowActions({ entry, busy, onRetry, onRemove }) {
   )
 }
 
+/** 冻结行提示（连败停止自动重试，需手动操作）。 */
+function FrozenHint({ status }) {
+  if (status !== 'frozen') return null
+  return createElement('div', { className: 'dsh-my-guardian-freeze-hint' }, strings.frozenHint())
+}
+
 function EntryRow({ entry, source, onAction }) {
-  const [expanded, setExpanded] = useState(false)
+  // 失败/冻结行默认展开错误详情（用户之前必须手动点开才看得到真正报错）。
+  const [expanded, setExpanded] = useState(
+    () =>
+      typeof entry.lastError === 'string' &&
+      entry.lastError !== '' &&
+      (entry.status === 'failed' || entry.status === 'frozen'),
+  )
   const [confirming, setConfirming] = useState(false)
   const [busy, setBusy] = useState(false)
   const hasError = typeof entry.lastError === 'string' && entry.lastError !== ''
@@ -151,6 +163,7 @@ function EntryRow({ entry, source, onAction }) {
     { className: 'dsh-my-guardian-row' },
     createElement(RowHead, { entry, source }),
     createElement(RowMeta, { entry }),
+    createElement(FrozenHint, { status: entry.status }),
     installHint
       ? createElement(
           'div',

package/lib/parts/styles.part.js

@@ -88,6 +88,7 @@ const STYLES = `
   color:var(--dsw-alias-state-success-primary); word-break:break-all; }
 .dsh-my-guardian-row-meta { display:flex; align-items:center; gap:6px; font:var(--dsw-font-xxxs-11); color:var(--dsw-alias-label-tertiary); }
 .dsh-my-guardian-attempts { color:var(--dsw-alias-state-error-primary); }
+.dsh-my-guardian-freeze-hint { font:var(--dsw-font-xxxs-11); color:var(--dsw-alias-state-warn-primary); line-height:1.6; }
 .dsh-my-guardian-link { display:inline-flex; align-items:center; gap:3px; padding:0; border:none; background:transparent; cursor:pointer;
   font:var(--dsw-font-xxxs-11); color:var(--dsw-alias-label-tertiary);
   transition:color var(--ds-transition-duration-slow) var(--ds-ease-in-out); }

package/lib/parts/util.part.js

@@ -12,8 +12,8 @@ const strings = {
   safeMode: () => (isZh() ? '安全模式' : 'Safe mode'),
   safeModeDesc: () =>
     isZh()
-      ? '开启后所有候选/已转正插件都不再加载，用于快速恢复环境'
-      : 'Skips every staged/promoted plugin mount — fast recovery',
+      ? '开启后所有候选/已转正插件（候选区 cordis.staged.json 中的条目）都不再加载，用于快速恢复环境。注意：安全模式只作用于启动后挂载的候选插件；若插件直接写进启动名册（cordis.patch.yml / profile），DSH 启动时仍是 all-or-nothing——请把新插件先放进候选区。'
+      : 'Skips every staged/promoted plugin mount — fast recovery. Note: this only covers entries mounted after boot (cordis.staged.json); plugins in the boot roster (cordis.patch.yml / profile) are still all-or-nothing — put new plugins in the staged file first.',
   staged: () => (isZh() ? '候选' : 'staged'),
   promoted: () => (isZh() ? '转正' : 'promoted'),
   entries: () => (isZh() ? '插件条目' : 'Plugin entries'),
@@ -41,6 +41,10 @@ const strings = {
   loading: () => (isZh() ? '加载中…' : 'Loading…'),
   events: () => (isZh() ? '最近事件' : 'Recent events'),
   attempts: (n) => (isZh() ? `失败 ${n} 次` : `failed ×${n}`),
+  frozenHint: () =>
+    isZh()
+      ? '已冻结：连续失败停止自动重试——点击刷新按钮手动重试，或移除该条目'
+      : 'Frozen: auto-retry stopped after repeated failures — retry manually or remove the entry',
   failureDependency: () => (isZh() ? '依赖缺失' : 'Dependency'),
   failureCode: () => (isZh() ? '代码错误' : 'Code error'),
   failureOther: () => (isZh() ? '其他' : 'Other'),

package/lib/parts/view.part.js

@@ -123,14 +123,19 @@ function EntryList({ rows, onAction }) {
   )
 }
 
-/** Recent guardian event log: badge + key info + time per entry. */
+/** 高频噪音事件：每次启动/热重载都会大量产生，挤掉真正重要的诊断信息。 */
+const EVENT_NOISE = new Set(['entry-init', 'entry-dispose'])
+
+/** Recent guardian event log: badge + key info + time per entry.
+ *  过滤 entry-init/entry-dispose 噪音，优先展示隔离/冻结/更新失败等关键事件。 */
 function EventList({ events }) {
-  if (events.length === 0) return null
+  const important = events.filter((event) => !EVENT_NOISE.has(event.type))
+  if (important.length === 0) return null
   return createElement(
     'div',
     { className: 'dsh-my-guardian-events' },
     createElement('div', { className: 'dsh-my-guardian-events-title' }, icon.clock(14), strings.events()),
-    events.map((event, index) =>
+    important.map((event, index) =>
       createElement(
         'div',
         {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-my-guardian",
-  "version": "0.3.5",
+  "version": "0.3.6",
   "description": "DSH 插件治理守护：新装/更新插件先进候选区，启动后热挂载——成功转正、失败自动禁用、连续失败冻结，一键安全模式，侧边栏诊断面板。DSH web plugin: staged plugin loading with auto-disable on failure, freeze, safe mode and a sidebar panel.",
   "type": "module",
   "main": "lib/index.js",