test(qa): accept structured gateway restart outcomes (#103681)

steipete · web-flow · commit 5a451f92f993 · 2026-07-10T13:57:59.000+01:00
diff --git a/extensions/qa-lab/src/scenario-catalog.test.ts b/extensions/qa-lab/src/scenario-catalog.test.ts
@@ -435,18 +435,20 @@ describe("qa scenario catalog", () => {
     expect(readQaScenarioById("long-context-progress-watchdog").sourcePath).toBe(
       "qa/scenarios/runtime/long-context-progress-watchdog.yaml",
     );
-    expect(
-      JSON.stringify(readQaScenarioById("gateway-restart-inflight-run").execution.flow),
-    ).toContain("EmbeddedAttemptSessionTakeoverError");
-    expect(
-      JSON.stringify(readQaScenarioById("gateway-restart-inflight-run").execution.flow),
-    ).toContain("AbortError");
-    expect(
-      JSON.stringify(readQaScenarioById("gateway-restart-inflight-run").execution.flow),
-    ).toContain("This operation was aborted");
-    expect(
-      JSON.stringify(readQaScenarioById("gateway-restart-inflight-run").execution.flow),
-    ).toContain("liveTurnTimeoutMs(env, 180000)");
+    const gatewayRestartFlow = readQaScenarioById("gateway-restart-inflight-run").execution.flow;
+    const interruptedStatusAssertion = gatewayRestartFlow?.steps
+      .flatMap((step) => step.actions)
+      .find((action) =>
+        JSON.stringify(action).includes("interrupted agent run ended with unexpected status"),
+      );
+    expect(interruptedStatusAssertion).toBeDefined();
+    const interruptedStatusContract = JSON.stringify(interruptedStatusAssertion);
+    expect(interruptedStatusContract).toContain("waited.stopReason === 'restart'");
+    expect(interruptedStatusContract).toContain("waited.stopReason === 'aborted'");
+    expect(interruptedStatusContract).toContain("EmbeddedAttemptSessionTakeoverError");
+    expect(interruptedStatusContract).toContain("AbortError");
+    expect(interruptedStatusContract).toContain("This operation was aborted");
+    expect(JSON.stringify(gatewayRestartFlow)).toContain("liveTurnTimeoutMs(env, 180000)");
     const longContextFlow = JSON.stringify(
       readQaScenarioById("long-context-progress-watchdog").execution.flow,
     );
diff --git a/extensions/qa-lab/src/suite-runtime-agent-process.test.ts b/extensions/qa-lab/src/suite-runtime-agent-process.test.ts
@@ -779,6 +779,18 @@ describe("qa suite runtime agent process helpers", () => {
     );
   });
 
+  it.each(["restart", "aborted"])(
+    "preserves the %s stop reason from agent.wait",
+    async (stopReason) => {
+      const result = { status: "error", stopReason };
+      const gatewayCall = vi.fn(async () => result);
+
+      await expect(
+        waitForAgentRun({ gateway: { call: gatewayCall } } as never, "run-interrupted"),
+      ).resolves.toEqual(result);
+    },
+  );
+
   it("caps the gateway client timeout when waiting for oversized agent runs", async () => {
     const gatewayCall = vi.fn(async () => ({ status: "ok" }));
 
diff --git a/extensions/qa-lab/src/suite-runtime-agent-process.ts b/extensions/qa-lab/src/suite-runtime-agent-process.ts
@@ -46,6 +46,7 @@ type QaChatHistoryResponse = {
 type QaAgentWaitResult = {
   status?: string;
   error?: string;
+  stopReason?: string;
 };
 
 const ANSI_ESCAPE_PATTERN = new RegExp(String.raw`\x1B\[[0-?]*[ -/]*[@-~]`, "g");
diff --git a/qa/scenarios/runtime/gateway-restart-inflight-run.yaml b/qa/scenarios/runtime/gateway-restart-inflight-run.yaml
@@ -96,7 +96,7 @@ flow:
             - expr: started.runId
             - expr: liveTurnTimeoutMs(env, 180000)
         - assert:
-            expr: "waited.status === 'ok' || waited.status === 'timeout' || (waited.status === 'error' && (String(waited.error ?? '').includes('EmbeddedAttemptSessionTakeoverError') || String(waited.error ?? '').includes('AbortError') || String(waited.error ?? '').includes('This operation was aborted')))"
+            expr: "waited.status === 'ok' || waited.status === 'timeout' || (waited.status === 'error' && (waited.stopReason === 'restart' || waited.stopReason === 'aborted' || String(waited.error ?? '').includes('EmbeddedAttemptSessionTakeoverError') || String(waited.error ?? '').includes('AbortError') || String(waited.error ?? '').includes('This operation was aborted')))"
             message:
               expr: "`interrupted agent run ended with unexpected status: ${JSON.stringify(waited)}`"
         - set: interruptedMatches
