oh-my-codex 0.17.3 → 0.18.1

package/dist/scripts/__tests__/codex-native-hook.test.js

@@ -17,6 +17,7 @@ import { OMX_TMUX_HUD_OWNER_ENV } from "../../hud/reconcile.js";
 import { readAllState } from "../../hud/state.js";
 import { getLegacyWikiDir, serializePage, writePage } from "../../wiki/storage.js";
 import { WIKI_SCHEMA_VERSION } from "../../wiki/types.js";
+import { createUltragoalPlan, readUltragoalPlan } from "../../ultragoal/artifacts.js";
 function nativeHookScriptPath() {
     return join(process.cwd(), "dist", "scripts", "codex-native-hook.js");
 }
@@ -39,6 +40,38 @@ async function writeJson(path, value) {
     await mkdir(dirname(path), { recursive: true }).catch(() => { });
     await writeFile(path, JSON.stringify(value, null, 2));
 }
+async function withLoreGuardConfig(value, prefix, run) {
+    const cwd = await mkdtemp(join(tmpdir(), `omx-native-hook-pretool-git-commit-lore-${prefix}-`));
+    const codexHome = await mkdtemp(join(tmpdir(), `omx-native-hook-codex-home-lore-${prefix}-`));
+    const defaultHome = await mkdtemp(join(tmpdir(), `omx-native-hook-home-lore-${prefix}-`));
+    const originalGuard = process.env.OMX_LORE_COMMIT_GUARD;
+    const originalCodexHome = process.env.CODEX_HOME;
+    const originalHome = process.env.HOME;
+    try {
+        delete process.env.OMX_LORE_COMMIT_GUARD;
+        process.env.CODEX_HOME = codexHome;
+        process.env.HOME = defaultHome;
+        await writeFile(join(codexHome, "config.toml"), `[shell_environment_policy.set]\nOMX_LORE_COMMIT_GUARD = "${value}"\n`, "utf-8");
+        return await run(cwd);
+    }
+    finally {
+        if (originalGuard === undefined)
+            delete process.env.OMX_LORE_COMMIT_GUARD;
+        else
+            process.env.OMX_LORE_COMMIT_GUARD = originalGuard;
+        if (originalCodexHome === undefined)
+            delete process.env.CODEX_HOME;
+        else
+            process.env.CODEX_HOME = originalCodexHome;
+        if (originalHome === undefined)
+            delete process.env.HOME;
+        else
+            process.env.HOME = originalHome;
+        await rm(cwd, { recursive: true, force: true });
+        await rm(codexHome, { recursive: true, force: true });
+        await rm(defaultHome, { recursive: true, force: true });
+    }
+}
 function buildWorkerStopFakeTmux(tmuxLogPath, options = {}) {
     return `#!/usr/bin/env bash
 set -eu
@@ -67,7 +100,7 @@ if [[ "$cmd" == "display-message" ]]; then
   exit 0
 fi
 if [[ "$cmd" == "capture-pane" ]]; then
-  echo "› ready"
+  ${options.busyLeader ? 'echo "• Working… (esc to interrupt)"' : 'echo "› ready"'}
   exit 0
 fi
 if [[ "$cmd" == "send-keys" ]]; then
@@ -567,7 +600,16 @@ describe("codex native hook dispatch", () => {
     });
     it("keeps subagent SessionStart from replacing the canonical leader session", async () => {
         const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-subagent-session-start-"));
-        try {
+        const originalCodexHome = process.env.CODEX_HOME;
+        try {
+            process.env.CODEX_HOME = join(cwd, "codex-home");
+            await writeJson(join(process.env.CODEX_HOME, ".omx-config.json"), {
+                notifications: {
+                    enabled: true,
+                    verbosity: "session",
+                    telegram: { enabled: true, botToken: "123:abc", chatId: "456" },
+                },
+            });
             const stateDir = join(cwd, ".omx", "state");
             const canonicalSessionId = "omx-leader-session";
             const leaderNativeSessionId = "codex-leader-thread";
@@ -583,6 +625,13 @@ describe("codex native hook dispatch", () => {
                 iteration: 1,
                 max_iterations: 5,
             });
+            await mkdir(join(cwd, ".omx", "hooks"), { recursive: true });
+            await writeFile(join(cwd, ".omx", "hooks", "record-lifecycle.mjs"), [
+                "import { appendFileSync } from 'node:fs';",
+                "export async function onHookEvent(event) {",
+                "  appendFileSync('hook-events.jsonl', `${JSON.stringify({ event: event.event, context: event.context })}\\n`);",
+                "}",
+            ].join("\n"));
             const transcriptPath = join(cwd, "subagent-rollout.jsonl");
             await writeFile(transcriptPath, `${JSON.stringify({
                 type: "session_meta",
@@ -616,6 +665,7 @@ describe("codex native hook dispatch", () => {
             const leaderRalph = JSON.parse(await readFile(join(stateDir, "sessions", canonicalSessionId, "ralph-state.json"), "utf-8"));
             assert.equal(leaderRalph.active, true);
             assert.equal(leaderRalph.current_phase, "executing");
+            assert.equal(existsSync(join(cwd, "hook-events.jsonl")), false, "subagent SessionStart must not independently dispatch session-start hook notifications");
             const tracking = JSON.parse(await readFile(join(stateDir, "subagent-tracking.json"), "utf-8"));
             assert.equal(tracking.sessions?.[canonicalSessionId]?.leader_thread_id, leaderNativeSessionId);
             assert.equal(tracking.sessions?.[canonicalSessionId]?.threads?.[childNativeSessionId]?.kind, "subagent");
@@ -623,8 +673,213 @@ describe("codex native hook dispatch", () => {
             assert.equal(tracking.sessions?.[leaderNativeSessionId]?.leader_thread_id, leaderNativeSessionId);
             assert.equal(tracking.sessions?.[leaderNativeSessionId]?.threads?.[childNativeSessionId]?.kind, "subagent");
             assert.equal(tracking.sessions?.[leaderNativeSessionId]?.threads?.[childNativeSessionId]?.mode, "critic");
+            await dispatchCodexNativeHook({
+                hook_event_name: "Stop",
+                cwd,
+                session_id: childNativeSessionId,
+                thread_id: childNativeSessionId,
+                turn_id: "child-stop-turn",
+            }, { cwd });
+            assert.equal(existsSync(join(cwd, "hook-events.jsonl")), false, "subagent Stop must not independently dispatch stop hook notifications");
+        }
+        finally {
+            if (originalCodexHome === undefined) {
+                delete process.env.CODEX_HOME;
+            }
+            else {
+                process.env.CODEX_HOME = originalCodexHome;
+            }
+            await rm(cwd, { recursive: true, force: true });
+        }
+    });
+    it("suppresses child-agent SessionStart hook dispatch at minimal verbosity", async () => {
+        const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-subagent-session-minimal-"));
+        const originalCodexHome = process.env.CODEX_HOME;
+        try {
+            process.env.CODEX_HOME = join(cwd, "codex-home");
+            await writeJson(join(process.env.CODEX_HOME, ".omx-config.json"), {
+                notifications: {
+                    enabled: true,
+                    verbosity: "minimal",
+                    telegram: { enabled: true, botToken: "123:abc", chatId: "456" },
+                },
+            });
+            const stateDir = join(cwd, ".omx", "state");
+            const canonicalSessionId = "omx-leader-session-minimal";
+            const leaderNativeSessionId = "codex-leader-thread-minimal";
+            const childNativeSessionId = "codex-child-thread-minimal";
+            await mkdir(join(stateDir, "sessions", canonicalSessionId), { recursive: true });
+            await writeSessionStart(cwd, canonicalSessionId, {
+                nativeSessionId: leaderNativeSessionId,
+            });
+            await mkdir(join(cwd, ".omx", "hooks"), { recursive: true });
+            await writeFile(join(cwd, ".omx", "hooks", "record-lifecycle.mjs"), [
+                "import { appendFileSync } from 'node:fs';",
+                "export async function onHookEvent(event) {",
+                "  appendFileSync('hook-events.jsonl', `${JSON.stringify({ event: event.event })}\\n`);",
+                "}",
+            ].join("\n"));
+            const transcriptPath = join(cwd, "minimal-subagent-rollout.jsonl");
+            await writeFile(transcriptPath, `${JSON.stringify({
+                type: "session_meta",
+                payload: {
+                    id: childNativeSessionId,
+                    source: {
+                        subagent: {
+                            thread_spawn: {
+                                parent_thread_id: leaderNativeSessionId,
+                                agent_role: "verifier",
+                            },
+                        },
+                    },
+                },
+            })}\n`);
+            await dispatchCodexNativeHook({
+                hook_event_name: "SessionStart",
+                cwd,
+                session_id: childNativeSessionId,
+                transcript_path: transcriptPath,
+            }, { cwd, sessionOwnerPid: process.pid });
+            assert.equal(existsSync(join(cwd, "hook-events.jsonl")), false, "subagent SessionStart must be suppressed at minimal verbosity");
+        }
+        finally {
+            if (originalCodexHome === undefined) {
+                delete process.env.CODEX_HOME;
+            }
+            else {
+                process.env.CODEX_HOME = originalCodexHome;
+            }
+            await rm(cwd, { recursive: true, force: true });
+        }
+    });
+    it("allows explicit child-agent lifecycle hook dispatch when includeChildAgents is enabled", async () => {
+        const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-subagent-session-include-"));
+        const originalCodexHome = process.env.CODEX_HOME;
+        try {
+            process.env.CODEX_HOME = join(cwd, "codex-home");
+            await writeJson(join(process.env.CODEX_HOME, ".omx-config.json"), {
+                notifications: {
+                    enabled: true,
+                    verbosity: "session",
+                    includeChildAgents: true,
+                    telegram: { enabled: true, botToken: "123:abc", chatId: "456" },
+                },
+            });
+            const stateDir = join(cwd, ".omx", "state");
+            const canonicalSessionId = "omx-leader-session-include";
+            const leaderNativeSessionId = "codex-leader-thread-include";
+            const childNativeSessionId = "codex-child-thread-include";
+            await mkdir(join(stateDir, "sessions", canonicalSessionId), { recursive: true });
+            await writeSessionStart(cwd, canonicalSessionId, {
+                nativeSessionId: leaderNativeSessionId,
+            });
+            await mkdir(join(cwd, ".omx", "hooks"), { recursive: true });
+            await writeFile(join(cwd, ".omx", "hooks", "record-lifecycle.mjs"), [
+                "import { appendFileSync } from 'node:fs';",
+                "export async function onHookEvent(event) {",
+                "  appendFileSync('hook-events.jsonl', `${JSON.stringify({ event: event.event })}\\n`);",
+                "}",
+            ].join("\n"));
+            const transcriptPath = join(cwd, "included-subagent-rollout.jsonl");
+            await writeFile(transcriptPath, `${JSON.stringify({
+                type: "session_meta",
+                payload: {
+                    id: childNativeSessionId,
+                    source: {
+                        subagent: {
+                            thread_spawn: {
+                                parent_thread_id: leaderNativeSessionId,
+                                agent_role: "verifier",
+                            },
+                        },
+                    },
+                },
+            })}\n`);
+            await dispatchCodexNativeHook({
+                hook_event_name: "SessionStart",
+                cwd,
+                session_id: childNativeSessionId,
+                transcript_path: transcriptPath,
+            }, { cwd, sessionOwnerPid: process.pid });
+            await dispatchCodexNativeHook({
+                hook_event_name: "Stop",
+                cwd,
+                session_id: childNativeSessionId,
+                thread_id: childNativeSessionId,
+                turn_id: "included-child-stop-turn",
+            }, { cwd });
+            const hookEvents = await readFile(join(cwd, "hook-events.jsonl"), "utf-8");
+            assert.match(hookEvents, /"event":"session-start"/);
+            assert.match(hookEvents, /"event":"stop"/);
+        }
+        finally {
+            if (originalCodexHome === undefined) {
+                delete process.env.CODEX_HOME;
+            }
+            else {
+                process.env.CODEX_HOME = originalCodexHome;
+            }
+            await rm(cwd, { recursive: true, force: true });
+        }
+    });
+    it("allows child-agent lifecycle hook dispatch at agent verbosity", async () => {
+        const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-subagent-session-agent-"));
+        const originalCodexHome = process.env.CODEX_HOME;
+        try {
+            process.env.CODEX_HOME = join(cwd, "codex-home");
+            await writeJson(join(process.env.CODEX_HOME, ".omx-config.json"), {
+                notifications: {
+                    enabled: true,
+                    verbosity: "agent",
+                    telegram: { enabled: true, botToken: "123:abc", chatId: "456" },
+                },
+            });
+            const stateDir = join(cwd, ".omx", "state");
+            const canonicalSessionId = "omx-leader-session-agent";
+            const leaderNativeSessionId = "codex-leader-thread-agent";
+            const childNativeSessionId = "codex-child-thread-agent";
+            await mkdir(join(stateDir, "sessions", canonicalSessionId), { recursive: true });
+            await writeSessionStart(cwd, canonicalSessionId, {
+                nativeSessionId: leaderNativeSessionId,
+            });
+            await mkdir(join(cwd, ".omx", "hooks"), { recursive: true });
+            await writeFile(join(cwd, ".omx", "hooks", "record-lifecycle.mjs"), [
+                "import { appendFileSync } from 'node:fs';",
+                "export async function onHookEvent(event) {",
+                "  appendFileSync('hook-events.jsonl', `${JSON.stringify({ event: event.event })}\\n`);",
+                "}",
+            ].join("\n"));
+            const transcriptPath = join(cwd, "agent-verbosity-subagent-rollout.jsonl");
+            await writeFile(transcriptPath, `${JSON.stringify({
+                type: "session_meta",
+                payload: {
+                    id: childNativeSessionId,
+                    source: {
+                        subagent: {
+                            thread_spawn: {
+                                parent_thread_id: leaderNativeSessionId,
+                                agent_role: "verifier",
+                            },
+                        },
+                    },
+                },
+            })}\n`);
+            await dispatchCodexNativeHook({
+                hook_event_name: "SessionStart",
+                cwd,
+                session_id: childNativeSessionId,
+                transcript_path: transcriptPath,
+            }, { cwd, sessionOwnerPid: process.pid });
+            const hookEvents = await readFile(join(cwd, "hook-events.jsonl"), "utf-8");
+            assert.match(hookEvents, /"event":"session-start"/);
         }
         finally {
+            if (originalCodexHome === undefined) {
+                delete process.env.CODEX_HOME;
+            }
+            else {
+                process.env.CODEX_HOME = originalCodexHome;
+            }
             await rm(cwd, { recursive: true, force: true });
         }
     });
@@ -1218,6 +1473,62 @@ describe("codex native hook dispatch", () => {
             await rm(cwd, { recursive: true, force: true });
         }
     });
+    it("does not repeat performance-goal reconciliation after a recorded objective mismatch blocker", async () => {
+        const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-performance-mismatch-blocked-stop-"));
+        try {
+            await writeJson(join(cwd, ".omx", "goals", "performance", "latency", "state.json"), {
+                version: 1,
+                workflow: "performance-goal",
+                slug: "latency",
+                objective: "Reduce latency",
+                status: "blocked",
+                lastValidation: {
+                    status: "blocked",
+                    evidence: "omx performance-goal complete rejected the fresh get_goal snapshot: Codex goal objective mismatch: expected \"reduce latency\", got \"legacy objective\".",
+                    recordedAt: "2026-05-20T00:00:00.000Z",
+                },
+            });
+            const result = await dispatchCodexNativeHook({
+                hook_event_name: "Stop",
+                cwd,
+                session_id: "sess-performance-mismatch-blocked-stop",
+                thread_id: "thread-performance-mismatch-blocked-stop",
+                last_assistant_message: "Performance goal complete; next call update_goal({status: \"complete\"}).",
+            }, { cwd });
+            assert.notEqual(result.outputJson?.decision, "block");
+            assert.doesNotMatch(JSON.stringify(result.outputJson), /omx performance-goal complete --slug latency/);
+            assert.doesNotMatch(JSON.stringify(result.outputJson), /get_goal snapshot reconciliation/);
+        }
+        finally {
+            await rm(cwd, { recursive: true, force: true });
+        }
+    });
+    it("does not block Stop for an already complete performance-goal state", async () => {
+        const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-performance-complete-stop-"));
+        try {
+            await writeJson(join(cwd, ".omx", "goals", "performance", "latency", "state.json"), {
+                version: 1,
+                workflow: "performance-goal",
+                slug: "latency",
+                objective: "Reduce latency",
+                status: "complete",
+                completedAt: "2026-05-20T00:00:00.000Z",
+            });
+            const result = await dispatchCodexNativeHook({
+                hook_event_name: "Stop",
+                cwd,
+                session_id: "sess-performance-complete-stop",
+                thread_id: "thread-performance-complete-stop",
+                last_assistant_message: "Performance goal complete; next call update_goal({status: \"complete\"}).",
+            }, { cwd });
+            assert.notEqual(result.outputJson?.decision, "block");
+            assert.doesNotMatch(JSON.stringify(result.outputJson), /omx performance-goal complete --slug latency/);
+            assert.doesNotMatch(JSON.stringify(result.outputJson), /get_goal snapshot reconciliation/);
+        }
+        finally {
+            await rm(cwd, { recursive: true, force: true });
+        }
+    });
     it("blocks ultragoal Stop for concise generic goal completion claims", async () => {
         const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-ultragoal-generic-complete-stop-"));
         try {
@@ -1262,7 +1573,7 @@ describe("codex native hook dispatch", () => {
             await rm(cwd, { recursive: true, force: true });
         }
     });
-    it("blocks ultragoal Stop with blocked checkpoint and fresh-thread remediation for completed legacy snapshots", async () => {
+    it("blocks ultragoal Stop with blocked checkpoint and available-goal-context remediation for completed legacy snapshots", async () => {
         const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-ultragoal-legacy-stop-"));
         try {
             await writeJson(join(cwd, ".omx", "ultragoal", "goals.json"), {
@@ -1281,7 +1592,8 @@ describe("codex native hook dispatch", () => {
             assert.equal(result.outputJson?.decision, "block");
             assert.match(output, /omx ultragoal checkpoint --goal-id G001-demo --status complete/);
             assert.match(output, /--status blocked/);
-            assert.match(output, /fresh Codex thread/);
+            assert.match(output, /Codex goal context/);
+            assert.doesNotMatch(output, /fresh (?:Codex )?(?:thread|session)s?/i);
             assert.match(output, /Hooks must not mutate Codex goal state/);
         }
         finally {
@@ -1294,7 +1606,7 @@ describe("codex native hook dispatch", () => {
             await writeJson(join(cwd, ".omx", "ultragoal", "goals.json"), {
                 version: 1,
                 codexGoalMode: "aggregate",
-                codexObjective: "Complete all ultragoal stories in .omx/ultragoal/goals.json: many micro goals",
+                codexObjective: "Complete the durable ultragoal plan in .omx/ultragoal/goals.json, including later accepted/appended stories, under the original brief constraints; use .omx/ultragoal/ledger.jsonl as the audit trail.",
                 activeGoalId: "G001-micro",
                 aggregateCompletion: {
                     status: "complete",
@@ -1409,6 +1721,67 @@ describe("codex native hook dispatch", () => {
             await rm(cwd, { recursive: true, force: true });
         }
     });
+    it("does not repeat Stop block when the last autoresearch-goal completion attempt reported objective mismatch", async () => {
+        const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-autoresearch-mismatch-reported-stop-"));
+        try {
+            await writeJson(join(cwd, ".omx", "goals", "autoresearch", "mismatched-mission", "mission.json"), {
+                version: 1,
+                workflow: "autoresearch-goal",
+                slug: "mismatched-mission",
+                topic: "Passing research bound to another Codex goal",
+                status: "passed",
+            });
+            await writeJson(join(cwd, ".omx", "goals", "autoresearch", "mismatched-mission", "completion.json"), {
+                verdict: "pass",
+                passed: true,
+            });
+            const result = await dispatchCodexNativeHook({
+                hook_event_name: "Stop",
+                cwd,
+                session_id: "sess-autoresearch-mismatch-reported-stop",
+                thread_id: "thread-autoresearch-mismatch-reported-stop",
+                last_assistant_message: [
+                    "I called get_goal and ran omx autoresearch-goal complete --slug mismatched-mission --codex-goal-json /tmp/snapshot.json.",
+                    "The autoresearch-goal completion failed with Codex goal objective mismatch, so I will not repeat the same complete command blindly in this thread.",
+                ].join("\n"),
+            }, { cwd });
+            assert.notEqual(result.outputJson?.decision, "block");
+            assert.doesNotMatch(JSON.stringify(result.outputJson), /autoresearch-goal complete --slug mismatched-mission/);
+            assert.doesNotMatch(JSON.stringify(result.outputJson), /get_goal snapshot reconciliation/);
+        }
+        finally {
+            await rm(cwd, { recursive: true, force: true });
+        }
+    });
+    it("still blocks later autoresearch-goal completion claims after an objective mismatch if no mismatch is reported in the final answer", async () => {
+        const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-autoresearch-mismatch-later-retry-stop-"));
+        try {
+            await writeJson(join(cwd, ".omx", "goals", "autoresearch", "retryable-mission", "mission.json"), {
+                version: 1,
+                workflow: "autoresearch-goal",
+                slug: "retryable-mission",
+                topic: "Passing research that can still retry with the correct snapshot",
+                status: "passed",
+            });
+            await writeJson(join(cwd, ".omx", "goals", "autoresearch", "retryable-mission", "completion.json"), {
+                verdict: "pass",
+                passed: true,
+            });
+            const result = await dispatchCodexNativeHook({
+                hook_event_name: "Stop",
+                cwd,
+                session_id: "sess-autoresearch-mismatch-later-retry-stop",
+                thread_id: "thread-autoresearch-mismatch-later-retry-stop",
+                last_assistant_message: "Autoresearch goal complete; next call update_goal({status: \"complete\"}).",
+            }, { cwd });
+            assert.equal(result.outputJson?.decision, "block");
+            assert.match(JSON.stringify(result.outputJson), /get_goal snapshot reconciliation/);
+            assert.match(JSON.stringify(result.outputJson), /omx autoresearch-goal complete --slug retryable-mission/);
+        }
+        finally {
+            await rm(cwd, { recursive: true, force: true });
+        }
+    });
     it("treats workflow keywords in native subagent prompt text as literal delegation text", async () => {
         const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-subagent-keyword-literal-"));
         try {
@@ -1512,49 +1885,205 @@ describe("codex native hook dispatch", () => {
             assert.match(message, /get_goal/);
             assert.match(message, /create_goal/);
             assert.match(message, /update_goal/);
+            assert.match(message, /does not call `\/goal clear`/);
+            assert.match(message, /multiple sequential ultragoal runs/);
             assert.equal(existsSync(join(cwd, ".omx", "state", "sessions", "sess-ultragoal-1", "ultragoal-state.json")), false);
         }
         finally {
             await rm(cwd, { recursive: true, force: true });
         }
     });
-    it("normalizes the Korean keyboard typo for ulw during UserPromptSubmit activation", async () => {
-        const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-ulw-ko-"));
+    it("applies only explicit structured UserPromptSubmit ultragoal steering directives", async () => {
+        const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-ultragoal-steer-"));
         try {
-            await mkdir(join(cwd, ".omx", "state"), { recursive: true });
+            await createUltragoalPlan(cwd, {
+                brief: "G002-cli-and-prompt-submit-bridge .omx/ultragoal hook steering fixture",
+                goals: [{ title: "First", objective: "Complete first milestone with tests." }],
+            });
+            const prose = await dispatchCodexNativeHook({
+                hook_event_name: "UserPromptSubmit",
+                cwd,
+                session_id: "sess-ultragoal-steer-1",
+                prompt: "Please add a subgoal for docs later; this is normal prose, not a directive.",
+            }, { cwd });
+            assert.equal(prose.outputJson, null);
+            assert.equal((await readUltragoalPlan(cwd)).goals.length, 1);
+            const jsonExample = await dispatchCodexNativeHook({
+                hook_event_name: "UserPromptSubmit",
+                cwd,
+                session_id: "sess-ultragoal-steer-1",
+                prompt: `Here is an inert example:\n\`\`\`json\n${JSON.stringify({
+                    kind: "add_subgoal",
+                    source: "user_prompt_submit",
+                    evidence: "Example JSON should not mutate .omx/ultragoal.",
+                    rationale: "Only explicit steering fences or labels are executable.",
+                    title: "Inert JSON example",
+                    objective: "This example must not be added.",
+                })}\n\`\`\``,
+            }, { cwd });
+            assert.equal(jsonExample.outputJson, null);
+            assert.equal((await readUltragoalPlan(cwd)).goals.length, 1);
             const result = await dispatchCodexNativeHook({
                 hook_event_name: "UserPromptSubmit",
                 cwd,
-                session_id: "sess-ulw-ko",
-                thread_id: "thread-ulw-ko",
-                turn_id: "turn-ulw-ko",
-                prompt: "ㅕㅣㅈ로 병렬 처리해줘",
+                session_id: "sess-ultragoal-steer-1",
+                prompt: `OMX_ULTRAGOAL_STEER: ${JSON.stringify({
+                    kind: "add_subgoal",
+                    source: "user_prompt_submit",
+                    evidence: "Prompt-submit supplied a structured .omx/ultragoal directive for G002-cli-and-prompt-submit-bridge.",
+                    rationale: "Add bounded hook regression work while preserving all completion gates.",
+                    title: "Prompt bridge regression",
+                    objective: "Verify UserPromptSubmit bounded steering bridge with tests.",
+                })}`,
             }, { cwd });
-            assert.equal(result.omxEventName, "keyword-detector");
-            assert.equal(result.skillState?.skill, "ultrawork");
-            assert.equal(result.skillState?.keyword, "ulw");
-            const additionalContext = String(result.outputJson?.hookSpecificOutput?.additionalContext || "");
-            assert.match(additionalContext, /workflow keyword \"ulw\" -> ultrawork/);
-            assert.equal(existsSync(join(cwd, ".omx", "state", "sessions", "sess-ulw-ko", "ultrawork-state.json")), true);
+            const message = String(result.outputJson?.hookSpecificOutput?.additionalContext || "");
+            assert.match(message, /bounded \.omx\/ultragoal steering/);
+            assert.match(message, /G002-cli-and-prompt-submit-bridge/);
+            assert.match(message, /accepted/);
+            const plan = await readUltragoalPlan(cwd);
+            assert.equal(plan.goals.length, 2);
+            assert.equal(plan.goals[1]?.title, "Prompt bridge regression");
         }
         finally {
             await rm(cwd, { recursive: true, force: true });
         }
     });
-    it("adds ultrawork-specific activation guidance only for true ultrawork workflow activation", async () => {
-        const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-ultrawork-routing-"));
+    it("does not apply UserPromptSubmit ultragoal steering from native subagent prompts", async () => {
+        const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-ultragoal-steer-subagent-"));
         try {
-            await mkdir(join(cwd, ".omx", "state"), { recursive: true });
-            const result = await dispatchCodexNativeHook({
-                hook_event_name: "UserPromptSubmit",
-                cwd,
-                session_id: "sess-ultrawork-msg",
-                thread_id: "thread-ultrawork-msg",
-                turn_id: "turn-ultrawork-msg",
-                prompt: "$ultrawork fan out the regression checks",
-            }, { cwd });
-            assert.equal(result.omxEventName, "keyword-detector");
-            assert.equal(result.skillState?.skill, "ultrawork");
+            await createUltragoalPlan(cwd, {
+                brief: "G002-cli-and-prompt-submit-bridge .omx/ultragoal subagent steering fixture",
+                goals: [{ title: "First", objective: "Complete first milestone with tests." }],
+            });
+            const stateDir = join(cwd, ".omx", "state");
+            const canonicalSessionId = "sess-ultragoal-parent";
+            const leaderNativeSessionId = "native-ultragoal-parent";
+            const childNativeSessionId = "native-ultragoal-child";
+            const nowIso = new Date().toISOString();
+            await writeJson(join(stateDir, "session.json"), {
+                session_id: canonicalSessionId,
+                native_session_id: leaderNativeSessionId,
+            });
+            await writeJson(join(stateDir, "subagent-tracking.json"), {
+                schemaVersion: 1,
+                sessions: {
+                    [canonicalSessionId]: {
+                        session_id: canonicalSessionId,
+                        leader_thread_id: leaderNativeSessionId,
+                        updated_at: nowIso,
+                        threads: {
+                            [leaderNativeSessionId]: {
+                                thread_id: leaderNativeSessionId,
+                                kind: "leader",
+                                first_seen_at: nowIso,
+                                last_seen_at: nowIso,
+                                turn_count: 1,
+                            },
+                            [childNativeSessionId]: {
+                                thread_id: childNativeSessionId,
+                                kind: "subagent",
+                                first_seen_at: nowIso,
+                                last_seen_at: nowIso,
+                                turn_count: 1,
+                                mode: "architect",
+                            },
+                        },
+                    },
+                },
+            });
+            const result = await dispatchCodexNativeHook({
+                hook_event_name: "UserPromptSubmit",
+                cwd,
+                session_id: childNativeSessionId,
+                thread_id: childNativeSessionId,
+                turn_id: "turn-ultragoal-child-1",
+                prompt: `OMX_ULTRAGOAL_STEER: ${JSON.stringify({
+                    kind: "add_subgoal",
+                    source: "user_prompt_submit",
+                    evidence: "Subagent prompt text must be literal delegated context.",
+                    rationale: "Subagent prompts should not mutate the parent .omx/ultragoal ledger.",
+                    title: "Subagent should not add this",
+                    objective: "This must remain literal prompt text.",
+                })}`,
+            }, { cwd });
+            assert.equal(result.outputJson, null);
+            const plan = await readUltragoalPlan(cwd);
+            assert.equal(plan.goals.length, 1);
+            const ledger = await readFile(join(cwd, ".omx/ultragoal/ledger.jsonl"), "utf-8");
+            assert.equal((ledger.match(/"event":"steering_accepted"/g) ?? []).length, 0);
+            assert.equal((ledger.match(/"event":"steering_rejected"/g) ?? []).length, 0);
+        }
+        finally {
+            await rm(cwd, { recursive: true, force: true });
+        }
+    });
+    it("dedupes repeated UserPromptSubmit ultragoal steering directives by prompt signature", async () => {
+        const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-ultragoal-steer-dedupe-"));
+        try {
+            await createUltragoalPlan(cwd, {
+                brief: "G002-cli-and-prompt-submit-bridge .omx/ultragoal dedupe fixture",
+                goals: [{ title: "First", objective: "Complete first milestone with tests." }],
+            });
+            const prompt = `\`\`\`omx-ultragoal-steer
+${JSON.stringify({
+                kind: "add_subgoal",
+                source: "user_prompt_submit",
+                evidence: "Structured prompt-submit directive adds exactly one deduped goal.",
+                rationale: "Use idempotent bridge semantics for repeated hook delivery.",
+                title: "Deduped bridge regression",
+                objective: "Verify repeated UserPromptSubmit steering does not duplicate goals.",
+            })}
+\`\`\``;
+            await dispatchCodexNativeHook({ hook_event_name: "UserPromptSubmit", cwd, session_id: "sess-dedupe", prompt }, { cwd });
+            const second = await dispatchCodexNativeHook({ hook_event_name: "UserPromptSubmit", cwd, session_id: "sess-dedupe", prompt }, { cwd });
+            const message = String(second.outputJson?.hookSpecificOutput?.additionalContext || "");
+            assert.match(message, /deduped/);
+            const plan = await readUltragoalPlan(cwd);
+            assert.equal(plan.goals.filter((goal) => goal.title === "Deduped bridge regression").length, 1);
+            const ledger = await readFile(join(cwd, ".omx/ultragoal/ledger.jsonl"), "utf-8");
+            assert.equal((ledger.match(/"event":"steering_accepted"/g) ?? []).length, 1);
+        }
+        finally {
+            await rm(cwd, { recursive: true, force: true });
+        }
+    });
+    it("normalizes the Korean keyboard typo for ulw during UserPromptSubmit activation", async () => {
+        const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-ulw-ko-"));
+        try {
+            await mkdir(join(cwd, ".omx", "state"), { recursive: true });
+            const result = await dispatchCodexNativeHook({
+                hook_event_name: "UserPromptSubmit",
+                cwd,
+                session_id: "sess-ulw-ko",
+                thread_id: "thread-ulw-ko",
+                turn_id: "turn-ulw-ko",
+                prompt: "ㅕㅣㅈ로 병렬 처리해줘",
+            }, { cwd });
+            assert.equal(result.omxEventName, "keyword-detector");
+            assert.equal(result.skillState?.skill, "ultrawork");
+            assert.equal(result.skillState?.keyword, "ulw");
+            const additionalContext = String(result.outputJson?.hookSpecificOutput?.additionalContext || "");
+            assert.match(additionalContext, /workflow keyword \"ulw\" -> ultrawork/);
+            assert.equal(existsSync(join(cwd, ".omx", "state", "sessions", "sess-ulw-ko", "ultrawork-state.json")), true);
+        }
+        finally {
+            await rm(cwd, { recursive: true, force: true });
+        }
+    });
+    it("adds ultrawork-specific activation guidance only for true ultrawork workflow activation", async () => {
+        const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-ultrawork-routing-"));
+        try {
+            await mkdir(join(cwd, ".omx", "state"), { recursive: true });
+            const result = await dispatchCodexNativeHook({
+                hook_event_name: "UserPromptSubmit",
+                cwd,
+                session_id: "sess-ultrawork-msg",
+                thread_id: "thread-ultrawork-msg",
+                turn_id: "turn-ultrawork-msg",
+                prompt: "$ultrawork fan out the regression checks",
+            }, { cwd });
+            assert.equal(result.omxEventName, "keyword-detector");
+            assert.equal(result.skillState?.skill, "ultrawork");
             const message = String(result.outputJson?.hookSpecificOutput?.additionalContext || "");
             assert.match(message, /\$ultrawork" -> ultrawork/);
             assert.match(message, /ground the task before editing/i);
@@ -2370,6 +2899,44 @@ exit 0
             await rm(cwd, { recursive: true, force: true });
         }
     });
+    it("does not block Bash commands that only mention omx question in quoted arguments", async () => {
+        const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-pretool-question-quoted-mention-"));
+        try {
+            const result = await dispatchCodexNativeHook({
+                hook_event_name: "PreToolUse",
+                cwd,
+                tool_name: "Bash",
+                tool_use_id: "tool-question-quoted-mention",
+                tool_input: {
+                    command: `omx ultragoal create-goals --brief "Deep interview says omx question failed in tmux"`,
+                },
+            }, { cwd });
+            assert.equal(result.omxEventName, "pre-tool-use");
+            assert.equal(result.outputJson, null);
+        }
+        finally {
+            await rm(cwd, { recursive: true, force: true });
+        }
+    });
+    it("does not block Bash heredocs that only document omx question text", async () => {
+        const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-pretool-question-heredoc-mention-"));
+        try {
+            const result = await dispatchCodexNativeHook({
+                hook_event_name: "PreToolUse",
+                cwd,
+                tool_name: "Bash",
+                tool_use_id: "tool-question-heredoc-mention",
+                tool_input: {
+                    command: `cat > issue-notes.md <<'EOF'\nomx question failed in the attached tmux pane\nEOF`,
+                },
+            }, { cwd });
+            assert.equal(result.omxEventName, "pre-tool-use");
+            assert.equal(result.outputJson, null);
+        }
+        finally {
+            await rm(cwd, { recursive: true, force: true });
+        }
+    });
     it("allows Bash omx question when the command preserves the leader-pane return hint", async () => {
         const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-pretool-question-allow-"));
         try {
@@ -3010,7 +3577,7 @@ exit 0
                 cwd,
                 tool_name: "Bash",
                 tool_use_id: "tool-slop-git-priority",
-                tool_input: { command: 'git commit -m "quick hack fallback if it fails"' },
+                tool_input: { command: 'OMX_LORE_COMMIT_GUARD=1 git commit -m "quick hack fallback if it fails"' },
             }, { cwd });
             assert.equal(result.omxEventName, "pre-tool-use");
             assert.equal(result.outputJson?.decision, "block");
@@ -3029,7 +3596,7 @@ exit 0
                 cwd,
                 tool_name: "Bash",
                 tool_use_id: "tool-git-commit-invalid",
-                tool_input: { command: 'git commit -m "fix tests"' },
+                tool_input: { command: 'OMX_LORE_COMMIT_GUARD=1 git commit -m "fix tests"' },
             }, { cwd });
             assert.equal(result.omxEventName, "pre-tool-use");
             assert.deepEqual(result.outputJson, {
@@ -3054,11 +3621,35 @@ exit 0
             await rm(cwd, { recursive: true, force: true });
         }
     });
-    it("allows non-Lore git commit messages when the Lore commit guard is explicitly disabled", async () => {
+    it("blocks PreToolUse git commit when process env explicitly enables the Lore commit guard", async () => {
+        const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-pretool-git-commit-lore-env-enabled-"));
+        const original = process.env.OMX_LORE_COMMIT_GUARD;
+        try {
+            process.env.OMX_LORE_COMMIT_GUARD = "1";
+            const result = await dispatchCodexNativeHook({
+                hook_event_name: "PreToolUse",
+                cwd,
+                tool_name: "Bash",
+                tool_use_id: "tool-git-commit-lore-env-enabled",
+                tool_input: { command: 'git commit -m "fix tests"' },
+            }, { cwd });
+            assert.equal(result.omxEventName, "pre-tool-use");
+            assert.equal(result.outputJson?.decision, "block");
+            assert.match(JSON.stringify(result.outputJson), /Lore protocol/);
+        }
+        finally {
+            if (original === undefined)
+                delete process.env.OMX_LORE_COMMIT_GUARD;
+            else
+                process.env.OMX_LORE_COMMIT_GUARD = original;
+            await rm(cwd, { recursive: true, force: true });
+        }
+    });
+    it("allows non-Lore git commit messages when the Lore commit guard is disabled by default", async () => {
         const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-pretool-git-commit-lore-disabled-"));
         const original = process.env.OMX_LORE_COMMIT_GUARD;
         try {
-            process.env.OMX_LORE_COMMIT_GUARD = "0";
+            delete process.env.OMX_LORE_COMMIT_GUARD;
             const result = await dispatchCodexNativeHook({
                 hook_event_name: "PreToolUse",
                 cwd,
@@ -3077,6 +3668,60 @@ exit 0
             await rm(cwd, { recursive: true, force: true });
         }
     });
+    it("blocks non-Lore git commit messages when the Lore commit guard is enabled in CODEX_HOME config.toml", async () => {
+        await withLoreGuardConfig("1", "config-enabled", async (cwd) => {
+            const result = await dispatchCodexNativeHook({
+                hook_event_name: "PreToolUse",
+                cwd,
+                tool_name: "Bash",
+                tool_use_id: "tool-git-commit-lore-config-enabled",
+                tool_input: { command: 'git commit -m "fix: conventional"' },
+            }, { cwd });
+            assert.equal(result.omxEventName, "pre-tool-use");
+            assert.equal(result.outputJson?.decision, "block");
+            assert.match(JSON.stringify(result.outputJson), /Lore protocol/);
+        });
+    });
+    it("allows non-Lore git commit messages when the Lore commit guard is disabled in CODEX_HOME config.toml", async () => {
+        await withLoreGuardConfig("0", "config-disabled", async (cwd) => {
+            const result = await dispatchCodexNativeHook({
+                hook_event_name: "PreToolUse",
+                cwd,
+                tool_name: "Bash",
+                tool_use_id: "tool-git-commit-lore-config-disabled",
+                tool_input: { command: 'git commit -m "fix: use conventional commit"' },
+            }, { cwd });
+            assert.equal(result.omxEventName, "pre-tool-use");
+            assert.equal(result.outputJson, null);
+        });
+    });
+    it("lets inline Lore commit guard values override a disabled CODEX_HOME config.toml", async () => {
+        await withLoreGuardConfig("0", "config-inline-enabled", async (cwd) => {
+            const result = await dispatchCodexNativeHook({
+                hook_event_name: "PreToolUse",
+                cwd,
+                tool_name: "Bash",
+                tool_use_id: "tool-git-commit-lore-config-inline-enabled",
+                tool_input: { command: 'OMX_LORE_COMMIT_GUARD=1 git commit -m "fix: conventional"' },
+            }, { cwd });
+            assert.equal(result.omxEventName, "pre-tool-use");
+            assert.equal(result.outputJson?.decision, "block");
+            assert.match(JSON.stringify(result.outputJson), /Lore protocol/);
+        });
+    });
+    it("restores default-off Lore guard when env -u removes a disabled CODEX_HOME config source", async () => {
+        await withLoreGuardConfig("0", "config-codex-home-unset", async (cwd) => {
+            const result = await dispatchCodexNativeHook({
+                hook_event_name: "PreToolUse",
+                cwd,
+                tool_name: "Bash",
+                tool_use_id: "tool-git-commit-lore-config-codex-home-unset",
+                tool_input: { command: 'env -u CODEX_HOME git commit -m "fix: conventional"' },
+            }, { cwd });
+            assert.equal(result.omxEventName, "pre-tool-use");
+            assert.equal(result.outputJson, null);
+        });
+    });
     it("allows non-Lore git commit messages when the Lore commit guard is disabled inline", async () => {
         const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-pretool-git-commit-lore-inline-disabled-"));
         try {
@@ -3094,7 +3739,30 @@ exit 0
             await rm(cwd, { recursive: true, force: true });
         }
     });
-    it("does not treat newline-separated Lore guard assignment as inline git commit env", async () => {
+    it("allows inline disabled guard to override an enabled process env", async () => {
+        const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-pretool-git-commit-lore-inline-override-disabled-"));
+        const original = process.env.OMX_LORE_COMMIT_GUARD;
+        try {
+            process.env.OMX_LORE_COMMIT_GUARD = "1";
+            const result = await dispatchCodexNativeHook({
+                hook_event_name: "PreToolUse",
+                cwd,
+                tool_name: "Bash",
+                tool_use_id: "tool-git-commit-lore-inline-override-disabled",
+                tool_input: { command: 'OMX_LORE_COMMIT_GUARD=0 git commit -m "fix: conventional"' },
+            }, { cwd });
+            assert.equal(result.omxEventName, "pre-tool-use");
+            assert.equal(result.outputJson, null);
+        }
+        finally {
+            if (original === undefined)
+                delete process.env.OMX_LORE_COMMIT_GUARD;
+            else
+                process.env.OMX_LORE_COMMIT_GUARD = original;
+            await rm(cwd, { recursive: true, force: true });
+        }
+    });
+    it("does not treat newline-separated Lore guard assignment as inline git commit opt-in", async () => {
         const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-pretool-git-commit-lore-newline-assignment-"));
         try {
             const result = await dispatchCodexNativeHook({
@@ -3102,21 +3770,33 @@ exit 0
                 cwd,
                 tool_name: "Bash",
                 tool_use_id: "tool-git-commit-lore-newline-assignment",
-                tool_input: { command: 'OMX_LORE_COMMIT_GUARD=0\ngit commit -m "fix: conventional"' },
+                tool_input: { command: 'OMX_LORE_COMMIT_GUARD=1\ngit commit -m "fix: conventional"' },
             }, { cwd });
             assert.equal(result.omxEventName, "pre-tool-use");
-            assert.equal(result.outputJson?.decision, "block");
-            assert.match(JSON.stringify(result.outputJson), /Lore protocol/);
+            assert.equal(result.outputJson, null);
         }
         finally {
             await rm(cwd, { recursive: true, force: true });
         }
     });
-    it("restores default-on Lore guard when env -u unsets a disabled process env", async () => {
+    it("restores default-off Lore guard when env -u unsets a config.toml fallback", async () => {
+        await withLoreGuardConfig("1", "config-env-unset", async (cwd) => {
+            const result = await dispatchCodexNativeHook({
+                hook_event_name: "PreToolUse",
+                cwd,
+                tool_name: "Bash",
+                tool_use_id: "tool-git-commit-lore-config-env-unset",
+                tool_input: { command: 'env -u OMX_LORE_COMMIT_GUARD git commit -m "fix: conventional"' },
+            }, { cwd });
+            assert.equal(result.omxEventName, "pre-tool-use");
+            assert.equal(result.outputJson, null);
+        });
+    });
+    it("restores default-off Lore guard when env -u unsets an enabled process env", async () => {
         const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-pretool-git-commit-lore-env-unset-"));
         const original = process.env.OMX_LORE_COMMIT_GUARD;
         try {
-            process.env.OMX_LORE_COMMIT_GUARD = "0";
+            process.env.OMX_LORE_COMMIT_GUARD = "1";
             const result = await dispatchCodexNativeHook({
                 hook_event_name: "PreToolUse",
                 cwd,
@@ -3125,8 +3805,7 @@ exit 0
                 tool_input: { command: 'env -u OMX_LORE_COMMIT_GUARD git commit -m "fix: conventional"' },
             }, { cwd });
             assert.equal(result.omxEventName, "pre-tool-use");
-            assert.equal(result.outputJson?.decision, "block");
-            assert.match(JSON.stringify(result.outputJson), /Lore protocol/);
+            assert.equal(result.outputJson, null);
         }
         finally {
             if (original === undefined)
@@ -3136,11 +3815,11 @@ exit 0
             await rm(cwd, { recursive: true, force: true });
         }
     });
-    it("restores default-on Lore guard when env -i clears a disabled process env", async () => {
+    it("restores default-off Lore guard when env -i clears an enabled process env", async () => {
         const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-pretool-git-commit-lore-env-ignore-"));
         const original = process.env.OMX_LORE_COMMIT_GUARD;
         try {
-            process.env.OMX_LORE_COMMIT_GUARD = "0";
+            process.env.OMX_LORE_COMMIT_GUARD = "1";
             const result = await dispatchCodexNativeHook({
                 hook_event_name: "PreToolUse",
                 cwd,
@@ -3149,8 +3828,7 @@ exit 0
                 tool_input: { command: 'env -i PATH=/usr/bin git commit -m "fix: conventional"' },
             }, { cwd });
             assert.equal(result.omxEventName, "pre-tool-use");
-            assert.equal(result.outputJson?.decision, "block");
-            assert.match(JSON.stringify(result.outputJson), /Lore protocol/);
+            assert.equal(result.outputJson, null);
         }
         finally {
             if (original === undefined)
@@ -3160,7 +3838,7 @@ exit 0
             await rm(cwd, { recursive: true, force: true });
         }
     });
-    it("keeps Lore commit enforcement enabled for unknown inline guard values", async () => {
+    it("keeps Lore commit enforcement disabled for unknown inline guard values", async () => {
         const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-pretool-git-commit-lore-inline-unknown-"));
         try {
             const result = await dispatchCodexNativeHook({
@@ -3171,8 +3849,7 @@ exit 0
                 tool_input: { command: 'OMX_LORE_COMMIT_GUARD=maybe git commit -m "fix: conventional"' },
             }, { cwd });
             assert.equal(result.omxEventName, "pre-tool-use");
-            assert.equal(result.outputJson?.decision, "block");
-            assert.match(JSON.stringify(result.outputJson), /Lore protocol/);
+            assert.equal(result.outputJson, null);
         }
         finally {
             await rm(cwd, { recursive: true, force: true });
@@ -3201,7 +3878,7 @@ exit 0
             await rm(cwd, { recursive: true, force: true });
         }
     });
-    it("keeps Lore commit enforcement enabled for unknown guard values", async () => {
+    it("keeps Lore commit enforcement disabled for unknown guard values", async () => {
         const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-pretool-git-commit-lore-unknown-"));
         const original = process.env.OMX_LORE_COMMIT_GUARD;
         try {
@@ -3214,8 +3891,7 @@ exit 0
                 tool_input: { command: 'git commit -m "fix tests"' },
             }, { cwd });
             assert.equal(result.omxEventName, "pre-tool-use");
-            assert.equal(result.outputJson?.decision, "block");
-            assert.match(JSON.stringify(result.outputJson), /Lore protocol/);
+            assert.equal(result.outputJson, null);
         }
         finally {
             if (original === undefined)
@@ -3308,7 +3984,7 @@ exit 0
                 cwd,
                 tool_name: "Bash",
                 tool_use_id: "tool-git-commit-env-invalid",
-                tool_input: { command: 'HUSKY=0 git commit -m "fix tests"' },
+                tool_input: { command: 'OMX_LORE_COMMIT_GUARD=1 HUSKY=0 git commit -m "fix tests"' },
             }, { cwd });
             assert.equal(result.omxEventName, "pre-tool-use");
             assert.deepEqual(result.outputJson, {
@@ -3338,7 +4014,7 @@ exit 0
                 cwd,
                 tool_name: "Bash",
                 tool_use_id: "tool-git-commit-option-invalid",
-                tool_input: { command: 'git -c core.editor=true commit -m "fix tests"' },
+                tool_input: { command: 'OMX_LORE_COMMIT_GUARD=1 git -c core.editor=true commit -m "fix tests"' },
             }, { cwd });
             assert.equal(result.omxEventName, "pre-tool-use");
             assert.deepEqual(result.outputJson, {
@@ -3368,7 +4044,7 @@ exit 0
                 cwd,
                 tool_name: "Bash",
                 tool_use_id: "tool-git-exe-commit-env-wrapper-invalid",
-                tool_input: { command: 'env git.exe commit -m "fix tests"' },
+                tool_input: { command: 'env OMX_LORE_COMMIT_GUARD=1 git.exe commit -m "fix tests"' },
             }, { cwd });
             assert.equal(result.omxEventName, "pre-tool-use");
             assert.deepEqual(result.outputJson, {
@@ -3398,7 +4074,7 @@ exit 0
                 cwd,
                 tool_name: "Bash",
                 tool_use_id: "tool-git-exe-commit-invalid",
-                tool_input: { command: 'git.exe commit -m "fix tests"' },
+                tool_input: { command: 'OMX_LORE_COMMIT_GUARD=1 git.exe commit -m "fix tests"' },
             }, { cwd });
             assert.equal(result.omxEventName, "pre-tool-use");
             assert.deepEqual(result.outputJson, {
@@ -3428,7 +4104,7 @@ exit 0
                 cwd,
                 tool_name: "Bash",
                 tool_use_id: "tool-git-exe-commit-env-flag-wrapper-invalid",
-                tool_input: { command: 'env -i PATH=/usr/bin git.exe commit -m "fix tests"' },
+                tool_input: { command: 'env -i PATH=/usr/bin OMX_LORE_COMMIT_GUARD=1 git.exe commit -m "fix tests"' },
             }, { cwd });
             assert.equal(result.omxEventName, "pre-tool-use");
             assert.deepEqual(result.outputJson, {
@@ -3458,7 +4134,7 @@ exit 0
                 cwd,
                 tool_name: "Bash",
                 tool_use_id: "tool-git-exe-commit-env-value-wrapper-invalid",
-                tool_input: { command: 'env -u FOO git.exe commit -m "fix tests"' },
+                tool_input: { command: 'env -u FOO OMX_LORE_COMMIT_GUARD=1 git.exe commit -m "fix tests"' },
             }, { cwd });
             assert.equal(result.omxEventName, "pre-tool-use");
             assert.deepEqual(result.outputJson, {
@@ -3488,7 +4164,7 @@ exit 0
                 cwd,
                 tool_name: "Bash",
                 tool_use_id: "tool-git-exe-commit-windows-path-invalid",
-                tool_input: { command: '"C:/Program Files/Git/cmd/git.exe" commit -m "fix tests"' },
+                tool_input: { command: 'OMX_LORE_COMMIT_GUARD=1 "C:/Program Files/Git/cmd/git.exe" commit -m "fix tests"' },
             }, { cwd });
             assert.equal(result.omxEventName, "pre-tool-use");
             assert.deepEqual(result.outputJson, {
@@ -3518,7 +4194,7 @@ exit 0
                 cwd,
                 tool_name: "Bash",
                 tool_use_id: "tool-git-exe-commit-windows-backslash-path-invalid",
-                tool_input: { command: '"C:\\Program Files\\Git\\cmd\\git.exe" commit -m "fix tests"' },
+                tool_input: { command: 'OMX_LORE_COMMIT_GUARD=1 "C:\\Program Files\\Git\\cmd\\git.exe" commit -m "fix tests"' },
             }, { cwd });
             assert.equal(result.omxEventName, "pre-tool-use");
             assert.deepEqual(result.outputJson, {
@@ -3548,7 +4224,7 @@ exit 0
                 cwd,
                 tool_name: "Bash",
                 tool_use_id: "tool-git-commit-path-invalid",
-                tool_input: { command: '/usr/bin/git commit -m "fix tests"' },
+                tool_input: { command: 'OMX_LORE_COMMIT_GUARD=1 /usr/bin/git commit -m "fix tests"' },
             }, { cwd });
             assert.equal(result.omxEventName, "pre-tool-use");
             assert.deepEqual(result.outputJson, {
@@ -3578,7 +4254,7 @@ exit 0
                 cwd,
                 tool_name: "Bash",
                 tool_use_id: "tool-git-commit-file",
-                tool_input: { command: "git commit -F .git/COMMIT_EDITMSG" },
+                tool_input: { command: "OMX_LORE_COMMIT_GUARD=1 git commit -F .git/COMMIT_EDITMSG" },
             }, { cwd });
             assert.equal(result.omxEventName, "pre-tool-use");
             assert.deepEqual(result.outputJson, {
@@ -3607,7 +4283,7 @@ exit 0
                 tool_use_id: "tool-git-commit-missing-omx-coauthor",
                 tool_input: {
                     command: [
-                        'git commit',
+                        'OMX_LORE_COMMIT_GUARD=1 git commit',
                         '-m "Prevent invalid history from bypassing Lore enforcement"',
                         '-m "The native pre-tool-use hook now blocks inline git commit messages that skip Lore trailers or the required OmX co-author trailer."',
                         '-m "Constraint: Native PreToolUse can only inspect the Bash command text"',
@@ -3642,7 +4318,7 @@ exit 0
                 tool_use_id: "tool-git-commit-valid",
                 tool_input: {
                     command: [
-                        'git commit',
+                        'OMX_LORE_COMMIT_GUARD=1 git commit',
                         '-m "Prevent invalid history from bypassing Lore enforcement"',
                         '-m "The native pre-tool-use hook now blocks inline git commit messages that skip Lore trailers or the required OmX co-author trailer."',
                         '-m "Constraint: Native PreToolUse can only inspect the Bash command text"',
@@ -3668,7 +4344,7 @@ exit 0
                 tool_use_id: "tool-git-commit-compact-coauthor",
                 tool_input: {
                     command: [
-                        'git commit',
+                        'OMX_LORE_COMMIT_GUARD=1 git commit',
                         '-m "Launch lvisai.xyz intro site"',
                         '-m "Co-authored-by: OmX <omx@oh-my-codex.dev>"',
                     ].join(" "),
@@ -3691,7 +4367,7 @@ exit 0
                 tool_use_id: "tool-git-commit-compact-trailers",
                 tool_input: {
                     command: [
-                        'git commit',
+                        'OMX_LORE_COMMIT_GUARD=1 git commit',
                         '-m "Launch lvisai.xyz intro site"',
                         '-m "Constraint: Native PreToolUse can only inspect inline Bash command text\nTested: node --test dist/scripts/__tests__/codex-native-hook.test.js\n\nCo-authored-by: OmX <omx@oh-my-codex.dev>"',
                     ].join(" "),
@@ -3714,7 +4390,7 @@ exit 0
                 tool_use_id: "tool-git-commit-compact-no-separator",
                 tool_input: {
                     command: [
-                        'git commit',
+                        'OMX_LORE_COMMIT_GUARD=1 git commit',
                         '--message="Launch lvisai.xyz intro site\nCo-authored-by: OmX <omx@oh-my-codex.dev>"',
                     ].join(" "),
                 },
@@ -4052,41 +4728,36 @@ exit 0
             await rm(cwd, { recursive: true, force: true });
         }
     });
-    it("returns PostToolUse MCP transport fallback guidance for clear MCP transport death", async () => {
-        const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-posttool-mcp-transport-"));
+    it("does not treat non-MCP source output containing detector constants as MCP transport death", async () => {
+        const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-posttool-read-mcp-source-"));
         try {
             const result = await dispatchCodexNativeHook({
                 hook_event_name: "PostToolUse",
                 cwd,
-                tool_name: "mcp__omx_state__state_write",
-                tool_use_id: "tool-mcp-transport",
-                tool_input: { mode: "team", active: true },
-                tool_response: "{\"error\":\"MCP transport closed\",\"details\":\"stdio pipe closed before response\"}",
+                tool_name: "Read",
+                tool_use_id: "tool-read-mcp-source",
+                tool_input: { file_path: "src/scripts/codex-native-pre-post.ts" },
+                tool_response: "const MCP_TRANSPORT_FAILURE_PATTERNS = [/transport closed/i, /server disconnected/i];\nconst context = /\\bmcp\\b/i;",
             }, { cwd });
             assert.equal(result.omxEventName, "post-tool-use");
-            const output = result.outputJson;
-            assert.equal(output?.decision, "block");
-            assert.equal(output?.reason, "The MCP tool appears to have lost its transport/server connection. Preserve state, debug the transport failure, and use OMX CLI/file-backed fallbacks instead of retrying blindly.");
-            const additionalContext = String(output?.hookSpecificOutput?.additionalContext ?? "");
-            assert.match(additionalContext, /omx state write --input/);
-            assert.match(additionalContext, /plain Node stdio processes/i);
-            assert.match(additionalContext, /read-stall-state/);
-            assert.match(additionalContext, /OMX_MCP_TRANSPORT_DEBUG=1/);
+            assert.equal(result.outputJson, null);
         }
         finally {
             await rm(cwd, { recursive: true, force: true });
         }
     });
-    it("does not classify non-transport MCP failures as transport death", async () => {
-        const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-posttool-mcp-nontransport-"));
+    it("does not treat non-MCP docs stdout mentioning closed MCP transport as transport death", async () => {
+        const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-posttool-docs-mcp-log-"));
         try {
             const result = await dispatchCodexNativeHook({
                 hook_event_name: "PostToolUse",
                 cwd,
-                tool_name: "mcp__omx_state__state_write",
-                tool_use_id: "tool-mcp-nontransport",
-                tool_input: { active: true },
-                tool_response: "{\"error\":\"validation failed\",\"details\":\"mode is required\"}",
+                tool_name: "ShellOutput",
+                tool_use_id: "tool-docs-mcp-log",
+                tool_response: JSON.stringify({
+                    stdout: "Troubleshooting note: MCP transport closed after the server disconnected in an old log.",
+                    stderr: "",
+                }),
             }, { cwd });
             assert.equal(result.omxEventName, "post-tool-use");
             assert.equal(result.outputJson, null);
@@ -4095,9 +4766,90 @@ exit 0
             await rm(cwd, { recursive: true, force: true });
         }
     });
-    it("marks active team state failed on MCP transport death without deleting team state", async () => {
-        const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-team-mcp-transport-"));
-        const previousCwd = process.cwd();
+    it("does not MCP-block non-MCP command output with unrelated stderr and MCP transport stdout", async () => {
+        const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-posttool-nonmcp-mixed-output-"));
+        try {
+            const result = await dispatchCodexNativeHook({
+                hook_event_name: "PostToolUse",
+                cwd,
+                tool_name: "ShellOutput",
+                tool_use_id: "tool-nonmcp-mixed-output",
+                tool_response: JSON.stringify({
+                    stdout: "captured log line: MCP transport closed before response",
+                    stderr: "grep: fixture.txt: No such file or directory",
+                }),
+            }, { cwd });
+            assert.equal(result.omxEventName, "post-tool-use");
+            assert.equal(result.outputJson, null);
+        }
+        finally {
+            await rm(cwd, { recursive: true, force: true });
+        }
+    });
+    it("still blocks MCP-like raw transport failures", async () => {
+        const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-posttool-mcp-raw-transport-"));
+        try {
+            const result = await dispatchCodexNativeHook({
+                hook_event_name: "PostToolUse",
+                cwd,
+                tool_name: "mcp__omx_state__state_write",
+                tool_use_id: "tool-mcp-raw-transport",
+                tool_response: "transport closed after server disconnected",
+            }, { cwd });
+            assert.equal(result.omxEventName, "post-tool-use");
+            assert.equal(result.outputJson?.decision, "block");
+            assert.match(String(result.outputJson?.reason || ""), /lost its transport\/server connection/);
+        }
+        finally {
+            await rm(cwd, { recursive: true, force: true });
+        }
+    });
+    it("returns PostToolUse MCP transport fallback guidance for clear MCP transport death", async () => {
+        const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-posttool-mcp-transport-"));
+        try {
+            const result = await dispatchCodexNativeHook({
+                hook_event_name: "PostToolUse",
+                cwd,
+                tool_name: "mcp__omx_state__state_write",
+                tool_use_id: "tool-mcp-transport",
+                tool_input: { mode: "team", active: true },
+                tool_response: "{\"error\":\"MCP transport closed\",\"details\":\"stdio pipe closed before response\"}",
+            }, { cwd });
+            assert.equal(result.omxEventName, "post-tool-use");
+            const output = result.outputJson;
+            assert.equal(output?.decision, "block");
+            assert.equal(output?.reason, "The MCP tool appears to have lost its transport/server connection. Preserve state, debug the transport failure, and use OMX CLI/file-backed fallbacks instead of retrying blindly.");
+            const additionalContext = String(output?.hookSpecificOutput?.additionalContext ?? "");
+            assert.match(additionalContext, /omx state write --input/);
+            assert.match(additionalContext, /plain Node stdio processes/i);
+            assert.match(additionalContext, /read-stall-state/);
+            assert.match(additionalContext, /OMX_MCP_TRANSPORT_DEBUG=1/);
+        }
+        finally {
+            await rm(cwd, { recursive: true, force: true });
+        }
+    });
+    it("does not classify non-transport MCP failures as transport death", async () => {
+        const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-posttool-mcp-nontransport-"));
+        try {
+            const result = await dispatchCodexNativeHook({
+                hook_event_name: "PostToolUse",
+                cwd,
+                tool_name: "mcp__omx_state__state_write",
+                tool_use_id: "tool-mcp-nontransport",
+                tool_input: { active: true },
+                tool_response: "{\"error\":\"validation failed\",\"details\":\"mode is required\"}",
+            }, { cwd });
+            assert.equal(result.omxEventName, "post-tool-use");
+            assert.equal(result.outputJson, null);
+        }
+        finally {
+            await rm(cwd, { recursive: true, force: true });
+        }
+    });
+    it("marks active team state failed on MCP transport death without deleting team state", async () => {
+        const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-team-mcp-transport-"));
+        const previousCwd = process.cwd();
         try {
             process.chdir(cwd);
             await initTeamState("transport-team", "task", "executor", 1, cwd, undefined, { ...process.env, OMX_SESSION_ID: "sess-transport" });
@@ -4366,6 +5118,51 @@ exit 0
             await rm(cwd, { recursive: true, force: true });
         }
     });
+    it("requires Autopilot code review after a compact-boundary Stop exemption", async () => {
+        const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-stop-autopilot-review-compact-"));
+        try {
+            const stateDir = join(cwd, ".omx", "state");
+            const sessionId = "sess-stop-autopilot-review-compact";
+            await mkdir(join(stateDir, "sessions", sessionId), { recursive: true });
+            await writeJson(join(stateDir, "sessions", sessionId, "autopilot-state.json"), {
+                active: true,
+                mode: "autopilot",
+                current_phase: "code-review",
+                state: {
+                    phase_cycle: ["ralplan", "ralph", "code-review"],
+                    handoff_artifacts: {
+                        ralplan: ".omx/plans/prd-issue-2366.md",
+                        ralph: { verification: ["npm test"] },
+                        code_review: null,
+                    },
+                    review_verdict: null,
+                },
+            });
+            const compactBoundary = await dispatchCodexNativeHook({
+                hook_event_name: "Stop",
+                cwd,
+                session_id: sessionId,
+                stop_reason: "context compact",
+            }, { cwd });
+            const resumedStop = await dispatchCodexNativeHook({
+                hook_event_name: "Stop",
+                cwd,
+                session_id: sessionId,
+            }, { cwd });
+            assert.equal(compactBoundary.omxEventName, "stop");
+            assert.equal(compactBoundary.outputJson, null);
+            assert.equal(resumedStop.omxEventName, "stop");
+            assert.deepEqual(resumedStop.outputJson, {
+                decision: "block",
+                reason: "OMX autopilot is still active (phase: code-review); continue the task and gather fresh verification evidence before stopping.",
+                stopReason: "autopilot_code-review",
+                systemMessage: "OMX autopilot is still active (phase: code-review). Run the required $code-review step before completing or clearing Autopilot state.",
+            });
+        }
+        finally {
+            await rm(cwd, { recursive: true, force: true });
+        }
+    });
     it("suppresses duplicate Autopilot planning Stop replays so stale planning state cannot loop indefinitely", async () => {
         const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-stop-autopilot-planning-replay-"));
         try {
@@ -4402,6 +5199,80 @@ exit 0
             await rm(cwd, { recursive: true, force: true });
         }
     });
+    it("allows Stop when terminal Autopilot run-state shadows stale session ralplan state", async () => {
+        const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-stop-autopilot-terminal-run-state-"));
+        try {
+            const stateDir = join(cwd, ".omx", "state");
+            const sessionId = "sess-stop-autopilot-terminal-run-state";
+            await mkdir(join(stateDir, "sessions", sessionId), { recursive: true });
+            await writeJson(join(stateDir, "sessions", sessionId, "autopilot-state.json"), {
+                active: true,
+                mode: "autopilot",
+                current_phase: "ralplan",
+            });
+            await writeJson(join(stateDir, "sessions", sessionId, "run-state.json"), {
+                version: 1,
+                active: false,
+                mode: "autopilot",
+                outcome: "finish",
+                lifecycle_outcome: "finished",
+                current_phase: "complete",
+                completed_at: "2026-05-20T11:00:00.000Z",
+                updated_at: "2026-05-20T11:00:00.000Z",
+            });
+            const result = await dispatchCodexNativeHook({
+                hook_event_name: "Stop",
+                cwd,
+                session_id: sessionId,
+                thread_id: "thread-stop-autopilot-terminal-run-state",
+                turn_id: "turn-stop-autopilot-terminal-run-state-1",
+                last_assistant_message: "Done. Verification passed.",
+            }, { cwd });
+            assert.equal(result.omxEventName, "stop");
+            assert.equal(result.outputJson, null);
+        }
+        finally {
+            await rm(cwd, { recursive: true, force: true });
+        }
+    });
+    it("still blocks Stop while Autopilot ralplan state is genuinely non-terminal", async () => {
+        const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-stop-autopilot-active-ralplan-"));
+        try {
+            const stateDir = join(cwd, ".omx", "state");
+            const sessionId = "sess-stop-autopilot-active-ralplan";
+            await mkdir(join(stateDir, "sessions", sessionId), { recursive: true });
+            await writeJson(join(stateDir, "sessions", sessionId, "autopilot-state.json"), {
+                active: true,
+                mode: "autopilot",
+                current_phase: "ralplan",
+            });
+            await writeJson(join(stateDir, "sessions", sessionId, "run-state.json"), {
+                version: 1,
+                active: true,
+                mode: "autopilot",
+                outcome: "continue",
+                current_phase: "ralplan",
+                updated_at: "2026-05-20T11:00:00.000Z",
+            });
+            const result = await dispatchCodexNativeHook({
+                hook_event_name: "Stop",
+                cwd,
+                session_id: sessionId,
+                thread_id: "thread-stop-autopilot-active-ralplan",
+                turn_id: "turn-stop-autopilot-active-ralplan-1",
+            }, { cwd });
+            assert.equal(result.omxEventName, "stop");
+            assert.deepEqual(result.outputJson, {
+                decision: "block",
+                reason: "OMX autopilot is still active (phase: ralplan); continue the task and gather fresh verification evidence before stopping.",
+                stopReason: "autopilot_ralplan",
+                systemMessage: "OMX autopilot is still active (phase: ralplan).",
+            });
+        }
+        finally {
+            await rm(cwd, { recursive: true, force: true });
+        }
+    });
     it("does not block Stop from stale root Autopilot planning state when the explicit session has no scoped state", async () => {
         const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-stop-stale-root-autopilot-planning-"));
         try {
@@ -4858,6 +5729,87 @@ exit 0
             await rm(cwd, { recursive: true, force: true });
         }
     });
+    it("queues worker Stop leader nudge with Tab and submit when leader pane is busy", async () => {
+        const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-stop-team-worker-busy-leader-"));
+        const prevTeamWorker = process.env.OMX_TEAM_WORKER;
+        const prevTeamStateRoot = process.env.OMX_TEAM_STATE_ROOT;
+        const prevPath = process.env.PATH;
+        try {
+            await initTeamState("worker-stop-team-busy-leader", "worker stop busy leader", "executor", 1, cwd, undefined, { ...process.env, OMX_SESSION_ID: "sess-stop-team-worker-busy-leader" });
+            const fakeBinDir = join(cwd, "fake-bin");
+            const tmuxLogPath = join(cwd, "tmux.log");
+            await mkdir(fakeBinDir, { recursive: true });
+            await writeFile(join(fakeBinDir, "tmux"), buildWorkerStopFakeTmux(tmuxLogPath, { busyLeader: true }));
+            await chmod(join(fakeBinDir, "tmux"), 0o755);
+            const stateDir = join(cwd, ".omx", "state");
+            const teamDir = join(stateDir, "team", "worker-stop-team-busy-leader");
+            const workerDir = join(teamDir, "workers", "worker-1");
+            await writeJson(join(teamDir, "config.json"), {
+                name: "worker-stop-team-busy-leader",
+                tmux_session: "omx-team-worker-stop",
+                leader_pane_id: "%42",
+                workers: [{ name: "worker-1", index: 1, pane_id: "%10" }],
+            });
+            await writeJson(join(teamDir, "manifest.v2.json"), {
+                name: "worker-stop-team-busy-leader",
+                tmux_session: "omx-team-worker-stop",
+                leader_pane_id: "%42",
+                workers: [{ name: "worker-1", index: 1, pane_id: "%10" }],
+            });
+            await writeJson(join(workerDir, "identity.json"), {
+                name: "worker-1",
+                index: 1,
+                role: "executor",
+                assigned_tasks: ["1"],
+                worktree_path: cwd,
+                team_state_root: stateDir,
+            });
+            await writeJson(join(workerDir, "status.json"), {
+                state: "done",
+                current_task_id: "1",
+                updated_at: new Date().toISOString(),
+            });
+            await writeJson(join(teamDir, "tasks", "task-1.json"), {
+                id: "1",
+                subject: "hook task",
+                description: "finish hook task",
+                status: "completed",
+                owner: "worker-1",
+                created_at: new Date().toISOString(),
+            });
+            process.env.OMX_TEAM_WORKER = "worker-stop-team-busy-leader/worker-1";
+            process.env.OMX_TEAM_STATE_ROOT = stateDir;
+            process.env.PATH = `${fakeBinDir}:${prevPath || ""}`;
+            const result = await dispatchCodexNativeHook({
+                hook_event_name: "Stop",
+                cwd,
+                session_id: "sess-stop-team-worker-busy-leader",
+            }, { cwd });
+            assert.equal(result.outputJson, null);
+            const tmuxLog = await readFile(tmuxLogPath, "utf-8");
+            assert.match(tmuxLog, /send-keys -t %42 -l \[OMX\] worker-1 native Stop allowed/);
+            assert.match(tmuxLog, /send-keys -t %42 Tab/);
+            assert.match(tmuxLog, /send-keys -t %42 C-m/);
+            assert.ok(tmuxLog.indexOf("send-keys -t %42 Tab") < tmuxLog.indexOf("send-keys -t %42 C-m"), "busy worker-stop nudge should press Tab before C-m");
+            const nudgeState = JSON.parse(await readFile(join(workerDir, "worker-stop-nudge.json"), "utf-8"));
+            assert.equal(nudgeState.delivery, "queued");
+        }
+        finally {
+            if (typeof prevTeamWorker === "string")
+                process.env.OMX_TEAM_WORKER = prevTeamWorker;
+            else
+                delete process.env.OMX_TEAM_WORKER;
+            if (typeof prevTeamStateRoot === "string")
+                process.env.OMX_TEAM_STATE_ROOT = prevTeamStateRoot;
+            else
+                delete process.env.OMX_TEAM_STATE_ROOT;
+            if (typeof prevPath === "string")
+                process.env.PATH = prevPath;
+            else
+                delete process.env.PATH;
+            await rm(cwd, { recursive: true, force: true });
+        }
+    });
     it("allows worker Stop when the Stop nudge helper cannot deliver", async () => {
         const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-stop-team-worker-helper-fail-"));
         const prevTeamWorker = process.env.OMX_TEAM_WORKER;
@@ -5622,13 +6574,25 @@ exit 0
             await rm(cwd, { recursive: true, force: true });
         }
     });
-    it("does not block on stale ralplan skill-active when canonical run-state is terminal", async () => {
-        const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-stop-terminal-ralplan-run-"));
+    it("does not block when canonical root ralplan state is inactive but session ralplan state is stale active", async () => {
+        const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-stop-stale-session-ralplan-root-inactive-"));
         try {
             const stateDir = join(cwd, ".omx", "state");
-            const sessionId = "sess-stop-terminal-ralplan";
+            const sessionId = "sess-stop-stale-session-ralplan";
             await mkdir(join(stateDir, "sessions", sessionId), { recursive: true });
             await writeJson(join(stateDir, "session.json"), { session_id: sessionId });
+            await writeJson(join(stateDir, "skill-active-state.json"), {
+                active: false,
+                skill: "ralplan",
+                phase: "reviewing",
+                active_skills: [],
+            });
+            await writeJson(join(stateDir, "ralplan-state.json"), {
+                active: false,
+                mode: "ralplan",
+                current_phase: "complete",
+                session_id: sessionId,
+            });
             await writeJson(join(stateDir, "sessions", sessionId, "skill-active-state.json"), {
                 active: true,
                 skill: "ralplan",
@@ -5647,16 +6611,6 @@ exit 0
                 current_phase: "planning",
                 session_id: sessionId,
             });
-            await writeJson(join(stateDir, "sessions", sessionId, "run-state.json"), {
-                version: 1,
-                mode: "ralplan",
-                active: false,
-                outcome: "finish",
-                lifecycle_outcome: "finished",
-                current_phase: "complete",
-                completed_at: "2026-05-01T00:00:00.000Z",
-                updated_at: "2026-05-01T00:00:00.000Z",
-            });
             const result = await dispatchCodexNativeHook({
                 hook_event_name: "Stop",
                 cwd,
@@ -5669,13 +6623,26 @@ exit 0
             await rm(cwd, { recursive: true, force: true });
         }
     });
-    it("does not block on stale ralplan skill-active when pinned mode state belongs to another session", async () => {
-        const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-stop-foreign-ralplan-"));
+    it("keeps blocking current session ralplan when root inactive ralplan state belongs to another session", async () => {
+        const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-stop-session-ralplan-root-other-session-"));
         try {
             const stateDir = join(cwd, ".omx", "state");
-            const sessionId = "sess-stop-current-ralplan";
+            const sessionId = "sess-stop-current-active-ralplan";
             await mkdir(join(stateDir, "sessions", sessionId), { recursive: true });
             await writeJson(join(stateDir, "session.json"), { session_id: sessionId });
+            await writeJson(join(stateDir, "skill-active-state.json"), {
+                active: false,
+                skill: "ralplan",
+                phase: "complete",
+                session_id: "sess-stop-old-ralplan",
+                active_skills: [],
+            });
+            await writeJson(join(stateDir, "ralplan-state.json"), {
+                active: false,
+                mode: "ralplan",
+                current_phase: "complete",
+                session_id: "sess-stop-old-ralplan",
+            });
             await writeJson(join(stateDir, "sessions", sessionId, "skill-active-state.json"), {
                 active: true,
                 skill: "ralplan",
@@ -5692,7 +6659,7 @@ exit 0
                 active: true,
                 mode: "ralplan",
                 current_phase: "planning",
-                session_id: "sess-other-ralplan",
+                session_id: sessionId,
             });
             const result = await dispatchCodexNativeHook({
                 hook_event_name: "Stop",
@@ -5700,18 +6667,257 @@ exit 0
                 session_id: sessionId,
             }, { cwd });
             assert.equal(result.omxEventName, "stop");
-            assert.equal(result.outputJson, null);
+            assert.equal(result.outputJson?.decision, "block");
+            assert.equal(result.outputJson?.stopReason, "skill_ralplan_planning_continue_artifact");
         }
         finally {
             await rm(cwd, { recursive: true, force: true });
         }
     });
-    it("returns an explicit ralplan waiting status while subagents are still active", async () => {
-        const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-stop-skill-subagent-"));
+    it("keeps blocking current session ralplan when root inactive ralplan state is unscoped", async () => {
+        const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-stop-session-ralplan-root-unscoped-"));
         try {
             const stateDir = join(cwd, ".omx", "state");
-            await mkdir(join(stateDir, "sessions", "sess-stop-skill-subagent"), { recursive: true });
-            await writeJson(join(stateDir, "session.json"), { session_id: "sess-stop-skill-subagent" });
+            const sessionId = "sess-stop-unscoped-root-current-active";
+            await mkdir(join(stateDir, "sessions", sessionId), { recursive: true });
+            await writeJson(join(stateDir, "session.json"), { session_id: sessionId });
+            await writeJson(join(stateDir, "skill-active-state.json"), {
+                active: false,
+                skill: "ralplan",
+                phase: "complete",
+                active_skills: [],
+            });
+            await writeJson(join(stateDir, "ralplan-state.json"), {
+                active: false,
+                mode: "ralplan",
+                current_phase: "complete",
+            });
+            await writeJson(join(stateDir, "sessions", sessionId, "skill-active-state.json"), {
+                active: true,
+                skill: "ralplan",
+                phase: "planning",
+                session_id: sessionId,
+                active_skills: [{
+                        skill: "ralplan",
+                        phase: "planning",
+                        active: true,
+                        session_id: sessionId,
+                    }],
+            });
+            await writeJson(join(stateDir, "sessions", sessionId, "ralplan-state.json"), {
+                active: true,
+                mode: "ralplan",
+                current_phase: "planning",
+                session_id: sessionId,
+            });
+            const result = await dispatchCodexNativeHook({
+                hook_event_name: "Stop",
+                cwd,
+                session_id: sessionId,
+            }, { cwd });
+            assert.equal(result.omxEventName, "stop");
+            assert.equal(result.outputJson?.decision, "block");
+            assert.equal(result.outputJson?.stopReason, "skill_ralplan_planning_continue_artifact");
+        }
+        finally {
+            await rm(cwd, { recursive: true, force: true });
+        }
+    });
+    it("does not block stale session ralplan when root ralplan is terminal and another root skill is active", async () => {
+        const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-stop-stale-ralplan-other-root-skill-"));
+        try {
+            const stateDir = join(cwd, ".omx", "state");
+            const sessionId = "sess-stop-stale-ralplan-other-root-skill";
+            await mkdir(join(stateDir, "sessions", sessionId), { recursive: true });
+            await writeJson(join(stateDir, "session.json"), { session_id: sessionId });
+            await writeJson(join(stateDir, "skill-active-state.json"), {
+                active: true,
+                skill: "deep-interview",
+                phase: "intent-first",
+                session_id: sessionId,
+                active_skills: [{
+                        skill: "deep-interview",
+                        phase: "intent-first",
+                        active: true,
+                        session_id: sessionId,
+                    }],
+            });
+            await writeJson(join(stateDir, "ralplan-state.json"), {
+                active: false,
+                mode: "ralplan",
+                current_phase: "complete",
+                session_id: sessionId,
+            });
+            await writeJson(join(stateDir, "sessions", sessionId, "skill-active-state.json"), {
+                active: true,
+                skill: "ralplan",
+                phase: "planning",
+                session_id: sessionId,
+                active_skills: [{
+                        skill: "ralplan",
+                        phase: "planning",
+                        active: true,
+                        session_id: sessionId,
+                    }],
+            });
+            await writeJson(join(stateDir, "sessions", sessionId, "ralplan-state.json"), {
+                active: true,
+                mode: "ralplan",
+                current_phase: "planning",
+                session_id: sessionId,
+            });
+            const result = await dispatchCodexNativeHook({
+                hook_event_name: "Stop",
+                cwd,
+                session_id: sessionId,
+            }, { cwd });
+            assert.equal(result.omxEventName, "stop");
+            assert.equal(result.outputJson, null);
+        }
+        finally {
+            await rm(cwd, { recursive: true, force: true });
+        }
+    });
+    it("keeps blocking session ralplan when canonical root state is not inactive", async () => {
+        const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-stop-session-ralplan-root-active-"));
+        try {
+            const stateDir = join(cwd, ".omx", "state");
+            const sessionId = "sess-stop-session-ralplan-root-active";
+            await mkdir(join(stateDir, "sessions", sessionId), { recursive: true });
+            await writeJson(join(stateDir, "session.json"), { session_id: sessionId });
+            await writeJson(join(stateDir, "skill-active-state.json"), {
+                active: true,
+                skill: "ralplan",
+                phase: "planning",
+                session_id: sessionId,
+                active_skills: [{
+                        skill: "ralplan",
+                        phase: "planning",
+                        active: true,
+                        session_id: sessionId,
+                    }],
+            });
+            await writeJson(join(stateDir, "sessions", sessionId, "skill-active-state.json"), {
+                active: true,
+                skill: "ralplan",
+                phase: "planning",
+                session_id: sessionId,
+                active_skills: [{
+                        skill: "ralplan",
+                        phase: "planning",
+                        active: true,
+                        session_id: sessionId,
+                    }],
+            });
+            await writeJson(join(stateDir, "sessions", sessionId, "ralplan-state.json"), {
+                active: true,
+                mode: "ralplan",
+                current_phase: "planning",
+                session_id: sessionId,
+            });
+            const result = await dispatchCodexNativeHook({
+                hook_event_name: "Stop",
+                cwd,
+                session_id: sessionId,
+            }, { cwd });
+            assert.equal(result.omxEventName, "stop");
+            assert.equal(result.outputJson?.decision, "block");
+            assert.equal(result.outputJson?.stopReason, "skill_ralplan_planning_continue_artifact");
+        }
+        finally {
+            await rm(cwd, { recursive: true, force: true });
+        }
+    });
+    it("does not block on stale ralplan skill-active when canonical run-state is terminal", async () => {
+        const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-stop-terminal-ralplan-run-"));
+        try {
+            const stateDir = join(cwd, ".omx", "state");
+            const sessionId = "sess-stop-terminal-ralplan";
+            await mkdir(join(stateDir, "sessions", sessionId), { recursive: true });
+            await writeJson(join(stateDir, "session.json"), { session_id: sessionId });
+            await writeJson(join(stateDir, "sessions", sessionId, "skill-active-state.json"), {
+                active: true,
+                skill: "ralplan",
+                phase: "planning",
+                session_id: sessionId,
+                active_skills: [{
+                        skill: "ralplan",
+                        phase: "planning",
+                        active: true,
+                        session_id: sessionId,
+                    }],
+            });
+            await writeJson(join(stateDir, "sessions", sessionId, "ralplan-state.json"), {
+                active: true,
+                mode: "ralplan",
+                current_phase: "planning",
+                session_id: sessionId,
+            });
+            await writeJson(join(stateDir, "sessions", sessionId, "run-state.json"), {
+                version: 1,
+                mode: "ralplan",
+                active: false,
+                outcome: "finish",
+                lifecycle_outcome: "finished",
+                current_phase: "complete",
+                completed_at: "2026-05-01T00:00:00.000Z",
+                updated_at: "2026-05-01T00:00:00.000Z",
+            });
+            const result = await dispatchCodexNativeHook({
+                hook_event_name: "Stop",
+                cwd,
+                session_id: sessionId,
+            }, { cwd });
+            assert.equal(result.omxEventName, "stop");
+            assert.equal(result.outputJson, null);
+        }
+        finally {
+            await rm(cwd, { recursive: true, force: true });
+        }
+    });
+    it("does not block on stale ralplan skill-active when pinned mode state belongs to another session", async () => {
+        const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-stop-foreign-ralplan-"));
+        try {
+            const stateDir = join(cwd, ".omx", "state");
+            const sessionId = "sess-stop-current-ralplan";
+            await mkdir(join(stateDir, "sessions", sessionId), { recursive: true });
+            await writeJson(join(stateDir, "session.json"), { session_id: sessionId });
+            await writeJson(join(stateDir, "sessions", sessionId, "skill-active-state.json"), {
+                active: true,
+                skill: "ralplan",
+                phase: "planning",
+                session_id: sessionId,
+                active_skills: [{
+                        skill: "ralplan",
+                        phase: "planning",
+                        active: true,
+                        session_id: sessionId,
+                    }],
+            });
+            await writeJson(join(stateDir, "sessions", sessionId, "ralplan-state.json"), {
+                active: true,
+                mode: "ralplan",
+                current_phase: "planning",
+                session_id: "sess-other-ralplan",
+            });
+            const result = await dispatchCodexNativeHook({
+                hook_event_name: "Stop",
+                cwd,
+                session_id: sessionId,
+            }, { cwd });
+            assert.equal(result.omxEventName, "stop");
+            assert.equal(result.outputJson, null);
+        }
+        finally {
+            await rm(cwd, { recursive: true, force: true });
+        }
+    });
+    it("returns an explicit ralplan waiting status while subagents are still active", async () => {
+        const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-stop-skill-subagent-"));
+        try {
+            const stateDir = join(cwd, ".omx", "state");
+            await mkdir(join(stateDir, "sessions", "sess-stop-skill-subagent"), { recursive: true });
+            await writeJson(join(stateDir, "session.json"), { session_id: "sess-stop-skill-subagent" });
             await writeJson(join(stateDir, "sessions", "sess-stop-skill-subagent", "skill-active-state.json"), {
                 active: true,
                 skill: "ralplan",
@@ -6406,16 +7612,25 @@ exit 0
             assert.equal(result.omxEventName, "stop");
             const reason = String(result.outputJson?.reason);
             assert.match(reason, /Ralph completion audit is missing required evidence/);
-            assert.match(reason, /state\.completion_audit = \{ passed: true, prompt_to_artifact_checklist: \[\.\.\.\], verification_evidence: \[\.\.\.\] \}/);
+            assert.match(reason, /set "completion_audit" on the Ralph state object/);
+            assert.doesNotMatch(reason, /state\.completion_audit/);
             assert.match(reason, /repo-relative JSON file/);
             assert.match(reason, /Markdown artifacts and flat top-level checklist\/evidence fields are not accepted/);
             assert.equal(result.outputJson?.stopReason, "ralph_completion_audit_missing_completion_audit");
             const reopened = JSON.parse(await readFile(statePath, "utf-8"));
-            assert.equal(reopened.active, true);
-            assert.equal(reopened.current_phase, "verifying");
+            assert.equal(reopened.active, false);
+            assert.equal(reopened.current_phase, "complete");
             assert.equal(reopened.completion_audit_gate, "blocked");
             assert.equal(reopened.completion_audit_missing_reason, "missing_completion_audit");
-            assert.equal(typeof reopened.completed_at, "undefined");
+            assert.equal(reopened.completed_at, "2026-05-10T12:00:00.000Z");
+            const repeat = await dispatchCodexNativeHook({
+                hook_event_name: "Stop",
+                cwd,
+                session_id: sessionId,
+                last_assistant_message: "Done. Ralph complete.",
+            }, { cwd });
+            assert.equal(repeat.outputJson?.stopReason, "ralph_completion_audit_missing_completion_audit");
+            assert.doesNotMatch(String(repeat.outputJson?.reason), /Ralph is still active/);
         }
         finally {
             await rm(cwd, { recursive: true, force: true });
@@ -6605,6 +7820,42 @@ exit 0
             await rm(cwd, { recursive: true, force: true });
         }
     });
+    it("allows Stop from stale orphaned session-scoped Ralph starting iteration zero state", async () => {
+        const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-stop-stale-orphan-starting-ralph-"));
+        try {
+            const stateDir = join(cwd, ".omx", "state");
+            const sessionId = "sess-stale-orphan-ralph";
+            await mkdir(join(stateDir, "sessions", sessionId), { recursive: true });
+            await writeJson(join(stateDir, "session.json"), { session_id: sessionId, native_session_id: sessionId, cwd });
+            await writeJson(join(stateDir, "sessions", sessionId, "ralph-state.json"), {
+                active: true,
+                mode: "ralph",
+                current_phase: "starting",
+                iteration: 0,
+                session_id: sessionId,
+                updated_at: "2000-01-01T00:00:00.000Z",
+            });
+            await writeJson(join(stateDir, "sessions", sessionId, "skill-active-state.json"), {
+                active: true,
+                skill: "ralph",
+                phase: "starting",
+                session_id: sessionId,
+                active_skills: [{ skill: "ralph", phase: "starting", active: true, session_id: sessionId }],
+            });
+            const result = await dispatchCodexNativeHook({
+                hook_event_name: "Stop",
+                cwd,
+                session_id: sessionId,
+                thread_id: "thread-verifier-terminal",
+                last_assistant_message: "APPROVE: read-only verifier evidence is fresh and sufficient.",
+            }, { cwd });
+            assert.equal(result.omxEventName, "stop");
+            assert.equal(result.outputJson, null);
+        }
+        finally {
+            await rm(cwd, { recursive: true, force: true });
+        }
+    });
     it("blocks Stop on visible active session-scoped Ralph starting state and reports its path", async () => {
         const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-stop-visible-starting-ralph-"));
         try {
@@ -6640,6 +7891,126 @@ exit 0
             await rm(cwd, { recursive: true, force: true });
         }
     });
+    it("retires prompt-seeded Ralph starting state when canonical Ralph already completed with audit", async () => {
+        const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-stop-ralph-shadowed-starting-"));
+        try {
+            const stateDir = join(cwd, ".omx", "state");
+            const nativeSessionId = "native-hook-seed";
+            const canonicalSessionId = "omx-runtime-session";
+            await mkdir(join(stateDir, "sessions", nativeSessionId), { recursive: true });
+            await mkdir(join(stateDir, "sessions", canonicalSessionId), { recursive: true });
+            await writeJson(join(stateDir, "session.json"), {
+                session_id: canonicalSessionId,
+                cwd,
+            });
+            await writeJson(join(stateDir, "sessions", nativeSessionId, "ralph-state.json"), {
+                active: true,
+                mode: "ralph",
+                current_phase: "starting",
+                session_id: nativeSessionId,
+                iteration: 0,
+                task_slug: "mvp-h-local-method-preflight-execution",
+                started_at: "2026-05-14T07:00:00.000Z",
+            });
+            await writeJson(join(stateDir, "sessions", nativeSessionId, "skill-active-state.json"), {
+                active: true,
+                skill: "ralph",
+                phase: "starting",
+                session_id: nativeSessionId,
+                active_skills: [{ skill: "ralph", phase: "starting", active: true, session_id: nativeSessionId }],
+            });
+            await writeJson(join(stateDir, "sessions", canonicalSessionId, "ralph-state.json"), {
+                active: false,
+                mode: "ralph",
+                current_phase: "complete",
+                session_id: canonicalSessionId,
+                completed_at: "2026-05-14T07:30:00.000Z",
+                completion_audit: {
+                    passed: true,
+                    prompt_to_artifact_checklist: ["task evidence mapped"],
+                    verification_evidence: ["fresh verification evidence recorded"],
+                },
+            });
+            const result = await dispatchCodexNativeHook({
+                hook_event_name: "Stop",
+                cwd,
+                session_id: nativeSessionId,
+            }, { cwd });
+            assert.equal(result.omxEventName, "stop");
+            assert.equal(result.outputJson, null);
+            const retiredState = JSON.parse(await readFile(join(stateDir, "sessions", nativeSessionId, "ralph-state.json"), "utf-8"));
+            assert.equal(retiredState.active, false);
+            assert.equal(retiredState.current_phase, "complete");
+            assert.equal(retiredState.stop_reason, "shadowed_by_completed_canonical_ralph");
+            assert.equal(retiredState.shadowed_by_completed_canonical_ralph.session_id, canonicalSessionId);
+        }
+        finally {
+            await rm(cwd, { recursive: true, force: true });
+        }
+    });
+    it("does not retire prompt-seeded Ralph starting state from a completed canonical Ralph owned by another thread", async () => {
+        const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-stop-ralph-shadowed-thread-mismatch-"));
+        try {
+            const stateDir = join(cwd, ".omx", "state");
+            const nativeSessionId = "native-hook-seed";
+            const canonicalSessionId = "omx-runtime-session";
+            await mkdir(join(stateDir, "sessions", nativeSessionId), { recursive: true });
+            await mkdir(join(stateDir, "sessions", canonicalSessionId), { recursive: true });
+            await writeJson(join(stateDir, "session.json"), {
+                session_id: canonicalSessionId,
+                cwd,
+            });
+            await writeJson(join(stateDir, "sessions", nativeSessionId, "ralph-state.json"), {
+                active: true,
+                mode: "ralph",
+                current_phase: "starting",
+                session_id: nativeSessionId,
+                iteration: 0,
+                task_slug: "mvp-h-local-method-preflight-execution",
+                started_at: "2026-05-14T07:00:00.000Z",
+            });
+            await writeJson(join(stateDir, "sessions", nativeSessionId, "skill-active-state.json"), {
+                active: true,
+                skill: "ralph",
+                phase: "starting",
+                session_id: nativeSessionId,
+                active_skills: [{ skill: "ralph", phase: "starting", active: true, session_id: nativeSessionId }],
+            });
+            await writeJson(join(stateDir, "sessions", canonicalSessionId, "ralph-state.json"), {
+                active: false,
+                mode: "ralph",
+                current_phase: "complete",
+                session_id: canonicalSessionId,
+                owner_codex_thread_id: "thread-A",
+                completed_at: "2026-05-14T07:30:00.000Z",
+                completion_audit: {
+                    passed: true,
+                    prompt_to_artifact_checklist: ["task evidence mapped"],
+                    verification_evidence: ["fresh verification evidence recorded"],
+                },
+            });
+            const result = await dispatchCodexNativeHook({
+                hook_event_name: "Stop",
+                cwd,
+                session_id: nativeSessionId,
+                thread_id: "thread-B",
+            }, { cwd });
+            assert.equal(result.omxEventName, "stop");
+            assert.deepEqual(result.outputJson, {
+                decision: "block",
+                reason: "OMX Ralph is still active (phase: starting; state: .omx/state/sessions/native-hook-seed/ralph-state.json); continue the task and gather fresh verification evidence before stopping.",
+                stopReason: "ralph_starting",
+                systemMessage: "OMX Ralph is still active (phase: starting; state: .omx/state/sessions/native-hook-seed/ralph-state.json); continue the task and gather fresh verification evidence before stopping.",
+            });
+            const preservedState = JSON.parse(await readFile(join(stateDir, "sessions", nativeSessionId, "ralph-state.json"), "utf-8"));
+            assert.equal(preservedState.active, true);
+            assert.equal(preservedState.current_phase, "starting");
+            assert.equal(preservedState.stop_reason, undefined);
+        }
+        finally {
+            await rm(cwd, { recursive: true, force: true });
+        }
+    });
     it("does not block Stop from another session-scoped Ralph state when an explicit session_id has no active Ralph state", async () => {
         const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-stop-explicit-session-ralph-"));
         try {