"Update to use keyboard library for better handling of input"

Author: manyfacedqod

cmd/generate.go

@@ -8,12 +8,13 @@ import (
 	"strings"
 	"time"
 
+	"github.com/eiannone/keyboard"
+	"github.com/manifoldco/promptui"
+	"github.com/spf13/cobra"
+
 	"smartcommit/config"
 	"smartcommit/diff"
 	"smartcommit/llm"
-
-	"github.com/manifoldco/promptui"
-	"github.com/spf13/cobra"
 )
 
 var yesFlag bool
@@ -28,21 +29,21 @@ Use --yes or -y to skip the prompt and commit directly.`,
 	Run: func(cmd *cobra.Command, args []string) {
 		cfg := config.LoadOrDefault()
 
-		d, err := diff.GetStagedDiff()
-		if err != nil || strings.TrimSpace(d) == "" {
+		diffText, err := diff.GetStagedDiff()
+		if err != nil || diffText == "" {
 			fmt.Println("❌ No staged changes found.")
 			return
 		}
 
-		prompt := cfg.SystemPrompt + "\n\nDiff:\n" + d
+		promptText := cfg.SystemPrompt + "\n\nDiff:\n" + diffText
 
 		provider, err := llm.GetProvider(cfg)
 		if err != nil {
 			fmt.Println("❌", err)
 			return
 		}
 
-		message, err := provider.Generate(prompt)
+		message, err := provider.Generate(promptText)
 		if err != nil {
 			fmt.Println("❌ Generation failed:", err)
 			return
@@ -54,39 +55,46 @@ Use --yes or -y to skip the prompt and commit directly.`,
 			fmt.Println("----------------------------------")
 			fmt.Println(message)
 			fmt.Println("----------------------------------")
-			commit(message)
+			runGitCommit(message)
 			return
 		}
 
-		// Interactive loop
 		for {
 			fmt.Println("\n💡 Generated Commit Message:")
 			fmt.Println("----------------------------------")
 			fmt.Println(message)
 			fmt.Println("----------------------------------")
-			fmt.Print("Choose [c]ommit, [e]dit, [r]egenerate, [q]uit: ")
+			fmt.Print("Choose [c]ommit, [e]dit, [r]egen, [q]uit: ")
 
-			var choice string
-			fmt.Scanln(&choice)
+			if err := keyboard.Open(); err != nil {
+				fmt.Println("❌ Keyboard input error:", err)
+				return
+			}
+			char, _, err := keyboard.GetSingleKey()
+			keyboard.Close()
+			if err != nil {
+				fmt.Println("❌ Failed to read key:", err)
+				return
+			}
 
-			switch choice {
+			switch strings.ToLower(string(char)) {
 			case "c":
-				commit(message)
+				runGitCommit(message)
 				return
 			case "e":
-				message = edit(message)
+				message = editMessage(message)
 			case "r":
 				fmt.Print("\n🔄 Regenerating")
 				for i := 0; i < 3; i++ {
 					fmt.Print(".")
 					time.Sleep(200 * time.Millisecond)
 				}
-				msg, err := provider.Generate(prompt)
+				message, err = provider.Generate(promptText)
 				if err != nil {
-					fmt.Println("\n❌ Regeneration failed:", err)
-				} else {
-					message = strings.TrimSpace(msg)
+					fmt.Println("❌ Regeneration failed:", err)
+					continue
 				}
+				message = strings.TrimSpace(message)
 			case "q":
 				fmt.Println("👋 Aborted.")
 				return
@@ -102,20 +110,19 @@ func init() {
 	rootCmd.AddCommand(generateCmd)
 }
 
-func commit(msg string) {
+func runGitCommit(msg string) {
 	fmt.Println("✅ Committing with:")
 	fmt.Println(msg)
 	cmd := exec.Command("git", "commit", "-m", msg)
 	cmd.Stdin = os.Stdin
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
-	err := cmd.Run()
-	if err != nil {
+	if err := cmd.Run(); err != nil {
 		fmt.Println("❌ Git commit failed:", err)
 	}
 }
 
-func edit(current string) string {
+func editMessage(current string) string {
 	prompt := promptui.Prompt{
 		Label:     "Edit Commit Message",
 		Default:   current,
@@ -126,5 +133,5 @@ func edit(current string) string {
 		fmt.Println("⚠️ Edit cancelled.")
 		return current
 	}
-	return result
+	return strings.TrimSpace(result)
 }

go.mod

@@ -3,6 +3,7 @@ module smartcommit
 go 1.24.5
 
 require (
+	github.com/eiannone/keyboard v0.0.0-20220611211555-0d226195f203
 	github.com/manifoldco/promptui v0.9.0
 	github.com/spf13/cobra v1.9.1
 	gopkg.in/yaml.v3 v3.0.1
@@ -12,5 +13,5 @@ require (
 	github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/spf13/pflag v1.0.6 // indirect
-	golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b // indirect
+	golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
 )

go.sum

@@ -5,6 +5,8 @@ github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5P
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1 h1:q763qf9huN11kDQavWsoZXJNW3xEE4JJyHa5Q25/sd8=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
 github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
+github.com/eiannone/keyboard v0.0.0-20220611211555-0d226195f203 h1:XBBHcIb256gUJtLmY22n99HaZTz+r2Z51xUPi01m3wg=
+github.com/eiannone/keyboard v0.0.0-20220611211555-0d226195f203/go.mod h1:E1jcSv8FaEny+OP/5k9UxZVw9YFWGj7eI4KR/iOBqCg=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/manifoldco/promptui v0.9.0 h1:3V4HzJk1TtXW1MTZMP7mdlwbBpIinw3HztaIlYthEiA=
@@ -14,8 +16,9 @@ github.com/spf13/cobra v1.9.1 h1:CXSaggrXdbHK9CF+8ywj8Amf7PBRmPCOJugH954Nnlo=
 github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wxYW0=
 github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=
 github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b h1:MQE+LT/ABUuuvEZ+YQAMSXindAdUh7slEmAkup74op4=
 golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a h1:dGzPydgVsqGcTRVwiLJ1jVbufYwmzD3LfVPLKsKg+0k=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 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=