oh-my-codex 0.18.3 → 0.18.4

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

@@ -43,6 +43,18 @@ async function writeJson(path, value) {
     await mkdir(dirname(path), { recursive: true }).catch(() => { });
     await writeFile(path, JSON.stringify(value, null, 2));
 }
+async function setTeamPaneIds(cwd, teamName, paneIds) {
+    for (const fileName of ["config.json", "manifest.v2.json"]) {
+        const filePath = join(cwd, ".omx", "state", "team", teamName, fileName);
+        const parsed = JSON.parse(await readFile(filePath, "utf-8"));
+        parsed.leader_pane_id = paneIds.leaderPaneId;
+        parsed.workers = (parsed.workers ?? []).map((worker) => ({
+            ...worker,
+            pane_id: worker.name ? paneIds.workerPaneIds[worker.name] ?? worker.pane_id ?? null : worker.pane_id ?? null,
+        }));
+        await writeJson(filePath, parsed);
+    }
+}
 async function withIsolatedHome(prefix, run) {
     const homeDir = await mkdtemp(join(tmpdir(), `omx-native-hook-home-${prefix}-`));
     const previousHome = process.env.HOME;
@@ -192,6 +204,7 @@ const TEAM_STOP_COMMIT_GUIDANCE = " If system-generated worker auto-checkpoint c
 const DEFAULT_AUTO_NUDGE_RESPONSE = "continue with the current task only if it is already authorized";
 const TEAM_ENV_KEYS = [
     "OMX_TEAM_WORKER",
+    "OMX_TEAM_INTERNAL_WORKER",
     "OMX_TEAM_STATE_ROOT",
     "OMX_TEAM_LEADER_CWD",
     "OMX_SESSION_ID",
@@ -1923,6 +1936,36 @@ standardMaxRounds = 15
             await rm(cwd, { recursive: true, force: true });
         }
     });
+    it("does not repeat ultragoal Stop recovery after a safe completed-aggregate microgoal blocker is recorded", async () => {
+        const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-ultragoal-aggregate-blocked-stop-"));
+        try {
+            await writeJson(join(cwd, ".omx", "ultragoal", "goals.json"), {
+                version: 1,
+                codexGoalMode: "aggregate",
+                activeGoalId: "G001-demo",
+                goals: [{
+                        id: "G001-demo",
+                        status: "in_progress",
+                        objective: "Demo goal",
+                        failureReason: "aggregate Codex goal already complete and unreconcilable while repo-native .omx/ultragoal/goals.json still has an in-progress microgoal; stop the recovery loop",
+                    }],
+            });
+            const result = await dispatchCodexNativeHook({
+                hook_event_name: "Stop",
+                cwd,
+                session_id: "sess-ultragoal-aggregate-blocked-stop",
+                thread_id: "thread-ultragoal-aggregate-blocked-stop",
+                stop_hook_active: true,
+                last_assistant_message: "Goal complete.",
+            }, { cwd });
+            assert.notEqual(result.outputJson?.decision, "block");
+            assert.notEqual(result.outputJson?.stopReason, "ultragoal_codex_goal_snapshot_required");
+            assert.doesNotMatch(JSON.stringify(result.outputJson), /omx ultragoal checkpoint --goal-id G001-demo --status complete/);
+        }
+        finally {
+            await rm(cwd, { recursive: true, force: true });
+        }
+    });
     it("does not block ultragoal Stop after task-scoped reconciliation finishes exploded bookkeeping", async () => {
         const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-ultragoal-reconciled-stop-"));
         try {
@@ -3170,6 +3213,178 @@ export async function onHookEvent(event) {
             await rm(cwd, { recursive: true, force: true });
         }
     });
+    it("skips prompt-submit HUD reconciliation for confirmed team worker panes", async () => {
+        const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-hud-team-worker-skip-"));
+        try {
+            const teamName = "hud-worker-skip";
+            await initTeamState(teamName, "skip worker HUD reconcile", "executor", 1, cwd);
+            await setTeamPaneIds(cwd, teamName, {
+                leaderPaneId: "%42",
+                workerPaneIds: { "worker-1": "%10" },
+            });
+            process.env.TMUX = "1";
+            process.env.TMUX_PANE = "%10";
+            process.env.OMX_TEAM_INTERNAL_WORKER = `${teamName}/worker-1`;
+            process.env.OMX_TEAM_WORKER = `${teamName}/worker-1`;
+            process.env[OMX_TMUX_HUD_OWNER_ENV] = "1";
+            let reconcileCalls = 0;
+            const result = await dispatchCodexNativeHook({
+                hook_event_name: "UserPromptSubmit",
+                cwd,
+                session_id: "sess-hud-team-worker",
+                prompt: "$ralplan prepare plan",
+            }, {
+                cwd,
+                reconcileHudForPromptSubmitFn: async () => {
+                    reconcileCalls += 1;
+                    return { status: "recreated", paneId: "%9", desiredHeight: 3, duplicateCount: 0 };
+                },
+            });
+            assert.equal(result.omxEventName, "keyword-detector");
+            assert.equal(reconcileCalls, 0);
+        }
+        finally {
+            await rm(cwd, { recursive: true, force: true });
+        }
+    });
+    it("preserves prompt-submit HUD reconciliation for team leader panes", async () => {
+        const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-hud-team-leader-preserve-"));
+        try {
+            const teamName = "hud-leader-keep";
+            await initTeamState(teamName, "preserve leader HUD reconcile", "executor", 1, cwd);
+            await setTeamPaneIds(cwd, teamName, {
+                leaderPaneId: "%42",
+                workerPaneIds: { "worker-1": "%10" },
+            });
+            process.env.TMUX = "1";
+            process.env.TMUX_PANE = "%42";
+            process.env[OMX_TMUX_HUD_OWNER_ENV] = "1";
+            let reconcileCall = null;
+            const result = await dispatchCodexNativeHook({
+                hook_event_name: "UserPromptSubmit",
+                cwd,
+                session_id: "sess-hud-team-leader",
+                prompt: "$ralplan prepare plan",
+            }, {
+                cwd,
+                reconcileHudForPromptSubmitFn: async (hookCwd, deps = {}) => {
+                    reconcileCall = { cwd: hookCwd, sessionId: deps.sessionId };
+                    return { status: "recreated", paneId: "%9", desiredHeight: 3, duplicateCount: 0 };
+                },
+            });
+            assert.equal(result.omxEventName, "keyword-detector");
+            assert.deepEqual(reconcileCall, { cwd, sessionId: "sess-hud-team-leader" });
+        }
+        finally {
+            await rm(cwd, { recursive: true, force: true });
+        }
+    });
+    it("preserves prompt-submit HUD reconciliation when worker pane detection is ambiguous", async () => {
+        const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-hud-team-worker-ambiguous-"));
+        try {
+            const teamName = "hud-worker-ambiguous";
+            await initTeamState(teamName, "fail closed for ambiguous worker HUD reconcile", "executor", 1, cwd);
+            await setTeamPaneIds(cwd, teamName, {
+                leaderPaneId: "%42",
+                workerPaneIds: { "worker-1": "%10" },
+            });
+            process.env.TMUX = "1";
+            process.env.TMUX_PANE = "%99";
+            process.env.OMX_TEAM_INTERNAL_WORKER = `${teamName}/worker-1`;
+            process.env.OMX_TEAM_WORKER = `${teamName}/worker-1`;
+            process.env[OMX_TMUX_HUD_OWNER_ENV] = "1";
+            let reconcileCalls = 0;
+            const result = await dispatchCodexNativeHook({
+                hook_event_name: "UserPromptSubmit",
+                cwd,
+                session_id: "sess-hud-team-worker-ambiguous",
+                prompt: "$ralplan prepare plan",
+            }, {
+                cwd,
+                reconcileHudForPromptSubmitFn: async () => {
+                    reconcileCalls += 1;
+                    return { status: "recreated", paneId: "%9", desiredHeight: 3, duplicateCount: 0 };
+                },
+            });
+            assert.equal(result.omxEventName, "keyword-detector");
+            assert.equal(reconcileCalls, 1);
+        }
+        finally {
+            await rm(cwd, { recursive: true, force: true });
+        }
+    });
+    it("preserves prompt-submit HUD reconciliation for native subagents even with worker pane env", async () => {
+        const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-hud-subagent-worker-preserve-"));
+        try {
+            const teamName = "hud-subagent-keep";
+            await initTeamState(teamName, "preserve subagent HUD reconcile", "executor", 1, cwd);
+            await setTeamPaneIds(cwd, teamName, {
+                leaderPaneId: "%42",
+                workerPaneIds: { "worker-1": "%10" },
+            });
+            const stateDir = join(cwd, ".omx", "state");
+            const canonicalSessionId = "sess-subagent-hud-parent";
+            const leaderNativeSessionId = "native-subagent-hud-parent";
+            const childNativeSessionId = "native-subagent-hud-child";
+            const nowIso = new Date().toISOString();
+            await writeJson(join(stateDir, "session.json"), {
+                session_id: canonicalSessionId,
+                native_session_id: leaderNativeSessionId,
+            });
+            await writeJson(join(stateDir, "subagent-tracking.json"), {
+                schemaVersion: 1,
+                sessions: {
+                    [canonicalSessionId]: {
+                        session_id: canonicalSessionId,
+                        leader_thread_id: leaderNativeSessionId,
+                        updated_at: nowIso,
+                        threads: {
+                            [leaderNativeSessionId]: {
+                                thread_id: leaderNativeSessionId,
+                                kind: "leader",
+                                first_seen_at: nowIso,
+                                last_seen_at: nowIso,
+                                turn_count: 1,
+                            },
+                            [childNativeSessionId]: {
+                                thread_id: childNativeSessionId,
+                                kind: "subagent",
+                                first_seen_at: nowIso,
+                                last_seen_at: nowIso,
+                                turn_count: 1,
+                                mode: "verifier",
+                            },
+                        },
+                    },
+                },
+            });
+            process.env.TMUX = "1";
+            process.env.TMUX_PANE = "%10";
+            process.env.OMX_TEAM_INTERNAL_WORKER = `${teamName}/worker-1`;
+            process.env.OMX_TEAM_WORKER = `${teamName}/worker-1`;
+            process.env[OMX_TMUX_HUD_OWNER_ENV] = "1";
+            let reconcileCall = null;
+            const result = await dispatchCodexNativeHook({
+                hook_event_name: "UserPromptSubmit",
+                cwd,
+                session_id: childNativeSessionId,
+                thread_id: childNativeSessionId,
+                turn_id: "turn-subagent-hud-child",
+                prompt: "Review the worker patch literally; do not activate $ralplan.",
+            }, {
+                cwd,
+                reconcileHudForPromptSubmitFn: async (hookCwd, deps = {}) => {
+                    reconcileCall = { cwd: hookCwd, sessionId: deps.sessionId };
+                    return { status: "recreated", paneId: "%9", desiredHeight: 3, duplicateCount: 0 };
+                },
+            });
+            assert.equal(result.outputJson, null);
+            assert.deepEqual(reconcileCall, { cwd, sessionId: canonicalSessionId });
+        }
+        finally {
+            await rm(cwd, { recursive: true, force: true });
+        }
+    });
     it("runs prompt-submit HUD reconciliation as a best-effort tmux-only side effect", async () => {
         const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-hud-reconcile-"));
         const originalTmux = process.env.TMUX;
@@ -7650,6 +7865,65 @@ exit 0
             await rm(cwd, { recursive: true, force: true });
         }
     });
+    it("does not report ralplan subagent waiting when notify-fallback already recorded completion", async () => {
+        const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-stop-skill-subagent-complete-"));
+        try {
+            const stateDir = join(cwd, ".omx", "state");
+            const now = new Date().toISOString();
+            await mkdir(join(stateDir, "sessions", "sess-stop-skill-subagent-complete"), { recursive: true });
+            await writeJson(join(stateDir, "session.json"), { session_id: "sess-stop-skill-subagent-complete" });
+            await writeJson(join(stateDir, "sessions", "sess-stop-skill-subagent-complete", "skill-active-state.json"), {
+                active: true,
+                skill: "ralplan",
+                phase: "planning",
+            });
+            await writeJson(join(stateDir, "sessions", "sess-stop-skill-subagent-complete", "ralplan-state.json"), {
+                active: true,
+                current_phase: "planning",
+            });
+            await writeJson(join(stateDir, "subagent-tracking.json"), {
+                schemaVersion: 1,
+                sessions: {
+                    "sess-stop-skill-subagent-complete": {
+                        session_id: "sess-stop-skill-subagent-complete",
+                        leader_thread_id: "leader-1",
+                        updated_at: now,
+                        threads: {
+                            "leader-1": {
+                                thread_id: "leader-1",
+                                kind: "leader",
+                                first_seen_at: now,
+                                last_seen_at: now,
+                                turn_count: 1,
+                            },
+                            "sub-1": {
+                                thread_id: "sub-1",
+                                kind: "subagent",
+                                first_seen_at: now,
+                                last_seen_at: now,
+                                completed_at: now,
+                                last_completed_turn_id: "turn-complete-1",
+                                completion_source: "notify-fallback-watcher",
+                                turn_count: 2,
+                            },
+                        },
+                    },
+                },
+            });
+            const result = await dispatchCodexNativeHook({
+                hook_event_name: "Stop",
+                cwd,
+                session_id: "sess-stop-skill-subagent-complete",
+            }, { cwd });
+            assert.equal(result.omxEventName, "stop");
+            assert.equal(result.outputJson?.decision, "block");
+            assert.doesNotMatch(String(result.outputJson?.reason ?? ""), /waiting for 1 active native subagent thread/);
+            assert.equal(result.outputJson?.stopReason, "skill_ralplan_planning_continue_artifact");
+        }
+        finally {
+            await rm(cwd, { recursive: true, force: true });
+        }
+    });
     it("does not block on stale root ralplan skill when the explicit session-scoped canonical skill state is absent", async () => {
         const cwd = await mkdtemp(join(tmpdir(), "omx-native-hook-stop-stale-root-skill-"));
         try {
@@ -11368,4 +11642,61 @@ describe("codex native hook triage integration", () => {
         }
     });
 });
+describe('native Stop autopilot deep-interview wait', () => {
+    it('does not force continued execution while autopilot is waiting on a deep-interview omx question', async () => {
+        const cwd = await mkdtemp(join(tmpdir(), 'omx-native-hook-autopilot-question-wait-'));
+        try {
+            const sessionId = 'sess-autopilot-wait';
+            const sessionDir = join(cwd, '.omx', 'state', 'sessions', sessionId);
+            await writeJson(join(cwd, '.omx', 'state', 'session.json'), { session_id: sessionId });
+            await writeJson(join(sessionDir, 'autopilot-state.json'), {
+                mode: 'autopilot',
+                active: true,
+                current_phase: 'waiting-for-user',
+                run_outcome: 'blocked_on_user',
+                lifecycle_outcome: 'askuserQuestion',
+                session_id: sessionId,
+                state: {
+                    deep_interview_question: {
+                        status: 'waiting_for_user',
+                        source: 'omx-question',
+                        obligation_id: 'obligation-stop-1',
+                        previous_phase: 'deep-interview',
+                    },
+                },
+            });
+            await writeJson(join(sessionDir, 'deep-interview-state.json'), {
+                mode: 'deep-interview',
+                active: false,
+                current_phase: 'intent-first',
+                lifecycle_outcome: 'askuserQuestion',
+                run_outcome: 'blocked_on_user',
+                session_id: sessionId,
+                question_enforcement: {
+                    obligation_id: 'obligation-stop-1',
+                    source: 'omx-question',
+                    status: 'pending',
+                    lifecycle_outcome: 'askuserQuestion',
+                    requested_at: '2026-04-19T00:00:00.000Z',
+                },
+            });
+            await writeJson(join(sessionDir, 'skill-active-state.json'), {
+                active: true,
+                skill: 'autopilot',
+                phase: 'deep-interview',
+                session_id: sessionId,
+                active_skills: [{ skill: 'autopilot', phase: 'deep-interview', active: true, session_id: sessionId }],
+            });
+            const result = await dispatchCodexNativeHook({
+                hook_event_name: 'Stop',
+                session_id: sessionId,
+                thread_id: 'thread-autopilot-wait',
+            }, { cwd });
+            assert.equal(result.outputJson, null);
+        }
+        finally {
+            await rm(cwd, { recursive: true, force: true });
+        }
+    });
+});
 //# sourceMappingURL=codex-native-hook.test.js.map