Fix doctor completion cache plugin loading

Peter Steinberger · Peter Steinberger · commit ad619123c3cc · 2026-05-02T20:51:03.000+01:00
diff --git a/src/commands/doctor-completion.test.ts b/src/commands/doctor-completion.test.ts
@@ -0,0 +1,41 @@
+import { spawnSync } from "node:child_process";
+import { describe, expect, it, vi } from "vitest";
+
+vi.mock("node:child_process", () => ({
+  spawnSync: vi.fn(() => ({ status: 0 })),
+}));
+
+vi.mock("../infra/openclaw-root.js", () => ({
+  resolveOpenClawPackageRoot: vi.fn(async () => "/tmp/openclaw-root"),
+}));
+
+vi.mock("../cli/completion-runtime.js", async () => {
+  const actual = await vi.importActual<typeof import("../cli/completion-runtime.js")>(
+    "../cli/completion-runtime.js",
+  );
+  return {
+    ...actual,
+    completionCacheExists: vi.fn(async () => false),
+    resolveShellFromEnv: vi.fn(() => "powershell"),
+  };
+});
+
+describe("doctor completion", () => {
+  it("skips plugin command registration when doctor writes completion cache", async () => {
+    const { ensureCompletionCacheExists } = await import("./doctor-completion.js");
+    const { COMPLETION_SKIP_PLUGIN_COMMANDS_ENV } = await import("../cli/completion-runtime.js");
+
+    await expect(ensureCompletionCacheExists()).resolves.toBe(true);
+
+    expect(spawnSync).toHaveBeenCalledWith(
+      process.execPath,
+      ["/tmp/openclaw-root/openclaw.mjs", "completion", "--write-state"],
+      expect.objectContaining({
+        cwd: "/tmp/openclaw-root",
+        env: expect.objectContaining({
+          [COMPLETION_SKIP_PLUGIN_COMMANDS_ENV]: "1",
+        }),
+      }),
+    );
+  });
+});
diff --git a/src/commands/doctor-completion.ts b/src/commands/doctor-completion.ts
@@ -3,6 +3,7 @@ import path from "node:path";
 import { resolveCliName } from "../cli/cli-name.js";
 import {
   completionCacheExists,
+  COMPLETION_SKIP_PLUGIN_COMMANDS_ENV,
   installCompletion,
   isCompletionInstalled,
   resolveCompletionCachePath,
@@ -32,7 +33,10 @@ async function generateCompletionCache(): Promise<boolean> {
   const binPath = path.join(root, "openclaw.mjs");
   const result = spawnSync(process.execPath, [binPath, "completion", "--write-state"], {
     cwd: root,
-    env: process.env,
+    env: {
+      ...process.env,
+      [COMPLETION_SKIP_PLUGIN_COMMANDS_ENV]: "1",
+    },
     encoding: "utf-8",
     timeout: COMPLETION_CACHE_WRITE_TIMEOUT_MS,
   });
