oh-my-codex 0.20.2 → 0.20.5

package/dist/state/mode-state-context.js

@@ -1,3 +1,7 @@
+import { randomUUID } from 'crypto';
+import { readExactPaneProofSync } from '../team/exact-pane.js';
+import { spawnPlatformCommandSync } from '../utils/platform-command.js';
+import { isPaneRunningShell } from '../scripts/tmux-hook-engine.js';
 import { execFileSync } from 'child_process';
 export function captureTmuxPaneFromEnv(env = process.env) {
     const value = env.TMUX_PANE;
@@ -26,11 +30,63 @@ export function captureTmuxWindowForPane(pane, env = process.env) {
 function hasNonEmptyString(value) {
     return typeof value === 'string' && value.trim() !== '';
 }
+export const OMX_RALPH_PANE_OWNER_OPTION = '@omx_ralph_pane_owner_id';
+function clearRalphPaneBinding(state) {
+    delete state.tmux_pane_id;
+    delete state.tmux_pane_pid;
+    delete state.tmux_pane_owner_id;
+    delete state.tmux_session_name;
+    delete state.tmux_session_id;
+    delete state.tmux_pane_current_command;
+    delete state.tmux_pane_start_command;
+    delete state.tmux_pane_set_at;
+    delete state.tmux_window_id;
+}
+function isSafeForegroundCommand(value) {
+    return typeof value === 'string'
+        && /^[A-Za-z0-9_./:+@%=-]+(?: [A-Za-z0-9_./:+@%=-]+)*$/.test(value);
+}
+function captureRalphPaneBinding(paneId) {
+    const initialProof = readExactPaneProofSync(paneId);
+    if (initialProof.status !== 'live')
+        return null;
+    const paneOwnerId = `ralph:${randomUUID()}`;
+    const effectProof = readExactPaneProofSync(initialProof.paneId);
+    if (effectProof.status !== 'live' || effectProof.pid !== initialProof.pid)
+        return null;
+    const tagged = spawnPlatformCommandSync('tmux', ['set-option', '-p', '-t', effectProof.paneId, OMX_RALPH_PANE_OWNER_OPTION, paneOwnerId], { encoding: 'utf-8', stdio: ['ignore', 'pipe', 'pipe'] }).result;
+    if (tagged.error || tagged.status !== 0)
+        return null;
+    const authority = spawnPlatformCommandSync('tmux', ['display-message', '-p', '-t', effectProof.paneId, `#{pane_id}\x1f#{pane_pid}\x1f#{session_name}\x1f#{session_id}\x1f#{window_id}\x1f#{${OMX_RALPH_PANE_OWNER_OPTION}}\x1f#{pane_current_command}\x1f#{pane_start_command}`], { encoding: 'utf-8', stdio: ['ignore', 'pipe', 'pipe'] }).result;
+    if (authority.error || authority.status !== 0 || typeof authority.stdout !== 'string')
+        return null;
+    const [capturedPaneId, capturedPid, sessionName, sessionId, windowId, capturedOwnerId, paneCurrentCommand, paneStartCommand, ...extra] = authority.stdout.trim().split('\x1f');
+    const panePid = Number(capturedPid);
+    if (extra.length > 0 || capturedPaneId !== effectProof.paneId || panePid !== effectProof.pid
+        || !/^%[0-9]+$/.test(capturedPaneId) || !Number.isSafeInteger(panePid) || panePid <= 0
+        || !isSafeForegroundCommand(sessionName) || !/^\$[0-9]+$/.test(sessionId) || !/^@[0-9]+$/.test(windowId)
+        || capturedOwnerId !== paneOwnerId || !isSafeForegroundCommand(paneCurrentCommand)
+        || !isSafeForegroundCommand(paneStartCommand) || isPaneRunningShell(paneCurrentCommand))
+        return null;
+    return {
+        paneId: capturedPaneId,
+        panePid,
+        sessionName,
+        sessionId,
+        windowId,
+        paneOwnerId,
+        paneCurrentCommand,
+        paneStartCommand,
+    };
+}
 export function withModeRuntimeContext(existing, next, options) {
     const env = options?.env ?? process.env;
     const nowIso = options?.nowIso ?? new Date().toISOString();
     const wasActive = existing.active === true;
     const isActive = next.active === true;
+    const isRalphActivation = !wasActive && isActive && next.mode === 'ralph';
+    if (isRalphActivation)
+        clearRalphPaneBinding(next);
     const hasPane = hasNonEmptyString(next.tmux_pane_id);
     if (isActive && (!wasActive || !hasPane)) {
         const pane = captureTmuxPaneFromEnv(env);
@@ -44,6 +100,23 @@ export function withModeRuntimeContext(existing, next, options) {
             }
         }
     }
+    const ralphPaneId = typeof next.tmux_pane_id === 'string' ? next.tmux_pane_id.trim() : '';
+    if (isRalphActivation && ralphPaneId) {
+        const binding = captureRalphPaneBinding(ralphPaneId);
+        if (binding) {
+            next.tmux_pane_id = binding.paneId;
+            next.tmux_pane_pid = binding.panePid;
+            next.tmux_session_name = binding.sessionName;
+            next.tmux_session_id = binding.sessionId;
+            next.tmux_window_id = binding.windowId;
+            next.tmux_pane_owner_id = binding.paneOwnerId;
+            next.tmux_pane_current_command = binding.paneCurrentCommand;
+            next.tmux_pane_start_command = binding.paneStartCommand;
+        }
+        else {
+            clearRalphPaneBinding(next);
+        }
+    }
     return next;
 }
 //# sourceMappingURL=mode-state-context.js.map

package/dist/state/mode-state-context.js.map

@@ -1 +1 @@
-{"version":3,"file":"mode-state-context.js","sourceRoot":"","sources":["../../src/state/mode-state-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAU7C,MAAM,UAAU,sBAAsB,CAAC,GAAG,GAAsB,OAAO,CAAC,GAAG;IACzE,MAAM,KAAK,GAAG,GAAG,CAAC,SAAS,CAAC;IAC5B,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,IAAI,CAAC;IAC3C,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;IAC1B,OAAO,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;AACvC,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,IAAY,EAAE,GAAG,GAAsB,OAAO,CAAC,GAAG;IACzF,IAAI,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,kBAAkB,KAAK,GAAG;QAAE,OAAO,IAAI,CAAC;IACtE,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,GAAG,CAAC,WAAW,IAAI,MAAM,CAAC;QACvC,MAAM,QAAQ,GAAG,YAAY,CAAC,IAAI,EAAE,CAAC,iBAAiB,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,EAAE;YACzF,QAAQ,EAAE,OAAO;YACjB,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC;YACnC,OAAO,EAAE,IAAI;YACb,WAAW,EAAE,IAAI;SAClB,CAAC,CAAC,IAAI,EAAE,CAAC;QACV,OAAO,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC;IAC/C,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,SAAS,iBAAiB,CAAC,KAAc;IACvC,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC;AAC1D,CAAC;AAED,MAAM,UAAU,sBAAsB,CACpC,QAA8B,EAC9B,IAAO,EACP,OAAsD;IAEtD,MAAM,GAAG,GAAG,OAAO,EAAE,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;IACxC,MAAM,MAAM,GAAG,OAAO,EAAE,MAAM,IAAI,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IAC3D,MAAM,SAAS,GAAG,QAAQ,CAAC,MAAM,KAAK,IAAI,CAAC;IAC3C,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,KAAK,IAAI,CAAC;IACtC,MAAM,OAAO,GAAG,iBAAiB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAErD,IAAI,QAAQ,IAAI,CAAC,CAAC,SAAS,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;QACzC,MAAM,IAAI,GAAG,sBAAsB,CAAC,GAAG,CAAC,CAAC;QACzC,IAAI,IAAI,EAAE,CAAC;YACT,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;YACzB,MAAM,QAAQ,GAAG,wBAAwB,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;YACrD,IAAI,QAAQ;gBAAE,IAAI,CAAC,cAAc,GAAG,QAAQ,CAAC;YAC7C,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE,CAAC;gBAC9C,IAAI,CAAC,gBAAgB,GAAG,MAAM,CAAC;YACjC,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC"}
+{"version":3,"file":"mode-state-context.js","sourceRoot":"","sources":["../../src/state/mode-state-context.ts"],"names":[],"mappings":"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"}

package/dist/state/operations.d.ts

@@ -1,3 +1,4 @@
+import { type BeforeWritableCommit, type ResolvedStateScope } from '../mcp/state-paths.js';
 export declare const SUPPORTED_STATE_READ_MODES: readonly ['autopilot', 'autoresearch', 'team', 'ralph', 'ultrawork', 'ultraqa', 'ralplan', 'deep-interview', 'skill-active'];
 export type SupportedStateReadMode = (typeof SUPPORTED_STATE_READ_MODES)[number];
 export type StateOperationName = 'state_read' | 'state_write' | 'state_clear' | 'state_list_active' | 'state_get_status';
@@ -14,6 +15,8 @@ export declare function completeRalplanSession(options: {
     state: Record<string, unknown>;
     explicitSessionId?: string;
     requireNativeSubagents?: boolean;
+    beforeCommit?: BeforeWritableCommit;
+    capturedScope?: ResolvedStateScope;
 }): Promise<boolean>;
 export declare function listStateStatuses(cwd: string, explicitSessionId?: string, mode?: string, options?: {
     authoritativeActiveDecision?: boolean;

package/dist/state/operations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"operations.d.ts","sourceRoot":"","sources":["../../src/state/operations.ts"],"names":[],"mappings":"AA2GA,eAAO,MAAM,0BAA0B,YACrC,WAAW,EACX,cAAc,EACd,MAAM,EACN,OAAO,EACP,WAAW,EACX,SAAS,EACT,SAAS,EACT,gBAAgB,EAChB,cAAc,CACN,CAAC;AAEX,MAAM,MAAM,sBAAsB,GAAG,CAAC,OAAO,0BAA0B,CAAC,CAAC,MAAM,CAAC,CAAC;AACjF,MAAM,MAAM,kBAAkB,GAC1B,YAAY,GACZ,aAAa,GACb,aAAa,GACb,mBAAmB,GACnB,kBAAkB,CAAC;AAEvB,MAAM,WAAW,sBAAsB;IACrC,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAwOD,wBAAgB,gCAAgC,CAC9C,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC9B,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,OAAO,GAAE;IAAE,sBAAsB,CAAC,EAAE,OAAO,CAAA;CAAO,GACjD,MAAM,GAAG,IAAI,CA2Bf;AAmJD,wBAAsB,sBAAsB,CAAC,OAAO,EAAE;IACpD,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,sBAAsB,CAAC,EAAE,OAAO,CAAC;CAClC,GAAG,OAAO,CAAC,OAAO,CAAC,CAqDnB;AAED,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,MAAM,EACX,iBAAiB,CAAC,EAAE,MAAM,EAC1B,IAAI,CAAC,EAAE,MAAM,EACb,OAAO,GAAE;IAAE,2BAA2B,CAAC,EAAE,OAAO,CAAA;CAAO,GACtD,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CA6ClC;AAGD,wBAAsB,oBAAoB,CACxC,gBAAgB,CAAC,EAAE,MAAM,EACzB,iBAAiB,CAAC,EAAE,MAAM,GACzB,OAAO,CAAC,MAAM,EAAE,CAAC,CAsBnB;AA8CD,wBAAsB,qBAAqB,CACzC,IAAI,EAAE,kBAAkB,EACxB,OAAO,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,GACpC,OAAO,CAAC,sBAAsB,CAAC,CA+YjC"}
+{"version":3,"file":"operations.d.ts","sourceRoot":"","sources":["../../src/state/operations.ts"],"names":[],"mappings":"AAKA,OAAO,EAgBL,KAAK,oBAAoB,EACzB,KAAK,kBAAkB,EAExB,MAAM,uBAAuB,CAAC;AA2F/B,eAAO,MAAM,0BAA0B,YACrC,WAAW,EACX,cAAc,EACd,MAAM,EACN,OAAO,EACP,WAAW,EACX,SAAS,EACT,SAAS,EACT,gBAAgB,EAChB,cAAc,CACN,CAAC;AAEX,MAAM,MAAM,sBAAsB,GAAG,CAAC,OAAO,0BAA0B,CAAC,CAAC,MAAM,CAAC,CAAC;AACjF,MAAM,MAAM,kBAAkB,GAC1B,YAAY,GACZ,aAAa,GACb,aAAa,GACb,mBAAmB,GACnB,kBAAkB,CAAC;AAEvB,MAAM,WAAW,sBAAsB;IACrC,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAsPD,wBAAgB,gCAAgC,CAC9C,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC9B,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,OAAO,GAAE;IAAE,sBAAsB,CAAC,EAAE,OAAO,CAAA;CAAO,GACjD,MAAM,GAAG,IAAI,CA2Bf;AAsJD,wBAAsB,sBAAsB,CAAC,OAAO,EAAE;IACpD,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,YAAY,CAAC,EAAE,oBAAoB,CAAC;IACpC,aAAa,CAAC,EAAE,kBAAkB,CAAC;CACpC,GAAG,OAAO,CAAC,OAAO,CAAC,CA6EnB;AAED,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,MAAM,EACX,iBAAiB,CAAC,EAAE,MAAM,EAC1B,IAAI,CAAC,EAAE,MAAM,EACb,OAAO,GAAE;IAAE,2BAA2B,CAAC,EAAE,OAAO,CAAA;CAAO,GACtD,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CA6ClC;AAGD,wBAAsB,oBAAoB,CACxC,gBAAgB,CAAC,EAAE,MAAM,EACzB,iBAAiB,CAAC,EAAE,MAAM,GACzB,OAAO,CAAC,MAAM,EAAE,CAAC,CAsBnB;AA4DD,wBAAsB,qBAAqB,CACzC,IAAI,EAAE,kBAAkB,EACxB,OAAO,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,GACpC,OAAO,CAAC,sBAAsB,CAAC,CAwcjC"}

package/dist/state/operations.js

@@ -2,7 +2,7 @@ import { existsSync } from 'node:fs';
 import { mkdir, readFile, readdir, rename, unlink, writeFile } from 'node:fs/promises';
 import { dirname, join } from 'node:path';
 import { withModeRuntimeContext } from './mode-state-context.js';
-import { getAllScopedStatePaths, getAuthoritativeActiveStateDirs, getBaseStateDir, getBaseStateDirWithSource, getReadScopedStateDirs, getReadScopedStatePaths, getStateDir, getStatePath, resolveRuntimeStateScope, resolveWritableStateScope, resolveWorkingDirectoryForState, validateSessionId, validateStateModeSegment, } from '../mcp/state-paths.js';
+import { createWritableCommitRevalidator, getStateFilename, getAllScopedStatePaths, getAuthoritativeActiveStateDirs, getBaseStateDir, getBaseStateDirWithSource, getReadScopedStateDirs, getReadScopedStatePaths, getStateDir, getStatePath, resolveRuntimeStateScope, resolveWritableStateScope, resolveWorkingDirectoryForState, validateSessionId, validateStateModeSegment, } from '../mcp/state-paths.js';
 import { evaluateRalphCompletionAuditEvidence } from '../ralph/completion-audit.js';
 import { ensureCanonicalRalphArtifacts } from '../ralph/persistence.js';
 import { RALPH_PHASES, validateAndNormalizeRalphState } from '../ralph/contract.js';
@@ -10,14 +10,14 @@ import { applyRunOutcomeContract } from '../runtime/run-outcome.js';
 import { normalizeTerminalWorkflowState } from './terminal-normalization.js';
 import { hasCleanAutopilotReviewAndQaEvidence, isAutopilotSuccessfulTerminalState, validateAutopilotCompletionTransition, } from '../autopilot/completion-gate.js';
 import { readUltragoalState } from '../hud/state.js';
-import { SKILL_ACTIVE_STATE_MODE, clearTerminalSkillActiveMarkers, getSkillActiveStatePathsForStateDir, isTerminalSkillActiveState, isTransitionCanonicalStateOwned, listActiveSkills, listTransitionActiveSkills, readSkillActiveState, readVisibleSkillActiveStateForStateDir, syncCanonicalSkillStateForMode, writeSkillActiveStateCopiesForStateDir, } from './skill-active.js';
+import { SKILL_ACTIVE_STATE_MODE, clearTerminalSkillActiveMarkers, getSkillActiveStatePathsForStateDir, isTerminalSkillActiveState, isTransitionCanonicalStateOwned, listActiveSkills, listTransitionActiveSkills, readSkillActiveState, readVisibleSkillActiveStateForStateDir, syncCanonicalSkillStateForMode, writeSkillActiveStateCopiesForStateDir, writeSkillActiveStateWithPrimaryTransactionForStateDir, } from './skill-active.js';
 import { buildWorkflowTransitionError, evaluateWorkflowTransition, isTrackedWorkflowMode, } from './workflow-transition.js';
 import { reconcileWorkflowTransition } from './workflow-transition-reconcile.js';
 import { buildAutopilotDeepInterviewRalplanGateError, canAdvanceAutopilotDeepInterviewToRalplan, } from '../autopilot/deep-interview-gate.js';
-import { deriveAutopilotChildPhase, } from '../autopilot/fsm.js';
+import { deriveAutopilotChildPhase, normalizeAutopilotPhase, } from '../autopilot/fsm.js';
 import { buildAutopilotRalplanUltragoalGateError, canAdvanceAutopilotRalplanToUltragoal, } from '../autopilot/ralplan-gate.js';
 import { isUnsupportedNativeSubagentEvidenceForScope, } from '../leader/contract.js';
-import { buildRalplanConsensusGateFromSources, } from '../ralplan/consensus-gate.js';
+import { buildRalplanConsensusGateFromSources, RALPLAN_CONSENSUS_BLOCKED_REASONS, shouldBlockFreshAutopilotForRalplanReceipt, } from '../ralplan/consensus-gate.js';
 const AUTOPILOT_CHILD_PHASE_ORDER = [
     'deep-interview',
     'ralplan',
@@ -83,7 +83,7 @@ async function writeAtomicFile(path, data) {
         throw error;
     }
 }
-async function writeClearedSessionScopedModeState(path, mode, sessionId) {
+async function writeClearedSessionScopedModeState(path, mode, sessionId, beforeCommit) {
     const nowIso = new Date().toISOString();
     const clearedState = withModeRuntimeContext({}, {
         mode,
@@ -93,15 +93,17 @@ async function writeClearedSessionScopedModeState(path, mode, sessionId) {
         completed_at: nowIso,
         session_id: sessionId,
     });
-    await writeAtomicFile(path, JSON.stringify(clearedState, null, 2));
+    const payload = JSON.stringify(clearedState, null, 2);
+    await beforeCommit?.({ site: 'state-clear.primary', kind: 'write', path });
+    await writeAtomicFile(path, payload);
 }
-async function clearSessionNativeStopState(baseStateDir, sessionId) {
+async function clearSessionNativeStopState(baseStateDir, sessionId, beforeCommit) {
     const paths = [
-        join(baseStateDir, 'native-stop-state.json'),
-        join(baseStateDir, 'sessions', sessionId, 'native-stop-state.json'),
+        { path: join(baseStateDir, 'native-stop-state.json'), site: 'native-stop.root' },
+        { path: join(baseStateDir, 'sessions', sessionId, 'native-stop-state.json'), site: 'native-stop.session' },
     ];
     const changed = [];
-    for (const path of paths) {
+    for (const { path, site } of paths) {
         if (!existsSync(path))
             continue;
         let state;
@@ -118,7 +120,9 @@ async function clearSessionNativeStopState(baseStateDir, sessionId) {
             continue;
         delete sessions[sessionId];
         state.sessions = sessions;
-        await writeAtomicFile(path, JSON.stringify(state, null, 2));
+        const payload = JSON.stringify(state, null, 2);
+        await beforeCommit?.({ site, kind: 'write', path });
+        await writeAtomicFile(path, payload);
         changed.push(path);
     }
     return changed;
@@ -133,9 +137,14 @@ function validateStrictReadableMode(mode) {
     }
     return normalized;
 }
-async function initializeStateEnvironment(cwd, effectiveSessionId, rootSource) {
-    await mkdir(getStateDir(cwd), { recursive: true });
-    if (effectiveSessionId) {
+async function initializeStateEnvironment(cwd, effectiveSessionId, rootSource, exactStateDir) {
+    if (exactStateDir) {
+        await mkdir(exactStateDir, { recursive: true });
+    }
+    else {
+        await mkdir(getStateDir(cwd), { recursive: true });
+    }
+    if (effectiveSessionId && !exactStateDir) {
         await mkdir(getStateDir(cwd, effectiveSessionId), { recursive: true });
     }
     if (rootSource === 'team-env')
@@ -369,10 +378,12 @@ function collectCompletedRalplanSessionEntries(sessionState, rootState, sessionI
     }
     return [...entries.values()];
 }
-async function writeAtomicJson(path, value) {
+function serializeAtomicJson(value) {
     const serialized = JSON.stringify(value, null, 2);
     JSON.parse(serialized);
-    await mkdir(dirname(path), { recursive: true });
+    return serialized;
+}
+async function writeAtomicJson(path, serialized) {
     await writeAtomicFile(path, serialized);
 }
 async function readJsonRecordIfExists(path) {
@@ -392,44 +403,75 @@ function shouldWriteRootRalplanTerminalState(rootState, sessionId) {
     return optionalSessionId(rootState?.session_id) === sessionId;
 }
 export async function completeRalplanSession(options) {
+    if (options.beforeCommit && !options.capturedScope) {
+        throw new Error('completeRalplanSession requires capturedScope when beforeCommit is provided');
+    }
     if (!isCompleteRalplanTerminalState(options.state))
         return false;
-    const writableScope = await resolveWritableStateScope(options.cwd, options.explicitSessionId);
+    const writableScope = options.capturedScope
+        ?? await resolveWritableStateScope(options.cwd, options.explicitSessionId);
     const sessionId = writableScope.sessionId;
     const validationError = validateRalplanTerminalConsensus(options.cwd, options.state, sessionId, {
         requireNativeSubagents: options.requireNativeSubagents === true,
     });
     if (validationError)
         throw new Error(validationError);
+    const beforeCommit = options.beforeCommit ?? createWritableCommitRevalidator({
+        operation: 'completeRalplanSession',
+        cwd: options.cwd,
+        explicitSessionId: options.explicitSessionId,
+        capturedScope: writableScope,
+        baseStateDir: options.baseStateDir,
+    });
     const completedSessionId = sessionId ?? optionalSessionId(options.state.session_id);
     const rootScopeCompletion = !sessionId;
     const nowIso = new Date().toISOString();
     const rootState = buildRalplanTerminalState(options.state, sessionId, nowIso);
-    const rootStatePath = getStatePath('ralplan', options.cwd);
+    const rootStatePath = join(options.baseStateDir, getStateFilename('ralplan'));
     const existingRootState = await readJsonRecordIfExists(rootStatePath);
     const shouldWriteRootState = shouldWriteRootRalplanTerminalState(existingRootState, sessionId);
     if (shouldWriteRootState) {
-        await writeAtomicJson(rootStatePath, rootState);
+        const rootStatePayload = serializeAtomicJson(rootState);
+        await mkdir(dirname(rootStatePath), { recursive: true });
+        await beforeCommit({ site: 'ralplan.root-state', kind: 'write', path: rootStatePath });
+        await writeAtomicJson(rootStatePath, rootStatePayload);
     }
     if (sessionId) {
-        await writeAtomicJson(getStatePath('ralplan', options.cwd, sessionId), buildRalplanTerminalState(options.state, sessionId, nowIso));
+        const sessionStatePath = join(writableScope.stateDir, getStateFilename('ralplan'));
+        const sessionState = buildRalplanTerminalState(options.state, sessionId, nowIso);
+        const sessionStatePayload = serializeAtomicJson(sessionState);
+        await mkdir(dirname(sessionStatePath), { recursive: true });
+        await beforeCommit({ site: 'ralplan.session-state', kind: 'write', path: sessionStatePath });
+        await writeAtomicJson(sessionStatePath, sessionStatePayload);
     }
     const { rootPath, sessionPath } = getSkillActiveStatePathsForStateDir(options.baseStateDir, sessionId);
     const rootSkillState = await readSkillActiveState(rootPath);
     const rootEntries = filterCompletedRalplanRootEntries(listActiveSkills(rootSkillState ?? {}), completedSessionId, rootScopeCompletion);
     if (rootEntries.length > 0 || (shouldWriteRootState && rootSkillState !== null)) {
-        await writeAtomicJson(rootPath, buildRalplanSkillStateFromEntries(rootSkillState, rootState, rootEntries, undefined, nowIso));
+        const nextRootSkillState = buildRalplanSkillStateFromEntries(rootSkillState, rootState, rootEntries, undefined, nowIso);
+        const rootSkillStatePayload = serializeAtomicJson(nextRootSkillState);
+        await mkdir(dirname(rootPath), { recursive: true });
+        await beforeCommit({ site: 'ralplan.root-skill-write', kind: 'write', path: rootPath });
+        await writeAtomicJson(rootPath, rootSkillStatePayload);
     }
     else if (rootSkillState !== null && !isTerminalSkillActiveTombstone(rootSkillState)) {
-        await unlink(rootPath).catch(() => { });
+        await beforeCommit({ site: 'ralplan.root-skill-unlink', kind: 'unlink', path: rootPath });
+        await unlink(rootPath).catch((error) => {
+            if (error.code !== 'ENOENT')
+                throw error;
+        });
     }
     if (sessionPath && sessionId) {
         const sessionSkillState = await readSkillActiveState(sessionPath);
         const sessionEntries = collectCompletedRalplanSessionEntries(sessionSkillState, rootSkillState, sessionId);
         if (sessionEntries.length > 0 || sessionSkillState !== null) {
-            await writeAtomicJson(sessionPath, sessionEntries.length > 0
+            const nextSessionSkillState = sessionEntries.length > 0
                 ? buildRalplanSkillStateFromEntries(sessionSkillState ?? rootSkillState, rootState, sessionEntries, sessionId, nowIso)
-                : buildRalplanTerminalSkillState(sessionSkillState, rootState, sessionId, nowIso));
+                : buildRalplanTerminalSkillState(sessionSkillState, rootState, sessionId, nowIso);
+            const sessionSkillStatePayload = serializeAtomicJson(nextSessionSkillState);
+            await mkdir(dirname(sessionPath), { recursive: true });
+            await beforeCommit({ site: 'ralplan.session-skill-write', kind: 'write', path: sessionPath });
+            await writeAtomicJson(sessionPath, sessionSkillStatePayload);
         }
     }
     return true;
@@ -445,7 +487,7 @@ export async function listStateStatuses(cwd, explicitSessionId, mode, options =
             continue;
         const files = await readdir(stateDir);
         for (const file of files) {
-            if (!file.endsWith('-state.json'))
+            if (!file.endsWith('-state.json') || file === 'run-state.json')
                 continue;
             const currentMode = file.replace('-state.json', '');
             if (!mode && currentMode === SKILL_ACTIVE_STATE_MODE)
@@ -517,6 +559,19 @@ function isActiveDetailWorkflowState(state) {
     const phase = typeof state.current_phase === 'string' ? state.current_phase.trim().toLowerCase() : '';
     return !['complete', 'completed', 'cancelled', 'canceled', 'failed', 'cleared'].includes(phase);
 }
+function isResumableAutopilotState(state) {
+    if (state.active !== true)
+        return false;
+    if (state.mode !== undefined && state.mode !== 'autopilot')
+        return false;
+    const phaseValues = ['current_phase', 'currentPhase']
+        .filter((key) => Object.prototype.hasOwnProperty.call(state, key))
+        .map((key) => normalizeAutopilotPhase(state[key]));
+    if (phaseValues.length === 0 || phaseValues.some((phase) => phase === null || phase === 'complete' || phase === 'failed')) {
+        return false;
+    }
+    return new Set(phaseValues).size === 1;
+}
 async function readSessionDetailTransitionModes(cwd, sessionId, requestedMode) {
     if (!sessionId || requestedMode !== 'ralplan')
         return undefined;
@@ -572,12 +627,21 @@ export async function executeStateOperation(name, rawArgs = {}) {
                 const effectiveSessionId = stateScope.sessionId;
                 const mode = validateStateModeSegment(rawArgs.mode);
                 const { baseStateDir, rootSource } = getBaseStateDirWithSource(cwd);
-                await initializeStateEnvironment(cwd, effectiveSessionId, rootSource);
-                const path = getStatePath(mode, cwd, effectiveSessionId);
+                const beforeCommit = createWritableCommitRevalidator({
+                    operation: 'state_write',
+                    cwd,
+                    explicitSessionId,
+                    capturedScope: stateScope,
+                    baseStateDir,
+                });
+                // Write to the exact resolved scope directory; never recompute the
+                // target root/path after authorization.
+                const path = join(stateScope.stateDir, getStateFilename(mode));
                 const { mode: _mode, workingDirectory: _workingDirectory, session_id: _sessionId, state: customState, ...fields } = rawArgs;
                 let validationError = null;
                 let transitionMessage;
                 let ensureRalphArtifacts = false;
+                let skillActivePrimaryCommitted = false;
                 await withStateWriteLock(path, async () => {
                     let existing = {};
                     if (existsSync(path)) {
@@ -604,6 +668,26 @@ export async function executeStateOperation(name, rawArgs = {}) {
                     if (!hasExplicitStateField(fields, customState, 'terminal_outcome')) {
                         delete mergedRaw.terminal_outcome;
                     }
+                    let activeCanonicalModes;
+                    let canonicalDecision;
+                    if (isTrackedWorkflowMode(mode) && mergedRaw.active === true) {
+                        activeCanonicalModes = await readCanonicalActiveWorkflowModes(baseStateDir, effectiveSessionId);
+                        canonicalDecision = evaluateWorkflowTransition(activeCanonicalModes, mode);
+                        const hasExistingCanonicalRalplan = activeCanonicalModes.includes('ralplan');
+                        const freshAutopilotReceiptBlocked = mode === 'autopilot'
+                            && !isResumableAutopilotState(existing)
+                            && hasExistingCanonicalRalplan
+                            && shouldBlockFreshAutopilotForRalplanReceipt();
+                        if (freshAutopilotReceiptBlocked) {
+                            validationError = `${RALPLAN_CONSENSUS_BLOCKED_REASONS.documentedHostConsensusReceiptUnavailable}: official host consensus receipt verifier is unavailable`;
+                            return;
+                        }
+                        if (!canonicalDecision.allowed && canonicalDecision.denialReason === 'rollback') {
+                            validationError = buildWorkflowTransitionError(activeCanonicalModes, mode, 'write');
+                            return;
+                        }
+                    }
+                    await initializeStateEnvironment(cwd, effectiveSessionId, rootSource, stateScope.stateDir);
                     if (mode === 'ralph' &&
                         effectiveSessionId &&
                         typeof mergedRaw.owner_omx_session_id !== 'string') {
@@ -729,12 +813,6 @@ export async function executeStateOperation(name, rawArgs = {}) {
                         }
                     }
                     if (isTrackedWorkflowMode(mode) && mergedRaw.active === true) {
-                        const activeCanonicalModes = await readCanonicalActiveWorkflowModes(baseStateDir, effectiveSessionId);
-                        const canonicalDecision = evaluateWorkflowTransition(activeCanonicalModes, mode);
-                        if (!canonicalDecision.allowed && canonicalDecision.denialReason === 'rollback') {
-                            validationError = buildWorkflowTransitionError(activeCanonicalModes, mode, 'write');
-                            return;
-                        }
                         const transitionCurrentModes = mode === 'ralplan'
                             ? (activeCanonicalModes.length > 0
                                 ? activeCanonicalModes
@@ -746,6 +824,7 @@ export async function executeStateOperation(name, rawArgs = {}) {
                                 sessionId: effectiveSessionId,
                                 source: 'state-operations',
                                 baseStateDir,
+                                beforeCommit,
                                 ...(transitionCurrentModes ? { currentModes: transitionCurrentModes } : {}),
                             });
                             transitionMessage ??= transition.transitionMessage;
@@ -756,7 +835,18 @@ export async function executeStateOperation(name, rawArgs = {}) {
                         }
                     }
                     const merged = withModeRuntimeContext(existing, mergedRaw);
-                    await writeAtomicFile(path, JSON.stringify(merged, null, 2));
+                    const payload = JSON.stringify(merged, null, 2);
+                    if (mode === SKILL_ACTIVE_STATE_MODE && effectiveSessionId) {
+                        await writeSkillActiveStateWithPrimaryTransactionForStateDir(baseStateDir, merged, effectiveSessionId, path, async () => {
+                            await beforeCommit({ site: 'mode.primary', kind: 'write', path });
+                            await writeAtomicFile(path, payload);
+                        }, { beforeCommit });
+                        skillActivePrimaryCommitted = true;
+                    }
+                    else {
+                        await beforeCommit({ site: 'mode.primary', kind: 'write', path });
+                        await writeAtomicFile(path, payload);
+                    }
                 });
                 if (validationError) {
                     return {
@@ -765,9 +855,11 @@ export async function executeStateOperation(name, rawArgs = {}) {
                     };
                 }
                 if (mode === SKILL_ACTIVE_STATE_MODE) {
-                    const state = await readSkillActiveState(path);
-                    if (state) {
-                        await writeSkillActiveStateCopiesForStateDir(baseStateDir, state, effectiveSessionId);
+                    if (!skillActivePrimaryCommitted) {
+                        const state = await readSkillActiveState(path);
+                        if (state) {
+                            await writeSkillActiveStateCopiesForStateDir(baseStateDir, state, effectiveSessionId, undefined, { beforeCommit });
+                        }
                     }
                 }
                 else {
@@ -783,6 +875,8 @@ export async function executeStateOperation(name, rawArgs = {}) {
                             state: data,
                             explicitSessionId,
                             requireNativeSubagents: true,
+                            beforeCommit,
+                            capturedScope: stateScope,
                         });
                     if (!ralplanCompletionHandled) {
                         await syncCanonicalSkillStateForMode({
@@ -793,6 +887,7 @@ export async function executeStateOperation(name, rawArgs = {}) {
                             currentPhase: typeof data.current_phase === 'string' ? data.current_phase : undefined,
                             sessionId: effectiveSessionId,
                             source: 'state-operations',
+                            beforeCommit,
                         });
                     }
                 }
@@ -845,17 +940,25 @@ export async function executeStateOperation(name, rawArgs = {}) {
                 const stateScope = await resolveWritableStateScope(cwd, explicitSessionId);
                 const effectiveSessionId = stateScope.sessionId;
                 await initializeStateEnvironment(cwd, effectiveSessionId, rootSource);
-                const path = getStatePath(mode, cwd, effectiveSessionId);
+                const beforeCommit = createWritableCommitRevalidator({
+                    operation: 'state_clear',
+                    cwd,
+                    explicitSessionId,
+                    capturedScope: stateScope,
+                    baseStateDir,
+                });
+                const path = join(stateScope.stateDir, getStateFilename(mode));
                 if (mode !== SKILL_ACTIVE_STATE_MODE
                     && effectiveSessionId
                     && existsSync(getStatePath(mode, cwd))) {
-                    await writeClearedSessionScopedModeState(path, mode, effectiveSessionId);
+                    await writeClearedSessionScopedModeState(path, mode, effectiveSessionId, beforeCommit);
                 }
                 else if (existsSync(path)) {
+                    await beforeCommit({ site: 'state-clear.primary', kind: 'unlink', path });
                     await unlink(path);
                 }
                 const nativeStopCleared = effectiveSessionId
-                    ? await clearSessionNativeStopState(baseStateDir, effectiveSessionId)
+                    ? await clearSessionNativeStopState(baseStateDir, effectiveSessionId, beforeCommit)
                     : [];
                 if (mode !== SKILL_ACTIVE_STATE_MODE) {
                     await syncCanonicalSkillStateForMode({
@@ -865,6 +968,7 @@ export async function executeStateOperation(name, rawArgs = {}) {
                         active: false,
                         sessionId: effectiveSessionId,
                         source: 'state-operations',
+                        beforeCommit,
                     });
                 }
                 return { payload: { cleared: true, mode, path, ...(nativeStopCleared.length > 0 ? { native_stop_cleared: nativeStopCleared } : {}) } };