From 998d477f5efd5a2e494b6ac70d24c2bdb95e7471 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Mon, 2 Mar 2026 14:43:14 +0000
Subject: [PATCH] test: stabilize cross-platform regression suites (#31594)

---
 ...gent.uses-last-non-empty-agent-text-as.test.ts | 13 +++++++++++++
 src/memory/qmd-manager.test.ts                    | 15 +++++++++++----
 test/scripts/ios-team-id.test.ts                  | 10 ++++++++--
 3 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/src/cron/isolated-agent.uses-last-non-empty-agent-text-as.test.ts b/src/cron/isolated-agent.uses-last-non-empty-agent-text-as.test.ts
index 04e613fab6e..7c375dfea2f 100644
--- a/src/cron/isolated-agent.uses-last-non-empty-agent-text-as.test.ts
+++ b/src/cron/isolated-agent.uses-last-non-empty-agent-text-as.test.ts
@@ -385,6 +385,19 @@ describe("runCronIsolatedAgentTurn", () => {
 
   it("applies model overrides with correct precedence", async () => {
     await withTempHome(async (home) => {
+      vi.mocked(loadModelCatalog).mockResolvedValue([
+        {
+          id: "gpt-4.1-mini",
+          name: "GPT-4.1 Mini",
+          provider: "openai",
+        },
+        {
+          id: "claude-opus-4-5",
+          name: "Claude Opus 4.5",
+          provider: "anthropic",
+        },
+      ]);
+
       let res = (
         await runCronTurn(home, {
           jobPayload: {
diff --git a/src/memory/qmd-manager.test.ts b/src/memory/qmd-manager.test.ts
index 6324eba13ff..462b2eff7aa 100644
--- a/src/memory/qmd-manager.test.ts
+++ b/src/memory/qmd-manager.test.ts
@@ -1405,13 +1405,20 @@ describe("QmdMemoryManager", () => {
       const { manager } = await createManager();
       await manager.search("hello", { sessionKey: "agent:main:slack:dm:u123" });
 
-      const mcporterCall = spawnMock.mock.calls.find(
-        (call: unknown[]) => (call[1] as string[] | undefined)?.[0] === "call",
+      const mcporterCall = spawnMock.mock.calls.find((call: unknown[]) =>
+        (call[1] as string[] | undefined)?.includes("call"),
       );
       expect(mcporterCall).toBeDefined();
-      expect(mcporterCall?.[0]).toBe("mcporter.cmd");
+      const callCommand = mcporterCall?.[0];
+      expect(typeof callCommand).toBe("string");
       const options = mcporterCall?.[2] as { shell?: boolean } | undefined;
-      expect(options?.shell).toBe(true);
+      if (isMcporterCommand(callCommand)) {
+        expect(callCommand).toBe("mcporter.cmd");
+        expect(options?.shell).toBe(true);
+      } else {
+        // If wrapper entrypoint resolution succeeded, spawn may invoke node/exe directly.
+        expect(options?.shell).not.toBe(true);
+      }
 
       await manager.close();
     } finally {
diff --git a/test/scripts/ios-team-id.test.ts b/test/scripts/ios-team-id.test.ts
index 6c0bfdaab7e..127b1c01b94 100644
--- a/test/scripts/ios-team-id.test.ts
+++ b/test/scripts/ios-team-id.test.ts
@@ -141,7 +141,13 @@ printf 'BBBBB22222\\t0\\tBeta Team\\r\\n'`,
 
     const result = runScript(homeDir);
     expect(result.ok).toBe(false);
-    expect(result.stderr).toContain("An Apple account is signed in to Xcode");
-    expect(result.stderr).toContain("IOS_DEVELOPMENT_TEAM");
+    expect(
+      result.stderr.includes("An Apple account is signed in to Xcode") ||
+        result.stderr.includes("No Apple Team ID found in Xcode accounts"),
+    ).toBe(true);
+    expect(
+      result.stderr.includes("IOS_DEVELOPMENT_TEAM") ||
+        result.stderr.includes("IOS_ALLOW_KEYCHAIN_TEAM_FALLBACK"),
+    ).toBe(true);
   });
 });