Merge fix-supervisor-loop

Author: nigel-dev

src/lib/orchestrator.ts

@@ -166,6 +166,7 @@ export class Orchestrator {
   private toastCallback: ToastCallback | null = null;
   private notifyCallback: NotifyCallback | null = null;
   private jobsLaunchedCount = 0;
+  private approvedForMerge = new Set<string>();
   private firstJobCompleted = false;
 
   private getMergeTrainConfig(): {
@@ -280,10 +281,20 @@ export class Orchestrator {
         `Checkpoint mismatch: expected "${this.checkpoint}", got "${checkpoint}"`,
       );
     }
+    const wasPreMerge = this.checkpoint === 'pre_merge';
     this.checkpoint = null;
 
     const plan = await loadPlan();
     if (plan && plan.status === 'paused') {
+      // Track jobs approved for merge so reconciler doesn't re-checkpoint them
+      if (wasPreMerge) {
+        for (const job of plan.jobs) {
+          if (job.status === 'ready_to_merge') {
+            this.approvedForMerge.add(job.name);
+          }
+        }
+      }
+
       plan.status = 'running';
       plan.checkpoint = null;
       await savePlan(plan);
@@ -483,7 +494,7 @@ export class Orchestrator {
           continue;
         }
 
-        if (this.isSupervisor(plan)) {
+        if (this.isSupervisor(plan) && !this.approvedForMerge.has(job.name)) {
           await this.setCheckpoint('pre_merge', plan);
           return;
         }
@@ -492,6 +503,7 @@ export class Orchestrator {
         this.mergeTrain.enqueue(job);
         await updatePlanJob(plan.id, job.name, { status: 'merging' });
         job.status = 'merging';
+        this.approvedForMerge.delete(job.name);
       }
 
       if (this.mergeTrain && this.mergeTrain.getQueue().length > 0) {

tests/lib/orchestrator-modes.test.ts

@@ -388,6 +388,53 @@ describe('orchestrator modes', () => {
       expect(orchestrator.clearCheckpoint('pre_pr')).rejects.toThrow('Checkpoint mismatch');
     });
 
+    it('does not re-checkpoint after pre_merge approval', async () => {
+      planState = makePlan({
+        mode: 'supervisor',
+        status: 'running',
+        jobs: [
+          makeJob('merge-me', { status: 'completed', mergeOrder: 0, branch: 'mc/merge-me' }),
+        ],
+      });
+
+      const fakeTrain = {
+        queue: [] as JobSpec[],
+        enqueue(job: JobSpec) {
+          this.queue.push(job);
+        },
+        getQueue() {
+          return [...this.queue];
+        },
+        async processNext() {
+          this.queue.shift();
+          return { success: true, mergedAt: '2026-01-02T00:00:00.000Z' };
+        },
+      };
+
+      const orchestrator = new Orchestrator(monitor as any, DEFAULT_CONFIG as any, toastCallback);
+
+      // First reconcile: job transitions completed -> ready_to_merge, then supervisor checkpoints
+      await (orchestrator as any).reconcile();
+      expect(orchestrator.getCheckpoint()).toBe('pre_merge');
+      expect(planState?.status).toBe('paused');
+
+      // Inject fake merge train before clearing so the auto-reconcile uses it
+      (orchestrator as any).mergeTrain = fakeTrain;
+
+      // Simulate mc_plan_approve clearing the checkpoint
+      await orchestrator.clearCheckpoint('pre_merge');
+      expect(orchestrator.getCheckpoint()).toBeNull();
+      expect(planState?.status).toBe('running');
+
+      // Wait for the auto-reconcile triggered by clearCheckpoint/startReconciler
+      await new Promise((resolve) => setTimeout(resolve, 50));
+
+      // Job should have moved to merging (enqueued in merge train) and then merged
+      expect(orchestrator.getCheckpoint()).not.toBe('pre_merge');
+      const mergeJob = planState?.jobs.find(j => j.name === 'merge-me');
+      expect(mergeJob?.status).toBe('merged');
+    });
+
     it('sends checkpoint toast notifications', async () => {
       planState = makePlan({
         mode: 'supervisor',