johno/beads
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(sync): protect local issues from git-history-backfill during sync (#485)

Browse Source 
Fix sync bug where newly created issues were incorrectly tombstoned during bd sync.

The root cause was git-history-backfill finding issues in local commits on the sync branch, then tombstoning them when they weren't in the merged JSONL. The fix protects issues from the left snapshot (local export) from git-history-backfill.

🤖 Generated with [Claude Code](https://claude.com/claude-code)
This commit is contained in:
Rod Davenport
2025-12-12 16:28:48 -05:00
committed by GitHub
parent 8af08460a7
commit 6985ea94e5
5 changed files with 176 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
cmd/bd/import.go
View File

@@ -98,6 +98,7 @@ NOTE: Import requires direct database access and does not work with daemon mode.
force, _ := cmd.Flags().GetBool("force")
noGitHistory, _ := cmd.Flags().GetBool("no-git-history")
ignoreDeletions, _ := cmd.Flags().GetBool("ignore-deletions")
protectLeftSnapshot, _ := cmd.Flags().GetBool("protect-left-snapshot")
// Check if stdin is being used interactively (not piped)
if input == "" && term.IsTerminal(int(os.Stdin.Fd())) {
@@ -260,6 +261,23 @@ NOTE: Import requires direct database access and does not work with daemon mode.
IgnoreDeletions: ignoreDeletions,
}
// If --protect-left-snapshot is set, read the left snapshot and build ID set
// This protects locally exported issues from git-history-backfill (bd-sync-deletion fix)
if protectLeftSnapshot && input != "" {
beadsDir := filepath.Dir(input)
leftSnapshotPath := filepath.Join(beadsDir, "beads.left.jsonl")
if _, err := os.Stat(leftSnapshotPath); err == nil {
sm := NewSnapshotManager(input)
leftIDs, err := sm.BuildIDSet(leftSnapshotPath)
if err != nil {
fmt.Fprintf(os.Stderr, "Warning: failed to read left snapshot: %v\n", err)
} else if len(leftIDs) > 0 {
opts.ProtectLocalExportIDs = leftIDs
fmt.Fprintf(os.Stderr, "Protecting %d issue(s) from left snapshot\n", len(leftIDs))
}
}
}
result, err := importIssuesCore(ctx, dbPath, store, allIssues, opts)
// Check for uncommitted changes in JSONL after import
@@ -774,6 +792,7 @@ func init() {
importCmd.Flags().Bool("force", false, "Force metadata update even when database is already in sync with JSONL")
importCmd.Flags().Bool("no-git-history", false, "Skip git history backfill for deletions (use during JSONL filename migrations)")
importCmd.Flags().Bool("ignore-deletions", false, "Import issues even if they're in the deletions manifest")
importCmd.Flags().Bool("protect-left-snapshot", false, "Protect issues in left snapshot from git-history-backfill (bd-sync-deletion fix)")
importCmd.Flags().BoolVar(&jsonOutput, "json", false, "Output import statistics in JSON format")
rootCmd.AddCommand(importCmd)
}