From d0f484d02421c3999b0079ca0eb93e9149a8eb8b Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Fri, 8 May 2026 13:06:18 +0100
Subject: [PATCH] test: clarify runtime event assertions

---
 src/context-engine/context-engine.test.ts     | 4 ++--
 src/gateway/client.test.ts                    | 7 ++-----
 src/gateway/client.watchdog.test.ts           | 2 +-
 src/gateway/talk-realtime-relay.test.ts       | 2 +-
 src/logging/console-capture.test.ts           | 2 +-
 src/sessions/session-lifecycle-events.test.ts | 4 ++--
 6 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/context-engine/context-engine.test.ts b/src/context-engine/context-engine.test.ts
index 70bff373e5f..5245ed853ce 100644
--- a/src/context-engine/context-engine.test.ts
+++ b/src/context-engine/context-engine.test.ts
@@ -1127,8 +1127,8 @@ describe("Initialization guard", () => {
   it("ensureContextEnginesInitialized() is idempotent and registers legacy", async () => {
     const { ensureContextEnginesInitialized } = await import("./init.js");
 
-    expect(() => ensureContextEnginesInitialized()).not.toThrow();
-    expect(() => ensureContextEnginesInitialized()).not.toThrow();
+    expect(ensureContextEnginesInitialized()).toBeUndefined();
+    expect(ensureContextEnginesInitialized()).toBeUndefined();
 
     const ids = listContextEngineIds();
     expect(ids).toContain("legacy");
diff --git a/src/gateway/client.test.ts b/src/gateway/client.test.ts
index 1571ee5c7bd..9b6762d2cc0 100644
--- a/src/gateway/client.test.ts
+++ b/src/gateway/client.test.ts
@@ -234,8 +234,7 @@ describe("GatewayClient security checks", () => {
       onConnectError,
     });
 
-    // Should not throw
-    expect(() => client.start()).not.toThrow();
+    expect(client.start()).toBeUndefined();
 
     expectSecurityConnectError(onConnectError);
     expect(wsInstances.length).toBe(0); // No WebSocket created
@@ -535,9 +534,7 @@ describe("GatewayClient close handling", () => {
     const client = createClientWithIdentity("dev-2", onClose);
 
     client.start();
-    expect(() => {
-      getLatestWs().emitClose(1008, "unauthorized: device token mismatch");
-    }).not.toThrow();
+    expect(getLatestWs().emitClose(1008, "unauthorized: device token mismatch")).toBeUndefined();
 
     expect(logDebugMock).toHaveBeenCalledWith(
       expect.stringContaining("failed clearing stale device-auth token"),
diff --git a/src/gateway/client.watchdog.test.ts b/src/gateway/client.watchdog.test.ts
index 52547aa6a57..3c3bf5b7b1d 100644
--- a/src/gateway/client.watchdog.test.ts
+++ b/src/gateway/client.watchdog.test.ts
@@ -210,7 +210,7 @@ describe("GatewayClient", () => {
     });
 
     try {
-      expect(() => client.start()).not.toThrow();
+      expect(client.start()).toBeUndefined();
       await connected;
       expect(onConnectError).not.toHaveBeenCalled();
     } finally {
diff --git a/src/gateway/talk-realtime-relay.test.ts b/src/gateway/talk-realtime-relay.test.ts
index c78535672c9..2ebc7bd14ef 100644
--- a/src/gateway/talk-realtime-relay.test.ts
+++ b/src/gateway/talk-realtime-relay.test.ts
@@ -552,6 +552,6 @@ describe("talk realtime gateway relay", () => {
     expect(() => createSession("conn-1")).toThrow(
       "Too many active realtime relay sessions for this connection",
     );
-    expect(() => createSession("conn-2")).not.toThrow();
+    expect(createSession("conn-2")).toBeDefined();
   });
 });
diff --git a/src/logging/console-capture.test.ts b/src/logging/console-capture.test.ts
index 6bb8f098bbe..a97c8d00e89 100644
--- a/src/logging/console-capture.test.ts
+++ b/src/logging/console-capture.test.ts
@@ -177,7 +177,7 @@ describe("enableConsoleCapture", () => {
     enableConsoleCapture();
     const epipe = new Error("write EPIPE") as NodeJS.ErrnoException;
     epipe.code = "EPIPE";
-    expect(() => stream.emit("error", epipe)).not.toThrow();
+    expect(stream.emit("error", epipe)).toBe(true);
   });
 
   it("rethrows non-EPIPE errors on stdout", () => {
diff --git a/src/sessions/session-lifecycle-events.test.ts b/src/sessions/session-lifecycle-events.test.ts
index d8654925405..1af7c67890c 100644
--- a/src/sessions/session-lifecycle-events.test.ts
+++ b/src/sessions/session-lifecycle-events.test.ts
@@ -48,12 +48,12 @@ describe("session lifecycle events", () => {
     const unsubscribeNoisy = onSessionLifecycleEvent(noisy.listener);
     const unsubscribeHealthy = onSessionLifecycleEvent(healthy.listener);
 
-    expect(() =>
+    expect(
       emitSessionLifecycleEvent({
         sessionKey: "agent:main:main",
         reason: "resumed",
       }),
-    ).not.toThrow();
+    ).toBeUndefined();
 
     expect(noisy.calls).toHaveLength(1);
     expect(healthy.calls).toHaveLength(1);