Feature/architecture refactor (#12)

* updates: better cli

* plan described

* githelpers better support for custom command (undo/back)

* logging use +-MN pattern from now

* switch from if into case to make linter happier

* up

* final shavings

* reuse shared flags

Author: amberpixels

.gitignore

@@ -37,9 +37,4 @@ go.work.sum
 
 .idea
 
-# generated result of aictx itself
-output.txt
-
-.claude
-
 /build

cmd/git-back/main.go

@@ -1,44 +1,54 @@
 package main
 
 import (
-	"fmt"
+	"context"
 	"os"
-	"runtime/debug"
+	"os/signal"
+	"syscall"
 
+	"github.com/amberpixels/git-undo/cmd/shared"
 	"github.com/amberpixels/git-undo/internal/app"
+	"github.com/urfave/cli/v3"
 )
 
 // version is set by the build ldflags
 // The default value is "dev+dirty" but it should never be used. In success path, it's always overwritten.
 var version = "dev+dirty"
+var versionSource = "hardcoded"
 
-func main() {
-	var verbose, dryRun bool
-	for _, arg := range os.Args[1:] {
-		if arg == "-v" || arg == "--verbose" {
-			verbose = true
-		}
-		if arg == "--dry-run" {
-			dryRun = true
-		}
-	}
+const (
+	appNameGitBack = "git-back"
+)
 
-	// When running binary that was installed via `go install`, here we'll get the proper version
-	if bi, ok := debug.ReadBuildInfo(); ok && bi.Main.Version != "" {
-		version = bi.Main.Version
+func main() {
+	// Create a context that can be cancelled with Ctrl+C
+	ctx, cancel := signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM)
+	defer cancel()
+
+	version, versionSource = app.HandleAppVersion(version, versionSource)
+
+	cmd := &cli.Command{
+		Name:  appNameGitBack,
+		Usage: "Navigate back through git checkout/switch operations",
+		Flags: shared.CommonFlags(),
+		Action: func(ctx context.Context, c *cli.Command) error {
+			a := app.NewAppGitBack(version, versionSource)
+
+			if c.Bool("version") {
+				return a.HandleVersion(c.Bool("verbose"))
+			}
+
+			return a.Run(ctx, app.RunOptions{
+				Verbose:     c.Bool("verbose"),
+				DryRun:      c.Bool("dry-run"),
+				HookCommand: c.String("hook"),
+				ShowLog:     c.Bool("log"),
+				Args:        c.Args().Slice(),
+			})
+		},
 	}
-	application := app.NewAppGiBack(version, verbose, dryRun)
 
-	if err := application.Run(os.Args[1:]); err != nil {
-		_, _ = fmt.Fprintln(os.Stderr, redColor+appNameGitBack+" ❌: "+grayColor+err.Error()+resetColor)
-		os.Exit(1)
+	if err := cmd.Run(ctx, os.Args); err != nil {
+		app.HandleError(appNameGitBack, err)
 	}
 }
-
-const (
-	grayColor  = "\033[90m"
-	redColor   = "\033[31m"
-	resetColor = "\033[0m"
-
-	appNameGitBack = "git-back"
-)

cmd/git-undo/main.go

@@ -1,44 +1,58 @@
 package main
 
 import (
-	"fmt"
+	"context"
 	"os"
-	"runtime/debug"
+	"os/signal"
+	"syscall"
 
+	"github.com/amberpixels/git-undo/cmd/shared"
 	"github.com/amberpixels/git-undo/internal/app"
+	"github.com/urfave/cli/v3"
 )
 
 // version is set by the build ldflags
 // The default value is "dev+dirty" but it should never be used. In success path, it's always overwritten.
 var version = "dev+dirty"
+var versionSource = "hardcoded"
 
-func main() {
-	var verbose, dryRun bool
-	for _, arg := range os.Args[1:] {
-		if arg == "-v" || arg == "--verbose" {
-			verbose = true
-		}
-		if arg == "--dry-run" {
-			dryRun = true
-		}
-	}
+const (
+	appNameGitUndo = "git-undo"
+)
 
-	// When running binary that was installed via `go install`, here we'll get the proper version
-	if bi, ok := debug.ReadBuildInfo(); ok && bi.Main.Version != "" {
-		version = bi.Main.Version
+func main() {
+	// Create a context that can be cancelled with Ctrl+C
+	ctx, cancel := signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM)
+	defer cancel()
+
+	version, versionSource = app.HandleAppVersion(version, versionSource)
+
+	cmd := &cli.Command{
+		Name:                      appNameGitUndo,
+		Usage:                     "Universal \"Ctrl + Z\" for Git commands",
+		DisableSliceFlagSeparator: true,
+		HideHelp:                  true,
+		Flags:                     shared.CommonFlags(),
+		Action: func(ctx context.Context, c *cli.Command) error {
+			application := app.NewAppGitUndo(version, versionSource)
+			if c.Bool("version") {
+				return application.HandleVersion(c.Bool("verbose"))
+			}
+
+			// Use the new structured approach with parsed options
+			opts := app.RunOptions{
+				Verbose:     c.Bool("verbose"),
+				DryRun:      c.Bool("dry-run"),
+				HookCommand: c.String("hook"),
+				ShowLog:     c.Bool("log"),
+				Args:        c.Args().Slice(),
+			}
+
+			return application.Run(ctx, opts)
+		},
 	}
-	application := app.NewAppGitUndo(version, verbose, dryRun)
 
-	if err := application.Run(os.Args[1:]); err != nil {
-		_, _ = fmt.Fprintln(os.Stderr, redColor+appNameGitUndo+" ❌: "+grayColor+err.Error()+resetColor)
-		os.Exit(1)
+	if err := cmd.Run(ctx, os.Args); err != nil {
+		app.HandleError(appNameGitUndo, err)
 	}
 }
-
-const (
-	grayColor  = "\033[90m"
-	redColor   = "\033[31m"
-	resetColor = "\033[0m"
-
-	appNameGitUndo = "git-undo"
-)

cmd/shared/flags.go

@@ -0,0 +1,37 @@
+package shared
+
+import (
+	"github.com/urfave/cli/v3"
+)
+
+// CommonFlags returns the standard set of CLI flags used by both git-undo and git-back commands.
+func CommonFlags() []cli.Flag {
+	return []cli.Flag{
+		&cli.BoolFlag{
+			Name:    "help",
+			Aliases: []string{"h"},
+			Usage:   "Show help",
+		},
+		&cli.BoolFlag{
+			Name:    "verbose",
+			Aliases: []string{"v"},
+			Usage:   "Enable verbose output",
+		},
+		&cli.BoolFlag{
+			Name:  "dry-run",
+			Usage: "Show what would be executed without running commands",
+		},
+		&cli.BoolFlag{
+			Name:  "version",
+			Usage: "Print the version",
+		},
+		&cli.StringFlag{
+			Name:  "hook",
+			Usage: "Hook command for shell integration (internal use)",
+		},
+		&cli.BoolFlag{
+			Name:  "log",
+			Usage: "Display the git-undo command log",
+		},
+	}
+}

go.mod

@@ -7,6 +7,7 @@ toolchain go1.24.3
 require (
 	github.com/mattn/go-shellwords v1.0.12
 	github.com/stretchr/testify v1.10.0
+	github.com/urfave/cli/v3 v3.3.8
 )
 
 require (

go.sum

@@ -8,6 +8,8 @@ github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
 github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
 github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/urfave/cli/v3 v3.3.8 h1:BzolUExliMdet9NlJ/u4m5vHSotJ3PzEqSAZ1oPMa/E=
+github.com/urfave/cli/v3 v3.3.8/go.mod h1:FJSKtM/9AiiTOJL4fJ6TbMUkxBXn7GO9guZqoZtpYpo=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=