diff --git a/extensions/matrix/doctor-contract-api.account-state.test.ts b/extensions/matrix/doctor-contract-api.account-state.test.ts
index 07664cc5d977..8023c5c5eb97 100644
--- a/extensions/matrix/doctor-contract-api.account-state.test.ts
+++ b/extensions/matrix/doctor-contract-api.account-state.test.ts
@@ -119,7 +119,9 @@ if (process.versions.bun) {
   const entryPath = fileURLToPath(new URL("../../src/entry.ts", import.meta.url));
   return runCliProcessChild({
     nodeArgs: [
-      ...(process.versions.bun ? ["--preload"] : ["--import", "tsx", "--import"]),
+      ...(process.versions.bun
+        ? ["--preload"]
+        : ["--import", new URL("../../scripts/tsx.mjs", import.meta.url).href, "--import"]),
       loaderPath,
       entryPath,
       "doctor",
diff --git a/scripts/e2e/lib/upgrade-survivor/native-assignment-app-server.mjs b/scripts/e2e/lib/upgrade-survivor/native-assignment-app-server.mjs
index 01720173a4ae..5614e10e796c 100644
--- a/scripts/e2e/lib/upgrade-survivor/native-assignment-app-server.mjs
+++ b/scripts/e2e/lib/upgrade-survivor/native-assignment-app-server.mjs
@@ -280,7 +280,9 @@ function handle(socket, phase, message) {
             hidden: false,
             isDefault: true,
             defaultReasoningEffort: "low",
-            supportedReasoningEfforts: [{ reasoningEffort: "low" }],
+            supportedReasoningEfforts: [
+              { reasoningEffort: "low", description: "Low reasoning effort" },
+            ],
             multiAgentVersion: "v1",
             inputModalities: ["text"],
           },
diff --git a/src/gateway/session-history-worker.integration.test.ts b/src/gateway/session-history-worker.integration.test.ts
index 8b9321e780ad..48c57c9a458e 100644
--- a/src/gateway/session-history-worker.integration.test.ts
+++ b/src/gateway/session-history-worker.integration.test.ts
@@ -415,20 +415,26 @@ it("waits for a missing projection and serves the original history request", asy
       )
       .run(target.sessionId);
 
-    const page = await readChatHistoryPage({
-      entry,
-      provider: undefined,
-      sessionId: target.sessionId,
-      storePath: target.storePath,
-      sessionAgentId: target.agentId,
-      canonicalKey: target.sessionKey,
-      max: 10,
-      maxHistoryBytes: 100_000,
-      effectiveMaxChars: 8000,
-      offset: undefined,
-      messageId: undefined,
-    });
-    expect(page.messages.map(readChatHistoryMessageId)).toEqual(["recovered"]);
+    // Runtime tests own the recovery deadline; real worker startup must not spend it here.
+    vi.useFakeTimers({ toFake: ["setTimeout", "clearTimeout"] });
+    try {
+      const page = await readChatHistoryPage({
+        entry,
+        provider: undefined,
+        sessionId: target.sessionId,
+        storePath: target.storePath,
+        sessionAgentId: target.agentId,
+        canonicalKey: target.sessionKey,
+        max: 10,
+        maxHistoryBytes: 100_000,
+        effectiveMaxChars: 8000,
+        offset: undefined,
+        messageId: undefined,
+      });
+      expect(page.messages.map(readChatHistoryMessageId)).toEqual(["recovered"]);
+    } finally {
+      vi.useRealTimers();
+    }
   });
 });
 
diff --git a/test/helpers/upgrade-survivor-diagnostics.ts b/test/helpers/upgrade-survivor-diagnostics.ts
index 27415399b9ca..83e084eb5cf3 100644
--- a/test/helpers/upgrade-survivor-diagnostics.ts
+++ b/test/helpers/upgrade-survivor-diagnostics.ts
@@ -11,6 +11,7 @@ export function copySurvivorCaptureClosure(workDir: string) {
     "scripts/e2e/lib/text-file-utils.mjs",
     UPGRADE_SURVIVOR_DIAGNOSTICS_PATH,
     "scripts/e2e/lib/upgrade-survivor/backup-rollback-summary.mjs",
+    "scripts/e2e/lib/upgrade-survivor/native-assignment-summary.mjs",
     "scripts/e2e/lib/upgrade-survivor/plugin-policy-summary.mjs",
     "scripts/lib/release-version.mjs",
   ]) {