Drain doctor-fix queued publishes

Co-authored-by: Andrew <andrewxhill@gmail.com>

Author: andrewxhill-ai

internal/app/repo.go

@@ -1106,6 +1106,7 @@ func runDoctorFix(ctx context.Context, engine git.Engine, cfg policy.File, lockM
 	var applied []string
 	var skipped []string
 	protectedWorktreeCleanForPublish := false
+	queuedProtectedTipPublish := false
 
 	staleLocks, err := lockManager.InspectStale(time.Hour)
 	if err != nil {
@@ -1271,11 +1272,31 @@ func runDoctorFix(ctx context.Context, engine git.Engine, cfg policy.File, lockM
 					}
 					if created {
 						applied = append(applied, fmt.Sprintf("queued publish request %d for protected tip %s", request.ID, protectedSHA))
+						queuedProtectedTipPublish = true
 					}
 				}
 			}
 		}
 	}
+
+	if queuedProtectedTipPublish {
+		publishLease, err := lockManager.Acquire(state.PublishLock, "doctor-fix")
+		if err == nil {
+			result, processErr := processPublishRequest(ctx, store, repoRecord, cfg, publishLease)
+			releaseErr := publishLease.Release()
+			if processErr != nil {
+				return nil, nil, processErr
+			}
+			if releaseErr != nil {
+				return nil, nil, releaseErr
+			}
+			applied = append(applied, result)
+		} else if errors.Is(err, state.ErrLockHeld) {
+			skipped = append(skipped, "left queued publish in place because the publish worker is already active")
+		} else {
+			return nil, nil, err
+		}
+	}
 	return applied, skipped, nil
 }
 

internal/app/repo_test.go

@@ -1517,8 +1517,8 @@ func TestDoctorFixAbortsProtectedMergeState(t *testing.T) {
 	}
 }
 
-func TestDoctorFixQueuesPublishForProtectedTipAheadOfUpstream(t *testing.T) {
-	repoRoot, _ := createTestRepoWithRemote(t)
+func TestDoctorFixPublishesProtectedTipAheadOfUpstream(t *testing.T) {
+	repoRoot, remoteDir := createTestRepoWithRemote(t)
 	initRepoForWorker(t, repoRoot)
 
 	writeFileAndCommit(t, repoRoot, "ahead.txt", "ahead\n", "main ahead")
@@ -1543,8 +1543,12 @@ func TestDoctorFixQueuesPublishForProtectedTipAheadOfUpstream(t *testing.T) {
 	if err != nil {
 		t.Fatalf("ListPublishRequests: %v", err)
 	}
-	if len(requests) != 1 || requests[0].Status != "queued" || requests[0].TargetSHA != head {
-		t.Fatalf("expected queued publish for protected tip %q, got %+v", head, requests)
+	if len(requests) != 1 || requests[0].Status != "succeeded" || requests[0].TargetSHA != head {
+		t.Fatalf("expected succeeded publish for protected tip %q, got %+v", head, requests)
+	}
+	remoteHead := trimNewline(runTestCommand(t, remoteDir, "git", "rev-parse", "refs/heads/main"))
+	if remoteHead != head {
+		t.Fatalf("expected remote head %q, got %q", head, remoteHead)
 	}
 }