diff --git a/src/auto-reply/reply/commands-subagents-spawn-action.test.ts b/src/auto-reply/reply/commands-subagents-spawn-action.test.ts
index ff7f55178132..4581076c2bdc 100644
--- a/src/auto-reply/reply/commands-subagents-spawn-action.test.ts
+++ b/src/auto-reply/reply/commands-subagents-spawn-action.test.ts
@@ -83,6 +83,24 @@ function buildContext(params?: {
   } satisfies Parameters<typeof handleSubagentsSpawnAction>[0];
 }
 
+function latestSpawnCall(): {
+  options: Record<string, unknown>;
+  context: Record<string, unknown>;
+} {
+  const call = spawnSubagentDirectMock.mock.calls.at(-1);
+  if (!call) {
+    throw new Error("expected spawnSubagentDirect call");
+  }
+  const [options, context] = call;
+  if (!options || typeof options !== "object" || !context || typeof context !== "object") {
+    throw new Error("expected spawnSubagentDirect object args");
+  }
+  return {
+    options: options as Record<string, unknown>,
+    context: context as Record<string, unknown>,
+  };
+}
+
 describe("subagents spawn action", () => {
   beforeEach(() => {
     vi.clearAllMocks();
@@ -119,22 +137,18 @@ describe("subagents spawn action", () => {
         text: "Spawned subagent beta (session agent:beta:subagent:test-uuid, run run-spaw).",
       },
     });
-    expect(spawnSubagentDirectMock).toHaveBeenCalledWith(
-      expect.objectContaining({
-        agentId: "beta",
-        task: "do the thing",
-        mode: "run",
-        cleanup: "keep",
-        expectsCompletionMessage: true,
-      }),
-      expect.objectContaining({
-        agentSessionKey: "agent:main:main",
-        agentChannel: "whatsapp",
-        agentAccountId: "default",
-        agentTo: "channel:origin",
-        agentThreadId: "thread-1",
-      }),
-    );
+    expect(spawnSubagentDirectMock).toHaveBeenCalledOnce();
+    const { options, context } = latestSpawnCall();
+    expect(options.agentId).toBe("beta");
+    expect(options.task).toBe("do the thing");
+    expect(options.mode).toBe("run");
+    expect(options.cleanup).toBe("keep");
+    expect(options.expectsCompletionMessage).toBe(true);
+    expect(context.agentSessionKey).toBe("agent:main:main");
+    expect(context.agentChannel).toBe("whatsapp");
+    expect(context.agentAccountId).toBe("default");
+    expect(context.agentTo).toBe("channel:origin");
+    expect(context.agentThreadId).toBe("thread-1");
   });
 
   it("passes --model through to spawnSubagentDirect", async () => {
@@ -144,13 +158,9 @@ describe("subagents spawn action", () => {
         restTokens: ["beta", "do", "the", "thing", "--model", "openai/gpt-4o"],
       }),
     );
-    expect(spawnSubagentDirectMock).toHaveBeenCalledWith(
-      expect.objectContaining({
-        model: "openai/gpt-4o",
-        task: "do the thing",
-      }),
-      expect.anything(),
-    );
+    const { options } = latestSpawnCall();
+    expect(options.model).toBe("openai/gpt-4o");
+    expect(options.task).toBe("do the thing");
   });
 
   it("passes --thinking through to spawnSubagentDirect", async () => {
@@ -160,13 +170,9 @@ describe("subagents spawn action", () => {
         restTokens: ["beta", "do", "the", "thing", "--thinking", "high"],
       }),
     );
-    expect(spawnSubagentDirectMock).toHaveBeenCalledWith(
-      expect.objectContaining({
-        thinking: "high",
-        task: "do the thing",
-      }),
-      expect.anything(),
-    );
+    const { options } = latestSpawnCall();
+    expect(options.thinking).toBe("high");
+    expect(options.task).toBe("do the thing");
   });
 
   it("passes group context from the session entry", async () => {
@@ -182,14 +188,10 @@ describe("subagents spawn action", () => {
         },
       }),
     );
-    expect(spawnSubagentDirectMock).toHaveBeenCalledWith(
-      expect.anything(),
-      expect.objectContaining({
-        agentGroupId: "group-1",
-        agentGroupChannel: "#group-channel",
-        agentGroupSpace: "workspace-1",
-      }),
-    );
+    const { context } = latestSpawnCall();
+    expect(context.agentGroupId).toBe("group-1");
+    expect(context.agentGroupChannel).toBe("#group-channel");
+    expect(context.agentGroupSpace).toBe("workspace-1");
   });
 
   it("uses the requester key chosen by earlier routing", async () => {
@@ -205,14 +207,10 @@ describe("subagents spawn action", () => {
         },
       }),
     );
-    expect(spawnSubagentDirectMock).toHaveBeenCalledWith(
-      expect.anything(),
-      expect.objectContaining({
-        agentSessionKey: "agent:main:target",
-        agentChannel: "discord",
-        agentTo: "channel:12345",
-      }),
-    );
+    const { context } = latestSpawnCall();
+    expect(context.agentSessionKey).toBe("agent:main:target");
+    expect(context.agentChannel).toBe("discord");
+    expect(context.agentTo).toBe("channel:12345");
   });
 
   it("prefers the requester-key session entry for group metadata", async () => {
@@ -229,15 +227,11 @@ describe("subagents spawn action", () => {
         },
       }),
     );
-    const call = spawnSubagentDirectMock.mock.calls.at(-1);
-    expect(call?.[1]).toEqual(
-      expect.objectContaining({
-        agentSessionKey: "agent:main:target",
-        agentGroupId: "wrapper-group",
-        agentGroupChannel: "#wrapper",
-        agentGroupSpace: "wrapper-space",
-      }),
-    );
+    let context = latestSpawnCall().context;
+    expect(context.agentSessionKey).toBe("agent:main:target");
+    expect(context.agentGroupId).toBe("wrapper-group");
+    expect(context.agentGroupChannel).toBe("#wrapper");
+    expect(context.agentGroupSpace).toBe("wrapper-space");
 
     spawnSubagentDirectMock.mockClear();
     await handleSubagentsSpawnAction({
@@ -274,15 +268,11 @@ describe("subagents spawn action", () => {
       },
     });
 
-    expect(spawnSubagentDirectMock).toHaveBeenCalledWith(
-      expect.anything(),
-      expect.objectContaining({
-        agentSessionKey: "agent:main:target",
-        agentGroupId: "target-group",
-        agentGroupChannel: "#target",
-        agentGroupSpace: "target-space",
-      }),
-    );
+    context = latestSpawnCall().context;
+    expect(context.agentSessionKey).toBe("agent:main:target");
+    expect(context.agentGroupId).toBe("target-group");
+    expect(context.agentGroupChannel).toBe("#target");
+    expect(context.agentGroupSpace).toBe("target-space");
   });
 
   it("falls back to OriginatingTo when command.to is missing", async () => {
@@ -297,12 +287,7 @@ describe("subagents spawn action", () => {
         },
       }),
     );
-    expect(spawnSubagentDirectMock).toHaveBeenCalledWith(
-      expect.anything(),
-      expect.objectContaining({
-        agentTo: "channel:manual",
-      }),
-    );
+    expect(latestSpawnCall().context.agentTo).toBe("channel:manual");
   });
 
   it("formats forbidden spawn failures", async () => {