Refactor paired runtime orchestration

src/message-agent-executor.test.ts

@@ -200,6 +200,7 @@ import * as db from './db.js';
 import { logger } from './logger.js';
 import { buildRoomMemoryBriefing } from './sqlite-memory-store.js';
 import { runAgentForGroup } from './message-agent-executor.js';
+import { resetPairedFollowUpScheduleState } from './paired-follow-up-scheduler.js';
 import * as pairedExecutionContext from './paired-execution-context.js';
 import * as sessionRecovery from './session-recovery.js';
 import * as serviceRouting from './service-routing.js';
@@ -238,6 +239,7 @@ const ORIGINAL_UNSAFE_HOST_PAIRED_MODE =
 describe('runAgentForGroup room memory', () => {
   beforeEach(() => {
     vi.resetAllMocks();
+    resetPairedFollowUpScheduleState();
     delete process.env.EJCLAW_UNSAFE_HOST_PAIRED_MODE;
     vi.mocked(agentRunner.runAgentProcess).mockImplementation(
       async (_group, _input, _onProcess, onOutput) => {
@@ -984,6 +986,9 @@ describe('runAgentForGroup room memory', () => {
       summary:
         'Review snapshot is stale after owner changes. Retry the review once to refresh against the latest owner workspace.',
     });
+    expect(
+      pairedExecutionContext.completePairedExecutionContext,
+    ).toHaveBeenCalledTimes(1);
   });
 
   it('uses the role plan for reviewer execution while keeping task snapshots on the owner agent', async () => {
@@ -1769,11 +1774,107 @@ describe('runAgentForGroup room memory', () => {
     expect(result).toBe('error');
     expect(deps.queue.enqueueMessageCheck).toHaveBeenCalledWith('group@test');
   });
+
+  it('does not re-enqueue the same review_ready follow-up twice in one run', async () => {
+    const group = { ...makeGroup(), folder: 'test-group' };
+    const deps = makeDeps();
+
+    vi.mocked(serviceRouting.getEffectiveChannelLease).mockReturnValue({
+      chat_jid: 'group@test',
+      owner_agent_type: 'claude-code',
+      reviewer_agent_type: 'claude-code',
+      arbiter_agent_type: null,
+      owner_service_id: 'claude',
+      reviewer_service_id: 'claude',
+      arbiter_service_id: null,
+      activated_at: null,
+      reason: null,
+      explicit: false,
+    });
+    vi.mocked(
+      pairedExecutionContext.preparePairedExecutionContext,
+    ).mockReturnValue({
+      task: {
+        id: 'paired-task-review-ready-dedup',
+        chat_jid: 'group@test',
+        group_folder: 'test-group',
+        owner_service_id: 'claude',
+        reviewer_service_id: 'claude',
+        title: null,
+        source_ref: 'HEAD',
+        plan_notes: null,
+        round_trip_count: 1,
+        review_requested_at: '2026-03-31T00:00:00.000Z',
+        status: 'in_review',
+        arbiter_verdict: null,
+        arbiter_requested_at: null,
+        completion_reason: null,
+        created_at: '2026-03-31T00:00:00.000Z',
+        updated_at: '2026-03-31T00:00:00.000Z',
+      },
+      workspace: null,
+      envOverrides: {},
+    });
+    vi.mocked(db.getPairedTaskById).mockReturnValue({
+      id: 'paired-task-review-ready-dedup',
+      chat_jid: 'group@test',
+      group_folder: 'test-group',
+      owner_service_id: 'claude',
+      reviewer_service_id: 'claude',
+      title: null,
+      source_ref: 'HEAD',
+      plan_notes: null,
+      round_trip_count: 1,
+      review_requested_at: '2026-03-31T00:00:00.000Z',
+      status: 'review_ready',
+      arbiter_verdict: null,
+      arbiter_requested_at: null,
+      completion_reason: null,
+      created_at: '2026-03-31T00:00:00.000Z',
+      updated_at: '2026-03-31T00:00:00.000Z',
+    });
+    vi.mocked(agentRunner.runAgentProcess).mockResolvedValue({
+      status: 'error',
+      result: null,
+      error: 'SDK crashed with exit code 1',
+    });
+
+    await runAgentForGroup(deps, {
+      group,
+      prompt: 'please review',
+      chatJid: 'group@test',
+      runId: 'run-review-ready-requeue-dedup',
+      forcedRole: 'reviewer',
+      onOutput: async () => {},
+    });
+    await runAgentForGroup(deps, {
+      group,
+      prompt: 'please review',
+      chatJid: 'group@test',
+      runId: 'run-review-ready-requeue-dedup',
+      forcedRole: 'reviewer',
+      onOutput: async () => {},
+    });
+
+    expect(deps.queue.enqueueMessageCheck).toHaveBeenCalledTimes(1);
+    expect(logger.info).toHaveBeenCalledWith(
+      expect.objectContaining({
+        taskId: 'paired-task-review-ready-dedup',
+        role: 'reviewer',
+        pairedExecutionStatus: 'failed',
+        taskStatus: 'review_ready',
+        intentKind: 'reviewer-turn',
+        scheduled: false,
+      }),
+      'Skipped duplicate paired follow-up after failed reviewer/arbiter execution in the same run',
+    );
+  });
 });
 
 describe('runAgentForGroup Claude rotation', () => {
   beforeEach(() => {
     vi.resetAllMocks();
+    resetPairedFollowUpScheduleState();
     vi.mocked(buildRoomMemoryBriefing).mockResolvedValue(undefined);
     vi.mocked(tokenRotation.getTokenCount).mockReturnValue(1);
     vi.mocked(tokenRotation.getCurrentTokenIndex).mockReturnValue(0);
@@ -2585,6 +2686,7 @@ describe('runAgentForGroup Claude rotation', () => {
 describe('runAgentForGroup Codex rotation', () => {
   beforeEach(() => {
     vi.resetAllMocks();
+    resetPairedFollowUpScheduleState();
     vi.mocked(buildRoomMemoryBriefing).mockResolvedValue(undefined);
     vi.mocked(codexTokenRotation.getCodexAccountCount).mockReturnValue(2);
     vi.mocked(codexTokenRotation.rotateCodexToken).mockReturnValueOnce(true);