refactor(app): reuse status snapshot in wait and doctor

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

Author: andrewxhill-ai

internal/app/repo.go

@@ -831,22 +831,18 @@ Flags:
 		if record, _, err := ensureRepositoryRecord(ctx, store, repoRoot, cfg); err == nil {
 			repoRecord = record
 			hasRepoRecord = true
-			queue, err := loadQueueSnapshot(store, record.ID)
-			if err != nil {
-				return err
-			}
-			report.UnfinishedQueueItems = queue.UnfinishedItems
 		}
 	}
 
 	lockManager := state.NewLockManager(repoRoot, layout.GitDir)
 	result := doctorResult{HealthReport: report, RootCheckout: rootInfo}
 	if hasRepoRecord {
-		queue, err := loadQueueSnapshot(store, repoRecord.ID)
+		snapshot, err := loadRepoStatusSnapshot(ctx, store, repoRecord, cfg, 0)
 		if err != nil {
 			return err
 		}
-		result.QueueSummary = queue.Summary
+		result.UnfinishedQueueItems = snapshot.UnfinishedQueueItems
+		result.QueueSummary = snapshot.QueueSummary
 	}
 	if fix {
 		applied, skipped, err := runDoctorFix(ctx, engine, cfg, lockManager, store, repoRecord, hasRepoRecord)
@@ -865,12 +861,12 @@ Flags:
 		result.HealthReport = report
 		result.RootCheckout = rootInfo
 		if store.Exists() && hasRepoRecord {
-			queue, err := loadQueueSnapshot(store, repoRecord.ID)
+			snapshot, err := loadRepoStatusSnapshot(ctx, store, repoRecord, cfg, 0)
 			if err != nil {
 				return err
 			}
-			result.UnfinishedQueueItems = queue.UnfinishedItems
-			result.QueueSummary = queue.Summary
+			result.UnfinishedQueueItems = snapshot.UnfinishedQueueItems
+			result.QueueSummary = snapshot.QueueSummary
 		}
 	}
 	result.QueueBlocked = !result.ProtectedBranchClean || result.MainWorktreeDetached || (result.MainWorktreeBranch != "" && result.MainWorktreeBranch != result.ProtectedBranch)

internal/app/status_snapshot.go

@@ -12,6 +12,7 @@ type repoStatusSnapshot struct {
 	ExecutionEstimate         executionEstimate
 	Counts                    queueCounts
 	QueueSummary              queueSummary
+	UnfinishedQueueItems      []string
 	Alerts                    []string
 	LatestSubmission          *statusSubmission
 	LatestPublish             *statusPublish
@@ -52,13 +53,14 @@ func loadRepoStatusSnapshot(ctx context.Context, store state.Store, repoRecord s
 	}
 
 	snapshot := repoStatusSnapshot{
-		ExecutionEstimate: estimate,
-		Counts:            queue.Counts,
-		QueueSummary:      queue.Summary,
-		Alerts:            buildStatusAlerts(queue.Counts),
-		ActiveSubmissions: activeSubmissions(enrichedSubmissions),
-		ActivePublishes:   activePublishes(requests),
-		RecentEvents:      events,
+		ExecutionEstimate:    estimate,
+		Counts:               queue.Counts,
+		QueueSummary:         queue.Summary,
+		UnfinishedQueueItems: queue.UnfinishedItems,
+		Alerts:               buildStatusAlerts(queue.Counts),
+		ActiveSubmissions:    activeSubmissions(enrichedSubmissions),
+		ActivePublishes:      activePublishes(requests),
+		RecentEvents:         events,
 	}
 
 	lockManager := state.NewLockManager(repoRecord.CanonicalPath, stateGitDirFromStorePath(store.Path))

internal/app/wait.go

@@ -10,6 +10,7 @@ import (
 
 	"github.com/recallnet/mainline/internal/domain"
 	"github.com/recallnet/mainline/internal/git"
+	"github.com/recallnet/mainline/internal/policy"
 	"github.com/recallnet/mainline/internal/state"
 )
 
@@ -204,7 +205,7 @@ func waitForIntegratedSubmission(queued queuedSubmission, timeout time.Duration,
 		ProtectedBranch:  queued.Config.Repo.ProtectedBranch,
 		SubmissionStatus: queued.Submission.Status,
 	}
-	defer populateIntegrationWaitQueueSummary(queued.Store, queued.RepoRecord.ID, &result)
+	defer populateIntegrationWaitQueueSummary(context.Background(), queued.Store, queued.RepoRecord, queued.Config, &result)
 	mainEngine := git.NewEngine(queued.Config.Repo.MainWorktree)
 
 	ticker := time.NewTicker(pollInterval)
@@ -340,7 +341,7 @@ func waitForSubmissionTarget(queued queuedSubmission, target waitTarget, timeout
 		ProtectedBranch:  queued.Config.Repo.ProtectedBranch,
 		SubmissionStatus: queued.Submission.Status,
 	}
-	defer populateSubmissionWaitQueueSummary(queued.Store, queued.RepoRecord.ID, &result)
+	defer populateSubmissionWaitQueueSummary(context.Background(), queued.Store, queued.RepoRecord, queued.Config, &result)
 	mainEngine := git.NewEngine(queued.Config.Repo.MainWorktree)
 	ticker := time.NewTicker(pollInterval)
 	defer ticker.Stop()
@@ -513,24 +514,24 @@ func waitForSubmissionTarget(queued queuedSubmission, target waitTarget, timeout
 	}
 }
 
-func populateIntegrationWaitQueueSummary(store state.Store, repoID int64, result *integrationWaitResult) {
+func populateIntegrationWaitQueueSummary(ctx context.Context, store state.Store, repoRecord state.RepositoryRecord, cfg policy.File, result *integrationWaitResult) {
 	if result == nil {
 		return
 	}
-	snapshot, err := loadQueueSnapshot(store, repoID)
+	snapshot, err := loadRepoStatusSnapshot(ctx, store, repoRecord, cfg, 0)
 	if err != nil {
 		return
 	}
-	result.QueueSummary = snapshot.Summary
+	result.QueueSummary = snapshot.QueueSummary
 }
 
-func populateSubmissionWaitQueueSummary(store state.Store, repoID int64, result *submissionWaitResult) {
+func populateSubmissionWaitQueueSummary(ctx context.Context, store state.Store, repoRecord state.RepositoryRecord, cfg policy.File, result *submissionWaitResult) {
 	if result == nil {
 		return
 	}
-	snapshot, err := loadQueueSnapshot(store, repoID)
+	snapshot, err := loadRepoStatusSnapshot(ctx, store, repoRecord, cfg, 0)
 	if err != nil {
 		return
 	}
-	result.QueueSummary = snapshot.Summary
+	result.QueueSummary = snapshot.QueueSummary
 }