refactor: unify CatalogSummary + PolicySummary into AccountSummary

One struct, one query, one method. Both types queried the same
datadog_account_statuses_cache table but arbitrarily split the columns.

- New AccountSummary with all fields from both structs plus 6 missing
  columns from the schema (DismissedPolicyCount, CleanCount, etc)
- Single GetAccountSummary SQL query replaces GetCatalogStatus + GetPolicyStatus
- GetSummary() replaces GetCatalogSummary() + GetPolicySummary()
- Show analysis progress in catalogstatus compact view
- Delete catalog_status.go and policy_summary.go

Author: binarylogic

internal/app/chat/chat.go

@@ -71,7 +71,7 @@ type Model struct {
 	originY   int
 
 	// Empty state
-	policySummary *domain.PolicySummary
+	policySummary *domain.AccountSummary
 
 	// Dependencies
 	db           sqlite.DB
@@ -149,7 +149,7 @@ func (m *Model) Update(msg tea.Msg) tea.Cmd {
 		if !m.hasMessages() && m.db != nil {
 			ctx, cancel := context.WithTimeout(context.Background(), time.Second)
 			defer cancel()
-			summary, err := m.db.DatadogAccountStatuses().GetPolicySummary(ctx)
+			summary, err := m.db.DatadogAccountStatuses().GetSummary(ctx)
 			if err == nil && summary.ReadyForUse {
 				m.policySummary = &summary
 			}
@@ -170,7 +170,35 @@ func (m *Model) Update(msg tea.Msg) tea.Cmd {
 		cmds = append(cmds, m.handlePersistedMessage(msg))
 
 	case msgs.StreamFailed:
+		// Forward to round so it transitions to StateFailed.
+		cmds = append(cmds, m.messageList.Update(msg))
+
+		// Clean up orphaned messages from DB (async to avoid blocking UI).
+		if last := m.messageList.LastRound(); last != nil {
+			ids := last.LastTurnMessageIDs()
+			if len(ids) > 0 {
+				db := m.db
+				scope := m.scope
+				cmds = append(cmds, func() tea.Msg {
+					for _, id := range ids {
+						if err := db.Messages().Delete(context.Background(), id); err != nil {
+							scope.Error("failed to delete orphaned message", "id", id, "error", err)
+						}
+					}
+					return nil
+				})
+			}
+
+			// Turn 1: remove round entirely, input bar restores text via pendingText.
+			if !last.HasAssistantContent() {
+				m.messageList.RemoveLastRound()
+			}
+			// Turn 2+: round stays visible with red error divider.
+		}
+
+		cmds = append(cmds, m.inputBar.Update(msg))
 		cmds = append(cmds, appmsg.ErrorCmd("Failed to get response", msg.Err, false))
+		return tea.Batch(cmds...)
 
 	case tea.MouseClickMsg:
 		// Click on the message list area focuses it
@@ -493,7 +521,7 @@ func (m *Model) emptyStateContent() string {
 }
 
 // wastePercent computes waste % preferring bytes.
-func wastePercent(s domain.PolicySummary) int {
+func wastePercent(s domain.AccountSummary) int {
 	if s.TotalBytesPerHour > 0 && s.EstimatedBytesPerHour > 0 {
 		return int(math.Round(s.EstimatedBytesPerHour / s.TotalBytesPerHour * 100))
 	}

internal/app/statusbar/catalogstatus/catalogstatus.go

@@ -28,7 +28,7 @@ type Model struct {
 	theme styles.Theme
 	db    sqlite.DB
 
-	summary   domain.CatalogSummary
+	summary   domain.AccountSummary
 	services  []domain.ServiceStatus
 	hasData   bool
 	lastState string
@@ -72,7 +72,7 @@ func (m *Model) Update(msg tea.Msg) tea.Cmd {
 		ctx, cancel := context.WithTimeout(context.Background(), time.Second)
 		defer cancel()
 
-		summary, err := m.db.DatadogAccountStatuses().GetCatalogSummary(ctx)
+		summary, err := m.db.DatadogAccountStatuses().GetSummary(ctx)
 		if err != nil {
 			return m.poll()
 		}
@@ -97,7 +97,7 @@ func (m *Model) Update(msg tea.Msg) tea.Cmd {
 }
 
 // stateKey builds a string key for change detection.
-func (m *Model) stateKey(s domain.CatalogSummary, services []domain.ServiceStatus) string {
+func (m *Model) stateKey(s domain.AccountSummary, services []domain.ServiceStatus) string {
 	key := fmt.Sprintf("%v:%d:%d:%d:%d:%d:%d:%d:%d:%s:%.0f:%s:%d",
 		s.ReadyForUse, s.ServiceCount, s.ActiveServices,
 		s.EventCount, s.AnalyzedCount, s.AnalyzingCount,
@@ -142,7 +142,11 @@ func (m *Model) CompactView() string {
 	case domain.ServiceLogStatusDiscovering:
 		suffix = " · discovering"
 	case domain.ServiceLogStatusAnalyzing:
-		suffix = " · analyzing"
+		if s.EventCount > 0 {
+			suffix = fmt.Sprintf(" · analyzing %d/%d events", s.AnalyzedCount, s.EventCount)
+		} else {
+			suffix = " · analyzing"
+		}
 	case domain.ServiceLogStatusDisabled, domain.ServiceLogStatusInactive,
 		domain.ServiceLogStatusBroken, domain.ServiceLogStatusStale,
 		domain.ServiceLogStatusReady:
@@ -290,7 +294,7 @@ func (m *Model) serviceName(svc domain.ServiceStatus) string {
 // renderStatus renders the status badge, with percent for discovering/analyzing.
 func (m *Model) renderStatus(svc domain.ServiceStatus) string {
 	s := status.Service(m.theme, svc.Status, true)
-	if svc.PercentComplete > 0 && svc.Status == domain.ServiceLogStatusDiscovering {
+	if svc.PercentComplete > 0 && (svc.Status == domain.ServiceLogStatusDiscovering || svc.Status == domain.ServiceLogStatusAnalyzing) {
 		muted := lipgloss.NewStyle().Foreground(m.theme.TextMuted).Background(m.theme.Bg)
 		s += " " + muted.Render(fmt.Sprintf("%.0f%%", svc.PercentComplete))
 	}

internal/app/statusbar/policystatus/policystatus.go

@@ -27,7 +27,7 @@ type Model struct {
 	theme styles.Theme
 	db    sqlite.DB
 
-	summary    domain.PolicySummary
+	summary    domain.AccountSummary
 	categories []domain.PolicyCategoryStatus
 	hasData    bool
 	lastState  string
@@ -71,7 +71,7 @@ func (m *Model) Update(msg tea.Msg) tea.Cmd {
 		ctx, cancel := context.WithTimeout(context.Background(), time.Second)
 		defer cancel()
 
-		summary, err := m.db.DatadogAccountStatuses().GetPolicySummary(ctx)
+		summary, err := m.db.DatadogAccountStatuses().GetSummary(ctx)
 		if err != nil {
 			return m.poll()
 		}
@@ -96,7 +96,7 @@ func (m *Model) Update(msg tea.Msg) tea.Cmd {
 }
 
 // stateKey builds a string key for change detection.
-func (m *Model) stateKey(s domain.PolicySummary, cats []domain.PolicyCategoryStatus) string {
+func (m *Model) stateKey(s domain.AccountSummary, cats []domain.PolicyCategoryStatus) string {
 	key := fmt.Sprintf("%v:%d:%d:%d:%v:%v:%v:%.0f:%.0f:%v:%v:%.0f:%.0f:%v:%.0f:%.0f:%d",
 		s.ReadyForUse, s.PendingPolicyCount,
 		s.PolicyCount, s.ApprovedPolicyCount,
@@ -165,7 +165,7 @@ func (m *Model) CompactView() string {
 }
 
 // wastePercent computes the estimated waste as a percentage of total bytes.
-func wastePercent(s domain.PolicySummary) int {
+func wastePercent(s domain.AccountSummary) int {
 	if s.TotalBytesPerHour > 0 && s.EstimatedBytesPerHour > 0 {
 		return int(math.Round(s.EstimatedBytesPerHour / s.TotalBytesPerHour * 100))
 	}
@@ -233,7 +233,7 @@ func (m *Model) renderHeadline() string {
 
 // formatSavingsBreakdown returns per-dimension savings segments for joining
 // into the headline, e.g. ["bytes: ~$4.6k/yr", "volume: ~$7.3k/yr", "~$11.9k/yr total"].
-func formatSavingsBreakdown(s domain.PolicySummary, sep string) []string {
+func formatSavingsBreakdown(s domain.AccountSummary, sep string) []string {
 	if s.EstimatedCostPerHour == nil {
 		return nil
 	}
@@ -389,7 +389,7 @@ func formatBenefitLabel(benefits string) string {
 }
 
 // formatObservedSaving returns the observed savings from approved policies.
-func formatObservedSaving(s domain.PolicySummary) string {
+func formatObservedSaving(s domain.AccountSummary) string {
 	if s.ObservedCostBefore != nil && s.ObservedCostAfter != nil {
 		diff := (*s.ObservedCostBefore - *s.ObservedCostAfter) * 8760
 		if diff >= 1 {

internal/domain/account_summary.go

@@ -0,0 +1,62 @@
+package domain
+
+// PolicyLogStatus is the lifecycle status for a policy.
+type PolicyLogStatus string
+
+const (
+	PolicyLogStatusPending   PolicyLogStatus = "PENDING"
+	PolicyLogStatusApproved  PolicyLogStatus = "APPROVED"
+	PolicyLogStatusDismissed PolicyLogStatus = "DISMISSED"
+)
+
+func (s PolicyLogStatus) String() string { return string(s) }
+
+// AccountSummary is the aggregated status across all Datadog accounts.
+// Sourced from a single query against datadog_account_statuses_cache.
+type AccountSummary struct {
+	ReadyForUse bool
+
+	// Catalog: services
+	ServiceCount     int64
+	ActiveServices   int64
+	ReadyServices    int64
+	BrokenServices   int64
+	StaleServices    int64
+	DiscoveringCount int64
+	AnalyzingCount   int64
+
+	// Catalog: events
+	EventCount       int64
+	AnalyzedCount    int64
+	CleanCount       int64
+	PendingCount     int64
+	ResolvedCount    int64
+	QuarantinedCount int64
+	PercentComplete  float64
+	WorstStatus      ServiceLogStatus
+	LogError         string
+
+	// Policies
+	PolicyCount          int64
+	PendingPolicyCount   int64
+	ApprovedPolicyCount  int64
+	DismissedPolicyCount int64
+
+	// Cost & volume: estimated savings from pending policies
+	EstimatedCostPerHour       *float64 // nil when pricing unavailable
+	EstimatedCostPerHourBytes  *float64
+	EstimatedCostPerHourVolume *float64
+	EstimatedVolumePerHour     float64
+	EstimatedBytesPerHour      float64
+
+	// Cost & volume: observed impact from approved policies
+	ObservedCostBefore   *float64 // nil when pricing unavailable
+	ObservedCostAfter    *float64
+	ObservedVolumeBefore float64
+	ObservedVolumeAfter  float64
+
+	// Cost & volume: totals
+	TotalCostPerHour   *float64 // nil when pricing unavailable
+	TotalVolumePerHour float64
+	TotalBytesPerHour  float64
+}

internal/domain/catalog_status.go

@@ -10,61 +10,66 @@ import (
 
 // DatadogAccountStatuses provides access to Datadog account status data.
 type DatadogAccountStatuses interface {
-	GetCatalogSummary(ctx context.Context) (domain.CatalogSummary, error)
-	GetPolicySummary(ctx context.Context) (domain.PolicySummary, error)
+	GetSummary(ctx context.Context) (domain.AccountSummary, error)
 }
 
 // datadogAccountStatusesImpl implements DatadogAccountStatuses.
 type datadogAccountStatusesImpl struct {
 	queries *gen.Queries
 }
 
-// GetCatalogSummary returns aggregated catalog status across all Datadog accounts.
-func (d *datadogAccountStatusesImpl) GetCatalogSummary(ctx context.Context) (domain.CatalogSummary, error) {
-	row, err := d.queries.GetCatalogStatus(ctx)
+// GetSummary returns aggregated status across all Datadog accounts.
+func (d *datadogAccountStatusesImpl) GetSummary(ctx context.Context) (domain.AccountSummary, error) {
+	row, err := d.queries.GetAccountSummary(ctx)
 	if err != nil {
-		return domain.CatalogSummary{}, WrapSQLiteError(err, "get catalog summary")
+		return domain.AccountSummary{}, WrapSQLiteError(err, "get account summary")
 	}
 
-	return domain.CatalogSummary{
-		ReadyForUse:      row.ReadyForUse != 0,
+	return domain.AccountSummary{
+		ReadyForUse: row.ReadyForUse != 0,
+
+		// Services
 		ServiceCount:     row.ServiceCount,
 		ActiveServices:   row.ActiveServices,
-		EventCount:       row.EventCount,
-		AnalyzedCount:    row.AnalyzedCount,
-		AnalyzingCount:   row.AnalyzingCount,
-		DiscoveringCount: row.DiscoveringCount,
+		ReadyServices:    row.ReadyServices,
 		BrokenServices:   row.BrokenServices,
 		StaleServices:    row.StaleServices,
+		DiscoveringCount: row.DiscoveringCount,
+		AnalyzingCount:   row.AnalyzingCount,
+
+		// Events
+		EventCount:       row.EventCount,
+		AnalyzedCount:    row.AnalyzedCount,
+		CleanCount:       row.CleanCount,
+		PendingCount:     row.PendingCount,
+		ResolvedCount:    row.ResolvedCount,
+		QuarantinedCount: row.QuarantinedCount,
 		PercentComplete:  row.PercentComplete,
 		WorstStatus:      domain.ServiceLogStatus(row.WorstStatus),
 		LogError:         fmt.Sprint(row.LogError),
-	}, nil
-}
 
-// GetPolicySummary returns aggregated policy/savings status across all Datadog accounts.
-func (d *datadogAccountStatusesImpl) GetPolicySummary(ctx context.Context) (domain.PolicySummary, error) {
-	row, err := d.queries.GetPolicyStatus(ctx)
-	if err != nil {
-		return domain.PolicySummary{}, WrapSQLiteError(err, "get policy summary")
-	}
+		// Policies
+		PolicyCount:          row.PolicyCount,
+		PendingPolicyCount:   row.PendingPolicyCount,
+		ApprovedPolicyCount:  row.ApprovedPolicyCount,
+		DismissedPolicyCount: row.DismissedPolicyCount,
 
-	return domain.PolicySummary{
-		ReadyForUse:                row.ReadyForUse != 0,
-		PendingPolicyCount:         row.PendingPolicyCount,
-		PolicyCount:                row.PolicyCount,
-		ApprovedPolicyCount:        row.ApprovedPolicyCount,
+		// Estimated savings
 		EstimatedCostPerHour:       row.EstimatedCostPerHour,
 		EstimatedCostPerHourBytes:  row.EstimatedCostPerHourBytes,
 		EstimatedCostPerHourVolume: row.EstimatedCostPerHourVolume,
 		EstimatedVolumePerHour:     row.EstimatedVolumePerHour,
 		EstimatedBytesPerHour:      row.EstimatedBytesPerHour,
-		ObservedCostBefore:         row.ObservedCostBefore,
-		ObservedCostAfter:          row.ObservedCostAfter,
-		ObservedVolumeBefore:       row.ObservedVolumeBefore,
-		ObservedVolumeAfter:        row.ObservedVolumeAfter,
-		TotalCostPerHour:           row.TotalCostPerHour,
-		TotalVolumePerHour:         row.TotalVolumePerHour,
-		TotalBytesPerHour:          row.TotalBytesPerHour,
+
+		// Observed impact
+		ObservedCostBefore:   row.ObservedCostBefore,
+		ObservedCostAfter:    row.ObservedCostAfter,
+		ObservedVolumeBefore: row.ObservedVolumeBefore,
+		ObservedVolumeAfter:  row.ObservedVolumeAfter,
+
+		// Totals
+		TotalCostPerHour:   row.TotalCostPerHour,
+		TotalVolumePerHour: row.TotalVolumePerHour,
+		TotalBytesPerHour:  row.TotalBytesPerHour,
 	}, nil
 }