refactor(test): dedupe isolated cron turn setup

src/cron/isolated-agent.uses-last-non-empty-agent-text-as.e2e.test.ts

@@ -85,29 +85,64 @@ async function readSessionEntry(storePath: string, key: string) {
   return store[key];
 }
 
+const DEFAULT_MESSAGE = "do it";
+const DEFAULT_SESSION_KEY = "cron:job-1";
+const DEFAULT_AGENT_TURN_PAYLOAD: CronJob["payload"] = {
+  kind: "agentTurn",
+  message: DEFAULT_MESSAGE,
+  deliver: false,
+};
 const GMAIL_MODEL = "openrouter/meta-llama/llama-3.3-70b:free";
 
+type RunCronTurnOptions = {
+  cfgOverrides?: Parameters<typeof makeCfg>[2];
+  deps?: CliDeps;
+  jobPayload?: CronJob["payload"];
+  message?: string;
+  mockTexts?: string[] | null;
+  sessionKey?: string;
+  storeEntries?: Record<string, Record<string, unknown>>;
+  storePath?: string;
+};
+
+async function runCronTurn(home: string, options: RunCronTurnOptions = {}) {
+  const storePath = options.storePath ?? (await writeSessionStore(home, options.storeEntries));
+  const deps = options.deps ?? makeDeps();
+  if (options.mockTexts === null) {
+    vi.mocked(runEmbeddedPiAgent).mockReset();
+  } else {
+    mockEmbeddedTexts(options.mockTexts ?? ["ok"]);
+  }
+
+  const jobPayload = options.jobPayload ?? DEFAULT_AGENT_TURN_PAYLOAD;
+  const res = await runCronIsolatedAgentTurn({
+    cfg: makeCfg(home, storePath, options.cfgOverrides),
+    deps,
+    job: makeJob(jobPayload),
+    message:
+      options.message ?? (jobPayload.kind === "agentTurn" ? jobPayload.message : DEFAULT_MESSAGE),
+    sessionKey: options.sessionKey ?? DEFAULT_SESSION_KEY,
+    lane: "cron",
+  });
+
+  return { deps, res, storePath };
+}
+
 async function runGmailHookTurn(
   home: string,
   storeEntries?: Record<string, Record<string, unknown>>,
 ) {
-  const storePath = await writeSessionStore(home, storeEntries);
+  return runCronTurn(home, {
-  const deps = makeDeps();
+    cfgOverrides: {
-  mockEmbeddedOk();
-
-  return runCronIsolatedAgentTurn({
-    cfg: makeCfg(home, storePath, {
       hooks: {
         gmail: {
           model: GMAIL_MODEL,
         },
       },
-    }),
+    },
-    deps,
+    jobPayload: DEFAULT_AGENT_TURN_PAYLOAD,
-    job: makeJob({ kind: "agentTurn", message: "do it", deliver: false }),
-    message: "do it",
     sessionKey: "hook:gmail:msg-1",
-    lane: "cron",
+    storeEntries,
   });
 }
 
@@ -116,24 +151,17 @@ async function runTurnWithStoredModelOverride(
   jobPayload: CronJob["payload"],
   modelOverride = "gpt-4.1-mini",
 ) {
-  const storePath = await writeSessionStore(home, {
+  return runCronTurn(home, {
-    "agent:main:cron:job-1": {
+    jobPayload,
-      sessionId: "existing-cron-session",
+    storeEntries: {
-      updatedAt: Date.now(),
+      "agent:main:cron:job-1": {
-      providerOverride: "openai",
+        sessionId: "existing-cron-session",
-      modelOverride,
+        updatedAt: Date.now(),
+        providerOverride: "openai",
+        modelOverride,
+      },
     },
   });
-  const deps = makeDeps();
-  mockEmbeddedOk();
-  return await runCronIsolatedAgentTurn({
-    cfg: makeCfg(home, storePath),
-    deps,
-    job: makeJob(jobPayload),
-    message: "do it",
-    sessionKey: "cron:job-1",
-    lane: "cron",
-  });
 }
 
 describe("runCronIsolatedAgentTurn", () => {
@@ -144,17 +172,8 @@ describe("runCronIsolatedAgentTurn", () => {
 
   it("treats blank model overrides as unset", async () => {
     await withTempHome(async (home) => {
-      const storePath = await writeSessionStore(home);
+      const { res } = await runCronTurn(home, {
-      const deps = makeDeps();
+        jobPayload: { kind: "agentTurn", message: DEFAULT_MESSAGE, model: "   " },
-      mockEmbeddedOk();
-
-      const res = await runCronIsolatedAgentTurn({
-        cfg: makeCfg(home, storePath),
-        deps,
-        job: makeJob({ kind: "agentTurn", message: "do it", model: "   " }),
-        message: "do it",
-        sessionKey: "cron:job-1",
-        lane: "cron",
       });
 
       expect(res.status).toBe("ok");
@@ -164,17 +183,9 @@ describe("runCronIsolatedAgentTurn", () => {
 
   it("uses last non-empty agent text as summary", async () => {
     await withTempHome(async (home) => {
-      const storePath = await writeSessionStore(home);
+      const { res } = await runCronTurn(home, {
-      const deps = makeDeps();
+        jobPayload: DEFAULT_AGENT_TURN_PAYLOAD,
-      mockEmbeddedTexts(["first", " ", " last "]);
+        mockTexts: ["first", " ", " last "],
-
-      const res = await runCronIsolatedAgentTurn({
-        cfg: makeCfg(home, storePath),
-        deps,
-        job: makeJob({ kind: "agentTurn", message: "do it", deliver: false }),
-        message: "do it",
-        sessionKey: "cron:job-1",
-        lane: "cron",
       });
 
       expect(res.status).toBe("ok");
@@ -184,17 +195,8 @@ describe("runCronIsolatedAgentTurn", () => {
 
   it("appends current time after the cron header line", async () => {
     await withTempHome(async (home) => {
-      const storePath = await writeSessionStore(home);
+      await runCronTurn(home, {
-      const deps = makeDeps();
+        jobPayload: DEFAULT_AGENT_TURN_PAYLOAD,
-      mockEmbeddedOk();
-
-      await runCronIsolatedAgentTurn({
-        cfg: makeCfg(home, storePath),
-        deps,
-        job: makeJob({ kind: "agentTurn", message: "do it", deliver: false }),
-        message: "do it",
-        sessionKey: "cron:job-1",
-        lane: "cron",
       });
 
       const call = vi.mocked(runEmbeddedPiAgent).mock.calls.at(-1)?.[0] as {
@@ -233,13 +235,13 @@ describe("runCronIsolatedAgentTurn", () => {
         job: {
           ...makeJob({
             kind: "agentTurn",
-            message: "do it",
+            message: DEFAULT_MESSAGE,
             deliver: false,
             channel: "last",
           }),
           agentId: "ops",
         },
-        message: "do it",
+        message: DEFAULT_MESSAGE,
         sessionKey: "cron:job-ops",
         agentId: "ops",
         lane: "cron",
@@ -259,21 +261,12 @@ describe("runCronIsolatedAgentTurn", () => {
 
   it("uses model override when provided", async () => {
     await withTempHome(async (home) => {
-      const storePath = await writeSessionStore(home);
+      const { res } = await runCronTurn(home, {
-      const deps = makeDeps();
+        jobPayload: {
-      mockEmbeddedOk();
-
-      const res = await runCronIsolatedAgentTurn({
-        cfg: makeCfg(home, storePath),
-        deps,
-        job: makeJob({
           kind: "agentTurn",
-          message: "do it",
+          message: DEFAULT_MESSAGE,
           model: "openai/gpt-4.1-mini",
-        }),
+        },
-        message: "do it",
-        sessionKey: "cron:job-1",
-        lane: "cron",
       });
 
       expect(res.status).toBe("ok");
@@ -283,9 +276,9 @@ describe("runCronIsolatedAgentTurn", () => {
 
   it("uses stored session override when no job model override is provided", async () => {
     await withTempHome(async (home) => {
-      const res = await runTurnWithStoredModelOverride(home, {
+      const { res } = await runTurnWithStoredModelOverride(home, {
         kind: "agentTurn",
-        message: "do it",
+        message: DEFAULT_MESSAGE,
         deliver: false,
       });
 
@@ -296,9 +289,9 @@ describe("runCronIsolatedAgentTurn", () => {
 
   it("prefers job model override over stored session override", async () => {
     await withTempHome(async (home) => {
-      const res = await runTurnWithStoredModelOverride(home, {
+      const { res } = await runTurnWithStoredModelOverride(home, {
         kind: "agentTurn",
-        message: "do it",
+        message: DEFAULT_MESSAGE,
         model: "anthropic/claude-opus-4-5",
         deliver: false,
       });
@@ -307,9 +300,10 @@ describe("runCronIsolatedAgentTurn", () => {
       expectEmbeddedProviderModel({ provider: "anthropic", model: "claude-opus-4-5" });
     });
   });
+
   it("uses hooks.gmail.model for Gmail hook sessions", async () => {
     await withTempHome(async (home) => {
-      const res = await runGmailHookTurn(home);
+      const { res } = await runGmailHookTurn(home);
 
       expect(res.status).toBe("ok");
       expectEmbeddedProviderModel({
@@ -321,7 +315,7 @@ describe("runCronIsolatedAgentTurn", () => {
 
   it("keeps hooks.gmail.model precedence over stored session override", async () => {
     await withTempHome(async (home) => {
-      const res = await runGmailHookTurn(home, {
+      const { res } = await runGmailHookTurn(home, {
         "agent:main:hook:gmail:msg-1": {
           sessionId: "existing-gmail-session",
           updatedAt: Date.now(),
@@ -340,17 +334,10 @@ describe("runCronIsolatedAgentTurn", () => {
 
   it("wraps external hook content by default", async () => {
     await withTempHome(async (home) => {
-      const storePath = await writeSessionStore(home);
+      const { res } = await runCronTurn(home, {
-      const deps = makeDeps();
+        jobPayload: { kind: "agentTurn", message: "Hello" },
-      mockEmbeddedOk();
-
-      const res = await runCronIsolatedAgentTurn({
-        cfg: makeCfg(home, storePath),
-        deps,
-        job: makeJob({ kind: "agentTurn", message: "Hello" }),
         message: "Hello",
         sessionKey: "hook:gmail:msg-1",
-        lane: "cron",
       });
 
       expect(res.status).toBe("ok");
@@ -362,23 +349,17 @@ describe("runCronIsolatedAgentTurn", () => {
 
   it("skips external content wrapping when hooks.gmail opts out", async () => {
     await withTempHome(async (home) => {
-      const storePath = await writeSessionStore(home);
+      const { res } = await runCronTurn(home, {
-      const deps = makeDeps();
+        cfgOverrides: {
-      mockEmbeddedOk();
-
-      const res = await runCronIsolatedAgentTurn({
-        cfg: makeCfg(home, storePath, {
           hooks: {
             gmail: {
               allowUnsafeExternalContent: true,
             },
           },
-        }),
+        },
-        deps,
+        jobPayload: { kind: "agentTurn", message: "Hello" },
-        job: makeJob({ kind: "agentTurn", message: "Hello" }),
         message: "Hello",
         sessionKey: "hook:gmail:msg-2",
-        lane: "cron",
       });
 
       expect(res.status).toBe("ok");
@@ -390,9 +371,6 @@ describe("runCronIsolatedAgentTurn", () => {
 
   it("ignores hooks.gmail.model when not in the allowlist", async () => {
     await withTempHome(async (home) => {
-      const storePath = await writeSessionStore(home);
-      const deps = makeDeps();
-      mockEmbeddedOk();
       vi.mocked(loadModelCatalog).mockResolvedValueOnce([
         {
           id: "claude-opus-4-5",
@@ -401,8 +379,8 @@ describe("runCronIsolatedAgentTurn", () => {
         },
       ]);
 
-      const res = await runCronIsolatedAgentTurn({
+      const { res } = await runCronTurn(home, {
-        cfg: makeCfg(home, storePath, {
+        cfgOverrides: {
           agents: {
             defaults: {
               model: "anthropic/claude-opus-4-5",
@@ -416,12 +394,9 @@ describe("runCronIsolatedAgentTurn", () => {
               model: "openrouter/meta-llama/llama-3.3-70b:free",
             },
           },
-        }),
+        },
-        deps,
+        jobPayload: DEFAULT_AGENT_TURN_PAYLOAD,
-        job: makeJob({ kind: "agentTurn", message: "do it", deliver: false }),
-        message: "do it",
         sessionKey: "hook:gmail:msg-2",
-        lane: "cron",
       });
 
       expect(res.status).toBe("ok");
@@ -436,27 +411,13 @@ describe("runCronIsolatedAgentTurn", () => {
 
   it("rejects invalid model override", async () => {
     await withTempHome(async (home) => {
-      const storePath = await writeSessionStore(home);
+      const { res } = await runCronTurn(home, {
-      const deps: CliDeps = {
+        jobPayload: {
-        sendMessageWhatsApp: vi.fn(),
-        sendMessageTelegram: vi.fn(),
-        sendMessageDiscord: vi.fn(),
-        sendMessageSignal: vi.fn(),
-        sendMessageIMessage: vi.fn(),
-      };
-      vi.mocked(runEmbeddedPiAgent).mockReset();
-
-      const res = await runCronIsolatedAgentTurn({
-        cfg: makeCfg(home, storePath),
-        deps,
-        job: makeJob({
           kind: "agentTurn",
-          message: "do it",
+          message: DEFAULT_MESSAGE,
           model: "openai/",
-        }),
+        },
-        message: "do it",
+        mockTexts: null,
-        sessionKey: "cron:job-1",
-        lane: "cron",
       });
 
       expect(res.status).toBe("error");
@@ -467,21 +428,6 @@ describe("runCronIsolatedAgentTurn", () => {
 
   it("defaults thinking to low for reasoning-capable models", async () => {
     await withTempHome(async (home) => {
-      const storePath = await writeSessionStore(home);
-      const deps: CliDeps = {
-        sendMessageWhatsApp: vi.fn(),
-        sendMessageTelegram: vi.fn(),
-        sendMessageDiscord: vi.fn(),
-        sendMessageSignal: vi.fn(),
-        sendMessageIMessage: vi.fn(),
-      };
-      vi.mocked(runEmbeddedPiAgent).mockResolvedValue({
-        payloads: [{ text: "done" }],
-        meta: {
-          durationMs: 5,
-          agentMeta: { sessionId: "s", provider: "p", model: "m" },
-        },
-      });
       vi.mocked(loadModelCatalog).mockResolvedValueOnce([
         {
           id: "claude-opus-4-5",
@@ -491,13 +437,9 @@ describe("runCronIsolatedAgentTurn", () => {
         },
       ]);
 
-      await runCronIsolatedAgentTurn({
+      await runCronTurn(home, {
-        cfg: makeCfg(home, storePath),
+        jobPayload: DEFAULT_AGENT_TURN_PAYLOAD,
-        deps,
+        mockTexts: ["done"],
-        job: makeJob({ kind: "agentTurn", message: "do it", deliver: false }),
-        message: "do it",
-        sessionKey: "cron:job-1",
-        lane: "cron",
       });
 
       const callArgs = vi.mocked(runEmbeddedPiAgent).mock.calls.at(-1)?.[0];
@@ -507,30 +449,10 @@ describe("runCronIsolatedAgentTurn", () => {
 
   it("truncates long summaries", async () => {
     await withTempHome(async (home) => {
-      const storePath = await writeSessionStore(home);
-      const deps: CliDeps = {
-        sendMessageWhatsApp: vi.fn(),
-        sendMessageTelegram: vi.fn(),
-        sendMessageDiscord: vi.fn(),
-        sendMessageSignal: vi.fn(),
-        sendMessageIMessage: vi.fn(),
-      };
       const long = "a".repeat(2001);
-      vi.mocked(runEmbeddedPiAgent).mockResolvedValue({
+      const { res } = await runCronTurn(home, {
-        payloads: [{ text: long }],
+        jobPayload: DEFAULT_AGENT_TURN_PAYLOAD,
-        meta: {
+        mockTexts: [long],
-          durationMs: 5,
-          agentMeta: { sessionId: "s", provider: "p", model: "m" },
-        },
-      });
-
-      const res = await runCronIsolatedAgentTurn({
-        cfg: makeCfg(home, storePath),
-        deps,
-        job: makeJob({ kind: "agentTurn", message: "do it", deliver: false }),
-        message: "do it",
-        sessionKey: "cron:job-1",
-        lane: "cron",
       });
 
       expect(res.status).toBe("ok");
@@ -542,28 +464,26 @@ describe("runCronIsolatedAgentTurn", () => {
     await withTempHome(async (home) => {
       const storePath = await writeSessionStore(home);
       const deps = makeDeps();
-      mockEmbeddedOk();
 
-      const cfg = makeCfg(home, storePath);
+      const first = (
-      const job = makeJob({ kind: "agentTurn", message: "ping", deliver: false });
+        await runCronTurn(home, {
+          deps,
+          jobPayload: { kind: "agentTurn", message: "ping", deliver: false },
+          message: "ping",
+          mockTexts: ["ok"],
+          storePath,
+        })
+      ).res;
 
-      const first = await runCronIsolatedAgentTurn({
+      const second = (
-        cfg,
+        await runCronTurn(home, {
-        deps,
+          deps,
-        job,
+          jobPayload: { kind: "agentTurn", message: "ping", deliver: false },
-        message: "ping",
+          message: "ping",
-        sessionKey: "cron:job-1",
+          mockTexts: ["ok"],
-        lane: "cron",
+          storePath,
-      });
+        })
-
+      ).res;
-      const second = await runCronIsolatedAgentTurn({
-        cfg,
-        deps,
-        job,
-        message: "ping",
-        sessionKey: "cron:job-1",
-        lane: "cron",
-      });
 
       expect(first.sessionId).toBeDefined();
       expect(second.sessionId).toBeDefined();
@@ -586,28 +506,10 @@ describe("runCronIsolatedAgentTurn", () => {
       };
       await fs.writeFile(storePath, JSON.stringify(store, null, 2), "utf-8");
 
-      const deps: CliDeps = {
+      await runCronTurn(home, {
-        sendMessageWhatsApp: vi.fn(),
+        jobPayload: { kind: "agentTurn", message: "ping", deliver: false },
-        sendMessageTelegram: vi.fn(),
-        sendMessageDiscord: vi.fn(),
-        sendMessageSignal: vi.fn(),
-        sendMessageIMessage: vi.fn(),
-      };
-      vi.mocked(runEmbeddedPiAgent).mockResolvedValue({
-        payloads: [{ text: "ok" }],
-        meta: {
-          durationMs: 5,
-          agentMeta: { sessionId: "s", provider: "p", model: "m" },
-        },
-      });
-
-      await runCronIsolatedAgentTurn({
-        cfg: makeCfg(home, storePath),
-        deps,
-        job: makeJob({ kind: "agentTurn", message: "ping", deliver: false }),
         message: "ping",
-        sessionKey: "cron:job-1",
+        storePath,
-        lane: "cron",
       });
       const entry = await readSessionEntry(storePath, "agent:main:cron:job-1");