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

Fix bd-v0y: Remove mtime fast-path in hasJSONLChanged

Browse Source 
Git doesn't preserve mtime on checkout, causing false negatives where
hasJSONLChanged() incorrectly returns false after git pull updates JSONL.
This caused bd sync to overwrite pulled JSONL instead of importing it,
resurrecting deleted issues.

Solution: Always compute content hash for comparison (Option 1).
Performance impact is minimal (~10-50ms for sync operations).

Changes:
- cmd/bd/integrity.go: Remove mtime fast-path, always compute hash
- cmd/bd/sync.go: Remove mtime storage after import
- cmd/bd/import.go: Remove mtime storage after import
- cmd/bd/daemon_sync.go: Remove mtime storage and update comments
- cmd/bd/daemon_sync_test.go: Remove mtime assertions from tests

All tests pass. Existing test 'mtime changed but content same - git
operation scenario' verifies the fix works correctly.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
Steve Yegge
2025-11-23 22:50:29 -08:00
parent 7491c142d4
commit c9a2e7a8b2
6 changed files with 75 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cmd/bd/daemon_sync.go
View File

@@ -251,10 +251,11 @@ func sanitizeMetadataKey(key string) string {
// In multi-repo mode, keySuffix should be the stable repo identifier (e.g., ".", "../frontend").
//
// Metadata key format (bd-ar2.12):
// - Single-repo mode: "last_import_hash", "last_import_time", "last_import_mtime"
// - Single-repo mode: "last_import_hash", "last_import_time"
// - Multi-repo mode: "last_import_hash:<repo_key>", "last_import_time:<repo_key>", etc.
// where <repo_key> is a stable repo identifier like "." or "../frontend"
// - Windows paths: Colons in absolute paths (e.g., C:\...) are replaced with underscores (bd-web8)
// - Note: "last_import_mtime" was removed in bd-v0y fix (git doesn't preserve mtime)
//
// Transaction boundaries (bd-ar2.6):
// This function does NOT provide atomicity between JSONL write, metadata updates, and DB mtime.
@@ -279,11 +280,9 @@ func updateExportMetadata(ctx context.Context, store storage.Storage, jsonlPath
// Build metadata keys with optional suffix for per-repo tracking
hashKey := "last_import_hash"
timeKey := "last_import_time"
mtimeKey := "last_import_mtime"
if keySuffix != "" {
hashKey += ":" + keySuffix
timeKey += ":" + keySuffix
mtimeKey += ":" + keySuffix
}
// Note: Metadata update failures are treated as warnings, not errors (bd-ar2.5).
@@ -300,14 +299,7 @@ func updateExportMetadata(ctx context.Context, store storage.Storage, jsonlPath
if err := store.SetMetadata(ctx, timeKey, exportTime); err != nil {
log.log("Warning: failed to update %s: %v", timeKey, err)
}
// Store mtime for fast-path optimization
if jsonlInfo, statErr := os.Stat(jsonlPath); statErr == nil {
mtimeStr := fmt.Sprintf("%d", jsonlInfo.ModTime().Unix())
if err := store.SetMetadata(ctx, mtimeKey, mtimeStr); err != nil {
log.log("Warning: failed to update %s: %v", mtimeKey, err)
}
}
// Note: mtime tracking removed in bd-v0y fix (git doesn't preserve mtime)
}
// validateDatabaseFingerprint checks that the database belongs to this repository