oh-my-codex 0.18.16 → 0.19.1

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

@@ -6,6 +6,7 @@ import { dirname, join } from 'node:path';
 import { tmpdir } from 'node:os';
 import { executeStateOperation } from '../operations.js';
 import { subagentTrackingPath } from '../../subagents/tracker.js';
+import { updateModeState } from '../../modes/base.js';
 async function withAmbientTmuxEnv(env, run) {
     const previousTmux = process.env.TMUX;
     const previousTmuxPane = process.env.TMUX_PANE;
@@ -65,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: {
@@ -146,6 +186,10 @@ function ralplanConsensusGate(sessionId, provenanceKind, threadOverrides = {}) {
         },
     };
 }
+async function writeNativeRalplanConsensusGate(cwd, sessionId, threadOverrides = {}) {
+    await writeNativeSubagentTracking(cwd, sessionId);
+    return ralplanConsensusGate(sessionId, 'native_subagent', threadOverrides);
+}
 async function createFakeTmuxBin(wd) {
     const fakeBin = join(wd, 'bin');
     await mkdir(fakeBin, { recursive: true });
@@ -230,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 {
@@ -261,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 {
@@ -682,6 +894,1218 @@ describe('state operations directory initialization', () => {
             await rm(wd, { recursive: true, force: true });
         }
     });
+    it('finalizes completed ralplan writes across root and current session state', async () => {
+        const wd = await mkdtemp(join(tmpdir(), 'omx-state-ops-ralplan-complete-'));
+        try {
+            const sessionId = 'sess-ralplan-complete';
+            const consensusGate = await writeNativeRalplanConsensusGate(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(stateDir, 'ralplan-state.json'), JSON.stringify({
+                mode: 'ralplan',
+                active: true,
+                current_phase: 'planning',
+                session_id: sessionId,
+            }, null, 2));
+            await writeFile(join(sessionDir, 'ralplan-state.json'), JSON.stringify({
+                mode: 'ralplan',
+                active: true,
+                current_phase: 'planning',
+                session_id: sessionId,
+            }, null, 2));
+            const staleSkillState = {
+                version: 1,
+                active: true,
+                skill: 'ralplan',
+                phase: 'planning',
+                updated_at: '2026-06-30T00:00:00.000Z',
+                session_id: sessionId,
+                active_skills: [{
+                        skill: 'ralplan',
+                        phase: 'planning',
+                        active: true,
+                        session_id: sessionId,
+                    }],
+            };
+            await writeFile(join(stateDir, 'skill-active-state.json'), JSON.stringify(staleSkillState, null, 2));
+            await writeFile(join(sessionDir, 'skill-active-state.json'), JSON.stringify(staleSkillState, null, 2));
+            const response = await executeStateOperation('state_write', {
+                workingDirectory: wd,
+                mode: 'ralplan',
+                active: false,
+                current_phase: 'complete',
+                terminal_reason: 'consensus approved bounded no-op',
+                ralplan_architect_review: {
+                    verdict: 'APPROVE',
+                    artifact_path: '.omx/plans/architect.md',
+                },
+                ralplan_critic_review: {
+                    verdict: 'APPROVE',
+                    artifact_path: '.omx/plans/critic.md',
+                },
+                ralplan_consensus_gate: consensusGate,
+            });
+            assert.equal(response.isError, undefined);
+            const rootRalplan = JSON.parse(await readFile(join(stateDir, 'ralplan-state.json'), 'utf-8'));
+            const sessionRalplan = JSON.parse(await readFile(join(sessionDir, 'ralplan-state.json'), 'utf-8'));
+            for (const state of [rootRalplan, sessionRalplan]) {
+                assert.equal(state.active, false);
+                assert.equal(state.current_phase, 'complete');
+                assert.equal(state.status, 'complete');
+                assert.equal(state.terminal_reason, 'consensus approved bounded no-op');
+                assert.equal(state.ralplan_consensus_gate.complete, true);
+                assert.equal(state.session_id, sessionId);
+            }
+            const rootSkill = JSON.parse(await readFile(join(stateDir, 'skill-active-state.json'), 'utf-8'));
+            const sessionSkill = JSON.parse(await readFile(join(sessionDir, 'skill-active-state.json'), 'utf-8'));
+            for (const state of [rootSkill, sessionSkill]) {
+                assert.equal(state.active, false);
+                assert.equal(state.phase, 'complete');
+                assert.equal(state.terminal_reason, 'consensus approved bounded no-op');
+                assert.deepEqual(state.active_skills, []);
+            }
+            assert.equal(sessionSkill.session_id, sessionId);
+            const listed = await executeStateOperation('state_list_active', {
+                workingDirectory: wd,
+            });
+            assert.deepEqual(listed.payload, { active_modes: [] });
+        }
+        finally {
+            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 {
+            const sessionId = 'sess-ralplan-forged-complete';
+            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,
+                mode: 'ralplan',
+                active: false,
+                current_phase: 'complete',
+                ralplan_consensus_gate: {
+                    complete: true,
+                },
+            });
+            assert.equal(response.isError, true);
+            assert.match(String(response.payload.error ?? ''), /tracker-backed native architect and critic consensus evidence/);
+            const sessionRalplan = JSON.parse(await readFile(join(sessionDir, 'ralplan-state.json'), 'utf-8'));
+            assert.equal(sessionRalplan.active, true);
+            assert.equal(sessionRalplan.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 {
+            const sessionId = 'sess-ralplan-current-phase-alias';
+            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,
+                mode: 'ralplan',
+                active: false,
+                currentPhase: 'complete',
+            });
+            assert.equal(response.isError, true);
+            assert.match(String(response.payload.error ?? ''), /tracker-backed native architect and critic consensus evidence/);
+            const sessionRalplan = JSON.parse(await readFile(join(sessionDir, 'ralplan-state.json'), 'utf-8'));
+            assert.equal(sessionRalplan.active, true);
+            assert.equal(sessionRalplan.current_phase, 'planning');
+            assert.equal(sessionRalplan.currentPhase, undefined);
+        }
+        finally {
+            await rm(wd, { recursive: true, force: true });
+        }
+    });
+    it('reuses existing tracker-backed ralplan consensus when terminal writes omit gate payload', async () => {
+        const wd = await mkdtemp(join(tmpdir(), 'omx-state-ops-ralplan-existing-consensus-'));
+        try {
+            const sessionId = 'sess-ralplan-existing-consensus';
+            const consensusGate = await writeNativeRalplanConsensusGate(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,
+                ralplan_consensus_gate: consensusGate,
+            }, null, 2));
+            const response = await executeStateOperation('state_write', {
+                workingDirectory: wd,
+                mode: 'ralplan',
+                active: false,
+                current_phase: 'complete',
+                terminal_reason: 'existing tracker-backed consensus complete',
+            });
+            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');
+            const finalGate = sessionRalplan.ralplan_consensus_gate;
+            assert.equal(finalGate.complete, true);
+            assert.deepEqual(finalGate.required_review_roles, ['architect', 'critic']);
+            assert.equal(finalGate.ralplan_architect_review.provenance_kind, 'native_subagent');
+            assert.equal(finalGate.ralplan_critic_review.provenance_kind, 'native_subagent');
+        }
+        finally {
+            await rm(wd, { recursive: true, force: true });
+        }
+    });
+    it('finalizes completed ralplan updateModeState writes across root and current session state', async () => {
+        const wd = await mkdtemp(join(tmpdir(), 'omx-state-ops-ralplan-complete-update-mode-'));
+        try {
+            const sessionId = 'sess-ralplan-complete-update-mode';
+            const consensusGate = await writeNativeRalplanConsensusGate(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(stateDir, 'ralplan-state.json'), JSON.stringify({
+                mode: 'ralplan',
+                active: true,
+                current_phase: 'planning',
+                session_id: sessionId,
+            }, null, 2));
+            await writeFile(join(sessionDir, 'ralplan-state.json'), JSON.stringify({
+                mode: 'ralplan',
+                active: true,
+                current_phase: 'planning',
+                session_id: sessionId,
+            }, null, 2));
+            const staleSkillState = {
+                version: 1,
+                active: true,
+                skill: 'ralplan',
+                phase: 'planning',
+                session_id: sessionId,
+                active_skills: [{
+                        skill: 'ralplan',
+                        phase: 'planning',
+                        active: true,
+                        session_id: sessionId,
+                    }],
+            };
+            await writeFile(join(stateDir, 'skill-active-state.json'), JSON.stringify(staleSkillState, null, 2));
+            await writeFile(join(sessionDir, 'skill-active-state.json'), JSON.stringify(staleSkillState, null, 2));
+            await updateModeState('ralplan', {
+                active: false,
+                current_phase: 'complete',
+                terminal_reason: 'runtime consensus complete',
+                ralplan_consensus_gate: consensusGate,
+            }, wd);
+            const rootRalplan = JSON.parse(await readFile(join(stateDir, 'ralplan-state.json'), 'utf-8'));
+            const sessionRalplan = JSON.parse(await readFile(join(sessionDir, 'ralplan-state.json'), 'utf-8'));
+            for (const state of [rootRalplan, sessionRalplan]) {
+                assert.equal(state.active, false);
+                assert.equal(state.current_phase, 'complete');
+                assert.equal(state.status, 'complete');
+                assert.equal(state.terminal_reason, 'runtime consensus complete');
+                assert.equal(state.ralplan_consensus_gate.complete, true);
+                assert.equal(state.session_id, sessionId);
+            }
+            const rootSkill = JSON.parse(await readFile(join(stateDir, 'skill-active-state.json'), 'utf-8'));
+            const sessionSkill = JSON.parse(await readFile(join(sessionDir, 'skill-active-state.json'), 'utf-8'));
+            for (const state of [rootSkill, sessionSkill]) {
+                assert.equal(state.active, false);
+                assert.equal(state.phase, 'complete');
+                assert.equal(state.terminal_reason, 'runtime consensus complete');
+                assert.deepEqual(state.active_skills, []);
+            }
+            const rootListed = await executeStateOperation('state_list_active', {
+                workingDirectory: wd,
+            });
+            assert.deepEqual(rootListed.payload, { active_modes: [] });
+            const sessionListed = await executeStateOperation('state_list_active', {
+                workingDirectory: wd,
+                session_id: sessionId,
+            });
+            assert.deepEqual(sessionListed.payload, { active_modes: [] });
+        }
+        finally {
+            await rm(wd, { recursive: true, force: true });
+        }
+    });
+    it('rejects forged ralplan complete gates from updateModeState before mutating active state', async () => {
+        const wd = await mkdtemp(join(tmpdir(), 'omx-state-ops-ralplan-update-mode-forged-complete-'));
+        try {
+            const sessionId = 'sess-ralplan-update-mode-forged-complete';
+            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));
+            await assert.rejects(updateModeState('ralplan', {
+                active: false,
+                current_phase: 'complete',
+                ralplan_consensus_gate: {
+                    complete: true,
+                },
+            }, wd), /architect and critic consensus evidence/);
+            const sessionRalplan = JSON.parse(await readFile(join(sessionDir, 'ralplan-state.json'), 'utf-8'));
+            assert.equal(sessionRalplan.active, true);
+            assert.equal(sessionRalplan.current_phase, 'planning');
+        }
+        finally {
+            await rm(wd, { recursive: true, force: true });
+        }
+    });
+    it('does not promote stale session metadata when ralplan terminalizes from root scope', async () => {
+        const wd = await mkdtemp(join(tmpdir(), 'omx-state-ops-ralplan-stale-session-'));
+        try {
+            const staleSessionId = 'sess-ralplan-stale';
+            const consensusGate = await writeNativeRalplanConsensusGate(wd, staleSessionId);
+            const stateDir = join(wd, '.omx', 'state');
+            const sessionDir = join(stateDir, 'sessions', staleSessionId);
+            await mkdir(stateDir, { recursive: true });
+            await writeFile(join(stateDir, 'session.json'), JSON.stringify({
+                session_id: staleSessionId,
+                cwd: join(wd, 'different-project'),
+            }, null, 2));
+            await writeFile(join(stateDir, 'ralplan-state.json'), JSON.stringify({
+                mode: 'ralplan',
+                active: true,
+                current_phase: 'planning',
+                session_id: staleSessionId,
+            }, null, 2));
+            await writeFile(join(stateDir, 'skill-active-state.json'), JSON.stringify({
+                version: 1,
+                active: true,
+                skill: 'ralplan',
+                phase: 'planning',
+                session_id: staleSessionId,
+                active_skills: [
+                    {
+                        skill: 'ralplan',
+                        phase: 'planning',
+                        active: true,
+                    },
+                    {
+                        skill: 'ralplan',
+                        phase: 'planning',
+                        active: true,
+                        session_id: staleSessionId,
+                    },
+                ],
+            }, null, 2));
+            const response = await executeStateOperation('state_write', {
+                workingDirectory: wd,
+                mode: 'ralplan',
+                active: false,
+                current_phase: 'complete',
+                status: 'complete',
+                terminal_reason: 'consensus approved bounded no-op',
+                state: {
+                    session_id: staleSessionId,
+                    ralplan_consensus_gate: consensusGate,
+                },
+            });
+            assert.equal(response.isError, undefined);
+            const rootRalplan = JSON.parse(await readFile(join(stateDir, 'ralplan-state.json'), 'utf-8'));
+            assert.equal(rootRalplan.active, false);
+            assert.equal(rootRalplan.current_phase, 'complete');
+            assert.equal(rootRalplan.status, 'complete');
+            assert.equal(rootRalplan.session_id, undefined);
+            const rootSkill = JSON.parse(await readFile(join(stateDir, 'skill-active-state.json'), 'utf-8'));
+            assert.equal(rootSkill.active, false);
+            assert.equal(rootSkill.phase, 'complete');
+            assert.deepEqual(rootSkill.active_skills, []);
+            assert.equal(existsSync(join(sessionDir, 'ralplan-state.json')), false);
+            assert.equal(existsSync(join(sessionDir, 'skill-active-state.json')), false);
+            const listed = await executeStateOperation('state_list_active', {
+                workingDirectory: wd,
+            });
+            assert.deepEqual(listed.payload, { active_modes: [] });
+        }
+        finally {
+            await rm(wd, { recursive: true, force: true });
+        }
+    });
+    it('does not hide unrelated root detail state when ralplan terminalizes without canonical state', async () => {
+        const wd = await mkdtemp(join(tmpdir(), 'omx-state-ops-ralplan-root-detail-only-'));
+        try {
+            const sessionId = 'sess-ralplan-root-detail-only';
+            const consensusGate = await writeNativeRalplanConsensusGate(wd, sessionId);
+            const stateDir = join(wd, '.omx', 'state');
+            await mkdir(stateDir, { recursive: true });
+            await writeFile(join(stateDir, 'team-state.json'), JSON.stringify({
+                mode: 'team',
+                active: true,
+                current_phase: 'running',
+            }, null, 2));
+            const response = await executeStateOperation('state_write', {
+                workingDirectory: wd,
+                mode: 'ralplan',
+                active: false,
+                current_phase: 'complete',
+                state: {
+                    session_id: sessionId,
+                    ralplan_consensus_gate: consensusGate,
+                },
+            });
+            assert.equal(response.isError, undefined);
+            assert.equal(existsSync(join(stateDir, 'skill-active-state.json')), false);
+            const listed = await executeStateOperation('state_list_active', {
+                workingDirectory: wd,
+            });
+            assert.deepEqual(listed.payload, { active_modes: ['team'] });
+        }
+        finally {
+            await rm(wd, { recursive: true, force: true });
+        }
+    });
+    it('preserves an unrelated active root ralplan when a session ralplan terminalizes', async () => {
+        const wd = await mkdtemp(join(tmpdir(), 'omx-state-ops-ralplan-preserve-root-'));
+        try {
+            const sessionId = 'sess-ralplan-preserve-root';
+            const consensusGate = await writeNativeRalplanConsensusGate(wd, sessionId);
+            const stateDir = join(wd, '.omx', 'state');
+            const sessionDir = join(stateDir, 'sessions', sessionId);
+            await mkdir(sessionDir, { recursive: true });
+            await writeFile(join(stateDir, 'ralplan-state.json'), JSON.stringify({
+                mode: 'ralplan',
+                active: true,
+                current_phase: 'planning',
+            }, null, 2));
+            await writeFile(join(sessionDir, 'ralplan-state.json'), JSON.stringify({
+                mode: 'ralplan',
+                active: true,
+                current_phase: 'planning',
+                session_id: sessionId,
+            }, null, 2));
+            await writeFile(join(stateDir, 'skill-active-state.json'), JSON.stringify({
+                version: 1,
+                active: true,
+                skill: 'ralplan',
+                phase: 'planning',
+                active_skills: [
+                    {
+                        skill: 'ralplan',
+                        phase: 'planning',
+                        active: true,
+                    },
+                    {
+                        skill: 'ralplan',
+                        phase: 'planning',
+                        active: true,
+                        session_id: sessionId,
+                    },
+                ],
+            }, null, 2));
+            await writeFile(join(sessionDir, 'skill-active-state.json'), JSON.stringify({
+                version: 1,
+                active: true,
+                skill: 'ralplan',
+                phase: 'planning',
+                session_id: sessionId,
+                active_skills: [{
+                        skill: 'ralplan',
+                        phase: 'planning',
+                        active: true,
+                        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',
+                terminal_reason: 'consensus approved bounded no-op',
+                ralplan_consensus_gate: consensusGate,
+            });
+            assert.equal(response.isError, undefined);
+            const rootRalplan = JSON.parse(await readFile(join(stateDir, 'ralplan-state.json'), 'utf-8'));
+            assert.equal(rootRalplan.active, true);
+            assert.equal(rootRalplan.current_phase, 'planning');
+            assert.equal(rootRalplan.session_id, 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.session_id, sessionId);
+            const rootSkill = JSON.parse(await readFile(join(stateDir, 'skill-active-state.json'), 'utf-8'));
+            assert.equal(rootSkill.active, true);
+            assert.equal(rootSkill.skill, 'ralplan');
+            assert.deepEqual(rootSkill.active_skills, [{ skill: 'ralplan', phase: 'planning', active: true }]);
+            const rootListed = await executeStateOperation('state_list_active', {
+                workingDirectory: wd,
+            });
+            assert.deepEqual(rootListed.payload, { active_modes: ['ralplan'] });
+            const sessionListed = await executeStateOperation('state_list_active', {
+                workingDirectory: wd,
+                session_id: sessionId,
+            });
+            assert.deepEqual(sessionListed.payload, { active_modes: [] });
+        }
+        finally {
+            await rm(wd, { recursive: true, force: true });
+        }
+    });
+    it('does not hide a legacy active root ralplan detail state when a session ralplan terminalizes', async () => {
+        const wd = await mkdtemp(join(tmpdir(), 'omx-state-ops-ralplan-legacy-root-detail-'));
+        try {
+            const sessionId = 'sess-ralplan-legacy-root-detail';
+            const consensusGate = await writeNativeRalplanConsensusGate(wd, sessionId);
+            const stateDir = join(wd, '.omx', 'state');
+            const sessionDir = join(stateDir, 'sessions', sessionId);
+            await mkdir(sessionDir, { recursive: true });
+            await writeFile(join(stateDir, 'ralplan-state.json'), JSON.stringify({
+                mode: 'ralplan',
+                active: true,
+                current_phase: 'planning',
+            }, null, 2));
+            await writeFile(join(sessionDir, 'ralplan-state.json'), JSON.stringify({
+                mode: 'ralplan',
+                active: true,
+                current_phase: 'planning',
+                session_id: sessionId,
+            }, null, 2));
+            await writeFile(join(sessionDir, 'skill-active-state.json'), JSON.stringify({
+                version: 1,
+                active: true,
+                skill: 'ralplan',
+                phase: 'planning',
+                session_id: sessionId,
+                active_skills: [{
+                        skill: 'ralplan',
+                        phase: 'planning',
+                        active: true,
+                        session_id: sessionId,
+                    }],
+            }, null, 2));
+            const response = await executeStateOperation('state_write', {
+                workingDirectory: wd,
+                session_id: sessionId,
+                mode: 'ralplan',
+                active: false,
+                current_phase: 'complete',
+                ralplan_consensus_gate: consensusGate,
+            });
+            assert.equal(response.isError, undefined);
+            assert.equal(existsSync(join(stateDir, 'skill-active-state.json')), false);
+            const rootListed = await executeStateOperation('state_list_active', {
+                workingDirectory: wd,
+            });
+            assert.deepEqual(rootListed.payload, { active_modes: ['ralplan'] });
+            const sessionListed = await executeStateOperation('state_list_active', {
+                workingDirectory: wd,
+                session_id: sessionId,
+            });
+            assert.deepEqual(sessionListed.payload, { active_modes: [] });
+        }
+        finally {
+            await rm(wd, { recursive: true, force: true });
+        }
+    });
+    it('removes an empty session-only root mirror when a session ralplan terminalizes', async () => {
+        const wd = await mkdtemp(join(tmpdir(), 'omx-state-ops-ralplan-empty-root-mirror-'));
+        try {
+            const sessionId = 'sess-ralplan-empty-root-mirror';
+            const consensusGate = await writeNativeRalplanConsensusGate(wd, sessionId);
+            const stateDir = join(wd, '.omx', 'state');
+            const sessionDir = join(stateDir, 'sessions', sessionId);
+            await mkdir(sessionDir, { recursive: true });
+            await writeFile(join(stateDir, 'ralplan-state.json'), JSON.stringify({
+                mode: 'ralplan',
+                active: true,
+                current_phase: 'planning',
+            }, null, 2));
+            await writeFile(join(sessionDir, 'ralplan-state.json'), JSON.stringify({
+                mode: 'ralplan',
+                active: true,
+                current_phase: 'planning',
+                session_id: sessionId,
+            }, null, 2));
+            await writeFile(join(stateDir, 'skill-active-state.json'), JSON.stringify({
+                version: 1,
+                active: true,
+                skill: 'ralplan',
+                phase: 'planning',
+                session_id: sessionId,
+                active_skills: [{
+                        skill: 'ralplan',
+                        phase: 'planning',
+                        active: true,
+                        session_id: sessionId,
+                    }],
+            }, null, 2));
+            await writeFile(join(sessionDir, 'skill-active-state.json'), JSON.stringify({
+                version: 1,
+                active: true,
+                skill: 'ralplan',
+                phase: 'planning',
+                session_id: sessionId,
+                active_skills: [{
+                        skill: 'ralplan',
+                        phase: 'planning',
+                        active: true,
+                        session_id: sessionId,
+                    }],
+            }, null, 2));
+            const response = await executeStateOperation('state_write', {
+                workingDirectory: wd,
+                session_id: sessionId,
+                mode: 'ralplan',
+                active: false,
+                current_phase: 'complete',
+                ralplan_consensus_gate: consensusGate,
+            });
+            assert.equal(response.isError, undefined);
+            assert.equal(existsSync(join(stateDir, 'skill-active-state.json')), false);
+            const rootListed = await executeStateOperation('state_list_active', {
+                workingDirectory: wd,
+            });
+            assert.deepEqual(rootListed.payload, { active_modes: ['ralplan'] });
+            const sessionListed = await executeStateOperation('state_list_active', {
+                workingDirectory: wd,
+                session_id: sessionId,
+            });
+            assert.deepEqual(sessionListed.payload, { active_modes: [] });
+        }
+        finally {
+            await rm(wd, { recursive: true, force: true });
+        }
+    });
+    it('preserves run_outcome-only root canonical tombstones when a session ralplan terminalizes', async () => {
+        const wd = await mkdtemp(join(tmpdir(), 'omx-state-ops-ralplan-preserve-root-tombstone-'));
+        try {
+            const sessionId = 'sess-ralplan-root-tombstone';
+            const consensusGate = await writeNativeRalplanConsensusGate(wd, sessionId);
+            const stateDir = join(wd, '.omx', 'state');
+            const sessionDir = join(stateDir, 'sessions', sessionId);
+            await mkdir(sessionDir, { recursive: true });
+            await writeFile(join(stateDir, 'team-state.json'), JSON.stringify({
+                mode: 'team',
+                active: true,
+                current_phase: 'running',
+            }, null, 2));
+            await writeFile(join(stateDir, 'ralplan-state.json'), JSON.stringify({
+                mode: 'ralplan',
+                active: true,
+                current_phase: 'planning',
+            }, null, 2));
+            await writeFile(join(sessionDir, 'ralplan-state.json'), JSON.stringify({
+                mode: 'ralplan',
+                active: true,
+                current_phase: 'planning',
+                session_id: sessionId,
+            }, null, 2));
+            await writeFile(join(stateDir, 'skill-active-state.json'), JSON.stringify({
+                version: 1,
+                active: true,
+                skill: 'team',
+                run_outcome: 'finish',
+                active_skills: [{
+                        skill: 'team',
+                        active: true,
+                    }],
+            }, null, 2));
+            const before = await executeStateOperation('state_list_active', {
+                workingDirectory: wd,
+            });
+            assert.deepEqual(before.payload, { active_modes: [] });
+            const response = await executeStateOperation('state_write', {
+                workingDirectory: wd,
+                session_id: sessionId,
+                mode: 'ralplan',
+                active: false,
+                current_phase: 'complete',
+                ralplan_consensus_gate: consensusGate,
+            });
+            assert.equal(response.isError, undefined);
+            const rootSkill = JSON.parse(await readFile(join(stateDir, 'skill-active-state.json'), 'utf-8'));
+            assert.equal(rootSkill.active, true);
+            assert.equal(rootSkill.run_outcome, 'finish');
+            const rootListed = await executeStateOperation('state_list_active', {
+                workingDirectory: wd,
+            });
+            assert.deepEqual(rootListed.payload, { active_modes: [] });
+        }
+        finally {
+            await rm(wd, { recursive: true, force: true });
+        }
+    });
+    it('removes terminal_reason-only active root canonical state when a session ralplan terminalizes', async () => {
+        const wd = await mkdtemp(join(tmpdir(), 'omx-state-ops-ralplan-terminal-reason-only-'));
+        try {
+            const sessionId = 'sess-ralplan-terminal-reason-only';
+            const consensusGate = await writeNativeRalplanConsensusGate(wd, sessionId);
+            const stateDir = join(wd, '.omx', 'state');
+            const sessionDir = join(stateDir, 'sessions', sessionId);
+            await mkdir(sessionDir, { recursive: true });
+            await writeFile(join(stateDir, 'ralplan-state.json'), JSON.stringify({
+                mode: 'ralplan',
+                active: true,
+                current_phase: 'planning',
+            }, null, 2));
+            await writeFile(join(sessionDir, 'ralplan-state.json'), JSON.stringify({
+                mode: 'ralplan',
+                active: true,
+                current_phase: 'planning',
+                session_id: sessionId,
+            }, null, 2));
+            await writeFile(join(stateDir, 'skill-active-state.json'), JSON.stringify({
+                version: 1,
+                active: true,
+                skill: 'ralplan',
+                terminal_reason: 'stale reason without terminal marker',
+                active_skills: [{
+                        skill: 'ralplan',
+                        active: true,
+                        session_id: sessionId,
+                    }],
+            }, null, 2));
+            const before = await executeStateOperation('state_list_active', {
+                workingDirectory: wd,
+                session_id: sessionId,
+            });
+            assert.deepEqual(before.payload, { active_modes: ['ralplan'] });
+            const response = await executeStateOperation('state_write', {
+                workingDirectory: wd,
+                session_id: sessionId,
+                mode: 'ralplan',
+                active: false,
+                current_phase: 'complete',
+                ralplan_consensus_gate: consensusGate,
+            });
+            assert.equal(response.isError, undefined);
+            assert.equal(existsSync(join(stateDir, 'skill-active-state.json')), false);
+            const rootListed = await executeStateOperation('state_list_active', {
+                workingDirectory: wd,
+            });
+            assert.deepEqual(rootListed.payload, { active_modes: ['ralplan'] });
+            const sessionListed = await executeStateOperation('state_list_active', {
+                workingDirectory: wd,
+                session_id: sessionId,
+            });
+            assert.deepEqual(sessionListed.payload, { active_modes: [] });
+        }
+        finally {
+            await rm(wd, { recursive: true, force: true });
+        }
+    });
+    it('removes non-terminal lifecycle_outcome root canonical state when a session ralplan terminalizes', async () => {
+        const wd = await mkdtemp(join(tmpdir(), 'omx-state-ops-ralplan-lifecycle-nonterminal-'));
+        try {
+            const sessionId = 'sess-ralplan-lifecycle-nonterminal';
+            const consensusGate = await writeNativeRalplanConsensusGate(wd, sessionId);
+            const stateDir = join(wd, '.omx', 'state');
+            const sessionDir = join(stateDir, 'sessions', sessionId);
+            await mkdir(sessionDir, { recursive: true });
+            await writeFile(join(stateDir, 'ralplan-state.json'), JSON.stringify({
+                mode: 'ralplan',
+                active: true,
+                current_phase: 'planning',
+            }, null, 2));
+            await writeFile(join(sessionDir, 'ralplan-state.json'), JSON.stringify({
+                mode: 'ralplan',
+                active: true,
+                current_phase: 'planning',
+                session_id: sessionId,
+            }, null, 2));
+            await writeFile(join(stateDir, 'skill-active-state.json'), JSON.stringify({
+                version: 1,
+                active: true,
+                skill: 'ralplan',
+                lifecycle_outcome: 'progress',
+                active_skills: [{
+                        skill: 'ralplan',
+                        active: true,
+                        session_id: sessionId,
+                    }],
+            }, null, 2));
+            const before = await executeStateOperation('state_list_active', {
+                workingDirectory: wd,
+                session_id: sessionId,
+            });
+            assert.deepEqual(before.payload, { active_modes: ['ralplan'] });
+            const response = await executeStateOperation('state_write', {
+                workingDirectory: wd,
+                session_id: sessionId,
+                mode: 'ralplan',
+                active: false,
+                current_phase: 'complete',
+                ralplan_consensus_gate: consensusGate,
+            });
+            assert.equal(response.isError, undefined);
+            assert.equal(existsSync(join(stateDir, 'skill-active-state.json')), false);
+            const rootListed = await executeStateOperation('state_list_active', {
+                workingDirectory: wd,
+            });
+            assert.deepEqual(rootListed.payload, { active_modes: ['ralplan'] });
+            const sessionListed = await executeStateOperation('state_list_active', {
+                workingDirectory: wd,
+                session_id: sessionId,
+            });
+            assert.deepEqual(sessionListed.payload, { active_modes: [] });
+        }
+        finally {
+            await rm(wd, { recursive: true, force: true });
+        }
+    });
+    it('preserves unrelated active session skills when ralplan terminalizes', async () => {
+        const wd = await mkdtemp(join(tmpdir(), 'omx-state-ops-ralplan-preserve-'));
+        try {
+            const sessionId = 'sess-ralplan-preserve';
+            const consensusGate = await writeNativeRalplanConsensusGate(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));
+            await writeFile(join(sessionDir, 'autoresearch-state.json'), JSON.stringify({
+                mode: 'autoresearch',
+                active: true,
+                current_phase: 'running',
+                session_id: sessionId,
+            }, null, 2));
+            const mixedSkillState = {
+                version: 1,
+                active: true,
+                skill: 'ralplan',
+                phase: 'planning',
+                updated_at: '2026-06-30T00:00:00.000Z',
+                session_id: sessionId,
+                active_skills: [
+                    {
+                        skill: 'ralplan',
+                        phase: 'planning',
+                        active: true,
+                        session_id: sessionId,
+                    },
+                    {
+                        skill: 'autoresearch',
+                        phase: 'running',
+                        active: true,
+                        session_id: sessionId,
+                    },
+                ],
+            };
+            await writeFile(join(stateDir, 'skill-active-state.json'), JSON.stringify(mixedSkillState, null, 2));
+            await writeFile(join(sessionDir, 'skill-active-state.json'), JSON.stringify(mixedSkillState, null, 2));
+            const response = await executeStateOperation('state_write', {
+                workingDirectory: wd,
+                mode: 'ralplan',
+                active: false,
+                current_phase: 'complete',
+                status: 'complete',
+                terminal_reason: 'consensus approved bounded no-op',
+                ralplan_consensus_gate: consensusGate,
+            });
+            assert.equal(response.isError, undefined);
+            const rootSkill = JSON.parse(await readFile(join(stateDir, 'skill-active-state.json'), 'utf-8'));
+            const sessionSkill = JSON.parse(await readFile(join(sessionDir, 'skill-active-state.json'), 'utf-8'));
+            for (const state of [rootSkill, sessionSkill]) {
+                assert.equal(state.active, true);
+                assert.equal(state.skill, 'autoresearch');
+                assert.equal(state.phase, 'running');
+                assert.deepEqual(state.active_skills?.map((entry) => entry.skill), ['autoresearch']);
+                assert.deepEqual(state.active_skills?.map((entry) => entry.session_id), [sessionId]);
+            }
+            const listed = await executeStateOperation('state_list_active', {
+                workingDirectory: wd,
+            });
+            assert.deepEqual(listed.payload, { active_modes: ['autoresearch'] });
+        }
+        finally {
+            await rm(wd, { recursive: true, force: true });
+        }
+    });
+    it('preserves same-session root mirror skills when session canonical state is partial', async () => {
+        const wd = await mkdtemp(join(tmpdir(), 'omx-state-ops-ralplan-partial-session-skill-'));
+        try {
+            const sessionId = 'sess-ralplan-partial-session-skill';
+            const consensusGate = await writeNativeRalplanConsensusGate(wd, sessionId);
+            const stateDir = join(wd, '.omx', 'state');
+            const sessionDir = join(stateDir, 'sessions', sessionId);
+            await mkdir(sessionDir, { recursive: true });
+            await writeFile(join(sessionDir, 'ralplan-state.json'), JSON.stringify({
+                mode: 'ralplan',
+                active: true,
+                current_phase: 'planning',
+                session_id: sessionId,
+            }, null, 2));
+            await writeFile(join(sessionDir, 'team-state.json'), JSON.stringify({
+                mode: 'team',
+                active: true,
+                current_phase: 'running',
+                session_id: sessionId,
+            }, null, 2));
+            await writeFile(join(stateDir, 'skill-active-state.json'), JSON.stringify({
+                version: 1,
+                active: true,
+                skill: 'ralplan',
+                phase: 'planning',
+                session_id: sessionId,
+                active_skills: [
+                    {
+                        skill: 'ralplan',
+                        phase: 'planning',
+                        active: true,
+                        session_id: sessionId,
+                    },
+                    {
+                        skill: 'team',
+                        phase: 'running',
+                        active: true,
+                        session_id: sessionId,
+                    },
+                ],
+            }, null, 2));
+            await writeFile(join(sessionDir, 'skill-active-state.json'), JSON.stringify({
+                version: 1,
+                active: true,
+                skill: 'ralplan',
+                phase: 'planning',
+                session_id: sessionId,
+                active_skills: [{
+                        skill: 'ralplan',
+                        phase: 'planning',
+                        active: true,
+                        session_id: sessionId,
+                    }],
+            }, null, 2));
+            const response = await executeStateOperation('state_write', {
+                workingDirectory: wd,
+                session_id: sessionId,
+                mode: 'ralplan',
+                active: false,
+                current_phase: 'complete',
+                ralplan_consensus_gate: consensusGate,
+            });
+            assert.equal(response.isError, undefined);
+            const sessionSkill = JSON.parse(await readFile(join(sessionDir, 'skill-active-state.json'), 'utf-8'));
+            assert.equal(sessionSkill.active, true);
+            assert.equal(sessionSkill.skill, 'team');
+            assert.equal(sessionSkill.phase, 'running');
+            assert.equal(sessionSkill.session_id, sessionId);
+            assert.deepEqual(sessionSkill.active_skills?.map((entry) => entry.skill), ['team']);
+            assert.deepEqual(sessionSkill.active_skills?.map((entry) => entry.session_id), [sessionId]);
+            const sessionListed = await executeStateOperation('state_list_active', {
+                workingDirectory: wd,
+                session_id: sessionId,
+            });
+            assert.deepEqual(sessionListed.payload, { active_modes: ['team'] });
+        }
+        finally {
+            await rm(wd, { recursive: true, force: true });
+        }
+    });
+    it('clears stale terminal phase aliases when preserving same-session root mirror skills', async () => {
+        const wd = await mkdtemp(join(tmpdir(), 'omx-state-ops-ralplan-terminal-session-skill-'));
+        try {
+            const sessionId = 'sess-ralplan-terminal-session-skill';
+            const consensusGate = await writeNativeRalplanConsensusGate(wd, sessionId);
+            const stateDir = join(wd, '.omx', 'state');
+            const sessionDir = join(stateDir, 'sessions', sessionId);
+            await mkdir(sessionDir, { recursive: true });
+            await writeFile(join(sessionDir, 'ralplan-state.json'), JSON.stringify({
+                mode: 'ralplan',
+                active: true,
+                current_phase: 'planning',
+                session_id: sessionId,
+            }, null, 2));
+            await writeFile(join(sessionDir, 'team-state.json'), JSON.stringify({
+                mode: 'team',
+                active: true,
+                current_phase: 'running',
+                session_id: sessionId,
+            }, null, 2));
+            await writeFile(join(stateDir, 'skill-active-state.json'), JSON.stringify({
+                version: 1,
+                active: true,
+                skill: 'ralplan',
+                phase: 'planning',
+                session_id: sessionId,
+                active_skills: [
+                    {
+                        skill: 'ralplan',
+                        phase: 'planning',
+                        active: true,
+                        session_id: sessionId,
+                    },
+                    {
+                        skill: 'team',
+                        active: true,
+                        session_id: sessionId,
+                    },
+                ],
+            }, null, 2));
+            await writeFile(join(sessionDir, 'skill-active-state.json'), JSON.stringify({
+                version: 1,
+                active: false,
+                skill: 'ralplan',
+                phase: 'blocked',
+                session_id: sessionId,
+                completed_at: '2026-06-30T00:00:00.000Z',
+                terminal_reason: 'stale terminal marker',
+                active_skills: [],
+            }, null, 2));
+            const response = await executeStateOperation('state_write', {
+                workingDirectory: wd,
+                session_id: sessionId,
+                mode: 'ralplan',
+                active: false,
+                current_phase: 'complete',
+                ralplan_consensus_gate: consensusGate,
+            });
+            assert.equal(response.isError, undefined);
+            const sessionSkill = JSON.parse(await readFile(join(sessionDir, 'skill-active-state.json'), 'utf-8'));
+            assert.equal(sessionSkill.active, true);
+            assert.equal(sessionSkill.skill, 'team');
+            assert.equal(sessionSkill.phase, '');
+            assert.equal(sessionSkill.completed_at, undefined);
+            assert.equal(sessionSkill.terminal_reason, undefined);
+            assert.deepEqual(sessionSkill.active_skills?.map((entry) => entry.skill), ['team']);
+            const sessionListed = await executeStateOperation('state_list_active', {
+                workingDirectory: wd,
+                session_id: sessionId,
+            });
+            assert.deepEqual(sessionListed.payload, { active_modes: ['team'] });
+        }
+        finally {
+            await rm(wd, { recursive: true, force: true });
+        }
+    });
+    it('does not hide detail-only active session state when ralplan terminalizes', async () => {
+        const wd = await mkdtemp(join(tmpdir(), 'omx-state-ops-ralplan-session-detail-only-'));
+        try {
+            const sessionId = 'sess-ralplan-session-detail-only';
+            const consensusGate = await writeNativeRalplanConsensusGate(wd, sessionId);
+            const sessionDir = join(wd, '.omx', 'state', 'sessions', sessionId);
+            await mkdir(sessionDir, { recursive: true });
+            await writeFile(join(sessionDir, 'ralplan-state.json'), JSON.stringify({
+                mode: 'ralplan',
+                active: true,
+                current_phase: 'planning',
+                session_id: sessionId,
+            }, null, 2));
+            await writeFile(join(sessionDir, 'autoresearch-state.json'), JSON.stringify({
+                mode: 'autoresearch',
+                active: true,
+                current_phase: 'running',
+                session_id: sessionId,
+            }, null, 2));
+            const response = await executeStateOperation('state_write', {
+                workingDirectory: wd,
+                session_id: sessionId,
+                mode: 'ralplan',
+                active: false,
+                current_phase: 'complete',
+                ralplan_consensus_gate: consensusGate,
+            });
+            assert.equal(response.isError, undefined);
+            assert.equal(existsSync(join(sessionDir, 'skill-active-state.json')), false);
+            const listed = await executeStateOperation('state_list_active', {
+                workingDirectory: wd,
+                session_id: sessionId,
+            });
+            assert.deepEqual(listed.payload, { active_modes: ['autoresearch'] });
+        }
+        finally {
+            await rm(wd, { recursive: true, force: true });
+        }
+    });
+    it('does not seed session canonical state from root-only skills when ralplan terminalizes', async () => {
+        const wd = await mkdtemp(join(tmpdir(), 'omx-state-ops-ralplan-root-only-skill-'));
+        try {
+            const sessionId = 'sess-ralplan-root-only-skill';
+            const consensusGate = await writeNativeRalplanConsensusGate(wd, sessionId);
+            const stateDir = join(wd, '.omx', 'state');
+            const sessionDir = join(stateDir, 'sessions', sessionId);
+            await mkdir(sessionDir, { recursive: true });
+            await writeFile(join(stateDir, 'autoresearch-state.json'), JSON.stringify({
+                mode: 'autoresearch',
+                active: true,
+                current_phase: 'running',
+            }, null, 2));
+            await writeFile(join(stateDir, 'skill-active-state.json'), JSON.stringify({
+                version: 1,
+                active: true,
+                skill: 'autoresearch',
+                phase: 'running',
+                active_skills: [{
+                        skill: 'autoresearch',
+                        phase: 'running',
+                        active: true,
+                    }],
+            }, null, 2));
+            await writeFile(join(sessionDir, 'ralplan-state.json'), JSON.stringify({
+                mode: 'ralplan',
+                active: true,
+                current_phase: 'planning',
+                session_id: sessionId,
+            }, null, 2));
+            await writeFile(join(sessionDir, 'team-state.json'), JSON.stringify({
+                mode: 'team',
+                active: true,
+                current_phase: 'running',
+                session_id: sessionId,
+            }, null, 2));
+            const response = await executeStateOperation('state_write', {
+                workingDirectory: wd,
+                session_id: sessionId,
+                mode: 'ralplan',
+                active: false,
+                current_phase: 'complete',
+                ralplan_consensus_gate: consensusGate,
+            });
+            assert.equal(response.isError, undefined);
+            assert.equal(existsSync(join(sessionDir, 'skill-active-state.json')), false);
+            const rootListed = await executeStateOperation('state_list_active', {
+                workingDirectory: wd,
+            });
+            assert.deepEqual(rootListed.payload, { active_modes: ['autoresearch'] });
+            const sessionListed = await executeStateOperation('state_list_active', {
+                workingDirectory: wd,
+                session_id: sessionId,
+            });
+            assert.deepEqual(sessionListed.payload, { active_modes: ['team'] });
+        }
+        finally {
+            await rm(wd, { recursive: true, force: true });
+        }
+    });
     it('denies unsupported overlaps without writing the requested mode state', async () => {
         const wd = await mkdtemp(join(tmpdir(), 'omx-state-ops-deny-overlap-'));
         try {