diff --git a/cmd/bd/count.go b/cmd/bd/count.go index c3fd1850b..96ce2db8e 100644 --- a/cmd/bd/count.go +++ b/cmd/bd/count.go @@ -104,14 +104,8 @@ Examples: labels = utils.NormalizeLabels(labels) labelsAny = utils.NormalizeLabels(labelsAny) - // Check database freshness before reading ctx := rootCtx - if daemonClient == nil { - if err := ensureDatabaseFresh(ctx); err != nil { - fmt.Fprintf(os.Stderr, "Error: %v\n", err) - os.Exit(1) - } - } + requireFreshDB(ctx) // If daemon is running, use RPC if daemonClient != nil { diff --git a/cmd/bd/duplicates.go b/cmd/bd/duplicates.go index d4b8b49b9..0ddefd44f 100644 --- a/cmd/bd/duplicates.go +++ b/cmd/bd/duplicates.go @@ -38,14 +38,7 @@ Example: // Use global jsonOutput set by PersistentPreRun ctx := rootCtx - // Check database freshness before reading (bd-2q6d, bd-c4rq) - // Skip check when using daemon (daemon auto-imports on staleness) - if daemonClient == nil { - if err := ensureDatabaseFresh(ctx); err != nil { - fmt.Fprintf(os.Stderr, "Error: %v\n", err) - os.Exit(1) - } - } + requireFreshDB(ctx) // Get all issues allIssues, err := store.SearchIssues(ctx, "", types.IssueFilter{}) diff --git a/cmd/bd/export.go b/cmd/bd/export.go index 39ea6b32d..bb951af5d 100644 --- a/cmd/bd/export.go +++ b/cmd/bd/export.go @@ -197,11 +197,7 @@ Examples: defer func() { _ = store.Close() }() } - // Check database freshness before reading (bd-2q6d) - // Export always uses direct mode (daemon closed above) - if err := ensureDatabaseFresh(rootCtx); err != nil { - FatalErrorRespectJSON("%v", err) - } + requireFreshDB(rootCtx) // Handle --events and --events-reset flags if eventsFlag || eventsReset { diff --git a/cmd/bd/find_duplicates.go b/cmd/bd/find_duplicates.go index 06b786dde..12b7f245e 100644 --- a/cmd/bd/find_duplicates.go +++ b/cmd/bd/find_duplicates.go @@ -95,13 +95,7 @@ func runFindDuplicates(cmd *cobra.Command, _ []string) { } } - // Check database freshness - if daemonClient == nil { - if err := ensureDatabaseFresh(ctx); err != nil { - fmt.Fprintf(os.Stderr, "Error: %v\n", err) - os.Exit(1) - } - } + requireFreshDB(ctx) // Fetch issues filter := types.IssueFilter{} diff --git a/cmd/bd/gate.go b/cmd/bd/gate.go index 6448c7d5d..c46437723 100644 --- a/cmd/bd/gate.go +++ b/cmd/bd/gate.go @@ -105,10 +105,7 @@ By default, shows only open gates. Use --all to include closed gates.`, return } - // Check database freshness before reading (bd-2q6d) - if err := ensureDatabaseFresh(ctx); err != nil { - FatalErrorRespectJSON("%v", err) - } + requireFreshDB(ctx) // Direct mode issues, err := store.SearchIssues(ctx, "", filter) diff --git a/cmd/bd/graph.go b/cmd/bd/graph.go index a2adeaf31..7a0822416 100644 --- a/cmd/bd/graph.go +++ b/cmd/bd/graph.go @@ -92,12 +92,7 @@ Status icons: ○ open ◐ in_progress ● blocked ✓ closed ❄ deferred`, os.Exit(1) } - // Check database freshness before reading (bd-2q6d) - if daemonClient == nil { - if err := ensureDatabaseFresh(ctx); err != nil { - FatalErrorRespectJSON("%v", err) - } - } + requireFreshDB(ctx) // Handle --all flag: show graph for all open issues if graphAll { diff --git a/cmd/bd/history.go b/cmd/bd/history.go index 762275bf2..930aa33c1 100644 --- a/cmd/bd/history.go +++ b/cmd/bd/history.go @@ -30,12 +30,7 @@ Examples: ctx := rootCtx issueID := args[0] - // Check database freshness before reading (bd-2q6d) - if daemonClient == nil { - if err := ensureDatabaseFresh(ctx); err != nil { - FatalErrorRespectJSON("%v", err) - } - } + requireFreshDB(ctx) // Check if storage supports versioning vs, ok := storage.AsVersioned(store) diff --git a/cmd/bd/info.go b/cmd/bd/info.go index fa9cfb510..0dd25b1cb 100644 --- a/cmd/bd/info.go +++ b/cmd/bd/info.go @@ -3,7 +3,6 @@ package main import ( "encoding/json" "fmt" - "os" "path/filepath" "strings" @@ -98,14 +97,7 @@ Examples: if store != nil { ctx := rootCtx - // Check database freshness before reading - // Skip check when using daemon (daemon auto-imports on staleness) - if daemonClient == nil { - if err := ensureDatabaseFresh(ctx); err != nil { - fmt.Fprintf(os.Stderr, "Error: %v\n", err) - os.Exit(1) - } - } + requireFreshDB(ctx) filter := types.IssueFilter{} issues, err := store.SearchIssues(ctx, "", filter) diff --git a/cmd/bd/lint.go b/cmd/bd/lint.go index fecc428cf..20620ba74 100644 --- a/cmd/bd/lint.go +++ b/cmd/bd/lint.go @@ -103,10 +103,7 @@ Examples: } } else { // Direct mode - if err := ensureDatabaseFresh(ctx); err != nil { - fmt.Fprintf(os.Stderr, "Error: %v\n", err) - os.Exit(1) - } + requireFreshDB(ctx) if store == nil { fmt.Fprintln(os.Stderr, "Error: database not initialized") diff --git a/cmd/bd/list.go b/cmd/bd/list.go index 2eac43b3a..6c9b8b7f3 100644 --- a/cmd/bd/list.go +++ b/cmd/bd/list.go @@ -956,15 +956,8 @@ var listCmd = &cobra.Command{ filter.Overdue = true } - // Check database freshness before reading - // Skip check when using daemon (daemon auto-imports on staleness) ctx := rootCtx - if daemonClient == nil { - if err := ensureDatabaseFresh(ctx); err != nil { - fmt.Fprintf(os.Stderr, "Error: %v\n", err) - os.Exit(1) - } - } + requireFreshDB(ctx) // If daemon is running, use RPC if daemonClient != nil { diff --git a/cmd/bd/query.go b/cmd/bd/query.go index bad0c02d9..1c6f30134 100644 --- a/cmd/bd/query.go +++ b/cmd/bd/query.go @@ -127,13 +127,7 @@ Examples: ctx := rootCtx - // Check database freshness before reading (skip when using daemon) - if daemonClient == nil { - if err := ensureDatabaseFresh(ctx); err != nil { - fmt.Fprintf(os.Stderr, "Error: %v\n", err) - os.Exit(1) - } - } + requireFreshDB(ctx) var issues []*types.Issue diff --git a/cmd/bd/ready.go b/cmd/bd/ready.go index 3abcbeb37..3ae5bde87 100644 --- a/cmd/bd/ready.go +++ b/cmd/bd/ready.go @@ -191,14 +191,7 @@ This is useful for agents executing molecules to see which steps can run next.`, // Direct mode ctx := rootCtx - // Check database freshness before reading - // Skip check when using daemon (daemon auto-imports on staleness) - if daemonClient == nil { - if err := ensureDatabaseFresh(ctx); err != nil { - fmt.Fprintf(os.Stderr, "Error: %v\n", err) - os.Exit(1) - } - } + requireFreshDB(ctx) issues, err := store.GetReadyWork(ctx, filter) if err != nil { diff --git a/cmd/bd/search.go b/cmd/bd/search.go index e83361e1f..1976ac420 100644 --- a/cmd/bd/search.go +++ b/cmd/bd/search.go @@ -174,13 +174,7 @@ Examples: ctx := rootCtx - // Check database freshness before reading (skip when using daemon) - if daemonClient == nil { - if err := ensureDatabaseFresh(ctx); err != nil { - fmt.Fprintf(os.Stderr, "Error: %v\n", err) - os.Exit(1) - } - } + requireFreshDB(ctx) // If daemon is running, use RPC if daemonClient != nil { diff --git a/cmd/bd/show.go b/cmd/bd/show.go index 7fa0f066c..2a4639d03 100644 --- a/cmd/bd/show.go +++ b/cmd/bd/show.go @@ -56,13 +56,7 @@ var showCmd = &cobra.Command{ return } - // Check database freshness before reading - // Skip check when using daemon (daemon auto-imports on staleness) - if daemonClient == nil { - if err := ensureDatabaseFresh(ctx); err != nil { - FatalErrorRespectJSON("%v", err) - } - } + requireFreshDB(ctx) // Resolve partial IDs first (daemon mode only - direct mode uses routed resolution) var resolvedIDs []string diff --git a/cmd/bd/stale.go b/cmd/bd/stale.go index 5fca2598a..39fe4d686 100644 --- a/cmd/bd/stale.go +++ b/cmd/bd/stale.go @@ -65,14 +65,7 @@ This helps identify: // Direct mode ctx := rootCtx - // Check database freshness before reading (bd-2q6d, bd-c4rq) - // Skip check when using daemon (daemon auto-imports on staleness) - if daemonClient == nil { - if err := ensureDatabaseFresh(ctx); err != nil { - fmt.Fprintf(os.Stderr, "Error: %v\n", err) - os.Exit(1) - } - } + requireFreshDB(ctx) issues, err := store.GetStaleIssues(ctx, filter) if err != nil { diff --git a/cmd/bd/staleness.go b/cmd/bd/staleness.go index bbb17d89b..e729b0e94 100644 --- a/cmd/bd/staleness.go +++ b/cmd/bd/staleness.go @@ -8,12 +8,23 @@ import ( "github.com/steveyegge/beads/internal/autoimport" ) +// requireFreshDB checks database freshness and exits on failure. +// Skips the check when running in daemon mode (daemon auto-imports on staleness). +// This is the standard wrapper for read commands; use it instead of calling +// ensureDatabaseFresh directly to avoid boilerplate. +func requireFreshDB(ctx context.Context) { + if daemonClient == nil { + if err := ensureDatabaseFresh(ctx); err != nil { + FatalErrorRespectJSON("%v", err) + } + } +} + // ensureDatabaseFresh checks if the database is in sync with JSONL before read operations. // If JSONL is newer than database, refuses to operate with an error message. // This prevents users from making decisions based on stale/incomplete data. // -// NOTE: Callers must check if daemonClient != nil and skip calling this function -// when running in daemon mode (daemon auto-imports on staleness). +// NOTE: Prefer requireFreshDB() which wraps this with the daemon check and error handling. // // Implements bd-2q6d: All read operations should validate database freshness. // Implements bd-c4rq: Daemon check moved to call sites to avoid function call overhead. diff --git a/cmd/bd/status.go b/cmd/bd/status.go index 972385fb6..f6a6a5fa1 100644 --- a/cmd/bd/status.go +++ b/cmd/bd/status.go @@ -73,14 +73,8 @@ Examples: var stats *types.Statistics var err error - // Check database freshness before reading (bd-2q6d, bd-c4rq) - // Skip check when using daemon (daemon auto-imports on staleness) ctx := rootCtx - if daemonClient == nil { - if err := ensureDatabaseFresh(ctx); err != nil { - FatalErrorRespectJSON("%v", err) - } - } + requireFreshDB(ctx) // If daemon is running, use RPC if daemonClient != nil {