perf(gateway): preserve pristine startup facts (#106282)

steipete · web-flow · commit 0d1573e9a2cc · 2026-07-13T05:50:36.000-07:00
diff --git a/src/cli/program/preaction.test.ts b/src/cli/program/preaction.test.ts
@@ -14,6 +14,8 @@ type EnsureConfigReadyOptions = {
   beforeStateMigrations?: () => Promise<boolean>;
   commandPath?: string[];
   requireConfig?: boolean;
+  skipPristineCoreStateMigrations?: boolean;
+  skipPristineStartupStateMigrations?: boolean;
 };
 const ensureConfigReadyMock = vi.fn<(_opts: EnsureConfigReadyOptions) => Promise<void>>(
   async () => {},
@@ -23,6 +25,8 @@ const routeLogsToStderrMock = vi.fn();
 const prepareGatewayRunBootstrapMock = vi.fn(async () => true);
 const recheckGatewayRunBootstrapMock = vi.fn(async () => true);
 const reloadTrustedGatewayRunEnvironmentMock = vi.fn(async () => true);
+const wasPreparedGatewayRunCoreStatePristineMock = vi.fn(() => true);
+const wasPreparedGatewayRunStatePristineMock = vi.fn(() => true);
 
 const runtimeMock = {
   log: vi.fn(),
@@ -64,6 +68,8 @@ vi.mock("../gateway-cli/pre-bootstrap.js", () => ({
   prepareGatewayRunBootstrap: prepareGatewayRunBootstrapMock,
   recheckGatewayRunBootstrap: recheckGatewayRunBootstrapMock,
   reloadTrustedGatewayRunEnvironment: reloadTrustedGatewayRunEnvironmentMock,
+  wasPreparedGatewayRunCoreStatePristine: wasPreparedGatewayRunCoreStatePristineMock,
+  wasPreparedGatewayRunStatePristine: wasPreparedGatewayRunStatePristineMock,
 }));
 
 let registerPreActionHooks: typeof import("./preaction.js").registerPreActionHooks;
@@ -319,6 +325,8 @@ describe("registerPreActionHooks", () => {
       expect.objectContaining({
         beforeStateMigrations: expect.any(Function),
         commandPath: ["gateway", "run"],
+        skipPristineCoreStateMigrations: true,
+        skipPristineStartupStateMigrations: true,
       }),
     );
     const beforeStateMigrations = ensureConfigReadyMock.mock.calls[0]?.[0]?.beforeStateMigrations;
diff --git a/src/cli/program/preaction.ts b/src/cli/program/preaction.ts
@@ -151,9 +151,15 @@ export function registerPreActionHooks(program: Command, programVersion: string)
       return;
     }
     let beforeStateMigrations: ((snapshot?: ConfigFileSnapshot) => Promise<boolean>) | undefined;
+    let skipPristineStartupStateMigrations = false;
+    let skipPristineCoreStateMigrations = false;
     if (isGatewayRunAction(actionCommand)) {
-      const { prepareGatewayRunBootstrap, recheckGatewayRunBootstrap } =
-        await import("../gateway-cli/pre-bootstrap.js");
+      const {
+        prepareGatewayRunBootstrap,
+        recheckGatewayRunBootstrap,
+        wasPreparedGatewayRunCoreStatePristine,
+        wasPreparedGatewayRunStatePristine,
+      } = await import("../gateway-cli/pre-bootstrap.js");
       const { resolveGatewayRunOptions } = await import("../gateway-cli/run-options.js");
       const resolvedOptions = resolveGatewayRunOptions(actionCommand.opts(), actionCommand);
       const opts = {
@@ -164,6 +170,8 @@ export function registerPreActionHooks(program: Command, programVersion: string)
       if (!shouldBootstrap) {
         return;
       }
+      skipPristineStartupStateMigrations = wasPreparedGatewayRunStatePristine();
+      skipPristineCoreStateMigrations = wasPreparedGatewayRunCoreStatePristine();
       beforeStateMigrations = (snapshot) =>
         recheckGatewayRunBootstrap({
           opts,
@@ -177,6 +185,8 @@ export function registerPreActionHooks(program: Command, programVersion: string)
       startupPolicy,
       allowInvalid: shouldAllowInvalidConfigForAction(actionCommand, commandPath),
       ...(beforeStateMigrations ? { beforeStateMigrations } : {}),
+      ...(skipPristineStartupStateMigrations ? { skipPristineStartupStateMigrations: true } : {}),
+      ...(skipPristineCoreStateMigrations ? { skipPristineCoreStateMigrations: true } : {}),
       skipConfigGuard: shouldBypassConfigGuardForCommandPath(commandPath),
     });
     if (beforeStateMigrations) {
diff --git a/src/commands/doctor/shared/pristine-startup-state.test.ts b/src/commands/doctor/shared/pristine-startup-state.test.ts
@@ -144,6 +144,12 @@ describe("pristine startup state", () => {
       skipAllStateMigrations: false,
       skipCoreStateMigrations: false,
     });
+    expect(
+      planPristineStartupConfigMigrations({ agents: { $include: "agents.json" } }, env),
+    ).toEqual({
+      skipAllStateMigrations: false,
+      skipCoreStateMigrations: false,
+    });
   });
 
   it("rejects enabled plugin entries and includes", () => {
diff --git a/src/commands/doctor/shared/pristine-startup-state.ts b/src/commands/doctor/shared/pristine-startup-state.ts
@@ -105,7 +105,7 @@ export function planPristineStartupConfigMigrations(
   config: unknown,
   env: NodeJS.ProcessEnv = process.env,
 ): PristineStartupMigrationPlan {
-  if (!isRecord(config) || Object.hasOwn(config, "$include")) {
+  if (!isRecord(config) || containsObjectKey(config, "$include")) {
     return { skipAllStateMigrations: false, skipCoreStateMigrations: false };
   }
   const skipCoreStateMigrations = configIsPristineCoreStateSafe(config);

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ export function planPristineStartupConfigMigrations(`
`105`	`105`	`config: unknown,`
`106`	`106`	`env: NodeJS.ProcessEnv = process.env,`
`107`	`107`	`): PristineStartupMigrationPlan {`
`108`		`- if (!isRecord(config) \|\| Object.hasOwn(config, "$include")) {`
	`108`	`+ if (!isRecord(config) \|\| containsObjectKey(config, "$include")) {`
`109`	`109`	`return { skipAllStateMigrations: false, skipCoreStateMigrations: false };`
`110`	`110`	`}`
`111`	`111`	`const skipCoreStateMigrations = configIsPristineCoreStateSafe(config);`