From c644da16d1dece38e7e214662dbea626c36bd7ce Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Sun, 4 Oct 2026 02:15:45 +0200
Subject: [PATCH] test(codex): move the held-response fixture into a helper

---
 .../codex-app-server-agent.local.e2e.test.ts  | 102 +++++++++++-------
 1 file changed, 64 insertions(+), 38 deletions(-)

diff --git a/packages/server/src/server/agent/providers/codex-app-server-agent.local.e2e.test.ts b/packages/server/src/server/agent/providers/codex-app-server-agent.local.e2e.test.ts
index 99a4956078..312f897750 100644
--- a/packages/server/src/server/agent/providers/codex-app-server-agent.local.e2e.test.ts
+++ b/packages/server/src/server/agent/providers/codex-app-server-agent.local.e2e.test.ts
@@ -2,7 +2,7 @@ import { describe, expect, test, vi } from "vitest";
 import { execFileSync } from "node:child_process";
 import os from "node:os";
 import path from "node:path";
-import { createServer } from "node:http";
+import { createServer, type ServerResponse } from "node:http";
 import { mkdtempSync, rmSync, writeFileSync } from "node:fs";
 import { once } from "node:events";
 
@@ -171,6 +171,62 @@ async function startMockResponsesServer(sequence: string[]): Promise<{
   };
 }
 
+async function startHeldFirstResponseServer(): Promise<{
+  url: string;
+  requestBodies: string[];
+  releaseFirstResponse: () => void;
+  close: () => Promise<void>;
+}> {
+  const requestBodies: string[] = [];
+  let heldResponse: ServerResponse | null = null;
+  const reply = (res: ServerResponse) => {
+    res.statusCode = 200;
+    res.setHeader("content-type", "text/event-stream");
+    res.end(assistantMessageSse("done"));
+  };
+  const server = createServer((req, res) => {
+    const chunks: Buffer[] = [];
+    req.on("data", (chunk) => chunks.push(Buffer.from(chunk)));
+    req.on("end", () => {
+      if (req.method !== "POST" || req.url !== "/v1/responses") {
+        res.statusCode = 404;
+        res.end("not found");
+        return;
+      }
+      requestBodies.push(Buffer.concat(chunks).toString("utf8"));
+      if (requestBodies.length === 1) {
+        heldResponse = res;
+      } else {
+        reply(res);
+      }
+    });
+  });
+
+  server.listen(0, "127.0.0.1");
+  await once(server, "listening");
+  const address = server.address();
+  if (!address || typeof address === "string") {
+    throw new Error("Expected TCP address for mock responses server");
+  }
+  return {
+    url: `http://127.0.0.1:${address.port}`,
+    requestBodies,
+    releaseFirstResponse: () => {
+      if (!heldResponse) throw new Error("No held response to release");
+      reply(heldResponse);
+      heldResponse = null;
+    },
+    close: () =>
+      new Promise<void>((resolve, reject) => {
+        server.closeAllConnections();
+        server.close((error) => {
+          if (error) reject(error);
+          else resolve();
+        });
+      }),
+  };
+}
+
 function writeMockCodexConfig(codexHome: string, serverUrl: string): void {
   writeFileSync(
     path.join(codexHome, "config.toml"),
@@ -222,39 +278,10 @@ describe("Codex app-server provider (local e2e)", () => {
     async () => {
       const cwd = mkdtempSync(path.join(os.tmpdir(), "codex-steer-rewind-cwd-"));
       const codexHome = mkdtempSync(path.join(os.tmpdir(), "codex-steer-rewind-home-"));
-      const requestBodies: string[] = [];
-      let releaseFirstResponse: (() => void) | null = null;
-      const server = createServer((req, res) => {
-        const chunks: Buffer[] = [];
-        req.on("data", (chunk) => chunks.push(Buffer.from(chunk)));
-        req.on("end", () => {
-          if (req.method !== "POST" || req.url !== "/v1/responses") {
-            res.statusCode = 404;
-            res.end("not found");
-            return;
-          }
-          requestBodies.push(Buffer.concat(chunks).toString("utf8"));
-          const reply = () => {
-            res.statusCode = 200;
-            res.setHeader("content-type", "text/event-stream");
-            res.end(assistantMessageSse("done"));
-          };
-          if (requestBodies.length === 1) {
-            releaseFirstResponse = reply;
-          } else {
-            reply();
-          }
-        });
-      });
-      server.listen(0, "127.0.0.1");
-      await once(server, "listening");
-      const address = server.address();
-      if (!address || typeof address === "string") {
-        throw new Error("Expected TCP address for mock responses server");
-      }
+      const mockServer = await startHeldFirstResponseServer();
 
       try {
-        writeMockCodexConfig(codexHome, `http://127.0.0.1:${address.port}`);
+        writeMockCodexConfig(codexHome, mockServer.url);
         const client = new CodexAppServerAgentClient(createTestLogger());
         const session = await client.createSession(
           { provider: "codex", cwd, modeId: "auto", model: "mock-model" },
@@ -281,13 +308,13 @@ describe("Codex app-server provider (local e2e)", () => {
           });
 
           const started = await session.startTurn("ORIGINAL_PROMPT");
-          await vi.waitFor(() => expect(releaseFirstResponse).not.toBeNull(), {
+          await vi.waitFor(() => expect(mockServer.requestBodies).toHaveLength(1), {
             timeout: 15_000,
           });
           await expect(
             session.steerActiveTurn!("STEER_PROMPT", { expectedTurnId: started.turnId }),
           ).resolves.toEqual({ status: "accepted" });
-          releaseFirstResponse!();
+          mockServer.releaseFirstResponse();
           await turnFinished;
 
           await vi.waitFor(() => expect(userMessageIds.get("STEER_PROMPT")).toBeDefined(), {
@@ -300,14 +327,13 @@ describe("Codex app-server provider (local e2e)", () => {
           }).catch(() => undefined);
 
           await session.run("AFTER_REWIND");
-          expect(requestBodies.at(-1)).toContain("AFTER_REWIND");
-          expect(requestBodies.at(-1)).toContain("ORIGINAL_PROMPT");
+          expect(mockServer.requestBodies.at(-1)).toContain("AFTER_REWIND");
+          expect(mockServer.requestBodies.at(-1)).toContain("ORIGINAL_PROMPT");
         } finally {
           await session.close();
         }
       } finally {
-        server.closeAllConnections();
-        server.close();
+        await mockServer.close();
         rmSync(cwd, { recursive: true, force: true });
         rmSync(codexHome, { recursive: true, force: true });
       }