012bed1068
Changes: 1. Add TTY detection to bd import - prevents silent hang when run interactively without arguments. Shows helpful usage message instead. 2. Fix misleading error messages - change "Run 'bd import'" to "Run 'bd sync --import-only'" or explicit file path throughout. Technical details: - Added golang.org/x/term dependency for IsTerminal() - When stdin is a TTY and no -i flag: show usage and exit - When stdin is piped: works as before (supports script pipelines) - Preserved all legitimate stdin uses: * python gh2jsonl.py --repo owner/repo | bd import * python md2jsonl.py feature.md | bd import * git show HEAD:.beads/beads.jsonl | bd import -i /dev/stdin Updated error messages in: - cmd/bd/staleness.go - main "out of sync" error - cmd/bd/sync.go - merge completion suggestions - internal/rpc/server_export_import_auto.go - daemon warnings 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
61 lines
2.2 KiB
Go
61 lines
2.2 KiB
Go
package main
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"os"
|
|
|
|
"github.com/steveyegge/beads/internal/autoimport"
|
|
)
|
|
|
|
// 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).
|
|
//
|
|
// Implements bd-2q6d: All read operations should validate database freshness.
|
|
// Implements bd-c4rq: Daemon check moved to call sites to avoid function call overhead.
|
|
func ensureDatabaseFresh(ctx context.Context) error {
|
|
if allowStale {
|
|
fmt.Fprintf(os.Stderr, "⚠️ Staleness check skipped (--allow-stale), data may be out of sync\n")
|
|
return nil
|
|
}
|
|
|
|
// Skip check if no storage available (shouldn't happen in practice)
|
|
if store == nil {
|
|
return nil
|
|
}
|
|
|
|
// Check if database is stale
|
|
isStale, err := autoimport.CheckStaleness(ctx, store, dbPath)
|
|
if err != nil {
|
|
// If we can't determine staleness, allow operation to proceed
|
|
// (better to show potentially stale data than block user)
|
|
fmt.Fprintf(os.Stderr, "Warning: could not check database staleness: %v\n", err)
|
|
return nil
|
|
}
|
|
|
|
if !isStale {
|
|
// Database is fresh, proceed
|
|
return nil
|
|
}
|
|
|
|
// Database is stale - refuse to operate
|
|
return fmt.Errorf(
|
|
"Database out of sync with JSONL. Run 'bd sync --import-only' to fix.\n\n"+
|
|
"The JSONL file has been updated (e.g., after 'git pull') but the database\n"+
|
|
"hasn't been imported yet. This would cause you to see stale/incomplete data.\n\n"+
|
|
"To fix:\n"+
|
|
" bd sync --import-only # Import JSONL updates to database\n"+
|
|
" bd import -i .beads/beads.jsonl # Alternative: specify file explicitly\n\n"+
|
|
"If in a sandboxed environment (e.g., Codex) where daemon can't be stopped:\n"+
|
|
" bd --sandbox ready # Use direct mode (no daemon)\n"+
|
|
" bd ready --allow-stale # Skip staleness check (use with caution)\n\n"+
|
|
"Or use daemon mode (auto-imports on every operation):\n"+
|
|
" bd daemon start\n"+
|
|
" bd <command> # Will auto-import before executing",
|
|
)
|
|
}
|