refactor: reorganize into idiomatic Go project layout

timvw · timvw · commit a5bfe3b029e7 · 2026-04-08T14:50:04.000+02:00
Move from flat package main to structured layout:
- cmd/: all cobra commands and CLI logic (package cmd)
- internal/color/: ANSI color utilities
- internal/fuzzy/: fuzzy matching for interactive selectors
- main.go: slim entry point calling cmd.Execute()

Update goreleaser ldflags to use cmd.Version.
diff --git a/.goreleaser.yml b/.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:
diff --git a/cmd/checkout.go b/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()
diff --git a/cmd/cleanup.go b/cmd/cleanup.go
@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"fmt"
diff --git a/cmd/cleanup_test.go b/cmd/cleanup_test.go
@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"os"
diff --git a/cmd/config.go b/cmd/config.go
@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"fmt"
diff --git a/cmd/config_cmd.go b/cmd/config_cmd.go
@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"fmt"
diff --git a/cmd/config_test.go b/cmd/config_test.go
@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"bytes"
diff --git a/cmd/create.go b/cmd/create.go
@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"fmt"
diff --git a/cmd/default.go b/cmd/default.go
@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"fmt"
diff --git a/cmd/default_test.go b/cmd/default_test.go
@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"strings"
diff --git a/cmd/e2e_interactive_test.go b/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
diff --git a/cmd/examples.go b/cmd/examples.go
@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"fmt"
diff --git a/cmd/examples_test.go b/cmd/examples_test.go
@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"bytes"
diff --git a/cmd/hooks.go b/cmd/hooks.go
@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"fmt"
diff --git a/cmd/info.go b/cmd/info.go
@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"fmt"
diff --git a/cmd/init.go b/cmd/init.go
@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"fmt"
diff --git a/cmd/init_test.go b/cmd/init_test.go
@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"encoding/json"
diff --git a/cmd/list.go b/cmd/list.go
@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"os"
diff --git a/cmd/main_test.go b/cmd/main_test.go
@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"fmt"
diff --git a/cmd/migrate.go b/cmd/migrate.go
@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"fmt"
diff --git a/cmd/migrate_test.go b/cmd/migrate_test.go
@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"encoding/json"
diff --git a/cmd/output.go b/cmd/output.go
@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"encoding/json"
diff --git a/cmd/output_test.go b/cmd/output_test.go
@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"bytes"
diff --git a/cmd/pr.go b/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()
diff --git a/cmd/prune.go b/cmd/prune.go
@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"fmt"
diff --git a/cmd/remove.go b/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()
diff --git a/cmd/remove_cleanup_test.go b/cmd/remove_cleanup_test.go
@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"fmt"
diff --git a/cmd/remove_force_test.go b/cmd/remove_force_test.go
@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"os"
diff --git a/cmd/repo.go b/cmd/repo.go
@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"encoding/json"
diff --git a/cmd/root.go b/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,
+	)
+}
diff --git a/cmd/shellenv.go b/cmd/shellenv.go
@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"fmt"
diff --git a/cmd/shellenv_test.go b/cmd/shellenv_test.go
diff --git a/cmd/stale.go b/cmd/stale.go
diff --git a/cmd/stale_test.go b/cmd/stale_test.go
diff --git a/cmd/status.go b/cmd/status.go
diff --git a/cmd/status_color_test.go b/cmd/status_color_test.go
diff --git a/cmd/status_test.go b/cmd/status_test.go
diff --git a/cmd/version.go b/cmd/version.go
diff --git a/cmd/worktree_path.go b/cmd/worktree_path.go
diff --git a/fuzzy.go b/fuzzy.go
diff --git a/internal/color/color.go b/internal/color/color.go
diff --git a/internal/color/color_test.go b/internal/color/color_test.go
diff --git a/internal/fuzzy/fuzzy.go b/internal/fuzzy/fuzzy.go
diff --git a/internal/fuzzy/fuzzy_test.go b/internal/fuzzy/fuzzy_test.go
diff --git a/main.go b/main.go

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package main`
	`1`	`+package cmd`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"fmt"`