diff --git a/src/auto-reply/reply.directive.directive-behavior.accepts-thinking-xhigh-codex-models.test.ts b/src/auto-reply/reply.directive.directive-behavior.accepts-thinking-xhigh-codex-models.test.ts
deleted file mode 100644
index 40a145220c1..00000000000
--- a/src/auto-reply/reply.directive.directive-behavior.accepts-thinking-xhigh-codex-models.test.ts
+++ /dev/null
@@ -1,190 +0,0 @@
-import "./reply.directive.directive-behavior.e2e-mocks.js";
-import fs from "node:fs/promises";
-import path from "node:path";
-import { describe, expect, it, vi } from "vitest";
-import {
-  installDirectiveBehaviorE2EHooks,
-  makeWhatsAppDirectiveConfig,
-  replyText,
-  replyTexts,
-  runEmbeddedPiAgent,
-  sessionStorePath,
-  withTempHome,
-} from "./reply.directive.directive-behavior.e2e-harness.js";
-import { getReplyFromConfig } from "./reply.js";
-
-async function writeSkill(params: { workspaceDir: string; name: string; description: string }) {
-  const { workspaceDir, name, description } = params;
-  const skillDir = path.join(workspaceDir, "skills", name);
-  await fs.mkdir(skillDir, { recursive: true });
-  await fs.writeFile(
-    path.join(skillDir, "SKILL.md"),
-    `---\nname: ${name}\ndescription: ${description}\n---\n\n# ${name}\n`,
-    "utf-8",
-  );
-}
-
-async function runThinkingDirective(home: string, model: string) {
-  const res = await getReplyFromConfig(
-    {
-      Body: "/thinking xhigh",
-      From: "+1004",
-      To: "+2000",
-      CommandAuthorized: true,
-    },
-    {},
-    makeWhatsAppDirectiveConfig(home, { model }, { session: { store: sessionStorePath(home) } }),
-  );
-  return replyTexts(res);
-}
-
-describe("directive behavior", () => {
-  installDirectiveBehaviorE2EHooks();
-
-  it("accepts /thinking xhigh for codex models", async () => {
-    await withTempHome(async (home) => {
-      const texts = await runThinkingDirective(home, "openai-codex/gpt-5.2-codex");
-      expect(texts).toContain("Thinking level set to xhigh.");
-    });
-  });
-  it("accepts /thinking xhigh for openai gpt-5.2", async () => {
-    await withTempHome(async (home) => {
-      const texts = await runThinkingDirective(home, "openai/gpt-5.2");
-      expect(texts).toContain("Thinking level set to xhigh.");
-    });
-  });
-  it("rejects /thinking xhigh for non-codex models", async () => {
-    await withTempHome(async (home) => {
-      const texts = await runThinkingDirective(home, "openai/gpt-4.1-mini");
-      expect(texts).toContain(
-        'Thinking level "xhigh" is only supported for openai/gpt-5.2, openai-codex/gpt-5.3-codex, openai-codex/gpt-5.3-codex-spark, openai-codex/gpt-5.2-codex, openai-codex/gpt-5.1-codex, github-copilot/gpt-5.2-codex or github-copilot/gpt-5.2.',
-      );
-    });
-  });
-  it("keeps reserved command aliases from matching after trimming", async () => {
-    await withTempHome(async (home) => {
-      const res = await getReplyFromConfig(
-        {
-          Body: "/help",
-          From: "+1222",
-          To: "+1222",
-          CommandAuthorized: true,
-        },
-        {},
-        makeWhatsAppDirectiveConfig(
-          home,
-          {
-            model: "anthropic/claude-opus-4-5",
-            models: {
-              "anthropic/claude-opus-4-5": { alias: " help " },
-            },
-          },
-          { session: { store: sessionStorePath(home) } },
-        ),
-      );
-
-      const text = replyText(res);
-      expect(text).toContain("Help");
-      expect(runEmbeddedPiAgent).not.toHaveBeenCalled();
-    });
-  });
-  it("treats skill commands as reserved for model aliases", async () => {
-    await withTempHome(async (home) => {
-      const workspace = path.join(home, "openclaw");
-      await writeSkill({
-        workspaceDir: workspace,
-        name: "demo-skill",
-        description: "Demo skill",
-      });
-
-      await getReplyFromConfig(
-        {
-          Body: "/demo_skill",
-          From: "+1222",
-          To: "+1222",
-          CommandAuthorized: true,
-        },
-        {},
-        makeWhatsAppDirectiveConfig(
-          home,
-          {
-            model: "anthropic/claude-opus-4-5",
-            workspace,
-            models: {
-              "anthropic/claude-opus-4-5": { alias: "demo_skill" },
-            },
-          },
-          { session: { store: sessionStorePath(home) } },
-        ),
-      );
-
-      expect(runEmbeddedPiAgent).toHaveBeenCalled();
-      const prompt = vi.mocked(runEmbeddedPiAgent).mock.calls[0]?.[0]?.prompt ?? "";
-      expect(prompt).toContain('Use the "demo-skill" skill');
-    });
-  });
-  it("errors on invalid queue options", async () => {
-    await withTempHome(async (home) => {
-      const res = await getReplyFromConfig(
-        {
-          Body: "/queue collect debounce:bogus cap:zero drop:maybe",
-          From: "+1222",
-          To: "+1222",
-          CommandAuthorized: true,
-        },
-        {},
-        makeWhatsAppDirectiveConfig(
-          home,
-          { model: "anthropic/claude-opus-4-5" },
-          {
-            session: { store: sessionStorePath(home) },
-          },
-        ),
-      );
-
-      const text = replyText(res);
-      expect(text).toContain("Invalid debounce");
-      expect(text).toContain("Invalid cap");
-      expect(text).toContain("Invalid drop policy");
-      expect(runEmbeddedPiAgent).not.toHaveBeenCalled();
-    });
-  });
-  it("shows current queue settings when /queue has no arguments", async () => {
-    await withTempHome(async (home) => {
-      const res = await getReplyFromConfig(
-        {
-          Body: "/queue",
-          From: "+1222",
-          To: "+1222",
-          Provider: "whatsapp",
-          CommandAuthorized: true,
-        },
-        {},
-        makeWhatsAppDirectiveConfig(
-          home,
-          { model: "anthropic/claude-opus-4-5" },
-          {
-            messages: {
-              queue: {
-                mode: "collect",
-                debounceMs: 1500,
-                cap: 9,
-                drop: "summarize",
-              },
-            },
-            session: { store: sessionStorePath(home) },
-          },
-        ),
-      );
-
-      const text = replyText(res);
-      expect(text).toContain(
-        "Current queue settings: mode=collect, debounce=1500ms, cap=9, drop=summarize.",
-      );
-      expect(text).toContain(
-        "Options: modes steer, followup, collect, steer+backlog, interrupt; debounce:<ms|s|m>, cap:<n>, drop:old|new|summarize.",
-      );
-      expect(runEmbeddedPiAgent).not.toHaveBeenCalled();
-    });
-  });
-});
diff --git a/src/auto-reply/reply.directive.directive-behavior.applies-inline-reasoning-mixed-messages-acks-immediately.test.ts b/src/auto-reply/reply.directive.directive-behavior.applies-inline-reasoning-mixed-messages-acks-immediately.test.ts
index 78a7fb2792f..56e1e5beaaa 100644
--- a/src/auto-reply/reply.directive.directive-behavior.applies-inline-reasoning-mixed-messages-acks-immediately.test.ts
+++ b/src/auto-reply/reply.directive.directive-behavior.applies-inline-reasoning-mixed-messages-acks-immediately.test.ts
@@ -1,4 +1,6 @@
 import "./reply.directive.directive-behavior.e2e-mocks.js";
+import fs from "node:fs/promises";
+import path from "node:path";
 import { describe, expect, it, vi } from "vitest";
 import { loadSessionStore, resolveSessionKey, saveSessionStore } from "../config/sessions.js";
 import {
@@ -13,6 +15,31 @@ import {
 } from "./reply.directive.directive-behavior.e2e-harness.js";
 import { getReplyFromConfig } from "./reply.js";
 
+async function writeSkill(params: { workspaceDir: string; name: string; description: string }) {
+  const { workspaceDir, name, description } = params;
+  const skillDir = path.join(workspaceDir, "skills", name);
+  await fs.mkdir(skillDir, { recursive: true });
+  await fs.writeFile(
+    path.join(skillDir, "SKILL.md"),
+    `---\nname: ${name}\ndescription: ${description}\n---\n\n# ${name}\n`,
+    "utf-8",
+  );
+}
+
+async function runThinkingDirective(home: string, model: string) {
+  const res = await getReplyFromConfig(
+    {
+      Body: "/thinking xhigh",
+      From: "+1004",
+      To: "+2000",
+      CommandAuthorized: true,
+    },
+    {},
+    makeWhatsAppDirectiveConfig(home, { model }, { session: { store: sessionStorePath(home) } }),
+  );
+  return replyTexts(res);
+}
+
 async function runThinkDirectiveAndGetText(home: string): Promise<string | undefined> {
   const res = await getReplyFromConfig(
     { Body: "/think", From: "+1222", To: "+1222", CommandAuthorized: true },
@@ -235,4 +262,150 @@ describe("directive behavior", () => {
       expect(runEmbeddedPiAgent).not.toHaveBeenCalled();
     });
   });
+  it("accepts /thinking xhigh for codex models", async () => {
+    await withTempHome(async (home) => {
+      const texts = await runThinkingDirective(home, "openai-codex/gpt-5.2-codex");
+      expect(texts).toContain("Thinking level set to xhigh.");
+    });
+  });
+  it("accepts /thinking xhigh for openai gpt-5.2", async () => {
+    await withTempHome(async (home) => {
+      const texts = await runThinkingDirective(home, "openai/gpt-5.2");
+      expect(texts).toContain("Thinking level set to xhigh.");
+    });
+  });
+  it("rejects /thinking xhigh for non-codex models", async () => {
+    await withTempHome(async (home) => {
+      const texts = await runThinkingDirective(home, "openai/gpt-4.1-mini");
+      expect(texts).toContain(
+        'Thinking level "xhigh" is only supported for openai/gpt-5.2, openai-codex/gpt-5.3-codex, openai-codex/gpt-5.3-codex-spark, openai-codex/gpt-5.2-codex, openai-codex/gpt-5.1-codex, github-copilot/gpt-5.2-codex or github-copilot/gpt-5.2.',
+      );
+    });
+  });
+  it("keeps reserved command aliases from matching after trimming", async () => {
+    await withTempHome(async (home) => {
+      const res = await getReplyFromConfig(
+        {
+          Body: "/help",
+          From: "+1222",
+          To: "+1222",
+          CommandAuthorized: true,
+        },
+        {},
+        makeWhatsAppDirectiveConfig(
+          home,
+          {
+            model: "anthropic/claude-opus-4-5",
+            models: {
+              "anthropic/claude-opus-4-5": { alias: " help " },
+            },
+          },
+          { session: { store: sessionStorePath(home) } },
+        ),
+      );
+
+      const text = replyText(res);
+      expect(text).toContain("Help");
+      expect(runEmbeddedPiAgent).not.toHaveBeenCalled();
+    });
+  });
+  it("treats skill commands as reserved for model aliases", async () => {
+    await withTempHome(async (home) => {
+      const workspace = path.join(home, "openclaw");
+      await writeSkill({
+        workspaceDir: workspace,
+        name: "demo-skill",
+        description: "Demo skill",
+      });
+
+      await getReplyFromConfig(
+        {
+          Body: "/demo_skill",
+          From: "+1222",
+          To: "+1222",
+          CommandAuthorized: true,
+        },
+        {},
+        makeWhatsAppDirectiveConfig(
+          home,
+          {
+            model: "anthropic/claude-opus-4-5",
+            workspace,
+            models: {
+              "anthropic/claude-opus-4-5": { alias: "demo_skill" },
+            },
+          },
+          { session: { store: sessionStorePath(home) } },
+        ),
+      );
+
+      expect(runEmbeddedPiAgent).toHaveBeenCalled();
+      const prompt = vi.mocked(runEmbeddedPiAgent).mock.calls[0]?.[0]?.prompt ?? "";
+      expect(prompt).toContain('Use the "demo-skill" skill');
+    });
+  });
+  it("errors on invalid queue options", async () => {
+    await withTempHome(async (home) => {
+      const res = await getReplyFromConfig(
+        {
+          Body: "/queue collect debounce:bogus cap:zero drop:maybe",
+          From: "+1222",
+          To: "+1222",
+          CommandAuthorized: true,
+        },
+        {},
+        makeWhatsAppDirectiveConfig(
+          home,
+          { model: "anthropic/claude-opus-4-5" },
+          {
+            session: { store: sessionStorePath(home) },
+          },
+        ),
+      );
+
+      const text = replyText(res);
+      expect(text).toContain("Invalid debounce");
+      expect(text).toContain("Invalid cap");
+      expect(text).toContain("Invalid drop policy");
+      expect(runEmbeddedPiAgent).not.toHaveBeenCalled();
+    });
+  });
+  it("shows current queue settings when /queue has no arguments", async () => {
+    await withTempHome(async (home) => {
+      const res = await getReplyFromConfig(
+        {
+          Body: "/queue",
+          From: "+1222",
+          To: "+1222",
+          Provider: "whatsapp",
+          CommandAuthorized: true,
+        },
+        {},
+        makeWhatsAppDirectiveConfig(
+          home,
+          { model: "anthropic/claude-opus-4-5" },
+          {
+            messages: {
+              queue: {
+                mode: "collect",
+                debounceMs: 1500,
+                cap: 9,
+                drop: "summarize",
+              },
+            },
+            session: { store: sessionStorePath(home) },
+          },
+        ),
+      );
+
+      const text = replyText(res);
+      expect(text).toContain(
+        "Current queue settings: mode=collect, debounce=1500ms, cap=9, drop=summarize.",
+      );
+      expect(text).toContain(
+        "Options: modes steer, followup, collect, steer+backlog, interrupt; debounce:<ms|s|m>, cap:<n>, drop:old|new|summarize.",
+      );
+      expect(runEmbeddedPiAgent).not.toHaveBeenCalled();
+    });
+  });
 });