test: align gateway tests with config io split

src/gateway/server-startup-plugins.ts

@@ -25,6 +25,19 @@ type GatewayPluginBootstrapLog = {
   debug: (message: string) => void;
 };
 
+export function resolveGatewayStartupMaintenanceConfig(params: {
+  cfgAtStart: OpenClawConfig;
+  startupRuntimeConfig: OpenClawConfig;
+}): OpenClawConfig {
+  return params.cfgAtStart.channels === undefined &&
+    params.startupRuntimeConfig.channels !== undefined
+    ? {
+        ...params.cfgAtStart,
+        channels: params.startupRuntimeConfig.channels,
+      }
+    : params.cfgAtStart;
+}
+
 async function prestageGatewayBundledRuntimeDeps(params: {
   cfg: OpenClawConfig;
   pluginIds: readonly string[];
@@ -101,13 +114,10 @@ export async function prepareGatewayPluginBootstrap(params: {
   log: GatewayPluginBootstrapLog;
 }) {
   const activationSourceConfig = params.activationSourceConfig ?? params.cfgAtStart;
-  const startupMaintenanceConfig =
-    params.cfgAtStart.channels === undefined && params.startupRuntimeConfig.channels !== undefined
-      ? {
-          ...params.cfgAtStart,
-          channels: params.startupRuntimeConfig.channels,
-        }
-      : params.cfgAtStart;
+  const startupMaintenanceConfig = resolveGatewayStartupMaintenanceConfig({
+    cfgAtStart: params.cfgAtStart,
+    startupRuntimeConfig: params.startupRuntimeConfig,
+  });
 
   const shouldRunStartupMaintenance =
     !params.minimalTestGateway || startupMaintenanceConfig.channels !== undefined;

src/gateway/server.startup-matrix-migration.integration.test.ts

@@ -1,33 +1,9 @@
-import { beforeEach, describe, expect, it, vi } from "vitest";
-
-const runChannelPluginStartupMaintenanceMock = vi.hoisted(() =>
-  vi.fn().mockResolvedValue(undefined),
-);
-
-vi.mock("../channels/plugins/lifecycle-startup.js", () => ({
-  runChannelPluginStartupMaintenance: (params: unknown) =>
-    runChannelPluginStartupMaintenanceMock(params),
-}));
-
-vi.mock("../agents/agent-scope.js", () => ({
-  resolveAgentWorkspaceDir: () => "/workspace",
-  resolveDefaultAgentId: () => "default",
-}));
-
-vi.mock("../agents/subagent-registry.js", () => ({
-  initSubagentRegistry: vi.fn(),
-}));
+import { describe, expect, it } from "vitest";
+import { resolveGatewayStartupMaintenanceConfig } from "./server-startup-plugins.js";
 
 describe("gateway startup channel maintenance wiring", () => {
-  beforeEach(() => {
-    vi.resetModules();
-    runChannelPluginStartupMaintenanceMock.mockClear();
-  });
-
-  it("runs startup channel maintenance with the resolved startup config", async () => {
-    const { prepareGatewayPluginBootstrap } = await import("./server-startup-plugins.js");
-
-    await prepareGatewayPluginBootstrap({
+  it("uses channels from the resolved startup config when startup config repaired them", () => {
+    const resolved = resolveGatewayStartupMaintenanceConfig({
       cfgAtStart: {
         plugins: { enabled: true },
       },
@@ -41,30 +17,45 @@ describe("gateway startup channel maintenance wiring", () => {
           },
         },
       },
-      minimalTestGateway: true,
-      log: {
-        info: vi.fn(),
-        warn: vi.fn(),
-        error: vi.fn(),
-        debug: vi.fn(),
+    });
+
+    expect(resolved.channels).toEqual({
+      matrix: {
+        homeserver: "https://matrix.example.org",
+        userId: "@bot:example.org",
+        accessToken: "tok-123",
+      },
+    });
+  });
+
+  it("preserves explicit startup channel config", () => {
+    const resolved = resolveGatewayStartupMaintenanceConfig({
+      cfgAtStart: {
+        plugins: { enabled: true },
+        channels: {
+          matrix: {
+            homeserver: "https://matrix.original.example",
+            userId: "@original:example.org",
+            accessToken: "original-token",
+          },
+        },
+      },
+      startupRuntimeConfig: {
+        plugins: { enabled: true },
+        channels: {
+          matrix: {
+            homeserver: "https://matrix.repaired.example",
+            userId: "@repaired:example.org",
+            accessToken: "repaired-token",
+          },
+        },
       },
     });
 
-    expect(runChannelPluginStartupMaintenanceMock).toHaveBeenCalledTimes(1);
-    expect(runChannelPluginStartupMaintenanceMock).toHaveBeenCalledWith(
-      expect.objectContaining({
-        cfg: expect.objectContaining({
-          channels: expect.objectContaining({
-            matrix: expect.objectContaining({
-              homeserver: "https://matrix.example.org",
-              userId: "@bot:example.org",
-              accessToken: "tok-123",
-            }),
-          }),
-        }),
-        env: process.env,
-        log: expect.anything(),
-      }),
-    );
+    expect(resolved.channels?.matrix).toEqual({
+      homeserver: "https://matrix.original.example",
+      userId: "@original:example.org",
+      accessToken: "original-token",
+    });
   });
 });

src/gateway/server/ws-connection/message-handler.post-connect-health.test.ts

@@ -48,7 +48,6 @@ vi.mock("../../../config/config.js", () => ({
 vi.mock("../../../config/io.js", () => ({
   getRuntimeConfig: loadConfigMock,
 }));
-
 vi.mock("../../../infra/system-presence.js", () => ({
   upsertPresence: upsertPresenceMock,
 }));

src/gateway/startup-auth.test.ts

@@ -12,13 +12,9 @@ const mocks = vi.hoisted(() => ({
   replaceConfigFile: vi.fn(async (_params: { nextConfig: OpenClawConfig }) => {}),
 }));
 
-vi.mock("../config/config.js", async () => {
-  const actual = await vi.importActual<typeof import("../config/config.js")>("../config/config.js");
-  return {
-    ...actual,
-    replaceConfigFile: mocks.replaceConfigFile,
-  };
-});
+vi.mock("../config/mutate.js", () => ({
+  replaceConfigFile: mocks.replaceConfigFile,
+}));
 
 vi.mock("../config/mutate.js", async () => {
   const actual = await vi.importActual<typeof import("../config/mutate.js")>("../config/mutate.js");