refactor(queue): unify status and doctor reporting

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

Author: andrewxhill-ai

internal/app/queue_snapshot.go

@@ -0,0 +1,35 @@
+package app
+
+import (
+	"context"
+
+	"github.com/recallnet/mainline/internal/state"
+)
+
+type queueSnapshot struct {
+	Counts          statusCounts `json:"counts"`
+	Summary         queueSummary `json:"summary"`
+	UnfinishedItems []string     `json:"unfinished_items"`
+}
+
+func loadQueueSnapshot(store state.Store, repoID int64) (queueSnapshot, error) {
+	ctx := context.Background()
+	submissions, err := store.ListIntegrationSubmissions(ctx, repoID)
+	if err != nil {
+		return queueSnapshot{}, err
+	}
+	requests, err := store.ListPublishRequests(ctx, repoID)
+	if err != nil {
+		return queueSnapshot{}, err
+	}
+	items, err := store.ListUnfinishedItems(ctx, repoID)
+	if err != nil {
+		return queueSnapshot{}, err
+	}
+	counts := summarizeCounts(submissions, requests)
+	return queueSnapshot{
+		Counts:          counts,
+		Summary:         summarizeQueue(counts),
+		UnfinishedItems: items,
+	}, nil
+}

internal/app/repo.go

@@ -831,16 +831,23 @@ Flags:
 		if record, _, err := ensureRepositoryRecord(ctx, store, repoRoot, cfg); err == nil {
 			repoRecord = record
 			hasRepoRecord = true
-			items, err := store.ListUnfinishedItems(ctx, record.ID)
+			queue, err := loadQueueSnapshot(store, record.ID)
 			if err != nil {
 				return err
 			}
-			report.UnfinishedQueueItems = items
+			report.UnfinishedQueueItems = queue.UnfinishedItems
 		}
 	}
 
 	lockManager := state.NewLockManager(repoRoot, layout.GitDir)
 	result := doctorResult{HealthReport: report, RootCheckout: rootInfo}
+	if hasRepoRecord {
+		queue, err := loadQueueSnapshot(store, repoRecord.ID)
+		if err != nil {
+			return err
+		}
+		result.QueueSummary = queue.Summary
+	}
 	if fix {
 		applied, skipped, err := runDoctorFix(ctx, engine, cfg, lockManager, store, repoRecord, hasRepoRecord)
 		if err != nil {
@@ -858,11 +865,12 @@ Flags:
 		result.HealthReport = report
 		result.RootCheckout = rootInfo
 		if store.Exists() && hasRepoRecord {
-			items, err := store.ListUnfinishedItems(ctx, repoRecord.ID)
+			queue, err := loadQueueSnapshot(store, repoRecord.ID)
 			if err != nil {
 				return err
 			}
-			result.UnfinishedQueueItems = items
+			result.UnfinishedQueueItems = queue.UnfinishedItems
+			result.QueueSummary = queue.Summary
 		}
 	}
 	result.QueueBlocked = !result.ProtectedBranchClean || result.MainWorktreeDetached || (result.MainWorktreeBranch != "" && result.MainWorktreeBranch != result.ProtectedBranch)
@@ -941,6 +949,7 @@ Flags:
 type doctorResult struct {
 	git.HealthReport
 	RootCheckout rootCheckoutInfo `json:"root_checkout,omitempty"`
+	QueueSummary queueSummary     `json:"queue_summary,omitempty"`
 	QueueBlocked bool             `json:"queue_blocked,omitempty"`
 	NextActions  []string         `json:"next_actions,omitempty"`
 	FixesApplied []string         `json:"fixes_applied,omitempty"`

internal/app/repo_test.go

@@ -873,6 +873,12 @@ func TestDoctorJSONListsConcreteUnfinishedQueueItems(t *testing.T) {
 	if strings.Join(result.UnfinishedQueueItems, "\n") != strings.Join(want, "\n") {
 		t.Fatalf("unexpected unfinished queue items:\nwant: %v\ngot:  %v", want, result.UnfinishedQueueItems)
 	}
+	if result.QueueSummary.Headline != "publishing" || result.QueueSummary.QueueLength != 2 {
+		t.Fatalf("expected doctor queue summary to reflect publishing blocked mix, got %+v", result.QueueSummary)
+	}
+	if !result.QueueSummary.HasBlockedSubmissions || !result.QueueSummary.HasRunningPublishes || result.QueueSummary.HasRunningSubmissions || !result.QueueSummary.HasQueuedWork {
+		t.Fatalf("unexpected doctor queue summary flags: %+v", result.QueueSummary)
+	}
 	for _, item := range result.UnfinishedQueueItems {
 		if strings.TrimSpace(item) == "" {
 			t.Fatalf("unexpected blank unfinished queue item in %+v", result.UnfinishedQueueItems)

internal/app/status.go

@@ -293,6 +293,10 @@ func collectStatus(repoPath string, limit int) (statusResult, error) {
 		return statusResult{}, err
 	}
 	enrichedSubmissions = annotateQueueEstimates(enrichedSubmissions, estimate)
+	queue, err := loadQueueSnapshot(store, repoRecord.ID)
+	if err != nil {
+		return statusResult{}, err
+	}
 
 	result := statusResult{
 		RepositoryRoot:     repoRecord.CanonicalPath,
@@ -304,7 +308,7 @@ func collectStatus(repoPath string, limit int) (statusResult, error) {
 		ProtectedUpstream:  protectedStatus,
 		ExecutionEstimate:  estimate,
 		PublishExecution:   buildPublishExecutionPolicy(cfg),
-		Counts:             summarizeCounts(submissions, requests),
+		Counts:             queue.Counts,
 		ActiveSubmissions:  activeSubmissions(enrichedSubmissions),
 		ActivePublishes:    activePublishes(requests),
 		RecentEvents:       events,
@@ -316,14 +320,13 @@ func collectStatus(repoPath string, limit int) (statusResult, error) {
 			result.RebaseGuidance = buildStatusRebaseGuidance(cfg, comparison, protectedStatus, layout.WorktreeRoot, currentBranch)
 		}
 	}
-	queue := summarizeQueue(result.Counts)
-	result.State = queue.Headline
-	result.QueueLength = queue.QueueLength
-	result.HasBlockedSubmissions = queue.HasBlockedSubmissions
-	result.HasRunningPublishes = queue.HasRunningPublishes
-	result.HasRunningSubmissions = queue.HasRunningSubmissions
-	result.HasQueuedWork = queue.HasQueuedWork
-	result.QueueSummary = queue
+	result.State = queue.Summary.Headline
+	result.QueueLength = queue.Summary.QueueLength
+	result.HasBlockedSubmissions = queue.Summary.HasBlockedSubmissions
+	result.HasRunningPublishes = queue.Summary.HasRunningPublishes
+	result.HasRunningSubmissions = queue.Summary.HasRunningSubmissions
+	result.HasQueuedWork = queue.Summary.HasQueuedWork
+	result.QueueSummary = queue.Summary
 	result.Alerts = buildStatusAlerts(result.Counts)
 	lockManager := state.NewLockManager(layout.RepositoryRoot, layout.GitDir)
 	if metadata, ok := readActiveLease(lockManager, state.IntegrationLock); ok {

internal/app/wait.go

@@ -527,43 +527,30 @@ func populateIntegrationWaitQueueSummary(store state.Store, repoID int64, result
 	if result == nil {
 		return
 	}
-	summary, ok := loadQueueSummary(store, repoID)
-	if !ok {
+	snapshot, err := loadQueueSnapshot(store, repoID)
+	if err != nil {
 		return
 	}
-	result.QueueState = summary.Headline
-	result.QueueLength = summary.QueueLength
-	result.HasBlockedSubmissions = summary.HasBlockedSubmissions
-	result.HasRunningPublishes = summary.HasRunningPublishes
-	result.HasRunningSubmissions = summary.HasRunningSubmissions
-	result.HasQueuedWork = summary.HasQueuedWork
+	result.QueueState = snapshot.Summary.Headline
+	result.QueueLength = snapshot.Summary.QueueLength
+	result.HasBlockedSubmissions = snapshot.Summary.HasBlockedSubmissions
+	result.HasRunningPublishes = snapshot.Summary.HasRunningPublishes
+	result.HasRunningSubmissions = snapshot.Summary.HasRunningSubmissions
+	result.HasQueuedWork = snapshot.Summary.HasQueuedWork
 }
 
 func populateSubmissionWaitQueueSummary(store state.Store, repoID int64, result *submissionWaitResult) {
 	if result == nil {
 		return
 	}
-	summary, ok := loadQueueSummary(store, repoID)
-	if !ok {
-		return
-	}
-	result.QueueState = summary.Headline
-	result.QueueLength = summary.QueueLength
-	result.HasBlockedSubmissions = summary.HasBlockedSubmissions
-	result.HasRunningPublishes = summary.HasRunningPublishes
-	result.HasRunningSubmissions = summary.HasRunningSubmissions
-	result.HasQueuedWork = summary.HasQueuedWork
-}
-
-func loadQueueSummary(store state.Store, repoID int64) (queueSummary, bool) {
-	ctx := context.Background()
-	submissions, err := store.ListIntegrationSubmissions(ctx, repoID)
-	if err != nil {
-		return queueSummary{}, false
-	}
-	requests, err := store.ListPublishRequests(ctx, repoID)
+	snapshot, err := loadQueueSnapshot(store, repoID)
 	if err != nil {
-		return queueSummary{}, false
+		return
 	}
-	return summarizeQueue(summarizeCounts(submissions, requests)), true
+	result.QueueState = snapshot.Summary.Headline
+	result.QueueLength = snapshot.Summary.QueueLength
+	result.HasBlockedSubmissions = snapshot.Summary.HasBlockedSubmissions
+	result.HasRunningPublishes = snapshot.Summary.HasRunningPublishes
+	result.HasRunningSubmissions = snapshot.Summary.HasRunningSubmissions
+	result.HasQueuedWork = snapshot.Summary.HasQueuedWork
 }