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

Fix bd-gdzd: Treat same-content-different-ID as update

Browse Source 
When import finds same content hash with different IDs, treat it as
an update to the existing issue instead of failing with 'rename
collision' error. This handles edge cases like test data, legacy
data, or data corruption gracefully.

Amp-Thread-ID: https://ampcode.com/threads/T-e58a11be-cbbb-4a75-86d5-fc51af8f51d2
Co-authored-by: Amp <amp@ampcode.com>
This commit is contained in:
Steve Yegge
2025-11-05 00:54:25 -08:00
parent 6c541edeed
commit 0abd21f7a6
1 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
internal/importer/importer.go
View File

@@ -289,9 +289,29 @@ func handleRename(ctx context.Context, s *sqlite.SQLiteStorage, existing *types.
// The rename is already complete in the database // The rename is already complete in the database
return deletedID, nil return deletedID, nil
} }
// REMOVED (bd-8e05): Sequential ID collision handling during rename // With hash IDs, same content should produce same ID. If we find same content
// With hash-based IDs, rename collisions should not occur // with different IDs, treat it as an update to the existing ID (not a rename).
return "", fmt.Errorf("rename collision handling removed - should not occur with hash IDs") // This handles edge cases like test data, legacy data, or data corruption.
// Keep the existing ID and update fields if incoming has newer timestamp.
if incoming.UpdatedAt.After(existing.UpdatedAt) {
// Update existing issue with incoming's fields
updates := map[string]interface{}{
"title": incoming.Title,
"description": incoming.Description,
"design": incoming.Design,
"acceptance_criteria": incoming.AcceptanceCriteria,
"notes": incoming.Notes,
"external_ref": incoming.ExternalRef,
"status": incoming.Status,
"priority": incoming.Priority,
"issue_type": incoming.IssueType,
"assignee": incoming.Assignee,
}
if err := s.UpdateIssue(ctx, existing.ID, updates, "importer"); err != nil {
return "", fmt.Errorf("failed to update issue %s: %w", existing.ID, err)
}
}
return "", nil
/* OLD CODE REMOVED (bd-8e05) /* OLD CODE REMOVED (bd-8e05)
// Different content - this is a collision during rename // Different content - this is a collision during rename