From f68b06843a034e9592f0daec6b9eb8a4e90abeea Mon Sep 17 00:00:00 2001
From: George Pickett <gpickett00@gmail.com>
Date: Mon, 20 Apr 2026 15:25:01 -0700
Subject: [PATCH] test(gateway): cover immediate websocket connect after
 startup

---
 .../server.startup-websocket-race.test.ts     | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/src/gateway/server.startup-websocket-race.test.ts b/src/gateway/server.startup-websocket-race.test.ts
index 7508279605e..8c18adec3f1 100644
--- a/src/gateway/server.startup-websocket-race.test.ts
+++ b/src/gateway/server.startup-websocket-race.test.ts
@@ -1,5 +1,6 @@
 import http from "node:http";
 import { afterEach, describe, expect, it, vi } from "vitest";
+import { connectGatewayClient, disconnectGatewayClient } from "./test-helpers.e2e.js";
 import { getFreePort, installGatewayTestHooks, startGatewayServer } from "./test-helpers.js";
 
 const machineNameDelay = vi.hoisted(() => {
@@ -104,4 +105,39 @@ describe("gateway startup websocket readiness", () => {
       }
     }
   });
+
+  it("accepts an immediate websocket connection once startup resolves", async () => {
+    machineNameDelay.reset();
+    const previousMinimal = process.env.OPENCLAW_TEST_MINIMAL_GATEWAY;
+    process.env.OPENCLAW_TEST_MINIMAL_GATEWAY = "0";
+    let server: Awaited<ReturnType<typeof startGatewayServer>> | undefined;
+    let client: Awaited<ReturnType<typeof connectGatewayClient>> | undefined;
+    try {
+      const port = await getFreePort();
+      machineNameDelay.release();
+      server = await startGatewayServer(port, {
+        auth: { mode: "none" },
+      });
+
+      client = await connectGatewayClient({
+        url: `ws://127.0.0.1:${port}`,
+        timeoutMs: 5_000,
+        timeoutMessage: "expected websocket connect to succeed immediately after startup",
+      });
+
+      expect(client).toBeDefined();
+    } finally {
+      if (client) {
+        await disconnectGatewayClient(client);
+      }
+      if (server) {
+        await server.close();
+      }
+      if (previousMinimal === undefined) {
+        delete process.env.OPENCLAW_TEST_MINIMAL_GATEWAY;
+      } else {
+        process.env.OPENCLAW_TEST_MINIMAL_GATEWAY = previousMinimal;
+      }
+    }
+  });
 });