imagine using custom comment for ur autoCommitGenerator thingy

Author: manyfacedqod

cmd/config.go

@@ -1,12 +1,9 @@
-// File: cmd/config.go
 package cmd
 
 import (
 	"fmt"
 	"os"
 	"os/exec"
-	"path/filepath"
-	"strings"
 
 	"smartcommit/config"
 
@@ -16,68 +13,85 @@ import (
 var ConfigCmd = &cobra.Command{
 	Use:   "config",
 	Short: "View or change smartcommit configuration",
-}
+	Long: `Manage smartcommit configuration
 
-var setCmd = &cobra.Command{
-	Use:   "set <key> <value>",
-	Short: "Set a configuration value",
-	Args:  cobra.ExactArgs(2),
-	Run: func(cmd *cobra.Command, args []string) {
-		key, value := args[0], args[1]
-		cfg := config.LoadOrDefault()
-		cfg.Set(key, value)
-		if err := config.Save(cfg); err != nil {
-			fmt.Println("❌ Failed to save config:", err)
-			return
-		}
-		fmt.Println("✅ Config updated")
-	},
+Examples:
+  smartcommit config edit       # Edit the system prompt (tone/style)
+  smartcommit config show       # View current configuration`,
 }
 
-var showCmd = &cobra.Command{
-	Use:   "show",
-	Short: "Display current configuration",
+var EditConfigCmd = &cobra.Command{
+	Use:   "edit",
+	Short: "Edit system prompt in your preferred editor (e.g., vim, nano, code)",
 	Run: func(cmd *cobra.Command, args []string) {
 		cfg := config.LoadOrDefault()
-		cfg.PrettyPrint()
-	},
-}
 
-var editCmd = &cobra.Command{
-	Use:   "edit system_prompt",
-	Short: "Edit the system prompt using your default editor",
-	Args:  cobra.ExactArgs(1),
-	Run: func(cmd *cobra.Command, args []string) {
-		if args[0] != "system_prompt" {
-			fmt.Println("❌ Only 'system_prompt' can be edited via editor for now.")
+		tmpFile, err := os.CreateTemp("", "smartcommit-prompt-*.txt")
+		if err != nil {
+			fmt.Println("❌ Failed to create temp file:", err)
 			return
 		}
+		defer os.Remove(tmpFile.Name())
 
-		cfg := config.LoadOrDefault()
-		tmpfile := filepath.Join(os.TempDir(), "smartcommit_system_prompt.txt")
-		os.WriteFile(tmpfile, []byte(cfg.SystemPrompt), 0644)
+		// Write current prompt to temp file
+		_, _ = tmpFile.WriteString(cfg.SystemPrompt)
+		tmpFile.Close()
 
+		// Open in default editor
 		editor := os.Getenv("EDITOR")
 		if editor == "" {
 			editor = "vim"
 		}
+		cmdEdit := exec.Command(editor, tmpFile.Name())
+		cmdEdit.Stdin = os.Stdin
+		cmdEdit.Stdout = os.Stdout
+		cmdEdit.Stderr = os.Stderr
 
-		execCmd := exec.Command(editor, tmpfile)
-		execCmd.Stdin = os.Stdin
-		execCmd.Stdout = os.Stdout
-		execCmd.Stderr = os.Stderr
-		execCmd.Run()
+		if err := cmdEdit.Run(); err != nil {
+			fmt.Println("❌ Failed to open editor:", err)
+			return
+		}
 
-		updated, _ := os.ReadFile(tmpfile)
-		cfg.SystemPrompt = strings.TrimSpace(string(updated))
-		if err := config.Save(cfg); err != nil {
-			fmt.Println("❌ Failed to save:", err)
+		// Read edited prompt
+		editedBytes, err := os.ReadFile(tmpFile.Name())
+		if err != nil {
+			fmt.Println("❌ Failed to read edited prompt:", err)
 			return
 		}
-		fmt.Println("✅ Updated system prompt")
+
+		edited := string(editedBytes)
+		if edited == "" {
+			fmt.Println("⚠️ Prompt left empty. Aborting.")
+			return
+		}
+
+		cfg.SystemPrompt = edited
+		if err := config.Save(cfg); err != nil {
+			fmt.Println("❌ Failed to save config:", err)
+		} else {
+			fmt.Println("✅ System prompt updated successfully.")
+		}
 	},
 }
 
-func init() {
-	ConfigCmd.AddCommand(setCmd, showCmd, editCmd)
+
+var ShowConfigCmd = &cobra.Command{
+	Use:   "show",
+	Short: "Show current config",
+	Run: func(cmd *cobra.Command, args []string) {
+		cfg := config.LoadOrDefault()
+		fmt.Printf("\nSystem Prompt: %s\n", cfg.SystemPrompt)
+		fmt.Printf("Provider: %s\n", cfg.Provider)
+		fmt.Printf("Model: %s\n", cfg.Model)
+		if cfg.APIKey != "" {
+			fmt.Println("API Key: [set]")
+		} else {
+			fmt.Println("API Key: [not set]")
+		}
+	},
 }
+
+func init() {
+	ConfigCmd.AddCommand(EditConfigCmd)
+	ConfigCmd.AddCommand(ShowConfigCmd)
+} 

cmd/generate.go

@@ -1,14 +1,14 @@
 package cmd
 
 import (
-	"bufio"
 	"fmt"
 	"os"
 	"os/exec"
 	"smartcommit/config"
 	"smartcommit/diff"
 	"smartcommit/llm"
 	"smartcommit/prompt"
+	"time"
 
 	promptui "github.com/manifoldco/promptui"
 	"github.com/spf13/cobra"
@@ -19,7 +19,6 @@ var GenerateCmd = &cobra.Command{
 	Short: "Generate a commit message using AI",
 	Run: func(cmd *cobra.Command, args []string) {
 		cfg := config.LoadOrDefault()
-		
 
 		diffText, err := diff.GetStagedDiff()
 		if err != nil || len(diffText) == 0 {
@@ -41,25 +40,33 @@ var GenerateCmd = &cobra.Command{
 			return
 		}
 
-		reader := bufio.NewReader(os.Stdin)
-
 		for {
 			fmt.Println("\n💡 Generated Commit Message:")
 			fmt.Println("----------------------------------")
 			fmt.Println(message)
 			fmt.Println("----------------------------------")
-			fmt.Print("Choose: [c]ommit, [e]dit prompt, [r]egenerate, [q]uit: ")
+			fmt.Print("Choose [c]ommit, [e]dit message, [r]egenerate, [q]uit: ")
+
+			var choice string
+			fmt.Scanln(&choice)
 
-			choice, _ := reader.ReadString('\n')
-			switch choice[:1] {
+			switch choice {
 			case "c":
 				runGitCommit(message)
 				return
 			case "e":
-				promptText = editPrompt(promptText)
-				message, _ = provider.Generate(promptText)
+				message = editMessage(message)
 			case "r":
-				message, _ = provider.Generate(promptText)
+				fmt.Print("\n🔄 Regenerating")
+				for i := 0; i < 3; i++ {
+					fmt.Print(".")
+					time.Sleep(200 * time.Millisecond)
+				}
+				message, err = provider.Generate(promptText)
+				if err != nil {
+					fmt.Println("❌ Regeneration failed:", err)
+					continue
+				}
 			case "q":
 				return
 			default:
@@ -84,15 +91,16 @@ func executeCommand(name string, args ...string) error {
 	return c.Run()
 }
 
-func editPrompt(defaultPrompt string) string {
+func editMessage(current string) string {
 	prompt := promptui.Prompt{
-		Label:   "Edit Prompt",
-		Default: defaultPrompt,
+		Label:     "Edit Commit Message",
+		Default:   current,
 		AllowEdit: true,
 	}
 	result, err := prompt.Run()
 	if err != nil {
-		return defaultPrompt
+		fmt.Println("⚠️ Edit cancelled.")
+		return current
 	}
 	return result
 }

config/config.go

@@ -21,7 +21,7 @@ func defaultConfig() *Config {
 	return &Config{
 		Provider:     "ollama",
 		Model:        "llama3",
-		SystemPrompt: "You are a terse, developer-friendly AI who writes conventional commit messages. Prefer single-line messages like 'feat: add ...' or 'fix: resolve ...'. Avoid PR-style summaries, bullet points, also this is official commit message. JUST SHOW THE COMMIT MESSAGE, NO OTHER BS.",
+		SystemPrompt: "You are a terse, developer-friendly AI who writes conventional commit messages. Prefer single-line messages like 'feat: add ...' or 'fix: resolve ...'. Avoid PR-style summaries, bullet points, also this is official commit message. JUST SHOW THE COMMIT MESSAGE, NO OTHER BS. DONT GIVE ANY OTHER SUGGESTIONS OR BRACKETS OR ANYTHING, THIS ARE LIKE LITERAL COMMITS! DONT MESS THEM UP JUST GIVE THE COMMIT!",
 	}
 }
 

go.mod

@@ -12,5 +12,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.33.0 // indirect
 )

go.sum

@@ -14,8 +14,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.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
+golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
 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=

main.go

@@ -1,4 +1,3 @@
-// Entry point: main.go
 package main
 
 import (
@@ -13,19 +12,29 @@ import (
 func main() {
 	rootCmd := &cobra.Command{
 		Use:   "smartcommit",
-		Short: "Generate Git commit messages using AI",
-		Long: `smartcommit is a CLI tool that uses local or remote LLMs (e.g. Ollama, OpenAI) to generate commit messages
-based on staged Git changes. It supports interactive flow, multiple backends, and prompt customization.`,
+		Short: "AI-powered Git commit message generator",
+		Long: `smartcommit is a CLI tool to generate AI-based Git commit messages
+from staged changes using local or remote LLMs (e.g., Ollama, OpenAI).
+
+Examples:
+  smartcommit generate          Generate a commit message from staged changes
+  smartcommit config edit       Edit the system prompt (tone/style)
+  smartcommit config show       View current configuration
+
+Run 'smartcommit [command] --help' for detailed command help.`,
 	}
+	
+	// Override Cobra's help output with our Long text
+	rootCmd.SetHelpFunc(func(cmd *cobra.Command, _ []string) {
+		fmt.Println(cmd.Long)
+	})
 
+	// Register subcommands
 	rootCmd.AddCommand(cmd.GenerateCmd)
 	rootCmd.AddCommand(cmd.ConfigCmd)
 
-	rootCmd.PersistentFlags().BoolP("help", "h", false, "Show help message")
-
 	if err := rootCmd.Execute(); err != nil {
 		fmt.Println("❌", err)
 		os.Exit(1)
 	}
 }
-