From a4266be80812cc91b4fd982e96230a39c2db564d Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Sun, 26 Apr 2026 18:11:12 +0100
Subject: [PATCH] test(release): stabilize release validation waits

---
 src/gateway/gateway-acp-bind.live.test.ts | 2 +-
 test/helpers/gateway-e2e-harness.ts       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gateway/gateway-acp-bind.live.test.ts b/src/gateway/gateway-acp-bind.live.test.ts
index 47745253c24..7dbc7416998 100644
--- a/src/gateway/gateway-acp-bind.live.test.ts
+++ b/src/gateway/gateway-acp-bind.live.test.ts
@@ -290,7 +290,7 @@ async function bindConversationAndWait(params: {
     if (runtime?.probeAvailability) {
       await runtime.probeAvailability().catch(() => {});
     }
-    if (!(backend?.healthy?.() ?? false)) {
+    if (!backend || (backend.healthy && !backend.healthy())) {
       if (runtime?.doctor && (attempt === 1 || attempt % 6 === 0)) {
         const report = await runtime.doctor().catch((error) => ({
           message: error instanceof Error ? error.message : String(error),
diff --git a/test/helpers/gateway-e2e-harness.ts b/test/helpers/gateway-e2e-harness.ts
index 4c3da079bfb..ae1fc7419f6 100644
--- a/test/helpers/gateway-e2e-harness.ts
+++ b/test/helpers/gateway-e2e-harness.ts
@@ -363,7 +363,7 @@ export async function waitForChatFinalEvent(params: {
   sessionKey: string;
   timeoutMs?: number;
 }): Promise<ChatEventPayload> {
-  const deadline = Date.now() + (params.timeoutMs ?? 15_000);
+  const deadline = Date.now() + (params.timeoutMs ?? 45_000);
   while (Date.now() < deadline) {
     const match = params.events.find(
       (evt) =>