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

fix(sync): add multi-repo support to hash update after restore

Browse Source 
The previous fix didn't handle the multi-repo case - it used bare
'jsonl_content_hash' key but daemon uses 'jsonl_content_hash:<repoKey>'.
Now properly computes repoKey for multi-repo support.
This commit is contained in:
Steve Yegge
2025-12-13 06:57:10 -08:00
parent 335887e000
commit 59e32e3529
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/bd/sync.go
View File

@@ -669,9 +669,14 @@ Use --merge to merge the sync branch back to main branch.`,
} else {
// Update jsonl_content_hash to match the restored file
// This prevents daemon/CLI from seeing a hash mismatch and re-importing
// which would trigger re-export and dirty the working directory (bd-c83r race fix)
// which would trigger re-export and dirty the working directory (bd-lw0x race fix)
// Uses repoKey for multi-repo support (bd-ar2.10, bd-ar2.11)
hashKey := "jsonl_content_hash"
if rk := getRepoKeyForPath(jsonlPath); rk != "" {
hashKey += ":" + rk
}
if restoredHash, err := computeJSONLHash(jsonlPath); err == nil {
if err := store.SetMetadata(ctx, "jsonl_content_hash", restoredHash); err != nil {
if err := store.SetMetadata(ctx, hashKey, restoredHash); err != nil {
debug.Logf("sync: failed to update hash after restore: %v", err)
}
}