From c245cfc19c79c3a420174a48b5f6ad774ffeec38 Mon Sep 17 00:00:00 2001
From: Patrick Erichsen <patrick.a.erichsen@gmail.com>
Date: Thu, 6 Aug 2026 17:52:37 -0700
Subject: [PATCH] test: fix current main CI baselines (#120080)

* test: fix current main CI baselines

* test(qa-lab): preserve provider mode literals
---
 extensions/qa-lab/src/live-timeout.test.ts        |  2 +-
 .../run/attempt-normalization.test.ts             | 15 ++++++---------
 .../usage-reporting.test-support.ts               |  1 +
 ....test-fixture.ts => chat-host.test-support.ts} |  0
 ui/src/pages/chat/chat-send.test.ts               |  2 +-
 5 files changed, 9 insertions(+), 11 deletions(-)
 rename ui/src/pages/chat/{chat-host.test-fixture.ts => chat-host.test-support.ts} (100%)

diff --git a/extensions/qa-lab/src/live-timeout.test.ts b/extensions/qa-lab/src/live-timeout.test.ts
index 0861b85775a3..3d8a25187a7c 100644
--- a/extensions/qa-lab/src/live-timeout.test.ts
+++ b/extensions/qa-lab/src/live-timeout.test.ts
@@ -46,7 +46,7 @@ describe("qa live timeout policy", () => {
       fallbackModel: "claude-cli/claude-opus-4-8",
       expectedTimeoutMs: 240_000,
     },
-  ])("$title", ({ mode, model, fallbackModel, expectedTimeoutMs }) => {
+  ] as const)("$title", ({ mode, model, fallbackModel, expectedTimeoutMs }) => {
     expect(
       resolveQaLiveTurnTimeoutMs(
         {
diff --git a/src/agents/embedded-agent-runner/run/attempt-normalization.test.ts b/src/agents/embedded-agent-runner/run/attempt-normalization.test.ts
index 6b54c50abdc2..419e8691d9a3 100644
--- a/src/agents/embedded-agent-runner/run/attempt-normalization.test.ts
+++ b/src/agents/embedded-agent-runner/run/attempt-normalization.test.ts
@@ -15,21 +15,20 @@ beforeEach(() => {
 });
 
 describe("buildContextEngineCompactionSessionTarget", () => {
-  it("uses the marker session id as the fallback compatibility key", () => {
+  it("leaves the key absent when a marker has no stored mapping", () => {
     expect(
       buildContextEngineCompactionSessionTarget({
         sessionFile: "sqlite:main:marker-session:/tmp/sessions.json",
         sessionId: "stale-outer-session",
       }),
-    ).toMatchObject({
+    ).toEqual({
       agentId: "main",
       sessionId: "marker-session",
-      sessionKey: "marker-session",
       storePath: "/tmp/sessions.json",
     });
   });
 
-  it("uses the configured default agent for an unscoped compatibility key", () => {
+  it("uses the configured default agent without inventing a session key", () => {
     expect(
       buildContextEngineCompactionSessionTarget({
         config: {
@@ -39,15 +38,14 @@ describe("buildContextEngineCompactionSessionTarget", () => {
         sessionFile: "compat-session",
         sessionId: "compat-session",
       }),
-    ).toMatchObject({
+    ).toEqual({
       agentId: "worker",
       sessionId: "compat-session",
-      sessionKey: "compat-session",
       storePath: "/tmp/worker/sessions.json",
     });
   });
 
-  it("uses an adopted target session id when no session key is available", () => {
+  it("preserves an adopted session id without inventing a session key", () => {
     expect(
       buildContextEngineCompactionSessionTarget({
         sessionFile: "",
@@ -58,10 +56,9 @@ describe("buildContextEngineCompactionSessionTarget", () => {
           storePath: "/tmp/sessions.json",
         },
       }),
-    ).toMatchObject({
+    ).toEqual({
       agentId: "main",
       sessionId: "adopted-session",
-      sessionKey: "adopted-session",
       storePath: "/tmp/sessions.json",
     });
   });
diff --git a/src/agents/embedded-agent-runner/usage-reporting.test-support.ts b/src/agents/embedded-agent-runner/usage-reporting.test-support.ts
index ba86afa946a8..631bfd8741e8 100644
--- a/src/agents/embedded-agent-runner/usage-reporting.test-support.ts
+++ b/src/agents/embedded-agent-runner/usage-reporting.test-support.ts
@@ -186,6 +186,7 @@ describe("runEmbeddedAgent usage reporting", () => {
       prompt: "hello",
       timeoutMs: 30000,
       runId: "run-gateway-bind",
+      config: {},
       allowGatewaySubagentBinding: true,
     });
 
diff --git a/ui/src/pages/chat/chat-host.test-fixture.ts b/ui/src/pages/chat/chat-host.test-support.ts
similarity index 100%
rename from ui/src/pages/chat/chat-host.test-fixture.ts
rename to ui/src/pages/chat/chat-host.test-support.ts
diff --git a/ui/src/pages/chat/chat-send.test.ts b/ui/src/pages/chat/chat-send.test.ts
index 50cd92fa2458..857fc2630063 100644
--- a/ui/src/pages/chat/chat-send.test.ts
+++ b/ui/src/pages/chat/chat-send.test.ts
@@ -19,7 +19,7 @@ import {
 import { refreshChatAvatar } from "./chat-avatar.ts";
 import * as chatCommandExecutor from "./chat-command-executor.ts";
 import type { executeSlashCommand } from "./chat-command-executor.ts";
-import { makeChatHost, makeRequestMock } from "./chat-host.test-fixture.ts";
+import { makeChatHost, makeRequestMock } from "./chat-host.test-support.ts";
 import type { ChatHost } from "./chat-send-contract.ts";
 import {
   getPendingChatPickerPatch,