From f57ce21d731508ba1dcb158f5a7c1e4f8192a025 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Fri, 17 Apr 2026 05:34:10 +0100
Subject: [PATCH] test: trim process-backed agent assertions

---
 src/agents/bash-tools.test.ts                 |  6 +--
 src/agents/pi-bundle-mcp-runtime.test.ts      |  2 +-
 ...media-tool-shared.model-resolution.test.ts | 40 ++-----------------
 3 files changed, 8 insertions(+), 40 deletions(-)

diff --git a/src/agents/bash-tools.test.ts b/src/agents/bash-tools.test.ts
index 9cc6a248d84..1ac7208ff0e 100644
--- a/src/agents/bash-tools.test.ts
+++ b/src/agents/bash-tools.test.ts
@@ -755,7 +755,7 @@ describe("exec backgrounded onUpdate suppression", () => {
       await execTool.execute(nextCallId(), { command }, undefined, onUpdateSpy);
       const callsAtExit = onUpdateSpy.mock.calls.length;
       // Allow a tick for any straggling stdout data events.
-      await new Promise((r) => setTimeout(r, 50));
+      await new Promise((r) => setTimeout(r, 5));
       expect(onUpdateSpy.mock.calls.length).toBe(callsAtExit);
     },
     isWin ? 10_000 : 5_000,
@@ -782,8 +782,8 @@ describe("exec backgrounded onUpdate suppression", () => {
         onUpdateSpy,
       );
       const callsAtAbort = onUpdateSpy.mock.calls.length;
-      // Allow extra time for any straggling stdout data events.
-      await new Promise((r) => setTimeout(r, 100));
+      // Allow a tick for any straggling stdout data events.
+      await new Promise((r) => setTimeout(r, 5));
       // After abort, no new onUpdate calls should have been made.
       expect(onUpdateSpy.mock.calls.length).toBe(callsAtAbort);
       expect(result).toBeDefined();
diff --git a/src/agents/pi-bundle-mcp-runtime.test.ts b/src/agents/pi-bundle-mcp-runtime.test.ts
index 2645cd667df..bb2ceece485 100644
--- a/src/agents/pi-bundle-mcp-runtime.test.ts
+++ b/src/agents/pi-bundle-mcp-runtime.test.ts
@@ -266,7 +266,7 @@ describe("session MCP runtime", () => {
     const serverScriptPath = path.join(pluginRoot, "servers", "bundle-probe.mjs");
     await writeBundleProbeMcpServer(serverScriptPath, {
       startupCounterPath,
-      startupDelayMs: 100,
+      startupDelayMs: 10,
       pidPath,
       exitMarkerPath,
     });
diff --git a/src/agents/tools/media-tool-shared.model-resolution.test.ts b/src/agents/tools/media-tool-shared.model-resolution.test.ts
index eeba3cb9a51..44688f047ad 100644
--- a/src/agents/tools/media-tool-shared.model-resolution.test.ts
+++ b/src/agents/tools/media-tool-shared.model-resolution.test.ts
@@ -1,35 +1,7 @@
-import { beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
-
-const state = vi.hoisted(() => ({
-  normalizeModelRefMock: vi.fn(),
-}));
-
-vi.mock("../model-selection.js", async () => {
-  const actual =
-    await vi.importActual<typeof import("../model-selection.js")>("../model-selection.js");
-  return {
-    ...actual,
-    normalizeModelRef: (...args: Parameters<typeof actual.normalizeModelRef>) =>
-      state.normalizeModelRefMock(...args),
-  };
-});
-
-let resolveModelFromRegistry: typeof import("./media-tool-shared.js").resolveModelFromRegistry;
+import { describe, expect, it, vi } from "vitest";
+import { resolveModelFromRegistry } from "./media-tool-shared.js";
 
 describe("resolveModelFromRegistry", () => {
-  beforeAll(async () => {
-    ({ resolveModelFromRegistry } = await import("./media-tool-shared.js"));
-  });
-
-  beforeEach(() => {
-    state.normalizeModelRefMock
-      .mockReset()
-      .mockImplementation((provider: string, model: string) => ({
-        provider: provider.trim().toLowerCase(),
-        model: model.trim().replace(/^ollama\//, ""),
-      }));
-  });
-
   it("normalizes provider and model refs before registry lookup", () => {
     const foundModel = { provider: "ollama", id: "qwen3.5:397b-cloud" };
     const find = vi.fn(() => foundModel);
@@ -37,13 +9,9 @@ describe("resolveModelFromRegistry", () => {
     const result = resolveModelFromRegistry({
       modelRegistry: { find },
       provider: " OLLAMA ",
-      modelId: "ollama/qwen3.5:397b-cloud",
+      modelId: " qwen3.5:397b-cloud ",
     });
 
-    expect(state.normalizeModelRefMock).toHaveBeenCalledWith(
-      " OLLAMA ",
-      "ollama/qwen3.5:397b-cloud",
-    );
     expect(find).toHaveBeenCalledWith("ollama", "qwen3.5:397b-cloud");
     expect(result).toBe(foundModel);
   });
@@ -55,7 +23,7 @@ describe("resolveModelFromRegistry", () => {
       resolveModelFromRegistry({
         modelRegistry: { find },
         provider: " OLLAMA ",
-        modelId: "ollama/qwen3.5:397b-cloud",
+        modelId: " qwen3.5:397b-cloud ",
       }),
     ).toThrow("Unknown model: ollama/qwen3.5:397b-cloud");
   });