oh-my-codex 0.20.3 → 0.20.5

package/dist/cli/codex-home.js

@@ -1,14 +1,17 @@
 import { join } from "path";
 import { codexConfigPath } from "../utils/paths.js";
-import { readPersistedSetupPreferencesSync, readPersistedSetupScopeSync, } from "./setup-preferences.js";
+import { readPersistedSetupPreferencesSync, readPersistedSetupScopeSync, resolveNearestPersistedSetupScopeSync, } from "./setup-preferences.js";
 export const readPersistedSetupPreferences = readPersistedSetupPreferencesSync;
 export const readPersistedSetupScope = readPersistedSetupScopeSync;
 export function resolveProjectLocalCodexHomeForLaunch(cwd, env = process.env) {
     if (env.CODEX_HOME && env.CODEX_HOME.trim() !== "")
         return undefined;
-    const persistedScope = readPersistedSetupScope(cwd);
-    if (persistedScope === "project") {
-        return join(cwd, ".codex");
+    // Walk upward so a project-scoped setup is honored from any directory
+    // inside its tree — launching from a subdirectory must not fall through
+    // to the user config (issue #3447).
+    const nearest = resolveNearestPersistedSetupScopeSync(cwd);
+    if (nearest?.scope === "project") {
+        return join(nearest.projectRoot, ".codex");
     }
     return undefined;
 }

package/dist/cli/codex-home.js.map

@@ -1 +1 @@
-{"version":3,"file":"codex-home.js","sourceRoot":"","sources":["../../src/cli/codex-home.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EACN,iCAAiC,EACjC,2BAA2B,GAC3B,MAAM,wBAAwB,CAAC;AAEhC,MAAM,CAAC,MAAM,6BAA6B,GAAG,iCAAiC,CAAC;AAC/E,MAAM,CAAC,MAAM,uBAAuB,GAAG,2BAA2B,CAAC;AAEnE,MAAM,UAAU,qCAAqC,CACpD,GAAW,EACX,GAAG,GAAsB,OAAO,CAAC,GAAG;IAEpC,IAAI,GAAG,CAAC,UAAU,IAAI,GAAG,CAAC,UAAU,CAAC,IAAI,EAAE,KAAK,EAAE;QAAE,OAAO,SAAS,CAAC;IACrE,MAAM,cAAc,GAAG,uBAAuB,CAAC,GAAG,CAAC,CAAC;IACpD,IAAI,cAAc,KAAK,SAAS,EAAE,CAAC;QAClC,OAAO,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;IAC5B,CAAC;IACD,OAAO,SAAS,CAAC;AAClB,CAAC;AAED,MAAM,UAAU,yBAAyB,CACxC,GAAW,EACX,GAAG,GAAsB,OAAO,CAAC,GAAG;IAEpC,IAAI,GAAG,CAAC,UAAU,IAAI,GAAG,CAAC,UAAU,CAAC,IAAI,EAAE,KAAK,EAAE;QAAE,OAAO,GAAG,CAAC,UAAU,CAAC;IAC1E,OAAO,qCAAqC,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AACxD,CAAC;AAED,MAAM,UAAU,+BAA+B,CAC9C,GAAW,EACX,GAAG,GAAsB,OAAO,CAAC,GAAG;IAEpC,MAAM,iBAAiB,GAAG,yBAAyB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAC9D,OAAO,iBAAiB;QACvB,CAAC,CAAC,IAAI,CAAC,iBAAiB,EAAE,aAAa,CAAC;QACxC,CAAC,CAAC,eAAe,EAAE,CAAC;AACtB,CAAC"}
+{"version":3,"file":"codex-home.js","sourceRoot":"","sources":["../../src/cli/codex-home.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EACN,iCAAiC,EACjC,2BAA2B,EAC3B,qCAAqC,GACrC,MAAM,wBAAwB,CAAC;AAEhC,MAAM,CAAC,MAAM,6BAA6B,GAAG,iCAAiC,CAAC;AAC/E,MAAM,CAAC,MAAM,uBAAuB,GAAG,2BAA2B,CAAC;AAEnE,MAAM,UAAU,qCAAqC,CACpD,GAAW,EACX,GAAG,GAAsB,OAAO,CAAC,GAAG;IAEpC,IAAI,GAAG,CAAC,UAAU,IAAI,GAAG,CAAC,UAAU,CAAC,IAAI,EAAE,KAAK,EAAE;QAAE,OAAO,SAAS,CAAC;IACrE,sEAAsE;IACtE,wEAAwE;IACxE,oCAAoC;IACpC,MAAM,OAAO,GAAG,qCAAqC,CAAC,GAAG,CAAC,CAAC;IAC3D,IAAI,OAAO,EAAE,KAAK,KAAK,SAAS,EAAE,CAAC;QAClC,OAAO,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;IAC5C,CAAC;IACD,OAAO,SAAS,CAAC;AAClB,CAAC;AAED,MAAM,UAAU,yBAAyB,CACxC,GAAW,EACX,GAAG,GAAsB,OAAO,CAAC,GAAG;IAEpC,IAAI,GAAG,CAAC,UAAU,IAAI,GAAG,CAAC,UAAU,CAAC,IAAI,EAAE,KAAK,EAAE;QAAE,OAAO,GAAG,CAAC,UAAU,CAAC;IAC1E,OAAO,qCAAqC,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AACxD,CAAC;AAED,MAAM,UAAU,+BAA+B,CAC9C,GAAW,EACX,GAAG,GAAsB,OAAO,CAAC,GAAG;IAEpC,MAAM,iBAAiB,GAAG,yBAAyB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAC9D,OAAO,iBAAiB;QACvB,CAAC,CAAC,IAAI,CAAC,iBAAiB,EAAE,aAAa,CAAC;QACxC,CAAC,CAAC,eAAe,EAAE,CAAC;AACtB,CAAC"}

package/dist/cli/doctor.d.ts

@@ -3,7 +3,9 @@
  */
 import { type NativeHookClaimJournalDurability } from "./native-hook-claim-journal.js";
 import { spawnSync } from "child_process";
+import { type CanonicalSessionBindingSnapshot } from "../mcp/state-paths.js";
 import { type SetupInstallMode } from "./setup-preferences.js";
+import { type ProcessInspectionProvider } from "../hooks/session.js";
 /** @internal Test seam for deterministic claim-journal durability coverage. */
 export declare function setDoctorClaimJournalDurabilityForTest(durability: NativeHookClaimJournalDurability | undefined): () => void;
 interface DoctorOptions {
@@ -39,6 +41,11 @@ interface NativeHookDistSmokeOptions {
     nodePath?: string;
     runner?: typeof spawnSync;
 }
+interface ProcessIdentityReadinessOptions {
+    platform?: NodeJS.Platform;
+    pid?: number;
+    provider?: Pick<ProcessInspectionProvider, "observeProcess">;
+}
 type DoctorSetupScope = "user" | "project";
 interface DoctorPaths {
     codexHomeDir: string;
@@ -49,7 +56,17 @@ interface DoctorPaths {
     agentsDir: string;
     stateDir: string;
 }
+type BindingSelectorName = "OMX_SESSION_ID" | "CODEX_SESSION_ID" | "SESSION_ID";
+export declare function sanitizeBindingDiagnosticLine(value: string): string;
+declare function selectorEvaluation(snapshot: CanonicalSessionBindingSnapshot, env: NodeJS.ProcessEnv): {
+    nonblank: BindingSelectorName[];
+    bad: BindingSelectorName[];
+};
+export declare const evaluateStateRootSessionBinding: typeof selectorEvaluation;
+export declare function formatStateRootSessionBindingDiagnostic(snapshot: CanonicalSessionBindingSnapshot, env?: NodeJS.ProcessEnv, badSelectors?: readonly BindingSelectorName[]): string;
+export declare function checkStateRootSessionBinding(snapshot: CanonicalSessionBindingSnapshot, env?: NodeJS.ProcessEnv): Check;
 export declare function doctor(options?: DoctorOptions): Promise<void>;
+export declare function checkProcessIdentityReadiness(options?: ProcessIdentityReadinessOptions): Check | null;
 export declare function checkExploreHarness(platform?: NodeJS.Platform, env?: NodeJS.ProcessEnv, options?: {
     exploreRoutingEnabled?: boolean;
 }): Check;

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

@@ -1 +1 @@
-{"version":3,"file":"doctor.d.ts","sourceRoot":"","sources":["../../src/cli/doctor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"doctor.d.ts","sourceRoot":"","sources":["../../src/cli/doctor.ts"],"names":[],"mappings":"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"}

package/dist/cli/doctor.js

@@ -1,7 +1,7 @@
 /**
  * omx doctor - Validate oh-my-codex installation
  */
-import { createNativeHookClaimJournalDurability, recoverNativeHookClaimJournal, } from "./native-hook-claim-journal.js";
+import { createNativeHookClaimJournalDurability, recoverNativeHookClaimJournal, wrapNativeHookClaimJournalDurability, } from "./native-hook-claim-journal.js";
 import { emitDegradedDurabilityWarning, recordRegularFileSyncOutcome, } from "../utils/file-durability.js";
 import { constants, existsSync, readFileSync } from "fs";
 import { access, chown, lstat, mkdtemp, readdir, readFile, rmdir, rm } from "fs/promises";
@@ -9,6 +9,7 @@ import { spawnSync } from "child_process";
 import { basename, dirname, join, relative } from "path";
 import { tmpdir } from "os";
 import { codexHome, codexConfigPath, codexPromptsDir, userSkillsDir, projectSkillsDir, omxStateDir, detectLegacySkillRootOverlap, codexAgentsDir, } from "../utils/paths.js";
+import { readCanonicalSessionBindingSnapshot, normalizeSessionId, } from "../mcp/state-paths.js";
 import { classifySpawnError, spawnPlatformCommandSync, } from "../utils/platform-command.js";
 import { getCatalogExpectations } from "./catalog-contract.js";
 import { parse as parseToml } from "@iarna/toml";
@@ -30,6 +31,7 @@ import { OMX_DEFAULT_SPARK_MODEL_ENV, OMX_SPARK_MODEL_ENV, getAgentModelOverride
 import { AGENT_DEFINITIONS } from "../agents/definitions.js";
 import { getInstallableNativeAgentNames } from "../agents/policy.js";
 import { readCatalogManifest } from "../catalog/reader.js";
+import { defaultProcessInspectionProvider, isValidProcessIdentity, } from "../hooks/session.js";
 let doctorClaimJournalDurabilityOverride;
 /** @internal Test seam for deterministic claim-journal durability coverage. */
 export function setDoctorClaimJournalDurabilityForTest(durability) {
@@ -127,16 +129,233 @@ function resolveDoctorPaths(cwd, scope) {
         stateDir: omxStateDir(cwd),
     };
 }
+const BINDING_SELECTOR_NAMES = [
+    "OMX_SESSION_ID",
+    "CODEX_SESSION_ID",
+    "SESSION_ID",
+];
+const ROOT_SELECTOR_BY_SOURCE = {
+    "team-env": "OMX_TEAM_STATE_ROOT",
+    "omx-root-env": "OMX_ROOT",
+    "omx-state-root-env": "OMX_STATE_ROOT",
+};
+function bindingEnvironmentRootSelector(env) {
+    if (env.OMX_TEAM_STATE_ROOT?.trim())
+        return { source: "team-env", selector: "OMX_TEAM_STATE_ROOT" };
+    if (env.OMX_ROOT?.trim())
+        return { source: "omx-root-env", selector: "OMX_ROOT" };
+    if (env.OMX_STATE_ROOT?.trim())
+        return { source: "omx-state-root-env", selector: "OMX_STATE_ROOT" };
+    return undefined;
+}
+function printableBindingComponent(value) {
+    return value
+        .replace(/[\u0000-\u001f\u007f-\u009f\u2028\u2029]/g, " ")
+        .replace(/\s+/g, " ")
+        .trim();
+}
+function safeSelectedSessionJsonLabel(_path) {
+    return _path ? "session.json" : undefined;
+}
+export function sanitizeBindingDiagnosticLine(value) {
+    const sanitized = printableBindingComponent(value);
+    if (sanitized.length <= 240)
+        return sanitized;
+    return `${sanitized.slice(0, 239)}…`;
+}
+function selectorEvaluation(snapshot, env) {
+    const nonblank = [];
+    const bad = [];
+    const aliases = new Set(Object.values(snapshot.verifiedAliases ?? {}));
+    for (const name of BINDING_SELECTOR_NAMES) {
+        const raw = env[name];
+        if (typeof raw !== "string" || raw.trim() === "")
+            continue;
+        nonblank.push(name);
+        const normalized = normalizeSessionId(raw);
+        const accepted = snapshot.status === "stale-dead"
+            ? normalized !== undefined && normalized === snapshot.verifiedAliases?.session_id
+            : snapshot.status === "usable"
+                ? normalized !== undefined && aliases.has(normalized)
+                : false;
+        if (!accepted)
+            bad.push(name);
+    }
+    return { nonblank, bad };
+}
+export const evaluateStateRootSessionBinding = selectorEvaluation;
+function bindingRecoveryAction(snapshot, rootSelector, badSelectors) {
+    const rootClear = rootSelector ? `clear ${rootSelector} only if unintended; ` : "";
+    const selectorFix = badSelectors.length > 0 ? "clear or correct listed selectors; " : "";
+    if (snapshot.status === "resolution-error") {
+        const resolutionRecovery = rootSelector
+            ? `${rootClear}then relaunch from intended workspace`
+            : "inspect runtime root policy and relaunch";
+        return `${selectorFix}${resolutionRecovery}`;
+    }
+    if (snapshot.status === "absent") {
+        return `${selectorFix}${rootClear}relaunch`;
+    }
+    if (snapshot.status === "read-error") {
+        return `${selectorFix}${rootClear}inspect selected session.json path/access; relaunch`;
+    }
+    if (snapshot.status === "stale-dead") {
+        return `${selectorFix}${rootClear}inspect selected session.json; confirm owner state; terminate only verified owner if necessary (still-live owner only); relaunch`;
+    }
+    return `${selectorFix}${rootClear}inspect selected session.json; verify owner; terminate only verified owner if necessary; relaunch`;
+}
+function compactCappedBindingRecoveryAction(snapshot, rootSelector, badSelectors) {
+    const selectorFix = badSelectors.length > 0 ? "clear or correct listed selectors;" : "";
+    const rootClear = rootSelector ? `clear ${rootSelector} only if unintended;` : "";
+    const ownerTermination = snapshot.status === "stale-dead"
+        || snapshot.status === "foreign-cwd"
+        || snapshot.status === "malformed"
+        || snapshot.status === "identity-indeterminate"
+        ? "terminate only verified owner if necessary;"
+        : "";
+    if (ownerTermination)
+        return `${selectorFix}${rootClear}${ownerTermination}relaunch`;
+    if (snapshot.status === "read-error")
+        return `${selectorFix}${rootClear}inspect;relaunch`;
+    return `${selectorFix}${rootClear}relaunch`;
+}
+export function formatStateRootSessionBindingDiagnostic(snapshot, env = process.env, badSelectors) {
+    const failedSelectorSet = new Set(badSelectors ?? selectorEvaluation(snapshot, env).bad);
+    const failedSelectors = BINDING_SELECTOR_NAMES.filter((name) => failedSelectorSet.has(name));
+    const reportBadSelectors = failedSelectors;
+    const inferred = snapshot.rootSource ? undefined : bindingEnvironmentRootSelector(env);
+    const source = snapshot.rootSource ?? inferred?.source ?? "cwd-default";
+    const rootSelector = ROOT_SELECTOR_BY_SOURCE[source] ?? inferred?.selector;
+    const pointer = snapshot.status;
+    const unsafe = (pointer !== "usable" && pointer !== "absent") || failedSelectors.length > 0;
+    const fields = [
+        `src=${source}`,
+        ...(rootSelector && unsafe ? [`root_selector=${rootSelector}`] : []),
+        `ptr=${pointer}`,
+        ...(unsafe ? ["binding check made no mutation"] : []),
+        `fix=${bindingRecoveryAction(snapshot, rootSelector, failedSelectors)}`,
+        ...(safeSelectedSessionJsonLabel(snapshot.selectedSessionJson)
+            ? [`selected_session_json=${safeSelectedSessionJsonLabel(snapshot.selectedSessionJson)}`]
+            : []),
+        ...(reportBadSelectors.length > 0 ? [`bad_selectors=${reportBadSelectors.join(",")}`] : []),
+    ];
+    const raw = fields.join(" ");
+    if (raw.length <= 240 && !(rootSelector && unsafe))
+        return sanitizeBindingDiagnosticLine(raw);
+    const staticFields = [
+        `src=${source}`,
+        ...(rootSelector && unsafe ? [`root_selector=${rootSelector}`] : []),
+        `ptr=${pointer}`,
+        ...(unsafe ? ["binding check made no mutation"] : []),
+    ];
+    // Capped output is assembled from whole fields; selector/session evidence is never
+    // truncated. The tail form keeps the selected-path proof atomic when all selectors are present.
+    const compactRecovery = compactCappedBindingRecoveryAction(snapshot, rootSelector, failedSelectors);
+    const selectedSessionLabel = safeSelectedSessionJsonLabel(snapshot.selectedSessionJson);
+    const badSelectorsField = reportBadSelectors.length > 0
+        ? `bad_selectors=${reportBadSelectors.join(",")}`
+        : undefined;
+    const compactPointerCode = pointer === "identity-indeterminate"
+        ? "indet"
+        : pointer === "resolution-error"
+            ? "resolve"
+            : pointer === "missing-recorded-cwd"
+                ? "missing"
+                : pointer === "root-mismatch"
+                    ? "root"
+                    : pointer === "foreign-cwd"
+                        ? "foreign"
+                        : pointer === "stale-dead"
+                            ? "stale"
+                            : pointer === "read-error"
+                                ? "read"
+                                : pointer;
+    if (rootSelector && unsafe) {
+        const canonicalFields = [
+            `src=${source}`,
+            `root=${rootSelector}`,
+            `clear=${rootSelector}-if-unintended`,
+            `ptr=${compactPointerCode}`,
+            ...(failedSelectors.length > 0 ? ["fix=clear/correct"] : []),
+            "no-mutation",
+            ...(compactRecovery.includes("terminate only verified owner if necessary")
+                ? ["owner=terminate-verified-only-if-needed"]
+                : []),
+            ...(selectedSessionLabel ? ["selected=session.json"] : []),
+            ...(badSelectorsField ? [badSelectorsField] : []),
+        ];
+        return canonicalFields.join(";");
+    }
+    const buildCompactFields = (selectedEvidence, recovery, includeFixLabel = true) => [
+        ...staticFields,
+        ...(includeFixLabel ? [`fix=${recovery}`] : [recovery]),
+        ...(selectedEvidence ? [selectedEvidence] : []),
+        ...(badSelectorsField ? [badSelectorsField] : []),
+    ];
+    const compactWithFullEvidence = buildCompactFields(selectedSessionLabel ? `selected_session_json=${selectedSessionLabel}` : undefined, compactRecovery).join(";");
+    if (compactWithFullEvidence.length <= 240)
+        return sanitizeBindingDiagnosticLine(compactWithFullEvidence);
+    const selectedTail = selectedSessionLabel ? "session.json" : undefined;
+    const compactWithTailEvidence = buildCompactFields(selectedTail, compactRecovery).join(";");
+    if (compactWithTailEvidence.length <= 240)
+        return sanitizeBindingDiagnosticLine(compactWithTailEvidence);
+    const compactWithoutFixLabel = buildCompactFields(selectedTail, compactRecovery, false).join(";");
+    if (compactWithoutFixLabel.length <= 240)
+        return sanitizeBindingDiagnosticLine(compactWithoutFixLabel);
+    const compactPointer = pointer === "identity-indeterminate"
+        ? "indet"
+        : pointer === "resolution-error"
+            ? "resolve"
+            : pointer === "missing-recorded-cwd"
+                ? "missing"
+                : pointer === "root-mismatch"
+                    ? "root"
+                    : pointer === "foreign-cwd"
+                        ? "foreign"
+                        : pointer === "stale-dead"
+                            ? "stale"
+                            : pointer === "read-error"
+                                ? "read"
+                                : pointer;
+    const fallbackFields = [
+        `src=${source}`,
+        ...(rootSelector && unsafe
+            ? [`root=${rootSelector}`, `clear=${rootSelector}-if-unintended`]
+            : []),
+        `ptr=${compactPointer}`,
+        ...(failedSelectors.length > 0 ? ["fix=clear/correct"] : []),
+        "no-mutation",
+        ...(compactRecovery.includes("terminate only verified owner if necessary")
+            ? ["owner=terminate-verified-only-if-needed"]
+            : []),
+        ...(selectedSessionLabel ? ["selected=session.json"] : []),
+        ...(badSelectorsField ? [badSelectorsField] : []),
+    ];
+    return sanitizeBindingDiagnosticLine(fallbackFields.join(";"));
+}
+export function checkStateRootSessionBinding(snapshot, env = process.env) {
+    const evaluation = selectorEvaluation(snapshot, env);
+    let status = "fail";
+    if (snapshot.status === "absent" && evaluation.bad.length === 0)
+        status = "pass";
+    else if (snapshot.status === "stale-dead" && evaluation.bad.length === 0)
+        status = "warn";
+    else if (snapshot.status === "usable" && evaluation.bad.length === 0)
+        status = "pass";
+    const message = formatStateRootSessionBindingDiagnostic(snapshot, env, evaluation.bad);
+    return { name: "State root/session binding", status, message };
+}
 export async function doctor(options = {}) {
     if (options.team) {
         await doctorTeam();
         return;
     }
     const cwd = process.cwd();
+    const bindingSnapshot = await readCanonicalSessionBindingSnapshot(cwd, process.env);
     const scopeResolution = await resolveDoctorScope(cwd);
     const paths = resolveDoctorPaths(cwd, scopeResolution.scope);
     const recoveryTracker = { degraded: false };
-    const recovery = await recoverNativeHookClaimJournal(paths.codexHomeDir, doctorClaimJournalDurabilityOverride ?? createNativeHookClaimJournalDurability());
+    const recovery = await recoverNativeHookClaimJournal(paths.codexHomeDir, wrapNativeHookClaimJournalDurability(doctorClaimJournalDurabilityOverride ?? createNativeHookClaimJournalDurability(process.platform), recoveryTracker));
     recordRegularFileSyncOutcome(recoveryTracker, recovery.outcome);
     emitDegradedDurabilityWarning("native-hook claim-journal recovery", recoveryTracker);
     const scopeSourceMessage = scopeResolution.source === "persisted"
@@ -177,6 +396,9 @@ export async function doctor(options = {}) {
     checks.push(checkCodexCli());
     // Check 2: Node.js version
     checks.push(checkNodeVersion());
+    const processIdentityCheck = checkProcessIdentityReadiness();
+    if (processIdentityCheck)
+        checks.push(processIdentityCheck);
     // Check 2.5: Explore harness readiness
     const exploreRoutingState = await resolveExploreRoutingState(paths.configPath);
     checks.push(checkExploreHarness(process.platform, process.env, {
@@ -239,7 +461,17 @@ export async function doctor(options = {}) {
     // Check 7: AGENTS.md in project
     checks.push(checkAgentsMd(scopeResolution.scope, paths.codexHomeDir, scopeResolution.installMode));
     // Check 8: State directory
-    checks.push(checkDirectory("State dir", paths.stateDir));
+    if (bindingSnapshot.status === "resolution-error") {
+        checks.push({
+            name: "State dir",
+            status: "fail",
+            message: "effective root unavailable (binding resolution-error)",
+        });
+    }
+    else {
+        checks.push(checkDirectory("State dir", bindingSnapshot.baseStateDir ?? paths.stateDir));
+    }
+    checks.push(checkStateRootSessionBinding(bindingSnapshot, process.env));
     checks.push(await checkRepoArtifactOwnership(cwd));
     // Check 9: MCP servers configured
     checks.push(await checkMcpServers(paths.configPath, scopeResolution.installMode, scopeResolution.mcpMode));
@@ -611,6 +843,48 @@ function checkNodeVersion() {
         message: `v${process.versions.node} (need >= 20)`,
     };
 }
+export function checkProcessIdentityReadiness(options = {}) {
+    const platform = options.platform ?? process.platform;
+    if (platform !== "darwin" && platform !== "win32")
+        return null;
+    const pid = options.pid ?? process.pid;
+    const provider = options.provider ?? defaultProcessInspectionProvider;
+    try {
+        const observation = provider.observeProcess(pid, platform);
+        if (observation.kind === "identity"
+            && isValidProcessIdentity(observation.identity)
+            && observation.identity.platform === platform) {
+            return {
+                name: "Process identity",
+                status: "pass",
+                message: "native process identity provider is ready",
+            };
+        }
+        const reason = observation.kind === "identity"
+            ? isValidProcessIdentity(observation.identity)
+                ? "platform mismatch"
+                : "provider response unverifiable"
+            : observation.kind === "gone"
+                ? "current process not identified"
+                : observation.kind === "denied"
+                    ? "provider access denied"
+                    : observation.kind === "unsupported"
+                        ? "provider unavailable"
+                        : "provider response unverifiable";
+        return {
+            name: "Process identity",
+            status: "fail",
+            message: `native process identity is unavailable (${reason}); reinstall or update OMX and rerun doctor`,
+        };
+    }
+    catch {
+        return {
+            name: "Process identity",
+            status: "fail",
+            message: "native process identity is unavailable (provider response unverifiable); reinstall or update OMX and rerun doctor",
+        };
+    }
+}
 export function checkExploreHarness(platform = process.platform, env = process.env, options = {}) {
     const override = env[EXPLORE_BIN_ENV]?.trim();
     const exploreRoutingEnabled = options.exploreRoutingEnabled ?? isExploreCommandRoutingEnabled(env);