test(gateway): add regression tests for restart coalescing fix

6a6f686e6e79 · claude · 6a6f686e6e79 · commit 416ac3830e3a · 2026-05-19T19:30:52.000-05:00
- run-loop.test.ts: assert markGatewaySigusr1RestartHandled is called
  before request() in the restartIntent branch of onSigusr1; both call
  count and invocation order are verified. Uses waitForLoopCondition for
  reliable async completion rather than fixed setImmediate counts.
- infra-runtime.test.ts: assert resetGatewayRestartStateForInProcessRestart
  aligns stale emit/consume token counters so a post-reset restart request
  is not coalesced.

Both tests fail against current main and pass with the patch.

Co-Authored-By: Claude Sonnet 4.6 &lt;noreply@anthropic.com&gt;
diff --git a/src/cli/gateway-cli/run-loop.test.ts b/src/cli/gateway-cli/run-loop.test.ts
@@ -1090,6 +1090,33 @@ describe("runGatewayLoop", () => {
     });
   });
 
+  it("marks the in-flight token consumed before routing SIGUSR1 with a restart intent", async () => {
+    vi.clearAllMocks();
+    consumeGatewayRestartIntentPayloadSync.mockReturnValueOnce({ reason: "config.patch" });
+
+    await withIsolatedSignals(async ({ captureSignal }) => {
+      const { close, start } = await createSignaledLoopHarness();
+      const sigusr1 = captureSignal("SIGUSR1");
+
+      sigusr1();
+      await waitForLoopCondition(
+        () => close.mock.calls.length > 0,
+        "expected close to be called as part of the restart",
+      );
+      await waitForLoopCondition(
+        () => start.mock.calls.length >= 2,
+        "expected start to be called a second time after restart",
+      );
+
+      expect(markGatewaySigusr1RestartHandled).toHaveBeenCalledTimes(1);
+      expect(markGatewaySigusr1RestartHandled.mock.invocationCallOrder[0]).toBeLessThan(
+        close.mock.invocationCallOrder[0]!,
+      );
+      expect(close).toHaveBeenCalledTimes(1);
+      expect(start).toHaveBeenCalledTimes(2);
+    });
+  });
+
   it("releases the lock before exiting on spawned restart", async () => {
     vi.clearAllMocks();
     peekGatewaySigusr1RestartReason.mockReturnValue(undefined);
diff --git a/src/infra/infra-runtime.test.ts b/src/infra/infra-runtime.test.ts
@@ -13,6 +13,7 @@ import {
   isGatewaySigusr1RestartExternallyAllowed,
   markGatewaySigusr1RestartHandled,
   peekGatewaySigusr1RestartReason,
+  resetGatewayRestartStateForInProcessRestart,
   scheduleGatewaySigusr1Restart,
   setGatewaySigusr1RestartPolicy,
   setPreRestartDeferralCheck,
@@ -463,6 +464,21 @@ describe("infra runtime", () => {
         process.removeListener("SIGUSR1", handler);
       }
     });
+
+    it("aligns stale emit/consume token counters on in-process restart boundary", () => {
+      const handler = () => {};
+      process.on("SIGUSR1", handler);
+      try {
+        emitGatewayRestart();
+        // An unconsumed token permanently coalesces further restart requests.
+        expect(scheduleGatewaySigusr1Restart({ delayMs: 0, reason: "check" }).coalesced).toBe(true);
+        resetGatewayRestartStateForInProcessRestart();
+        // After boundary reset the tokens are aligned; requests go through.
+        expect(scheduleGatewaySigusr1Restart({ delayMs: 0, reason: "post-reset" }).coalesced).toBe(false);
+      } finally {
+        process.removeListener("SIGUSR1", handler);
+      }
+    });
   });
 
   describe("pre-restart deferral check", () => {
