fix(update): repair plugins for legacy updater doctors

steipete · steipete · commit 0556ac0291a8 · 2026-05-20T03:41:45.000+01:00
diff --git a/src/commands/doctor/shared/release-configured-plugin-installs.test.ts b/src/commands/doctor/shared/release-configured-plugin-installs.test.ts
@@ -428,11 +428,9 @@ describe("configured plugin install release step", () => {
     });
   });
 
-  it("defers package-manager plugins for writable legacy parents without explicit deferral", async () => {
+  it("repairs package-manager plugins for writable legacy parents without explicit deferral", async () => {
     mocks.repairMissingPluginInstallsForIds.mockResolvedValue({
-      changes: [
-        'Skipped package-manager repair for configured plugin "discord" during package update; rerun "openclaw doctor --fix" after the update completes.',
-      ],
+      changes: ['Installed missing configured plugin "discord".'],
       warnings: [],
     });
 
@@ -459,12 +457,10 @@ describe("configured plugin install release step", () => {
       OPENCLAW_UPDATE_PARENT_SUPPORTS_DOCTOR_CONFIG_WRITE: "1",
     });
     expect(result).toEqual({
-      changes: [
-        'Skipped package-manager repair for configured plugin "discord" during package update; rerun "openclaw doctor --fix" after the update completes.',
-      ],
+      changes: ['Installed missing configured plugin "discord".'],
       warnings: [],
-      completed: false,
-      touchedConfig: false,
+      completed: true,
+      touchedConfig: true,
     });
   });
 
diff --git a/src/commands/doctor/shared/update-phase.test.ts b/src/commands/doctor/shared/update-phase.test.ts
@@ -36,7 +36,7 @@ describe("update-phase env helpers", () => {
     expect(isPostCoreConvergencePass(env)).toBe(true);
   });
 
-  it("defers configured plugin repair for explicit or writable-parent update handoffs", () => {
+  it("defers configured plugin repair only for explicit update handoffs", () => {
     expect(
       shouldDeferConfiguredPluginInstallRepair({
         [UPDATE_IN_PROGRESS_ENV]: "1",
@@ -53,7 +53,7 @@ describe("update-phase env helpers", () => {
         [UPDATE_IN_PROGRESS_ENV]: "1",
         [UPDATE_PARENT_SUPPORTS_DOCTOR_CONFIG_WRITE_ENV]: "1",
       }),
-    ).toBe(true);
+    ).toBe(false);
     expect(
       shouldDeferConfiguredPluginInstallRepair({
         [UPDATE_IN_PROGRESS_ENV]: "1",
@@ -80,7 +80,7 @@ describe("update-phase env helpers", () => {
         [UPDATE_IN_PROGRESS_ENV]: "1",
         [UPDATE_PARENT_SUPPORTS_DOCTOR_CONFIG_WRITE_ENV]: "1",
       }),
-    ).toBe(false);
+    ).toBe(true);
     expect(
       isLegacyPackageUpdateDoctorPass({
         [UPDATE_IN_PROGRESS_ENV]: "1",
diff --git a/src/commands/doctor/shared/update-phase.ts b/src/commands/doctor/shared/update-phase.ts
@@ -39,16 +39,15 @@ export function isUpdatePackageSwapInProgress(env: NodeJS.ProcessEnv): boolean {
 
 /**
  * True iff configured plugin install repair should be deferred because the
- * updater guarantees a later post-core convergence pass. Shipped writable
- * parents predate the explicit defer marker but still resume after the
- * candidate doctor exits, so the candidate pass must not install payloads
- * that the parent will immediately repair again from stale in-memory records.
+ * updater guarantees a later post-core convergence pass. Older shipped
+ * parents may set only the writable-config marker; they still resume after
+ * the candidate doctor exits, so the candidate must repair payloads before
+ * control returns to that stale process.
  */
 export function shouldDeferConfiguredPluginInstallRepair(env: NodeJS.ProcessEnv): boolean {
   return (
     isUpdatePackageSwapInProgress(env) &&
-    (isTruthyEnvValue(env[UPDATE_DEFER_CONFIGURED_PLUGIN_INSTALL_REPAIR_ENV]) ||
-      isTruthyEnvValue(env[UPDATE_PARENT_SUPPORTS_DOCTOR_CONFIG_WRITE_ENV]))
+    isTruthyEnvValue(env[UPDATE_DEFER_CONFIGURED_PLUGIN_INSTALL_REPAIR_ENV])
   );
 }
 
