oh-my-codex 0.19.0 → 0.20.0

package/dist/state/__tests__/operations.test.js

@@ -66,6 +66,45 @@ async function withOmxRootEnv(root, run) {
             delete process.env.OMX_TEAM_STATE_ROOT;
     }
 }
+async function withStateRootEnv(env, run) {
+    const previousOmxRoot = process.env.OMX_ROOT;
+    const previousOmxStateRoot = process.env.OMX_STATE_ROOT;
+    const previousTeamStateRoot = process.env.OMX_TEAM_STATE_ROOT;
+    if (typeof env.OMX_ROOT === 'string')
+        process.env.OMX_ROOT = env.OMX_ROOT;
+    else
+        delete process.env.OMX_ROOT;
+    if (typeof env.OMX_STATE_ROOT === 'string')
+        process.env.OMX_STATE_ROOT = env.OMX_STATE_ROOT;
+    else
+        delete process.env.OMX_STATE_ROOT;
+    if (typeof env.OMX_TEAM_STATE_ROOT === 'string')
+        process.env.OMX_TEAM_STATE_ROOT = env.OMX_TEAM_STATE_ROOT;
+    else
+        delete process.env.OMX_TEAM_STATE_ROOT;
+    try {
+        return await run();
+    }
+    finally {
+        if (typeof previousOmxRoot === 'string')
+            process.env.OMX_ROOT = previousOmxRoot;
+        else
+            delete process.env.OMX_ROOT;
+        if (typeof previousOmxStateRoot === 'string')
+            process.env.OMX_STATE_ROOT = previousOmxStateRoot;
+        else
+            delete process.env.OMX_STATE_ROOT;
+        if (typeof previousTeamStateRoot === 'string')
+            process.env.OMX_TEAM_STATE_ROOT = previousTeamStateRoot;
+        else
+            delete process.env.OMX_TEAM_STATE_ROOT;
+    }
+}
+function responsePayload(response) {
+    assert.equal(response.isError, undefined);
+    assert.ok(response.payload && typeof response.payload === 'object' && !Array.isArray(response.payload));
+    return response.payload;
+}
 function validExecutionContract(stride) {
     const perStride = {
         task: {
@@ -235,6 +274,123 @@ describe('state operations directory initialization', () => {
             await rm(wd, { recursive: true, force: true });
         }
     });
+    it('writes and clears session state under OMX_TEAM_STATE_ROOT without creating cwd .omx', async () => {
+        const root = await mkdtemp(join(tmpdir(), 'omx-state-ops-team-root-'));
+        try {
+            const wd = join(root, 'workspace');
+            const teamStateRoot = join(root, 'team-state');
+            await mkdir(wd, { recursive: true });
+            await withStateRootEnv({ OMX_TEAM_STATE_ROOT: teamStateRoot }, async () => {
+                const writeResponse = await executeStateOperation('state_write', {
+                    workingDirectory: wd,
+                    session_id: 'sess-team-write',
+                    mode: 'autoresearch',
+                    active: true,
+                    current_phase: 'running',
+                });
+                const writePayload = responsePayload(writeResponse);
+                assert.equal(writePayload.path, join(teamStateRoot, 'sessions', 'sess-team-write', 'autoresearch-state.json'));
+                assert.equal(existsSync(writePayload.path), true);
+                assert.equal(existsSync(join(teamStateRoot, 'sessions', 'sess-team-write', 'skill-active-state.json')), true);
+                assert.equal(existsSync(join(wd, '.omx')), false);
+                const clearResponse = await executeStateOperation('state_clear', {
+                    workingDirectory: wd,
+                    session_id: 'sess-team-write',
+                    mode: 'autoresearch',
+                });
+                const clearPayload = responsePayload(clearResponse);
+                assert.equal(clearPayload.path, writePayload.path);
+                assert.equal(existsSync(writePayload.path), false);
+                assert.equal(existsSync(join(teamStateRoot, 'sessions', 'sess-team-write', 'skill-active-state.json')), true);
+                assert.equal(existsSync(join(wd, '.omx')), false);
+            });
+        }
+        finally {
+            await rm(root, { recursive: true, force: true });
+        }
+    });
+    it('writes and clears session state under OMX_ROOT when cwd is filesystem root', async () => {
+        const boxRoot = await mkdtemp(join(tmpdir(), 'omx-state-ops-omx-root-'));
+        try {
+            await withStateRootEnv({ OMX_ROOT: boxRoot }, async () => {
+                const writeResponse = await executeStateOperation('state_write', {
+                    workingDirectory: '/',
+                    session_id: 'sess-omx-root',
+                    mode: 'autoresearch',
+                    active: true,
+                    current_phase: 'running',
+                });
+                const writePayload = responsePayload(writeResponse);
+                const expectedPath = join(boxRoot, '.omx', 'state', 'sessions', 'sess-omx-root', 'autoresearch-state.json');
+                assert.equal(writePayload.path, expectedPath);
+                assert.equal(existsSync(expectedPath), true);
+                const clearResponse = await executeStateOperation('state_clear', {
+                    workingDirectory: '/',
+                    session_id: 'sess-omx-root',
+                    mode: 'autoresearch',
+                });
+                const clearPayload = responsePayload(clearResponse);
+                assert.equal(clearPayload.path, expectedPath);
+                assert.equal(existsSync(expectedPath), false);
+                const workspace = join(boxRoot, 'workspace');
+                await mkdir(workspace, { recursive: true });
+                const workspaceResponse = await executeStateOperation('state_write', {
+                    workingDirectory: workspace,
+                    session_id: 'sess-omx-root-workspace',
+                    mode: 'autoresearch',
+                    active: true,
+                    current_phase: 'running',
+                });
+                const workspacePayload = responsePayload(workspaceResponse);
+                assert.equal(workspacePayload.path, join(boxRoot, '.omx', 'state', 'sessions', 'sess-omx-root-workspace', 'autoresearch-state.json'));
+                assert.equal(existsSync(join(workspace, '.omx')), false);
+            });
+        }
+        finally {
+            await rm(boxRoot, { recursive: true, force: true });
+        }
+    });
+    it('writes and clears session state under OMX_STATE_ROOT when cwd is filesystem root', async () => {
+        const stateRoot = await mkdtemp(join(tmpdir(), 'omx-state-ops-state-root-'));
+        try {
+            await withStateRootEnv({ OMX_STATE_ROOT: stateRoot }, async () => {
+                const writeResponse = await executeStateOperation('state_write', {
+                    workingDirectory: '/',
+                    session_id: 'sess-state-root',
+                    mode: 'autoresearch',
+                    active: true,
+                    current_phase: 'running',
+                });
+                const writePayload = responsePayload(writeResponse);
+                const expectedPath = join(stateRoot, '.omx', 'state', 'sessions', 'sess-state-root', 'autoresearch-state.json');
+                assert.equal(writePayload.path, expectedPath);
+                assert.equal(existsSync(expectedPath), true);
+                const clearResponse = await executeStateOperation('state_clear', {
+                    workingDirectory: '/',
+                    session_id: 'sess-state-root',
+                    mode: 'autoresearch',
+                });
+                const clearPayload = responsePayload(clearResponse);
+                assert.equal(clearPayload.path, expectedPath);
+                assert.equal(existsSync(expectedPath), false);
+                const workspace = join(stateRoot, 'workspace');
+                await mkdir(workspace, { recursive: true });
+                const workspaceResponse = await executeStateOperation('state_write', {
+                    workingDirectory: workspace,
+                    session_id: 'sess-state-root-workspace',
+                    mode: 'autoresearch',
+                    active: true,
+                    current_phase: 'running',
+                });
+                const workspacePayload = responsePayload(workspaceResponse);
+                assert.equal(workspacePayload.path, join(stateRoot, '.omx', 'state', 'sessions', 'sess-state-root-workspace', 'autoresearch-state.json'));
+                assert.equal(existsSync(join(workspace, '.omx')), false);
+            });
+        }
+        finally {
+            await rm(stateRoot, { recursive: true, force: true });
+        }
+    });
     it('surfaces active ultragoal artifacts in list-active without mode state files', async () => {
         const wd = await mkdtemp(join(tmpdir(), 'omx-state-ops-ultragoal-artifact-'));
         try {
@@ -266,6 +422,57 @@ describe('state operations directory initialization', () => {
             await rm(wd, { recursive: true, force: true });
         }
     });
+    it('reports reconciled task-scoped aggregate ultragoal artifacts as inactive in get-status', async () => {
+        const wd = await mkdtemp(join(tmpdir(), 'omx-state-ops-ultragoal-reconciled-'));
+        try {
+            await mkdir(join(wd, '.omx', 'ultragoal'), { recursive: true });
+            await writeFile(join(wd, '.omx', 'ultragoal', 'goals.json'), JSON.stringify({
+                aggregateCompletion: {
+                    status: 'complete',
+                    completedAt: '2026-06-01T12:00:00.000Z',
+                    evidence: 'task-scoped Codex aggregate completed and active microgoal row was reconciled',
+                },
+                activeGoalId: 'G002',
+                goals: [{
+                        id: 'G001',
+                        title: 'Fix duplicate HUD panes',
+                        objective: 'Keep one HUD renderer per leader.',
+                        status: 'complete',
+                        completedAt: '2026-06-01T12:00:00.000Z',
+                    }, {
+                        id: 'G002',
+                        title: 'Still marked running',
+                        objective: 'Progress-only row left running by the old aggregate path.',
+                        status: 'in_progress',
+                    }, {
+                        id: 'G003',
+                        title: 'Still marked pending',
+                        objective: 'Progress-only row left pending by the old aggregate path.',
+                        status: 'pending',
+                    }],
+            }, null, 2));
+            const activeResponse = await executeStateOperation('state_list_active', {
+                workingDirectory: wd,
+            });
+            assert.deepEqual(activeResponse.payload, { active_modes: [] });
+            const statusResponse = await executeStateOperation('state_get_status', {
+                workingDirectory: wd,
+                mode: 'ultragoal',
+            });
+            const statuses = statusResponse.payload.statuses || {};
+            assert.equal(statuses.ultragoal?.active, false);
+            assert.equal(statuses.ultragoal?.phase, 'complete');
+            assert.equal(statuses.ultragoal?.path, join(wd, '.omx', 'ultragoal', 'goals.json'));
+            assert.equal(statuses.ultragoal?.source, 'ultragoal-artifacts');
+            assert.equal(statuses.ultragoal?.data?.activeGoal, undefined);
+            assert.equal(statuses.ultragoal?.data?.complete, 1);
+            assert.equal(statuses.ultragoal?.data?.inProgress, 1);
+            assert.equal(statuses.ultragoal?.data?.pending, 1);
+        }
+        finally {
+            await rm(wd, { recursive: true, force: true });
+        }
+    });
     it('prefers active ultragoal artifacts over stale inactive mode state', async () => {
         const wd = await mkdtemp(join(tmpdir(), 'omx-state-ops-ultragoal-stale-state-'));
         try {
@@ -403,6 +610,58 @@ describe('state operations directory initialization', () => {
             await rm(wd, { recursive: true, force: true });
         }
     });
+    it('normalizes terminal deep-interview snapshots by releasing stale locks', async () => {
+        const wd = await mkdtemp(join(tmpdir(), 'omx-state-ops-di-terminal-normalize-'));
+        try {
+            const completedAt = '2026-07-09T00:00:00.000Z';
+            const writeResponse = await executeStateOperation('state_write', {
+                workingDirectory: wd,
+                mode: 'deep-interview',
+                active: false,
+                current_phase: 'cancelled',
+                completed_at: completedAt,
+                input_lock: {
+                    active: true,
+                    owner: 'question-round',
+                },
+                approval_lock: {
+                    status: 'pending',
+                    reviewer: 'user',
+                },
+                question_enforcement: {
+                    obligation_id: 'obligation-stale',
+                    source: 'omx-question',
+                    status: 'pending',
+                    lifecycle_outcome: 'askuserQuestion',
+                    requested_at: '2026-07-08T23:59:00.000Z',
+                },
+            });
+            assert.equal(writeResponse.isError, undefined);
+            const readResponse = await executeStateOperation('state_read', {
+                workingDirectory: wd,
+                mode: 'deep-interview',
+            });
+            const readBody = readResponse.payload;
+            const inputLock = readBody.input_lock;
+            const approvalLock = readBody.approval_lock;
+            const questionEnforcement = readBody.question_enforcement;
+            assert.equal(readBody.active, false);
+            assert.equal(readBody.current_phase, 'cancelled');
+            assert.equal(readBody.completed_at, completedAt);
+            assert.equal(readBody.run_outcome, 'cancelled');
+            assert.equal(inputLock.active, false);
+            assert.equal(inputLock.status, 'released');
+            assert.equal(inputLock.released_at, completedAt);
+            assert.equal(approvalLock.active, false);
+            assert.equal(approvalLock.status, 'released');
+            assert.equal(inputLock.release_reason, 'terminal_state_normalization');
+            assert.equal(questionEnforcement.status, 'cleared');
+            assert.equal(questionEnforcement.clear_reason, 'abort');
+        }
+        finally {
+            await rm(wd, { recursive: true, force: true });
+        }
+    });
     it('writes and reads autoresearch state', async () => {
         const wd = await mkdtemp(join(tmpdir(), 'omx-state-ops-autoresearch-'));
         try {
@@ -772,6 +1031,86 @@ describe('state operations directory initialization', () => {
             await rm(wd, { recursive: true, force: true });
         }
     });
+    it('finalizes ralplan when runtime tracker lags but workspace tracker has completed native reviews', async () => {
+        const wd = await mkdtemp(join(tmpdir(), 'omx-state-ops-ralplan-runtime-lag-complete-'));
+        const stateRoot = await mkdtemp(join(tmpdir(), 'omx-state-ops-ralplan-runtime-lag-root-'));
+        try {
+            await withStateRootEnv({ OMX_STATE_ROOT: stateRoot }, async () => {
+                const sessionId = 'sess-ralplan-runtime-lag-complete';
+                const runtimeStateDir = join(stateRoot, '.omx', 'state');
+                const sessionDir = join(runtimeStateDir, 'sessions', sessionId);
+                const workspaceStateDir = join(wd, '.omx', 'state');
+                await mkdir(sessionDir, { recursive: true });
+                await mkdir(workspaceStateDir, { recursive: true });
+                await writeFile(join(runtimeStateDir, 'session.json'), JSON.stringify({
+                    session_id: sessionId,
+                    native_session_id: 'thread-leader',
+                    cwd: wd,
+                }, null, 2));
+                const consensusGate = ralplanConsensusGate(sessionId, 'native_subagent');
+                consensusGate.ralplan_architect_review.completed_at = '2026-07-07T04:30:00.000Z';
+                consensusGate.ralplan_critic_review.completed_at = '2026-07-07T04:31:00.000Z';
+                await writeFile(subagentTrackingPath(wd), JSON.stringify({
+                    schemaVersion: 1,
+                    sessions: {
+                        [sessionId]: {
+                            session_id: sessionId,
+                            leader_thread_id: 'thread-leader',
+                            updated_at: '2026-07-07T04:31:00.000Z',
+                            threads: {
+                                'thread-leader': { thread_id: 'thread-leader', kind: 'leader', first_seen_at: '2026-07-07T04:29:00.000Z', last_seen_at: '2026-07-07T04:29:00.000Z', turn_count: 1 },
+                                'thread-architect': { thread_id: 'thread-architect', kind: 'subagent', first_seen_at: '2026-07-07T04:30:00.000Z', last_seen_at: '2026-07-07T04:30:00.000Z', turn_count: 1 },
+                                'thread-critic': { thread_id: 'thread-critic', kind: 'subagent', first_seen_at: '2026-07-07T04:31:00.000Z', last_seen_at: '2026-07-07T04:31:00.000Z', turn_count: 1 },
+                            },
+                        },
+                    },
+                }, null, 2));
+                await writeFile(join(workspaceStateDir, 'subagent-tracking.json'), JSON.stringify({
+                    schemaVersion: 1,
+                    sessions: {
+                        [sessionId]: {
+                            session_id: sessionId,
+                            leader_thread_id: 'thread-leader',
+                            updated_at: '2026-07-07T04:31:00.000Z',
+                            threads: {
+                                'thread-leader': { thread_id: 'thread-leader', kind: 'leader', first_seen_at: '2026-07-07T04:29:00.000Z', last_seen_at: '2026-07-07T04:29:00.000Z', turn_count: 1 },
+                                'thread-architect': { thread_id: 'thread-architect', kind: 'subagent', first_seen_at: '2026-07-07T04:30:00.000Z', last_seen_at: '2026-07-07T04:30:00.000Z', completed_at: '2026-07-07T04:30:00.000Z', turn_count: 1 },
+                                'thread-critic': { thread_id: 'thread-critic', kind: 'subagent', first_seen_at: '2026-07-07T04:31:00.000Z', last_seen_at: '2026-07-07T04:31:00.000Z', completed_at: '2026-07-07T04:31:00.000Z', turn_count: 1 },
+                            },
+                        },
+                    },
+                }, null, 2));
+                await writeFile(join(sessionDir, 'ralplan-state.json'), JSON.stringify({
+                    mode: 'ralplan',
+                    active: true,
+                    current_phase: 'planning',
+                    session_id: sessionId,
+                }, null, 2));
+                const response = await executeStateOperation('state_write', {
+                    workingDirectory: wd,
+                    session_id: sessionId,
+                    mode: 'ralplan',
+                    active: false,
+                    current_phase: 'complete',
+                    planning_complete: true,
+                    latest_plan_path: '.omx/plans/prd-clickstack-otel-consumer-20260707T043000Z.md',
+                    terminal_reason: 'consensus approved despite runtime tracker lag',
+                    ralplan_consensus_gate: consensusGate,
+                });
+                assert.equal(response.isError, undefined);
+                const sessionRalplan = JSON.parse(await readFile(join(sessionDir, 'ralplan-state.json'), 'utf-8'));
+                assert.equal(sessionRalplan.active, false);
+                assert.equal(sessionRalplan.current_phase, 'complete');
+                assert.equal(sessionRalplan.status, 'complete');
+                assert.equal(sessionRalplan.terminal_reason, 'consensus approved despite runtime tracker lag');
+                assert.equal(sessionRalplan.ralplan_consensus_gate.complete, true);
+            });
+        }
+        finally {
+            await rm(wd, { recursive: true, force: true });
+            await rm(stateRoot, { recursive: true, force: true });
+        }
+    });
     it('rejects forged ralplan complete gates before mutating active session state', async () => {
         const wd = await mkdtemp(join(tmpdir(), 'omx-state-ops-ralplan-forged-complete-'));
         try {
@@ -809,6 +1148,285 @@ describe('state operations directory initialization', () => {
             await rm(wd, { recursive: true, force: true });
         }
     });
+    it('allows ralplan unsupported native non-clean recovery without tracker-backed consensus', async () => {
+        const wd = await mkdtemp(join(tmpdir(), 'omx-state-ops-ralplan-unsupported-recovery-'));
+        try {
+            const sessionId = 'sess-ralplan-unsupported-recovery';
+            const stateDir = join(wd, '.omx', 'state');
+            const sessionDir = join(stateDir, 'sessions', sessionId);
+            await mkdir(sessionDir, { recursive: true });
+            await writeFile(join(stateDir, 'session.json'), JSON.stringify({ session_id: sessionId, cwd: wd }, null, 2));
+            await writeFile(join(sessionDir, 'ralplan-state.json'), JSON.stringify({
+                mode: 'ralplan',
+                active: true,
+                current_phase: 'planning',
+                session_id: sessionId,
+            }, null, 2));
+            const response = await executeStateOperation('state_write', {
+                workingDirectory: wd,
+                session_id: sessionId,
+                mode: 'ralplan',
+                active: false,
+                current_phase: 'blocked',
+                native_subagent_support: {
+                    status: 'unsupported',
+                    reason: 'multi_agent_v1_unavailable',
+                    source: 'post_tool_failure',
+                },
+            });
+            assert.equal(response.isError, undefined);
+            const state = JSON.parse(await readFile(join(sessionDir, 'ralplan-state.json'), 'utf-8'));
+            assert.equal(state.active, false);
+            assert.equal(state.current_phase, 'blocked');
+            assert.equal(state.ralplan_consensus_gate, undefined);
+        }
+        finally {
+            await rm(wd, { recursive: true, force: true });
+        }
+    });
+    it('rejects ralplan clean complete without tracker-backed native consensus after unsupported recovery support', async () => {
+        const wd = await mkdtemp(join(tmpdir(), 'omx-state-ops-ralplan-clean-still-strict-'));
+        try {
+            const sessionId = 'sess-ralplan-clean-still-strict';
+            const stateDir = join(wd, '.omx', 'state');
+            const sessionDir = join(stateDir, 'sessions', sessionId);
+            await mkdir(sessionDir, { recursive: true });
+            await writeFile(join(stateDir, 'session.json'), JSON.stringify({ session_id: sessionId, cwd: wd }, null, 2));
+            await writeFile(join(sessionDir, 'ralplan-state.json'), JSON.stringify({
+                mode: 'ralplan',
+                active: true,
+                current_phase: 'planning',
+                session_id: sessionId,
+                native_subagent_support: {
+                    status: 'unsupported',
+                    reason: 'multi_agent_v1_unavailable',
+                    source: 'post_tool_failure',
+                },
+            }, null, 2));
+            const response = await executeStateOperation('state_write', {
+                workingDirectory: wd,
+                session_id: sessionId,
+                mode: 'ralplan',
+                active: false,
+                current_phase: 'complete',
+                status: 'complete',
+            });
+            assert.equal(response.isError, true);
+            assert.match(String(response.payload.error ?? ''), /Cannot complete ralplan cleanly while native subagent support is unavailable/);
+            const state = JSON.parse(await readFile(join(sessionDir, 'ralplan-state.json'), 'utf-8'));
+            assert.equal(state.active, true);
+            assert.equal(state.current_phase, 'planning');
+        }
+        finally {
+            await rm(wd, { recursive: true, force: true });
+        }
+    });
+    it('rejects ralplan clean complete with unsupported evidence even when native consensus is valid', async () => {
+        const wd = await mkdtemp(join(tmpdir(), 'omx-state-ops-ralplan-clean-unsupported-valid-consensus-deny-'));
+        try {
+            const sessionId = 'sess-ralplan-clean-unsupported-valid-consensus-deny';
+            await writeNativeSubagentTracking(wd, sessionId);
+            const stateDir = join(wd, '.omx', 'state');
+            const sessionDir = join(stateDir, 'sessions', sessionId);
+            await mkdir(sessionDir, { recursive: true });
+            await writeFile(join(stateDir, 'session.json'), JSON.stringify({ session_id: sessionId, cwd: wd }, null, 2));
+            await writeFile(join(sessionDir, 'ralplan-state.json'), JSON.stringify({
+                mode: 'ralplan',
+                active: true,
+                current_phase: 'planning',
+                session_id: sessionId,
+            }, null, 2));
+            const response = await executeStateOperation('state_write', {
+                workingDirectory: wd,
+                session_id: sessionId,
+                mode: 'ralplan',
+                active: false,
+                current_phase: 'complete',
+                status: 'complete',
+                native_subagent_support: {
+                    status: 'unsupported',
+                    reason: 'multi_agent_v1_unavailable',
+                    source: 'post_tool_failure',
+                },
+                ralplan_consensus_gate: ralplanConsensusGate(sessionId, 'native_subagent'),
+            });
+            assert.equal(response.isError, true);
+            assert.match(String(response.payload.error ?? ''), /Cannot complete ralplan cleanly while native subagent support is unavailable/);
+            const state = JSON.parse(await readFile(join(sessionDir, 'ralplan-state.json'), 'utf-8'));
+            assert.equal(state.active, true);
+            assert.equal(state.current_phase, 'planning');
+        }
+        finally {
+            await rm(wd, { recursive: true, force: true });
+        }
+    });
+    it('rejects ralplan clean complete with handoff-artifact unsupported evidence', async () => {
+        const wd = await mkdtemp(join(tmpdir(), 'omx-state-ops-ralplan-clean-handoff-unsupported-deny-'));
+        try {
+            const sessionId = 'sess-ralplan-clean-handoff-unsupported-deny';
+            await writeNativeSubagentTracking(wd, sessionId);
+            const stateDir = join(wd, '.omx', 'state');
+            const sessionDir = join(stateDir, 'sessions', sessionId);
+            await mkdir(sessionDir, { recursive: true });
+            await writeFile(join(stateDir, 'session.json'), JSON.stringify({ session_id: sessionId, cwd: wd }, null, 2));
+            await writeFile(join(sessionDir, 'ralplan-state.json'), JSON.stringify({
+                mode: 'ralplan',
+                active: true,
+                current_phase: 'planning',
+                session_id: sessionId,
+            }, null, 2));
+            const response = await executeStateOperation('state_write', {
+                workingDirectory: wd,
+                session_id: sessionId,
+                mode: 'ralplan',
+                active: false,
+                current_phase: 'complete',
+                status: 'complete',
+                handoff_artifacts: {
+                    ralplan: {
+                        native_subagent_support: {
+                            status: 'unsupported',
+                            reason: 'multi_agent_v1_unavailable',
+                            source: 'post_tool_failure',
+                        },
+                    },
+                },
+                ralplan_consensus_gate: ralplanConsensusGate(sessionId, 'native_subagent'),
+            });
+            assert.equal(response.isError, true);
+            assert.match(String(response.payload.error ?? ''), /Cannot complete ralplan cleanly while native subagent support is unavailable/);
+            const state = JSON.parse(await readFile(join(sessionDir, 'ralplan-state.json'), 'utf-8'));
+            assert.equal(state.active, true);
+            assert.equal(state.current_phase, 'planning');
+        }
+        finally {
+            await rm(wd, { recursive: true, force: true });
+        }
+    });
+    it('rejects ralplan clean complete with nested handoff-artifact unsupported evidence', async () => {
+        const wd = await mkdtemp(join(tmpdir(), 'omx-state-ops-ralplan-clean-nested-handoff-unsupported-deny-'));
+        try {
+            const sessionId = 'sess-ralplan-clean-nested-handoff-unsupported-deny';
+            await writeNativeSubagentTracking(wd, sessionId);
+            const stateDir = join(wd, '.omx', 'state');
+            const sessionDir = join(stateDir, 'sessions', sessionId);
+            await mkdir(sessionDir, { recursive: true });
+            await writeFile(join(stateDir, 'session.json'), JSON.stringify({ session_id: sessionId, cwd: wd }, null, 2));
+            await writeFile(join(sessionDir, 'ralplan-state.json'), JSON.stringify({
+                mode: 'ralplan',
+                active: true,
+                current_phase: 'planning',
+                session_id: sessionId,
+            }, null, 2));
+            const response = await executeStateOperation('state_write', {
+                workingDirectory: wd,
+                session_id: sessionId,
+                mode: 'ralplan',
+                active: false,
+                current_phase: 'complete',
+                status: 'complete',
+                state: {
+                    handoff_artifacts: {
+                        ralplan: {
+                            native_subagent_support: {
+                                status: 'unsupported',
+                                reason: 'multi_agent_v1_unavailable',
+                                source: 'post_tool_failure',
+                            },
+                        },
+                    },
+                },
+                ralplan_consensus_gate: ralplanConsensusGate(sessionId, 'native_subagent'),
+            });
+            assert.equal(response.isError, true);
+            assert.match(String(response.payload.error ?? ''), /Cannot complete ralplan cleanly while native subagent support is unavailable/);
+            const state = JSON.parse(await readFile(join(sessionDir, 'ralplan-state.json'), 'utf-8'));
+            assert.equal(state.active, true);
+            assert.equal(state.current_phase, 'planning');
+        }
+        finally {
+            await rm(wd, { recursive: true, force: true });
+        }
+    });
+    it('rejects ralplan clean complete with handoff-root unsupported evidence', async () => {
+        const wd = await mkdtemp(join(tmpdir(), 'omx-state-ops-ralplan-clean-handoff-root-unsupported-deny-'));
+        try {
+            const sessionId = 'sess-ralplan-clean-handoff-root-unsupported-deny';
+            await writeNativeSubagentTracking(wd, sessionId);
+            const stateDir = join(wd, '.omx', 'state');
+            const sessionDir = join(stateDir, 'sessions', sessionId);
+            await mkdir(sessionDir, { recursive: true });
+            await writeFile(join(stateDir, 'session.json'), JSON.stringify({ session_id: sessionId, cwd: wd }, null, 2));
+            await writeFile(join(sessionDir, 'ralplan-state.json'), JSON.stringify({
+                mode: 'ralplan',
+                active: true,
+                current_phase: 'planning',
+                session_id: sessionId,
+            }, null, 2));
+            const response = await executeStateOperation('state_write', {
+                workingDirectory: wd,
+                session_id: sessionId,
+                mode: 'ralplan',
+                active: false,
+                current_phase: 'complete',
+                status: 'complete',
+                handoff_artifacts: {
+                    native_subagent_support: {
+                        status: 'unsupported',
+                        reason: 'multi_agent_v1_unavailable',
+                        source: 'post_tool_failure',
+                    },
+                    ralplan_consensus_gate: ralplanConsensusGate(sessionId, 'native_subagent'),
+                },
+            });
+            assert.equal(response.isError, true);
+            assert.match(String(response.payload.error ?? ''), /Cannot complete ralplan cleanly while native subagent support is unavailable/);
+            const state = JSON.parse(await readFile(join(sessionDir, 'ralplan-state.json'), 'utf-8'));
+            assert.equal(state.active, true);
+            assert.equal(state.current_phase, 'planning');
+        }
+        finally {
+            await rm(wd, { recursive: true, force: true });
+        }
+    });
+    it('rejects ralplan clean status alias with unsupported evidence even when native consensus is valid', async () => {
+        const wd = await mkdtemp(join(tmpdir(), 'omx-state-ops-ralplan-status-alias-unsupported-deny-'));
+        try {
+            const sessionId = 'sess-ralplan-status-alias-unsupported-deny';
+            await writeNativeSubagentTracking(wd, sessionId);
+            const stateDir = join(wd, '.omx', 'state');
+            const sessionDir = join(stateDir, 'sessions', sessionId);
+            await mkdir(sessionDir, { recursive: true });
+            await writeFile(join(stateDir, 'session.json'), JSON.stringify({ session_id: sessionId, cwd: wd }, null, 2));
+            await writeFile(join(sessionDir, 'ralplan-state.json'), JSON.stringify({
+                mode: 'ralplan',
+                active: true,
+                current_phase: 'planning',
+                session_id: sessionId,
+            }, null, 2));
+            const response = await executeStateOperation('state_write', {
+                workingDirectory: wd,
+                session_id: sessionId,
+                mode: 'ralplan',
+                active: false,
+                status: 'complete',
+                native_subagent_support: {
+                    status: 'unsupported',
+                    reason: 'multi_agent_v1_unavailable',
+                    source: 'post_tool_failure',
+                },
+                ralplan_consensus_gate: ralplanConsensusGate(sessionId, 'native_subagent'),
+            });
+            assert.equal(response.isError, true);
+            assert.match(String(response.payload.error ?? ''), /Cannot complete ralplan cleanly while native subagent support is unavailable/);
+            const state = JSON.parse(await readFile(join(sessionDir, 'ralplan-state.json'), 'utf-8'));
+            assert.equal(state.active, true);
+            assert.equal(state.current_phase, 'planning');
+        }
+        finally {
+            await rm(wd, { recursive: true, force: true });
+        }
+    });
     it('normalizes currentPhase before gating ralplan terminal writes', async () => {
         const wd = await mkdtemp(join(tmpdir(), 'omx-state-ops-ralplan-current-phase-alias-'));
         try {
@@ -3042,6 +3660,40 @@ describe('state operations directory initialization', () => {
             await rm(wd, { recursive: true, force: true });
         }
     });
+    it('allows Autopilot ralplan unsupported native non-clean recovery', async () => {
+        const wd = await mkdtemp(join(tmpdir(), 'omx-state-ops-autopilot-ralplan-unsupported-recovery-'));
+        try {
+            await withOmxRootEnv(wd, async () => {
+                const sessionId = 'sess-autopilot-ralplan-unsupported-recovery';
+                const sessionDir = join(wd, '.omx', 'state', 'sessions', sessionId);
+                await mkdir(sessionDir, { recursive: true });
+                await writeFile(join(sessionDir, 'autopilot-state.json'), JSON.stringify({
+                    active: true,
+                    mode: 'autopilot',
+                    current_phase: 'ralplan',
+                }, null, 2));
+                const response = await executeStateOperation('state_write', {
+                    workingDirectory: wd,
+                    session_id: sessionId,
+                    mode: 'autopilot',
+                    active: false,
+                    current_phase: 'blocked',
+                    native_subagent_support: {
+                        status: 'unsupported',
+                        reason: 'multi_agent_v1_unavailable',
+                        source: 'post_tool_failure',
+                    },
+                });
+                assert.equal(response.isError, undefined);
+                const state = JSON.parse(await readFile(join(sessionDir, 'autopilot-state.json'), 'utf-8'));
+                assert.equal(state.active, false);
+                assert.equal(state.current_phase, 'blocked');
+            });
+        }
+        finally {
+            await rm(wd, { recursive: true, force: true });
+        }
+    });
     it('denies Autopilot ralplan to ultragoal self-write with codex_exec consensus evidence', async () => {
         const wd = await mkdtemp(join(tmpdir(), 'omx-state-ops-autopilot-ralplan-native-deny-'));
         try {
@@ -3080,6 +3732,91 @@ describe('state operations directory initialization', () => {
             await rm(wd, { recursive: true, force: true });
         }
     });
+    it('denies Autopilot ralplan to ultragoal when unsupported native evidence is present', async () => {
+        const wd = await mkdtemp(join(tmpdir(), 'omx-state-ops-autopilot-ralplan-unsupported-ultragoal-deny-'));
+        try {
+            await withOmxRootEnv(wd, async () => {
+                const sessionId = 'sess-autopilot-ralplan-unsupported-ultragoal-deny';
+                const sessionDir = join(wd, '.omx', 'state', 'sessions', sessionId);
+                await mkdir(sessionDir, { recursive: true });
+                await writeFile(join(sessionDir, 'autopilot-state.json'), JSON.stringify({
+                    active: true,
+                    mode: 'autopilot',
+                    current_phase: 'ralplan',
+                    native_subagent_support: {
+                        status: 'unsupported',
+                        reason: 'native_subagents_unsupported',
+                        source: 'post_tool_failure',
+                    },
+                }, null, 2));
+                const response = await executeStateOperation('state_write', {
+                    workingDirectory: wd,
+                    session_id: sessionId,
+                    mode: 'autopilot',
+                    active: true,
+                    current_phase: 'ultragoal',
+                    native_subagent_support: {
+                        status: 'unsupported',
+                        reason: 'native_subagents_unsupported',
+                        source: 'post_tool_failure',
+                    },
+                });
+                assert.equal(response.isError, true);
+                assert.match(String(response.payload.error || ''), /Cannot transition ralplan -> ultragoal/i);
+                const state = JSON.parse(await readFile(join(sessionDir, 'autopilot-state.json'), 'utf-8'));
+                assert.equal(state.current_phase, 'ralplan');
+            });
+        }
+        finally {
+            await rm(wd, { recursive: true, force: true });
+        }
+    });
+    it('denies Autopilot ralplan to ultragoal with unsupported evidence even when native consensus is valid', async () => {
+        const wd = await mkdtemp(join(tmpdir(), 'omx-state-ops-autopilot-ralplan-unsupported-valid-consensus-deny-'));
+        try {
+            await withOmxRootEnv(wd, async () => {
+                const sessionId = 'sess-autopilot-ralplan-unsupported-valid-consensus-deny';
+                const sessionDir = join(wd, '.omx', 'state', 'sessions', sessionId);
+                await mkdir(sessionDir, { recursive: true });
+                await writeNativeSubagentTracking(wd, sessionId);
+                await writeFile(join(sessionDir, 'autopilot-state.json'), JSON.stringify({
+                    active: true,
+                    mode: 'autopilot',
+                    current_phase: 'ralplan',
+                    native_subagent_support: {
+                        status: 'unsupported',
+                        reason: 'multi_agent_v1_unavailable',
+                        source: 'post_tool_failure',
+                    },
+                    state: {
+                        handoff_artifacts: {
+                            ralplan: {
+                                plan_path: '.omx/plans/prd.md',
+                                test_spec_path: '.omx/plans/test-spec.md',
+                            },
+                            ralplan_consensus_gate: ralplanConsensusGate(sessionId, 'native_subagent'),
+                        },
+                    },
+                }, null, 2));
+                const response = await executeStateOperation('state_write', {
+                    workingDirectory: wd,
+                    session_id: sessionId,
+                    mode: 'autopilot',
+                    active: true,
+                    current_phase: 'ultragoal',
+                });
+                assert.equal(response.isError, true);
+                const error = String(response.payload.error || '');
+                assert.match(error, /terminalize non-clean/);
+                assert.match(error, /blocked\/cancelled\/failed/);
+                const state = JSON.parse(await readFile(join(sessionDir, 'autopilot-state.json'), 'utf-8'));
+                assert.equal(state.current_phase, 'ralplan');
+            });
+        }
+        finally {
+            await rm(wd, { recursive: true, force: true });
+        }
+    });
     for (const { lane, architectVerdict, criticVerdict } of [
         { lane: 'architect', architectVerdict: 'iterate', criticVerdict: 'approve' },
         { lane: 'critic', architectVerdict: 'approve', criticVerdict: 'iterate' },