8c45069228
- bd-8v5o: When doctor --fix hydrates issues from git history, also remove them from the deletions manifest to prevent perpetual skip warnings during sync - bd-wsqt: Remove verbose per-issue "Skipping bd-xxx" messages during sync. Caller already shows summary of skipped issues. Added RemoveDeletions() function to deletions package with tests. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
87 lines
2.5 KiB
Go
87 lines
2.5 KiB
Go
package fix
|
|
|
|
import (
|
|
"fmt"
|
|
"os"
|
|
"os/exec"
|
|
"path/filepath"
|
|
)
|
|
|
|
// DatabaseVersion fixes database version mismatches by running bd migrate,
|
|
// or creates the database from JSONL by running bd init for fresh clones (bd-4h9).
|
|
func DatabaseVersion(path string) error {
|
|
// Validate workspace
|
|
if err := validateBeadsWorkspace(path); err != nil {
|
|
return err
|
|
}
|
|
|
|
// Get bd binary path
|
|
bdBinary, err := getBdBinary()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
// Check if database exists - if not, run init instead of migrate (bd-4h9)
|
|
beadsDir := filepath.Join(path, ".beads")
|
|
dbPath := filepath.Join(beadsDir, "beads.db")
|
|
|
|
if _, err := os.Stat(dbPath); os.IsNotExist(err) {
|
|
// No database - this is a fresh clone, run bd init
|
|
fmt.Println("→ No database found, running 'bd init' to hydrate from JSONL...")
|
|
cmd := exec.Command(bdBinary, "init") // #nosec G204 -- bdBinary from validated executable path
|
|
cmd.Dir = path
|
|
cmd.Stdout = os.Stdout
|
|
cmd.Stderr = os.Stderr
|
|
|
|
if err := cmd.Run(); err != nil {
|
|
return fmt.Errorf("failed to initialize database: %w", err)
|
|
}
|
|
|
|
// bd-8v5o: Clean up deletions manifest for hydrated issues
|
|
// After init, remove any issues from deletions.jsonl that exist in JSONL
|
|
// This prevents perpetual "Skipping bd-xxx (in deletions manifest)" warnings
|
|
jsonlPath := findJSONLPath(beadsDir)
|
|
if jsonlPath != "" {
|
|
if err := cleanupDeletionsManifest(beadsDir, jsonlPath); err != nil {
|
|
// Non-fatal - just log warning
|
|
fmt.Printf(" Warning: failed to clean up deletions manifest: %v\n", err)
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// Database exists - run bd migrate
|
|
cmd := exec.Command(bdBinary, "migrate") // #nosec G204 -- bdBinary from validated executable path
|
|
cmd.Dir = path // Set working directory without changing process dir
|
|
cmd.Stdout = os.Stdout
|
|
cmd.Stderr = os.Stderr
|
|
|
|
if err := cmd.Run(); err != nil {
|
|
return fmt.Errorf("failed to migrate database: %w", err)
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// findJSONLPath returns the path to the JSONL file in the beads directory.
|
|
// Returns empty string if no JSONL file exists.
|
|
func findJSONLPath(beadsDir string) string {
|
|
jsonlPath := filepath.Join(beadsDir, "issues.jsonl")
|
|
if _, err := os.Stat(jsonlPath); err == nil {
|
|
return jsonlPath
|
|
}
|
|
|
|
beadsJSONLPath := filepath.Join(beadsDir, "beads.jsonl")
|
|
if _, err := os.Stat(beadsJSONLPath); err == nil {
|
|
return beadsJSONLPath
|
|
}
|
|
|
|
return ""
|
|
}
|
|
|
|
// SchemaCompatibility fixes schema compatibility issues by running bd migrate
|
|
func SchemaCompatibility(path string) error {
|
|
return DatabaseVersion(path)
|
|
}
|