refactor: dedupe core config and runtime helpers

src/commands/auth-choice.apply-helpers.test.ts

@@ -35,6 +35,36 @@ function createPrompter(params?: {
   } as unknown as WizardPrompter;
 }
 
+function createPromptSpies(params?: { confirmResult?: boolean; textResult?: string }) {
+  const confirm = vi.fn(async () => params?.confirmResult ?? true);
+  const note = vi.fn(async () => undefined);
+  const text = vi.fn(async () => params?.textResult ?? "prompt-key");
+  return { confirm, note, text };
+}
+
+async function runEnsureMinimaxApiKeyFlow(params: { confirmResult: boolean; textResult: string }) {
+  process.env.MINIMAX_API_KEY = "env-key";
+  delete process.env.MINIMAX_OAUTH_TOKEN;
+
+  const { confirm, text } = createPromptSpies({
+    confirmResult: params.confirmResult,
+    textResult: params.textResult,
+  });
+  const setCredential = vi.fn(async () => undefined);
+
+  const result = await ensureApiKeyFromEnvOrPrompt({
+    provider: "minimax",
+    envLabel: "MINIMAX_API_KEY",
+    promptMessage: "Enter key",
+    normalize: (value) => value.trim(),
+    validate: () => undefined,
+    prompter: createPrompter({ confirm, text }),
+    setCredential,
+  });
+
+  return { result, setCredential, confirm, text };
+}
+
 afterEach(() => {
   restoreMinimaxEnv();
   vi.restoreAllMocks();
@@ -96,21 +126,9 @@ describe("maybeApplyApiKeyFromOption", () => {
 
 describe("ensureApiKeyFromEnvOrPrompt", () => {
   it("uses env credential when user confirms", async () => {
-    process.env.MINIMAX_API_KEY = "env-key";
-    delete process.env.MINIMAX_OAUTH_TOKEN;
-
-    const confirm = vi.fn(async () => true);
-    const text = vi.fn(async () => "prompt-key");
-    const setCredential = vi.fn(async () => undefined);
-
-    const result = await ensureApiKeyFromEnvOrPrompt({
-      provider: "minimax",
-      envLabel: "MINIMAX_API_KEY",
-      promptMessage: "Enter key",
-      normalize: (value) => value.trim(),
-      validate: () => undefined,
-      prompter: createPrompter({ confirm, text }),
-      setCredential,
+    const { result, setCredential, text } = await runEnsureMinimaxApiKeyFlow({
+      confirmResult: true,
+      textResult: "prompt-key",
     });
 
     expect(result).toBe("env-key");
@@ -119,21 +137,9 @@ describe("ensureApiKeyFromEnvOrPrompt", () => {
   });
 
   it("falls back to prompt when env is declined", async () => {
-    process.env.MINIMAX_API_KEY = "env-key";
-    delete process.env.MINIMAX_OAUTH_TOKEN;
-
-    const confirm = vi.fn(async () => false);
-    const text = vi.fn(async () => "  prompted-key  ");
-    const setCredential = vi.fn(async () => undefined);
-
-    const result = await ensureApiKeyFromEnvOrPrompt({
-      provider: "minimax",
-      envLabel: "MINIMAX_API_KEY",
-      promptMessage: "Enter key",
-      normalize: (value) => value.trim(),
-      validate: () => undefined,
-      prompter: createPrompter({ confirm, text }),
-      setCredential,
+    const { result, setCredential, text } = await runEnsureMinimaxApiKeyFlow({
+      confirmResult: false,
+      textResult: "  prompted-key  ",
     });
 
     expect(result).toBe("prompted-key");
@@ -148,9 +154,10 @@ describe("ensureApiKeyFromEnvOrPrompt", () => {
 
 describe("ensureApiKeyFromOptionEnvOrPrompt", () => {
   it("uses opts token and skips note/env/prompt", async () => {
-    const confirm = vi.fn(async () => true);
-    const note = vi.fn(async () => undefined);
-    const text = vi.fn(async () => "prompt-key");
+    const { confirm, note, text } = createPromptSpies({
+      confirmResult: true,
+      textResult: "prompt-key",
+    });
     const setCredential = vi.fn(async () => undefined);
 
     const result = await ensureApiKeyFromOptionEnvOrPrompt({
@@ -179,9 +186,10 @@ describe("ensureApiKeyFromOptionEnvOrPrompt", () => {
     delete process.env.MINIMAX_OAUTH_TOKEN;
     process.env.MINIMAX_API_KEY = "env-key";
 
-    const confirm = vi.fn(async () => true);
-    const note = vi.fn(async () => undefined);
-    const text = vi.fn(async () => "prompt-key");
+    const { confirm, note, text } = createPromptSpies({
+      confirmResult: true,
+      textResult: "prompt-key",
+    });
     const setCredential = vi.fn(async () => undefined);
 
     const result = await ensureApiKeyFromOptionEnvOrPrompt({

src/commands/doctor-config-flow.include-warning.test.ts

@@ -1,7 +1,5 @@
-import fs from "node:fs/promises";
-import path from "node:path";
 import { describe, expect, it, vi } from "vitest";
-import { withTempHome } from "../../test/helpers/temp-home.js";
+import { withTempHomeConfig } from "../config/test-helpers.js";
 
 const { noteSpy } = vi.hoisted(() => ({
   noteSpy: vi.fn(),
@@ -15,15 +13,7 @@ import { loadAndMaybeMigrateDoctorConfig } from "./doctor-config-flow.js";
 
 describe("doctor include warning", () => {
   it("surfaces include confinement hint for escaped include paths", async () => {
-    await withTempHome(async (home) => {
-      const configDir = path.join(home, ".openclaw");
-      await fs.mkdir(configDir, { recursive: true });
-      await fs.writeFile(
-        path.join(configDir, "openclaw.json"),
-        JSON.stringify({ $include: "/etc/passwd" }, null, 2),
-        "utf-8",
-      );
-
+    await withTempHomeConfig({ $include: "/etc/passwd" }, async () => {
       await loadAndMaybeMigrateDoctorConfig({
         options: { nonInteractive: true },
         confirm: async () => false,

src/commands/doctor-config-flow.safe-bins.test.ts

@@ -1,7 +1,5 @@
-import fs from "node:fs/promises";
-import path from "node:path";
 import { beforeEach, describe, expect, it, vi } from "vitest";
-import { withTempHome } from "../../test/helpers/temp-home.js";
+import { runDoctorConfigWithInput } from "./doctor-config-flow.test-utils.js";
 
 const { noteSpy } = vi.hoisted(() => ({
   noteSpy: vi.fn(),
@@ -13,25 +11,6 @@ vi.mock("../terminal/note.js", () => ({
 
 import { loadAndMaybeMigrateDoctorConfig } from "./doctor-config-flow.js";
 
-async function runDoctorConfigWithInput(params: {
-  config: Record<string, unknown>;
-  repair?: boolean;
-}) {
-  return withTempHome(async (home) => {
-    const configDir = path.join(home, ".openclaw");
-    await fs.mkdir(configDir, { recursive: true });
-    await fs.writeFile(
-      path.join(configDir, "openclaw.json"),
-      JSON.stringify(params.config, null, 2),
-      "utf-8",
-    );
-    return loadAndMaybeMigrateDoctorConfig({
-      options: { nonInteractive: true, repair: params.repair },
-      confirm: async () => false,
-    });
-  });
-}
-
 describe("doctor config flow safe bins", () => {
   beforeEach(() => {
     noteSpy.mockClear();
@@ -59,6 +38,7 @@ describe("doctor config flow safe bins", () => {
           ],
         },
       },
+      run: loadAndMaybeMigrateDoctorConfig,
     });
 
     const cfg = result.cfg as {
@@ -94,6 +74,7 @@ describe("doctor config flow safe bins", () => {
           },
         },
       },
+      run: loadAndMaybeMigrateDoctorConfig,
     });
 
     expect(noteSpy).toHaveBeenCalledWith(

src/commands/doctor-config-flow.test-utils.ts

@@ -0,0 +1,26 @@
+import fs from "node:fs/promises";
+import path from "node:path";
+import { withTempHome } from "../../test/helpers/temp-home.js";
+
+export async function runDoctorConfigWithInput<T>(params: {
+  config: Record<string, unknown>;
+  repair?: boolean;
+  run: (args: {
+    options: { nonInteractive: boolean; repair?: boolean };
+    confirm: () => Promise<boolean>;
+  }) => Promise<T>;
+}) {
+  return withTempHome(async (home) => {
+    const configDir = path.join(home, ".openclaw");
+    await fs.mkdir(configDir, { recursive: true });
+    await fs.writeFile(
+      path.join(configDir, "openclaw.json"),
+      JSON.stringify(params.config, null, 2),
+      "utf-8",
+    );
+    return params.run({
+      options: { nonInteractive: true, repair: params.repair },
+      confirm: async () => false,
+    });
+  });
+}

src/commands/doctor-config-flow.test.ts

@@ -3,25 +3,7 @@ import path from "node:path";
 import { describe, expect, it, vi } from "vitest";
 import { withTempHome } from "../../test/helpers/temp-home.js";
 import { loadAndMaybeMigrateDoctorConfig } from "./doctor-config-flow.js";
-
-async function runDoctorConfigWithInput(params: {
-  config: Record<string, unknown>;
-  repair?: boolean;
-}) {
-  return withTempHome(async (home) => {
-    const configDir = path.join(home, ".openclaw");
-    await fs.mkdir(configDir, { recursive: true });
-    await fs.writeFile(
-      path.join(configDir, "openclaw.json"),
-      JSON.stringify(params.config, null, 2),
-      "utf-8",
-    );
-    return loadAndMaybeMigrateDoctorConfig({
-      options: { nonInteractive: true, repair: params.repair },
-      confirm: async () => false,
-    });
-  });
-}
+import { runDoctorConfigWithInput } from "./doctor-config-flow.test-utils.js";
 
 function expectGoogleChatDmAllowFromRepaired(cfg: unknown) {
   const typed = cfg as {
@@ -36,6 +18,27 @@ function expectGoogleChatDmAllowFromRepaired(cfg: unknown) {
   expect(typed.channels.googlechat.allowFrom).toBeUndefined();
 }
 
+type DiscordGuildRule = {
+  users: string[];
+  roles: string[];
+  channels: Record<string, { users: string[]; roles: string[] }>;
+};
+
+type DiscordAccountRule = {
+  allowFrom: string[];
+  dm: { allowFrom: string[]; groupChannels: string[] };
+  execApprovals: { approvers: string[] };
+  guilds: Record<string, DiscordGuildRule>;
+};
+
+type RepairedDiscordPolicy = {
+  allowFrom: string[];
+  dm: { allowFrom: string[]; groupChannels: string[] };
+  execApprovals: { approvers: string[] };
+  guilds: Record<string, DiscordGuildRule>;
+  accounts: Record<string, DiscordAccountRule>;
+};
+
 describe("doctor config flow", () => {
   it("preserves invalid config for doctor repairs", async () => {
     const result = await runDoctorConfigWithInput({
@@ -43,6 +46,7 @@ describe("doctor config flow", () => {
         gateway: { auth: { mode: "token", token: 123 } },
         agents: { list: [{ id: "pi" }] },
       },
+      run: loadAndMaybeMigrateDoctorConfig,
     });
 
     expect((result.cfg as Record<string, unknown>).gateway).toEqual({
@@ -58,6 +62,7 @@ describe("doctor config flow", () => {
         gateway: { auth: { mode: "token", token: "ok", extra: true } },
         agents: { list: [{ id: "pi" }] },
       },
+      run: loadAndMaybeMigrateDoctorConfig,
     });
 
     const cfg = result.cfg as Record<string, unknown>;
@@ -88,6 +93,7 @@ describe("doctor config flow", () => {
           },
         },
       },
+      run: loadAndMaybeMigrateDoctorConfig,
     });
 
     const cfg = result.cfg as {
@@ -145,6 +151,7 @@ describe("doctor config flow", () => {
             },
           },
         },
+        run: loadAndMaybeMigrateDoctorConfig,
       });
 
       const cfg = result.cfg as unknown as {
@@ -223,37 +230,7 @@ describe("doctor config flow", () => {
       });
 
       const cfg = result.cfg as unknown as {
-        channels: {
-          discord: {
-            allowFrom: string[];
-            dm: { allowFrom: string[]; groupChannels: string[] };
-            execApprovals: { approvers: string[] };
-            guilds: Record<
-              string,
-              {
-                users: string[];
-                roles: string[];
-                channels: Record<string, { users: string[]; roles: string[] }>;
-              }
-            >;
-            accounts: Record<
-              string,
-              {
-                allowFrom: string[];
-                dm: { allowFrom: string[]; groupChannels: string[] };
-                execApprovals: { approvers: string[] };
-                guilds: Record<
-                  string,
-                  {
-                    users: string[];
-                    roles: string[];
-                    channels: Record<string, { users: string[]; roles: string[] }>;
-                  }
-                >;
-              }
-            >;
-          };
-        };
+        channels: { discord: RepairedDiscordPolicy };
       };
 
       expect(cfg.channels.discord.allowFrom).toEqual(["123"]);
@@ -291,6 +268,7 @@ describe("doctor config flow", () => {
           },
         },
       },
+      run: loadAndMaybeMigrateDoctorConfig,
     });
 
     const cfg = result.cfg as unknown as {
@@ -313,6 +291,7 @@ describe("doctor config flow", () => {
           },
         },
       },
+      run: loadAndMaybeMigrateDoctorConfig,
     });
 
     const cfg = result.cfg as unknown as {
@@ -334,6 +313,7 @@ describe("doctor config flow", () => {
           },
         },
       },
+      run: loadAndMaybeMigrateDoctorConfig,
     });
 
     const cfg = result.cfg as unknown as {
@@ -362,6 +342,7 @@ describe("doctor config flow", () => {
           },
         },
       },
+      run: loadAndMaybeMigrateDoctorConfig,
     });
 
     const cfg = result.cfg as unknown as {
@@ -386,6 +367,7 @@ describe("doctor config flow", () => {
           },
         },
       },
+      run: loadAndMaybeMigrateDoctorConfig,
     });
 
     const cfg = result.cfg as unknown as {
@@ -408,6 +390,7 @@ describe("doctor config flow", () => {
           },
         },
       },
+      run: loadAndMaybeMigrateDoctorConfig,
     });
 
     expectGoogleChatDmAllowFromRepaired(result.cfg);
@@ -429,6 +412,7 @@ describe("doctor config flow", () => {
           },
         },
       },
+      run: loadAndMaybeMigrateDoctorConfig,
     });
 
     const cfg = result.cfg as unknown as {
@@ -464,6 +448,7 @@ describe("doctor config flow", () => {
           },
         },
       },
+      run: loadAndMaybeMigrateDoctorConfig,
     });
 
     expectGoogleChatDmAllowFromRepaired(result.cfg);