Implements automatic fix capability for bd doctor with user confirmation and security hardening. Features: - Organizes fix implementations under doctor/fix/ directory structure - Shows all fixable issues and prompts for confirmation (Y/n) before applying - Provides clear output about what was fixed and any errors encountered - Re-runs diagnostics after fixes to show updated state - Each fix is idempotent and safe to run multiple times Automatic fixes implemented: - Git hooks (runs bd hooks install) - Daemon health issues (runs bd daemons killall) - DB-JSONL sync problems (runs bd sync --import-only) - File permissions (fixes .beads/ and database permissions) - Database version mismatches (runs bd migrate) - Schema compatibility issues (runs bd migrate) - Gitignore updates (writes canonical template) Security improvements: - Prevents command injection by using os.Executable() instead of PATH lookup - Prevents path traversal attacks with workspace validation - Fixes race conditions by using cmd.Dir instead of os.Chdir() - Corrects file permission logic (proper bit masking) - Validates all operations run in beads workspaces only Files changed: - cmd/bd/doctor.go: Enhanced applyFixes() with confirmation and better UX - cmd/bd/doctor/gitignore.go: Fixed permissions (0600 → 0644) - cmd/bd/doctor/fix/common.go: Security helpers (getBdBinary, validateBeadsWorkspace) - cmd/bd/doctor/fix/hooks.go: Git hooks fix - cmd/bd/doctor/fix/daemon.go: Daemon health fix - cmd/bd/doctor/fix/sync.go: DB-JSONL sync fix - cmd/bd/doctor/fix/permissions.go: File permissions fix - cmd/bd/doctor/fix/migrate.go: Database migration fixes 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
59 lines
1.3 KiB
Go
59 lines
1.3 KiB
Go
package fix
|
|
|
|
import (
|
|
"fmt"
|
|
"os"
|
|
"os/exec"
|
|
"path/filepath"
|
|
)
|
|
|
|
// DBJSONLSync fixes database-JSONL sync issues by running bd sync --import-only
|
|
func DBJSONLSync(path string) error {
|
|
// Validate workspace
|
|
if err := validateBeadsWorkspace(path); err != nil {
|
|
return err
|
|
}
|
|
|
|
beadsDir := filepath.Join(path, ".beads")
|
|
|
|
// Check if both database and JSONL exist
|
|
dbPath := filepath.Join(beadsDir, "beads.db")
|
|
jsonlPath := filepath.Join(beadsDir, "issues.jsonl")
|
|
beadsJSONLPath := filepath.Join(beadsDir, "beads.jsonl")
|
|
|
|
hasDB := false
|
|
if _, err := os.Stat(dbPath); err == nil {
|
|
hasDB = true
|
|
}
|
|
|
|
hasJSONL := false
|
|
if _, err := os.Stat(jsonlPath); err == nil {
|
|
hasJSONL = true
|
|
} else if _, err := os.Stat(beadsJSONLPath); err == nil {
|
|
hasJSONL = true
|
|
}
|
|
|
|
if !hasDB || !hasJSONL {
|
|
// Nothing to sync
|
|
return nil
|
|
}
|
|
|
|
// Get bd binary path
|
|
bdBinary, err := getBdBinary()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
// Run bd sync --import-only to import JSONL updates
|
|
cmd := exec.Command(bdBinary, "sync", "--import-only") // #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 sync database with JSONL: %w", err)
|
|
}
|
|
|
|
return nil
|
|
}
|