This change fixes the issue where 'bd sync' would fail with a false-positive "JSONL is newer than database" error after the daemon auto-exports. Root Cause: - Daemon exports local changes to JSONL, updating its timestamp - bd sync sees JSONL.mtime > DB.mtime and incorrectly assumes external changes - This blocks export even though content is identical Solution: - Modified isJSONLNewer() to use SHA256 content hash comparison - Only triggers auto-import when JSONL is newer AND content differs - Prevents false positives from daemon auto-export timestamp updates - Maintains conservative fallback if hashes can't be computed Changes: - Added computeJSONLHash() and computeDBHash() helper functions - Created isJSONLNewerWithStore() to support testing with explicit store - Added comprehensive tests for content-based comparison logic - All existing tests pass, including export_mtime tests Fixes: bd-lm2q
393 lines
12 KiB
Go
393 lines
12 KiB
Go
package main
|
|
|
|
import (
|
|
"bytes"
|
|
"context"
|
|
"crypto/sha256"
|
|
"database/sql"
|
|
"encoding/hex"
|
|
"encoding/json"
|
|
"fmt"
|
|
"math"
|
|
"os"
|
|
"path/filepath"
|
|
"sort"
|
|
|
|
"github.com/steveyegge/beads/internal/storage"
|
|
"github.com/steveyegge/beads/internal/types"
|
|
)
|
|
|
|
// isJSONLNewer checks if JSONL file is newer than database file.
|
|
// Returns true if JSONL is newer AND has different content, false otherwise.
|
|
// This prevents false positives from daemon auto-export timestamp skew (bd-lm2q).
|
|
func isJSONLNewer(jsonlPath string) bool {
|
|
return isJSONLNewerWithStore(jsonlPath, nil)
|
|
}
|
|
|
|
// isJSONLNewerWithStore is like isJSONLNewer but accepts an optional store parameter.
|
|
// If st is nil, it will try to use the global store.
|
|
func isJSONLNewerWithStore(jsonlPath string, st storage.Storage) bool {
|
|
jsonlInfo, jsonlStatErr := os.Stat(jsonlPath)
|
|
if jsonlStatErr != nil {
|
|
return false
|
|
}
|
|
|
|
beadsDir := filepath.Dir(jsonlPath)
|
|
dbPath := filepath.Join(beadsDir, "beads.db")
|
|
dbInfo, dbStatErr := os.Stat(dbPath)
|
|
if dbStatErr != nil {
|
|
return false
|
|
}
|
|
|
|
// Quick path: if DB is newer, JSONL is definitely not newer
|
|
if !jsonlInfo.ModTime().After(dbInfo.ModTime()) {
|
|
return false
|
|
}
|
|
|
|
// JSONL is newer by timestamp - but this could be due to daemon auto-export
|
|
// or clock skew. Use content-based comparison to determine if import is needed.
|
|
// If we can't determine content hash (e.g., store not available), conservatively
|
|
// assume JSONL is newer to trigger auto-import.
|
|
if st == nil {
|
|
if ensureStoreActive() != nil || store == nil {
|
|
return true // Conservative: can't check content, assume different
|
|
}
|
|
st = store
|
|
}
|
|
|
|
ctx := context.Background()
|
|
jsonlHash, err := computeJSONLHash(jsonlPath)
|
|
if err != nil {
|
|
return true // Conservative: can't read JSONL, assume different
|
|
}
|
|
|
|
dbHash, err := computeDBHash(ctx, st)
|
|
if err != nil {
|
|
return true // Conservative: can't read DB, assume different
|
|
}
|
|
|
|
// Compare hashes: if they match, JSONL and DB have same content
|
|
// despite timestamp difference (daemon auto-export case)
|
|
return jsonlHash != dbHash
|
|
}
|
|
|
|
// validatePreExport performs integrity checks before exporting database to JSONL.
|
|
// Returns error if critical issues found that would cause data loss.
|
|
func validatePreExport(ctx context.Context, store storage.Storage, jsonlPath string) error {
|
|
// Check if JSONL is newer than database - if so, must import first
|
|
if isJSONLNewer(jsonlPath) {
|
|
return fmt.Errorf("refusing to export: JSONL is newer than database (import first to avoid data loss)")
|
|
}
|
|
|
|
jsonlInfo, jsonlStatErr := os.Stat(jsonlPath)
|
|
|
|
// Get database issue count (fast path with COUNT(*) if available)
|
|
dbCount, err := countDBIssuesFast(ctx, store)
|
|
if err != nil {
|
|
return fmt.Errorf("failed to count database issues: %w", err)
|
|
}
|
|
|
|
// Get JSONL issue count
|
|
jsonlCount := 0
|
|
if jsonlStatErr == nil {
|
|
jsonlCount, err = countIssuesInJSONL(jsonlPath)
|
|
if err != nil {
|
|
// Conservative: if JSONL exists with content but we can't count it,
|
|
// and DB is empty, refuse to export (potential data loss)
|
|
if dbCount == 0 && jsonlInfo.Size() > 0 {
|
|
return fmt.Errorf("refusing to export empty DB over existing JSONL whose contents couldn't be verified: %w", err)
|
|
}
|
|
// Warning for other cases
|
|
fmt.Fprintf(os.Stderr, "WARNING: Failed to count issues in JSONL: %v\n", err)
|
|
}
|
|
}
|
|
|
|
// Critical: refuse to export empty DB over non-empty JSONL
|
|
if dbCount == 0 && jsonlCount > 0 {
|
|
return fmt.Errorf("refusing to export empty DB over %d issues in JSONL (would cause data loss)", jsonlCount)
|
|
}
|
|
|
|
// Warning: large divergence suggests sync failure
|
|
if jsonlCount > 0 {
|
|
divergencePercent := math.Abs(float64(dbCount-jsonlCount)) / float64(jsonlCount) * 100
|
|
if divergencePercent > 50 {
|
|
fmt.Fprintf(os.Stderr, "WARNING: DB has %d issues, JSONL has %d (%.1f%% divergence)\n",
|
|
dbCount, jsonlCount, divergencePercent)
|
|
fmt.Fprintf(os.Stderr, "This suggests sync failure - investigate before proceeding\n")
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// checkDuplicateIDs detects duplicate issue IDs in the database.
|
|
// Returns error if duplicates are found (indicates database corruption).
|
|
func checkDuplicateIDs(ctx context.Context, store storage.Storage) error {
|
|
// Get access to underlying database
|
|
// This is a hack - we need to add a proper interface method for this
|
|
// For now, we'll use a type assertion to access the underlying *sql.DB
|
|
type dbGetter interface {
|
|
GetDB() interface{}
|
|
}
|
|
|
|
getter, ok := store.(dbGetter)
|
|
if !ok {
|
|
// If store doesn't expose GetDB, skip this check
|
|
// This is acceptable since duplicate IDs are prevented by UNIQUE constraint
|
|
return nil
|
|
}
|
|
|
|
db, ok := getter.GetDB().(*sql.DB)
|
|
if !ok || db == nil {
|
|
return nil
|
|
}
|
|
|
|
rows, err := db.QueryContext(ctx, `
|
|
SELECT id, COUNT(*) as cnt
|
|
FROM issues
|
|
GROUP BY id
|
|
HAVING cnt > 1
|
|
`)
|
|
if err != nil {
|
|
return fmt.Errorf("failed to check for duplicate IDs: %w", err)
|
|
}
|
|
defer rows.Close()
|
|
|
|
var duplicates []string
|
|
for rows.Next() {
|
|
var id string
|
|
var count int
|
|
if err := rows.Scan(&id, &count); err != nil {
|
|
return fmt.Errorf("failed to scan duplicate ID row: %w", err)
|
|
}
|
|
duplicates = append(duplicates, fmt.Sprintf("%s (x%d)", id, count))
|
|
}
|
|
|
|
if err := rows.Err(); err != nil {
|
|
return fmt.Errorf("error iterating duplicate IDs: %w", err)
|
|
}
|
|
|
|
if len(duplicates) > 0 {
|
|
return fmt.Errorf("database corruption: duplicate IDs: %v", duplicates)
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// checkOrphanedDeps finds dependencies pointing to or from non-existent issues.
|
|
// Returns list of orphaned dependency IDs and any error encountered.
|
|
func checkOrphanedDeps(ctx context.Context, store storage.Storage) ([]string, error) {
|
|
// Get access to underlying database
|
|
type dbGetter interface {
|
|
GetDB() interface{}
|
|
}
|
|
|
|
getter, ok := store.(dbGetter)
|
|
if !ok {
|
|
return nil, nil
|
|
}
|
|
|
|
db, ok := getter.GetDB().(*sql.DB)
|
|
if !ok || db == nil {
|
|
return nil, nil
|
|
}
|
|
|
|
// Check both sides: dependencies where either issue_id or depends_on_id doesn't exist
|
|
rows, err := db.QueryContext(ctx, `
|
|
SELECT DISTINCT d.issue_id
|
|
FROM dependencies d
|
|
LEFT JOIN issues i ON d.issue_id = i.id
|
|
WHERE i.id IS NULL
|
|
UNION
|
|
SELECT DISTINCT d.depends_on_id
|
|
FROM dependencies d
|
|
LEFT JOIN issues i ON d.depends_on_id = i.id
|
|
WHERE i.id IS NULL
|
|
`)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("failed to check for orphaned dependencies: %w", err)
|
|
}
|
|
defer rows.Close()
|
|
|
|
var orphaned []string
|
|
for rows.Next() {
|
|
var id string
|
|
if err := rows.Scan(&id); err != nil {
|
|
return nil, fmt.Errorf("failed to scan orphaned dependency: %w", err)
|
|
}
|
|
orphaned = append(orphaned, id)
|
|
}
|
|
|
|
if err := rows.Err(); err != nil {
|
|
return nil, fmt.Errorf("error iterating orphaned dependencies: %w", err)
|
|
}
|
|
|
|
if len(orphaned) > 0 {
|
|
fmt.Fprintf(os.Stderr, "WARNING: Found %d orphaned dependency references: %v\n", len(orphaned), orphaned)
|
|
}
|
|
|
|
return orphaned, nil
|
|
}
|
|
|
|
// validatePostImport checks that import didn't cause data loss.
|
|
// Returns error if issue count decreased (data loss) or nil if OK.
|
|
func validatePostImport(before, after int) error {
|
|
if after < before {
|
|
return fmt.Errorf("import reduced issue count: %d → %d (data loss detected!)", before, after)
|
|
}
|
|
if after == before {
|
|
fmt.Fprintf(os.Stderr, "Import complete: no changes\n")
|
|
} else {
|
|
fmt.Fprintf(os.Stderr, "Import complete: %d → %d issues (+%d)\n", before, after, after-before)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// countDBIssues returns the total number of issues in the database.
|
|
// This is the legacy interface kept for compatibility.
|
|
func countDBIssues(ctx context.Context, store storage.Storage) (int, error) {
|
|
return countDBIssuesFast(ctx, store)
|
|
}
|
|
|
|
// countDBIssuesFast uses COUNT(*) if possible, falls back to SearchIssues.
|
|
func countDBIssuesFast(ctx context.Context, store storage.Storage) (int, error) {
|
|
// Try fast path with COUNT(*) using direct SQL
|
|
// This is a hack until we add a proper CountIssues method to storage.Storage
|
|
type dbGetter interface {
|
|
GetDB() interface{}
|
|
}
|
|
|
|
if getter, ok := store.(dbGetter); ok {
|
|
if db, ok := getter.GetDB().(*sql.DB); ok && db != nil {
|
|
var count int
|
|
err := db.QueryRowContext(ctx, "SELECT COUNT(*) FROM issues").Scan(&count)
|
|
if err == nil {
|
|
return count, nil
|
|
}
|
|
// Fall through to slow path on error
|
|
}
|
|
}
|
|
|
|
// Fallback: load all issues and count them (slow but always works)
|
|
issues, err := store.SearchIssues(ctx, "", types.IssueFilter{})
|
|
if err != nil {
|
|
return 0, fmt.Errorf("failed to count database issues: %w", err)
|
|
}
|
|
return len(issues), nil
|
|
}
|
|
|
|
// dbNeedsExport checks if the database has changes that differ from JSONL.
|
|
// Returns true if export is needed, false if DB and JSONL are already in sync.
|
|
func dbNeedsExport(ctx context.Context, store storage.Storage, jsonlPath string) (bool, error) {
|
|
// Check if JSONL exists
|
|
jsonlInfo, err := os.Stat(jsonlPath)
|
|
if os.IsNotExist(err) {
|
|
// JSONL doesn't exist - always need to export
|
|
return true, nil
|
|
}
|
|
if err != nil {
|
|
return false, fmt.Errorf("failed to stat JSONL: %w", err)
|
|
}
|
|
|
|
// Check database modification time
|
|
beadsDir := filepath.Dir(jsonlPath)
|
|
dbPath := filepath.Join(beadsDir, "beads.db")
|
|
dbInfo, err := os.Stat(dbPath)
|
|
if err != nil {
|
|
return false, fmt.Errorf("failed to stat database: %w", err)
|
|
}
|
|
|
|
// If database is newer than JSONL, we need to export
|
|
if dbInfo.ModTime().After(jsonlInfo.ModTime()) {
|
|
return true, nil
|
|
}
|
|
|
|
// If modification times suggest they're in sync, verify counts match
|
|
dbCount, err := countDBIssuesFast(ctx, store)
|
|
if err != nil {
|
|
return false, fmt.Errorf("failed to count database issues: %w", err)
|
|
}
|
|
|
|
jsonlCount, err := countIssuesInJSONL(jsonlPath)
|
|
if err != nil {
|
|
return false, fmt.Errorf("failed to count JSONL issues: %w", err)
|
|
}
|
|
|
|
// If counts don't match, we need to export
|
|
if dbCount != jsonlCount {
|
|
return true, nil
|
|
}
|
|
|
|
// DB and JSONL appear to be in sync
|
|
return false, nil
|
|
}
|
|
|
|
// computeJSONLHash computes a content hash of the JSONL file.
|
|
// Returns the SHA256 hash of the file contents.
|
|
func computeJSONLHash(jsonlPath string) (string, error) {
|
|
data, err := os.ReadFile(jsonlPath) // #nosec G304 - controlled path from config
|
|
if err != nil {
|
|
return "", fmt.Errorf("failed to read JSONL: %w", err)
|
|
}
|
|
|
|
// Use sha256 for consistency with autoimport package
|
|
hasher := sha256.New()
|
|
hasher.Write(data)
|
|
return hex.EncodeToString(hasher.Sum(nil)), nil
|
|
}
|
|
|
|
// computeDBHash computes a content hash of the database by exporting to memory.
|
|
// This is used to compare DB content with JSONL content without relying on timestamps.
|
|
func computeDBHash(ctx context.Context, store storage.Storage) (string, error) {
|
|
// Get all issues from DB
|
|
issues, err := store.SearchIssues(ctx, "", types.IssueFilter{})
|
|
if err != nil {
|
|
return "", fmt.Errorf("failed to get issues: %w", err)
|
|
}
|
|
|
|
// Sort by ID for consistent hash
|
|
sort.Slice(issues, func(i, j int) bool {
|
|
return issues[i].ID < issues[j].ID
|
|
})
|
|
|
|
// Populate dependencies
|
|
allDeps, err := store.GetAllDependencyRecords(ctx)
|
|
if err != nil {
|
|
return "", fmt.Errorf("failed to get dependencies: %w", err)
|
|
}
|
|
for _, issue := range issues {
|
|
issue.Dependencies = allDeps[issue.ID]
|
|
}
|
|
|
|
// Populate labels
|
|
for _, issue := range issues {
|
|
labels, err := store.GetLabels(ctx, issue.ID)
|
|
if err != nil {
|
|
return "", fmt.Errorf("failed to get labels for %s: %w", issue.ID, err)
|
|
}
|
|
issue.Labels = labels
|
|
}
|
|
|
|
// Populate comments
|
|
for _, issue := range issues {
|
|
comments, err := store.GetIssueComments(ctx, issue.ID)
|
|
if err != nil {
|
|
return "", fmt.Errorf("failed to get comments for %s: %w", issue.ID, err)
|
|
}
|
|
issue.Comments = comments
|
|
}
|
|
|
|
// Serialize to JSON and hash
|
|
var buf bytes.Buffer
|
|
encoder := json.NewEncoder(&buf)
|
|
for _, issue := range issues {
|
|
if err := encoder.Encode(issue); err != nil {
|
|
return "", fmt.Errorf("failed to encode issue %s: %w", issue.ID, err)
|
|
}
|
|
}
|
|
|
|
hasher := sha256.New()
|
|
hasher.Write(buf.Bytes())
|
|
return hex.EncodeToString(hasher.Sum(nil)), nil
|
|
}
|