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

fix: skip prefix validation in multi-repo mode (GH#686) (#688)

Browse Source 
Issues from additional repos have their own prefixes, which is expected.
Skip validation when multi-repo config is present.
This commit is contained in:
Gero Hillebrandt
2025-12-22 10:25:19 +01:00
committed by GitHub
parent 2c5acc9060
commit 9d30e80fdf
2 changed files with 110 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
internal/importer/importer.go
View File

@@ -7,6 +7,7 @@ import (
"sort"
"strings"
"github.com/steveyegge/beads/internal/config"
"github.com/steveyegge/beads/internal/linear"
"github.com/steveyegge/beads/internal/storage"
"github.com/steveyegge/beads/internal/storage/sqlite"
@@ -106,6 +107,12 @@ func ImportIssues(ctx context.Context, dbPath string, store storage.Storage, iss
defer func() { _ = sqliteStore.Close() }()
}
// GH#686: In multi-repo mode, skip prefix validation for all issues.
// Issues from additional repos have their own prefixes which are expected and correct.
if config.GetMultiRepoConfig() != nil && !opts.SkipPrefixValidation {
opts.SkipPrefixValidation = true
}
// Clear export_hashes before import to prevent staleness (bd-160)
// Import operations may add/update issues, so export_hashes entries become invalid
if !opts.DryRun {
@@ -208,6 +215,12 @@ func handlePrefixMismatch(ctx context.Context, sqliteStore *sqlite.SQLiteStorage
result.ExpectedPrefix = configuredPrefix
// GH#686: In multi-repo mode, allow all prefixes (nil = allow all)
allowedPrefixes := buildAllowedPrefixSet(configuredPrefix)
if allowedPrefixes == nil {
return issues, nil
}
// Analyze prefixes in imported issues
// Track tombstones separately - they don't count as "real" mismatches (bd-6pni)
tombstoneMismatchPrefixes := make(map[string]int)
@@ -219,7 +232,7 @@ func handlePrefixMismatch(ctx context.Context, sqliteStore *sqlite.SQLiteStorage
for _, issue := range issues {
prefix := utils.ExtractIssuePrefix(issue.ID)
if prefix != configuredPrefix {
if !allowedPrefixes[prefix] {
if issue.IsTombstone() {
tombstoneMismatchPrefixes[prefix]++
tombstonesToRemove = append(tombstonesToRemove, issue.ID)
@@ -939,3 +952,12 @@ func validateNoDuplicateExternalRefs(issues []*types.Issue, clearDuplicates bool
return nil
}
// buildAllowedPrefixSet returns allowed prefixes, or nil to allow all (GH#686).
// In multi-repo mode, additional repos have their own prefixes - allow all.
func buildAllowedPrefixSet(primaryPrefix string) map[string]bool {
if config.GetMultiRepoConfig() != nil {
return nil // Multi-repo: allow all prefixes
}
return map[string]bool{primaryPrefix: true}
}