oh-my-codex 0.21.13 → 0.21.15

package/dist/scripts/__tests__/native-hook-protocol.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=native-hook-protocol.test.d.ts.map

package/dist/scripts/__tests__/native-hook-protocol.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"native-hook-protocol.test.d.ts","sourceRoot":"","sources":["../../../src/scripts/__tests__/native-hook-protocol.test.ts"],"names":[],"mappings":""}

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

@@ -0,0 +1,329 @@
+import assert from "node:assert/strict";
+import { mkdir, mkdtemp, readFile, readdir, realpath, rm, writeFile } from "node:fs/promises";
+import { existsSync } from "node:fs";
+import { spawnSync } from "node:child_process";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { afterEach, beforeEach, describe, it } from "node:test";
+import { MANAGED_HOOK_EVENTS, buildManagedCodexHooksConfig } from "../../config/codex-hooks.js";
+import { writeSessionStart } from "../../hooks/session.js";
+import { createSubagentTrackingState, readSubagentTrackingState, recordNativeSubagentAuthorityObservation, recordSubagentTurn, withCrossProcessFileLockSync } from "../../subagents/tracker.js";
+import { dispatchCodexNativeHook, mapCodexHookEventToOmxEvent } from "../codex-native-hook.js";
+import { CODEX_HOOK_EVENT_NAMES, extractRawCodexHookEventName, MAX_NATIVE_STDIN_JSON_BYTES } from "../hook-payload-guard.js";
+import { MANAGED_CODEX_HOOK_EVENTS } from "../smoke-packed-install.js";
+describe("native hook protocol compatibility", () => {
+    let cwd;
+    let env;
+    const sessionId = "omx-protocol-session";
+    const parentId = "native-parent";
+    const agentId = "native-child";
+    beforeEach(async () => {
+        env = { ...process.env };
+        for (const key of Object.keys(process.env)) {
+            if (key.startsWith("OMX_") || key === "CODEX_THREAD_ID")
+                delete process.env[key];
+        }
+        cwd = await realpath(await mkdtemp(join(tmpdir(), "omx-native-protocol-")));
+        process.env.CODEX_HOME = join(cwd, "codex-home");
+        await mkdir(process.env.CODEX_HOME);
+    });
+    afterEach(async () => {
+        process.env = env;
+        await rm(cwd, { recursive: true, force: true });
+    });
+    function stop(overrides = {}) {
+        return {
+            hook_event_name: "SubagentStop",
+            cwd,
+            session_id: parentId,
+            agent_id: agentId,
+            agent_type: "executor",
+            turn_id: "child-turn-1",
+            transcript_path: null,
+            agent_transcript_path: null,
+            last_assistant_message: null,
+            stop_hook_active: false,
+            ...overrides,
+        };
+    }
+    async function start() {
+        await writeSessionStart(cwd, sessionId, { nativeSessionId: parentId, pid: process.pid });
+    }
+    function runNativeHookCli(input = JSON.stringify(stop())) {
+        return spawnSync(process.execPath, [join(process.cwd(), "dist/scripts/codex-native-hook.js")], {
+            cwd, env: process.env, input, encoding: "utf8", timeout: 10_000,
+        });
+    }
+    async function captureLifecycle(notifications) {
+        await writeFile(join(process.env.CODEX_HOME, ".omx-config.json"), JSON.stringify({
+            notifications: { enabled: true, ...notifications },
+        }));
+        const eventsPath = join(cwd, "child-events.jsonl");
+        await mkdir(join(cwd, ".omx/hooks"), { recursive: true });
+        await writeFile(join(cwd, ".omx/hooks/capture.mjs"), `import { appendFileSync } from 'node:fs';\nexport function onHookEvent(event) { appendFileSync(${JSON.stringify(eventsPath)}, JSON.stringify(event) + '\\n'); }\n`);
+        return eventsPath;
+    }
+    for (const notifications of [
+        { verbosity: "session", includeChildAgents: true },
+        { verbosity: "agent" },
+        { verbosity: "verbose" },
+        { verbosity: "session" },
+        { verbosity: "minimal" },
+    ]) {
+        it(`applies the SubagentStop lifecycle policy for ${JSON.stringify(notifications)}`, async () => {
+            await start();
+            const eventsPath = await captureLifecycle(notifications);
+            await dispatchCodexNativeHook(stop());
+            assert.ok((await readSubagentTrackingState(cwd)).sessions[sessionId].threads[agentId].completed_at);
+            if (notifications.includeChildAgents !== true && !["agent", "verbose"].includes(notifications.verbosity)) {
+                assert.equal(existsSync(eventsPath), false);
+                return;
+            }
+            await dispatchCodexNativeHook(stop({ stop_hook_active: true, stopHookActive: true }));
+            const events = (await readFile(eventsPath, "utf8")).trim().split("\n").map(line => JSON.parse(line));
+            assert.equal(events.length, 1);
+            assert.equal(events[0].event, "subagent-stop");
+            assert.equal(events[0].source, "native");
+            assert.equal(events[0].session_id, sessionId);
+            assert.equal(events[0].thread_id, agentId);
+            assert.equal(events[0].turn_id, "child-turn-1");
+            assert.equal(events[0].context.native_session_id, agentId);
+            assert.equal(events[0].context.payload.session_id, parentId);
+            assert.equal(events[0].context.payload.stop_hook_active, undefined);
+            assert.equal(events[0].context.payload.stopHookActive, undefined);
+            await dispatchCodexNativeHook(stop({ turn_id: "child-turn-2" }));
+            assert.equal((await readFile(eventsPath, "utf8")).trim().split("\n").length, 2);
+        });
+    }
+    it("deduplicates interleaved child and turn replays independently", async () => {
+        await start();
+        const eventsPath = await captureLifecycle({ includeChildAgents: true });
+        await dispatchCodexNativeHook(stop());
+        await dispatchCodexNativeHook(stop({ agent_id: "other-child" }));
+        await dispatchCodexNativeHook(stop());
+        await dispatchCodexNativeHook(stop({ turn_id: "child-turn-2" }));
+        await dispatchCodexNativeHook(stop());
+        const events = (await readFile(eventsPath, "utf8")).trim().split("\n").map(line => JSON.parse(line));
+        assert.deepEqual(events.map(event => [event.thread_id, event.turn_id]), [
+            [agentId, "child-turn-1"], ["other-child", "child-turn-1"], [agentId, "child-turn-2"],
+        ]);
+    });
+    it("deduplicates lifecycle hooks when legacy Stop and SubagentStop report the same child turn", async () => {
+        await start();
+        const eventsPath = await captureLifecycle({ includeChildAgents: true });
+        const legacyFirstChild = "legacy-first-child";
+        const nativeFirstChild = "native-first-child";
+        for (const childThreadId of [legacyFirstChild, nativeFirstChild]) {
+            recordNativeSubagentAuthorityObservation(cwd, {
+                sessionIds: [sessionId], childThreadId, parentThreadId: parentId,
+                rootNativeSessionId: parentId, authorityEvidence: "valid",
+            });
+        }
+        await dispatchCodexNativeHook({
+            hook_event_name: "Stop", cwd, session_id: legacyFirstChild,
+            thread_id: legacyFirstChild, turn_id: "turn-legacy-first", stop_hook_active: true,
+        });
+        await dispatchCodexNativeHook(stop({ agent_id: legacyFirstChild, turn_id: "turn-legacy-first" }));
+        await dispatchCodexNativeHook(stop({ agent_id: nativeFirstChild, turn_id: "turn-native-first" }));
+        await dispatchCodexNativeHook({
+            hook_event_name: "Stop", cwd, session_id: nativeFirstChild,
+            thread_id: nativeFirstChild, turn_id: "turn-native-first", stop_hook_active: true,
+        });
+        const events = (await readFile(eventsPath, "utf8")).trim().split("\n").map(line => JSON.parse(line));
+        assert.deepEqual(events.map(event => [event.event, event.thread_id, event.turn_id]), [
+            ["stop", legacyFirstChild, "turn-legacy-first"],
+            ["subagent-stop", nativeFirstChild, "turn-native-first"],
+        ]);
+    });
+    it("does not deduplicate separate SubagentStop completions when turn IDs are absent", async () => {
+        await start();
+        const eventsPath = await captureLifecycle({ includeChildAgents: true });
+        await dispatchCodexNativeHook(stop({ turn_id: null }));
+        await dispatchCodexNativeHook(stop({ turn_id: null }));
+        const events = (await readFile(eventsPath, "utf8")).trim().split("\n").map(line => JSON.parse(line));
+        assert.equal(events.length, 2);
+        assert.deepEqual(events.map(event => event.event), ["subagent-stop", "subagent-stop"]);
+        assert.deepEqual(events.map(event => event.turn_id), [undefined, undefined]);
+    });
+    it("does not treat missing turn IDs as proof of a duplicate completion", () => {
+        const first = recordSubagentTurn(createSubagentTrackingState(), {
+            sessionId, threadId: agentId, kind: "subagent", completed: true,
+            completionSource: "native_stop_event",
+        });
+        const second = recordSubagentTurn(first, {
+            sessionId, threadId: agentId, kind: "subagent", completed: true,
+            completionSource: "native_stop_event",
+        });
+        assert.equal(second.sessions[sessionId].threads[agentId].turn_count, first.sessions[sessionId].threads[agentId].turn_count + 1);
+    });
+    it("keeps malformed tracker authority bytes intact and returns CLI no-op with a diagnostic", async () => {
+        await start();
+        const eventsPath = await captureLifecycle({ includeChildAgents: true });
+        const trackerPath = join(cwd, ".omx/state/subagent-tracking.json");
+        const malformed = '{"schemaVersion":1,"sessions":{"preserve-authority":';
+        await writeFile(trackerPath, malformed);
+        const result = runNativeHookCli();
+        assert.equal(result.status, 0, result.stderr || result.stdout);
+        assert.deepEqual(JSON.parse(result.stdout), {});
+        assert.equal(await readFile(trackerPath, "utf8"), malformed);
+        assert.equal(existsSync(eventsPath), false);
+        const logDir = join(cwd, ".omx/logs");
+        const logFile = (await readdir(logDir)).find(name => name.startsWith("native-hook-"));
+        assert.ok(logFile);
+        const diagnostic = await readFile(join(logDir, logFile), "utf8");
+        assert.match(diagnostic, /native_subagent_completion_tracking_error/);
+        assert.match(diagnostic, /Malformed subagent tracker authority state/);
+    });
+    it("returns CLI no-op without dispatch or mutation when the tracker lock stays held", async () => {
+        await start();
+        const eventsPath = await captureLifecycle({ includeChildAgents: true });
+        recordNativeSubagentAuthorityObservation(cwd, {
+            sessionIds: [sessionId], childThreadId: agentId, parentThreadId: parentId,
+            rootNativeSessionId: parentId, authorityEvidence: "valid",
+        });
+        const trackerPath = join(cwd, ".omx/state/subagent-tracking.json");
+        const before = await readFile(trackerPath, "utf8");
+        const result = withCrossProcessFileLockSync(trackerPath, () => runNativeHookCli());
+        assert.equal(result.status, 0, result.stderr || result.stdout);
+        assert.deepEqual(JSON.parse(result.stdout), {});
+        assert.equal(await readFile(trackerPath, "utf8"), before);
+        assert.equal(existsSync(eventsPath), false);
+    });
+    it("rejects unbound identities before opted-in SubagentStop lifecycle dispatch", async () => {
+        await start();
+        const eventsPath = await captureLifecycle({ includeChildAgents: true });
+        for (const overrides of [{ session_id: "foreign-parent" }, { agent_id: parentId }, { agent_id: null }]) {
+            await dispatchCodexNativeHook(stop(overrides));
+        }
+        assert.equal(existsSync(eventsPath), false);
+        assert.equal(existsSync(join(cwd, ".omx/state/subagent-tracking.json")), false);
+    });
+    it("keeps setup, bounded input parsing, dispatch, plugin, and packed smoke event rosters aligned", async () => {
+        assert.deepEqual(CODEX_HOOK_EVENT_NAMES, MANAGED_HOOK_EVENTS);
+        assert.deepEqual(MANAGED_CODEX_HOOK_EVENTS, MANAGED_HOOK_EVENTS);
+        const plugin = JSON.parse(await readFile(join(process.cwd(), "plugins/oh-my-codex/hooks/hooks.json"), "utf8"));
+        assert.deepEqual(Object.keys(plugin.hooks), [...MANAGED_HOOK_EVENTS]);
+        const config = buildManagedCodexHooksConfig("/repo");
+        assert.deepEqual(Object.keys(config.hooks), [...MANAGED_HOOK_EVENTS]);
+        for (const event of MANAGED_HOOK_EVENTS) {
+            assert.equal(extractRawCodexHookEventName(JSON.stringify({ hook_event_name: event })), event);
+            assert.ok(mapCodexHookEventToOmxEvent(event));
+            assert.match(config.hooks[event][0].hooks[0].command, /codex-native-hook\.js/);
+        }
+        assert.equal(mapCodexHookEventToOmxEvent("SubagentStop"), "subagent-stop");
+    });
+    it("records the child, accepts nullable optional fields, and never changes the leader pointer or grants authority", async () => {
+        await start();
+        const pointer = join(cwd, ".omx/state/session.json");
+        const before = await readFile(pointer, "utf8");
+        const modePath = join(cwd, ".omx/state/autopilot-state.json");
+        const activeMode = JSON.stringify({ active: true, current_phase: "implementation", session_id: sessionId });
+        await writeFile(modePath, activeMode);
+        const result = await dispatchCodexNativeHook(stop({ future_field: { ignored: true } }));
+        assert.equal(result.hookEventName, "SubagentStop");
+        assert.equal(result.omxEventName, "subagent-stop");
+        assert.equal(result.outputJson, null);
+        assert.equal(await readFile(pointer, "utf8"), before);
+        assert.equal(await readFile(modePath, "utf8"), activeMode);
+        const state = await readSubagentTrackingState(cwd);
+        const thread = state.sessions[sessionId].threads[agentId];
+        assert.equal(thread.kind, "subagent");
+        assert.equal(thread.mode, "executor");
+        assert.equal(thread.completion_source, "native_stop_event");
+        assert.equal(thread.last_completed_turn_id, "child-turn-1");
+        assert.ok(thread.completed_at);
+        assert.equal(thread.direct_child_root_id, undefined);
+        assert.equal(state.sessions[sessionId].threads[parentId], undefined);
+        assert.equal(state.sessions[parentId], undefined);
+    });
+    it("completes the child in every existing correlated tracker partition", async () => {
+        await start();
+        recordNativeSubagentAuthorityObservation(cwd, {
+            sessionIds: [sessionId, parentId, "previous-canonical-session"],
+            childThreadId: agentId,
+            parentThreadId: parentId,
+            rootNativeSessionId: parentId,
+            authorityEvidence: "valid",
+        });
+        await dispatchCodexNativeHook(stop());
+        const state = await readSubagentTrackingState(cwd);
+        for (const partitionId of [sessionId, parentId, "previous-canonical-session"]) {
+            const thread = state.sessions[partitionId]?.threads[agentId];
+            assert.equal(thread?.kind, "subagent");
+            assert.equal(thread?.completion_source, "native_stop_event");
+            assert.equal(thread?.last_completed_turn_id, "child-turn-1");
+            assert.ok(thread?.completed_at);
+            assert.equal(thread?.status, "closed");
+            assert.equal(thread?.direct_child_root_id, parentId);
+        }
+    });
+    it("deduplicates replays and legacy Stop for the same child turn, but records a new turn", async () => {
+        await start();
+        recordNativeSubagentAuthorityObservation(cwd, {
+            sessionIds: [sessionId], childThreadId: agentId, parentThreadId: parentId,
+            rootNativeSessionId: parentId, authorityEvidence: "valid",
+        });
+        const legacy = { hook_event_name: "Stop", cwd, session_id: sessionId, thread_id: agentId,
+            turn_id: "child-turn-1", stop_hook_active: true };
+        await dispatchCodexNativeHook(legacy);
+        const first = (await readSubagentTrackingState(cwd)).sessions[sessionId].threads[agentId];
+        await Promise.all([dispatchCodexNativeHook(stop()), dispatchCodexNativeHook(stop())]);
+        await dispatchCodexNativeHook(legacy);
+        const replay = (await readSubagentTrackingState(cwd)).sessions[sessionId].threads[agentId];
+        assert.deepEqual(replay, first);
+        await dispatchCodexNativeHook(stop({ turn_id: "child-turn-2" }));
+        const next = (await readSubagentTrackingState(cwd)).sessions[sessionId].threads[agentId];
+        assert.equal(next.turn_count, first.turn_count + 1);
+        assert.equal(next.last_completed_turn_id, "child-turn-2");
+    });
+    it("ignores absent, malformed, conflicting, foreign, or leader identities without creating tracking state", async () => {
+        await start();
+        for (const overrides of [
+            { agent_id: null }, { agent_id: "" }, { agent_id: {} }, { agent_id: "../escape" },
+            { agent_id: parentId }, { agent_id: sessionId }, { session_id: null },
+            { session_id: "" }, { session_id: {} }, { session_id: "other-session" },
+            { sessionId: "conflicting-session" },
+        ]) {
+            const result = await dispatchCodexNativeHook(stop(overrides));
+            assert.equal(result.outputJson, null);
+            assert.equal(existsSync(join(cwd, ".omx/state/subagent-tracking.json")), false, JSON.stringify(overrides));
+        }
+    });
+    it("does not promote a legacy child Stop without thread_id into its own leader session", async () => {
+        await start();
+        recordNativeSubagentAuthorityObservation(cwd, {
+            sessionIds: [sessionId], childThreadId: agentId, parentThreadId: parentId,
+            rootNativeSessionId: parentId, authorityEvidence: "valid",
+        });
+        const before = await readSubagentTrackingState(cwd);
+        await dispatchCodexNativeHook({
+            hook_event_name: "Stop", cwd, session_id: agentId,
+            turn_id: "child-turn-1", stop_hook_active: true,
+        });
+        assert.deepEqual(await readSubagentTrackingState(cwd), before);
+        await dispatchCodexNativeHook(stop());
+        const state = await readSubagentTrackingState(cwd);
+        assert.equal(state.sessions[agentId], undefined);
+        assert.ok(state.sessions[sessionId].threads[agentId].completed_at);
+    });
+    it("does not bootstrap a root session from a standalone SubagentStop", async () => {
+        assert.equal((await dispatchCodexNativeHook(stop())).outputJson, null);
+        assert.equal(existsSync(join(cwd, ".omx")), false);
+    });
+    it("does not apply leader Stop behavior to malformed SubagentStop input", async () => {
+        await start();
+        const result = runNativeHookCli('{"hook_event_name":"SubagentStop",');
+        assert.equal(result.status, 0, result.stderr || result.stdout);
+        assert.deepEqual(JSON.parse(result.stdout), {});
+    });
+    it("does not block an oversized SubagentStop completion", async () => {
+        await start();
+        const result = runNativeHookCli(JSON.stringify({
+            ...stop(),
+            oversized_field: "x".repeat(MAX_NATIVE_STDIN_JSON_BYTES),
+        }));
+        assert.equal(result.status, 0, result.stderr || result.stdout);
+        assert.deepEqual(JSON.parse(result.stdout), {});
+    });
+});
+//# sourceMappingURL=native-hook-protocol.test.js.map

package/dist/scripts/__tests__/native-hook-protocol.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"native-hook-protocol.test.js","sourceRoot":"","sources":["../../../src/scripts/__tests__/native-hook-protocol.test.ts"],"names":[],"mappings":"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"}

package/dist/scripts/__tests__/smoke-packed-install.test.js

@@ -395,7 +395,7 @@ test('packed lifecycle requires enabled command handlers and integer hook metada
         assert.doesNotThrow(() => parseCodexHooksListResult(valid, project, hooksPath), `${source} is a valid hook source`);
     }
 });
-test('packed lifecycle requires exactly seven generated OMX trust keys and an isolated approval target', () => {
+test('packed lifecycle requires exactly eight generated OMX trust keys and an isolated approval target', () => {
     const hooks = MANAGED_CODEX_HOOK_EVENTS.map((event, index) => ({
         event,
         command: 'node /tmp/omx/dist/scripts/codex-native-hook.js',
@@ -410,8 +410,8 @@ test('packed lifecycle requires exactly seven generated OMX trust keys and an is
     assert.throws(() => assertGeneratedTrustMatchesCodex({
         ...trust,
         '/tmp/project/.codex/hooks.json:foreign:0:0': 'sha256:foreign',
-    }, hooks), /exactly the 7 current OMX hooks with no stale keys/);
-    assert.throws(() => assertGeneratedTrustMatchesCodex(Object.fromEntries(Object.entries(trust).slice(0, -1)), hooks), /exactly the 7 current OMX hooks with no stale keys/);
+    }, hooks), /exactly the 8 current OMX hooks with no stale keys/);
+    assert.throws(() => assertGeneratedTrustMatchesCodex(Object.fromEntries(Object.entries(trust).slice(0, -1)), hooks), /exactly the 8 current OMX hooks with no stale keys/);
     assert.doesNotThrow(() => assertCodexBatchWriteResult({
         filePath: '/tmp/isolated-codex-home/config.toml',
         status: 'ok',
@@ -449,10 +449,10 @@ test('packed lifecycle fails closed on malformed project hooks.state entries and
         assert.throws(() => generatedHookTrustState(`[hooks.state]\n${malformedEntry}`), /invalid hooks\.state entry first/);
     }
     const staleRawTrust = generatedHookTrustState(`${validConfig}\nforeign = { trusted_hash = "sha256:foreign" }`);
-    assert.throws(() => assertGeneratedTrustMatchesCodex(staleRawTrust, hooks), /exactly the 7 current OMX hooks with no stale keys/);
+    assert.throws(() => assertGeneratedTrustMatchesCodex(staleRawTrust, hooks), /exactly the 8 current OMX hooks with no stale keys/);
     const protoRawTrust = generatedHookTrustState(`${validConfig}\n__proto__ = { trusted_hash = "sha256:proto" }`);
     assert.equal(Object.hasOwn(protoRawTrust, '__proto__'), true);
-    assert.throws(() => assertGeneratedTrustMatchesCodex(protoRawTrust, hooks), /exactly the 7 current OMX hooks with no stale keys/);
+    assert.throws(() => assertGeneratedTrustMatchesCodex(protoRawTrust, hooks), /exactly the 8 current OMX hooks with no stale keys/);
 });
 test('packed lifecycle treats only the production command grammar as managed ownership', () => {
     const hooks = MANAGED_CODEX_HOOK_EVENTS.map((event, index) => ({
@@ -879,6 +879,7 @@ test('packed install smoke covers every installed native hook event with minimal
         'UserPromptSubmit',
         'PreCompact',
         'PostCompact',
+        'SubagentStop',
         'Stop',
     ]);
     for (const eventName of PACKED_INSTALL_NATIVE_HOOK_SMOKE_EVENTS) {
@@ -1093,7 +1094,7 @@ test('packed install native hook stdout validation allows empty or JSON output o
     assert.doesNotThrow(() => validateHookStdout('Stop', '{}\n'));
     assert.throws(() => validateHookStdout('UserPromptSubmit', '{not json'), /native hook UserPromptSubmit emitted invalid JSON stdout/);
 });
-test('packed lifecycle and native hook smoke share the seven managed event names', () => {
+test('packed lifecycle and native hook smoke share the managed event names', () => {
     assert.deepEqual(MANAGED_CODEX_HOOK_EVENTS, PACKED_INSTALL_NATIVE_HOOK_SMOKE_EVENTS);
 });
 test('packed install native hook stdout validation enforces event output contracts', () => {