oh-my-codex 0.18.0 → 0.18.2

package/dist/cli/codex-feature-probe.js

@@ -1,5 +1,5 @@
 import { spawnSync } from "child_process";
-import { DEFAULT_CODEX_HOOK_FEATURE_FLAG, resolveCodexHookFeatureFlag, } from "../config/codex-feature-flags.js";
+import { DEFAULT_CODEX_HOOK_FEATURE_FLAG, resolveCodexHookFeatureFlag, supportsCodexPluginScopedHooks, } from "../config/codex-feature-flags.js";
 export function probeInstalledCodexFeatureList() {
     const result = spawnSync("codex", ["features", "list"], {
         encoding: "utf-8",
@@ -16,13 +16,19 @@ export function probeInstalledCodexVersion() {
         return null;
     return [result.stdout, result.stderr].filter(Boolean).join("\n") || null;
 }
-export function resolveCodexHookFeatureFlagForCli(options = {}) {
+export function resolveCodexHookFeatureSupportForCli(options = {}) {
     const featuresListOutput = options.codexFeaturesProbe?.() ?? probeInstalledCodexFeatureList();
     const versionOutput = options.codexVersionProbe?.() ?? probeInstalledCodexVersion();
-    return resolveCodexHookFeatureFlag({
-        featuresListOutput,
-        versionOutput,
-        fallback: DEFAULT_CODEX_HOOK_FEATURE_FLAG,
-    });
+    return {
+        hookFeatureFlag: resolveCodexHookFeatureFlag({
+            featuresListOutput,
+            versionOutput,
+            fallback: DEFAULT_CODEX_HOOK_FEATURE_FLAG,
+        }),
+        pluginScopedHooks: supportsCodexPluginScopedHooks({ featuresListOutput }),
+    };
+}
+export function resolveCodexHookFeatureFlagForCli(options = {}) {
+    return resolveCodexHookFeatureSupportForCli(options).hookFeatureFlag;
 }
 //# sourceMappingURL=codex-feature-probe.js.map

package/dist/cli/codex-feature-probe.js.map

@@ -1 +1 @@
-{"version":3,"file":"codex-feature-probe.js","sourceRoot":"","sources":["../../src/cli/codex-feature-probe.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,EACL,+BAA+B,EAC/B,2BAA2B,GAE5B,MAAM,kCAAkC,CAAC;AAO1C,MAAM,UAAU,8BAA8B;IAC5C,MAAM,MAAM,GAAG,SAAS,CAAC,OAAO,EAAE,CAAC,UAAU,EAAE,MAAM,CAAC,EAAE;QACtD,QAAQ,EAAE,OAAO;KAClB,CAAC,CAAC;IACH,IAAI,MAAM,CAAC,KAAK,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IACrD,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC;AAC3E,CAAC;AAED,MAAM,UAAU,0BAA0B;IACxC,MAAM,MAAM,GAAG,SAAS,CAAC,OAAO,EAAE,CAAC,WAAW,CAAC,EAAE;QAC/C,QAAQ,EAAE,OAAO;KAClB,CAAC,CAAC;IACH,IAAI,MAAM,CAAC,KAAK,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IACrD,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC;AAC3E,CAAC;AAED,MAAM,UAAU,iCAAiC,CAC/C,UAAoC,EAAE;IAEtC,MAAM,kBAAkB,GACtB,OAAO,CAAC,kBAAkB,EAAE,EAAE,IAAI,8BAA8B,EAAE,CAAC;IACrE,MAAM,aAAa,GAAG,OAAO,CAAC,iBAAiB,EAAE,EAAE,IAAI,0BAA0B,EAAE,CAAC;IACpF,OAAO,2BAA2B,CAAC;QACjC,kBAAkB;QAClB,aAAa;QACb,QAAQ,EAAE,+BAA+B;KAC1C,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"codex-feature-probe.js","sourceRoot":"","sources":["../../src/cli/codex-feature-probe.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,EACL,+BAA+B,EAC/B,2BAA2B,EAC3B,8BAA8B,GAE/B,MAAM,kCAAkC,CAAC;AAO1C,MAAM,UAAU,8BAA8B;IAC5C,MAAM,MAAM,GAAG,SAAS,CAAC,OAAO,EAAE,CAAC,UAAU,EAAE,MAAM,CAAC,EAAE;QACtD,QAAQ,EAAE,OAAO;KAClB,CAAC,CAAC;IACH,IAAI,MAAM,CAAC,KAAK,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IACrD,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC;AAC3E,CAAC;AAED,MAAM,UAAU,0BAA0B;IACxC,MAAM,MAAM,GAAG,SAAS,CAAC,OAAO,EAAE,CAAC,WAAW,CAAC,EAAE;QAC/C,QAAQ,EAAE,OAAO;KAClB,CAAC,CAAC;IACH,IAAI,MAAM,CAAC,KAAK,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IACrD,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC;AAC3E,CAAC;AAOD,MAAM,UAAU,oCAAoC,CAClD,UAAoC,EAAE;IAEtC,MAAM,kBAAkB,GACtB,OAAO,CAAC,kBAAkB,EAAE,EAAE,IAAI,8BAA8B,EAAE,CAAC;IACrE,MAAM,aAAa,GAAG,OAAO,CAAC,iBAAiB,EAAE,EAAE,IAAI,0BAA0B,EAAE,CAAC;IACpF,OAAO;QACL,eAAe,EAAE,2BAA2B,CAAC;YAC3C,kBAAkB;YAClB,aAAa;YACb,QAAQ,EAAE,+BAA+B;SAC1C,CAAC;QACF,iBAAiB,EAAE,8BAA8B,CAAC,EAAE,kBAAkB,EAAE,CAAC;KAC1E,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,iCAAiC,CAC/C,UAAoC,EAAE;IAEtC,OAAO,oCAAoC,CAAC,OAAO,CAAC,CAAC,eAAe,CAAC;AACvE,CAAC"}

package/dist/cli/doctor.d.ts

@@ -1,6 +1,7 @@
 /**
  * omx doctor - Validate oh-my-codex installation
  */
+import { spawnSync } from "child_process";
 interface DoctorOptions {
     verbose?: boolean;
     force?: boolean;
@@ -12,8 +13,14 @@ interface Check {
     status: "pass" | "warn" | "fail";
     message: string;
 }
+interface NativeHookDistSmokeOptions {
+    packageRoot?: string;
+    nodePath?: string;
+    runner?: typeof spawnSync;
+}
 export declare function doctor(options?: DoctorOptions): Promise<void>;
 export declare function checkExploreHarness(platform?: NodeJS.Platform, env?: NodeJS.ProcessEnv): Check;
+export declare function checkNativeHookDistSmoke(options?: NativeHookDistSmokeOptions): Promise<Check>;
 export declare function classifyPostCompactHookStdout(stdout: string): Check | null;
 export {};
 //# sourceMappingURL=doctor.d.ts.map

package/dist/cli/doctor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"doctor.d.ts","sourceRoot":"","sources":["../../src/cli/doctor.ts"],"names":[],"mappings":"AAAA;;GAEG;AAmEH,UAAU,aAAa;IACtB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,IAAI,CAAC,EAAE,OAAO,CAAC;CACf;AAED,UAAU,KAAK;IACd,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;IACjC,OAAO,EAAE,MAAM,CAAC;CAChB;AAyDD,wBAAsB,MAAM,CAAC,OAAO,GAAE,aAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CA6IvE;AAuYD,wBAAgB,mBAAmB,CAClC,QAAQ,GAAE,MAAM,CAAC,QAA2B,EAC5C,GAAG,GAAE,MAAM,CAAC,UAAwB,GAClC,KAAK,CAoFP;AAoUD,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,MAAM,GAAG,KAAK,GAAG,IAAI,CAmB1E"}
+{"version":3,"file":"doctor.d.ts","sourceRoot":"","sources":["../../src/cli/doctor.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAgE1C,UAAU,aAAa;IACtB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,IAAI,CAAC,EAAE,OAAO,CAAC;CACf;AAED,UAAU,KAAK;IACd,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;IACjC,OAAO,EAAE,MAAM,CAAC;CAChB;AAED,UAAU,0BAA0B;IACnC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,OAAO,SAAS,CAAC;CAC1B;AAyDD,wBAAsB,MAAM,CAAC,OAAO,GAAE,aAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CAmJvE;AAuYD,wBAAgB,mBAAmB,CAClC,QAAQ,GAAE,MAAM,CAAC,QAA2B,EAC5C,GAAG,GAAE,MAAM,CAAC,UAAwB,GAClC,KAAK,CAoFP;AAwiBD,wBAAsB,wBAAwB,CAC7C,OAAO,GAAE,0BAA+B,GACtC,OAAO,CAAC,KAAK,CAAC,CA2EhB;AAED,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,MAAM,GAAG,KAAK,GAAG,IAAI,CAmB1E"}

package/dist/cli/doctor.js

@@ -13,7 +13,7 @@ import { parse as parseToml } from "@iarna/toml";
 import { getBuiltinExploreHarnessUnsupportedReason, resolvePackagedExploreHarnessCommand, EXPLORE_BIN_ENV, } from "./explore.js";
 import { getPackageRoot } from "../utils/package.js";
 import { hasLegacyOmxTeamRunTable, getModelContextRecommendation, } from "../config/generator.js";
-import { buildManagedCodexNativeHookCommand, discoverCodexHookConfigPaths, getManagedCodexHookCommandsForEvent, getMissingManagedCodexHookEvents, } from "../config/codex-hooks.js";
+import { MANAGED_HOOK_EVENTS, buildManagedCodexNativeHookCommand, discoverCodexHookConfigPaths, getManagedCodexHookCommandsForEvent, getMissingManagedCodexHookEvents, } from "../config/codex-hooks.js";
 import { OMX_FIRST_PARTY_MCP_SERVER_NAMES } from "../config/omx-first-party-mcp.js";
 import { getDefaultBridge, isBridgeEnabled } from "../runtime/bridge.js";
 import { OMX_EXPLORE_CMD_ENV, isExploreCommandRoutingEnabled, } from "../hooks/explore-routing.js";
@@ -94,7 +94,11 @@ export async function doctor(options = {}) {
     if (contextRecommendationCheck)
         checks.push(contextRecommendationCheck);
     // Check 4.25: Native hooks coverage
-    checks.push(await checkNativeHooks(paths.hooksPath, paths.configPath));
+    checks.push(await checkNativeHooks(paths.hooksPath, paths.configPath, {
+        codexHomeDir: paths.codexHomeDir,
+        installMode: scopeResolution.installMode,
+    }));
+    checks.push(await checkNativeHookDistSmoke());
     if (options.verbose) {
         const postCompactRuntimeCheck = await checkNativePostCompactHookRuntime(paths.hooksPath, cwd, paths.codexHomeDir);
         if (postCompactRuntimeCheck)
@@ -714,21 +718,40 @@ async function checkExploreRouting(configPath) {
         };
     }
 }
+const LORE_COMMIT_GUARD_EXPLICIT_OPT_OUT_VALUES = new Set([
+    "0",
+    "false",
+    "no",
+    "off",
+]);
 async function checkLoreCommitGuard(configPath) {
     const envValue = process.env[OMX_LORE_COMMIT_GUARD_ENV];
-    if (typeof envValue === "string" &&
-        !isLoreCommitGuardEnabled(process.env)) {
+    if (typeof envValue === "string") {
+        if (isLoreCommitGuardEnabled(process.env)) {
+            return {
+                name: "Lore commit guard",
+                status: "pass",
+                message: "enabled by environment opt-in",
+            };
+        }
+        if (!isExplicitLoreCommitGuardOptOut(envValue)) {
+            return {
+                name: "Lore commit guard",
+                status: "warn",
+                message: "invalid environment value; Lore commit enforcement is disabled until OMX_LORE_COMMIT_GUARD is set to 1, true, yes, or on",
+            };
+        }
         return {
             name: "Lore commit guard",
-            status: "warn",
-            message: "disabled by environment override; enable with OMX_LORE_COMMIT_GUARD=1 (or remove the explicit opt-out)",
+            status: "pass",
+            message: "disabled by environment/default opt-out; enable with OMX_LORE_COMMIT_GUARD=1",
         };
     }
     if (!existsSync(configPath)) {
         return {
             name: "Lore commit guard",
             status: "pass",
-            message: "enabled by default (config.toml not found yet)",
+            message: "disabled by default (config.toml not found yet)",
         };
     }
     try {
@@ -736,20 +759,33 @@ async function checkLoreCommitGuard(configPath) {
         const parsed = parseToml(content);
         const configuredValue = parsed?.shell_environment_policy?.set?.[OMX_LORE_COMMIT_GUARD_ENV] ??
             parsed?.env?.[OMX_LORE_COMMIT_GUARD_ENV];
-        if (typeof configuredValue === "string" &&
-            !isLoreCommitGuardEnabled({
+        if (typeof configuredValue === "string") {
+            if (isLoreCommitGuardEnabled({
                 [OMX_LORE_COMMIT_GUARD_ENV]: configuredValue,
             })) {
+                return {
+                    name: "Lore commit guard",
+                    status: "pass",
+                    message: "enabled by config.toml opt-in",
+                };
+            }
+            if (!isExplicitLoreCommitGuardOptOut(configuredValue)) {
+                return {
+                    name: "Lore commit guard",
+                    status: "warn",
+                    message: 'invalid config.toml value; Lore commit enforcement is disabled until OMX_LORE_COMMIT_GUARD = "1" (or true/yes/on) is set under [shell_environment_policy.set]',
+                };
+            }
             return {
                 name: "Lore commit guard",
-                status: "warn",
-                message: 'disabled in config.toml; set OMX_LORE_COMMIT_GUARD = "1" under [shell_environment_policy.set] to restore default Lore commit enforcement',
+                status: "pass",
+                message: 'disabled in config.toml/default opt-out; set OMX_LORE_COMMIT_GUARD = "1" under [shell_environment_policy.set] to enable Lore commit enforcement',
             };
         }
         return {
             name: "Lore commit guard",
             status: "pass",
-            message: "enabled by default",
+            message: "disabled by default",
         };
     }
     catch {
@@ -760,18 +796,189 @@ async function checkLoreCommitGuard(configPath) {
         };
     }
 }
-async function checkNativeHooks(hooksPath, configPath) {
+function isExplicitLoreCommitGuardOptOut(value) {
+    return LORE_COMMIT_GUARD_EXPLICIT_OPT_OUT_VALUES.has(value.trim().toLowerCase());
+}
+function isEnabledTomlValue(value) {
+    return value === true || (typeof value === "string" && ["1", "true", "yes", "on"].includes(value.trim().toLowerCase()));
+}
+function configHasOmxEntries(configContent) {
+    return configContent.includes("omx_") || configContent.includes("oh-my-codex");
+}
+function configEnablesPluginScopedHooks(configContent) {
+    try {
+        const parsed = parseToml(configContent);
+        return isEnabledTomlValue(parsed.plugin_hooks) || isEnabledTomlValue(parsed.features?.plugin_hooks);
+    }
+    catch {
+        return /^\s*plugin_hooks\s*=\s*(?:true|1|"true"|"1"|"yes"|"on")\s*$/m.test(configContent);
+    }
+}
+function pluginHooksJsonHasNativeCoverage(content) {
+    try {
+        const parsed = JSON.parse(content);
+        if (!parsed || typeof parsed !== "object" || typeof parsed.hooks !== "object" || parsed.hooks === null) {
+            return false;
+        }
+        return MANAGED_HOOK_EVENTS.every((eventName) => {
+            const entries = parsed.hooks?.[eventName];
+            if (!Array.isArray(entries))
+                return false;
+            return entries.some((entry) => {
+                if (!entry || typeof entry !== "object")
+                    return false;
+                const hooks = entry.hooks;
+                if (!Array.isArray(hooks))
+                    return false;
+                return hooks.some((hook) => {
+                    if (!hook || typeof hook !== "object")
+                        return false;
+                    const command = hook.command;
+                    return typeof command === "string" && command.includes("codex-native-hook.mjs");
+                });
+            });
+        });
+    }
+    catch {
+        return null;
+    }
+}
+async function checkPluginScopedNativeHooks(codexHomeDir, setupHooksPath) {
+    const packagedMarketplace = await resolvePackagedOmxMarketplace(getPackageRoot());
+    if (!packagedMarketplace) {
+        return {
+            name: "Native hooks",
+            status: "warn",
+            message: `plugin-scoped hooks are enabled and setup-owned hooks.json is intentionally absent at ${setupHooksPath}, but packaged ${OMX_LOCAL_MARKETPLACE_NAME} metadata was not found`,
+        };
+    }
+    const version = await packagedOmxPluginVersion(packagedMarketplace);
+    const expectedCacheDir = version
+        ? join(codexHomeDir, "plugins", "cache", OMX_LOCAL_MARKETPLACE_NAME, "oh-my-codex", version)
+        : join(codexHomeDir, "plugins", "cache", OMX_LOCAL_MARKETPLACE_NAME, "oh-my-codex", "<version>");
+    const expectedHooksPath = join(expectedCacheDir, "hooks", "hooks.json");
+    const expectedHookLauncherPath = join(expectedCacheDir, "hooks", "codex-native-hook.mjs");
+    const expectedPinnedLauncherPath = join(expectedCacheDir, "hooks", "omx-command.json");
+    const state = await readOmxPluginCacheState(expectedCacheDir);
+    if (!state) {
+        return {
+            name: "Native hooks",
+            status: "warn",
+            message: `plugin-scoped hooks are enabled, but the expected Codex plugin cache manifest is missing at ${join(expectedCacheDir, ".codex-plugin", "plugin.json")}; setup-owned hooks.json is intentionally absent at ${setupHooksPath}; run "omx setup --plugin --force" to refresh the plugin cache`,
+        };
+    }
+    if (state.hooksPointer !== "./hooks/hooks.json") {
+        return {
+            name: "Native hooks",
+            status: "warn",
+            message: `plugin-scoped hooks are enabled, but the Codex plugin cache manifest points hooks to ${String(state.hooksPointer)} instead of ./hooks/hooks.json at ${expectedHooksPath}; run "omx setup --plugin --force" to refresh the plugin cache`,
+        };
+    }
+    for (const expectedPath of [expectedHooksPath, expectedHookLauncherPath, expectedPinnedLauncherPath]) {
+        if (!existsSync(expectedPath)) {
+            return {
+                name: "Native hooks",
+                status: "warn",
+                message: `plugin-scoped hooks are enabled, but expected plugin hook file is missing at ${expectedPath}; setup-owned hooks.json is intentionally absent at ${setupHooksPath}; run "omx setup --plugin --force" to refresh the plugin cache`,
+            };
+        }
+    }
+    let hookContent;
+    try {
+        hookContent = await readFile(expectedHooksPath, "utf-8");
+    }
+    catch {
+        return {
+            name: "Native hooks",
+            status: "fail",
+            message: `cannot read plugin-scoped hooks.json at ${expectedHooksPath}`,
+        };
+    }
+    const hasCoverage = pluginHooksJsonHasNativeCoverage(hookContent);
+    if (hasCoverage === null) {
+        return {
+            name: "Native hooks",
+            status: "fail",
+            message: `invalid plugin-scoped hooks.json at ${expectedHooksPath}`,
+        };
+    }
+    if (!hasCoverage) {
+        return {
+            name: "Native hooks",
+            status: "warn",
+            message: `plugin-scoped hooks.json at ${expectedHooksPath} is missing OMX native coverage for one or more events; run "omx setup --plugin --force" to refresh the plugin cache`,
+        };
+    }
+    const smokeCwd = await mkdtemp(join(tmpdir(), "omx-doctor-plugin-hook-"));
+    try {
+        const payload = JSON.stringify({
+            hook_event_name: "UserPromptSubmit",
+            session_id: "omx-doctor-plugin-hook-smoke",
+            transcript_path: join(smokeCwd, "nonexistent-transcript.jsonl"),
+            cwd: smokeCwd,
+            prompt: "doctor plugin hook smoke test",
+        });
+        const result = spawnSync(process.execPath, [expectedHookLauncherPath], {
+            cwd: smokeCwd,
+            encoding: "utf-8",
+            env: {
+                ...process.env,
+                OMX_NATIVE_HOOK_DOCTOR_SMOKE: "1",
+                OMX_ROOT: join(smokeCwd, ".omx-doctor-root"),
+                OMX_SESSION_ID: "omx-doctor-plugin-hook-smoke",
+                OMX_SOURCE_CWD: smokeCwd,
+                OMX_STARTUP_CWD: smokeCwd,
+            },
+            input: payload,
+            timeout: 5_000,
+        });
+        if (result.error) {
+            return {
+                name: "Native hooks",
+                status: "fail",
+                message: `plugin-scoped native hook smoke failed to run from ${expectedHookLauncherPath} (${result.error.message})`,
+            };
+        }
+        if (result.status !== 0) {
+            const detail = (result.stderr || result.stdout || `exit ${result.status}`).trim();
+            return {
+                name: "Native hooks",
+                status: "fail",
+                message: `plugin-scoped native hook smoke failed from ${expectedHookLauncherPath} (${detail})`,
+            };
+        }
+    }
+    finally {
+        await rm(smokeCwd, { recursive: true, force: true });
+    }
+    return {
+        name: "Native hooks",
+        status: "pass",
+        message: `plugin-scoped hooks are enabled; setup-owned hooks.json is intentionally absent at ${setupHooksPath}, and plugin cache native hook coverage smoke passed via ${expectedHooksPath}`,
+    };
+}
+async function checkNativeHooks(hooksPath, configPath, context) {
     if (!existsSync(hooksPath)) {
         if (existsSync(configPath)) {
             try {
                 const configContent = await readFile(configPath, "utf-8");
-                const hasOmx = configContent.includes("omx_") ||
-                    configContent.includes("oh-my-codex");
-                if (hasOmx) {
+                if (context.installMode === "plugin") {
+                    if (configEnablesPluginScopedHooks(configContent)) {
+                        return checkPluginScopedNativeHooks(context.codexHomeDir, hooksPath);
+                    }
+                    if (configHasOmxEntries(configContent)) {
+                        return {
+                            name: "Native hooks",
+                            status: "warn",
+                            message: `plugin mode is using legacy native hook fallback, but expected setup-owned hooks.json is missing at ${hooksPath}; run "omx setup --plugin --force" to restore the fallback hook file, or upgrade Codex to plugin_hooks support so setup can use plugin-scoped hooks`,
+                        };
+                    }
+                }
+                if (configHasOmxEntries(configContent)) {
                     return {
                         name: "Native hooks",
                         status: "warn",
-                        message: 'hooks.json not found even though config.toml has OMX entries; run "omx setup --force" to restore native hook coverage',
+                        message: `expected setup-owned hooks.json is missing at ${hooksPath} even though config.toml has OMX entries; run "omx setup --force" to restore native hook coverage`,
                     };
                 }
             }
@@ -817,6 +1024,79 @@ async function checkNativeHooks(hooksPath, configPath) {
         };
     }
 }
+export async function checkNativeHookDistSmoke(options = {}) {
+    const packageRoot = options.packageRoot ?? getPackageRoot();
+    const nodePath = options.nodePath ?? process.execPath;
+    const runner = options.runner ?? spawnSync;
+    const scriptPath = join(packageRoot, "dist", "scripts", "codex-native-hook.js");
+    const packageJsonPath = join(packageRoot, "package.json");
+    let packageVersion = "current";
+    try {
+        const packageJson = JSON.parse(readFileSync(packageJsonPath, "utf-8"));
+        if (typeof packageJson.version === "string" && packageJson.version.trim()) {
+            packageVersion = packageJson.version.trim();
+        }
+    }
+    catch {
+        // Keep the generic recovery copy when package metadata is not readable.
+    }
+    if (!existsSync(scriptPath)) {
+        return {
+            name: "Native hook dist smoke",
+            status: "fail",
+            message: `installed native hook script is missing at ${scriptPath}; reinstall oh-my-codex and run "omx setup --force"`,
+        };
+    }
+    const smokeCwd = await mkdtemp(join(tmpdir(), "omx-doctor-native-hook-dist-"));
+    try {
+        const payload = JSON.stringify({
+            hook_event_name: "UserPromptSubmit",
+            session_id: "omx-doctor-native-hook-dist-smoke",
+            transcript_path: join(smokeCwd, "nonexistent-transcript.jsonl"),
+            cwd: smokeCwd,
+            prompt: "doctor smoke test",
+        });
+        const result = runner(nodePath, [scriptPath], {
+            cwd: smokeCwd,
+            encoding: "utf-8",
+            env: {
+                ...process.env,
+                OMX_NATIVE_HOOK_DOCTOR_SMOKE: "1",
+                OMX_ROOT: join(smokeCwd, ".omx-doctor-root"),
+                OMX_SESSION_ID: "omx-doctor-native-hook-dist-smoke",
+                OMX_SOURCE_CWD: smokeCwd,
+                OMX_STARTUP_CWD: smokeCwd,
+            },
+            input: payload,
+            timeout: 5_000,
+        });
+        if (result.error) {
+            return {
+                name: "Native hook dist smoke",
+                status: "fail",
+                message: `installed native hook dist smoke failed to run (${result.error.message}); reinstall oh-my-codex and run "omx setup --force"`,
+            };
+        }
+        if (result.status !== 0) {
+            const stderr = (result.stderr || "").trim();
+            const stdout = (result.stdout || "").trim();
+            const detail = stderr || stdout || `exit ${result.status}`;
+            return {
+                name: "Native hook dist smoke",
+                status: "fail",
+                message: `installed native hook dist failed a minimal UserPromptSubmit smoke (${detail}); reinstall with "npm install -g oh-my-codex@${packageVersion} --force --min-release-age=0 --before=" and then run "omx setup --force"`,
+            };
+        }
+        return {
+            name: "Native hook dist smoke",
+            status: "pass",
+            message: "installed dist/scripts/codex-native-hook.js parsed and accepted a minimal UserPromptSubmit payload",
+        };
+    }
+    finally {
+        await rm(smokeCwd, { recursive: true, force: true });
+    }
+}
 export function classifyPostCompactHookStdout(stdout) {
     const trimmed = stdout.trim();
     if (trimmed === "")