oh-my-codex 0.16.2 → 0.16.4

package/dist/config/__tests__/codex-hooks.test.js

@@ -1,12 +1,46 @@
 import { describe, it } from "node:test";
 import assert from "node:assert/strict";
-import { buildManagedCodexHookTrustState, buildManagedCodexHookTrustToml, buildManagedCodexHooksConfig, getMissingManagedCodexHookEvents, mergeManagedCodexHooksConfig, removeManagedCodexHooks, } from "../codex-hooks.js";
+import { mkdir, mkdtemp, rm, symlink, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { buildManagedCodexHookTrustState, buildManagedCodexHookTrustToml, buildManagedCodexHooksConfig, discoverCodexHookConfigPaths, dedupeCodexHookConfigPaths, getMissingManagedCodexHookEvents, hasUserCodexHooksAfterManagedRemoval, isRuntimeCodexHomeMirrorPath, mergeManagedCodexHooksConfig, removeManagedCodexHooks, } from "../codex-hooks.js";
 describe("codex hooks helpers", () => {
     it("uses the current JavaScript runtime for managed hook commands", () => {
         const config = buildManagedCodexHooksConfig("/repo");
         const command = config.hooks.SessionStart[0]?.hooks?.[0]?.command;
         assert.equal(command, `"${process.execPath.replace(/\\/g, "\\\\").replace(/"/g, '\\"')}" "/repo/dist/scripts/codex-native-hook.js"`);
     });
+    it("registers SessionStart for startup, resume, and clear reset sources", () => {
+        const config = buildManagedCodexHooksConfig("/repo");
+        const sessionStart = config.hooks.SessionStart[0];
+        assert.equal(sessionStart?.matcher, "startup|resume|clear");
+        assert.match(sessionStart?.matcher ?? "", /(?:^|\|)clear(?:\||$)/, "Codex emits SessionStart source=clear after /clear replacement threads; OMX must keep beginning-of-session hooks active");
+        assert.match(sessionStart?.matcher ?? "", /(?:^|\|)startup(?:\||$)/, "fresh /new thread starts remain covered by Codex's startup SessionStart source");
+    });
+    it("uses portable node invocation for Windows managed hook commands", () => {
+        const config = buildManagedCodexHooksConfig("D:\\Program Files\\nvm\\v24.12.0\\node_modules\\oh-my-codex", { platform: "win32" });
+        const command = config.hooks.SessionStart[0]?.hooks?.[0]?.command;
+        assert.equal(command, 'node "D:\\Program Files\\nvm\\v24.12.0\\node_modules\\oh-my-codex\\dist\\scripts\\codex-native-hook.js"');
+        assert.doesNotMatch(command ?? "", /^"/, "the node launcher must not be a quoted absolute node.exe path");
+        assert.match(command ?? "", /^node "[^"]*Program Files[^"]*codex-native-hook\.js"$/);
+    });
+    it("keeps Windows hook script paths quoted when they contain spaces", () => {
+        const merged = JSON.parse(mergeManagedCodexHooksConfig(JSON.stringify({
+            hooks: {
+                PreToolUse: [
+                    {
+                        matcher: "Bash",
+                        hooks: [{ type: "command", command: "echo keep-me" }],
+                    },
+                ],
+            },
+        }), "D:\\Program Files\\nvm\\v24.12.0\\node_modules\\oh-my-codex", { platform: "win32" }));
+        const commands = merged.hooks.PreToolUse
+            .flatMap((entry) => entry.hooks ?? [])
+            .map((hook) => hook.command);
+        assert.ok(commands.includes("echo keep-me"));
+        assert.ok(commands.includes('node "D:\\Program Files\\nvm\\v24.12.0\\node_modules\\oh-my-codex\\dist\\scripts\\codex-native-hook.js"'));
+    });
     it("merges managed wrappers without dropping user hooks", () => {
         const merged = JSON.parse(mergeManagedCodexHooksConfig(JSON.stringify({
             hooks: {
@@ -80,8 +114,14 @@ describe("codex hooks helpers", () => {
         assert.match(toml, /^trusted_hash = "sha256:[a-f0-9]{64}"$/m);
         assert.doesNotMatch(toml, /echo keep-me/);
     });
-    it("can preserve existing hook state when explicitly merging trust into hooks.json", () => {
+    it("keeps hooks.json trust state outside the hook event map", () => {
         const merged = JSON.parse(mergeManagedCodexHooksConfig(JSON.stringify({
+            state: {
+                "custom:/hooks.json:prompt:0:0": {
+                    trusted_hash: "sha256:top-level-user",
+                    enabled: true,
+                },
+            },
             hooks: {
                 state: {
                     "custom:/hooks.json:stop:0:0": {
@@ -96,13 +136,57 @@ describe("codex hooks helpers", () => {
                 ],
             },
         }), "/repo", "/hooks.json"));
-        assert.deepEqual(merged.hooks.state["custom:/hooks.json:stop:0:0"], {
+        assert.equal(Object.hasOwn(merged.hooks, "state"), false);
+        assert.ok(Object.values(merged.hooks).every(Array.isArray), "Codex Rust hook discovery expects hooks.hooks values to be event arrays");
+        assert.deepEqual(merged.state["custom:/hooks.json:stop:0:0"], {
             trusted_hash: "sha256:user",
             enabled: false,
         });
-        assert.match(merged.hooks.state["/hooks.json:stop:0:0"]?.trusted_hash ?? "", /^sha256:[a-f0-9]{64}$/);
+        assert.deepEqual(merged.state["custom:/hooks.json:prompt:0:0"], {
+            trusted_hash: "sha256:top-level-user",
+            enabled: true,
+        });
+        assert.match(merged.state["/hooks.json:stop:0:0"]?.trusted_hash ?? "", /^sha256:[a-f0-9]{64}$/);
         assert.match(JSON.stringify(merged.hooks.Stop), /echo user-stop/);
     });
+    it("preserves top-level managed hook state metadata while updating trusted_hash", () => {
+        const managedState = buildManagedCodexHookTrustState("/hooks.json", "/repo");
+        const managedKey = Object.keys(managedState).find((key) => key.includes(":stop:")) ?? Object.keys(managedState)[0];
+        assert.ok(managedKey);
+        const merged = JSON.parse(mergeManagedCodexHooksConfig(JSON.stringify({
+            state: {
+                [managedKey]: {
+                    trusted_hash: "sha256:old",
+                    enabled: false,
+                },
+            },
+        }), "/repo", "/hooks.json"));
+        assert.equal(Object.hasOwn(merged.hooks, "state"), false);
+        assert.deepEqual(merged.state[managedKey], {
+            trusted_hash: managedState[managedKey]?.trusted_hash,
+            enabled: false,
+        });
+    });
+    it("migrates misplaced managed hook state metadata while updating trusted_hash", () => {
+        const managedState = buildManagedCodexHookTrustState("/hooks.json", "/repo");
+        const managedKey = Object.keys(managedState).find((key) => key.includes(":stop:")) ?? Object.keys(managedState)[0];
+        assert.ok(managedKey);
+        const merged = JSON.parse(mergeManagedCodexHooksConfig(JSON.stringify({
+            hooks: {
+                state: {
+                    [managedKey]: {
+                        trusted_hash: "sha256:old",
+                        enabled: false,
+                    },
+                },
+            },
+        }), "/repo", "/hooks.json"));
+        assert.equal(Object.hasOwn(merged.hooks, "state"), false);
+        assert.deepEqual(merged.state[managedKey], {
+            trusted_hash: managedState[managedKey]?.trusted_hash,
+            enabled: false,
+        });
+    });
     it("keeps managed hook merge idempotent", () => {
         const first = mergeManagedCodexHooksConfig(null, "/repo", "/hooks.json");
         const second = mergeManagedCodexHooksConfig(first, "/repo", "/hooks.json");
@@ -112,6 +196,11 @@ describe("codex hooks helpers", () => {
         const managedOnly = JSON.stringify(buildManagedCodexHooksConfig("/repo"));
         const preserved = JSON.stringify({
             hooks: {
+                state: {
+                    "custom:/hooks.json:session_start:0:0": {
+                        trusted_hash: "sha256:user",
+                    },
+                },
                 SessionStart: [
                     {
                         hooks: [
@@ -126,12 +215,53 @@ describe("codex hooks helpers", () => {
         const removedManagedOnly = removeManagedCodexHooks(managedOnly);
         assert.equal(removedManagedOnly.removedCount > 0, true);
         assert.equal(removedManagedOnly.nextContent, null);
+        const generatedWithTrustState = mergeManagedCodexHooksConfig(null, "/repo", "/hooks.json");
+        const removedGeneratedWithTrustState = removeManagedCodexHooks(generatedWithTrustState);
+        assert.equal(removedGeneratedWithTrustState.removedCount > 0, true);
+        assert.equal(removedGeneratedWithTrustState.nextContent, null);
         const removedMixed = removeManagedCodexHooks(preserved);
         assert.equal(removedMixed.removedCount, 1);
         assert.ok(removedMixed.nextContent);
         assert.match(removedMixed.nextContent, /echo keep-me/);
         assert.doesNotMatch(removedMixed.nextContent, /codex-native-hook\.js/);
         assert.match(removedMixed.nextContent, /"version": 1/);
+        const cleaned = JSON.parse(removedMixed.nextContent);
+        assert.equal(Object.hasOwn(cleaned.hooks ?? {}, "state"), false);
+        assert.deepEqual(cleaned.state?.["custom:/hooks.json:session_start:0:0"], {
+            trusted_hash: "sha256:user",
+        });
+    });
+    it("detects user hooks that remain after managed wrapper removal", () => {
+        const managedOnly = JSON.stringify(buildManagedCodexHooksConfig("/repo"));
+        const mixed = JSON.stringify({
+            hooks: {
+                state: {
+                    "custom:/hooks.json:stop:0:0": {
+                        trusted_hash: "sha256:user",
+                    },
+                },
+                SessionStart: [
+                    {
+                        hooks: [
+                            { type: "command", command: 'node "/repo/dist/scripts/codex-native-hook.js"' },
+                            { type: "command", command: "echo keep-me" },
+                        ],
+                    },
+                ],
+            },
+        });
+        const stateOnly = JSON.stringify({
+            hooks: {
+                state: {
+                    "custom:/hooks.json:stop:0:0": {
+                        trusted_hash: "sha256:user",
+                    },
+                },
+            },
+        });
+        assert.equal(hasUserCodexHooksAfterManagedRemoval(managedOnly), false);
+        assert.equal(hasUserCodexHooksAfterManagedRemoval(mixed), true);
+        assert.equal(hasUserCodexHooksAfterManagedRemoval(stateOnly), false);
     });
     it("registers managed compact hook wrappers", () => {
         const config = buildManagedCodexHooksConfig("/repo");
@@ -143,6 +273,8 @@ describe("codex hooks helpers", () => {
         const postCommand = postCompact[0]?.hooks?.[0]?.command;
         assert.match(String(preCommand), /codex-native-hook\.js/);
         assert.match(String(postCommand), /codex-native-hook\.js/);
+        assert.equal(postCommand, preCommand);
+        assert.doesNotMatch(String(postCommand), /PostCompact Nudge|additionalContext|printf/);
     });
     it("reports missing managed hook coverage by event", () => {
         const missing = getMissingManagedCodexHookEvents(JSON.stringify({
@@ -168,5 +300,57 @@ describe("codex hooks helpers", () => {
     it("returns null for invalid hooks.json content", () => {
         assert.equal(getMissingManagedCodexHookEvents("{ invalid json"), null);
     });
+    it("ignores runtime codex-home hook mirrors before hook loading", async () => {
+        const cwd = await mkdtemp(join(tmpdir(), "omx-hook-dedupe-"));
+        try {
+            const canonicalPath = join(cwd, ".codex", "hooks.json");
+            const mirrorPath = join(cwd, ".omx", "runtime", "codex-home", "session-1", "hooks.json");
+            await mkdir(join(cwd, ".codex"), { recursive: true });
+            await mkdir(join(cwd, ".omx", "runtime", "codex-home", "session-1"), { recursive: true });
+            await writeFile(canonicalPath, JSON.stringify(buildManagedCodexHooksConfig("/repo")));
+            await symlink(canonicalPath, mirrorPath);
+            assert.equal(isRuntimeCodexHomeMirrorPath(mirrorPath, cwd), true);
+            const result = await dedupeCodexHookConfigPaths([canonicalPath, mirrorPath], cwd);
+            assert.deepEqual(result.paths.map((entry) => entry.path), [canonicalPath]);
+            assert.deepEqual(result.skipped.map((entry) => entry.reason), ["runtime_codex_home_mirror"]);
+        }
+        finally {
+            await rm(cwd, { recursive: true, force: true });
+        }
+    });
+    it("de-dupes hook config paths by realpath outside runtime mirrors", async () => {
+        const cwd = await mkdtemp(join(tmpdir(), "omx-hook-realpath-dedupe-"));
+        try {
+            const canonicalPath = join(cwd, ".codex", "hooks.json");
+            const aliasPath = join(cwd, "alias-hooks.json");
+            await mkdir(join(cwd, ".codex"), { recursive: true });
+            await writeFile(canonicalPath, JSON.stringify(buildManagedCodexHooksConfig("/repo")));
+            await symlink(canonicalPath, aliasPath);
+            const result = await dedupeCodexHookConfigPaths([canonicalPath, aliasPath], cwd);
+            assert.deepEqual(result.paths.map((entry) => entry.path), [canonicalPath]);
+            assert.deepEqual(result.skipped.map((entry) => entry.reason), ["duplicate_realpath"]);
+        }
+        finally {
+            await rm(cwd, { recursive: true, force: true });
+        }
+    });
+    it("discovers canonical hook configs while skipping runtime codex-home mirrors", async () => {
+        const cwd = await mkdtemp(join(tmpdir(), "omx-hook-discover-"));
+        try {
+            const canonicalPath = join(cwd, ".codex", "hooks.json");
+            const mirrorPath = join(cwd, ".omx", "runtime", "codex-home", "session-1", "hooks.json");
+            await mkdir(join(cwd, ".codex"), { recursive: true });
+            await mkdir(join(cwd, ".omx", "runtime", "codex-home", "session-1"), { recursive: true });
+            await writeFile(canonicalPath, JSON.stringify(buildManagedCodexHooksConfig("/repo")));
+            await writeFile(mirrorPath, JSON.stringify(buildManagedCodexHooksConfig("/repo")));
+            const result = await discoverCodexHookConfigPaths(cwd);
+            assert.deepEqual(result.paths.map((entry) => entry.path), [canonicalPath]);
+            assert.deepEqual(result.skipped.map((entry) => entry.path), [mirrorPath]);
+            assert.deepEqual(result.skipped.map((entry) => entry.reason), ["runtime_codex_home_mirror"]);
+        }
+        finally {
+            await rm(cwd, { recursive: true, force: true });
+        }
+    });
 });
 //# sourceMappingURL=codex-hooks.test.js.map

package/dist/config/__tests__/codex-hooks.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"codex-hooks.test.js","sourceRoot":"","sources":["../../../src/config/__tests__/codex-hooks.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,EACL,+BAA+B,EAC/B,8BAA8B,EAC9B,4BAA4B,EAC5B,gCAAgC,EAChC,4BAA4B,EAC5B,uBAAuB,GACxB,MAAM,mBAAmB,CAAC;AAE3B,QAAQ,CAAC,qBAAqB,EAAE,GAAG,EAAE;IAEnC,EAAE,CAAC,+DAA+D,EAAE,GAAG,EAAE;QACvE,MAAM,MAAM,GAAG,4BAA4B,CAAC,OAAO,CAAC,CAAC;QACrD,MAAM,OAAO,GAAI,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAyD,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC;QAE3H,MAAM,CAAC,KAAK,CACV,OAAO,EACP,IAAI,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,6CAA6C,CAC9G,CAAC;IACJ,CAAC,CAAC,CAAC;IACH,EAAE,CAAC,qDAAqD,EAAE,GAAG,EAAE;QAC7D,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CACvB,4BAA4B,CAC1B,IAAI,CAAC,SAAS,CAAC;YACb,KAAK,EAAE;gBACL,YAAY,EAAE;oBACZ;wBACE,KAAK,EAAE;4BACL,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,+CAA+C,EAAE;4BAC7E,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,cAAc,EAAE;yBAC7C;qBACF;oBACD;wBACE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,sBAAsB,EAAE,CAAC;qBAC9D;iBACF;aACF;SACF,CAAC,EACF,OAAO,CACR,CAC2E,CAAC;QAE/E,MAAM,YAAY,GAAG,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC;QAC/C,MAAM,CAAC,KAAK,CACV,YAAY,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CACjE,MAAM,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,sBAAsB,CAAC,CAC5D,CAAC,MAAM,EACR,CAAC,CACF,CAAC;QACF,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,cAAc,CAAC,CAAC;QAC3D,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,sBAAsB,CAAC,CAAC;QACnE,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,6BAA6B,CAAC,CAAC;IACnF,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yDAAyD,EAAE,GAAG,EAAE;QACjE,MAAM,KAAK,GAAG,+BAA+B,CAAC,4BAA4B,EAAE,OAAO,CAAC,CAAC;QACrF,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC;QAEvC,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE;YACrB,6CAA6C;YAC7C,8CAA8C;YAC9C,4CAA4C;YAC5C,6CAA6C;YAC7C,8CAA8C;YAC9C,qCAAqC;YACrC,mDAAmD;SACpD,CAAC,CAAC;QACH,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;YAC7C,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,YAAY,EAAE,uBAAuB,CAAC,CAAC;QAChE,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uDAAuD,EAAE,KAAK,IAAI,EAAE;QACrE,MAAM,KAAK,GAAG,+BAA+B,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;QACtE,MAAM,OAAO,GACX,IAAI,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,6CAA6C,CAAC;QAChH,MAAM,gBAAgB,GAAG;YACvB,UAAU,EAAE,cAAc;YAC1B,KAAK,EAAE;gBACL;oBACE,KAAK,EAAE,KAAK;oBACZ,OAAO;oBACP,OAAO,EAAE,GAAG;oBACZ,IAAI,EAAE,SAAS;iBAChB;aACF;YACD,OAAO,EAAE,MAAM;SAChB,CAAC;QACF,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;YAC/B,UAAU,EAAE,gBAAgB,CAAC,UAAU;YACvC,KAAK,EAAE,gBAAgB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;gBAC3C,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,IAAI,EAAE,IAAI,CAAC,IAAI;aAChB,CAAC,CAAC;YACH,OAAO,EAAE,gBAAgB,CAAC,OAAO;SAClC,CAAC,CAAC;QACH,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,MAAM,CAAC,aAAa,CAAC,CAAC;QACnD,MAAM,YAAY,GAAG,UAAU,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;QAEtF,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,8BAA8B,CAAC,EAAE,YAAY,EAAE,YAAY,CAAC,CAAC;IAClF,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oEAAoE,EAAE,GAAG,EAAE;QAC5E,MAAM,IAAI,GAAG,8BAA8B,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;QAEpE,MAAM,CAAC,EAAE,CACP,IAAI,CAAC,QAAQ,CAAC,8CAA8C,CAAC,CAC9D,CAAC;QACF,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,yCAAyC,CAAC,CAAC;QAC9D,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAC5C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gFAAgF,EAAE,GAAG,EAAE;QACxF,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CACvB,4BAA4B,CAC1B,IAAI,CAAC,SAAS,CAAC;YACb,KAAK,EAAE;gBACL,KAAK,EAAE;oBACL,6BAA6B,EAAE;wBAC7B,YAAY,EAAE,aAAa;wBAC3B,OAAO,EAAE,KAAK;qBACf;iBACF;gBACD,IAAI,EAAE;oBACJ;wBACE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,gBAAgB,EAAE,CAAC;qBACxD;iBACF;aACF;SACF,CAAC,EACF,OAAO,EACP,aAAa,CACd,CAMF,CAAC;QAEF,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,6BAA6B,CAAC,EAAE;YAClE,YAAY,EAAE,aAAa;YAC3B,OAAO,EAAE,KAAK;SACf,CAAC,CAAC;QACH,MAAM,CAAC,KAAK,CACV,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,sBAAsB,CAAC,EAAE,YAAY,IAAI,EAAE,EAC9D,uBAAuB,CACxB,CAAC;QACF,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,gBAAgB,CAAC,CAAC;IACpE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qCAAqC,EAAE,GAAG,EAAE;QAC7C,MAAM,KAAK,GAAG,4BAA4B,CAAC,IAAI,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC;QACzE,MAAM,MAAM,GAAG,4BAA4B,CAAC,KAAK,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC;QAE3E,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAC9B,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4DAA4D,EAAE,GAAG,EAAE;QACpE,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,4BAA4B,CAAC,OAAO,CAAC,CAAC,CAAC;QAC1E,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;YAC/B,KAAK,EAAE;gBACL,YAAY,EAAE;oBACZ;wBACE,KAAK,EAAE;4BACL,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,gDAAgD,EAAE;4BAC9E,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,cAAc,EAAE;yBAC7C;qBACF;iBACF;aACF;YACD,OAAO,EAAE,CAAC;SACX,CAAC,CAAC;QAEH,MAAM,kBAAkB,GAAG,uBAAuB,CAAC,WAAW,CAAC,CAAC;QAChE,MAAM,CAAC,KAAK,CAAC,kBAAkB,CAAC,YAAY,GAAG,CAAC,EAAE,IAAI,CAAC,CAAC;QACxD,MAAM,CAAC,KAAK,CAAC,kBAAkB,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;QAEnD,MAAM,YAAY,GAAG,uBAAuB,CAAC,SAAS,CAAC,CAAC;QACxD,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC;QAC3C,MAAM,CAAC,EAAE,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;QACpC,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;QACvD,MAAM,CAAC,YAAY,CAAC,YAAY,CAAC,WAAW,EAAE,uBAAuB,CAAC,CAAC;QACvE,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;IACzD,CAAC,CAAC,CAAC;IAIH,EAAE,CAAC,yCAAyC,EAAE,GAAG,EAAE;QACjD,MAAM,MAAM,GAAG,4BAA4B,CAAC,OAAO,CAAC,CAAC;QACrD,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;QAC3C,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;QAC5C,MAAM,UAAU,GAAG,MAAM,CAAC,KAAK,CAAC,UAA4D,CAAC;QAC7F,MAAM,WAAW,GAAG,MAAM,CAAC,KAAK,CAAC,WAA6D,CAAC;QAC/F,MAAM,UAAU,GAAG,UAAU,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC;QACtD,MAAM,WAAW,GAAG,WAAW,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC;QACxD,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,uBAAuB,CAAC,CAAC;QAC1D,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,uBAAuB,CAAC,CAAC;IAC7D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gDAAgD,EAAE,GAAG,EAAE;QACxD,MAAM,OAAO,GAAG,gCAAgC,CAC9C,IAAI,CAAC,SAAS,CAAC;YACb,KAAK,EAAE;gBACL,YAAY,EAAE;oBACZ;wBACE,KAAK,EAAE;4BACL,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,gDAAgD,EAAE;yBAC/E;qBACF;iBACF;gBACD,gBAAgB,EAAE;oBAChB;wBACE,KAAK,EAAE;4BACL,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,kBAAkB,EAAE;yBACjD;qBACF;iBACF;aACF;SACF,CAAC,CACH,CAAC;QAEF,MAAM,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,YAAY,EAAE,aAAa,EAAE,kBAAkB,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,CAAC,CAAC,CAAC;IACpH,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6CAA6C,EAAE,GAAG,EAAE;QACrD,MAAM,CAAC,KAAK,CAAC,gCAAgC,CAAC,gBAAgB,CAAC,EAAE,IAAI,CAAC,CAAC;IACzE,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"codex-hooks.test.js","sourceRoot":"","sources":["../../../src/config/__tests__/codex-hooks.test.ts"],"names":[],"mappings":"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"}

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

@@ -8,40 +8,63 @@ 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 } from "../generator.js";
+import { buildMergedConfig, cleanCodexModelAvailabilityNuxIfNeeded, mergeConfig, repairConfigIfNeeded, stripManagedCodexHookTrustState, upsertManagedCodexHookTrustState, } from "../generator.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;
 }
 /** Assert the current OMX block appears exactly once */
-function assertSingleOmxBlock(toml) {
+function assertSingleOmxBlock(toml, options = {}) {
     assert.equal(count(toml, /# oh-my-codex \(OMX\) Configuration/g), 1, "OMX marker should appear once");
     assert.equal(count(toml, /^# End oh-my-codex$/gm), 1, "End marker should appear once");
-    assert.equal(count(toml, /^\[mcp_servers\.omx_state\]$/gm), 1, "[mcp_servers.omx_state] should appear once");
-    assert.equal(count(toml, /^\[mcp_servers\.omx_memory\]$/gm), 1, "[mcp_servers.omx_memory] should appear once");
-    assert.equal(count(toml, /^\[mcp_servers\.omx_code_intel\]$/gm), 1, "[mcp_servers.omx_code_intel] should appear once");
-    assert.equal(count(toml, /^\[mcp_servers\.omx_trace\]$/gm), 1, "[mcp_servers.omx_trace] should appear once");
-    assert.equal(count(toml, /^\[mcp_servers\.omx_wiki\]$/gm), 1, "[mcp_servers.omx_wiki] should appear once");
+    if (options.includeFirstPartyMcp) {
+        assertFirstPartyMcpBlocks(toml);
+    }
+    else {
+        for (const name of OMX_FIRST_PARTY_MCP_SERVER_NAMES) {
+            assert.equal(count(toml, new RegExp(`^\\[mcp_servers\\.${name}\\]$`, "gm")), 0, `[mcp_servers.${name}] should not be emitted by default`);
+        }
+    }
     assert.equal(count(toml, /^\[mcp_servers\.omx_team_run\]$/gm), 0, "[mcp_servers.omx_team_run] should not be emitted");
     assert.doesNotMatch(toml, /dist\/mcp\/team-server\.js/, "team-server path should not be emitted");
     assert.equal(count(toml, /^\[tui\]$/gm), 1, "[tui] should appear once");
     assert.equal(count(toml, /^\[features\]$/gm), 1, "[features] should appear once");
-    assert.equal(count(toml, /^codex_hooks = true$/gm), 1, "hooks should appear once");
+    assert.equal(count(toml, /^hooks = true$/gm), 1, "hooks should appear once");
+    assert.equal(count(toml, /^codex_hooks = true$/gm), 0, "legacy codex_hooks should not be emitted");
     assert.equal(count(toml, /^notify\s*=/gm), 1, "notify key should appear once");
     assert.equal(count(toml, /^model_reasoning_effort\s*=/gm), 1, "model_reasoning_effort should appear once");
     assert.equal(count(toml, /^developer_instructions\s*=/gm), 1, "developer_instructions should appear once");
     assert.equal(count(toml, /^\[env\]$/gm), 0, "[env] should not be emitted");
     assert.equal(count(toml, /^\[shell_environment_policy\.set\]$/gm), 1, "[shell_environment_policy.set] should appear once");
     assert.equal(count(toml, /^USE_OMX_EXPLORE_CMD = "1"$/gm), 1, "USE_OMX_EXPLORE_CMD should appear once");
+}
+function assertFirstPartyMcpBlocks(toml) {
     const parsed = TOML.parse(toml);
     for (const name of OMX_FIRST_PARTY_MCP_SERVER_NAMES) {
+        assert.equal(count(toml, new RegExp(`^\\[mcp_servers\\.${name}\\]$`, "gm")), 1, `[mcp_servers.${name}] should appear once when first-party MCP is enabled`);
         const command = parsed.mcp_servers?.[name]?.command;
         assert.equal(command, process.execPath, `[mcp_servers.${name}] should use the Node executable that ran setup`);
         assert.notEqual(command, "node", `[mcp_servers.${name}] should not depend on PATH lookup for node`);
         assert.equal(typeof command === "string" && isAbsolute(command), true, `[mcp_servers.${name}] command should be absolute`);
     }
 }
+function assertSingleManagedHookTrustState(toml) {
+    const parsed = TOML.parse(toml);
+    const managedKeys = Object.keys(parsed.hooks?.state ?? {}).filter((key) => key.startsWith("/tmp/codex/hooks.json:"));
+    assert.deepEqual(managedKeys.sort(), [
+        "/tmp/codex/hooks.json:post_compact:0:0",
+        "/tmp/codex/hooks.json:post_tool_use:0:0",
+        "/tmp/codex/hooks.json:pre_compact:0:0",
+        "/tmp/codex/hooks.json:pre_tool_use:0:0",
+        "/tmp/codex/hooks.json:session_start:0:0",
+        "/tmp/codex/hooks.json:stop:0:0",
+        "/tmp/codex/hooks.json:user_prompt_submit:0:0",
+    ]);
+    assert.equal(count(toml, /^# OMX-owned Codex hook trust state$/gm), 1, "managed hook trust fence should appear once");
+    assert.equal(count(toml, /^# End OMX-owned Codex hook trust state$/gm), 1, "managed hook trust end fence should appear once");
+    assert.equal(count(toml, /^\[hooks\.state\."\/tmp\/codex\/hooks\.json:/gm), managedKeys.length, "managed hook trust tables should not duplicate");
+}
 describe("Codex transient TUI NUX cleanup", () => {
     it("removes only model availability NUX counters from project-local config", async () => {
         const wd = await mkdtemp(join(tmpdir(), "omx-codex-nux-cleanup-"));
@@ -111,13 +134,19 @@ describe("config generator idempotency (#384)", () => {
             assertSingleOmxBlock(toml);
             assert.match(toml, /^multi_agent = true$/m);
             assert.match(toml, /^child_agents_md = true$/m);
-            assert.match(toml, /^codex_hooks = true$/m);
+            assert.match(toml, /^hooks = true$/m);
             assert.match(toml, /^goals = true$/m);
         }
         finally {
             await rm(wd, { recursive: true, force: true });
         }
     });
+    it("emits first-party MCP blocks only when explicitly enabled", () => {
+        const toml = buildMergedConfig("", "/tmp/omx", {
+            includeFirstPartyMcp: true,
+        });
+        assertSingleOmxBlock(toml, { includeFirstPartyMcp: true });
+    });
     it("second run updates without duplicating any section", async () => {
         const wd = await mkdtemp(join(tmpdir(), "omx-idem-"));
         try {
@@ -237,6 +266,28 @@ describe("config generator idempotency (#384)", () => {
             await rm(wd, { recursive: true, force: true });
         }
     });
+    it("preserves user-owned omx-prefixed MCP servers that are not first-party", async () => {
+        const wd = await mkdtemp(join(tmpdir(), "omx-idem-"));
+        try {
+            const configPath = join(wd, "config.toml");
+            const userMcp = [
+                "[mcp_servers.omx_custom]",
+                'command = "node"',
+                'args = ["/user/custom-server.js"]',
+                "enabled = true",
+                "",
+            ].join("\n");
+            await writeFile(configPath, userMcp);
+            await mergeConfig(configPath, wd);
+            const toml = await readFile(configPath, "utf-8");
+            assertSingleOmxBlock(toml);
+            assert.match(toml, /^\[mcp_servers\.omx_custom\]$/m, "user-owned omx-prefixed MCP server preserved");
+            assert.match(toml, /^args = \["\/user\/custom-server\.js"\]$/m);
+        }
+        finally {
+            await rm(wd, { recursive: true, force: true });
+        }
+    });
     it("preserves user content between OMX re-runs", async () => {
         const wd = await mkdtemp(join(tmpdir(), "omx-idem-"));
         try {
@@ -388,7 +439,7 @@ describe("config generator idempotency (#384)", () => {
             includeTui: false,
         });
         assert.doesNotMatch(toml, /^\[tui\]$/m);
-        assert.match(toml, /^\[mcp_servers\.omx_state\]$/m);
+        assert.doesNotMatch(toml, /^\[mcp_servers\.omx_state\]$/m);
         assert.match(toml, /^\[shell_environment_policy\.set\]$/m);
         assert.match(toml, /^USE_OMX_EXPLORE_CMD = "1"$/m);
     });
@@ -724,6 +775,74 @@ describe("config generator idempotency (#384)", () => {
             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.5"',
+            "",
+            "# OMX-owned Codex hook trust state",
+            "# Missing the end fence must not cause trailing user config deletion.",
+            "",
+            '[hooks.state."custom:/hooks.json:stop:0:0"]',
+            'trusted_hash = "sha256:user"',
+            "enabled = false",
+            "",
+            "[hooks.state.user_prompt_submit]",
+            'trusted_hash = "sha256:prompt"',
+            "enabled = true",
+            "",
+        ].join("\n");
+        const stripped = stripManagedCodexHookTrustState(malformed);
+        assert.match(stripped, /^# OMX-owned Codex hook trust state$/m);
+        assert.match(stripped, /^\[hooks\.state\."custom:\/hooks\.json:stop:0:0"\]$/m);
+        assert.match(stripped, /^enabled = false$/m);
+        assert.match(stripped, /^\[hooks\.state\.user_prompt_submit\]$/m);
+        assert.match(stripped, /^trusted_hash = "sha256:prompt"$/m);
+        assert.doesNotThrow(() => TOML.parse(stripped));
+    });
+    it("dedupes prior fenced managed hook trust-state blocks before writing a replacement", () => {
+        const first = upsertManagedCodexHookTrustState([
+            'model = "gpt-5.5"',
+            "",
+            '[hooks.state."custom:/hooks.json:stop:0:0"]',
+            'trusted_hash = "sha256:user"',
+            "enabled = false",
+            "",
+        ].join("\n"), "/tmp/omx", "/tmp/codex/hooks.json");
+        const brokenWithDuplicatePriorBlock = `${first}\n${first.slice(first.indexOf("# OMX-owned Codex hook trust state"))}`;
+        assert.equal(count(brokenWithDuplicatePriorBlock, /^\[hooks\.state\."\/tmp\/codex\/hooks\.json:stop:0:0"\]$/gm), 2, "regression fixture should contain duplicate managed trust tables");
+        const repaired = upsertManagedCodexHookTrustState(brokenWithDuplicatePriorBlock, "/tmp/omx", "/tmp/codex/hooks.json");
+        const repeated = upsertManagedCodexHookTrustState(repaired, "/tmp/omx", "/tmp/codex/hooks.json");
+        assert.equal(repeated, repaired);
+        assert.match(repaired, /^\[hooks\.state\."custom:\/hooks\.json:stop:0:0"\]$/m, "unrelated user hook state should be preserved");
+        assert.match(repaired, /^enabled = false$/m);
+        assertSingleManagedHookTrustState(repaired);
+    });
+    it("dedupes stale unfenced managed hook trust-state tables during legacy setup refresh", () => {
+        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"',
+            "",
+        ].join("\n");
+        const refreshed = buildMergedConfig(stalePluginModeConfig, "/tmp/omx", {
+            codexHooksFile: hooksPath,
+        });
+        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");
+        assert.match(refreshed, /^enabled = false$/m);
+        assertSingleManagedHookTrustState(refreshed);
+    });
     it("syncs shared MCP registry entries in a dedicated managed block", async () => {
         const wd = await mkdtemp(join(tmpdir(), "omx-idem-"));
         try {