From ba24dd9184291a4e67e2a307c688e89ffcd7d82e Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Sun, 10 May 2026 03:20:12 +0100
Subject: [PATCH] test: tighten qa matrix subagent assertions

---
 .../src/runners/contract/scenarios.test.ts    | 91 +++++++++----------
 1 file changed, 42 insertions(+), 49 deletions(-)

diff --git a/extensions/qa-matrix/src/runners/contract/scenarios.test.ts b/extensions/qa-matrix/src/runners/contract/scenarios.test.ts
index db44ecebd22..f1ecaa18802 100644
--- a/extensions/qa-matrix/src/runners/contract/scenarios.test.ts
+++ b/extensions/qa-matrix/src/runners/contract/scenarios.test.ts
@@ -2433,44 +2433,46 @@ describe("matrix live qa scenarios", () => {
 
     const scenario = requireMatrixQaScenario("matrix-subagent-thread-spawn");
 
-    await expect(
-      runMatrixQaScenario(scenario, {
-        baseUrl: "http://127.0.0.1:28008/",
-        canary: undefined,
-        driverAccessToken: "driver-token",
-        driverUserId: "@driver:matrix-qa.test",
-        observedEvents: [],
-        observerAccessToken: "observer-token",
-        observerUserId: "@observer:matrix-qa.test",
-        roomId: "!main:matrix-qa.test",
-        restartGateway: undefined,
-        syncState: {},
-        sutAccessToken: "sut-token",
-        sutUserId: "@sut:matrix-qa.test",
-        timeoutMs: 8_000,
-        topology: {
-          defaultRoomId: "!main:matrix-qa.test",
-          defaultRoomKey: "main",
-          rooms: [],
-        },
-      }),
-    ).resolves.toMatchObject({
-      artifacts: {
-        driverEventId: "$subagent-spawn-trigger",
-        subagentCompletion: {
-          eventId: "$subagent-completion",
-          relatesTo: {
-            relType: "m.thread",
-            eventId: "$subagent-thread-root",
-          },
-          tokenMatched: true,
-        },
-        subagentIntro: {
-          eventId: "$subagent-thread-root",
-        },
-        threadRootEventId: "$subagent-thread-root",
+    const result = await runMatrixQaScenario(scenario, {
+      baseUrl: "http://127.0.0.1:28008/",
+      canary: undefined,
+      driverAccessToken: "driver-token",
+      driverUserId: "@driver:matrix-qa.test",
+      observedEvents: [],
+      observerAccessToken: "observer-token",
+      observerUserId: "@observer:matrix-qa.test",
+      roomId: "!main:matrix-qa.test",
+      restartGateway: undefined,
+      syncState: {},
+      sutAccessToken: "sut-token",
+      sutUserId: "@sut:matrix-qa.test",
+      timeoutMs: 8_000,
+      topology: {
+        defaultRoomId: "!main:matrix-qa.test",
+        defaultRoomKey: "main",
+        rooms: [],
       },
     });
+    const artifacts = result.artifacts as {
+      driverEventId?: unknown;
+      subagentCompletion?: {
+        eventId?: unknown;
+        relatesTo?: {
+          eventId?: unknown;
+          relType?: unknown;
+        };
+        tokenMatched?: unknown;
+      };
+      subagentIntro?: { eventId?: unknown };
+      threadRootEventId?: unknown;
+    };
+    expect(artifacts.driverEventId).toBe("$subagent-spawn-trigger");
+    expect(artifacts.subagentCompletion?.eventId).toBe("$subagent-completion");
+    expect(artifacts.subagentCompletion?.relatesTo?.relType).toBe("m.thread");
+    expect(artifacts.subagentCompletion?.relatesTo?.eventId).toBe("$subagent-thread-root");
+    expect(artifacts.subagentCompletion?.tokenMatched).toBe(true);
+    expect(artifacts.subagentIntro?.eventId).toBe("$subagent-thread-root");
+    expect(artifacts.threadRootEventId).toBe("$subagent-thread-root");
 
     expect(sendTextMessage).toHaveBeenCalledWith({
       body: expect.stringContaining("Call sessions_spawn now for this QA check"),
@@ -2482,19 +2484,10 @@ describe("matrix live qa scenarios", () => {
       mentionUserIds: ["@sut:matrix-qa.test"],
       roomId: "!main:matrix-qa.test",
     });
-    expect(waitForRoomEvent).toHaveBeenNthCalledWith(
-      1,
-      expect.objectContaining({
-        since: "driver-sync-start",
-      }),
-    );
-    expect(waitForRoomEvent).toHaveBeenNthCalledWith(
-      2,
-      expect.objectContaining({
-        predicate: expect.any(Function),
-        since: "driver-sync-intro",
-      }),
-    );
+    expect(waitForRoomEvent.mock.calls[0]?.[0]?.since).toBe("driver-sync-start");
+    const completionWaitOptions = waitForRoomEvent.mock.calls[1]?.[0];
+    expect(typeof completionWaitOptions?.predicate).toBe("function");
+    expect(completionWaitOptions?.since).toBe("driver-sync-intro");
     const introPredicate = waitForRoomEvent.mock.calls[0]?.[0]?.predicate as
       | ((event: MatrixQaObservedEvent) => boolean)
       | undefined;