refactor: reorganize into idiomatic Go project layout

.goreleaser.yml

@@ -13,7 +13,7 @@ builds:
   - main: .
     binary: wt
     ldflags:
-      - -s -w -X main.version={{.Version}}
+      - -s -w -X github.com/timvw/wt/cmd.Version={{.Version}}
     env:
       - CGO_ENABLED=0
     goos:

checkout.go → cmd/checkout.go

@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"fmt"
@@ -7,6 +7,7 @@ import (
 
 	"github.com/manifoldco/promptui"
 	"github.com/spf13/cobra"
+	"github.com/timvw/wt/internal/fuzzy"
 )
 
 var checkoutCmd = &cobra.Command{
@@ -33,7 +34,7 @@ var checkoutCmd = &cobra.Command{
 			prompt := promptui.Select{
 				Label:             "Select branch to checkout",
 				Items:             branches,
-				Searcher:          fuzzySearcher(branches),
+				Searcher:          fuzzy.Searcher(branches),
 				StartInSearchMode: true,
 			}
 			_, result, err := prompt.Run()

cleanup.go → cmd/cleanup.go

@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"fmt"

cleanup_test.go → cmd/cleanup_test.go

@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"os"

config.go → cmd/config.go

@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"fmt"

config_cmd.go → cmd/config_cmd.go

@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"fmt"

config_test.go → cmd/config_test.go

@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"bytes"

create.go → cmd/create.go

@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"fmt"

default.go → cmd/default.go

@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"fmt"

default_test.go → cmd/default_test.go

@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"strings"

e2e_interactive_test.go → cmd/e2e_interactive_test.go

@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"bytes"
@@ -1380,7 +1380,7 @@ func buildWtBinary(t *testing.T, tmpDir string) string {
 		}
 
 		builtWtBinaryPath = filepath.Join(buildDir, binaryName)
-		cmd := exec.Command("go", "build", "-o", builtWtBinaryPath, ".")
+		cmd := exec.Command("go", "build", "-o", builtWtBinaryPath, "github.com/timvw/wt")
 		if output, err := cmd.CombinedOutput(); err != nil {
 			builtWtBinaryErr = fmt.Errorf("failed to build wt binary: %v\nOutput: %s", err, output)
 			return

examples.go → cmd/examples.go

@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"fmt"

examples_test.go → cmd/examples_test.go

@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"bytes"

hooks.go → cmd/hooks.go

@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"fmt"

info.go → cmd/info.go

@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"fmt"

init.go → cmd/init.go

@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"fmt"

init_test.go → cmd/init_test.go

@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"encoding/json"

list.go → cmd/list.go

@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"os"

main_test.go → cmd/main_test.go

@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"fmt"

migrate.go → cmd/migrate.go

@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"fmt"

migrate_test.go → cmd/migrate_test.go

@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"encoding/json"

output.go → cmd/output.go

@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"encoding/json"

output_test.go → cmd/output_test.go

@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"bytes"

pr.go → cmd/pr.go

@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"fmt"
@@ -8,6 +8,7 @@ import (
 
 	"github.com/manifoldco/promptui"
 	"github.com/spf13/cobra"
+	"github.com/timvw/wt/internal/fuzzy"
 )
 
 var prCmd = &cobra.Command{
@@ -43,7 +44,7 @@ Examples:
 			prompt := promptui.Select{
 				Label:             "Select Pull Request",
 				Items:             labels,
-				Searcher:          fuzzySearcher(labels),
+				Searcher:          fuzzy.Searcher(labels),
 				StartInSearchMode: true,
 			}
 			idx, _, err := prompt.Run()
@@ -92,7 +93,7 @@ Examples:
 			prompt := promptui.Select{
 				Label:             "Select Merge Request",
 				Items:             labels,
-				Searcher:          fuzzySearcher(labels),
+				Searcher:          fuzzy.Searcher(labels),
 				StartInSearchMode: true,
 			}
 			idx, _, err := prompt.Run()

prune.go → cmd/prune.go

@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"fmt"

remove.go → cmd/remove.go

@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"fmt"
@@ -8,6 +8,7 @@ import (
 
 	"github.com/manifoldco/promptui"
 	"github.com/spf13/cobra"
+	"github.com/timvw/wt/internal/fuzzy"
 )
 
 var removeForce bool
@@ -37,7 +38,7 @@ var removeCmd = &cobra.Command{
 			prompt := promptui.Select{
 				Label:             "Select worktree to remove",
 				Items:             branches,
-				Searcher:          fuzzySearcher(branches),
+				Searcher:          fuzzy.Searcher(branches),
 				StartInSearchMode: true,
 			}
 			_, result, err := prompt.Run()

remove_cleanup_test.go → cmd/remove_cleanup_test.go

@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"fmt"

remove_force_test.go → cmd/remove_force_test.go

@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"os"

repo.go → cmd/repo.go

@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"encoding/json"

cmd/root.go

@@ -0,0 +1,142 @@
+package cmd
+
+import (
+	"bytes"
+	"fmt"
+	"os"
+
+	"github.com/spf13/cobra"
+)
+
+var (
+	Version           = "dev"
+	worktreeRoot      string
+	worktreeStrategy  string
+	worktreePattern   string
+	worktreeSeparator string
+)
+
+func init() {
+	loadWorktreeConfig()
+	rootCmd.Long = buildRootCmdLong()
+}
+
+// Execute runs the root command. Called by main().
+func Execute() {
+	// Re-load config after cobra parses flags so --config is available
+	rootCmd.PersistentPreRunE = func(cmd *cobra.Command, args []string) error {
+		if err := validateOutputFormat(); err != nil {
+			return err
+		}
+		if configFlag != "" {
+			loadWorktreeConfig()
+			rootCmd.Long = buildRootCmdLong()
+		}
+		return nil
+	}
+	if err := rootCmd.Execute(); err != nil {
+		if isJSONOutput() {
+			_ = emitJSONError(rootCmd, err)
+		} else {
+			fmt.Fprintln(os.Stderr, err)
+		}
+		os.Exit(1)
+	}
+}
+
+var rootCmd = &cobra.Command{
+	Use:           "wt",
+	Short:         "Git worktree helper with organized directory structure",
+	Long:          "",
+	SilenceErrors: true,
+	SilenceUsage:  true,
+	RunE: func(cmd *cobra.Command, args []string) error {
+		return printCommandHelp(cmd)
+	},
+}
+
+func printCommandHelp(cmd *cobra.Command) error {
+	return cmd.Help()
+}
+
+func init() {
+	rootCmd.PersistentFlags().StringVar(&configFlag, "config", "", "Path to config file (default: ~/.config/wt/config.toml)")
+	rootCmd.PersistentFlags().StringVar(&outputFormat, "format", formatText, "Output format: text or json")
+
+	defaultHelp := rootCmd.HelpFunc()
+	rootCmd.SetHelpFunc(func(cmd *cobra.Command, args []string) {
+		if !isJSONOutput() {
+			defaultHelp(cmd, args)
+			return
+		}
+
+		buf := bytes.NewBuffer(nil)
+		origOut := cmd.OutOrStdout()
+		origErr := cmd.ErrOrStderr()
+		cmd.SetOut(buf)
+		cmd.SetErr(buf)
+		defaultHelp(cmd, args)
+		cmd.SetOut(origOut)
+		cmd.SetErr(origErr)
+
+		_ = emitJSONSuccess(cmd, map[string]any{"help": buf.String()})
+	})
+
+	rootCmd.AddCommand(checkoutCmd)
+	rootCmd.AddCommand(createCmd)
+	rootCmd.AddCommand(prCmd)
+	rootCmd.AddCommand(mrCmd)
+	rootCmd.AddCommand(listCmd)
+	rootCmd.AddCommand(removeCmd)
+	rootCmd.AddCommand(pruneCmd)
+	rootCmd.AddCommand(cleanupCmd)
+	rootCmd.AddCommand(migrateCmd)
+	rootCmd.AddCommand(shellenvCmd)
+	rootCmd.AddCommand(versionCmd)
+	rootCmd.AddCommand(initCmd)
+	rootCmd.AddCommand(infoCmd)
+	rootCmd.AddCommand(configCmd)
+	rootCmd.AddCommand(examplesCmd)
+	rootCmd.AddCommand(defaultCmd)
+	rootCmd.AddCommand(statusCmd)
+	statusCmd.Flags().BoolVar(&statusCI, "ci", false, "Show CI/CD pipeline status for each branch (requires gh or glab CLI)")
+	removeCmd.Flags().BoolVarP(&removeForce, "force", "f", false, "Force removal even if worktree has modifications")
+	cleanupCmd.Flags().BoolVar(&cleanupDryRun, "dry-run", false, "Preview what would be removed without making changes")
+	cleanupCmd.Flags().BoolVarP(&cleanupForce, "force", "f", false, "Remove all merged worktrees without confirmation")
+	cleanupCmd.Flags().BoolVar(&cleanupStale, "stale", false, "Also detect worktrees with deleted remote branches or old commits")
+	cleanupCmd.Flags().IntVar(&cleanupStaleDays, "stale-days", 30, "Threshold in days for considering a worktree inactive")
+	migrateCmd.Flags().BoolVarP(&migrateForce, "force", "f", false, "Force migration when target path exists and is non-empty")
+	initCmd.Flags().BoolVar(&initDryRun, "dry-run", false, "Preview changes without modifying files")
+	initCmd.Flags().BoolVar(&initUninstall, "uninstall", false, "Remove wt configuration from shell")
+	initCmd.Flags().BoolVar(&initNoPrompt, "no-prompt", false, "Skip activation instructions (for automated installs)")
+	configInitCmd.Flags().BoolVar(&configInitForce, "force", false, "Overwrite existing config file")
+}
+
+func init() {
+	configCmd.AddCommand(configInitCmd)
+	configCmd.AddCommand(configShowCmd)
+	configCmd.AddCommand(configPathCmd)
+}
+
+func buildRootCmdLong() string {
+	pattern, err := resolveWorktreePattern()
+	if err != nil {
+		pattern = worktreePattern
+		if pattern == "" {
+			pattern = "unknown"
+		}
+	}
+
+	return fmt.Sprintf(`Git-like worktree management with organized directory structure.
+
+Strategy: %s
+Pattern:  %s
+Root:     %s
+
+Run 'wt info' to see available strategies and pattern variables.
+Set WORKTREE_ROOT, WORKTREE_STRATEGY, and WORKTREE_PATTERN to customize.`,
+		worktreeStrategy,
+		pattern,
+		worktreeRoot,
+	)
+}

shellenv.go → cmd/shellenv.go

@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"fmt"