diff --git a/src/auto-reply/reply/commands-subagents-send-steer.test-support.ts b/src/auto-reply/reply/commands-subagents-send-steer.test-support.ts
new file mode 100644
index 00000000000..e1c950ab207
--- /dev/null
+++ b/src/auto-reply/reply/commands-subagents-send-steer.test-support.ts
@@ -0,0 +1,11 @@
+import { buildSubagentsSendContext } from "./commands-subagents.test-helpers.js";
+
+export function buildSubagentsDispatchContext(params: {
+  handledPrefix: string;
+  restTokens: string[];
+}) {
+  return buildSubagentsSendContext({
+    handledPrefix: params.handledPrefix,
+    restTokens: params.restTokens,
+  });
+}
diff --git a/src/auto-reply/reply/commands-subagents-send.test.ts b/src/auto-reply/reply/commands-subagents-send.test.ts
index 762d52c1997..dafc0f8c455 100644
--- a/src/auto-reply/reply/commands-subagents-send.test.ts
+++ b/src/auto-reply/reply/commands-subagents-send.test.ts
@@ -1,5 +1,5 @@
 import { beforeEach, describe, expect, it, vi } from "vitest";
-import { buildSubagentsSendContext } from "./commands-subagents.test-helpers.js";
+import { buildSubagentsDispatchContext } from "./commands-subagents-send-steer.test-support.js";
 import { handleSubagentsSendAction } from "./commands-subagents/action-send.js";
 
 const sendControlledSubagentMessageMock = vi.hoisted(() => vi.fn());
@@ -11,7 +11,7 @@ vi.mock("./commands-subagents-control.runtime.js", () => ({
 }));
 
 const buildContext = () =>
-  buildSubagentsSendContext({
+  buildSubagentsDispatchContext({
     handledPrefix: "/subagents",
     restTokens: ["1", "continue", "with", "follow-up", "details"],
   });
diff --git a/src/auto-reply/reply/commands-subagents-steer.test.ts b/src/auto-reply/reply/commands-subagents-steer.test.ts
index 23f74a4085a..b883b467f5d 100644
--- a/src/auto-reply/reply/commands-subagents-steer.test.ts
+++ b/src/auto-reply/reply/commands-subagents-steer.test.ts
@@ -1,5 +1,5 @@
 import { beforeEach, describe, expect, it, vi } from "vitest";
-import { buildSubagentsSendContext } from "./commands-subagents.test-helpers.js";
+import { buildSubagentsDispatchContext } from "./commands-subagents-send-steer.test-support.js";
 import { handleSubagentsSendAction } from "./commands-subagents/action-send.js";
 
 const sendControlledSubagentMessageMock = vi.hoisted(() => vi.fn());
@@ -11,7 +11,7 @@ vi.mock("./commands-subagents-control.runtime.js", () => ({
 }));
 
 const buildContext = () =>
-  buildSubagentsSendContext({
+  buildSubagentsDispatchContext({
     handledPrefix: "/steer",
     restTokens: ["1", "check", "timer.ts", "instead"],
   });