From 135802f1aa0db542cde3d0825b443c6563c0b511 Mon Sep 17 00:00:00 2001 From: Steve Yegge Date: Sun, 28 Dec 2025 13:52:21 -0800 Subject: [PATCH] Consolidate CLI commands to reduce top-level surface area MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - migrate-* commands ā†’ subcommands of `bd migrate` - relate/unrelate ā†’ subcommands of `bd dep` - daemons subcommands ā†’ available under `bd daemon` - comment alias ā†’ hidden with deprecation warning All old commands still work with deprecation warnings for backwards compatibility. Reduces visible top-level commands from ~73 to 66. šŸ¤– Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 --- cmd/bd/comments.go | 22 +++---- cmd/bd/daemons.go | 16 ++++- cmd/bd/migrate.go | 112 ++++------------------------------- cmd/bd/migrate_hash_ids.go | 12 +++- cmd/bd/migrate_issues.go | 12 +++- cmd/bd/migrate_sync.go | 12 +++- cmd/bd/migrate_tombstones.go | 12 +++- cmd/bd/relate.go | 26 +++++--- 8 files changed, 86 insertions(+), 138 deletions(-) diff --git a/cmd/bd/comments.go b/cmd/bd/comments.go index 190e366e..5e54a9d7 100644 --- a/cmd/bd/comments.go +++ b/cmd/bd/comments.go @@ -203,21 +203,15 @@ Examples: }, } -// commentCmd is a top-level alias for commentsAddCmd +// commentCmd is a hidden top-level alias for commentsAddCmd (backwards compat) var commentCmd = &cobra.Command{ - Use: "comment [issue-id] [text]", - GroupID: "issues", - Short: "Add a comment to an issue (alias for 'comments add')", - Long: `Add a comment to an issue. This is a convenient alias for 'bd comments add'. - -Examples: - # Add a comment - bd comment bd-123 "Working on this now" - - # Add a comment from a file - bd comment bd-123 -f notes.txt`, - Args: cobra.MinimumNArgs(1), - Run: commentsAddCmd.Run, + Use: "comment [issue-id] [text]", + Short: "Add a comment to an issue (alias for 'comments add')", + Long: `Add a comment to an issue. This is an alias for 'bd comments add'.`, + Args: cobra.MinimumNArgs(1), + Run: commentsAddCmd.Run, + Hidden: true, + Deprecated: "use 'bd comments add' instead", } func init() { diff --git a/cmd/bd/daemons.go b/cmd/bd/daemons.go index 7e9e4999..ac1ddc0b 100644 --- a/cmd/bd/daemons.go +++ b/cmd/bd/daemons.go @@ -604,14 +604,26 @@ stale sockets, version mismatches, and unresponsive daemons.`, }, } func init() { - rootCmd.AddCommand(daemonsCmd) - // Add subcommands + // Add multi-daemon subcommands to daemonCmd (primary location) + daemonCmd.AddCommand(daemonsListCmd) + daemonCmd.AddCommand(daemonsHealthCmd) + daemonCmd.AddCommand(daemonsStopCmd) + daemonCmd.AddCommand(daemonsLogsCmd) + daemonCmd.AddCommand(daemonsKillallCmd) + daemonCmd.AddCommand(daemonsRestartCmd) + + // Also add to daemonsCmd for backwards compatibility + // Make daemonsCmd a hidden alias that shows deprecation + daemonsCmd.Hidden = true + daemonsCmd.Deprecated = "use 'bd daemon ' instead (e.g., 'bd daemon list')" daemonsCmd.AddCommand(daemonsListCmd) daemonsCmd.AddCommand(daemonsHealthCmd) daemonsCmd.AddCommand(daemonsStopCmd) daemonsCmd.AddCommand(daemonsLogsCmd) daemonsCmd.AddCommand(daemonsKillallCmd) daemonsCmd.AddCommand(daemonsRestartCmd) + rootCmd.AddCommand(daemonsCmd) + // Flags for list command daemonsListCmd.Flags().StringSlice("search", nil, "Directories to search for daemons (default: home, /tmp, cwd)") daemonsListCmd.Flags().Bool("no-cleanup", false, "Skip auto-cleanup of stale sockets") diff --git a/cmd/bd/migrate.go b/cmd/bd/migrate.go index 24d30ad0..14d15bbd 100644 --- a/cmd/bd/migrate.go +++ b/cmd/bd/migrate.go @@ -23,25 +23,27 @@ import ( var migrateCmd = &cobra.Command{ Use: "migrate", GroupID: "maint", - Short: "Migrate database to current version", - Long: `Detect and migrate database files to the current version. + Short: "Database migration commands", + Long: `Database migration and data transformation commands. -This command: +Without subcommand, detects and migrates database schema to current version: - Finds all .db files in .beads/ - Checks schema versions - Migrates old databases to beads.db - Updates schema version metadata -- Migrates sequential IDs to hash-based IDs (with --to-hash-ids) -- Enables separate branch workflow (with --to-separate-branch) -- Removes stale databases (with confirmation)`, +- Removes stale databases (with confirmation) + +Subcommands: + hash-ids Migrate sequential IDs to hash-based IDs (legacy) + issues Move issues between repositories + sync Set up sync.branch workflow for multi-clone setups + tombstones Convert deletions.jsonl to inline tombstones`, Run: func(cmd *cobra.Command, _ []string) { autoYes, _ := cmd.Flags().GetBool("yes") cleanup, _ := cmd.Flags().GetBool("cleanup") dryRun, _ := cmd.Flags().GetBool("dry-run") updateRepoID, _ := cmd.Flags().GetBool("update-repo-id") - toHashIDs, _ := cmd.Flags().GetBool("to-hash-ids") inspect, _ := cmd.Flags().GetBool("inspect") - toSeparateBranch, _ := cmd.Flags().GetString("to-separate-branch") // Block writes in readonly mode (migration modifies data, --inspect is read-only) if !dryRun && !inspect { @@ -60,12 +62,6 @@ This command: return } - // Handle --to-separate-branch - if toSeparateBranch != "" { - handleToSeparateBranch(toSeparateBranch, dryRun) - return - } - // Find .beads directory beadsDir := beads.FindBeadsDir() if beadsDir == "" { @@ -376,92 +372,6 @@ This command: } } - - // Migrate to hash IDs if requested - if toHashIDs { - if !jsonOutput { - fmt.Println("\nā†’ Migrating to hash-based IDs...") - } - - store, err := sqlite.New(rootCtx, targetPath) - if err != nil { - if jsonOutput { - outputJSON(map[string]interface{}{ - "error": "hash_migration_failed", - "message": err.Error(), - }) - } else { - fmt.Fprintf(os.Stderr, "Error: failed to open database: %v\n", err) - } - os.Exit(1) - } - - ctx := rootCtx - issues, err := store.SearchIssues(ctx, "", types.IssueFilter{}) - if err != nil { - _ = store.Close() - if jsonOutput { - outputJSON(map[string]interface{}{ - "error": "hash_migration_failed", - "message": err.Error(), - }) - } else { - fmt.Fprintf(os.Stderr, "Error: failed to list issues: %v\n", err) - } - os.Exit(1) - } - - if len(issues) > 0 && !isHashID(issues[0].ID) { - // Create backup - if !dryRun { - backupPath := strings.TrimSuffix(targetPath, ".db") + ".backup-pre-hash-" + time.Now().Format("20060102-150405") + ".db" - if err := copyFile(targetPath, backupPath); err != nil { - _ = store.Close() - if jsonOutput { - outputJSON(map[string]interface{}{ - "error": "backup_failed", - "message": err.Error(), - }) - } else { - fmt.Fprintf(os.Stderr, "Error: failed to create backup: %v\n", err) - } - os.Exit(1) - } - if !jsonOutput { - fmt.Printf("%s\n", ui.RenderPass(fmt.Sprintf("āœ“ Created backup: %s", filepath.Base(backupPath)))) - } - } - - mapping, err := migrateToHashIDs(ctx, store, issues, dryRun) - _ = store.Close() - - if err != nil { - if jsonOutput { - outputJSON(map[string]interface{}{ - "error": "hash_migration_failed", - "message": err.Error(), - }) - } else { - fmt.Fprintf(os.Stderr, "Error: hash ID migration failed: %v\n", err) - } - os.Exit(1) - } - - if !jsonOutput { - if dryRun { - fmt.Printf("\nWould migrate %d issues to hash-based IDs\n", len(mapping)) - } else { - fmt.Printf("%s\n", ui.RenderPass(fmt.Sprintf("āœ“ Migrated %d issues to hash-based IDs", len(mapping)))) - } - } - } else { - _ = store.Close() - if !jsonOutput { - fmt.Println("Database already uses hash-based IDs") - } - } - } - // Save updated config if !dryRun { if err := cfg.Save(beadsDir); err != nil { @@ -1063,9 +973,7 @@ func init() { migrateCmd.Flags().Bool("cleanup", false, "Remove old database files after migration") migrateCmd.Flags().Bool("dry-run", false, "Show what would be done without making changes") migrateCmd.Flags().Bool("update-repo-id", false, "Update repository ID (use after changing git remote)") - migrateCmd.Flags().Bool("to-hash-ids", false, "Migrate sequential IDs to hash-based IDs") migrateCmd.Flags().Bool("inspect", false, "Show migration plan and database state for AI agent analysis") - migrateCmd.Flags().String("to-separate-branch", "", "Enable separate branch workflow (e.g., 'beads-metadata')") migrateCmd.Flags().BoolVar(&jsonOutput, "json", false, "Output migration statistics in JSON format") rootCmd.AddCommand(migrateCmd) } diff --git a/cmd/bd/migrate_hash_ids.go b/cmd/bd/migrate_hash_ids.go index 8c47b15f..e9139769 100644 --- a/cmd/bd/migrate_hash_ids.go +++ b/cmd/bd/migrate_hash_ids.go @@ -23,8 +23,7 @@ import ( // TODO: Consider integrating into 'bd doctor' migration detection var migrateHashIDsCmd = &cobra.Command{ - Use: "migrate-hash-ids", - GroupID: "maint", + Use: "hash-ids", Short: "Migrate sequential IDs to hash-based IDs (legacy)", Long: `Migrate database from sequential IDs (bd-1, bd-2) to hash-based IDs (bd-a3f8e9a2). @@ -425,5 +424,12 @@ func copyFile(src, dst string) error { func init() { migrateHashIDsCmd.Flags().Bool("dry-run", false, "Show what would be done without making changes") - rootCmd.AddCommand(migrateHashIDsCmd) + migrateCmd.AddCommand(migrateHashIDsCmd) + + // Backwards compatibility alias at root level (hidden) + migrateHashIDsAliasCmd := *migrateHashIDsCmd + migrateHashIDsAliasCmd.Use = "migrate-hash-ids" + migrateHashIDsAliasCmd.Hidden = true + migrateHashIDsAliasCmd.Deprecated = "use 'bd migrate hash-ids' instead" + rootCmd.AddCommand(&migrateHashIDsAliasCmd) } diff --git a/cmd/bd/migrate_issues.go b/cmd/bd/migrate_issues.go index d29cd376..eaad3f88 100644 --- a/cmd/bd/migrate_issues.go +++ b/cmd/bd/migrate_issues.go @@ -14,8 +14,7 @@ import ( // TODO: Consider integrating into 'bd doctor' migration detection var migrateIssuesCmd = &cobra.Command{ - Use: "migrate-issues", - GroupID: "maint", + Use: "issues", Short: "Move issues between repositories", Long: `Move issues from one source repository to another with filtering and dependency preservation. @@ -692,7 +691,7 @@ func loadIDsFromFile(path string) ([]string, error) { } func init() { - rootCmd.AddCommand(migrateIssuesCmd) + migrateCmd.AddCommand(migrateIssuesCmd) migrateIssuesCmd.Flags().String("from", "", "Source repository (required)") migrateIssuesCmd.Flags().String("to", "", "Destination repository (required)") @@ -710,4 +709,11 @@ func init() { _ = migrateIssuesCmd.MarkFlagRequired("from") // Only fails if flag missing (caught in tests) _ = migrateIssuesCmd.MarkFlagRequired("to") // Only fails if flag missing (caught in tests) + + // Backwards compatibility alias at root level (hidden) + migrateIssuesAliasCmd := *migrateIssuesCmd + migrateIssuesAliasCmd.Use = "migrate-issues" + migrateIssuesAliasCmd.Hidden = true + migrateIssuesAliasCmd.Deprecated = "use 'bd migrate issues' instead" + rootCmd.AddCommand(&migrateIssuesAliasCmd) } diff --git a/cmd/bd/migrate_sync.go b/cmd/bd/migrate_sync.go index a1d4a548..ba37dfc9 100644 --- a/cmd/bd/migrate_sync.go +++ b/cmd/bd/migrate_sync.go @@ -15,8 +15,7 @@ import ( // TODO: Consider integrating into 'bd doctor' migration detection var migrateSyncCmd = &cobra.Command{ - Use: "migrate-sync ", - GroupID: "maint", + Use: "sync ", Short: "Migrate to sync.branch workflow for multi-clone setups", Long: `Migrate to using a dedicated sync branch for beads data. @@ -60,7 +59,14 @@ Examples: func init() { migrateSyncCmd.Flags().Bool("dry-run", false, "Preview migration without making changes") migrateSyncCmd.Flags().Bool("force", false, "Force migration even if already configured") - rootCmd.AddCommand(migrateSyncCmd) + migrateCmd.AddCommand(migrateSyncCmd) + + // Backwards compatibility alias at root level (hidden) + migrateSyncAliasCmd := *migrateSyncCmd + migrateSyncAliasCmd.Use = "migrate-sync" + migrateSyncAliasCmd.Hidden = true + migrateSyncAliasCmd.Deprecated = "use 'bd migrate sync' instead" + rootCmd.AddCommand(&migrateSyncAliasCmd) } func runMigrateSync(ctx context.Context, branchName string, dryRun, force bool) error { diff --git a/cmd/bd/migrate_tombstones.go b/cmd/bd/migrate_tombstones.go index c04976ee..cf094bd7 100644 --- a/cmd/bd/migrate_tombstones.go +++ b/cmd/bd/migrate_tombstones.go @@ -71,8 +71,7 @@ func loadLegacyDeletionsCmd(path string) (map[string]legacyDeletionRecordCmd, [] // TODO: Consider integrating into 'bd doctor' migration detection var migrateTombstonesCmd = &cobra.Command{ - Use: "migrate-tombstones", - GroupID: "maint", + Use: "tombstones", Short: "Convert deletions.jsonl entries to inline tombstones", Long: `Migrate legacy deletions.jsonl entries to inline tombstones in issues.jsonl. @@ -344,5 +343,12 @@ func init() { migrateTombstonesCmd.Flags().Bool("dry-run", false, "Preview changes without modifying files") migrateTombstonesCmd.Flags().Bool("verbose", false, "Show detailed progress") migrateTombstonesCmd.Flags().BoolVar(&jsonOutput, "json", false, "Output in JSON format") - rootCmd.AddCommand(migrateTombstonesCmd) + migrateCmd.AddCommand(migrateTombstonesCmd) + + // Backwards compatibility alias at root level (hidden) + migrateTombstonesAliasCmd := *migrateTombstonesCmd + migrateTombstonesAliasCmd.Use = "migrate-tombstones" + migrateTombstonesAliasCmd.Hidden = true + migrateTombstonesAliasCmd.Deprecated = "use 'bd migrate tombstones' instead" + rootCmd.AddCommand(&migrateTombstonesAliasCmd) } diff --git a/cmd/bd/relate.go b/cmd/bd/relate.go index b735544f..37676ad5 100644 --- a/cmd/bd/relate.go +++ b/cmd/bd/relate.go @@ -13,9 +13,8 @@ import ( ) var relateCmd = &cobra.Command{ - Use: "relate ", - GroupID: "deps", - Short: "Create a bidirectional relates_to link between issues", + Use: "relate ", + Short: "Create a bidirectional relates_to link between issues", Long: `Create a loose 'see also' relationship between two issues. The relates_to link is bidirectional - both issues will reference each other. @@ -29,9 +28,8 @@ Examples: } var unrelateCmd = &cobra.Command{ - Use: "unrelate ", - GroupID: "deps", - Short: "Remove a relates_to link between issues", + Use: "unrelate ", + Short: "Remove a relates_to link between issues", Long: `Remove a relates_to relationship between two issues. Removes the link in both directions. @@ -43,8 +41,20 @@ Example: } func init() { - rootCmd.AddCommand(relateCmd) - rootCmd.AddCommand(unrelateCmd) + // Add as subcommands of dep + depCmd.AddCommand(relateCmd) + depCmd.AddCommand(unrelateCmd) + + // Backwards compatibility aliases at root level (hidden) + relateAliasCmd := *relateCmd + relateAliasCmd.Hidden = true + relateAliasCmd.Deprecated = "use 'bd dep relate' instead" + rootCmd.AddCommand(&relateAliasCmd) + + unrelateAliasCmd := *unrelateCmd + unrelateAliasCmd.Hidden = true + unrelateAliasCmd.Deprecated = "use 'bd dep unrelate' instead" + rootCmd.AddCommand(&unrelateAliasCmd) } func runRelate(cmd *cobra.Command, args []string) error {