Treat soft plugin repair warnings as nonfatal (#84431)

TurboTheTurtle · steipete · web-flow · commit 1db2c2a3e058 · 2026-06-02T06:51:11.000-04:00
* Treat soft plugin repair warnings as nonfatal

* fix: scope plugin repair convergence failures

---------

Co-authored-by: Peter Steinberger &lt;steipete@gmail.com&gt;
diff --git a/src/cli/update-cli/post-core-plugin-convergence.test.ts b/src/cli/update-cli/post-core-plugin-convergence.test.ts
@@ -301,6 +301,64 @@ describe("runPostCorePluginConvergence", () => {
     ]);
   });
 
+  it("marks convergence errored when repair reports failed plugin ids", async () => {
+    mocks.repairMissingConfiguredPluginInstalls.mockResolvedValue({
+      changes: [],
+      warnings: [
+        'Failed to install missing configured plugin "discord" from @openclaw/discord: ENETUNREACH.',
+      ],
+      failedPluginIds: ["discord"],
+      records: {},
+    });
+    const result = await runPostCorePluginConvergence({
+      cfg: {
+        plugins: { entries: { discord: { enabled: true } } },
+      } as unknown as OpenClawConfig,
+      env: {},
+    });
+    expect(result.errored).toBe(true);
+    expect(result.warnings).toStrictEqual([
+      {
+        reason:
+          'Failed to install missing configured plugin "discord" from @openclaw/discord: ENETUNREACH.',
+        message:
+          'Failed to install missing configured plugin "discord" from @openclaw/discord: ENETUNREACH.',
+        guidance: ["Run `openclaw doctor --fix` to retry plugin repair."],
+      },
+    ]);
+  });
+
+  it("keeps inactive repair failures nonblocking", async () => {
+    mocks.repairMissingConfiguredPluginInstalls.mockResolvedValue({
+      changes: [],
+      warnings: [
+        'Failed to install missing configured plugin "discord" from @openclaw/discord: ENETUNREACH.',
+      ],
+      failedPluginIds: ["discord"],
+      records: {
+        discord: {
+          source: "npm",
+          spec: "@acme/discord",
+          installPath: "/p/discord",
+        },
+      },
+    });
+    const result = await runPostCorePluginConvergence({
+      cfg: {
+        plugins: {
+          deny: ["discord"],
+          entries: { discord: { enabled: true } },
+        },
+      } as unknown as OpenClawConfig,
+      env: {},
+    });
+    expect(result.errored).toBe(false);
+    expect(mocks.runPluginPayloadSmokeCheck).toHaveBeenCalledWith({
+      records: {},
+      env: expect.any(Object),
+    });
+  });
+
   it("flags errored=true when smoke check finds a missing main entry", async () => {
     mocks.repairMissingConfiguredPluginInstalls.mockResolvedValue({
       changes: [],
diff --git a/src/cli/update-cli/post-core-plugin-convergence.ts b/src/cli/update-cli/post-core-plugin-convergence.ts
@@ -46,6 +46,35 @@ const REPAIR_GUIDANCE = "Run `openclaw doctor --fix` to retry plugin repair.";
 const inspectGuidance = (pluginId: string) =>
   `Run \`openclaw plugins inspect ${pluginId} --runtime --json\` for details.`;
 
+function isBlockingRepairFailure(params: {
+  cfg: OpenClawConfig;
+  pluginId: string;
+  records: Record<string, PluginInstallRecord>;
+  smokeRecords: Record<string, PluginInstallRecord>;
+}): boolean {
+  if (Object.hasOwn(params.smokeRecords, params.pluginId)) {
+    return true;
+  }
+  const normalizedPluginConfig = normalizePluginsConfig(params.cfg.plugins);
+  const enableState = resolveEffectiveEnableState({
+    id: params.pluginId,
+    origin: "global",
+    config: normalizedPluginConfig,
+    rootConfig: params.cfg,
+  });
+  if (enableState.enabled) {
+    return true;
+  }
+  const record = params.records[params.pluginId];
+  if (!record) {
+    return false;
+  }
+  return Boolean(
+    resolveTrustedSourceLinkedOfficialNpmSpec({ pluginId: params.pluginId, record }) ||
+    resolveTrustedSourceLinkedOfficialClawHubSpec({ pluginId: params.pluginId, record }),
+  );
+}
+
 async function repairManagedNpmOpenClawPeerLinks(params: {
   env: NodeJS.ProcessEnv;
 }): Promise<{ changes: string[]; warnings: PostCoreConvergenceWarning[] }> {
@@ -136,6 +165,14 @@ export async function runPostCorePluginConvergence(params: {
   // configured plugin whose payload was deleted on disk would block the
   // entire update — even though the gateway will never load that plugin.
   const smokeRecords = filterRecordsToActive({ cfg: params.cfg, records });
+  const blockingFailedPluginIds = (repair.failedPluginIds ?? []).filter((pluginId) =>
+    isBlockingRepairFailure({
+      cfg: params.cfg,
+      pluginId,
+      records,
+      smokeRecords,
+    }),
+  );
   const smoke = await runPluginPayloadSmokeCheck({ records: smokeRecords, env });
   for (const failure of smoke.failures) {
     warnings.push({
@@ -155,7 +192,7 @@ export async function runPostCorePluginConvergence(params: {
       ...peerLinkRepair.changes,
     ],
     warnings,
-    errored: smoke.failures.length > 0,
+    errored: blockingFailedPluginIds.length > 0 || smoke.failures.length > 0,
     smokeFailures: smoke.failures,
     installRecords: records,
   };
