oh-my-codex 0.14.0 → 0.14.2

package/dist/scripts/__tests__/postinstall.test.d.ts

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

package/dist/scripts/__tests__/postinstall.test.d.ts.map

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

package/dist/scripts/__tests__/postinstall.test.js

@@ -0,0 +1,178 @@
+import assert from "node:assert/strict";
+import { mkdtemp, mkdir, readFile, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { describe, it } from "node:test";
+import { writeUserInstallStamp } from "../../cli/update.js";
+import { isGlobalInstallLifecycle, runPostinstall, } from "../postinstall.js";
+describe("isGlobalInstallLifecycle", () => {
+    it("accepts npm_config_global=true", () => {
+        assert.equal(isGlobalInstallLifecycle({ npm_config_global: "true" }), true);
+    });
+    it("accepts npm_config_location=global", () => {
+        assert.equal(isGlobalInstallLifecycle({ npm_config_location: "global" }), true);
+    });
+    it("rejects local installs", () => {
+        assert.equal(isGlobalInstallLifecycle({ npm_config_global: "false" }), false);
+    });
+});
+describe("runPostinstall", () => {
+    it("runs interactive setup only for bumped global installs", async () => {
+        const root = await mkdtemp(join(tmpdir(), "omx-postinstall-"));
+        const stampPath = join(root, ".codex", ".omx", "install-state.json");
+        const logs = [];
+        let setupCalls = 0;
+        try {
+            const result = await runPostinstall({
+                env: { npm_config_global: "true" },
+                getCurrentVersion: async () => "0.14.1",
+                isInteractive: () => true,
+                log: (message) => logs.push(message),
+                readStamp: async () => ({
+                    installed_version: "0.14.0",
+                    setup_completed_version: "0.14.0",
+                    updated_at: "2026-04-20T00:00:00.000Z",
+                }),
+                runSetup: async () => {
+                    setupCalls += 1;
+                },
+                writeStamp: async (stamp) => writeUserInstallStamp(stamp, stampPath),
+            });
+            assert.equal(result.status, "setup-ran");
+            assert.equal(setupCalls, 1);
+            assert.match(logs.join("\n"), /Launching interactive setup/);
+            const stamp = JSON.parse(await readFile(stampPath, "utf-8"));
+            assert.equal(stamp.installed_version, "0.14.1");
+            assert.equal(stamp.setup_completed_version, "0.14.1");
+        }
+        finally {
+            await rm(root, { recursive: true, force: true });
+        }
+    });
+    it("records the installed version and prints a hint when no TTY is available", async () => {
+        const root = await mkdtemp(join(tmpdir(), "omx-postinstall-"));
+        const stampPath = join(root, ".codex", ".omx", "install-state.json");
+        const logs = [];
+        let setupCalls = 0;
+        try {
+            const result = await runPostinstall({
+                env: { npm_config_global: "true" },
+                getCurrentVersion: async () => "0.14.1",
+                isInteractive: () => false,
+                log: (message) => logs.push(message),
+                readStamp: async () => ({
+                    installed_version: "0.14.0",
+                    setup_completed_version: "0.14.0",
+                    updated_at: "2026-04-20T00:00:00.000Z",
+                }),
+                runSetup: async () => {
+                    setupCalls += 1;
+                },
+                writeStamp: async (stamp) => writeUserInstallStamp(stamp, stampPath),
+            });
+            assert.equal(result.status, "hinted");
+            assert.equal(setupCalls, 0);
+            assert.match(logs.join("\n"), /Run `omx setup` \(interactive\) or `omx update`/);
+            const stamp = JSON.parse(await readFile(stampPath, "utf-8"));
+            assert.equal(stamp.installed_version, "0.14.1");
+            assert.equal(stamp.setup_completed_version, "0.14.0");
+        }
+        finally {
+            await rm(root, { recursive: true, force: true });
+        }
+    });
+    it("skips local installs", async () => {
+        let setupCalls = 0;
+        const result = await runPostinstall({
+            env: { npm_config_global: "false" },
+            getCurrentVersion: async () => "0.14.1",
+            isInteractive: () => true,
+            runSetup: async () => {
+                setupCalls += 1;
+            },
+        });
+        assert.equal(result.status, "noop-local");
+        assert.equal(setupCalls, 0);
+    });
+    it("does not rerun setup when the installed version matches the saved stamp", async () => {
+        let setupCalls = 0;
+        const result = await runPostinstall({
+            env: { npm_config_global: "true" },
+            getCurrentVersion: async () => "0.14.1",
+            isInteractive: () => true,
+            readStamp: async () => ({
+                installed_version: "0.14.1",
+                setup_completed_version: "0.14.1",
+                updated_at: "2026-04-20T00:00:00.000Z",
+            }),
+            runSetup: async () => {
+                setupCalls += 1;
+            },
+        });
+        assert.equal(result.status, "noop-same-version");
+        assert.equal(setupCalls, 0);
+    });
+    it("warns and exits cleanly when setup fails", async () => {
+        const warnings = [];
+        const result = await runPostinstall({
+            env: { npm_config_global: "true" },
+            getCurrentVersion: async () => "0.14.1",
+            isInteractive: () => true,
+            readStamp: async () => ({
+                installed_version: "0.14.0",
+                setup_completed_version: "0.14.0",
+                updated_at: "2026-04-20T00:00:00.000Z",
+            }),
+            runSetup: async () => {
+                throw new Error("boom");
+            },
+            warn: (message) => warnings.push(message),
+            writeStamp: async () => { },
+        });
+        assert.equal(result.status, "setup-failed");
+        assert.match(warnings.join("\n"), /non-fatal error: boom/);
+    });
+    it("runs interactive setup from the npm install prefix instead of the package dir or INIT_CWD", async () => {
+        const installRoot = await mkdtemp(join(tmpdir(), "omx-postinstall-install-root-"));
+        const packageRoot = await mkdtemp(join(tmpdir(), "omx-postinstall-package-root-"));
+        const initCwd = await mkdtemp(join(tmpdir(), "omx-postinstall-init-cwd-"));
+        const originalCwd = process.cwd();
+        const scopeFile = join(installRoot, ".omx", "setup-scope.json");
+        const packageScopeFile = join(packageRoot, ".omx", "setup-scope.json");
+        const initCwdScopeFile = join(initCwd, ".omx", "setup-scope.json");
+        try {
+            process.chdir(packageRoot);
+            const result = await runPostinstall({
+                env: {
+                    npm_config_global: "true",
+                    npm_config_prefix: installRoot,
+                    INIT_CWD: initCwd,
+                },
+                getCurrentVersion: async () => "0.14.1",
+                isInteractive: () => true,
+                readStamp: async () => ({
+                    installed_version: "0.14.0",
+                    setup_completed_version: "0.14.0",
+                    updated_at: "2026-04-20T00:00:00.000Z",
+                }),
+                runSetup: async () => {
+                    await mkdir(join(process.cwd(), ".omx"), { recursive: true });
+                    await writeFile(join(process.cwd(), ".omx", "setup-scope.json"), JSON.stringify({ scope: "project" }));
+                },
+                writeStamp: async () => { },
+            });
+            assert.equal(result.status, "setup-ran");
+            assert.equal(process.cwd(), packageRoot);
+            assert.equal(JSON.parse(await readFile(scopeFile, "utf-8")).scope, "project");
+            await assert.rejects(() => readFile(packageScopeFile, "utf-8"));
+            await assert.rejects(() => readFile(initCwdScopeFile, "utf-8"));
+        }
+        finally {
+            process.chdir(originalCwd);
+            await rm(installRoot, { recursive: true, force: true });
+            await rm(packageRoot, { recursive: true, force: true });
+            await rm(initCwd, { recursive: true, force: true });
+        }
+    });
+});
+//# sourceMappingURL=postinstall.test.js.map

package/dist/scripts/__tests__/postinstall.test.js.map

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

package/dist/scripts/codex-native-hook.d.ts

@@ -19,6 +19,7 @@ export declare function resolveSessionOwnerPidFromAncestry(startPid: number, opt
     readProcessCommand?: (pid: number) => string;
 }): number | null;
 export declare function dispatchCodexNativeHook(payload: CodexHookPayload, options?: NativeHookDispatchOptions): Promise<NativeHookDispatchResult>;
+export declare function isCodexNativeHookMainModule(moduleUrl: string, argv1: string | undefined): boolean;
 export declare function runCodexNativeHookCli(): Promise<void>;
 export {};
 //# sourceMappingURL=codex-native-hook.d.ts.map

package/dist/scripts/codex-native-hook.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"codex-native-hook.d.ts","sourceRoot":"","sources":["../../src/scripts/codex-native-hook.ts"],"names":[],"mappings":"AAsBA,OAAO,EAIL,KAAK,gBAAgB,EACtB,MAAM,8BAA8B,CAAC;AAiBtC,OAAO,EAAE,2BAA2B,EAAE,MAAM,qBAAqB,CAAC;AAelE,KAAK,kBAAkB,GACnB,cAAc,GACd,YAAY,GACZ,aAAa,GACb,kBAAkB,GAClB,MAAM,CAAC;AAEX,KAAK,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAEhD,UAAU,yBAAyB;IACjC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,6BAA6B,CAAC,EAAE,OAAO,2BAA2B,CAAC;CACpE;AAED,MAAM,WAAW,wBAAwB;IACvC,aAAa,EAAE,kBAAkB,GAAG,IAAI,CAAC;IACzC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,UAAU,EAAE,gBAAgB,GAAG,IAAI,CAAC;IACpC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;CAC5C;AA2FD,wBAAgB,2BAA2B,CACzC,aAAa,EAAE,kBAAkB,GAAG,IAAI,GACvC,MAAM,GAAG,IAAI,CAef;AAqKD,wBAAgB,kCAAkC,CAChD,QAAQ,EAAE,MAAM,EAChB,OAAO,GAAE;IACP,aAAa,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI,CAAC;IAC/C,kBAAkB,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,CAAC;CACzC,GACL,MAAM,GAAG,IAAI,CAuBf;AAwqCD,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE,gBAAgB,EACzB,OAAO,GAAE,yBAA8B,GACtC,OAAO,CAAC,wBAAwB,CAAC,CAiKnC;AA8BD,wBAAsB,qBAAqB,IAAI,OAAO,CAAC,IAAI,CAAC,CAmB3D"}
+{"version":3,"file":"codex-native-hook.d.ts","sourceRoot":"","sources":["../../src/scripts/codex-native-hook.ts"],"names":[],"mappings":"AA4BA,OAAO,EAIL,KAAK,gBAAgB,EACtB,MAAM,8BAA8B,CAAC;AAiBtC,OAAO,EAAE,2BAA2B,EAAE,MAAM,qBAAqB,CAAC;AAiBlE,KAAK,kBAAkB,GACnB,cAAc,GACd,YAAY,GACZ,aAAa,GACb,kBAAkB,GAClB,MAAM,CAAC;AAEX,KAAK,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAEhD,UAAU,yBAAyB;IACjC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,6BAA6B,CAAC,EAAE,OAAO,2BAA2B,CAAC;CACpE;AAED,MAAM,WAAW,wBAAwB;IACvC,aAAa,EAAE,kBAAkB,GAAG,IAAI,CAAC;IACzC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,UAAU,EAAE,gBAAgB,GAAG,IAAI,CAAC;IACpC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;CAC5C;AA2FD,wBAAgB,2BAA2B,CACzC,aAAa,EAAE,kBAAkB,GAAG,IAAI,GACvC,MAAM,GAAG,IAAI,CAef;AAiLD,wBAAgB,kCAAkC,CAChD,QAAQ,EAAE,MAAM,EAChB,OAAO,GAAE;IACP,aAAa,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI,CAAC;IAC/C,kBAAkB,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,CAAC;CACzC,GACL,MAAM,GAAG,IAAI,CAuBf;AA8sCD,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE,gBAAgB,EACzB,OAAO,GAAE,yBAA8B,GACtC,OAAO,CAAC,wBAAwB,CAAC,CAkLnC;AAOD,wBAAgB,2BAA2B,CACzC,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,GAAG,SAAS,GACxB,OAAO,CAGT;AAyBD,wBAAsB,qBAAqB,IAAI,OAAO,CAAC,IAAI,CAAC,CAmB3D"}

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

@@ -2,11 +2,12 @@ import { execFileSync } from "child_process";
 import { existsSync, readFileSync } from "fs";
 import { mkdir, readFile, readdir, writeFile } from "fs/promises";
 import { join, resolve } from "path";
+import { pathToFileURL } from "url";
 import { readModeState, readModeStateForSession, updateModeState } from "../modes/base.js";
 import { listActiveSkills, readVisibleSkillActiveState, } from "../state/skill-active.js";
 import { readSubagentSessionSummary } from "../subagents/tracker.js";
 import { resolveCanonicalTeamStateRoot } from "../team/state-root.js";
-import { readUsableSessionState, reconcileNativeSessionStart } from "../hooks/session.js";
+import { isSessionStateUsable, readSessionState, readUsableSessionState, reconcileNativeSessionStart, } from "../hooks/session.js";
 import { appendTeamEvent, readTeamLeaderAttention, readTeamManifestV2, readTeamPhase, writeTeamLeaderAttention, writeTeamPhase, } from "../team/state.js";
 import { omxNotepadPath, omxProjectMemoryPath } from "../utils/paths.js";
 import { getStateFilePath, getStatePath } from "../mcp/state-paths.js";
@@ -16,6 +17,7 @@ import { buildNativePostToolUseOutput, buildNativePreToolUseOutput, detectMcpTra
 import { buildNativeHookEvent, } from "../hooks/extensibility/events.js";
 import { dispatchHookEvent } from "../hooks/extensibility/dispatcher.js";
 import { reconcileHudForPromptSubmit } from "../hud/reconcile.js";
+import { shellEscapeSingle } from "../hud/tmux.js";
 import { onSessionStart as buildWikiSessionStartContext } from "../wiki/lifecycle.js";
 import { readAutoresearchCompletionStatus, readAutoresearchModeState } from "../autoresearch/skill-validation.js";
 import { shouldContinueRun } from "../runtime/run-loop.js";
@@ -23,6 +25,7 @@ import { triagePrompt } from "../hooks/triage-heuristic.js";
 import { readTriageConfig } from "../hooks/triage-config.js";
 import { readTriageState, writeTriageState, shouldSuppressFollowup, promptSignature, } from "../hooks/triage-state.js";
 import { isPendingDeepInterviewQuestionEnforcement } from "../question/deep-interview.js";
+import { resolveOmxCliEntryPath } from "../utils/paths.js";
 const TERMINAL_MODE_PHASES = new Set(["complete", "failed", "cancelled"]);
 const SKILL_STOP_BLOCKERS = new Set(["ralplan"]);
 const TEAM_TERMINAL_TASK_STATUSES = new Set(["completed", "failed"]);
@@ -133,24 +136,31 @@ function readPromptText(payload) {
     }
     return "";
 }
-function sanitizePayloadForHookContext(payload, hookEventName) {
-    if (hookEventName !== "UserPromptSubmit")
-        return payload;
+function sanitizePayloadForHookContext(payload, hookEventName, canonicalSessionId = "") {
     const sanitized = { ...payload };
-    delete sanitized.prompt;
-    delete sanitized.input;
-    delete sanitized.user_prompt;
-    delete sanitized.userPrompt;
-    delete sanitized.text;
+    if (hookEventName === "UserPromptSubmit") {
+        delete sanitized.prompt;
+        delete sanitized.input;
+        delete sanitized.user_prompt;
+        delete sanitized.userPrompt;
+        delete sanitized.text;
+        return sanitized;
+    }
+    if (hookEventName === "Stop") {
+        delete sanitized.stop_hook_active;
+        delete sanitized.stopHookActive;
+        delete sanitized.sessionId;
+        sanitized.session_id = canonicalSessionId.trim() || safeString(payload.session_id ?? payload.sessionId).trim();
+    }
     return sanitized;
 }
-function buildBaseContext(cwd, payload, hookEventName) {
+function buildBaseContext(cwd, payload, hookEventName, canonicalSessionId = "") {
     return {
         cwd,
         project_path: cwd,
         transcript_path: safeString(payload.transcript_path ?? payload.transcriptPath) || null,
         source: safeString(payload.source),
-        payload: sanitizePayloadForHookContext(payload, hookEventName),
+        payload: sanitizePayloadForHookContext(payload, hookEventName, canonicalSessionId),
     };
 }
 async function readJsonIfExists(path) {
@@ -183,14 +193,27 @@ async function readActiveAutoresearchState(cwd, sessionId) {
     return state;
 }
 async function readActiveRalphState(stateDir, preferredSessionId) {
-    const sessionInfo = await readUsableSessionState(resolve(stateDir, "..", ".."));
-    const currentOmxSessionId = safeString(sessionInfo?.session_id).trim();
+    const cwd = resolve(stateDir, "..", "..");
+    const [rawSessionInfo, usableSessionInfo] = await Promise.all([
+        readSessionState(cwd),
+        readUsableSessionState(cwd),
+    ]);
+    const currentOmxSessionId = safeString(usableSessionInfo?.session_id).trim();
+    const staleCurrentSessionId = rawSessionInfo && !isSessionStateUsable(rawSessionInfo, cwd)
+        ? safeString(rawSessionInfo.session_id).trim()
+        : "";
     const sessionCandidates = [...new Set([
             safeString(preferredSessionId).trim(),
             currentOmxSessionId,
         ].filter(Boolean))];
+    // Ralph Stop stays authoritative-scope-only once the Stop payload is session-bound.
+    // That is intentionally stricter than generic state MCP reads: do not scan sibling
+    // session scopes or fall back to root when a current/explicit session is in play.
     for (const sessionId of sessionCandidates) {
-        const sessionScoped = await readJsonIfExists(join(stateDir, "sessions", sessionId, "ralph-state.json"));
+        if (staleCurrentSessionId && sessionId === staleCurrentSessionId) {
+            continue;
+        }
+        const sessionScoped = await readStopSessionPinnedState("ralph-state.json", cwd, sessionId);
         if (sessionScoped?.active === true && shouldContinueRun(sessionScoped)) {
             return sessionScoped;
         }
@@ -201,18 +224,6 @@ async function readActiveRalphState(stateDir, preferredSessionId) {
     if (direct?.active === true && shouldContinueRun(direct)) {
         return direct;
     }
-    const sessionsRoot = join(stateDir, "sessions");
-    if (!existsSync(sessionsRoot))
-        return null;
-    const entries = await readdir(sessionsRoot, { withFileTypes: true }).catch(() => []);
-    for (const entry of entries) {
-        if (!entry.isDirectory())
-            continue;
-        const candidate = await readJsonIfExists(join(sessionsRoot, entry.name, "ralph-state.json"));
-        if (candidate?.active === true && shouldContinueRun(candidate)) {
-            return candidate;
-        }
-    }
     return null;
 }
 function readParentPid(pid) {
@@ -303,38 +314,60 @@ function resolveSessionOwnerPid(payload) {
         return resolved;
     return process.pid;
 }
-async function ensureOmxGitignoreEntry(cwd) {
-    let repoRoot = "";
+function tryReadGitValue(cwd, args) {
     try {
-        repoRoot = execFileSync("git", ["rev-parse", "--show-toplevel"], {
+        const value = execFileSync("git", args, {
             cwd,
             encoding: "utf-8",
             stdio: ["ignore", "pipe", "ignore"],
             windowsHide: true,
         }).trim();
+        return value || null;
     }
     catch {
-        return { changed: false };
+        return null;
+    }
+}
+function isPathIgnoredByGit(cwd, path) {
+    try {
+        execFileSync("git", ["check-ignore", "-q", path], {
+            cwd,
+            stdio: ["ignore", "ignore", "ignore"],
+            windowsHide: true,
+        });
+        return true;
     }
+    catch {
+        return false;
+    }
+}
+async function ensureOmxLocalIgnoreEntry(cwd) {
+    const repoRoot = tryReadGitValue(cwd, ["rev-parse", "--show-toplevel"]);
     if (!repoRoot)
         return { changed: false };
-    const gitignorePath = join(repoRoot, ".gitignore");
-    const existing = existsSync(gitignorePath)
-        ? await readFile(gitignorePath, "utf-8")
+    if (isPathIgnoredByGit(repoRoot, ".omx/")) {
+        return { changed: false };
+    }
+    const excludePathValue = tryReadGitValue(repoRoot, ["rev-parse", "--git-path", "info/exclude"]);
+    if (!excludePathValue)
+        return { changed: false };
+    const excludePath = resolve(repoRoot, excludePathValue);
+    const existing = existsSync(excludePath)
+        ? await readFile(excludePath, "utf-8")
         : "";
     const lines = existing.split(/\r?\n/).map((line) => line.trim());
     if (lines.includes(".omx/")) {
-        return { changed: false, gitignorePath };
+        return { changed: false, excludePath };
     }
     const next = `${existing}${existing.endsWith("\n") || existing.length === 0 ? "" : "\n"}.omx/\n`;
-    await writeFile(gitignorePath, next);
-    return { changed: true, gitignorePath };
+    await writeFile(excludePath, next);
+    return { changed: true, excludePath };
 }
 async function buildSessionStartContext(cwd, sessionId) {
     const sections = [];
-    const gitignoreResult = await ensureOmxGitignoreEntry(cwd);
-    if (gitignoreResult.changed) {
-        sections.push(`Added .omx/ to ${gitignoreResult.gitignorePath} to keep local OMX state out of source control.`);
+    const localIgnoreResult = await ensureOmxLocalIgnoreEntry(cwd);
+    if (localIgnoreResult.changed) {
+        sections.push(`Added .omx/ to ${localIgnoreResult.excludePath} to keep local OMX state out of source control without mutating tracked repo ignores.`);
     }
     const modeSummaries = [];
     for (const mode of ["ralph", "autopilot", "ultrawork", "ultraqa", "ralplan", "deep-interview", "team"]) {
@@ -420,7 +453,12 @@ async function buildSessionStartContext(cwd, sessionId) {
     }
     return sections.length > 0 ? sections.join("\n\n") : null;
 }
-function buildAdditionalContextMessage(prompt, skillState) {
+function buildDeepInterviewQuestionBridgeInstruction(cwd) {
+    const omxBin = resolveOmxCliEntryPath({ cwd }) || process.argv[1] || "omx";
+    const bridgeCommand = `${shellEscapeSingle(process.execPath)} ${shellEscapeSingle(omxBin)} question`;
+    return `Deep-interview must ask each interview round via \`omx question\`; do not fall back to \`request_user_input\` or plain-text questioning. After starting \`omx question\` in a background terminal, wait for that terminal to finish and read the JSON answer before continuing the interview. If bare \`omx question\` is unavailable in this reused session, use the current-session CLI bridge command: \`${bridgeCommand}\`. Stop remains blocked while a deep-interview question obligation is pending.`;
+}
+function buildAdditionalContextMessage(prompt, skillState, cwd = process.cwd()) {
     if (!prompt)
         return null;
     const promptPriorityMessage = buildPromptPriorityMessage(prompt);
@@ -442,7 +480,7 @@ function buildAdditionalContextMessage(prompt, skillState) {
         ? "Prompt-side `$ralph` activation seeds Ralph workflow state only; it does not invoke `omx ralph`. Use `omx ralph --prd ...` only when you explicitly want the PRD-gated CLI startup path."
         : null;
     const deepInterviewPromptActivationNote = skillState?.initialized_mode === "deep-interview"
-        ? "Deep-interview must ask each interview round via `omx question`; do not fall back to `request_user_input` or plain-text questioning. Stop remains blocked while a deep-interview question obligation is pending."
+        ? buildDeepInterviewQuestionBridgeInstruction(cwd)
         : null;
     const combinedTransitionMessage = (() => {
         if (!skillState?.transition_message)
@@ -803,7 +841,11 @@ async function readStopAutoNudgePhase(cwd, sessionId, threadId) {
 }
 async function buildDeepInterviewQuestionStopOutput(cwd, sessionId, threadId) {
     const modeState = await readStopSessionPinnedState("deep-interview-state.json", cwd, sessionId);
-    if (!modeState || modeState.active !== true)
+    if (!modeState)
+        return null;
+    const questionEnforcement = safeObject(modeState.question_enforcement);
+    const hasPendingQuestionObligation = isPendingDeepInterviewQuestionEnforcement(questionEnforcement);
+    if (modeState.active !== true && !hasPendingQuestionObligation)
         return null;
     const phase = formatPhase(modeState.current_phase, "planning");
     if (TERMINAL_MODE_PHASES.has(phase.toLowerCase()) || phase === "completing") {
@@ -816,8 +858,7 @@ async function buildDeepInterviewQuestionStopOutput(cwd, sessionId, threadId) {
         if (!blocker)
             return null;
     }
-    const questionEnforcement = safeObject(modeState.question_enforcement);
-    if (!isPendingDeepInterviewQuestionEnforcement(questionEnforcement)) {
+    if (!hasPendingQuestionObligation) {
         return null;
     }
     const obligationId = safeString(questionEnforcement.obligation_id).trim();
@@ -904,8 +945,8 @@ async function maybeReturnRepeatableStopOutput(payload, stateDir, signature, out
     await persistNativeStopSignature(stateDir, payload, signature, canonicalSessionId);
     return output;
 }
-async function returnPersistentStopBlock(payload, stateDir, signatureKind, signatureValue, output, canonicalSessionId) {
-    return await maybeReturnRepeatableStopOutput(payload, stateDir, buildRepeatableStopSignature(payload, signatureKind, signatureValue, canonicalSessionId), output, canonicalSessionId, { allowRepeatDuringStopHook: true });
+async function returnPersistentStopBlock(payload, stateDir, signatureKind, signatureValue, output, canonicalSessionId, options = { allowRepeatDuringStopHook: true }) {
+    return await maybeReturnRepeatableStopOutput(payload, stateDir, buildRepeatableStopSignature(payload, signatureKind, signatureValue, canonicalSessionId), output, canonicalSessionId, options);
 }
 async function findCanonicalActiveTeamForSession(cwd, sessionId) {
     if (!sessionId.trim())
@@ -1099,7 +1140,7 @@ async function buildStopHookOutput(payload, cwd, stateDir) {
         }
         const ultraworkOutput = await buildModeBasedStopOutput("ultrawork", cwd, canonicalSessionId);
         if (ultraworkOutput) {
-            return await returnPersistentStopBlock(payload, stateDir, "ultrawork-stop", safeString(ultraworkOutput.stopReason), ultraworkOutput, canonicalSessionId);
+            return await returnPersistentStopBlock(payload, stateDir, "ultrawork-stop", safeString(ultraworkOutput.stopReason), ultraworkOutput, canonicalSessionId, { allowRepeatDuringStopHook: false });
         }
         const ultraqaOutput = await buildModeBasedStopOutput("ultraqa", cwd, canonicalSessionId);
         if (ultraqaOutput) {
@@ -1165,18 +1206,32 @@ export async function dispatchCodexNativeHook(payload, options = {}) {
     const nativeSessionId = safeString(payload.session_id ?? payload.sessionId).trim();
     const threadId = safeString(payload.thread_id ?? payload.threadId).trim();
     const turnId = safeString(payload.turn_id ?? payload.turnId).trim();
-    let canonicalSessionId = safeString((await readUsableSessionState(cwd))?.session_id).trim();
+    const currentSessionState = await readUsableSessionState(cwd);
+    let canonicalSessionId = safeString(currentSessionState?.session_id).trim();
+    let resolvedNativeSessionId = nativeSessionId;
     if (hookEventName === "SessionStart" && nativeSessionId) {
         const sessionState = await reconcileNativeSessionStart(cwd, nativeSessionId, {
             pid: options.sessionOwnerPid ?? resolveSessionOwnerPid(payload),
         });
         canonicalSessionId = safeString(sessionState.session_id).trim();
+        resolvedNativeSessionId = safeString(sessionState.native_session_id).trim() || nativeSessionId;
     }
     else if (!canonicalSessionId) {
-        canonicalSessionId = safeString((await readUsableSessionState(cwd))?.session_id).trim();
+        canonicalSessionId = safeString(currentSessionState?.session_id).trim();
+    }
+    if (hookEventName === "Stop") {
+        const stopCanonicalSessionId = await resolveInternalSessionIdForPayload(cwd, readPayloadSessionId(payload));
+        if (stopCanonicalSessionId) {
+            canonicalSessionId = stopCanonicalSessionId;
+        }
+        if (canonicalSessionId && safeString(currentSessionState?.session_id).trim() === canonicalSessionId) {
+            resolvedNativeSessionId =
+                safeString(currentSessionState?.native_session_id).trim() || resolvedNativeSessionId;
+        }
     }
     const eventSessionId = canonicalSessionId || nativeSessionId || undefined;
     const sessionIdForState = canonicalSessionId || nativeSessionId;
+    let outputJson = null;
     if (hookEventName === "UserPromptSubmit") {
         const prompt = readPromptText(payload);
         if (prompt) {
@@ -1263,10 +1318,10 @@ export async function dispatchCodexNativeHook(payload, options = {}) {
         await reconcileHudForPromptSubmitFn(cwd, { sessionId: canonicalSessionId || sessionIdForState || undefined }).catch(() => { });
     }
     if (omxEventName) {
-        const baseContext = buildBaseContext(cwd, payload, hookEventName);
-        if (nativeSessionId) {
-            baseContext.native_session_id = nativeSessionId;
-            baseContext.codex_session_id = nativeSessionId;
+        const baseContext = buildBaseContext(cwd, payload, hookEventName, canonicalSessionId);
+        if (resolvedNativeSessionId) {
+            baseContext.native_session_id = resolvedNativeSessionId;
+            baseContext.codex_session_id = resolvedNativeSessionId;
         }
         if (canonicalSessionId) {
             baseContext.omx_session_id = canonicalSessionId;
@@ -1279,11 +1334,10 @@ export async function dispatchCodexNativeHook(payload, options = {}) {
         });
         await dispatchHookEvent(event, { cwd });
     }
-    let outputJson = null;
     if (hookEventName === "SessionStart" || hookEventName === "UserPromptSubmit") {
         const additionalContext = hookEventName === "SessionStart"
             ? await buildSessionStartContext(cwd, canonicalSessionId || nativeSessionId)
-            : (buildAdditionalContextMessage(readPromptText(payload), skillState) ?? triageAdditionalContext);
+            : (buildAdditionalContextMessage(readPromptText(payload), skillState, cwd) ?? triageAdditionalContext);
         if (additionalContext) {
             outputJson = {
                 hookSpecificOutput: {
@@ -1312,6 +1366,11 @@ export async function dispatchCodexNativeHook(payload, options = {}) {
         outputJson,
     };
 }
+export function isCodexNativeHookMainModule(moduleUrl, argv1) {
+    if (!argv1)
+        return false;
+    return moduleUrl === pathToFileURL(argv1).href;
+}
 async function readStdinJson() {
     const chunks = [];
     for await (const chunk of process.stdin) {
@@ -1352,7 +1411,7 @@ export async function runCodexNativeHookCli() {
         process.stdout.write(`${JSON.stringify(result.outputJson)}\n`);
     }
 }
-if (import.meta.url === `file://${process.argv[1]}`) {
+if (isCodexNativeHookMainModule(import.meta.url, process.argv[1])) {
     runCodexNativeHookCli().catch((error) => {
         process.stderr.write(`[omx] codex-native-hook failed: ${error instanceof Error ? error.message : String(error)}\n`);
         process.exitCode = 1;