diff --git a/src/auto-reply/reply/commands-spawn.test-harness.ts b/src/auto-reply/reply/commands-spawn.test-harness.ts
index dd9de3c286..72c78d3606 100644
--- a/src/auto-reply/reply/commands-spawn.test-harness.ts
+++ b/src/auto-reply/reply/commands-spawn.test-harness.ts
@@ -1,46 +1,11 @@
 import type { OpenClawConfig } from "../../config/config.js";
 import type { MsgContext } from "../templating.js";
-import { buildCommandContext } from "./commands-context.js";
-import { parseInlineDirectives } from "./directive-handling.js";
+import { buildCommandTestParams as buildBaseCommandTestParams } from "./commands.test-harness.js";
 
 export function buildCommandTestParams(
   commandBody: string,
   cfg: OpenClawConfig,
   ctxOverrides?: Partial<MsgContext>,
 ) {
-  const ctx = {
-    Body: commandBody,
-    CommandBody: commandBody,
-    CommandSource: "text",
-    CommandAuthorized: true,
-    Provider: "whatsapp",
-    Surface: "whatsapp",
-    ...ctxOverrides,
-  } as MsgContext;
-
-  const command = buildCommandContext({
-    ctx,
-    cfg,
-    isGroup: false,
-    triggerBodyNormalized: commandBody.trim().toLowerCase(),
-    commandAuthorized: true,
-  });
-
-  return {
-    ctx,
-    cfg,
-    command,
-    directives: parseInlineDirectives(commandBody),
-    elevated: { enabled: true, allowed: true, failures: [] },
-    sessionKey: "agent:main:main",
-    workspaceDir: "/tmp",
-    defaultGroupActivation: () => "mention",
-    resolvedVerboseLevel: "off" as const,
-    resolvedReasoningLevel: "off" as const,
-    resolveDefaultThinkingLevel: async () => undefined,
-    provider: "whatsapp",
-    model: "test-model",
-    contextTokens: 0,
-    isGroup: false,
-  };
+  return buildBaseCommandTestParams(commandBody, cfg, ctxOverrides);
 }