From c4c2060b81b73140734b36db0e91a853f17b0b4d Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 19 Feb 2026 08:26:03 +0000
Subject: [PATCH] test(agents): dedupe sessions_spawn requester run setup

---
 .../sessions-spawn-threadid.e2e.test.ts       | 53 ++++++++-----------
 1 file changed, 22 insertions(+), 31 deletions(-)

diff --git a/src/agents/sessions-spawn-threadid.e2e.test.ts b/src/agents/sessions-spawn-threadid.e2e.test.ts
index 9f57566c491..9dd46addac4 100644
--- a/src/agents/sessions-spawn-threadid.e2e.test.ts
+++ b/src/agents/sessions-spawn-threadid.e2e.test.ts
@@ -11,6 +11,24 @@ import {
 } from "./subagent-registry.js";
 
 describe("sessions_spawn requesterOrigin threading", () => {
+  const spawnAndReadRequesterRun = async (opts?: { agentThreadId?: number }) => {
+    const tool = await getSessionsSpawnTool({
+      agentSessionKey: "main",
+      agentChannel: "telegram",
+      agentTo: "telegram:123",
+      ...(opts?.agentThreadId === undefined ? {} : { agentThreadId: opts.agentThreadId }),
+    });
+    const result = await tool.execute("call", {
+      task: "do thing",
+      runTimeoutSeconds: 1,
+    });
+    expect(result.details).toMatchObject({ status: "accepted", runId: "run-1" });
+
+    const runs = listSubagentRunsForRequester("main");
+    expect(runs).toHaveLength(1);
+    return runs[0];
+  };
+
   beforeEach(() => {
     const callGatewayMock = getCallGatewayMock();
     resetSubagentRegistryForTests();
@@ -36,22 +54,8 @@ describe("sessions_spawn requesterOrigin threading", () => {
   });
 
   it("captures threadId in requesterOrigin", async () => {
-    const tool = await getSessionsSpawnTool({
-      agentSessionKey: "main",
-      agentChannel: "telegram",
-      agentTo: "telegram:123",
-      agentThreadId: 42,
-    });
-
-    const result = await tool.execute("call", {
-      task: "do thing",
-      runTimeoutSeconds: 1,
-    });
-    expect(result.details).toMatchObject({ status: "accepted", runId: "run-1" });
-
-    const runs = listSubagentRunsForRequester("main");
-    expect(runs).toHaveLength(1);
-    expect(runs[0]?.requesterOrigin).toMatchObject({
+    const run = await spawnAndReadRequesterRun({ agentThreadId: 42 });
+    expect(run?.requesterOrigin).toMatchObject({
       channel: "telegram",
       to: "telegram:123",
       threadId: 42,
@@ -59,20 +63,7 @@ describe("sessions_spawn requesterOrigin threading", () => {
   });
 
   it("stores requesterOrigin without threadId when none is provided", async () => {
-    const tool = await getSessionsSpawnTool({
-      agentSessionKey: "main",
-      agentChannel: "telegram",
-      agentTo: "telegram:123",
-    });
-
-    const result = await tool.execute("call", {
-      task: "do thing",
-      runTimeoutSeconds: 1,
-    });
-    expect(result.details).toMatchObject({ status: "accepted", runId: "run-1" });
-
-    const runs = listSubagentRunsForRequester("main");
-    expect(runs).toHaveLength(1);
-    expect(runs[0]?.requesterOrigin?.threadId).toBeUndefined();
+    const run = await spawnAndReadRequesterRun();
+    expect(run?.requesterOrigin?.threadId).toBeUndefined();
   });
 });