dsh-recency-guard 0.11.1 → 0.11.2

package/README.md

@@ -65,6 +65,18 @@
 
 当某个插件把 DSH 拖垮时，本插件会在崩溃的那一刻记录下"谁最可疑"，并在**下一次启动时、在崩溃插件的代码被加载之前**把它挡在门外。反复崩溃时，关闭的插件会逐个增加（第 1 次关最近更新的 1 个，仍崩溃则关最近更新的 2 个）。稳定之后，除首要嫌疑外，其余被关闭的配置会自动恢复。
 
+## v0.11.2 紧急修复（恢复诚实性 + 启动恢复时序）
+
+- **恢复结果白盒化（P0 假绿修复）**：`reenable` 此前**无条件**返回
+  `reenabled: true` 并从 `autoDisabled` 移除 —— 实测管理器返回
+  `application: 'failed'`（HMR 嵌套事务）时，state 仍记「已恢复」，面板/工具
+  显示成功而插件实际仍关闭。现在只有**真的 applied** 才算成功；失败者保留在
+  自动关闭名单待下轮重试，journal/note 如实列出「未启用（管理器拒绝）」。
+- **启动恢复延后到 HMR 事务之外**：boot 阶段 Loader 自身可能正处在事务中，
+  恢复调用会报 `HMR transactions cannot be nested`。自动恢复改为 boot 后
+  1.5s 执行（定时器 unref，不拖住宿主退出），失败由诚实结果兜底。
+- 回归：host 工具测试新增「管理器拒绝 ⇒ reenable 报失败」断言；14/14 全绿。
+
 ## v0.11.1 紧急修复（宿主兼容 + 启动崩溃 · 2026-11-08）
 
 **事故背景**：桌面端 DSH 自动升级到 `dsh 0.2.2-rc.1` 后连续崩溃（5 次/3 分钟），

package/dist/index.js

@@ -4976,11 +4976,15 @@ ${error?.stack ?? ""}
         `[recency-guard] \u4E0A\u6B21\u5D29\u6E83\u5DF2\u901A\u8FC7\u963B\u6B62\u52A0\u8F7D ${state.autoDisabled.map((d) => d.name).join(", ")} \u6062\u590D\u3002`
       );
       if (this.config.autoRestore) {
-        try {
-          await this.restore();
-        } catch (err) {
-          this.ctx.logger.warn(`[recency-guard] \u81EA\u52A8\u6062\u590D\u914D\u7F6E\u5931\u8D25\uFF1A${describeError(err)}`);
-        }
+        const timer = setTimeout(() => {
+          void this.restore().catch((err) => {
+            try {
+              this.ctx.logger.warn(`[recency-guard] \u81EA\u52A8\u6062\u590D\u914D\u7F6E\u5931\u8D25\uFF1A${describeError(err)}`);
+            } catch {
+            }
+          });
+        }, 1500);
+        timer.unref?.();
       }
     } else if (recovering) {
       this.ctx.logger.warn("[recency-guard] \u4E0A\u6B21\u5D29\u6E83\u540E\u542F\u52A8\uFF0C\u4FDD\u6301\u5ACC\u7591\u63D2\u4EF6\u5173\u95ED\u3002");
@@ -5103,31 +5107,37 @@ ${error?.stack ?? ""}
     const disabled = new Set(auto.map((d) => d.name));
     const reenabled = [];
     const keptDisabled = [];
+    const failed = [];
     for (const d of auto) {
       if (d.name === auto[auto.length - 1]?.name) {
         keptDisabled.push(d.name);
         continue;
       }
-      await this.reenable(d.name);
-      reenabled.push(d.name);
+      const result = await this.reenable(d.name);
+      if (result?.reenabled === true) reenabled.push(d.name);
+      else failed.push(d.name);
     }
     await this.store.updateState((s) => ({
       ...s,
-      autoDisabled: s.autoDisabled.filter((d) => keptDisabled.includes(d.name)),
+      // 失败者留在 autoDisabled（下轮启动重试）；成功者与首要嫌疑移出。
+      autoDisabled: s.autoDisabled.filter((d) => keptDisabled.includes(d.name) || failed.includes(d.name)),
       stabilized: true,
       restored: [...s.restored, ...reenabled]
     }));
     this.machine.transition("recovered", `\u5DF2\u6062\u590D ${reenabled.length} \u4E2A\u63D2\u4EF6`);
-    await this.store.append({ kind: "restore", detail: `\u91CD\u65B0\u542F\u7528 ${reenabled.join(", ") || "\u65E0"}` });
+    await this.store.append({
+      kind: "restore",
+      detail: `\u91CD\u65B0\u542F\u7528 ${reenabled.join(", ") || "\u65E0"}${failed.length > 0 ? `\uFF1B\u672A\u542F\u7528\uFF08\u7BA1\u7406\u5668\u62D2\u7EDD\uFF0C\u4FDD\u7559\u5F85\u91CD\u8BD5\uFF09 ${failed.join(", ")}` : ""}`
+    });
     await this.publishDecision(
       [...disabled].map((bundle) => ({ bundle, lastChangeAt: "", lastKind: "install" })),
-      keptDisabled,
-      keptDisabled.length ? "crash-recovery" : "none"
+      [...keptDisabled, ...failed],
+      keptDisabled.length || failed.length ? "crash-recovery" : "none"
     );
     return {
       reenabled,
-      keptDisabled,
-      note: keptDisabled.length ? `\u5DF2\u6062\u590D\u9700\u8981\u7684\u914D\u7F6E\uFF0C\u4EC5\u4FDD\u7559\u5ACC\u7591\u63D2\u4EF6 ${keptDisabled.join(", ")} \u5173\u95ED\u3002\u786E\u8BA4\u5B89\u5168\u540E\u53EF\u7528 reenable \u624B\u52A8\u5F00\u542F\u3002` : "\u5DF2\u6062\u590D\u5168\u90E8\u914D\u7F6E\u3002"
+      keptDisabled: [...keptDisabled, ...failed],
+      note: keptDisabled.length || failed.length ? `\u5DF2\u6062\u590D ${reenabled.length} \u4E2A\u914D\u7F6E\uFF1B${keptDisabled.length > 0 ? `\u4EC5\u4FDD\u7559\u5ACC\u7591\u63D2\u4EF6 ${keptDisabled.join(", ")} \u5173\u95ED` : ""}${failed.length > 0 ? `${keptDisabled.length > 0 ? "\uFF1B" : ""}${failed.join(", ")} \u7BA1\u7406\u5668\u62D2\u7EDD\u6062\u590D\uFF0C\u5DF2\u7559\u5728\u540D\u5355\u5F85\u4E0B\u8F6E\u91CD\u8BD5` : ""}\u3002\u786E\u8BA4\u5B89\u5168\u540E\u53EF\u7528 reenable \u624B\u52A8\u5F00\u542F\u3002` : "\u5DF2\u6062\u590D\u5168\u90E8\u914D\u7F6E\u3002"
     };
   }
   /** Manually re-enable one bundle, noting its backed-up config. */
@@ -5147,12 +5157,19 @@ ${error?.stack ?? ""}
       }
     }
     await this.store.append({ kind: "enable", bundle, result: safeJson(results) });
-    await this.store.updateState((s) => ({
-      ...s,
-      autoDisabled: s.autoDisabled.filter((d) => d.name !== bundle)
-    }));
+    const applied = results.some(
+      (r) => typeof r === "object" && r !== null && r.application === "applied"
+    );
+    if (applied) {
+      await this.store.updateState((s) => ({
+        ...s,
+        autoDisabled: s.autoDisabled.filter((d) => d.name !== bundle)
+      }));
+    } else {
+      this.ctx.logger.warn(`[recency-guard] ${bundle} \u672A\u80FD\u6062\u590D\uFF08\u7BA1\u7406\u5668\u672A applied\uFF09\uFF0C\u4FDD\u7559\u5728\u81EA\u52A8\u5173\u95ED\u540D\u5355\u5F85\u4E0B\u8F6E\u91CD\u8BD5`);
+    }
     const backup = await this.store.readBackup(bundle);
-    return { bundle, reenabled: true, hasConfigBackup: backup !== null };
+    return { bundle, reenabled: applied, hasConfigBackup: backup !== null };
   }
   /**
    * Clear the crash marker on teardown.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-recency-guard",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "description": "Crash-recovery guard for DeepSeek Harness: records third-party/experimental plugin install & update recency, backs up their config, and after a crash auto-disables the most-recently-updated plugin(s) so the profile boots again, then restores stable config.",
   "license": "MIT",
   "type": "module",