From e64cc907ffb53e4a695e64f4a4e136b89afd0ee6 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Fri, 13 Mar 2026 21:30:21 +0000
Subject: [PATCH] test: share cron run fallback helpers

---
 .../isolated-agent/run.interim-retry.test.ts  | 14 ++-----
 .../run.message-tool-policy.test.ts           | 38 ++++++++-----------
 src/cron/isolated-agent/run.test-harness.ts   |  7 ++++
 3 files changed, 27 insertions(+), 32 deletions(-)

diff --git a/src/cron/isolated-agent/run.interim-retry.test.ts b/src/cron/isolated-agent/run.interim-retry.test.ts
index 90d663ed020..6f01a2e9232 100644
--- a/src/cron/isolated-agent/run.interim-retry.test.ts
+++ b/src/cron/isolated-agent/run.interim-retry.test.ts
@@ -7,6 +7,7 @@ import {
   countActiveDescendantRunsMock,
   listDescendantRunsForRequesterMock,
   loadRunCronIsolatedAgentTurn,
+  mockRunCronFallbackPassthrough,
   pickLastNonEmptyTextFromPayloadsMock,
   runEmbeddedPiAgentMock,
   runWithModelFallbackMock,
@@ -17,13 +18,6 @@ const runCronIsolatedAgentTurn = await loadRunCronIsolatedAgentTurn();
 describe("runCronIsolatedAgentTurn — interim ack retry", () => {
   setupRunCronIsolatedAgentTurnSuite();
 
-  const mockFallbackPassthrough = () => {
-    runWithModelFallbackMock.mockImplementation(async ({ provider, model, run }) => {
-      const result = await run(provider, model);
-      return { result, provider, model, attempts: [] };
-    });
-  };
-
   const runTurnAndExpectOk = async (expectedFallbackCalls: number, expectedAgentCalls: number) => {
     const result = await runCronIsolatedAgentTurn(makeIsolatedAgentTurnParams());
     expect(result.status).toBe("ok");
@@ -62,7 +56,7 @@ describe("runCronIsolatedAgentTurn — interim ack retry", () => {
         meta: { agentMeta: { usage: { input: 10, output: 20 } } },
       });
 
-    mockFallbackPassthrough();
+    mockRunCronFallbackPassthrough();
     await runTurnAndExpectOk(2, 2);
     expect(runEmbeddedPiAgentMock.mock.calls[1]?.[0]?.prompt).toContain(
       "previous response was only an acknowledgement",
@@ -76,7 +70,7 @@ describe("runCronIsolatedAgentTurn — interim ack retry", () => {
       meta: { agentMeta: { usage: { input: 10, output: 20 } } },
     });
 
-    mockFallbackPassthrough();
+    mockRunCronFallbackPassthrough();
     await runTurnAndExpectOk(1, 1);
   });
 
@@ -93,7 +87,7 @@ describe("runCronIsolatedAgentTurn — interim ack retry", () => {
     ]);
     countActiveDescendantRunsMock.mockReturnValue(0);
 
-    mockFallbackPassthrough();
+    mockRunCronFallbackPassthrough();
     await runTurnAndExpectOk(1, 1);
   });
 });
diff --git a/src/cron/isolated-agent/run.message-tool-policy.test.ts b/src/cron/isolated-agent/run.message-tool-policy.test.ts
index 2d576900b9d..a92b19f5337 100644
--- a/src/cron/isolated-agent/run.message-tool-policy.test.ts
+++ b/src/cron/isolated-agent/run.message-tool-policy.test.ts
@@ -2,12 +2,12 @@ import { afterEach, beforeEach, describe, expect, it } from "vitest";
 import {
   clearFastTestEnv,
   loadRunCronIsolatedAgentTurn,
+  mockRunCronFallbackPassthrough,
   resetRunCronIsolatedAgentTurnHarness,
   resolveCronDeliveryPlanMock,
   resolveDeliveryTargetMock,
   restoreFastTestEnv,
   runEmbeddedPiAgentMock,
-  runWithModelFallbackMock,
 } from "./run.test-harness.js";
 
 const runCronIsolatedAgentTurn = await loadRunCronIsolatedAgentTurn();
@@ -32,12 +32,18 @@ function makeParams() {
 describe("runCronIsolatedAgentTurn message tool policy", () => {
   let previousFastTestEnv: string | undefined;
 
-  const mockFallbackPassthrough = () => {
-    runWithModelFallbackMock.mockImplementation(async ({ provider, model, run }) => {
-      const result = await run(provider, model);
-      return { result, provider, model, attempts: [] };
-    });
-  };
+  async function expectMessageToolDisabledForPlan(plan: {
+    requested: boolean;
+    mode: "none" | "announce";
+    channel?: string;
+    to?: string;
+  }) {
+    mockRunCronFallbackPassthrough();
+    resolveCronDeliveryPlanMock.mockReturnValue(plan);
+    await runCronIsolatedAgentTurn(makeParams());
+    expect(runEmbeddedPiAgentMock).toHaveBeenCalledTimes(1);
+    expect(runEmbeddedPiAgentMock.mock.calls[0]?.[0]?.disableMessageTool).toBe(true);
+  }
 
   beforeEach(() => {
     previousFastTestEnv = clearFastTestEnv();
@@ -56,35 +62,23 @@ describe("runCronIsolatedAgentTurn message tool policy", () => {
   });
 
   it('disables the message tool when delivery.mode is "none"', async () => {
-    mockFallbackPassthrough();
-    resolveCronDeliveryPlanMock.mockReturnValue({
+    await expectMessageToolDisabledForPlan({
       requested: false,
       mode: "none",
     });
-
-    await runCronIsolatedAgentTurn(makeParams());
-
-    expect(runEmbeddedPiAgentMock).toHaveBeenCalledTimes(1);
-    expect(runEmbeddedPiAgentMock.mock.calls[0]?.[0]?.disableMessageTool).toBe(true);
   });
 
   it("disables the message tool when cron delivery is active", async () => {
-    mockFallbackPassthrough();
-    resolveCronDeliveryPlanMock.mockReturnValue({
+    await expectMessageToolDisabledForPlan({
       requested: true,
       mode: "announce",
       channel: "telegram",
       to: "123",
     });
-
-    await runCronIsolatedAgentTurn(makeParams());
-
-    expect(runEmbeddedPiAgentMock).toHaveBeenCalledTimes(1);
-    expect(runEmbeddedPiAgentMock.mock.calls[0]?.[0]?.disableMessageTool).toBe(true);
   });
 
   it("keeps the message tool enabled for shared callers when delivery is not requested", async () => {
-    mockFallbackPassthrough();
+    mockRunCronFallbackPassthrough();
     resolveCronDeliveryPlanMock.mockReturnValue({
       requested: false,
       mode: "none",
diff --git a/src/cron/isolated-agent/run.test-harness.ts b/src/cron/isolated-agent/run.test-harness.ts
index 74b5eed43e1..81e4c8b902b 100644
--- a/src/cron/isolated-agent/run.test-harness.ts
+++ b/src/cron/isolated-agent/run.test-harness.ts
@@ -341,6 +341,13 @@ function makeDefaultEmbeddedResult() {
   };
 }
 
+export function mockRunCronFallbackPassthrough(): void {
+  runWithModelFallbackMock.mockImplementation(async ({ provider, model, run }) => {
+    const result = await run(provider, model);
+    return { result, provider, model, attempts: [] };
+  });
+}
+
 export function resetRunCronIsolatedAgentTurnHarness(): void {
   vi.clearAllMocks();