factory-factory 0.4.0 → 0.4.1

package/dist/src/backend/services/ratchet/service/ratchet.service.test.js

@@ -3,26 +3,30 @@ import { SERVICE_TIMEOUT_MS } from '../../../../backend/services/constants.js';
 import { CIStatus, RatchetState, SessionStatus } from '../../../../shared/core/index.js';
 import { unsafeCoerce } from '../../../../test-utils/unsafe-coerce.js';
 vi.mock('@/backend/services/workspace', () => ({
-    workspaceAccessor: {
+    workspaceDataService: {
         findById: vi.fn(),
-        findWithPRsForRatchet: vi.fn(),
-        findForRatchetById: vi.fn(),
-        update: vi.fn(),
-        transitionRatchetStateIfEnabled: vi.fn(),
-        settleRatchetIdleWhileDisabled: vi.fn(),
-        recordRatchetDispatchIfEnabled: vi.fn(),
-        adoptRatchetActiveSessionIfEnabled: vi.fn(),
-        recordRatchetSessionEnd: vi.fn(),
+    },
+    workspaceRatchetService: {
+        findCandidates: vi.fn(),
+        findCandidateById: vi.fn(),
+        clearActiveSession: vi.fn(),
+        enable: vi.fn(),
+        disable: vi.fn(),
+        transitionStateIfEnabled: vi.fn(),
+        settleIdleWhileDisabled: vi.fn(),
+        recordDispatchIfEnabled: vi.fn(),
+        adoptActiveSessionIfEnabled: vi.fn(),
+        recordSessionEnd: vi.fn(),
     },
 }));
 vi.mock('@/backend/services/session', () => ({
-    agentSessionAccessor: {
-        findById: vi.fn(),
-        findByWorkspaceId: vi.fn(),
+    sessionDataService: {
+        findAgentSessionById: vi.fn(),
+        findAgentSessionsByWorkspaceId: vi.fn(),
     },
 }));
 vi.mock('@/backend/services/settings', () => ({
-    userSettingsAccessor: {
+    userSettingsService: {
         get: vi.fn(),
         getDefaultSessionProvider: vi.fn(),
     },
@@ -40,15 +44,16 @@ vi.mock('@/backend/services/logger.service', () => ({
         error: vi.fn(),
     }),
 }));
-import { agentSessionAccessor } from '../../../../backend/services/session/index.js';
-import { userSettingsAccessor } from '../../../../backend/services/settings/index.js';
-import { workspaceAccessor } from '../../../../backend/services/workspace/index.js';
+import { userSettingsService } from '../../../../backend/services/settings/index.js';
+import { workspaceDataService, workspaceRatchetService } from '../../../../backend/services/workspace/index.js';
 import { fixerSessionService } from './fixer-session.service.js';
-import { RATCHET_STATE_CHANGED, RATCHET_TOGGLED, ratchetService, } from './ratchet.service.js';
+import { RATCHET_DISPATCH_CHANGED, RATCHET_STATE_CHANGED, RATCHET_TOGGLED, ratchetService, } from './ratchet.service.js';
 import { buildRatchetingLogContext } from './ratchet-decision-logging.helpers.js';
 import { computeDispatchSnapshotKey, computeLatestReviewActivityAtMs, determineRatchetState, } from './ratchet-pr-state.helpers.js';
 const mockSessionBridge = {
+    findSessionById: vi.fn(),
     findSessionsByWorkspaceId: vi.fn(),
+    acquireFixerSession: vi.fn(),
     isSessionRunning: vi.fn(),
     isSessionWorking: vi.fn(),
     stopSession: vi.fn(),
@@ -57,6 +62,10 @@ const mockSessionBridge = {
     sendSessionMessage: vi.fn(),
     injectCommittedUserMessage: vi.fn(),
 };
+const mockWorkspaceBridge = {
+    findFixerContext: vi.fn(),
+    recordSessionEnd: vi.fn(),
+};
 const mockGitHubBridge = {
     extractPRInfo: vi.fn(),
     getPRFullDetails: vi.fn(),
@@ -67,7 +76,7 @@ const mockGitHubBridge = {
     fetchAndComputePRState: vi.fn(),
     isRecentlyFetched: vi.fn(),
     isFetchInFlight: vi.fn(),
-    startFetch: vi.fn(),
+    startFetch: vi.fn(() => 41),
     registerFetch: vi.fn(),
     cancelFetch: vi.fn(),
 };
@@ -86,18 +95,20 @@ describe('ratchet service (state-change + idle dispatch)', () => {
             session: mockSessionBridge,
             github: mockGitHubBridge,
             snapshot: mockSnapshotBridge,
-        });
-        vi.mocked(workspaceAccessor.transitionRatchetStateIfEnabled).mockResolvedValue(true);
-        vi.mocked(workspaceAccessor.settleRatchetIdleWhileDisabled).mockResolvedValue(true);
-        vi.mocked(workspaceAccessor.recordRatchetDispatchIfEnabled).mockResolvedValue(true);
-        vi.mocked(workspaceAccessor.adoptRatchetActiveSessionIfEnabled).mockResolvedValue(true);
-        vi.mocked(workspaceAccessor.recordRatchetSessionEnd).mockResolvedValue(true);
-        vi.mocked(agentSessionAccessor.findByWorkspaceId).mockResolvedValue([]);
+            workspace: mockWorkspaceBridge,
+        });
+        vi.mocked(workspaceRatchetService.transitionStateIfEnabled).mockResolvedValue(true);
+        vi.mocked(workspaceRatchetService.settleIdleWhileDisabled).mockResolvedValue(true);
+        vi.mocked(workspaceRatchetService.recordDispatchIfEnabled).mockResolvedValue(true);
+        vi.mocked(workspaceRatchetService.adoptActiveSessionIfEnabled).mockResolvedValue(true);
+        vi.mocked(workspaceRatchetService.recordSessionEnd).mockResolvedValue(true);
+        vi.mocked(mockWorkspaceBridge.recordSessionEnd).mockResolvedValue(true);
+        vi.mocked(mockSessionBridge.findSessionsByWorkspaceId).mockResolvedValue([]);
         vi.mocked(mockSessionBridge.findSessionsByWorkspaceId).mockResolvedValue([]);
         vi.mocked(mockGitHubBridge.getAuthenticatedUsername).mockResolvedValue(null);
         vi.mocked(mockGitHubBridge.getResolvedReviewCommentIds).mockResolvedValue(new Set());
         vi.mocked(mockSessionBridge.isSessionWorking).mockReturnValue(false);
-        vi.mocked(userSettingsAccessor.get).mockResolvedValue({
+        vi.mocked(userSettingsService.get).mockResolvedValue({
             id: 'settings-1',
             userId: 'default',
             preferredIde: 'cursor',
@@ -108,6 +119,7 @@ describe('ratchet service (state-change + idle dispatch)', () => {
             cachedSlashCommands: null,
             ratchetEnabled: false,
             ratchetReplyToPrComments: true,
+            ratchetReviewTriggerMode: 'CHANGES_REQUESTED',
             defaultSessionProvider: 'CLAUDE',
             defaultClaudeModel: 'sonnet',
             defaultCodexModel: 'default',
@@ -118,13 +130,18 @@ describe('ratchet service (state-change + idle dispatch)', () => {
             createdAt: new Date('2026-01-01T00:00:00.000Z'),
             updatedAt: new Date('2026-01-01T00:00:00.000Z'),
         });
-        vi.mocked(userSettingsAccessor.getDefaultSessionProvider).mockResolvedValue('CLAUDE');
+        vi.mocked(userSettingsService.getDefaultSessionProvider).mockResolvedValue('CLAUDE');
+    });
+    it('records session completion through the configured workspace bridge', async () => {
+        await ratchetService.recordSessionEnd('workspace-1', 'session-1', 'COMPLETED');
+        expect(mockWorkspaceBridge.recordSessionEnd).toHaveBeenCalledWith('workspace-1', 'session-1', 'COMPLETED');
+        expect(workspaceRatchetService.recordSessionEnd).not.toHaveBeenCalled();
     });
     afterEach(() => {
         ratchetService.removeAllListeners();
     });
     it('checks workspaces and processes each', async () => {
-        vi.mocked(workspaceAccessor.findWithPRsForRatchet).mockResolvedValue([
+        vi.mocked(workspaceRatchetService.findCandidates).mockResolvedValue([
             {
                 id: 'ws-1',
                 prUrl: 'https://github.com/example/repo/pull/1',
@@ -167,7 +184,6 @@ describe('ratchet service (state-change + idle dispatch)', () => {
             ratchetDispatchRetryCount: 0,
         };
         const fetchPRStateSpy = vi.spyOn(unsafeCoerce(ratchetService), 'fetchPRState');
-        vi.mocked(workspaceAccessor.update).mockResolvedValue({});
         const triggerSpy = vi.spyOn(unsafeCoerce(ratchetService), 'triggerFixer');
         const result = await unsafeCoerce(ratchetService).processWorkspace(workspace);
         expect(fetchPRStateSpy).not.toHaveBeenCalled();
@@ -176,7 +192,7 @@ describe('ratchet service (state-change + idle dispatch)', () => {
             action: { type: 'DISABLED', reason: 'Workspace ratcheting disabled' },
             newState: RatchetState.IDLE,
         });
-        expect(workspaceAccessor.settleRatchetIdleWhileDisabled).toHaveBeenCalledWith('ws-disabled', RatchetState.IDLE);
+        expect(workspaceRatchetService.settleIdleWhileDisabled).toHaveBeenCalledWith('ws-disabled', RatchetState.IDLE);
     });
     it('settles a disabled workspace to IDLE via CAS and emits an accurate fromState', async () => {
         const workspace = {
@@ -193,13 +209,13 @@ describe('ratchet service (state-change + idle dispatch)', () => {
             ratchetDispatchOutcome: null,
             ratchetDispatchRetryCount: 0,
         };
-        vi.mocked(workspaceAccessor.settleRatchetIdleWhileDisabled).mockResolvedValue(true);
+        vi.mocked(workspaceRatchetService.settleIdleWhileDisabled).mockResolvedValue(true);
         const events = [];
         ratchetService.on(RATCHET_STATE_CHANGED, (event) => {
             events.push(event);
         });
         const result = await unsafeCoerce(ratchetService).processWorkspace(workspace);
-        expect(workspaceAccessor.settleRatchetIdleWhileDisabled).toHaveBeenCalledWith('ws-disabled-settle', RatchetState.CI_FAILED);
+        expect(workspaceRatchetService.settleIdleWhileDisabled).toHaveBeenCalledWith('ws-disabled-settle', RatchetState.CI_FAILED);
         expect(result).toMatchObject({
             previousState: RatchetState.CI_FAILED,
             newState: RatchetState.IDLE,
@@ -228,7 +244,7 @@ describe('ratchet service (state-change + idle dispatch)', () => {
             ratchetDispatchOutcome: null,
             ratchetDispatchRetryCount: 0,
         };
-        vi.mocked(workspaceAccessor.settleRatchetIdleWhileDisabled).mockResolvedValue(false);
+        vi.mocked(workspaceRatchetService.settleIdleWhileDisabled).mockResolvedValue(false);
         const events = [];
         ratchetService.on(RATCHET_STATE_CHANGED, (event) => {
             events.push(event);
@@ -274,8 +290,7 @@ describe('ratchet service (state-change + idle dispatch)', () => {
                 },
             ],
         });
-        vi.mocked(workspaceAccessor.update).mockResolvedValue({});
-        vi.mocked(agentSessionAccessor.findByWorkspaceId).mockResolvedValue([
+        vi.mocked(mockSessionBridge.findSessionsByWorkspaceId).mockResolvedValue([
             {
                 id: 'chat-1',
                 workflow: 'default-followup',
@@ -316,8 +331,7 @@ describe('ratchet service (state-change + idle dispatch)', () => {
             prState: 'OPEN',
             prNumber: 4,
         });
-        vi.mocked(workspaceAccessor.update).mockResolvedValue({});
-        vi.mocked(agentSessionAccessor.findByWorkspaceId).mockResolvedValue([]);
+        vi.mocked(mockSessionBridge.findSessionsByWorkspaceId).mockResolvedValue([]);
         vi.mocked(fixerSessionService.acquireAndDispatch).mockResolvedValue({
             status: 'started',
             sessionId: 'ratchet-session',
@@ -327,13 +341,13 @@ describe('ratchet service (state-change + idle dispatch)', () => {
         expect(result).toMatchObject({
             action: { type: 'TRIGGERED_FIXER' },
         });
-        expect(workspaceAccessor.recordRatchetDispatchIfEnabled).toHaveBeenCalledWith('ws-change', {
+        expect(workspaceRatchetService.recordDispatchIfEnabled).toHaveBeenCalledWith('ws-change', {
             sessionId: 'ratchet-session',
             snapshotKey: '2026-01-02T00:00:00Z',
             retryCount: 0,
         });
         const finalUpdatePayload = vi
-            .mocked(workspaceAccessor.transitionRatchetStateIfEnabled)
+            .mocked(workspaceRatchetService.transitionStateIfEnabled)
             .mock.calls.at(-1)?.[2];
         expect(finalUpdatePayload).not.toHaveProperty('ratchetLastCiRunId');
         expect(finalUpdatePayload).not.toHaveProperty('prReviewLastCheckedAt');
@@ -363,27 +377,32 @@ describe('ratchet service (state-change + idle dispatch)', () => {
             prState: 'OPEN',
             prNumber: 40,
         });
-        vi.mocked(agentSessionAccessor.findByWorkspaceId).mockResolvedValue([]);
+        vi.mocked(mockSessionBridge.findSessionsByWorkspaceId).mockResolvedValue([]);
         vi.mocked(fixerSessionService.acquireAndDispatch).mockResolvedValue({
             status: 'started',
             sessionId: 'raced-session',
             promptSent: true,
         });
-        vi.mocked(workspaceAccessor.recordRatchetDispatchIfEnabled).mockResolvedValue(false);
-        vi.mocked(workspaceAccessor.transitionRatchetStateIfEnabled).mockResolvedValue(false);
-        vi.mocked(workspaceAccessor.findById).mockResolvedValue({
+        vi.mocked(workspaceRatchetService.recordDispatchIfEnabled).mockResolvedValue(false);
+        vi.mocked(workspaceRatchetService.transitionStateIfEnabled).mockResolvedValue(false);
+        vi.mocked(workspaceDataService.findById).mockResolvedValue({
             id: 'ws-disable-race-dispatch',
             ratchetEnabled: false,
         });
         vi.mocked(mockSessionBridge.isSessionRunning).mockReturnValue(true);
+        const events = [];
+        ratchetService.on(RATCHET_DISPATCH_CHANGED, (event) => {
+            events.push(event);
+        });
         const result = await unsafeCoerce(ratchetService).processWorkspace(workspace);
         expect(result).toMatchObject({
             newState: RatchetState.IDLE,
             action: { type: 'DISABLED', reason: 'Workspace ratcheting disabled' },
         });
-        expect(workspaceAccessor.recordRatchetDispatchIfEnabled).toHaveBeenCalledWith('ws-disable-race-dispatch', { sessionId: 'raced-session', snapshotKey: 'new-snapshot', retryCount: 0 });
+        expect(workspaceRatchetService.recordDispatchIfEnabled).toHaveBeenCalledWith('ws-disable-race-dispatch', { sessionId: 'raced-session', snapshotKey: 'new-snapshot', retryCount: 0 });
         expect(mockSessionBridge.stopSession).toHaveBeenCalledWith('raced-session');
         expect(mockSnapshotBridge.recordReviewCheck).not.toHaveBeenCalled();
+        expect(events).toHaveLength(0);
     });
     it('dispatches when session is running but idle', async () => {
         const workspace = {
@@ -409,8 +428,7 @@ describe('ratchet service (state-change + idle dispatch)', () => {
             prState: 'OPEN',
             prNumber: 44,
         });
-        vi.mocked(workspaceAccessor.update).mockResolvedValue({});
-        vi.mocked(agentSessionAccessor.findByWorkspaceId).mockResolvedValue([
+        vi.mocked(mockSessionBridge.findSessionsByWorkspaceId).mockResolvedValue([
             {
                 id: 'chat-idle-1',
                 workflow: 'default-followup',
@@ -455,8 +473,7 @@ describe('ratchet service (state-change + idle dispatch)', () => {
             prState: 'OPEN',
             prNumber: 5,
         });
-        vi.mocked(workspaceAccessor.update).mockResolvedValue({});
-        vi.mocked(agentSessionAccessor.findByWorkspaceId).mockResolvedValue([]);
+        vi.mocked(mockSessionBridge.findSessionsByWorkspaceId).mockResolvedValue([]);
         const result = await unsafeCoerce(ratchetService).processWorkspace(workspace);
         expect(result).toMatchObject({
             action: {
@@ -464,7 +481,7 @@ describe('ratchet service (state-change + idle dispatch)', () => {
                 reason: 'PR state unchanged since last ratchet dispatch',
             },
         });
-        expect(agentSessionAccessor.findByWorkspaceId).not.toHaveBeenCalled();
+        expect(mockSessionBridge.findSessionsByWorkspaceId).not.toHaveBeenCalled();
         expect(mockSnapshotBridge.recordReviewCheck).not.toHaveBeenCalled();
     });
     it('does not dispatch repeatedly for unchanged CHANGES_REQUESTED state', async () => {
@@ -500,8 +517,7 @@ describe('ratchet service (state-change + idle dispatch)', () => {
                 },
             ],
         });
-        vi.mocked(workspaceAccessor.update).mockResolvedValue({});
-        vi.mocked(agentSessionAccessor.findByWorkspaceId).mockResolvedValue([]);
+        vi.mocked(mockSessionBridge.findSessionsByWorkspaceId).mockResolvedValue([]);
         const triggerSpy = vi.spyOn(unsafeCoerce(ratchetService), 'triggerFixer');
         const result = await unsafeCoerce(ratchetService).processWorkspace(workspace);
         expect(triggerSpy).not.toHaveBeenCalled();
@@ -511,9 +527,9 @@ describe('ratchet service (state-change + idle dispatch)', () => {
                 reason: 'PR state unchanged since last ratchet dispatch',
             },
         });
-        expect(agentSessionAccessor.findByWorkspaceId).not.toHaveBeenCalled();
+        expect(mockSessionBridge.findSessionsByWorkspaceId).not.toHaveBeenCalled();
     });
-    it('does not dispatch for CHANGES_REQUESTED when there are no PR review comments', async () => {
+    it('dispatches for CHANGES_REQUESTED when there are no PR review comments', async () => {
         const workspace = {
             id: 'ws-review-no-comments',
             prUrl: 'https://github.com/example/repo/pull/56',
@@ -538,19 +554,20 @@ describe('ratchet service (state-change + idle dispatch)', () => {
             prNumber: 56,
             reviewComments: [],
         });
-        vi.mocked(workspaceAccessor.update).mockResolvedValue({});
-        vi.mocked(agentSessionAccessor.findByWorkspaceId).mockResolvedValue([]);
+        vi.mocked(mockSessionBridge.findSessionsByWorkspaceId).mockResolvedValue([]);
+        vi.mocked(fixerSessionService.acquireAndDispatch).mockResolvedValue({
+            status: 'started',
+            sessionId: 'ratchet-session',
+            promptSent: true,
+        });
         const triggerSpy = vi.spyOn(unsafeCoerce(ratchetService), 'triggerFixer');
         const result = await unsafeCoerce(ratchetService).processWorkspace(workspace);
-        expect(triggerSpy).not.toHaveBeenCalled();
+        expect(triggerSpy).toHaveBeenCalled();
         expect(result).toMatchObject({
-            action: {
-                type: 'WAITING',
-                reason: 'No CI failures or PR review comments to address',
-            },
+            action: { type: 'TRIGGERED_FIXER' },
         });
     });
-    it('dispatches for PR review summary feedback without changes requested', async () => {
+    it('dispatches for PR review summary feedback in all-feedback mode', async () => {
         const workspace = {
             id: 'ws-review-summary',
             prUrl: 'https://github.com/example/repo/pull/57',
@@ -565,7 +582,14 @@ describe('ratchet service (state-change + idle dispatch)', () => {
             ratchetDispatchOutcome: null,
             ratchetDispatchRetryCount: 0,
         };
-        vi.spyOn(unsafeCoerce(ratchetService), 'fetchPRState').mockResolvedValue({
+        vi.mocked(userSettingsService.get).mockResolvedValue({
+            ratchetReviewTriggerMode: 'ALL_REVIEW_FEEDBACK',
+            ratchetReplyToPrComments: true,
+            ratchetPermissions: 'YOLO',
+        });
+        const fetchPRStateSpy = vi
+            .spyOn(unsafeCoerce(ratchetService), 'fetchPRState')
+            .mockResolvedValue({
             ciStatus: CIStatus.SUCCESS,
             snapshotKey: 'ci:SUCCESS|no-changes-requested:1767315600000|merge:clean',
             hasChangesRequested: false,
@@ -584,8 +608,7 @@ describe('ratchet service (state-change + idle dispatch)', () => {
                 },
             ],
         });
-        vi.mocked(workspaceAccessor.update).mockResolvedValue({});
-        vi.mocked(agentSessionAccessor.findByWorkspaceId).mockResolvedValue([]);
+        vi.mocked(mockSessionBridge.findSessionsByWorkspaceId).mockResolvedValue([]);
         vi.mocked(fixerSessionService.acquireAndDispatch).mockResolvedValue({
             status: 'started',
             sessionId: 'ratchet-session',
@@ -597,6 +620,7 @@ describe('ratchet service (state-change + idle dispatch)', () => {
             newState: RatchetState.READY,
         });
         expect(fixerSessionService.acquireAndDispatch).toHaveBeenCalled();
+        expect(fetchPRStateSpy).toHaveBeenCalledWith(workspace, null, expect.objectContaining({ reviewTriggerMode: 'ALL_REVIEW_FEEDBACK' }), expect.any(AbortSignal));
     });
     it('treats closed PR as IDLE and does not dispatch', () => {
         const state = determineRatchetState({
@@ -642,8 +666,7 @@ describe('ratchet service (state-change + idle dispatch)', () => {
                 },
             ],
         });
-        vi.mocked(workspaceAccessor.update).mockResolvedValue({});
-        vi.mocked(agentSessionAccessor.findByWorkspaceId).mockResolvedValue([]);
+        vi.mocked(mockSessionBridge.findSessionsByWorkspaceId).mockResolvedValue([]);
         vi.mocked(fixerSessionService.acquireAndDispatch).mockResolvedValue({
             status: 'started',
             sessionId: 'ratchet-session',
@@ -655,9 +678,7 @@ describe('ratchet service (state-change + idle dispatch)', () => {
         expect(result).toMatchObject({
             action: { type: 'ERROR', error: 'Failed to deliver initial ratchet prompt' },
         });
-        expect(workspaceAccessor.update).toHaveBeenCalledWith(workspace.id, {
-            ratchetActiveSessionId: null,
-        });
+        expect(workspaceRatchetService.clearActiveSession).toHaveBeenCalledWith(workspace.id);
         expect(mockSessionBridge.stopSession).toHaveBeenCalledWith('ratchet-session');
     });
     it('routes an aborted prompt-failure path through orphan cleanup', async () => {
@@ -669,7 +690,7 @@ describe('ratchet service (state-change + idle dispatch)', () => {
             sessionId: 'aborted-prompt-session',
             promptSent: false,
         });
-        vi.mocked(workspaceAccessor.update).mockImplementation(() => new Promise((resolve) => {
+        vi.mocked(workspaceRatchetService.clearActiveSession).mockImplementation(() => new Promise((resolve) => {
             finishPointerClear = () => resolve({});
         }));
         vi.mocked(mockSessionBridge.isSessionRunning).mockReturnValue(true);
@@ -683,13 +704,30 @@ describe('ratchet service (state-change + idle dispatch)', () => {
             reviewComments: [],
             hasMergeConflict: false,
         }, 0, controller.signal);
-        await vi.waitFor(() => expect(workspaceAccessor.update).toHaveBeenCalled());
+        await vi.waitFor(() => expect(workspaceRatchetService.clearActiveSession).toHaveBeenCalled());
         controller.abort(timeoutError);
         finishPointerClear();
         await expect(trigger).rejects.toBe(timeoutError);
-        expect(workspaceAccessor.recordRatchetSessionEnd).toHaveBeenCalledWith('ws-aborted-prompt', 'aborted-prompt-session', 'COMPLETED');
+        expect(workspaceRatchetService.recordSessionEnd).toHaveBeenCalledWith('ws-aborted-prompt', 'aborted-prompt-session', 'COMPLETED');
         expect(mockSessionBridge.stopSession).toHaveBeenCalledWith('aborted-prompt-session');
     });
+    it('publishes a dispatch invalidation after lifecycle settlement', async () => {
+        const events = [];
+        ratchetService.on(RATCHET_DISPATCH_CHANGED, (event) => {
+            events.push(event);
+        });
+        await ratchetService.recordSessionEnd('ws-1', 'session-1', 'DIED');
+        expect(events).toContainEqual({ workspaceId: 'ws-1' });
+    });
+    it('does not publish a dispatch change when lifecycle settlement loses its CAS', async () => {
+        const events = [];
+        ratchetService.on(RATCHET_DISPATCH_CHANGED, (event) => {
+            events.push(event);
+        });
+        vi.mocked(mockWorkspaceBridge.recordSessionEnd).mockResolvedValue(false);
+        await ratchetService.recordSessionEnd('ws-1', 'session-1', 'DIED');
+        expect(events).toHaveLength(0);
+    });
     it('does not dispatch on a clean PR with no new review activity', async () => {
         const recentCheck = new Date();
         const workspace = {
@@ -715,8 +753,7 @@ describe('ratchet service (state-change + idle dispatch)', () => {
             prState: 'OPEN',
             prNumber: 8,
         });
-        vi.mocked(workspaceAccessor.update).mockResolvedValue({});
-        vi.mocked(agentSessionAccessor.findByWorkspaceId).mockResolvedValue([]);
+        vi.mocked(mockSessionBridge.findSessionsByWorkspaceId).mockResolvedValue([]);
         const triggerSpy = vi.spyOn(unsafeCoerce(ratchetService), 'triggerFixer');
         const result = await unsafeCoerce(ratchetService).processWorkspace(workspace);
         expect(triggerSpy).not.toHaveBeenCalled();
@@ -727,6 +764,56 @@ describe('ratchet service (state-change + idle dispatch)', () => {
             },
         });
     });
+    it('dispatches stale actionable review comments when the PR snapshot changes', async () => {
+        const recentCheck = new Date();
+        const workspace = {
+            id: 'ws-stale-actionable-review',
+            prUrl: 'https://github.com/example/repo/pull/43',
+            prNumber: 43,
+            prState: 'OPEN',
+            prCiStatus: CIStatus.FAILURE,
+            ratchetEnabled: true,
+            ratchetState: RatchetState.CI_FAILED,
+            ratchetActiveSessionId: null,
+            ratchetLastCiRunId: 'failed-snapshot',
+            prReviewLastCheckedAt: recentCheck,
+            ratchetDispatchOutcome: 'COMPLETED',
+            ratchetDispatchRetryCount: 0,
+        };
+        vi.spyOn(unsafeCoerce(ratchetService), 'fetchPRState').mockResolvedValue({
+            ciStatus: CIStatus.SUCCESS,
+            snapshotKey: 'successful-snapshot',
+            hasChangesRequested: false,
+            hasMergeConflict: false,
+            latestReviewActivityAtMs: recentCheck.getTime() - 1000,
+            statusCheckRollup: null,
+            prState: 'OPEN',
+            prNumber: 43,
+            reviewComments: [
+                {
+                    author: 'reviewer',
+                    body: 'Please handle this edge case.',
+                    path: 'src/example.ts',
+                    line: 10,
+                    url: 'https://github.com/example/repo/pull/43#discussion_r1',
+                },
+            ],
+        });
+        vi.mocked(fixerSessionService.acquireAndDispatch).mockResolvedValue({
+            status: 'started',
+            sessionId: 'ratchet-review-session',
+            promptSent: true,
+        });
+        const result = await unsafeCoerce(ratchetService).processWorkspace(workspace);
+        expect(result).toMatchObject({
+            action: { type: 'TRIGGERED_FIXER', sessionId: 'ratchet-review-session' },
+        });
+        expect(workspaceRatchetService.recordDispatchIfEnabled).toHaveBeenCalledWith('ws-stale-actionable-review', {
+            sessionId: 'ratchet-review-session',
+            snapshotKey: 'successful-snapshot',
+            retryCount: 0,
+        });
+    });
     it('returns disabled when stale check-state update loses disable race', async () => {
         const recentCheck = new Date();
         const workspace = {
@@ -752,12 +839,12 @@ describe('ratchet service (state-change + idle dispatch)', () => {
             prState: 'OPEN',
             prNumber: 41,
         });
-        vi.mocked(workspaceAccessor.transitionRatchetStateIfEnabled).mockResolvedValue(false);
-        vi.mocked(workspaceAccessor.findById).mockResolvedValue({
+        vi.mocked(workspaceRatchetService.transitionStateIfEnabled).mockResolvedValue(false);
+        vi.mocked(workspaceDataService.findById).mockResolvedValue({
             id: 'ws-disable-race-state',
             ratchetEnabled: false,
         });
-        vi.mocked(agentSessionAccessor.findByWorkspaceId).mockResolvedValue([]);
+        vi.mocked(mockSessionBridge.findSessionsByWorkspaceId).mockResolvedValue([]);
         const events = [];
         ratchetService.on(RATCHET_STATE_CHANGED, (event) => {
             events.push(event);
@@ -795,19 +882,19 @@ describe('ratchet service (state-change + idle dispatch)', () => {
             prState: 'OPEN',
             prNumber: 42,
         });
-        vi.mocked(workspaceAccessor.transitionRatchetStateIfEnabled).mockResolvedValue(false);
-        vi.mocked(workspaceAccessor.findById).mockResolvedValue({
+        vi.mocked(workspaceRatchetService.transitionStateIfEnabled).mockResolvedValue(false);
+        vi.mocked(workspaceDataService.findById).mockResolvedValue({
             id: 'ws-superseded',
             ratchetEnabled: true,
             ratchetState: RatchetState.IDLE,
         });
-        vi.mocked(agentSessionAccessor.findByWorkspaceId).mockResolvedValue([]);
+        vi.mocked(mockSessionBridge.findSessionsByWorkspaceId).mockResolvedValue([]);
         const events = [];
         ratchetService.on(RATCHET_STATE_CHANGED, (event) => {
             events.push(event);
         });
         const result = await unsafeCoerce(ratchetService).processWorkspace(workspace);
-        expect(workspaceAccessor.transitionRatchetStateIfEnabled).toHaveBeenCalledWith('ws-superseded', RatchetState.CI_RUNNING, expect.objectContaining({ ratchetState: RatchetState.READY }));
+        expect(workspaceRatchetService.transitionStateIfEnabled).toHaveBeenCalledWith('ws-superseded', RatchetState.CI_RUNNING, expect.objectContaining({ ratchetState: RatchetState.READY }));
         expect(result).toMatchObject({
             previousState: RatchetState.CI_RUNNING,
             newState: RatchetState.CI_RUNNING,
@@ -844,8 +931,7 @@ describe('ratchet service (state-change + idle dispatch)', () => {
             prState: 'OPEN',
             prNumber: 13,
         });
-        vi.mocked(workspaceAccessor.update).mockResolvedValue({});
-        vi.mocked(agentSessionAccessor.findByWorkspaceId).mockResolvedValue([]);
+        vi.mocked(mockSessionBridge.findSessionsByWorkspaceId).mockResolvedValue([]);
         vi.mocked(fixerSessionService.acquireAndDispatch).mockResolvedValue({
             status: 'started',
             sessionId: 'retry-session',
@@ -855,7 +941,7 @@ describe('ratchet service (state-change + idle dispatch)', () => {
         expect(result).toMatchObject({
             action: { type: 'TRIGGERED_FIXER' },
         });
-        expect(workspaceAccessor.recordRatchetDispatchIfEnabled).toHaveBeenCalledWith('ws-died-retry', {
+        expect(workspaceRatchetService.recordDispatchIfEnabled).toHaveBeenCalledWith('ws-died-retry', {
             sessionId: 'retry-session',
             snapshotKey: 'same-snapshot',
             retryCount: 2,
@@ -887,22 +973,26 @@ describe('ratchet service (state-change + idle dispatch)', () => {
             prNumber: 14,
             reviewComments: [],
         });
-        vi.mocked(workspaceAccessor.update).mockResolvedValue({});
-        vi.mocked(agentSessionAccessor.findByWorkspaceId).mockResolvedValue([]);
+        vi.mocked(mockSessionBridge.findSessionsByWorkspaceId).mockResolvedValue([]);
         vi.mocked(fixerSessionService.acquireAndDispatch).mockResolvedValue({
             status: 'started',
             sessionId: 'retry-session',
             promptSent: true,
         });
+        const events = [];
+        ratchetService.on(RATCHET_DISPATCH_CHANGED, (event) => {
+            events.push(event);
+        });
         const result = await unsafeCoerce(ratchetService).processWorkspace(workspace);
         expect(result).toMatchObject({
             action: { type: 'TRIGGERED_FIXER' },
         });
-        expect(workspaceAccessor.recordRatchetDispatchIfEnabled).toHaveBeenCalledWith('ws-died-clean', {
+        expect(workspaceRatchetService.recordDispatchIfEnabled).toHaveBeenCalledWith('ws-died-clean', {
             sessionId: 'retry-session',
             snapshotKey: 'clean-snapshot',
             retryCount: 1,
         });
+        expect(events).toContainEqual({ workspaceId: 'ws-died-clean' });
     });
     it('stops retrying a died fixer once the retry budget is exhausted', async () => {
         const workspace = {
@@ -928,7 +1018,6 @@ describe('ratchet service (state-change + idle dispatch)', () => {
             prState: 'OPEN',
             prNumber: 15,
         });
-        vi.mocked(workspaceAccessor.update).mockResolvedValue({});
         const result = await unsafeCoerce(ratchetService).processWorkspace(workspace);
         expect(result).toMatchObject({
             action: {
@@ -962,8 +1051,7 @@ describe('ratchet service (state-change + idle dispatch)', () => {
             prState: 'OPEN',
             prNumber: 16,
         });
-        vi.mocked(workspaceAccessor.update).mockResolvedValue({});
-        vi.mocked(agentSessionAccessor.findByWorkspaceId).mockResolvedValue([]);
+        vi.mocked(mockSessionBridge.findSessionsByWorkspaceId).mockResolvedValue([]);
         vi.mocked(fixerSessionService.acquireAndDispatch).mockResolvedValue({
             status: 'started',
             sessionId: 'fresh-session',
@@ -973,7 +1061,7 @@ describe('ratchet service (state-change + idle dispatch)', () => {
         expect(result).toMatchObject({
             action: { type: 'TRIGGERED_FIXER' },
         });
-        expect(workspaceAccessor.recordRatchetDispatchIfEnabled).toHaveBeenCalledWith('ws-died-changed', { sessionId: 'fresh-session', snapshotKey: 'new-snapshot', retryCount: 0 });
+        expect(workspaceRatchetService.recordDispatchIfEnabled).toHaveBeenCalledWith('ws-died-changed', { sessionId: 'fresh-session', snapshotKey: 'new-snapshot', retryCount: 0 });
     });
     it('does not redispatch when the previous fixer completed and PR state is unchanged', async () => {
         const workspace = {
@@ -999,7 +1087,6 @@ describe('ratchet service (state-change + idle dispatch)', () => {
             prState: 'OPEN',
             prNumber: 17,
         });
-        vi.mocked(workspaceAccessor.update).mockResolvedValue({});
         const result = await unsafeCoerce(ratchetService).processWorkspace(workspace);
         expect(result).toMatchObject({
             action: {
@@ -1009,6 +1096,51 @@ describe('ratchet service (state-change + idle dispatch)', () => {
         });
         expect(fixerSessionService.acquireAndDispatch).not.toHaveBeenCalled();
     });
+    it('dispatches a fresh fixer after switching PRs with identical merge-conflict state', async () => {
+        const previousSnapshotKey = computeDispatchSnapshotKey(123, CIStatus.SUCCESS, false, null, null, true);
+        const currentSnapshotKey = computeDispatchSnapshotKey(456, CIStatus.SUCCESS, false, null, null, true);
+        expect(previousSnapshotKey).toBe('pr:123|ci:SUCCESS|no-changes-requested:none|merge:conflict');
+        expect(currentSnapshotKey).toBe('pr:456|ci:SUCCESS|no-changes-requested:none|merge:conflict');
+        const workspace = {
+            id: 'ws-pr-switch-merge-conflict',
+            prUrl: 'https://github.com/example/repo/pull/456',
+            prNumber: 456,
+            prState: 'OPEN',
+            prCiStatus: CIStatus.SUCCESS,
+            ratchetEnabled: true,
+            ratchetState: RatchetState.MERGE_CONFLICT,
+            ratchetActiveSessionId: null,
+            ratchetLastCiRunId: previousSnapshotKey,
+            prReviewLastCheckedAt: new Date('2026-01-01T00:00:00Z'),
+            ratchetDispatchOutcome: 'COMPLETED',
+            ratchetDispatchRetryCount: 2,
+        };
+        vi.spyOn(unsafeCoerce(ratchetService), 'fetchPRState').mockResolvedValue({
+            ciStatus: CIStatus.SUCCESS,
+            snapshotKey: currentSnapshotKey,
+            hasChangesRequested: false,
+            hasMergeConflict: true,
+            latestReviewActivityAtMs: null,
+            statusCheckRollup: null,
+            prState: 'OPEN',
+            prNumber: 456,
+            reviewComments: [],
+        });
+        vi.mocked(fixerSessionService.acquireAndDispatch).mockResolvedValue({
+            status: 'started',
+            sessionId: 'fresh-pr-session',
+            promptSent: true,
+        });
+        const result = await unsafeCoerce(ratchetService).processWorkspace(workspace);
+        expect(result).toMatchObject({
+            action: { type: 'TRIGGERED_FIXER' },
+        });
+        expect(workspaceRatchetService.recordDispatchIfEnabled).toHaveBeenCalledWith(workspace.id, {
+            sessionId: 'fresh-pr-session',
+            snapshotKey: currentSnapshotKey,
+            retryCount: 0,
+        });
+    });
     it('settles the dispatch as DIED when ratchet session process is not running', async () => {
         const workspace = {
             id: 'ws-stale-active',
@@ -1024,7 +1156,7 @@ describe('ratchet service (state-change + idle dispatch)', () => {
             ratchetDispatchOutcome: 'RUNNING',
             ratchetDispatchRetryCount: 0,
         };
-        vi.mocked(agentSessionAccessor.findById).mockResolvedValue({
+        vi.mocked(mockSessionBridge.findSessionById).mockResolvedValue({
             id: 'ratchet-session',
             provider: 'CLAUDE',
             status: SessionStatus.RUNNING,
@@ -1032,7 +1164,7 @@ describe('ratchet service (state-change + idle dispatch)', () => {
         vi.mocked(mockSessionBridge.isSessionRunning).mockReturnValue(false);
         const result = await unsafeCoerce(ratchetService).checkActiveFixerSession(workspace);
         expect(result).toEqual({ kind: 'settled', outcome: 'DIED' });
-        expect(workspaceAccessor.recordRatchetSessionEnd).toHaveBeenCalledWith(workspace.id, 'ratchet-session', 'DIED');
+        expect(mockWorkspaceBridge.recordSessionEnd).toHaveBeenCalledWith(workspace.id, 'ratchet-session', 'DIED');
     });
     it('settles the dispatch as DIED when ratchet session is not found in database', async () => {
         const workspace = {
@@ -1049,10 +1181,15 @@ describe('ratchet service (state-change + idle dispatch)', () => {
             ratchetDispatchOutcome: 'RUNNING',
             ratchetDispatchRetryCount: 0,
         };
-        vi.mocked(agentSessionAccessor.findById).mockResolvedValue(null);
+        vi.mocked(mockSessionBridge.findSessionById).mockResolvedValue(null);
+        const events = [];
+        ratchetService.on(RATCHET_DISPATCH_CHANGED, (event) => {
+            events.push(event);
+        });
         const result = await unsafeCoerce(ratchetService).checkActiveFixerSession(workspace);
         expect(result).toEqual({ kind: 'settled', outcome: 'DIED' });
-        expect(workspaceAccessor.recordRatchetSessionEnd).toHaveBeenCalledWith(workspace.id, 'deleted-session', 'DIED');
+        expect(mockWorkspaceBridge.recordSessionEnd).toHaveBeenCalledWith(workspace.id, 'deleted-session', 'DIED');
+        expect(events).toEqual([{ workspaceId: 'ws-missing-session' }]);
     });
     it('reports a concurrent end when another path already settled the dispatch', async () => {
         const workspace = {
@@ -1069,10 +1206,15 @@ describe('ratchet service (state-change + idle dispatch)', () => {
             ratchetDispatchOutcome: 'RUNNING',
             ratchetDispatchRetryCount: 0,
         };
-        vi.mocked(agentSessionAccessor.findById).mockResolvedValue(null);
-        vi.mocked(workspaceAccessor.recordRatchetSessionEnd).mockResolvedValue(false);
+        vi.mocked(mockSessionBridge.findSessionById).mockResolvedValue(null);
+        vi.mocked(mockWorkspaceBridge.recordSessionEnd).mockResolvedValue(false);
+        const events = [];
+        ratchetService.on(RATCHET_DISPATCH_CHANGED, (event) => {
+            events.push(event);
+        });
         const result = await unsafeCoerce(ratchetService).checkActiveFixerSession(workspace);
         expect(result).toEqual({ kind: 'ended_concurrently' });
+        expect(events).toHaveLength(0);
     });
     it('waits for the next cycle when the fixer ends concurrently mid-check', async () => {
         const workspace = {
@@ -1098,9 +1240,8 @@ describe('ratchet service (state-change + idle dispatch)', () => {
             prState: 'OPEN',
             prNumber: 12,
         });
-        vi.mocked(agentSessionAccessor.findById).mockResolvedValue(null);
-        vi.mocked(workspaceAccessor.recordRatchetSessionEnd).mockResolvedValue(false);
-        vi.mocked(workspaceAccessor.update).mockResolvedValue({});
+        vi.mocked(mockSessionBridge.findSessionById).mockResolvedValue(null);
+        vi.mocked(mockWorkspaceBridge.recordSessionEnd).mockResolvedValue(false);
         const result = await unsafeCoerce(ratchetService).processWorkspace(workspace);
         expect(result).toMatchObject({
             action: {
@@ -1125,7 +1266,7 @@ describe('ratchet service (state-change + idle dispatch)', () => {
             ratchetDispatchOutcome: 'RUNNING',
             ratchetDispatchRetryCount: 0,
         };
-        vi.mocked(agentSessionAccessor.findById).mockResolvedValue({
+        vi.mocked(mockSessionBridge.findSessionById).mockResolvedValue({
             id: 'ratchet-session',
             provider: 'CLAUDE',
             status: SessionStatus.RUNNING,
@@ -1135,7 +1276,7 @@ describe('ratchet service (state-change + idle dispatch)', () => {
         vi.mocked(mockSessionBridge.stopSession).mockResolvedValue();
         const result = await unsafeCoerce(ratchetService).checkActiveFixerSession(workspace);
         expect(result).toEqual({ kind: 'settled', outcome: 'COMPLETED' });
-        expect(workspaceAccessor.recordRatchetSessionEnd).toHaveBeenCalledWith(workspace.id, 'ratchet-session', 'COMPLETED');
+        expect(mockWorkspaceBridge.recordSessionEnd).toHaveBeenCalledWith(workspace.id, 'ratchet-session', 'COMPLETED');
         expect(mockSessionBridge.stopSession).toHaveBeenCalledWith('ratchet-session');
     });
     it('decides to trigger fixer when context is actionable', async () => {
@@ -1218,11 +1359,19 @@ describe('ratchet service (state-change + idle dispatch)', () => {
     it('ignores review activity authored by the authenticated user', () => {
         const latestActivity = computeLatestReviewActivityAtMs({
             reviews: [
-                { submittedAt: '2026-01-02T00:00:00Z', author: { login: 'ratchet-bot' } },
-                { submittedAt: '2026-01-01T00:00:00Z', author: { login: 'reviewer' } },
+                {
+                    submittedAt: '2026-01-02T00:00:00Z',
+                    author: { login: 'ratchet-bot' },
+                    state: 'CHANGES_REQUESTED',
+                },
+                {
+                    submittedAt: '2026-01-01T00:00:00Z',
+                    author: { login: 'reviewer' },
+                    state: 'CHANGES_REQUESTED',
+                },
             ],
             comments: [{ updatedAt: '2026-01-02T01:00:00Z', author: { login: 'ratchet-bot' } }],
-        }, [{ updatedAt: '2026-01-01T02:00:00Z', author: { login: 'reviewer2' } }], 'ratchet-bot');
+        }, [{ updatedAt: '2026-01-01T02:00:00Z', author: { login: 'reviewer2' } }], 'ratchet-bot', 'CHANGES_REQUESTED');
         expect(latestActivity).toBe(new Date('2026-01-01T02:00:00Z').getTime());
     });
     describe('determineRatchetState', () => {
@@ -1285,7 +1434,7 @@ describe('ratchet service (state-change + idle dispatch)', () => {
         });
     });
     describe('computeDispatchSnapshotKey', () => {
-        const callComputeSnapshotKey = (ciStatus, hasChangesRequested, latestReviewActivityAtMs, statusChecks) => computeDispatchSnapshotKey(ciStatus, hasChangesRequested, latestReviewActivityAtMs, statusChecks);
+        const callComputeSnapshotKey = (ciStatus, hasChangesRequested, latestReviewActivityAtMs, statusChecks) => computeDispatchSnapshotKey(123, ciStatus, hasChangesRequested, latestReviewActivityAtMs, statusChecks);
         it('includes CI status in key for non-failure states', () => {
             const key = callComputeSnapshotKey(CIStatus.SUCCESS, false, null, null);
             expect(key).toContain('ci:SUCCESS');
@@ -1329,36 +1478,60 @@ describe('ratchet service (state-change + idle dispatch)', () => {
         });
     });
     describe('computeLatestReviewActivityAtMs edge cases', () => {
-        const callCompute = (prDetails, reviewComments, authenticatedUsername) => computeLatestReviewActivityAtMs(prDetails, reviewComments, authenticatedUsername);
+        const callCompute = (prDetails, reviewComments, authenticatedUsername) => computeLatestReviewActivityAtMs(prDetails, reviewComments, authenticatedUsername, 'CHANGES_REQUESTED');
         it('returns null when there are no reviews or comments', () => {
             expect(callCompute({ reviews: [], comments: [] }, [], null)).toBeNull();
         });
         it('returns null when all activity is from the authenticated user', () => {
             expect(callCompute({
-                reviews: [{ submittedAt: '2026-01-01T00:00:00Z', author: { login: 'me' } }],
+                reviews: [
+                    {
+                        submittedAt: '2026-01-01T00:00:00Z',
+                        author: { login: 'me' },
+                        state: 'CHANGES_REQUESTED',
+                    },
+                ],
                 comments: [{ updatedAt: '2026-01-02T00:00:00Z', author: { login: 'me' } }],
             }, [{ updatedAt: '2026-01-03T00:00:00Z', author: { login: 'me' } }], 'me')).toBeNull();
         });
         it('does not filter when authenticatedUsername is null', () => {
             const result = callCompute({
-                reviews: [{ submittedAt: '2026-01-01T00:00:00Z', author: { login: 'bot' } }],
+                reviews: [
+                    {
+                        submittedAt: '2026-01-01T00:00:00Z',
+                        author: { login: 'bot' },
+                        state: 'CHANGES_REQUESTED',
+                    },
+                ],
                 comments: [],
             }, [], null);
             expect(result).toBe(new Date('2026-01-01T00:00:00Z').getTime());
         });
-        it('ignores reviews that have null submittedAt', () => {
+        it('ignores reviews with null submittedAt and ordinary PR comments', () => {
             const result = callCompute({
-                reviews: [{ submittedAt: null, author: { login: 'reviewer' } }],
+                reviews: [
+                    {
+                        submittedAt: null,
+                        author: { login: 'reviewer' },
+                        state: 'CHANGES_REQUESTED',
+                    },
+                ],
                 comments: [{ updatedAt: '2026-01-02T00:00:00Z', author: { login: 'commenter' } }],
             }, [], null);
-            expect(result).toBe(new Date('2026-01-02T00:00:00Z').getTime());
+            expect(result).toBeNull();
         });
         it('returns the latest timestamp across all sources', () => {
             const result = callCompute({
-                reviews: [{ submittedAt: '2026-01-01T00:00:00Z', author: { login: 'a' } }],
+                reviews: [
+                    {
+                        submittedAt: '2026-01-01T00:00:00Z',
+                        author: { login: 'a' },
+                        state: 'CHANGES_REQUESTED',
+                    },
+                ],
                 comments: [{ updatedAt: '2026-01-03T00:00:00Z', author: { login: 'b' } }],
             }, [{ updatedAt: '2026-01-02T00:00:00Z', author: { login: 'c' } }], null);
-            expect(result).toBe(new Date('2026-01-03T00:00:00Z').getTime());
+            expect(result).toBe(new Date('2026-01-02T00:00:00Z').getTime());
         });
     });
     describe('processWorkspace error handling', () => {
@@ -1376,7 +1549,6 @@ describe('ratchet service (state-change + idle dispatch)', () => {
                 ratchetDispatchRetryCount: 0,
             };
             vi.spyOn(unsafeCoerce(ratchetService), 'fetchPRState').mockResolvedValue(null);
-            vi.mocked(workspaceAccessor.update).mockResolvedValue({});
             const result = await unsafeCoerce(ratchetService).processWorkspace(workspace);
             expect(result).toMatchObject({
                 action: { type: 'ERROR', error: 'Failed to fetch PR state' },
@@ -1402,7 +1574,7 @@ describe('ratchet service (state-change + idle dispatch)', () => {
                 action: { type: 'WAITING', reason: 'recently_fetched' },
                 newState: RatchetState.IDLE,
             });
-            expect(workspaceAccessor.update).not.toHaveBeenCalled();
+            expect(workspaceRatchetService.clearActiveSession).not.toHaveBeenCalled();
         });
         it('returns WAITING when shutting down', async () => {
             unsafeCoerce(ratchetService).isShuttingDown = true;
@@ -1454,13 +1626,34 @@ describe('ratchet service (state-change + idle dispatch)', () => {
             expect(result).toEqual({ checked: 0, stateChanges: 0, actionsTriggered: 0, results: [] });
         });
         it('returns zero counts when no workspaces have PRs', async () => {
-            vi.mocked(workspaceAccessor.findWithPRsForRatchet).mockResolvedValue([]);
+            vi.mocked(workspaceRatchetService.findCandidates).mockResolvedValue([]);
             const result = await ratchetService.checkAllWorkspaces();
             expect(result).toEqual({ checked: 0, stateChanges: 0, actionsTriggered: 0, results: [] });
         });
+        it('loads the global review trigger mode once for the whole batch', async () => {
+            const workspaces = ['ws-one', 'ws-two'].map((id) => ({
+                id,
+                prUrl: `https://github.com/example/repo/pull/${id}`,
+                prNumber: 1,
+                prState: 'OPEN',
+                prCiStatus: CIStatus.UNKNOWN,
+                ratchetEnabled: true,
+                ratchetState: RatchetState.IDLE,
+                ratchetActiveSessionId: null,
+                ratchetLastCiRunId: null,
+                prReviewLastCheckedAt: null,
+                ratchetDispatchOutcome: null,
+                ratchetDispatchRetryCount: 0,
+            }));
+            vi.mocked(workspaceRatchetService.findCandidates).mockResolvedValue(workspaces);
+            vi.spyOn(unsafeCoerce(ratchetService), 'fetchPRState').mockResolvedValue({ skipped: true, reason: 'recently_fetched' });
+            const result = await ratchetService.checkAllWorkspaces();
+            expect(result.checked).toBe(2);
+            expect(userSettingsService.get).toHaveBeenCalledTimes(1);
+        });
         it('returns an error result when one workspace check times out', async () => {
             unsafeCoerce(ratchetService).workspaceCheckTimeoutMs = 5;
-            vi.mocked(workspaceAccessor.findWithPRsForRatchet).mockResolvedValue([
+            vi.mocked(workspaceRatchetService.findCandidates).mockResolvedValue([
                 {
                     id: 'ws-timeout',
                     prUrl: 'https://github.com/example/repo/pull/1',
@@ -1541,7 +1734,7 @@ describe('ratchet service (state-change + idle dispatch)', () => {
                 ratchetDispatchOutcome: null,
                 ratchetDispatchRetryCount: 0,
             }));
-            vi.mocked(workspaceAccessor.findWithPRsForRatchet).mockResolvedValue(workspaces);
+            vi.mocked(workspaceRatchetService.findCandidates).mockResolvedValue(workspaces);
             const processWorkspaceSpy = vi.spyOn(unsafeCoerce(ratchetService), 'processWorkspace');
             processWorkspaceSpy.mockImplementation((workspace, _opts, signal) => {
                 if (workspace.id !== 'ws-queued-timeout-3') {
@@ -1557,7 +1750,7 @@ describe('ratchet service (state-change + idle dispatch)', () => {
                 });
             });
             const result = await ratchetService.checkAllWorkspaces();
-            expect(processWorkspaceSpy).toHaveBeenCalledWith(expect.objectContaining({ id: 'ws-queued-timeout-3' }), undefined, expect.any(AbortSignal), expect.any(Function));
+            expect(processWorkspaceSpy).toHaveBeenCalledWith(expect.objectContaining({ id: 'ws-queued-timeout-3' }), undefined, expect.any(AbortSignal), expect.any(Function), 'CHANGES_REQUESTED');
             expect(result.results[3]).toMatchObject({
                 workspaceId: 'ws-queued-timeout-3',
                 action: { type: 'WAITING', reason: 'ran after queue' },
@@ -1572,7 +1765,7 @@ describe('ratchet service (state-change + idle dispatch)', () => {
                 ratchetEnabled: true,
                 ratchetState: RatchetState.IDLE,
             };
-            vi.mocked(workspaceAccessor.findWithPRsForRatchet).mockResolvedValue([workspace]);
+            vi.mocked(workspaceRatchetService.findCandidates).mockResolvedValue([workspace]);
             let finishCommit;
             const commitBarrier = new Promise((resolve) => {
                 finishCommit = resolve;
@@ -1614,7 +1807,7 @@ describe('ratchet service (state-change + idle dispatch)', () => {
                 ratchetDispatchOutcome: null,
                 ratchetDispatchRetryCount: 0,
             }));
-            vi.mocked(workspaceAccessor.findWithPRsForRatchet).mockResolvedValue(workspaces);
+            vi.mocked(workspaceRatchetService.findCandidates).mockResolvedValue(workspaces);
             let active = 0;
             let maximumActive = 0;
             let releaseChecks;
@@ -1664,18 +1857,18 @@ describe('ratchet service (state-change + idle dispatch)', () => {
             ratchetService.removeAllListeners();
         });
         it('resets ratchet state to IDLE via CAS on fromState and emits a state change', async () => {
-            vi.mocked(workspaceAccessor.findById).mockResolvedValue({
+            vi.mocked(workspaceDataService.findById).mockResolvedValue({
                 id: 'ws-closed',
                 ratchetEnabled: true,
                 ratchetState: RatchetState.CI_FAILED,
             });
-            vi.mocked(workspaceAccessor.transitionRatchetStateIfEnabled).mockResolvedValue(true);
+            vi.mocked(workspaceRatchetService.transitionStateIfEnabled).mockResolvedValue(true);
             const stateEvents = [];
             ratchetService.on(RATCHET_STATE_CHANGED, (event) => {
                 stateEvents.push(event);
             });
             await ratchetService.markPrClosed('ws-closed');
-            expect(workspaceAccessor.transitionRatchetStateIfEnabled).toHaveBeenCalledWith('ws-closed', RatchetState.CI_FAILED, {
+            expect(workspaceRatchetService.transitionStateIfEnabled).toHaveBeenCalledWith('ws-closed', RatchetState.CI_FAILED, {
                 ratchetState: RatchetState.IDLE,
                 ratchetLastCheckedAt: expect.any(Date),
             });
@@ -1688,7 +1881,7 @@ describe('ratchet service (state-change + idle dispatch)', () => {
             ]);
         });
         it('emits the fromState that actually won the compare-and-swap after losing a race', async () => {
-            vi.mocked(workspaceAccessor.findById)
+            vi.mocked(workspaceDataService.findById)
                 .mockResolvedValueOnce({
                 id: 'ws-closed',
                 ratchetEnabled: true,
@@ -1699,7 +1892,7 @@ describe('ratchet service (state-change + idle dispatch)', () => {
                 ratchetEnabled: true,
                 ratchetState: RatchetState.CI_RUNNING,
             });
-            vi.mocked(workspaceAccessor.transitionRatchetStateIfEnabled)
+            vi.mocked(workspaceRatchetService.transitionStateIfEnabled)
                 .mockResolvedValueOnce(false)
                 .mockResolvedValueOnce(true);
             const stateEvents = [];
@@ -1707,8 +1900,8 @@ describe('ratchet service (state-change + idle dispatch)', () => {
                 stateEvents.push(event);
             });
             await ratchetService.markPrClosed('ws-closed');
-            expect(workspaceAccessor.transitionRatchetStateIfEnabled).toHaveBeenNthCalledWith(1, 'ws-closed', RatchetState.CI_FAILED, expect.objectContaining({ ratchetState: RatchetState.IDLE }));
-            expect(workspaceAccessor.transitionRatchetStateIfEnabled).toHaveBeenNthCalledWith(2, 'ws-closed', RatchetState.CI_RUNNING, expect.objectContaining({ ratchetState: RatchetState.IDLE }));
+            expect(workspaceRatchetService.transitionStateIfEnabled).toHaveBeenNthCalledWith(1, 'ws-closed', RatchetState.CI_FAILED, expect.objectContaining({ ratchetState: RatchetState.IDLE }));
+            expect(workspaceRatchetService.transitionStateIfEnabled).toHaveBeenNthCalledWith(2, 'ws-closed', RatchetState.CI_RUNNING, expect.objectContaining({ ratchetState: RatchetState.IDLE }));
             expect(stateEvents).toEqual([
                 {
                     workspaceId: 'ws-closed',
@@ -1718,16 +1911,16 @@ describe('ratchet service (state-change + idle dispatch)', () => {
             ]);
         });
         it('is a no-op when ratchet state is already IDLE', async () => {
-            vi.mocked(workspaceAccessor.findById).mockResolvedValue({
+            vi.mocked(workspaceDataService.findById).mockResolvedValue({
                 id: 'ws-closed',
                 ratchetEnabled: true,
                 ratchetState: RatchetState.IDLE,
             });
             await ratchetService.markPrClosed('ws-closed');
-            expect(workspaceAccessor.transitionRatchetStateIfEnabled).not.toHaveBeenCalled();
+            expect(workspaceRatchetService.transitionStateIfEnabled).not.toHaveBeenCalled();
         });
         it('does not emit when ratcheting was disabled concurrently', async () => {
-            vi.mocked(workspaceAccessor.findById)
+            vi.mocked(workspaceDataService.findById)
                 .mockResolvedValueOnce({
                 id: 'ws-closed',
                 ratchetEnabled: true,
@@ -1738,7 +1931,7 @@ describe('ratchet service (state-change + idle dispatch)', () => {
                 ratchetEnabled: false,
                 ratchetState: RatchetState.IDLE,
             });
-            vi.mocked(workspaceAccessor.transitionRatchetStateIfEnabled).mockResolvedValue(false);
+            vi.mocked(workspaceRatchetService.transitionStateIfEnabled).mockResolvedValue(false);
             const stateEvents = [];
             ratchetService.on(RATCHET_STATE_CHANGED, (event) => {
                 stateEvents.push(event);
@@ -1747,9 +1940,9 @@ describe('ratchet service (state-change + idle dispatch)', () => {
             expect(stateEvents).toEqual([]);
         });
         it('is a no-op when workspace is not found', async () => {
-            vi.mocked(workspaceAccessor.findById).mockResolvedValue(null);
+            vi.mocked(workspaceDataService.findById).mockResolvedValue(null);
             await ratchetService.markPrClosed('ws-missing');
-            expect(workspaceAccessor.transitionRatchetStateIfEnabled).not.toHaveBeenCalled();
+            expect(workspaceRatchetService.transitionStateIfEnabled).not.toHaveBeenCalled();
         });
         it('does not continue to side effects after a timed-out await completes', async () => {
             unsafeCoerce(ratchetService).workspaceCheckTimeoutMs = 5;
@@ -1769,7 +1962,7 @@ describe('ratchet service (state-change + idle dispatch)', () => {
                 ratchetDispatchOutcome: null,
                 ratchetDispatchRetryCount: 0,
             };
-            vi.mocked(workspaceAccessor.findWithPRsForRatchet).mockResolvedValue([workspace]);
+            vi.mocked(workspaceRatchetService.findCandidates).mockResolvedValue([workspace]);
             let releaseFetch;
             const fetchBarrier = new Promise((resolve) => {
                 releaseFetch = resolve;
@@ -1794,7 +1987,7 @@ describe('ratchet service (state-change + idle dispatch)', () => {
             releaseFetch();
             await new Promise((resolve) => setTimeout(resolve, 0));
             expect(finishSpy).not.toHaveBeenCalled();
-            expect(workspaceAccessor.transitionRatchetStateIfEnabled).not.toHaveBeenCalled();
+            expect(workspaceRatchetService.transitionStateIfEnabled).not.toHaveBeenCalled();
         });
     });
     describe('checkWorkspaceById', () => {
@@ -1805,7 +1998,7 @@ describe('ratchet service (state-change + idle dispatch)', () => {
         });
         it('returns null when workspace not found', async () => {
             unsafeCoerce(ratchetService).isShuttingDown = false;
-            vi.mocked(workspaceAccessor.findForRatchetById).mockResolvedValue(null);
+            vi.mocked(workspaceRatchetService.findCandidateById).mockResolvedValue(null);
             const result = await ratchetService.checkWorkspaceById('ws-nonexistent');
             expect(result).toBeNull();
         });
@@ -1824,7 +2017,7 @@ describe('ratchet service (state-change + idle dispatch)', () => {
                 ratchetDispatchOutcome: null,
                 ratchetDispatchRetryCount: 0,
             };
-            vi.mocked(workspaceAccessor.findForRatchetById).mockResolvedValue(workspace);
+            vi.mocked(workspaceRatchetService.findCandidateById).mockResolvedValue(workspace);
             vi.mocked(mockGitHubBridge.extractPRInfo).mockReturnValue({
                 owner: 'example',
                 repo: 'repo',
@@ -1852,7 +2045,7 @@ describe('ratchet service (state-change + idle dispatch)', () => {
                 ratchetDispatchOutcome: null,
                 ratchetDispatchRetryCount: 0,
             };
-            vi.mocked(workspaceAccessor.findForRatchetById).mockResolvedValue(workspace);
+            vi.mocked(workspaceRatchetService.findCandidateById).mockResolvedValue(workspace);
             vi.mocked(mockGitHubBridge.extractPRInfo).mockReturnValue({
                 owner: 'example',
                 repo: 'repo',
@@ -1895,7 +2088,7 @@ describe('ratchet service (state-change + idle dispatch)', () => {
                 ratchetDispatchOutcome: null,
                 ratchetDispatchRetryCount: 0,
             };
-            vi.mocked(workspaceAccessor.findForRatchetById).mockResolvedValue(workspace);
+            vi.mocked(workspaceRatchetService.findCandidateById).mockResolvedValue(workspace);
             vi.mocked(mockGitHubBridge.extractPRInfo).mockReturnValue({
                 owner: 'example',
                 repo: 'repo',
@@ -1936,7 +2129,7 @@ describe('ratchet service (state-change + idle dispatch)', () => {
                 ratchetDispatchOutcome: null,
                 ratchetDispatchRetryCount: 0,
             };
-            vi.mocked(workspaceAccessor.findForRatchetById).mockResolvedValue(workspace);
+            vi.mocked(workspaceRatchetService.findCandidateById).mockResolvedValue(workspace);
             vi.mocked(mockGitHubBridge.extractPRInfo).mockReturnValue({
                 owner: 'example',
                 repo: 'repo',
@@ -1968,7 +2161,7 @@ describe('ratchet service (state-change + idle dispatch)', () => {
                 ratchetDispatchOutcome: null,
                 ratchetDispatchRetryCount: 0,
             };
-            vi.mocked(workspaceAccessor.findForRatchetById).mockResolvedValue(workspace);
+            vi.mocked(workspaceRatchetService.findCandidateById).mockResolvedValue(workspace);
             let releaseCheck;
             const checkBarrier = new Promise((resolve) => {
                 releaseCheck = () => resolve();
@@ -2009,8 +2202,8 @@ describe('ratchet service (state-change + idle dispatch)', () => {
                 makeWorkspace('blocker-3'),
                 makeWorkspace('queued-target'),
             ];
-            vi.mocked(workspaceAccessor.findWithPRsForRatchet).mockResolvedValue(workspaces);
-            vi.mocked(workspaceAccessor.findForRatchetById).mockResolvedValue(workspaces[3]);
+            vi.mocked(workspaceRatchetService.findCandidates).mockResolvedValue(workspaces);
+            vi.mocked(workspaceRatchetService.findCandidateById).mockResolvedValue(workspaces[3]);
             let releaseBlockers;
             const blockerBarrier = new Promise((resolve) => {
                 releaseBlockers = resolve;
@@ -2057,7 +2250,7 @@ describe('ratchet service (state-change + idle dispatch)', () => {
                 makeWorkspace('timed-out-3'),
                 makeWorkspace('after-timeouts'),
             ];
-            vi.mocked(workspaceAccessor.findWithPRsForRatchet).mockResolvedValue(workspaces);
+            vi.mocked(workspaceRatchetService.findCandidates).mockResolvedValue(workspaces);
             let finishCleanup;
             const cleanupBarrier = new Promise((resolve) => {
                 finishCleanup = resolve;
@@ -2103,8 +2296,8 @@ describe('ratchet service (state-change + idle dispatch)', () => {
                 makeWorkspace('batch-blocker-3'),
             ];
             const directWorkspace = makeWorkspace('direct-target');
-            vi.mocked(workspaceAccessor.findWithPRsForRatchet).mockResolvedValue(batchWorkspaces);
-            vi.mocked(workspaceAccessor.findForRatchetById).mockResolvedValue(directWorkspace);
+            vi.mocked(workspaceRatchetService.findCandidates).mockResolvedValue(batchWorkspaces);
+            vi.mocked(workspaceRatchetService.findCandidateById).mockResolvedValue(directWorkspace);
             let releaseBatch;
             const batchBarrier = new Promise((resolve) => {
                 releaseBatch = resolve;
@@ -2138,7 +2331,7 @@ describe('ratchet service (state-change + idle dispatch)', () => {
     describe('decideRatchetAction edge cases', () => {
         const callDecide = (context) => unsafeCoerce(ratchetService).decideRatchetAction(context);
         const arrangeOtherWorkingSession = () => {
-            vi.mocked(agentSessionAccessor.findByWorkspaceId).mockResolvedValue([
+            vi.mocked(mockSessionBridge.findSessionsByWorkspaceId).mockResolvedValue([
                 { id: 'other-session' },
             ]);
             vi.mocked(mockSessionBridge.isSessionWorking).mockReturnValue(true);
@@ -2268,7 +2461,7 @@ describe('ratchet service (state-change + idle dispatch)', () => {
             expect(result).toEqual({ kind: 'none' });
         });
         it('settles a non-RUNNING session as COMPLETED when its status is not FAILED', async () => {
-            vi.mocked(agentSessionAccessor.findById).mockResolvedValue({
+            vi.mocked(mockSessionBridge.findSessionById).mockResolvedValue({
                 id: 'completed-session',
                 provider: 'CLAUDE',
                 status: SessionStatus.IDLE,
@@ -2278,10 +2471,10 @@ describe('ratchet service (state-change + idle dispatch)', () => {
                 ratchetActiveSessionId: 'completed-session',
             });
             expect(result).toEqual({ kind: 'settled', outcome: 'COMPLETED' });
-            expect(workspaceAccessor.recordRatchetSessionEnd).toHaveBeenCalledWith('ws-3', 'completed-session', 'COMPLETED');
+            expect(mockWorkspaceBridge.recordSessionEnd).toHaveBeenCalledWith('ws-3', 'completed-session', 'COMPLETED');
         });
         it('settles a FAILED session as DIED', async () => {
-            vi.mocked(agentSessionAccessor.findById).mockResolvedValue({
+            vi.mocked(mockSessionBridge.findSessionById).mockResolvedValue({
                 id: 'failed-session',
                 provider: 'CLAUDE',
                 status: SessionStatus.FAILED,
@@ -2291,10 +2484,10 @@ describe('ratchet service (state-change + idle dispatch)', () => {
                 ratchetActiveSessionId: 'failed-session',
             });
             expect(result).toEqual({ kind: 'settled', outcome: 'DIED' });
-            expect(workspaceAccessor.recordRatchetSessionEnd).toHaveBeenCalledWith('ws-4', 'failed-session', 'DIED');
+            expect(mockWorkspaceBridge.recordSessionEnd).toHaveBeenCalledWith('ws-4', 'failed-session', 'DIED');
         });
         it('settles a provider-mismatched session as DIED and stops it', async () => {
-            vi.mocked(agentSessionAccessor.findById).mockResolvedValue({
+            vi.mocked(mockSessionBridge.findSessionById).mockResolvedValue({
                 id: 'codex-session',
                 provider: 'CODEX',
                 status: SessionStatus.RUNNING,
@@ -2307,11 +2500,11 @@ describe('ratchet service (state-change + idle dispatch)', () => {
                 ratchetSessionProvider: 'WORKSPACE_DEFAULT',
             });
             expect(result).toEqual({ kind: 'settled', outcome: 'DIED' });
-            expect(workspaceAccessor.recordRatchetSessionEnd).toHaveBeenCalledWith('ws-5', 'codex-session', 'DIED');
+            expect(mockWorkspaceBridge.recordSessionEnd).toHaveBeenCalledWith('ws-5', 'codex-session', 'DIED');
             expect(mockSessionBridge.stopSession).toHaveBeenCalledWith('codex-session');
         });
         it('returns the active fixer when the session is working', async () => {
-            vi.mocked(agentSessionAccessor.findById).mockResolvedValue({
+            vi.mocked(mockSessionBridge.findSessionById).mockResolvedValue({
                 id: 'working-session',
                 provider: 'CLAUDE',
                 status: SessionStatus.RUNNING,
@@ -2326,28 +2519,111 @@ describe('ratchet service (state-change + idle dispatch)', () => {
                 kind: 'active',
                 action: { type: 'FIXER_ACTIVE', sessionId: 'working-session' },
             });
-            expect(workspaceAccessor.recordRatchetSessionEnd).not.toHaveBeenCalled();
+            expect(mockWorkspaceBridge.recordSessionEnd).not.toHaveBeenCalled();
         });
         it('does not settle or stop a fixer after cancellation during session lookup', async () => {
             const controller = new AbortController();
             const timeoutError = new Error('Workspace check timed out');
             let finishLookup;
-            vi.mocked(agentSessionAccessor.findById).mockImplementation(() => new Promise((resolve) => {
+            vi.mocked(mockSessionBridge.findSessionById).mockImplementation(() => new Promise((resolve) => {
                 finishLookup = resolve;
             }));
             const check = unsafeCoerce(ratchetService).checkActiveFixerSession({
                 id: 'ws-cancelled-active-check',
                 ratchetActiveSessionId: 'session-1',
             }, controller.signal);
-            await vi.waitFor(() => expect(agentSessionAccessor.findById).toHaveBeenCalled());
+            await vi.waitFor(() => expect(mockSessionBridge.findSessionById).toHaveBeenCalled());
             controller.abort(timeoutError);
             finishLookup(null);
             await expect(check).rejects.toBe(timeoutError);
-            expect(workspaceAccessor.recordRatchetSessionEnd).not.toHaveBeenCalled();
+            expect(mockWorkspaceBridge.recordSessionEnd).not.toHaveBeenCalled();
             expect(mockSessionBridge.stopSession).not.toHaveBeenCalled();
         });
+        it('publishes a successful fallback settlement before observing post-write cancellation', async () => {
+            const controller = new AbortController();
+            const timeoutError = new Error('Workspace check timed out');
+            vi.mocked(mockSessionBridge.findSessionById).mockResolvedValue(null);
+            vi.mocked(mockWorkspaceBridge.recordSessionEnd).mockImplementation(() => {
+                controller.abort(timeoutError);
+                return Promise.resolve(true);
+            });
+            const events = [];
+            ratchetService.on(RATCHET_DISPATCH_CHANGED, (event) => {
+                events.push(event);
+            });
+            const check = unsafeCoerce(ratchetService).checkActiveFixerSession({
+                id: 'ws-cancelled-after-settlement',
+                ratchetActiveSessionId: 'session-1',
+                ratchetDispatchRetryCount: 2,
+            }, controller.signal);
+            await expect(check).rejects.toBe(timeoutError);
+            expect(events).toEqual([{ workspaceId: 'ws-cancelled-after-settlement' }]);
+        });
     });
     describe('triggerFixer error handling', () => {
+        it('commits the workspace check as soon as the fixer session starts', async () => {
+            const commitSideEffects = vi.fn();
+            vi.mocked(fixerSessionService.acquireAndDispatch).mockImplementation(async (input) => {
+                await input.afterStart?.({ sessionId: 'started-session', prompt: 'prompt' });
+                return {
+                    status: 'started',
+                    sessionId: 'started-session',
+                    promptSent: true,
+                };
+            });
+            const result = await unsafeCoerce(ratchetService).triggerFixer({
+                id: 'ws-started-dispatch',
+                prUrl: 'https://github.com/example/repo/pull/20',
+            }, {
+                ciStatus: CIStatus.FAILURE,
+                snapshotKey: 'failed:20',
+                prNumber: 20,
+                reviewComments: [],
+                hasMergeConflict: false,
+            }, 0, new AbortController().signal, commitSideEffects);
+            expect(result).toMatchObject({
+                type: 'TRIGGERED_FIXER',
+                sessionId: 'started-session',
+            });
+            expect(commitSideEffects).toHaveBeenCalledTimes(2);
+        });
+        it('cleans up a fixer when cancellation races with session startup', async () => {
+            const controller = new AbortController();
+            const timeoutError = new Error('Workspace check timed out');
+            const commitSideEffects = vi.fn();
+            vi.mocked(fixerSessionService.acquireAndDispatch).mockImplementation(async (input) => {
+                controller.abort(timeoutError);
+                try {
+                    await input.afterStart?.({ sessionId: 'cancelled-startup-session', prompt: 'prompt' });
+                    return {
+                        status: 'started',
+                        sessionId: 'cancelled-startup-session',
+                        promptSent: true,
+                    };
+                }
+                catch (error) {
+                    return {
+                        status: 'error',
+                        error: error instanceof Error ? error.message : String(error),
+                    };
+                }
+            });
+            vi.mocked(mockSessionBridge.isSessionRunning).mockReturnValue(true);
+            const trigger = unsafeCoerce(ratchetService).triggerFixer({
+                id: 'ws-cancelled-startup',
+                prUrl: 'https://github.com/example/repo/pull/20',
+            }, {
+                ciStatus: CIStatus.FAILURE,
+                snapshotKey: 'failed:20',
+                prNumber: 20,
+                reviewComments: [],
+                hasMergeConflict: false,
+            }, 0, controller.signal, commitSideEffects);
+            await expect(trigger).rejects.toBe(timeoutError);
+            expect(commitSideEffects).toHaveBeenCalledTimes(1);
+            expect(workspaceRatchetService.recordSessionEnd).toHaveBeenCalledWith('ws-cancelled-startup', 'cancelled-startup-session', 'COMPLETED');
+            expect(mockSessionBridge.stopSession).toHaveBeenCalledWith('cancelled-startup-session');
+        });
         it('does not clean up a fixer after its dispatch record is persisted', async () => {
             const controller = new AbortController();
             const timeoutError = new Error('Workspace check timed out');
@@ -2357,11 +2633,15 @@ describe('ratchet service (state-change + idle dispatch)', () => {
                 sessionId: 'cancelled-session',
                 promptSent: true,
             });
-            vi.mocked(workspaceAccessor.recordRatchetDispatchIfEnabled).mockImplementation(() => new Promise((resolve) => {
+            vi.mocked(workspaceRatchetService.recordDispatchIfEnabled).mockImplementation(() => new Promise((resolve) => {
                 finishRecord = resolve;
             }));
             vi.mocked(mockSessionBridge.isSessionRunning).mockReturnValue(true);
             const commitSideEffects = vi.fn();
+            const events = [];
+            ratchetService.on(RATCHET_DISPATCH_CHANGED, (event) => {
+                events.push(event);
+            });
             const trigger = unsafeCoerce(ratchetService).triggerFixer({
                 id: 'ws-cancelled-dispatch',
                 prUrl: 'https://github.com/example/repo/pull/20',
@@ -2372,22 +2652,134 @@ describe('ratchet service (state-change + idle dispatch)', () => {
                 reviewComments: [],
                 hasMergeConflict: false,
             }, 0, controller.signal, commitSideEffects);
-            await vi.waitFor(() => expect(workspaceAccessor.recordRatchetDispatchIfEnabled).toHaveBeenCalled());
+            await vi.waitFor(() => expect(workspaceRatchetService.recordDispatchIfEnabled).toHaveBeenCalled());
             controller.abort(timeoutError);
             finishRecord(true);
             await expect(trigger).rejects.toBe(timeoutError);
             expect(commitSideEffects).toHaveBeenCalledTimes(1);
-            expect(workspaceAccessor.recordRatchetSessionEnd).not.toHaveBeenCalled();
+            expect(workspaceRatchetService.recordSessionEnd).not.toHaveBeenCalled();
+            expect(mockSessionBridge.stopSession).not.toHaveBeenCalled();
+            expect(events).toEqual([{ workspaceId: 'ws-cancelled-dispatch' }]);
+        });
+        it('persists and commits a dispatch while prompt completion is pending', async () => {
+            let finishPrompt;
+            const promptCompletion = new Promise((resolve) => {
+                finishPrompt = resolve;
+            });
+            let finishRecord;
+            vi.mocked(fixerSessionService.acquireAndDispatch).mockResolvedValue({
+                status: 'started',
+                sessionId: 'pending-prompt-session',
+                promptSent: true,
+                promptCompletion,
+            });
+            vi.mocked(workspaceRatchetService.recordDispatchIfEnabled).mockImplementation(() => new Promise((resolve) => {
+                finishRecord = resolve;
+            }));
+            const commitSideEffects = vi.fn();
+            const trigger = unsafeCoerce(ratchetService).triggerFixer({
+                id: 'ws-pending-prompt',
+                prUrl: 'https://github.com/example/repo/pull/20',
+            }, {
+                ciStatus: CIStatus.FAILURE,
+                snapshotKey: 'failed:20',
+                prNumber: 20,
+                reviewComments: [],
+                hasMergeConflict: false,
+            }, 0, new AbortController().signal, commitSideEffects);
+            await vi.waitFor(() => expect(workspaceRatchetService.recordDispatchIfEnabled).toHaveBeenCalled());
+            expect(commitSideEffects).toHaveBeenCalledTimes(1);
+            finishRecord(true);
+            await expect(trigger).resolves.toMatchObject({ type: 'TRIGGERED_FIXER' });
+            expect(commitSideEffects).toHaveBeenCalledTimes(1);
+            finishPrompt(true);
+            await promptCompletion;
+        });
+        it('settles a persisted dispatch as died when prompt completion fails', async () => {
+            vi.mocked(fixerSessionService.acquireAndDispatch).mockResolvedValue({
+                status: 'started',
+                sessionId: 'failed-prompt-session',
+                promptSent: true,
+                promptCompletion: Promise.resolve(false),
+            });
+            vi.mocked(mockSessionBridge.isSessionRunning).mockReturnValue(true);
+            const result = await unsafeCoerce(ratchetService).triggerFixer({
+                id: 'ws-failed-prompt',
+                prUrl: 'https://github.com/example/repo/pull/20',
+            }, {
+                ciStatus: CIStatus.FAILURE,
+                snapshotKey: 'failed:20',
+                prNumber: 20,
+                reviewComments: [],
+                hasMergeConflict: false,
+            }, 0);
+            expect(result).toMatchObject({ type: 'TRIGGERED_FIXER' });
+            await vi.waitFor(() => expect(workspaceRatchetService.recordSessionEnd).toHaveBeenCalledWith('ws-failed-prompt', 'failed-prompt-session', 'DIED'));
+            expect(mockSessionBridge.stopSession).toHaveBeenCalledWith('failed-prompt-session');
+        });
+        it('does not stop a newer active session when an old prompt completion fails', async () => {
+            vi.mocked(fixerSessionService.acquireAndDispatch).mockResolvedValue({
+                status: 'started',
+                sessionId: 'stale-prompt-session',
+                promptSent: true,
+                promptCompletion: Promise.resolve(false),
+            });
+            vi.mocked(workspaceRatchetService.recordSessionEnd).mockResolvedValue(false);
+            vi.mocked(mockSessionBridge.isSessionRunning).mockReturnValue(true);
+            await unsafeCoerce(ratchetService).triggerFixer({
+                id: 'ws-replaced-prompt',
+                prUrl: 'https://github.com/example/repo/pull/20',
+            }, {
+                ciStatus: CIStatus.FAILURE,
+                snapshotKey: 'failed:20',
+                prNumber: 20,
+                reviewComments: [],
+                hasMergeConflict: false,
+            }, 0);
+            await vi.waitFor(() => expect(workspaceRatchetService.recordSessionEnd).toHaveBeenCalled());
             expect(mockSessionBridge.stopSession).not.toHaveBeenCalled();
         });
+        it('cleans up a fixer through prompt failure after its dispatch record is persisted', async () => {
+            const controller = new AbortController();
+            const timeoutError = new Error('Workspace check timed out');
+            let finishRecord;
+            vi.mocked(fixerSessionService.acquireAndDispatch).mockResolvedValue({
+                status: 'started',
+                sessionId: 'cancelled-session',
+                promptSent: true,
+                promptCompletion: Promise.resolve(false),
+            });
+            vi.mocked(workspaceRatchetService.recordDispatchIfEnabled).mockImplementation(() => new Promise((resolve) => {
+                finishRecord = resolve;
+            }));
+            vi.mocked(mockSessionBridge.isSessionRunning).mockReturnValue(true);
+            const commitSideEffects = vi.fn();
+            const trigger = unsafeCoerce(ratchetService).triggerFixer({
+                id: 'ws-cancelled-dispatch',
+                prUrl: 'https://github.com/example/repo/pull/20',
+            }, {
+                ciStatus: CIStatus.FAILURE,
+                snapshotKey: 'failed:20',
+                prNumber: 20,
+                reviewComments: [],
+                hasMergeConflict: false,
+            }, 0, controller.signal, commitSideEffects);
+            await vi.waitFor(() => expect(workspaceRatchetService.recordDispatchIfEnabled).toHaveBeenCalled());
+            controller.abort(timeoutError);
+            finishRecord(true);
+            await expect(trigger).rejects.toBe(timeoutError);
+            expect(commitSideEffects).toHaveBeenCalledTimes(1);
+            await vi.waitFor(() => expect(workspaceRatchetService.recordSessionEnd).toHaveBeenCalledWith('ws-cancelled-dispatch', 'cancelled-session', 'DIED'));
+            expect(mockSessionBridge.stopSession).toHaveBeenCalledWith('cancelled-session');
+        });
         it('cleans up a started fixer when dispatch persistence fails', async () => {
             vi.mocked(fixerSessionService.acquireAndDispatch).mockResolvedValue({
                 status: 'started',
                 sessionId: 'unrecorded-session',
                 promptSent: true,
             });
-            vi.mocked(workspaceAccessor.recordRatchetDispatchIfEnabled).mockRejectedValue(new Error('dispatch record write failed'));
-            vi.mocked(workspaceAccessor.recordRatchetSessionEnd).mockRejectedValue(new Error('dispatch cleanup write failed'));
+            vi.mocked(workspaceRatchetService.recordDispatchIfEnabled).mockRejectedValue(new Error('dispatch record write failed'));
+            vi.mocked(workspaceRatchetService.recordSessionEnd).mockRejectedValue(new Error('dispatch cleanup write failed'));
             vi.mocked(mockSessionBridge.isSessionRunning).mockReturnValue(true);
             const commitSideEffects = vi.fn();
             const result = await unsafeCoerce(ratchetService).triggerFixer({
@@ -2402,7 +2794,7 @@ describe('ratchet service (state-change + idle dispatch)', () => {
             }, 0, new AbortController().signal, commitSideEffects);
             expect(result).toMatchObject({ type: 'ERROR', error: 'dispatch record write failed' });
             expect(commitSideEffects).toHaveBeenCalledTimes(1);
-            expect(workspaceAccessor.recordRatchetSessionEnd).toHaveBeenCalledWith('ws-unrecorded-dispatch', 'unrecorded-session', 'COMPLETED');
+            expect(workspaceRatchetService.recordSessionEnd).toHaveBeenCalledWith('ws-unrecorded-dispatch', 'unrecorded-session', 'COMPLETED');
             expect(mockSessionBridge.stopSession).toHaveBeenCalledWith('unrecorded-session');
         });
         it('handles acquireAndDispatch throwing an error', async () => {
@@ -2439,13 +2831,16 @@ describe('ratchet service (state-change + idle dispatch)', () => {
                 ratchetLastCiRunId: null,
                 prReviewLastCheckedAt: null,
                 ratchetDispatchOutcome: null,
-                ratchetDispatchRetryCount: 0,
+                ratchetDispatchRetryCount: 2,
             };
             vi.mocked(fixerSessionService.acquireAndDispatch).mockResolvedValue({
                 status: 'already_active',
                 sessionId: 'existing-session',
             });
-            vi.mocked(workspaceAccessor.update).mockResolvedValue({});
+            const events = [];
+            ratchetService.on(RATCHET_DISPATCH_CHANGED, (event) => {
+                events.push(event);
+            });
             const result = await unsafeCoerce(ratchetService).triggerFixer(workspace, {
                 ciStatus: CIStatus.FAILURE,
                 prNumber: 21,
@@ -2454,8 +2849,9 @@ describe('ratchet service (state-change + idle dispatch)', () => {
                 type: 'FIXER_ACTIVE',
                 sessionId: 'existing-session',
             });
-            expect(workspaceAccessor.adoptRatchetActiveSessionIfEnabled).toHaveBeenCalledWith('ws-already-active', 'existing-session');
-            expect(workspaceAccessor.recordRatchetDispatchIfEnabled).not.toHaveBeenCalled();
+            expect(workspaceRatchetService.adoptActiveSessionIfEnabled).toHaveBeenCalledWith('ws-already-active', 'existing-session');
+            expect(workspaceRatchetService.recordDispatchIfEnabled).not.toHaveBeenCalled();
+            expect(events).toEqual([{ workspaceId: 'ws-already-active' }]);
         });
         it('stops already-active fixer when active-session recording loses disable race', async () => {
             const workspace = {
@@ -2474,7 +2870,7 @@ describe('ratchet service (state-change + idle dispatch)', () => {
                 status: 'already_active',
                 sessionId: 'existing-session',
             });
-            vi.mocked(workspaceAccessor.adoptRatchetActiveSessionIfEnabled).mockResolvedValue(false);
+            vi.mocked(workspaceRatchetService.adoptActiveSessionIfEnabled).mockResolvedValue(false);
             vi.mocked(mockSessionBridge.isSessionRunning).mockReturnValue(true);
             const result = await unsafeCoerce(ratchetService).triggerFixer(workspace, {
                 ciStatus: CIStatus.FAILURE,
@@ -2518,12 +2914,13 @@ describe('ratchet service (state-change + idle dispatch)', () => {
             ratchetService.removeAllListeners();
         });
         it('emits ratchet_toggled when enabling workspace ratcheting', async () => {
-            vi.mocked(workspaceAccessor.findById).mockResolvedValue({
+            vi.mocked(workspaceDataService.findById).mockResolvedValue({
                 id: 'ws-enable',
                 ratchetState: RatchetState.CI_FAILED,
                 ratchetActiveSessionId: null,
+                ratchetDispatchOutcome: 'DIED',
+                ratchetDispatchRetryCount: 2,
             });
-            vi.mocked(workspaceAccessor.update).mockResolvedValue({});
             const toggledEvents = [];
             const stateEvents = [];
             ratchetService.on(RATCHET_TOGGLED, (event) => {
@@ -2533,7 +2930,7 @@ describe('ratchet service (state-change + idle dispatch)', () => {
                 stateEvents.push(event);
             });
             await ratchetService.setWorkspaceRatcheting('ws-enable', true);
-            expect(workspaceAccessor.update).toHaveBeenCalledWith('ws-enable', { ratchetEnabled: true });
+            expect(workspaceRatchetService.enable).toHaveBeenCalledWith('ws-enable');
             expect(toggledEvents).toEqual([
                 {
                     workspaceId: 'ws-enable',
@@ -2544,12 +2941,11 @@ describe('ratchet service (state-change + idle dispatch)', () => {
             expect(stateEvents).toHaveLength(0);
         });
         it('emits ratchet_toggled and ratchet_state_changed when disabling non-idle workspace', async () => {
-            vi.mocked(workspaceAccessor.findById).mockResolvedValue({
+            vi.mocked(workspaceDataService.findById).mockResolvedValue({
                 id: 'ws-disable',
                 ratchetState: RatchetState.CI_RUNNING,
                 ratchetActiveSessionId: null,
             });
-            vi.mocked(workspaceAccessor.update).mockResolvedValue({});
             const toggledEvents = [];
             const stateEvents = [];
             ratchetService.on(RATCHET_TOGGLED, (event) => {
@@ -2559,14 +2955,7 @@ describe('ratchet service (state-change + idle dispatch)', () => {
                 stateEvents.push(event);
             });
             await ratchetService.setWorkspaceRatcheting('ws-disable', false);
-            expect(workspaceAccessor.update).toHaveBeenCalledWith('ws-disable', {
-                ratchetEnabled: false,
-                ratchetState: RatchetState.IDLE,
-                ratchetActiveSessionId: null,
-                ratchetLastCiRunId: null,
-                ratchetDispatchOutcome: null,
-                ratchetDispatchRetryCount: 0,
-            });
+            expect(workspaceRatchetService.disable).toHaveBeenCalledWith('ws-disable');
             expect(stateEvents).toEqual([
                 {
                     workspaceId: 'ws-disable',
@@ -2583,12 +2972,11 @@ describe('ratchet service (state-change + idle dispatch)', () => {
             ]);
         });
         it('stops ratchet workflow sessions found after disabling workspace', async () => {
-            vi.mocked(workspaceAccessor.findById).mockResolvedValue({
+            vi.mocked(workspaceDataService.findById).mockResolvedValue({
                 id: 'ws-disable-raced-session',
                 ratchetState: RatchetState.CI_RUNNING,
                 ratchetActiveSessionId: null,
             });
-            vi.mocked(workspaceAccessor.update).mockResolvedValue({});
             vi.mocked(mockSessionBridge.findSessionsByWorkspaceId).mockResolvedValue([
                 {
                     id: 'raced-ratchet-session',
@@ -2625,7 +3013,6 @@ describe('ratchet service (state-change + idle dispatch)', () => {
                 ratchetDispatchOutcome: null,
                 ratchetDispatchRetryCount: 0,
             };
-            vi.mocked(workspaceAccessor.update).mockResolvedValue({});
             const events = [];
             ratchetService.on(RATCHET_STATE_CHANGED, (event) => {
                 events.push(event);
@@ -2651,7 +3038,6 @@ describe('ratchet service (state-change + idle dispatch)', () => {
                 ratchetDispatchOutcome: null,
                 ratchetDispatchRetryCount: 0,
             };
-            vi.mocked(workspaceAccessor.update).mockResolvedValue({});
             const events = [];
             ratchetService.on(RATCHET_STATE_CHANGED, (event) => {
                 events.push(event);
@@ -2681,8 +3067,7 @@ describe('ratchet service (state-change + idle dispatch)', () => {
                 prState: 'OPEN',
                 prNumber: 32,
             });
-            vi.mocked(workspaceAccessor.update).mockResolvedValue({});
-            vi.mocked(agentSessionAccessor.findByWorkspaceId).mockResolvedValue([]);
+            vi.mocked(mockSessionBridge.findSessionsByWorkspaceId).mockResolvedValue([]);
             vi.mocked(fixerSessionService.acquireAndDispatch).mockResolvedValue({
                 status: 'started',
                 sessionId: 'ratchet-session-32',
@@ -2723,8 +3108,7 @@ describe('ratchet service (state-change + idle dispatch)', () => {
                 prState: 'OPEN',
                 prNumber: 33,
             });
-            vi.mocked(workspaceAccessor.update).mockResolvedValue({});
-            vi.mocked(agentSessionAccessor.findByWorkspaceId).mockResolvedValue([]);
+            vi.mocked(mockSessionBridge.findSessionsByWorkspaceId).mockResolvedValue([]);
             vi.mocked(fixerSessionService.acquireAndDispatch).mockResolvedValue({
                 status: 'started',
                 sessionId: 'ratchet-session-33',
@@ -2751,7 +3135,6 @@ describe('ratchet service (state-change + idle dispatch)', () => {
                 ratchetDispatchRetryCount: 0,
             };
             vi.spyOn(unsafeCoerce(ratchetService), 'fetchPRState').mockResolvedValue(null);
-            vi.mocked(workspaceAccessor.update).mockResolvedValue({});
             const events = [];
             ratchetService.on(RATCHET_STATE_CHANGED, (event) => {
                 events.push(event);