oh-my-codex 0.20.0 → 0.20.2

package/dist/config/__tests__/generator-idempotent.test.js

@@ -8,13 +8,35 @@ import { mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { isAbsolute, join } from "node:path";
 import TOML from "@iarna/toml";
-import { buildMergedConfig, cleanCodexModelAvailabilityNuxIfNeeded, mergeConfig, repairConfigIfNeeded, stripManagedCodexHookTrustState, upsertManagedCodexHookTrustState, } from "../generator.js";
-import { buildManagedCodexHookTrustState } from "../codex-hooks.js";
+import { analyzeLegacyMultiAgentConfig, buildMergedConfig, cleanCodexModelAvailabilityNuxIfNeeded, hasExactOmxSeededBehavioralDefaultsPair, mergeConfig, repairConfigIfNeeded, stripExistingOmxBlocks, stripManagedCodexHookTrustState, stripOmxFeatureFlags, upsertManagedCodexHookTrustState, stripOmxSeededBehavioralDefaults, } from "../generator.js";
+import { MANAGED_HOOK_EVENTS, ManagedCodexHooksPlanError, buildManagedCodexHookTrustState, planManagedCodexHooksMerge, } from "../codex-hooks.js";
 import { OMX_FIRST_PARTY_MCP_SERVER_NAMES } from "../omx-first-party-mcp.js";
 /** Count occurrences of a pattern in text */
 function count(text, pattern) {
     return (text.match(pattern) ?? []).length;
 }
+async function writeSetupGeneratedHookTrustFixture(wd) {
+    const configPath = join(wd, "config.toml");
+    const hooksPath = join(wd, "hooks.json");
+    const hooksPlan = planManagedCodexHooksMerge(null, wd, hooksPath);
+    if (!hooksPlan.ok || hooksPlan.finalContent === null) {
+        throw new Error("Expected setup hook plan to produce a hooks artifact.");
+    }
+    await writeFile(hooksPath, hooksPlan.finalContent);
+    const config = buildMergedConfig("", wd, {
+        codexHooksFile: hooksPath,
+        codexHooksContent: hooksPlan.finalContent,
+        managedHookTrustState: hooksPlan.finalTrustState,
+        priorManagedHookTrustState: hooksPlan.priorTrustState,
+    });
+    await writeFile(configPath, config);
+    return {
+        configPath,
+        hooksPath,
+        config,
+        trustState: hooksPlan.finalTrustState,
+    };
+}
 /** Assert the current OMX block appears exactly once */
 function assertSingleOmxBlock(toml, options = {}) {
     assert.equal(count(toml, /# oh-my-codex \(OMX\) Configuration/g), 1, "OMX marker should appear once");
@@ -133,15 +155,75 @@ describe("config generator idempotency (#384)", () => {
             await mergeConfig(configPath, wd);
             const toml = await readFile(configPath, "utf-8");
             assertSingleOmxBlock(toml);
-            assert.match(toml, /^multi_agent = true$/m);
+            assert.doesNotMatch(toml, /^multi_agent\s*=/m);
             assert.match(toml, /^child_agents_md = true$/m);
             assert.match(toml, /^hooks = true$/m);
             assert.match(toml, /^goals = true$/m);
+            assert.doesNotMatch(toml, /^\[agents\]$/m);
+            assert.doesNotMatch(toml, /^max_threads\s*=/m);
+            assert.doesNotMatch(toml, /^max_depth\s*=/m);
         }
         finally {
             await rm(wd, { recursive: true, force: true });
         }
     });
+    it("classifies legacy multi-agent keys without mutating config", () => {
+        const absent = analyzeLegacyMultiAgentConfig("");
+        assert.equal(absent.assessments["features.multi_agent"].state, "absent");
+        const legacy = analyzeLegacyMultiAgentConfig([
+            "[features]",
+            "multi_agent = true",
+            "",
+            "[agents]",
+            "max_threads = 6",
+            "max_depth = 2",
+        ].join("\n"));
+        assert.equal(legacy.assessments["features.multi_agent"].state, "retained-legacy");
+        assert.equal(legacy.assessments["agents.max_threads"].state, "retained-legacy");
+        assert.equal(legacy.assessments["agents.max_depth"].state, "retained-legacy");
+        const custom = analyzeLegacyMultiAgentConfig("[features]\nmulti_agent = false\n\n[agents]\nmax_threads = 8\nmax_depth = 3\n");
+        assert.equal(custom.assessments["features.multi_agent"].state, "custom");
+        assert.equal(custom.assessments["agents.max_threads"].state, "custom");
+        assert.equal(custom.assessments["agents.max_depth"].state, "custom");
+        const invalid = analyzeLegacyMultiAgentConfig("[features\nmulti_agent = true");
+        assert.equal(invalid.assessments["features.multi_agent"].state, "invalid/duplicate");
+        const duplicate = analyzeLegacyMultiAgentConfig("[features]\nmulti_agent = true\nmulti_agent = false\n");
+        assert.equal(duplicate.assessments["features.multi_agent"].state, "invalid/duplicate");
+        assert.equal(duplicate.assessments["features.multi_agent"].reasonCode, "toml-duplicate-key");
+    });
+    it("preserves legacy multi-agent values and all role tables across fixed-point merges", () => {
+        const existing = [
+            "[features]",
+            "multi_agent = false",
+            "",
+            "[agents]",
+            "max_threads = 8",
+            "max_depth = 3",
+            "",
+            "[agents.executor]",
+            'config_file = "/custom/executor.toml"',
+            "",
+            '[agents."review bot"]',
+            'config_file = "/custom/review.toml"',
+            "",
+        ].join("\n");
+        const merged = buildMergedConfig(existing, "/tmp/omx");
+        assert.match(merged, /^multi_agent = false$/m);
+        assert.match(merged, /^max_threads = 8$/m);
+        assert.match(merged, /^max_depth = 3$/m);
+        assert.match(merged, /^\[agents\.executor\]$/m);
+        assert.match(merged, /^\[agents\."review bot"\]$/m);
+        assert.match(merged, /^config_file = "\/custom\/executor\.toml"$/m);
+        assert.match(merged, /^config_file = "\/custom\/review\.toml"$/m);
+        const parsed = TOML.parse(merged);
+        assert.equal(parsed.agents?.executor?.config_file, "/custom/executor.toml");
+        assert.equal(parsed.agents?.["review bot"]?.config_file, "/custom/review.toml");
+        assert.equal(buildMergedConfig(merged, "/tmp/omx"), merged);
+    });
+    it("can preserve multi_agent while stripping other OMX feature flags", () => {
+        const stripped = stripOmxFeatureFlags("[features]\nmulti_agent = false\nchild_agents_md = true\nhooks = true\ngoals = true\n", { preserveMultiAgent: true });
+        assert.equal(stripped, "[features]\nmulti_agent = false\n");
+    });
     it("emits first-party MCP blocks only when explicitly enabled", () => {
         const toml = buildMergedConfig("", "/tmp/omx", {
             includeFirstPartyMcp: true,
@@ -354,11 +436,10 @@ describe("config generator idempotency (#384)", () => {
             assertSingleOmxBlock(toml);
             assert.match(toml, /^\[user\.custom\]$/m, "user section preserved");
             assert.match(toml, /^name = "kept"$/m, "user key preserved");
-            assert.match(toml, /^\[agents\]$/m, "global agents settings added");
-            assert.match(toml, /^max_threads = 6$/m, "global agents max_threads seeded");
-            assert.match(toml, /^max_depth = 2$/m, "global agents max_depth seeded");
-            assert.doesNotMatch(toml, /^\[agents\.executor\]$/m, "legacy OMX agent entry removed");
-            assert.doesNotMatch(toml, /^\[agents\.explore\]$/m, "legacy OMX agent entry removed");
+            assert.match(toml, /^\[agents\.executor\]$/m, "known agent table preserved");
+            assert.match(toml, /^\[agents\.explore\]$/m, "known agent table preserved");
+            assert.match(toml, /^config_file = "\/old\/path\/executor\.toml"$/m);
+            assert.match(toml, /^config_file = "\/old\/path\/explore\.toml"$/m);
         }
         finally {
             await rm(wd, { recursive: true, force: true });
@@ -518,128 +599,165 @@ describe("config generator idempotency (#384)", () => {
             await rm(wd, { recursive: true, force: true });
         }
     });
-    it("seeds context keys when root model is missing and both context keys are absent", async () => {
+    it("does not seed context defaults and preserves explicit context settings", async () => {
         const wd = await mkdtemp(join(tmpdir(), "omx-idem-"));
         try {
             const configPath = join(wd, "config.toml");
-            await writeFile(configPath, 'approval_policy = "on-failure"\n');
+            await writeFile(configPath, ['model = "gpt-5.6-sol"', "model_context_window = 640000", ""].join("\n"));
             await mergeConfig(configPath, wd);
             const toml = await readFile(configPath, "utf-8");
-            assert.match(toml, /^model = "gpt-5.6-sol"$/m);
-            assert.match(toml, /^# oh-my-codex seeded behavioral defaults \(uninstall removes unchanged defaults\)$/m);
-            assert.match(toml, /^model_context_window = 250000$/m);
-            assert.match(toml, /^model_auto_compact_token_limit = 200000$/m);
-            assert.match(toml, /^# End oh-my-codex seeded behavioral defaults$/m);
+            assert.match(toml, /^model_context_window = 640000$/m);
+            assert.doesNotMatch(toml, /^model_auto_compact_token_limit\s*=/m);
+            assert.doesNotMatch(toml, /seeded behavioral defaults/);
+            await mergeConfig(configPath, wd);
+            const repeated = await readFile(configPath, "utf-8");
+            assert.equal(repeated, toml);
+            assert.doesNotMatch(repeated, /^model_auto_compact_token_limit\s*=/m);
+            assert.doesNotMatch(repeated, /seeded behavioral defaults/);
         }
         finally {
             await rm(wd, { recursive: true, force: true });
         }
     });
-    it("can override gpt-5.6-terra to gpt-5.6-sol and seed 250k context defaults", async () => {
-        const wd = await mkdtemp(join(tmpdir(), "omx-idem-"));
-        try {
-            const toml = buildMergedConfig('model = \"gpt-5.6-terra\"\n', wd, {
-                modelOverride: "gpt-5.6-sol",
-            });
-            assert.match(toml, /^model = "gpt-5\.6-sol"$/m);
-            assert.doesNotMatch(toml, /^model = "gpt-5\.6-terra"$/m);
-            assert.match(toml, /^# oh-my-codex seeded behavioral defaults \(uninstall removes unchanged defaults\)$/m);
-            assert.match(toml, /^model_context_window = 250000$/m);
-            assert.match(toml, /^model_auto_compact_token_limit = 200000$/m);
-            assert.match(toml, /^# End oh-my-codex seeded behavioral defaults$/m);
-        }
-        finally {
-            await rm(wd, { recursive: true, force: true });
+    it("removes exact legacy source spans with LF, CRLF, and EOF variants", () => {
+        const start = "# oh-my-codex seeded behavioral defaults (uninstall removes unchanged defaults)";
+        const end = "# End oh-my-codex seeded behavioral defaults";
+        const fixtures = [
+            {
+                input: `before\n${start}\nmodel_context_window = 250000\nmodel_auto_compact_token_limit = 200000\n${end}\nafter`,
+                expected: "before\nafter",
+            },
+            {
+                input: `model_auto_compact_token_limit=123\r\n${start}\r\nmodel_context_window = 250000\r\n${end}\r\n[features]\r\nweb_search = true`,
+                expected: "model_auto_compact_token_limit=123\r\n[features]\r\nweb_search = true",
+            },
+            {
+                input: `model_context_window = [\n  1,\n]\n${start}\nmodel_auto_compact_token_limit = 200000\n${end}`,
+                expected: "model_context_window = [\n  1,\n]\n",
+            },
+        ];
+        for (const { input, expected } of fixtures) {
+            const stripped = stripOmxSeededBehavioralDefaults(input);
+            assert.equal(stripped, expected);
+            assert.equal(stripOmxSeededBehavioralDefaults(stripped), stripped);
         }
     });
-    it("does not seed 250k context defaults for non-gpt-5.6-sol models", async () => {
-        const wd = await mkdtemp(join(tmpdir(), "omx-idem-"));
-        try {
-            const configPath = join(wd, "config.toml");
-            await writeFile(configPath, 'model = "o3"\n');
-            await mergeConfig(configPath, wd);
-            const toml = await readFile(configPath, "utf-8");
-            assert.match(toml, /^model = "o3"$/m, "user model preserved");
-            assert.doesNotMatch(toml, /^model_context_window = 250000$/m);
-            assert.doesNotMatch(toml, /^model_auto_compact_token_limit = 200000$/m);
-        }
-        finally {
-            await rm(wd, { recursive: true, force: true });
-        }
+    it("strips bounded customized or siblingless singleton markers and preserves ambiguity", () => {
+        const start = "# oh-my-codex seeded behavioral defaults (uninstall removes unchanged defaults)";
+        const end = "# End oh-my-codex seeded behavioral defaults";
+        const customized = `before\r\n${start}\r\nmodel_context_window = 123\r\n${end}\r\nafter`;
+        assert.equal(stripOmxSeededBehavioralDefaults(customized), "before\r\nmodel_context_window = 123\r\nafter");
+        const siblingless = `${start}\nmodel_context_window = 250000\n${end}\n[features]\nmodel_auto_compact_token_limit = 999`;
+        assert.equal(stripOmxSeededBehavioralDefaults(siblingless), "model_context_window = 250000\n[features]\nmodel_auto_compact_token_limit = 999");
+        const ambiguous = `${start}\nmodel_context_window = 250000\n${end}\nmodel_auto_compact_token_limit = 1\nmodel_auto_compact_token_limit = 2`;
+        assert.equal(stripOmxSeededBehavioralDefaults(ambiguous), ambiguous);
+        const sameKeyOutside = `model_context_window = 1\n${start}\nmodel_context_window = 250000\n${end}\nmodel_auto_compact_token_limit = 2`;
+        assert.equal(stripOmxSeededBehavioralDefaults(sameKeyOutside), sameKeyOutside);
+        const malformed = `${start}\nmodel_context_window = 250000`;
+        assert.equal(stripOmxSeededBehavioralDefaults(malformed), malformed);
     });
-    it("seeds missing auto compact limit without overwriting an existing context window", async () => {
-        const wd = await mkdtemp(join(tmpdir(), "omx-idem-"));
-        try {
-            const configPath = join(wd, "config.toml");
-            await writeFile(configPath, ['model = "gpt-5.6-sol"', "model_context_window = 640000", ""].join("\n"));
-            await mergeConfig(configPath, wd);
-            const toml = await readFile(configPath, "utf-8");
-            assert.match(toml, /^model = "gpt-5\.6-sol"$/m);
-            assert.match(toml, /^model_context_window = 640000$/m);
-            assert.match(toml, /^model_auto_compact_token_limit = 200000$/m);
-        }
-        finally {
-            await rm(wd, { recursive: true, force: true });
+    it("preserves every byte inside noncanonical bounded blocks", () => {
+        const start = "# oh-my-codex seeded behavioral defaults (uninstall removes unchanged defaults)";
+        const end = "# End oh-my-codex seeded behavioral defaults";
+        const bodies = [
+            ["model_context_window = 250000", "# user comment", "model_auto_compact_token_limit = 200000"],
+            ["model_context_window = 250000", "", "model_auto_compact_token_limit = 200000"],
+            [" model_context_window = 250000", "model_auto_compact_token_limit = 200000"],
+            ["model_context_window = 250000", "model_auto_compact_token_limit = 200000 "],
+            ["model_auto_compact_token_limit = 200000", "model_context_window = 250000"],
+            ["model_context_window = 250000", "model_context_window = 250000", "model_auto_compact_token_limit = 200000"],
+            ["model_context_window = 250000", "unexpected = true", "model_auto_compact_token_limit = 200000"],
+            ["model_context_window = 250_000", "model_auto_compact_token_limit = 200000"],
+            ["", "model_context_window = 250000", "model_auto_compact_token_limit = 200000", ""],
+        ];
+        for (const body of bodies) {
+            const input = ["before", start, ...body, end, "after"].join("\n");
+            const expected = ["before", ...body, "after"].join("\n");
+            const stripped = stripOmxSeededBehavioralDefaults(input);
+            assert.equal(stripped, expected);
+            assert.equal(stripOmxSeededBehavioralDefaults(stripped), stripped);
         }
     });
-    it("seeds missing context window without overwriting an existing auto compact limit", async () => {
-        const wd = await mkdtemp(join(tmpdir(), "omx-idem-"));
-        try {
-            const configPath = join(wd, "config.toml");
-            await writeFile(configPath, ['model = "gpt-5.6-sol"', "model_auto_compact_token_limit = 150000", ""].join("\n"));
-            await mergeConfig(configPath, wd);
-            const toml = await readFile(configPath, "utf-8");
-            assert.match(toml, /^model = "gpt-5\.6-sol"$/m);
-            assert.match(toml, /^model_context_window = 250000$/m);
-            assert.match(toml, /^model_auto_compact_token_limit = 150000$/m);
-        }
-        finally {
-            await rm(wd, { recursive: true, force: true });
+    it("fails closed for duplicate assignments and malformed marker topologies", () => {
+        const start = "# oh-my-codex seeded behavioral defaults (uninstall removes unchanged defaults)";
+        const end = "# End oh-my-codex seeded behavioral defaults";
+        const pair = [start, "model_context_window = 250000", "model_auto_compact_token_limit = 200000", end];
+        const unchanged = [
+            ["model_context_window = 999", ...pair, "after"].join("\n"),
+            [...pair, "model_auto_compact_token_limit = 999", "after"].join("\n"),
+            [start, start, "model_context_window = 250000", "model_auto_compact_token_limit = 200000", end, end].join("\n"),
+            [...pair, ...pair].join("\n"),
+        ];
+        for (const input of unchanged) {
+            assert.equal(stripOmxSeededBehavioralDefaults(input), input);
+            assert.equal(hasExactOmxSeededBehavioralDefaultsPair(input), false);
         }
+        const invalidSuffix = ["before", ...pair, "invalid = [", ""].join("\n");
+        const expected = "before\ninvalid = [\n";
+        assert.equal(stripOmxSeededBehavioralDefaults(invalidSuffix), expected);
+        assert.equal(stripOmxSeededBehavioralDefaults(expected), expected);
     });
-    it("does not duplicate independently seeded defaults across reruns", async () => {
-        const wd = await mkdtemp(join(tmpdir(), "omx-idem-"));
-        try {
-            const configPath = join(wd, "config.toml");
-            await writeFile(configPath, ['model = "gpt-5.6-sol"', "model_context_window = 640000", ""].join("\n"));
-            await mergeConfig(configPath, wd);
-            await mergeConfig(configPath, wd);
-            const toml = await readFile(configPath, "utf-8");
-            assert.equal(count(toml, /^model_context_window = 640000$/gm), 1);
-            assert.equal(count(toml, /^model_auto_compact_token_limit = 200000$/gm), 1);
-            assert.doesNotMatch(toml, /^model_context_window = 250000$/m);
-        }
-        finally {
-            await rm(wd, { recursive: true, force: true });
-        }
+    it("ignores marker-shaped text inside TOML values and fails closed on stray markers", () => {
+        const start = "# oh-my-codex seeded behavioral defaults (uninstall removes unchanged defaults)";
+        const end = "# End oh-my-codex seeded behavioral defaults";
+        const stringContent = [
+            'developer_instructions = """',
+            start,
+            "model_context_window = 250000",
+            "model_auto_compact_token_limit = 200000",
+            end,
+            '"""',
+            "",
+        ].join("\n");
+        assert.equal(stripOmxSeededBehavioralDefaults(stringContent), stringContent);
+        assert.equal(hasExactOmxSeededBehavioralDefaultsPair(stringContent), false);
+        const duplicateAfterTable = [
+            start,
+            "model_context_window = 250000",
+            "model_auto_compact_token_limit = 200000",
+            end,
+            "[tui]",
+            start,
+            "",
+        ].join("\n");
+        assert.equal(stripOmxSeededBehavioralDefaults(duplicateAfterTable), duplicateAfterTable);
+        assert.equal(hasExactOmxSeededBehavioralDefaultsPair(duplicateAfterTable), false);
     });
-    it("does not duplicate seeded model defaults across reruns", async () => {
-        const wd = await mkdtemp(join(tmpdir(), "omx-idem-"));
-        try {
-            const configPath = join(wd, "config.toml");
-            await mergeConfig(configPath, wd);
-            await mergeConfig(configPath, wd);
-            const toml = await readFile(configPath, "utf-8");
-            assert.equal(count(toml, /^model = "gpt-5\.6-sol"$/gm), 1, "seeded model should appear once");
-            assert.equal(count(toml, /^model_context_window = 250000$/gm), 1, "seeded context window should appear once");
-            assert.equal(count(toml, /^model_auto_compact_token_limit = 200000$/gm), 1, "seeded auto compact limit should appear once");
-            assert.equal(count(toml, /^# oh-my-codex seeded behavioral defaults \(uninstall removes unchanged defaults\)$/gm), 1, "seeded defaults start marker should appear once");
-            assert.equal(count(toml, /^# End oh-my-codex seeded behavioral defaults$/gm), 1, "seeded defaults end marker should appear once");
-        }
-        finally {
-            await rm(wd, { recursive: true, force: true });
+    it("migrates before reconstruction without incremental normalization", () => {
+        const start = "# oh-my-codex seeded behavioral defaults (uninstall removes unchanged defaults)";
+        const end = "# End oh-my-codex seeded behavioral defaults";
+        const fixtures = [
+            {
+                baseline: 'approval_policy = "on-failure"\n[features]\nweb_search = true\n',
+                migrated: `approval_policy = "on-failure"\n${start}\nmodel_context_window = 250000\nmodel_auto_compact_token_limit = 200000\n${end}\n[features]\nweb_search = true\n`,
+            },
+            {
+                baseline: "model_auto_compact_token_limit = [\n  999,\n]\n[features]\nweb_search = true\n",
+                migrated: `model_auto_compact_token_limit = [\n  999,\n]\n${start}\nmodel_context_window = 250000\n${end}\n[features]\nweb_search = true\n`,
+            },
+            {
+                baseline: "# explicit sibling\nmodel_context_window   =   640000\n[features]\nweb_search = true\n",
+                migrated: `# explicit sibling\nmodel_context_window   =   640000\n${start}\nmodel_auto_compact_token_limit = 200000\n${end}\n[features]\nweb_search = true\n`,
+            },
+        ];
+        for (const fixture of fixtures) {
+            const baseline = buildMergedConfig(fixture.baseline, "/tmp/omx");
+            const migrated = buildMergedConfig(fixture.migrated, "/tmp/omx");
+            assert.equal(migrated, baseline);
+            assert.equal(buildMergedConfig(migrated, "/tmp/omx"), migrated);
+            assert.doesNotMatch(migrated, /seeded behavioral defaults/);
+            assert.doesNotThrow(() => TOML.parse(migrated));
         }
     });
-    it("writes only the global [agents] defaults into config", async () => {
+    it("does not write retired global [agents] defaults", async () => {
         const wd = await mkdtemp(join(tmpdir(), "omx-idem-"));
         try {
             const configPath = join(wd, "config.toml");
             await mergeConfig(configPath, wd);
             const toml = await readFile(configPath, "utf-8");
-            assert.match(toml, /^\[agents\]$/m, "global [agents] section present");
-            assert.match(toml, /^max_threads = 6$/m, "max_threads default written");
-            assert.match(toml, /^max_depth = 2$/m, "max_depth default written");
-            assert.doesNotMatch(toml, /^\[agents\.[^\]]+\]$/m, "legacy per-agent config_file entries omitted");
+            assert.doesNotMatch(toml, /^\[agents\]$/m);
+            assert.doesNotMatch(toml, /^max_threads\s*=/m);
+            assert.doesNotMatch(toml, /^max_depth\s*=/m);
         }
         finally {
             await rm(wd, { recursive: true, force: true });
@@ -692,6 +810,106 @@ describe("config generator idempotency (#384)", () => {
             await rm(wd, { recursive: true, force: true });
         }
     });
+    it("strips only complete exact OMX marker blocks outside TOML values", () => {
+        const start = "# oh-my-codex (OMX) Configuration";
+        const end = "# End oh-my-codex";
+        const decoys = [
+            `basic = "${start}"`,
+            `literal = '${end}'`,
+            'multiline_basic = """',
+            start,
+            end,
+            '"""',
+            "multiline_literal = '''",
+            start,
+            end,
+            "'''",
+            `# Marker-shaped text: ${start}`,
+            `# Marker-shaped text: ${end}`,
+        ];
+        const decoyOnly = [...decoys, ""].join("\n");
+        assert.deepEqual(stripExistingOmxBlocks(decoyOnly), {
+            cleaned: decoyOnly,
+            removed: 0,
+        });
+        const incomplete = [...decoys, "", start, "[user.incomplete]", "enabled = true", ""].join("\n");
+        assert.deepEqual(stripExistingOmxBlocks(incomplete), {
+            cleaned: incomplete,
+            removed: 0,
+        });
+        const managed = [
+            ...decoys,
+            "",
+            "# ============================================================",
+            start,
+            "[mcp_servers.omx_state]",
+            'command = "node"',
+            end,
+            "",
+            "[user.after]",
+            'name = "kept"',
+            "",
+        ].join("\n");
+        const expected = [...decoys, "", "[user.after]", 'name = "kept"', ""].join("\n");
+        assert.deepEqual(stripExistingOmxBlocks(managed), {
+            cleaned: expected,
+            removed: 1,
+        });
+        assert.doesNotThrow(() => TOML.parse(expected));
+    });
+    it("keeps OMX delimiter comments inert inside complete TOML assignments", () => {
+        const start = "# oh-my-codex (OMX) Configuration";
+        const end = "# End oh-my-codex";
+        const fixtures = [
+            ["root multiline array", ["root = [", start, end, "]"].join("\n")],
+            ["dotted multiline array", ["outer.value = [", start, end, "]"].join("\n")],
+            ["quoted multiline array", ['"quoted" = [', start, end, "]"].join("\n")],
+            ["empty-quoted multiline array", ['"" = [', start, end, "]"].join("\n")],
+            ["root multiline basic value", ['root_value = """', start, end, '"""'].join("\n")],
+            ["dotted multiline literal value", ["outer.literal = '''", start, end, "'''"].join("\n")],
+        ];
+        for (const [name, assignment] of fixtures) {
+            const config = `${assignment}\n`;
+            assert.doesNotThrow(() => TOML.parse(config), `${name} fixture must be valid TOML`);
+            assert.deepEqual(stripExistingOmxBlocks(config), { cleaned: config, removed: 0 }, name);
+            const merged = buildMergedConfig(config, "/tmp/omx");
+            assert.ok(merged.includes(assignment), `${name} bytes must survive merging`);
+            assert.doesNotThrow(() => TOML.parse(merged), `${name} merged config must be valid TOML`);
+        }
+    });
+    it("rejects marker-contained hook trust state without ownership proof", () => {
+        const start = "# oh-my-codex (OMX) Configuration";
+        const end = "# End oh-my-codex";
+        const fixtures = [
+            ["table", ['[hooks.state."foreign"]', 'trusted_hash = "sha256:foreign"'].join("\n")],
+            ["dotted", 'hooks.state."foreign" = { trusted_hash = "sha256:foreign" }'],
+            ["inline", 'hooks = { state = { foreign = { trusted_hash = "sha256:foreign" } } }'],
+            ["scalar", 'hooks.state = "foreign"'],
+        ];
+        const isManagedTrustConflict = (error) => error instanceof ManagedCodexHooksPlanError &&
+            error.code === "managed_trust_key_conflict";
+        for (const [name, content] of fixtures) {
+            const config = [start, content, end, ""].join("\n");
+            assert.doesNotThrow(() => TOML.parse(config), `${name} fixture must be valid TOML`);
+            assert.throws(() => stripExistingOmxBlocks(config), isManagedTrustConflict, name);
+            assert.throws(() => buildMergedConfig(config, "/tmp/omx"), isManagedTrustConflict, name);
+        }
+    });
+    it("matches managed hooks.state keys case-sensitively", () => {
+        const start = "# oh-my-codex (OMX) Configuration";
+        const end = "# End oh-my-codex";
+        const variants = [
+            'Hooks.state = { foreign = { trusted_hash = "sha256:foreign" } }',
+            'hooks.State = { foreign = { trusted_hash = "sha256:foreign" } }',
+            '"Hooks"."State" = { foreign = { trusted_hash = "sha256:foreign" } }',
+        ];
+        for (const variant of variants) {
+            const config = [start, variant, end, ""].join("\n");
+            assert.doesNotThrow(() => TOML.parse(config));
+            assert.equal(stripManagedCodexHookTrustState(config, { managedTrustState: {} }), config, `${variant} must remain foreign`);
+            assert.doesNotThrow(() => buildMergedConfig(config, "/tmp/omx"));
+        }
+    });
     it("mergeConfig removes legacy omx_team_run tables during setup upgrade", async () => {
         const wd = await mkdtemp(join(tmpdir(), "omx-idem-"));
         try {
@@ -791,6 +1009,74 @@ describe("config generator idempotency (#384)", () => {
             await rm(wd, { recursive: true, force: true });
         }
     });
+    it("repairs duplicate TUI config with setup-generated hook trust from the current hooks artifact", async () => {
+        const wd = await mkdtemp(join(tmpdir(), "omx-idem-"));
+        try {
+            const { configPath, config: setupConfig } = await writeSetupGeneratedHookTrustFixture(wd);
+            const trustBlock = setupConfig.match(/# OMX-owned Codex hook trust state\n[\s\S]*?# End OMX-owned Codex hook trust state/)?.[0];
+            assert.ok(trustBlock, "setup fixture must contain fenced managed hook trust");
+            const setupTrustState = TOML.parse(setupConfig).hooks?.state;
+            await writeFile(configPath, `${setupConfig}\n[tui]\nstatus_line = ["git-branch"]\n`);
+            assert.equal(await repairConfigIfNeeded(configPath, wd), true);
+            const repaired = await readFile(configPath, "utf-8");
+            const repairedTrustState = TOML.parse(repaired).hooks?.state;
+            assert.equal(count(repaired, /^\[tui\]$/gm), 1);
+            assert.ok(repaired.includes(trustBlock), "repair must preserve setup-generated trust bytes");
+            assert.deepEqual(repairedTrustState, setupTrustState);
+        }
+        finally {
+            await rm(wd, { recursive: true, force: true });
+        }
+    });
+    it("fails closed without rewriting managed hook trust when launch repair cannot prove it", async () => {
+        const wd = await mkdtemp(join(tmpdir(), "omx-idem-"));
+        try {
+            const { configPath, hooksPath, config: setupConfig, trustState } = await writeSetupGeneratedHookTrustFixture(wd);
+            const [firstTrustState] = Object.values(trustState);
+            assert.ok(firstTrustState);
+            const repairTarget = `${setupConfig}\n[tui]\nstatus_line = ["git-branch"]\n`;
+            const conflicting = repairTarget.replace(firstTrustState.trusted_hash, "sha256:conflicting-user-trust");
+            await writeFile(configPath, conflicting);
+            await assert.rejects(repairConfigIfNeeded(configPath, wd), (error) => error instanceof ManagedCodexHooksPlanError &&
+                error.code === "managed_trust_key_conflict");
+            assert.equal(await readFile(configPath, "utf-8"), conflicting);
+            const unprovenHooks = [
+                ["invalid", "{ not valid JSON"],
+                [
+                    "ambiguous",
+                    JSON.stringify({
+                        hooks: {
+                            SessionStart: [
+                                {
+                                    hooks: [
+                                        {
+                                            type: "command",
+                                            command: `NODE ${join(wd, "dist", "scripts", "codex-native-hook.js")}`,
+                                        },
+                                    ],
+                                },
+                            ],
+                        },
+                    }),
+                ],
+                ["missing", null],
+            ];
+            for (const [name, hooksContent] of unprovenHooks) {
+                await writeFile(configPath, repairTarget);
+                if (hooksContent === null) {
+                    await rm(hooksPath);
+                }
+                else {
+                    await writeFile(hooksPath, hooksContent);
+                }
+                await assert.rejects(repairConfigIfNeeded(configPath, wd), (error) => error instanceof ManagedCodexHooksPlanError, name);
+                assert.equal(await readFile(configPath, "utf-8"), repairTarget, name);
+            }
+        }
+        finally {
+            await rm(wd, { recursive: true, force: true });
+        }
+    });
     it("preserves trailing user config after an unmatched managed hook trust-state start marker", () => {
         const malformed = [
             'model = "gpt-5.6-sol"',
@@ -856,7 +1142,7 @@ describe("config generator idempotency (#384)", () => {
         assert.match(stripped, /^\[desktop\]$/m);
         assert.doesNotThrow(() => TOML.parse(stripped));
     });
-    it("preserves same-key user hook trust state and suppresses generated duplicates", () => {
+    it("fails closed on conflicting same-key hook trust state", () => {
         const hooksPath = "/tmp/codex/hooks.json";
         const config = [
             'model = "gpt-5.6-sol"',
@@ -866,13 +1152,10 @@ describe("config generator idempotency (#384)", () => {
             "enabled = false",
             "",
         ].join("\n");
-        const refreshed = upsertManagedCodexHookTrustState(config, "/tmp/omx", hooksPath);
-        assert.match(refreshed, /^trusted_hash = "sha256:user"$/m);
-        assert.match(refreshed, /^enabled = false$/m);
-        assert.equal(count(refreshed, /^\[hooks\.state\."\/tmp\/codex\/hooks\.json:post_compact:0:0"\]$/gm), 1, "preserved same-key user trust state must not be duplicated");
-        assert.doesNotThrow(() => TOML.parse(refreshed));
+        assert.throws(() => upsertManagedCodexHookTrustState(config, "/tmp/omx", hooksPath), (error) => error instanceof ManagedCodexHooksPlanError &&
+            error.code === "managed_trust_key_conflict");
     });
-    it("preserves unproven same-key hook trust-state tables", () => {
+    it("fails closed on unproven same-key hook trust-state tables", () => {
         const hooksPath = "/tmp/codex/hooks.json";
         const managedTrustState = buildManagedCodexHookTrustState(hooksPath, "/tmp/omx");
         const fixtures = [
@@ -922,10 +1205,534 @@ describe("config generator idempotency (#384)", () => {
             ],
         ];
         for (const [name, table] of fixtures) {
-            const stripped = stripManagedCodexHookTrustState(table.join("\n"), {
+            assert.throws(() => stripManagedCodexHookTrustState(table.join("\n"), {
                 managedTrustState,
-            });
-            assert.match(stripped, /^\[hooks\.state\."\/tmp\/codex\/hooks\.json:post_compact:0:0"\]/m, `${name} should be preserved`);
+            }), (error) => error instanceof ManagedCodexHooksPlanError &&
+                error.code === "managed_trust_key_conflict", name);
+        }
+    });
+    it("handles semantically equivalent TOML trust-key variants before writing a replacement", () => {
+        const hooksPath = "/tmp/codex/hooks.json";
+        const managedTrustState = buildManagedCodexHookTrustState(hooksPath, "/tmp/omx");
+        const key = `${hooksPath}:post_compact:0:0`;
+        const hash = managedTrustState[key]?.trusted_hash;
+        assert.ok(hash);
+        const matchingHeaders = [
+            `[hooks.state.'${key}']`,
+            `[hooks.state."${key.replace(/\//g, "\\u002f")}"]`,
+        ];
+        for (const header of matchingHeaders) {
+            const matching = [header, `trusted_hash = "${hash}"`, ""].join("\n");
+            const refreshed = upsertManagedCodexHookTrustState(matching, "/tmp/omx", hooksPath, { managedTrustState });
+            assert.equal(count(refreshed, /^\[hooks\.state\./gm), Object.keys(managedTrustState).length);
+            assert.equal(TOML.parse(refreshed)
+                .hooks?.state?.[key] !== undefined, true);
+        }
+        const conflicting = [
+            matchingHeaders[0],
+            'trusted_hash = "sha256:foreign"',
+            "",
+        ].join("\n");
+        assert.throws(() => upsertManagedCodexHookTrustState(conflicting, "/tmp/omx", hooksPath, { managedTrustState }), (error) => error instanceof ManagedCodexHooksPlanError &&
+            error.code === "managed_trust_key_conflict");
+    });
+    it("removes only a single exact proven managed dotted hook trust assignment", () => {
+        const hooksPath = "/tmp/codex/hooks.json";
+        const managedTrustState = buildManagedCodexHookTrustState(hooksPath, "/tmp/omx");
+        const key = `${hooksPath}:post_compact:0:0`;
+        const hash = managedTrustState[key]?.trusted_hash;
+        assert.ok(hash);
+        const exactAssignments = [
+            `hooks.state."${key}".trusted_hash = "${hash}"`,
+            `hooks . state . '${key}' . trusted_hash = "${hash}"`,
+        ];
+        for (const exact of exactAssignments) {
+            assert.equal(stripManagedCodexHookTrustState(exact, { managedTrustState }), "");
+        }
+        const exact = exactAssignments[1];
+        const refreshed = upsertManagedCodexHookTrustState(exact, "/tmp/omx", hooksPath, { managedTrustState });
+        assert.doesNotMatch(refreshed, /^hooks\s*\.\s*state\s*\./m);
+        assert.equal(count(refreshed, /^\[hooks\.state\./gm), Object.keys(managedTrustState).length);
+    });
+    it("fails closed for conflicting, commented, or multi-field managed dotted hook trust assignments", () => {
+        const hooksPath = "/tmp/codex/hooks.json";
+        const managedTrustState = buildManagedCodexHookTrustState(hooksPath, "/tmp/omx");
+        const key = `${hooksPath}:post_compact:0:0`;
+        const hash = managedTrustState[key]?.trusted_hash;
+        assert.ok(hash);
+        const assignment = `hooks.state.'${key}'.trusted_hash = "${hash}"`;
+        const fixtures = [
+            assignment.replace(hash, "sha256:foreign"),
+            `${assignment}\nhooks.state.'${key}'.enabled = true`,
+            `${assignment} # user comment`,
+        ];
+        for (const fixture of fixtures) {
+            assert.throws(() => stripManagedCodexHookTrustState(fixture, { managedTrustState }), (error) => error instanceof ManagedCodexHooksPlanError &&
+                error.code === "managed_trust_key_conflict");
+        }
+    });
+    it("removes exact inline hook trust state without changing adjacent TOML", () => {
+        const hooksPath = "/tmp/codex/hooks.json";
+        const managedTrustState = buildManagedCodexHookTrustState(hooksPath, "/tmp/omx");
+        const key = `${hooksPath}:post_compact:0:0`;
+        const hash = managedTrustState[key]?.trusted_hash;
+        assert.ok(hash);
+        const exactWholeStatement = `hooks = { state = { "${key}" = { trusted_hash = "${hash}" } } }`;
+        assert.equal(stripManagedCodexHookTrustState(exactWholeStatement, { managedTrustState }), "", "an exact single-field inline hooks state remains removable");
+        const inline = [
+            'model = "gpt-5.6-sol"',
+            `hooks.state.'${key}' = { trusted_hash = '${hash}' }`,
+            "",
+            "[desktop]",
+            "git-create-pull-request-as-draft = true",
+            "",
+        ].join("\n");
+        const stripped = stripManagedCodexHookTrustState(inline, { managedTrustState });
+        assert.doesNotMatch(stripped, /hooks\.state/);
+        assert.match(stripped, /^model = "gpt-5\.6-sol"$/m);
+        assert.match(stripped, /^\[desktop\]$/m);
+        assert.match(stripped, /^git-create-pull-request-as-draft = true$/m);
+        assert.doesNotThrow(() => TOML.parse(stripped));
+        const refreshed = upsertManagedCodexHookTrustState(inline, "/tmp/omx", hooksPath, { managedTrustState });
+        assert.equal(Object.keys(TOML.parse(refreshed)
+            .hooks?.state ?? {}).filter((stateKey) => stateKey === key).length, 1);
+    });
+    it("fails closed for inline, dotted, and table hook trust representations with foreign siblings", () => {
+        const hooksPath = "/tmp/codex/hooks.json";
+        const managedTrustState = buildManagedCodexHookTrustState(hooksPath, "/tmp/omx");
+        const key = `${hooksPath}:post_compact:0:0`;
+        const hash = managedTrustState[key]?.trusted_hash;
+        assert.ok(hash);
+        const fixtures = [
+            [
+                "inline",
+                `hooks = { state = { "${key}" = { trusted_hash = "${hash}" } }, foreign = "keep" }`,
+            ],
+            [
+                "dotted",
+                `hooks.state = { "${key}" = { trusted_hash = "${hash}" }, foreign = "keep" }`,
+            ],
+            [
+                "table",
+                [
+                    "[hooks]",
+                    `state = { "${key}" = { trusted_hash = "${hash}" } }`,
+                    'foreign = "keep"',
+                ].join("\n"),
+            ],
+        ];
+        for (const [name, fixture] of fixtures) {
+            assert.doesNotThrow(() => TOML.parse(fixture), `${name} fixture must be valid TOML`);
+            assert.throws(() => stripManagedCodexHookTrustState(fixture, { managedTrustState }), (error) => error instanceof ManagedCodexHooksPlanError &&
+                error.code === "managed_trust_key_conflict", `${name} cleanup must preserve the entire foreign-containing representation`);
+            assert.throws(() => upsertManagedCodexHookTrustState(fixture, "/tmp/omx", hooksPath, { managedTrustState }), (error) => error instanceof ManagedCodexHooksPlanError &&
+                error.code === "managed_trust_key_conflict", `${name} refresh must preserve the original bytes`);
+        }
+    });
+    it("fails closed for commented trust assignments inside a managed config marker", () => {
+        const fixture = [
+            "# oh-my-codex (OMX) Configuration",
+            'hooks.state."foreign-key".trusted_hash = "sha256:foreign" # preserve me',
+            "# End oh-my-codex",
+            "",
+        ].join("\n");
+        assert.throws(() => stripManagedCodexHookTrustState(fixture, { managedTrustState: {} }), (error) => error instanceof ManagedCodexHooksPlanError &&
+            error.code === "managed_trust_key_conflict");
+    });
+    it("fails closed on every non-record hooks.state form inside managed markers", () => {
+        const hooksPath = "/tmp/codex/hooks.json";
+        const managedTrustState = buildManagedCodexHookTrustState(hooksPath, "/tmp/omx");
+        const fixtures = [
+            ["scalar", 'hooks.state = "foreign"'],
+            ["array", "hooks.state = []"],
+            ["quoted state key", 'hooks."state" = "foreign"'],
+            ["inline non-record", 'hooks = { state = "foreign" }'],
+            [
+                "array of tables",
+                ["[[hooks.state]]", 'trusted_hash = "sha256:foreign"'].join("\n"),
+            ],
+        ];
+        for (const [name, value] of fixtures) {
+            const fixture = [
+                "# oh-my-codex (OMX) Configuration",
+                value,
+                "# End oh-my-codex",
+                "",
+            ].join("\n");
+            assert.doesNotThrow(() => TOML.parse(fixture), `${name} fixture must be valid TOML`);
+            assert.throws(() => stripManagedCodexHookTrustState(fixture, { managedTrustState }), (error) => error instanceof ManagedCodexHooksPlanError &&
+                error.code === "managed_trust_key_conflict", name);
+        }
+    });
+    it("fails closed before stripping malformed hooks.state spellings", () => {
+        const hooksPath = "/tmp/codex/hooks.json";
+        const managedTrustState = buildManagedCodexHookTrustState(hooksPath, "/tmp/omx");
+        const key = `${hooksPath}:post_compact:0:0`;
+        const hash = managedTrustState[key]?.trusted_hash;
+        assert.ok(hash);
+        const spellings = [
+            ["quoted state key", 'hooks."state" ='],
+            ["quoted hooks key", '"hooks".state ='],
+            ["fully quoted dotted key", '"hooks"."state" ='],
+            ["whitespace-delimited malformed array", 'hooks \t. "state" \t= ['],
+            ["malformed inline table", 'hooks = { "state" = {'],
+            ["incomplete table header", '[ "hooks" . "state"'],
+            ["incomplete array table header", '[[ "hooks" . "state" ]'],
+            ["incomplete hooks table header prefix", "[hooks"],
+            ["incomplete hooks array table header prefix", "[[hooks"],
+            ["partial hooks array-table closer", "[[hooks] # continuation"],
+            ["whitespace-split hooks array-table closer", "[[hooks] ]"],
+            [
+                "split hooks array-table closer",
+                ["[[hooks]", "]"].join("\n"),
+            ],
+            [
+                "comment-separated hooks assignment continuation",
+                [
+                    "hooks # continuation",
+                    '= { "state" = { trusted_hash = "sha256:foreign" } }',
+                ].join("\n"),
+            ],
+            [
+                "bare hooks assignment continuation",
+                [
+                    "hooks",
+                    '= { "state" = { trusted_hash = "sha256:foreign" } }',
+                ].join("\n"),
+            ],
+            [
+                "comment-separated hooks dotted-key continuation",
+                [
+                    "hooks # continuation",
+                    '. "state" = { trusted_hash = "sha256:foreign" }',
+                ].join("\n"),
+            ],
+            [
+                "comment-separated hooks table-header continuation",
+                ["hooks # continuation", '[ "state" ]'].join("\n"),
+            ],
+            [
+                "comment-separated hooks array-table-header continuation",
+                ["hooks # continuation", '[[ "state" ]]'].join("\n"),
+            ],
+            [
+                "split dotted key",
+                ["hooks .", '"state" = { trusted_hash = "sha256:foreign" }'].join("\n"),
+            ],
+            [
+                "unclosed multiline inline table",
+                ["hooks = {", '"state" = { trusted_hash = "sha256:foreign" }'].join("\n"),
+            ],
+            [
+                "comment-ended inline table continuation",
+                [
+                    "hooks = { # continuation",
+                    '"state" = { trusted_hash = "sha256:foreign" }',
+                ].join("\n"),
+            ],
+            [
+                "bare hooks assignment with inline-table continuation",
+                [
+                    "hooks =",
+                    '{ "state" = { trusted_hash = "sha256:foreign" } }',
+                ].join("\n"),
+            ],
+        ];
+        const isManagedTrustConflict = (error) => error instanceof ManagedCodexHooksPlanError &&
+            error.code === "managed_trust_key_conflict";
+        for (const [name, spelling] of spellings) {
+            const fixture = [
+                "# oh-my-codex (OMX) Configuration",
+                spelling,
+                "# End oh-my-codex",
+                "",
+                "[user.after]",
+                'value = "preserved"',
+                "",
+            ].join("\n");
+            const original = fixture;
+            assert.throws(() => buildMergedConfig(fixture, "/tmp/omx", { managedHookTrustState: managedTrustState }), isManagedTrustConflict, `${name} must fail before OMX block stripping`);
+            assert.equal(fixture, original, `${name} planning must not mutate input`);
+            assert.throws(() => stripExistingOmxBlocks(fixture), isManagedTrustConflict, `${name} must not be erased by direct OMX block stripping`);
+            assert.equal(fixture, original, `${name} stripping must not mutate input`);
+        }
+        const exactQuoted = [
+            "# oh-my-codex (OMX) Configuration",
+            `["hooks"."state"."${key}"]`,
+            `trusted_hash = "${hash}"`,
+            "# End oh-my-codex",
+            "",
+        ].join("\n");
+        assert.throws(() => stripExistingOmxBlocks(exactQuoted), isManagedTrustConflict, "direct stripping must not infer ownership without trust expectations");
+        assert.deepEqual(stripExistingOmxBlocks(exactQuoted, { managedTrustState }), {
+            cleaned: "",
+            removed: 1,
+        });
+        assert.doesNotThrow(() => buildMergedConfig(exactQuoted, "/tmp/omx", { managedHookTrustState: managedTrustState }));
+    });
+    it("fails closed when hooks scope crosses parsed assignments or malformed headers", () => {
+        const hooksPath = "/tmp/codex/hooks.json";
+        const managedTrustState = buildManagedCodexHookTrustState(hooksPath, "/tmp/omx");
+        const validNestedArrayAssignment = [
+            "values = [",
+            '  ["unrelated"]',
+            "]",
+        ];
+        assert.doesNotThrow(() => TOML.parse(["[hooks]", ...validNestedArrayAssignment].join("\n")));
+        const fixtures = [
+            [
+                "parsed nested assignment",
+                ["[hooks]", ...validNestedArrayAssignment, "state ="].join("\n"),
+            ],
+            [
+                "malformed bracket-prefixed line",
+                ["[hooks]", "[broken", "state ="].join("\n"),
+            ],
+        ];
+        const isManagedTrustConflict = (error) => error instanceof ManagedCodexHooksPlanError &&
+            error.code === "managed_trust_key_conflict";
+        for (const [name, content] of fixtures) {
+            const fixture = [
+                "# oh-my-codex (OMX) Configuration",
+                content,
+                "# End oh-my-codex",
+                "",
+                "[user.after]",
+                'value = "preserved"',
+                "",
+            ].join("\n");
+            const original = fixture;
+            assert.throws(() => stripExistingOmxBlocks(fixture), isManagedTrustConflict, `${name} must not be erased by direct OMX block stripping`);
+            assert.equal(fixture, original, `${name} stripping must not mutate input`);
+            assert.throws(() => buildMergedConfig(fixture, "/tmp/omx", { managedHookTrustState: managedTrustState }), isManagedTrustConflict, `${name} must fail before OMX block stripping`);
+            assert.equal(fixture, original, `${name} planning must not mutate input`);
+        }
+        const validNonHooksHeaderExit = [
+            "# oh-my-codex (OMX) Configuration",
+            "[hooks]",
+            "[unrelated]",
+            "state =",
+            "# End oh-my-codex",
+            "",
+            "[user.after]",
+            'value = "preserved"',
+            "",
+        ].join("\n");
+        const expectedExit = ["[user.after]", 'value = "preserved"', ""].join("\n");
+        assert.deepEqual(stripExistingOmxBlocks(validNonHooksHeaderExit), {
+            cleaned: expectedExit,
+            removed: 1,
+        });
+        assert.doesNotThrow(() => buildMergedConfig(validNonHooksHeaderExit, "/tmp/omx", {
+            managedHookTrustState: managedTrustState,
+        }));
+    });
+    it("fails closed for hooks array-table openers and preserves unrelated arrays", () => {
+        const hooksPath = "/tmp/codex/hooks.json";
+        const managedTrustState = buildManagedCodexHookTrustState(hooksPath, "/tmp/omx");
+        const arrayTableOpeners = [
+            ["adjacent", "[[hooks]]"],
+            ["space-split", "[ [hooks]]"],
+            ["tab-split", "[\t[hooks]]"],
+            ["newline-split", ["[[", "hooks]]"].join("\n")],
+            [
+                "two standalone opening brackets followed by independently parsed state",
+                [
+                    "[",
+                    "[",
+                    "hooks]]",
+                    'state = { trusted_hash = "sha256:foreign" }',
+                ].join("\n"),
+            ],
+            [
+                "three standalone opening brackets followed by independently parsed state",
+                [
+                    "[",
+                    "[",
+                    "[",
+                    "hooks]]]",
+                    'state = { trusted_hash = "sha256:foreign" }',
+                ].join("\n"),
+            ],
+            [
+                "comment- and blank-separated standalone opening brackets",
+                [
+                    "[",
+                    "# opening bracket continuation",
+                    "",
+                    "[",
+                    "",
+                    "# another opening bracket continuation",
+                    "[",
+                    "hooks]]]",
+                    'state = { trusted_hash = "sha256:foreign" }',
+                ].join("\n"),
+            ],
+            ["triple", "[[[hooks]]]"],
+            ["extra", "[[[[hooks]]]]"],
+            ["space-newline-split", ["[ [", "hooks]]"].join("\n")],
+            ["tab-newline-split", ["[\t[", "hooks]]"].join("\n")],
+            ["triple-newline-split", ["[[[", "hooks]]]"].join("\n")],
+            ["comment-ended", ["[[ # continuation", "hooks]]"].join("\n")],
+        ];
+        const isManagedTrustConflict = (error) => error instanceof ManagedCodexHooksPlanError &&
+            error.code === "managed_trust_key_conflict";
+        for (const [name, opener] of arrayTableOpeners) {
+            const fixture = [
+                "# oh-my-codex (OMX) Configuration",
+                opener,
+                "# End oh-my-codex",
+                "",
+                "[user.after]",
+                'value = "preserved"',
+                "",
+            ].join("\n");
+            const original = fixture;
+            assert.throws(() => buildMergedConfig(fixture, "/tmp/omx", {
+                managedHookTrustState: managedTrustState,
+            }), isManagedTrustConflict, `${name} opener must fail before OMX block stripping`);
+            assert.equal(fixture, original, `${name} planning must not mutate input`);
+            assert.throws(() => stripExistingOmxBlocks(fixture), isManagedTrustConflict, `${name} opener must not be erased by direct OMX block stripping`);
+            assert.equal(fixture, original, `${name} stripping must not mutate input`);
+        }
+        const unrelatedArrays = [
+            "[[user.before]]",
+            'name = "before"',
+            "",
+            "# oh-my-codex (OMX) Configuration",
+            "[[unrelated]]",
+            'name = "inside managed marker"',
+            "# End oh-my-codex",
+            "",
+            "[[user.after]]",
+            'name = "after"',
+            "",
+        ].join("\n");
+        const preservedArrays = [
+            "[[user.before]]",
+            'name = "before"',
+            "",
+            "[[user.after]]",
+            'name = "after"',
+            "",
+        ].join("\n");
+        assert.deepEqual(stripExistingOmxBlocks(unrelatedArrays), {
+            cleaned: preservedArrays,
+            removed: 1,
+        });
+        const merged = buildMergedConfig(unrelatedArrays, "/tmp/omx");
+        assert.match(merged, /^\[\[user\.before\]\]$/m);
+        assert.match(merged, /^\[\[user\.after\]\]$/m);
+        assert.doesNotMatch(merged, /^\[\[unrelated\]\]$/m);
+        assert.doesNotThrow(() => TOML.parse(merged));
+    });
+    it("removes valid nested hooks arrays inside exact managed marker ranges", () => {
+        const fixture = [
+            "# oh-my-codex (OMX) Configuration",
+            "values = [",
+            "  [",
+            "",
+            "    # a value named hooks is not a table prefix",
+            '    "hooks",',
+            "  ],",
+            "  # nor is this independently nested array",
+            "  [",
+            '    "unrelated",',
+            "  ],",
+            "  [",
+            '    [["hooks"]]',
+            "  ],",
+            "  [",
+            '    [ [ "hooks" ] ]',
+            "  ],",
+            "]",
+            "outer.values = [",
+            '  [["hooks"]]',
+            "]",
+            '"" = [',
+            '  [ [ "hooks" ] ]',
+            "]",
+            "# End oh-my-codex",
+            "",
+            "[user.after]",
+            'value = "preserved"',
+            "",
+        ].join("\n");
+        const expected = ["[user.after]", 'value = "preserved"', ""].join("\n");
+        assert.doesNotThrow(() => TOML.parse(fixture));
+        assert.deepEqual(stripExistingOmxBlocks(fixture), { cleaned: expected, removed: 1 });
+        const merged = buildMergedConfig(fixture, "/tmp/omx");
+        assert.doesNotMatch(merged, /^values = \[/m);
+        assert.match(merged, /^\[user\.after\]$/m);
+        assert.doesNotThrow(() => TOML.parse(merged));
+    });
+    it("ignores inert hooks.state text inside exact managed marker ranges", () => {
+        const fixture = [
+            "# oh-my-codex (OMX) Configuration",
+            '# hooks."state" =',
+            'basic = "hooks.\'state\' ="',
+            "literal = 'hooks = { state = {'",
+            'multiline = """',
+            '[[ "hooks" . "state" ]',
+            'hooks = { "state" = {',
+            '"""',
+            "# End oh-my-codex",
+            "",
+            "[user.after]",
+            'value = "preserved"',
+            "",
+        ].join("\n");
+        const expected = ["[user.after]", 'value = "preserved"', ""].join("\n");
+        assert.deepEqual(stripExistingOmxBlocks(fixture), { cleaned: expected, removed: 1 });
+        assert.doesNotThrow(() => buildMergedConfig(fixture, "/tmp/omx"));
+    });
+    it("removes an exact inline state entry within a hooks.state table", () => {
+        const hooksPath = "/tmp/codex/hooks.json";
+        const managedTrustState = buildManagedCodexHookTrustState(hooksPath, "/tmp/omx");
+        const key = `${hooksPath}:post_compact:0:0`;
+        const hash = managedTrustState[key]?.trusted_hash;
+        assert.ok(hash);
+        const inline = [
+            "[hooks.state]",
+            `"${key}" = { trusted_hash = "${hash}" }`,
+            "",
+            "[desktop]",
+            "git-create-pull-request-as-draft = true",
+            "",
+        ].join("\n");
+        const stripped = stripManagedCodexHookTrustState(inline, { managedTrustState });
+        assert.doesNotMatch(stripped, new RegExp(key.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")));
+        assert.match(stripped, /^\[hooks\.state\]$/m);
+        assert.match(stripped, /^\[desktop\]$/m);
+        assert.doesNotThrow(() => TOML.parse(stripped));
+    });
+    it("fails closed on multi-field, array-like, and mixed managed trust representations", () => {
+        const hooksPath = "/tmp/codex/hooks.json";
+        const managedTrustState = buildManagedCodexHookTrustState(hooksPath, "/tmp/omx");
+        const key = `${hooksPath}:post_compact:0:0`;
+        const hash = managedTrustState[key]?.trusted_hash;
+        assert.ok(hash);
+        const fixtures = [
+            [
+                `hooks.state."${key}" = { trusted_hash = "${hash}", enabled = false }`,
+                "",
+            ].join("\n"),
+            [
+                `hooks.state."${key}" = [{ trusted_hash = "${hash}" }]`,
+                "",
+            ].join("\n"),
+            [
+                `hooks.state."${key}" = { trusted_hash = "${hash}" }`,
+                `[hooks.state."${key}"]`,
+                `trusted_hash = "${hash}"`,
+                "",
+            ].join("\n"),
+        ];
+        for (const fixture of fixtures) {
+            assert.throws(() => stripManagedCodexHookTrustState(fixture, { managedTrustState }), (error) => error instanceof ManagedCodexHooksPlanError &&
+                error.code === "managed_trust_key_conflict");
+            assert.throws(() => buildMergedConfig(fixture, "/tmp/omx", { managedHookTrustState: managedTrustState }), (error) => error instanceof ManagedCodexHooksPlanError &&
+                error.code === "managed_trust_key_conflict");
         }
     });
     it("does not remove unfenced hook trust-state tables without a proof map", () => {
@@ -955,31 +1762,138 @@ describe("config generator idempotency (#384)", () => {
         assert.match(repaired, /^enabled = false$/m);
         assertSingleManagedHookTrustState(repaired);
     });
-    it("dedupes stale unfenced managed hook trust-state tables during legacy setup refresh", () => {
+    it("preserves managed-looking trust blocks inside multiline TOML values", () => {
         const hooksPath = "/tmp/codex/hooks.json";
-        const stalePluginModeConfig = [
-            "[features]",
-            "codex_hooks = true",
-            "goals = true",
-            "",
-            '[hooks.state."custom:/hooks.json:stop:0:0"]',
-            'trusted_hash = "sha256:user"',
-            "enabled = false",
-            "",
-            // Regression fixture for #2225: plugin-mode state could be left outside
-            // the managed fence, then legacy setup appended the same table again.
-            '[hooks.state."/tmp/codex/hooks.json:post_compact:0:0"]',
-            'trusted_hash = "sha256:stale-plugin-mode"',
-            "",
+        const managedTrustState = buildManagedCodexHookTrustState(hooksPath, "/tmp/omx");
+        const embeddedTrustBlock = [
+            "# OMX-owned Codex hook trust state",
+            "# Trusts only setup-managed native hook wrappers.",
+            ...Object.entries(managedTrustState)
+                .sort(([left], [right]) => left.localeCompare(right))
+                .flatMap(([key, state]) => [
+                `[hooks.state."${key}"]`,
+                `trusted_hash = "${state.trusted_hash}"`,
+                "",
+            ]),
+            "# End OMX-owned Codex hook trust state",
         ].join("\n");
-        const refreshed = buildMergedConfig(stalePluginModeConfig, "/tmp/omx", {
+        const multilineBasicValue = `basic = """\n${embeddedTrustBlock}\n"""`;
+        const multilineLiteralValue = `literal = '''\n${embeddedTrustBlock}\n'''`;
+        const config = [multilineBasicValue, "", multilineLiteralValue, ""].join("\n");
+        const first = upsertManagedCodexHookTrustState(config, "/tmp/omx", hooksPath, {
+            managedTrustState,
+        });
+        const refreshed = upsertManagedCodexHookTrustState(first, "/tmp/omx", hooksPath, {
+            managedTrustState,
+        });
+        const stripped = stripManagedCodexHookTrustState(refreshed, { managedTrustState });
+        assert.equal(refreshed, first, "the real managed block should still be replaced idempotently");
+        for (const preserved of [first, stripped]) {
+            assert.ok(preserved.includes(multilineBasicValue));
+            assert.ok(preserved.includes(multilineLiteralValue));
+        }
+        const parsed = TOML.parse(stripped);
+        assert.equal(parsed.basic, `${embeddedTrustBlock}\n`);
+        assert.equal(parsed.literal, `${embeddedTrustBlock}\n`);
+        assert.equal(parsed.hooks, undefined, "only the real managed trust tables should be stripped");
+        const unterminatedMultilineValue = multilineBasicValue.slice(0, -3);
+        assert.equal(stripManagedCodexHookTrustState(unterminatedMultilineValue, { managedTrustState }), unterminatedMultilineValue, "an ambiguous unterminated multiline value must not lose managed-looking content");
+    });
+    it("uses strict final hook coordinates for precomputed managed trust", () => {
+        const hooksPath = "/tmp/codex/hooks.json";
+        const foreignGroup = {
+            hooks: [
+                {
+                    type: "command",
+                    command: "/usr/bin/python3 /tmp/user-hook.py",
+                    timeout: 5,
+                },
+            ],
+        };
+        const existingHooks = JSON.stringify({
+            hooks: Object.fromEntries(MANAGED_HOOK_EVENTS.map((eventName) => [eventName, [foreignGroup]])),
+        });
+        const plan = planManagedCodexHooksMerge(existingHooks, "/tmp/omx", hooksPath);
+        assert.equal(plan.ok, true);
+        if (!plan.ok)
+            return;
+        const refreshed = buildMergedConfig("", "/tmp/omx", {
             codexHooksFile: hooksPath,
+            managedHookTrustState: plan.finalTrustState,
+            priorManagedHookTrustState: plan.priorTrustState,
+            legacyHookTrustState: plan.legacyTrustState,
         });
-        assert.doesNotThrow(() => TOML.parse(refreshed));
-        assert.equal(count(refreshed, /^\[hooks\.state\."\/tmp\/codex\/hooks\.json:post_compact:0:0"\]$/gm), 1, "legacy refresh should replace the stale plugin-mode managed hook state");
-        assert.match(refreshed, /^\[hooks\.state\."custom:\/hooks\.json:stop:0:0"\]$/m, "unrelated user hook state should be preserved");
+        const parsed = TOML.parse(refreshed);
+        const trustKeys = Object.keys(parsed.hooks?.state ?? {}).sort();
+        assert.deepEqual(trustKeys, Object.keys(plan.finalTrustState).sort());
+        for (const eventName of MANAGED_HOOK_EVENTS) {
+            const eventLabel = eventName
+                .replace(/([A-Z])/g, "_$1")
+                .toLowerCase()
+                .replace(/^_/, "");
+            assert.ok(trustKeys.some((key) => key.includes(`:${eventLabel}:1:0`)), `${eventName} should retain the actual final group index after foreign hooks`);
+        }
+    });
+    it("migrates exact legacy hooks.json state in the same precomputed config plan", () => {
+        const hooksPath = "/tmp/codex/hooks.json";
+        const plan = planManagedCodexHooksMerge(JSON.stringify({
+            state: {
+                "legacy:/hooks.json:stop:0:0": {
+                    trusted_hash: "sha256:legacy",
+                    enabled: false,
+                },
+            },
+            hooks: {},
+        }), "/tmp/omx", hooksPath);
+        assert.equal(plan.ok, true);
+        if (!plan.ok)
+            return;
+        const refreshed = buildMergedConfig("", "/tmp/omx", {
+            codexHooksFile: hooksPath,
+            managedHookTrustState: plan.finalTrustState,
+            priorManagedHookTrustState: plan.priorTrustState,
+            legacyHookTrustState: plan.legacyTrustState,
+        });
+        assert.doesNotMatch(plan.finalContent ?? "", /"state"/);
+        assert.match(refreshed, /^\[hooks\.state\."legacy:\/hooks\.json:stop:0:0"\]$/m);
+        assert.match(refreshed, /^trusted_hash = "sha256:legacy"$/m);
         assert.match(refreshed, /^enabled = false$/m);
-        assertSingleManagedHookTrustState(refreshed);
+    });
+    it("migrates a legacy __proto__ trust key into config.toml", () => {
+        const plan = planManagedCodexHooksMerge('{"state":{"__proto__":{"trusted_hash":"sha256:legacy","enabled":true}}}', "/tmp/omx", "/tmp/codex/hooks.json");
+        assert.equal(plan.ok, true);
+        if (!plan.ok)
+            return;
+        const config = buildMergedConfig("", "/tmp/omx", {
+            legacyHookTrustState: plan.legacyTrustState,
+        });
+        assert.match(config, /^\[hooks\.state\."__proto__"\]$/m);
+        assert.match(config, /^trusted_hash = "sha256:legacy"$/m);
+        assert.match(config, /^enabled = true$/m);
+    });
+    it("coalesces matching legacy hook trust config tables and rejects hash or enabled collisions", () => {
+        const key = "legacy:/hooks.json:stop:0:0";
+        const legacyHookTrustState = {
+            [key]: { trusted_hash: "sha256:legacy", enabled: false },
+        };
+        const matchingConfig = [
+            `[hooks.state."${key}"]`,
+            'trusted_hash = "sha256:legacy"',
+            "enabled = false",
+            "",
+        ].join("\n");
+        const matching = buildMergedConfig(matchingConfig, "/tmp/omx", {
+            legacyHookTrustState,
+        });
+        assert.equal(count(matching, /^\[hooks\.state\."legacy:\/hooks\.json:stop:0:0"\]$/gm), 1);
+        for (const conflictingConfig of [
+            matchingConfig.replace("sha256:legacy", "sha256:other"),
+            matchingConfig.replace("enabled = false", "enabled = true"),
+            matchingConfig.replace("\nenabled = false", ""),
+        ]) {
+            assert.throws(() => buildMergedConfig(conflictingConfig, "/tmp/omx", { legacyHookTrustState }), (error) => error instanceof ManagedCodexHooksPlanError &&
+                error.code === "managed_trust_key_conflict");
+        }
     });
     it("syncs shared MCP registry entries in a dedicated managed block", async () => {
         const wd = await mkdtemp(join(tmpdir(), "omx-idem-"));