Merge branch 'DFanso:main' into main

Author: vinyas-bharadwaj

README.md

@@ -134,6 +134,36 @@ Perfect for:
 - 🔒 **Privacy** - Verify what data would be shared with external APIs
 - 🧪 **Development** - Test prompt changes without API calls
 
+### Auto Commit Mode
+
+Automatically commit with the generated message without manual confirmation:
+
+```bash
+commit . --auto
+```
+
+This will:
+- Generate the commit message using your configured LLM
+- Automatically execute `git commit` with the generated message
+- Skip the interactive review and manual confirmation step
+
+**Note**: The `--auto` flag cannot be combined with `--dry-run`. Dry run mode takes precedence and will only preview without committing.
+
+**Platform Support**: Works on Linux, macOS, and Windows.
+
+### Combining Flags
+
+```bash
+# Preview only (no commit, no API call)
+commit . --dry-run
+
+# Generate and auto-commit
+commit . --auto
+
+# Generate with interactive review (default behavior)
+commit .
+```
+
 ### Setup LLM and API Key
 
 ```bash

cmd/cli/createMsg.go

@@ -27,7 +27,7 @@ import (
 // CreateCommitMsg launches the interactive flow for reviewing, regenerating,
 // editing, and accepting AI-generated commit messages in the current repo.
 // If dryRun is true, it displays the prompt without making an API call.
-func CreateCommitMsg(dryRun bool) {
+func CreateCommitMsg(dryRun bool, autoCommit bool) {
 	// Validate COMMIT_LLM and required API keys
 	useLLM, err := store.DefaultLLMKey()
 	if err != nil {
@@ -208,6 +208,38 @@ interactionLoop:
 
 	pterm.Println()
 	display.ShowChangesPreview(fileStats)
+
+	// Auto-commit if flag is set (cross-platform compatible)
+	if autoCommit && !dryRun {
+		pterm.Println()
+		spinner, err := pterm.DefaultSpinner.
+			WithSequence("⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏").
+			Start("Automatically committing with generated message...")
+		if err != nil {
+			pterm.Error.Printf("Failed to start spinner: %v\n", err)
+			return
+		}
+
+		cmd := exec.Command("git", "commit", "-m", finalMessage)
+		cmd.Dir = currentDir
+		// Ensure git command works across all platforms
+		cmd.Env = os.Environ()
+
+		output, err := cmd.CombinedOutput()
+		if err != nil {
+			spinner.Fail("Commit failed")
+			pterm.Error.Printf("Failed to commit: %v\n", err)
+			if len(output) > 0 {
+				pterm.Error.Println(string(output))
+			}
+			return
+		}
+
+		spinner.Success("Committed successfully!")
+		if len(output) > 0 {
+			pterm.Info.Println(strings.TrimSpace(string(output)))
+		}
+	}
 }
 
 type styleOption struct {
@@ -234,6 +266,7 @@ var (
 	}
 	errSelectionCancelled = errors.New("selection cancelled")
 )
+
 // resolveOllamaConfig returns the URL and model for Ollama, using environment variables as fallbacks
 func resolveOllamaConfig(apiKey string) (url, model string) {
 	url = apiKey
@@ -250,7 +283,6 @@ func resolveOllamaConfig(apiKey string) (url, model string) {
 	return url, model
 }
 
-
 func generateMessage(provider types.LLMProvider, config *types.Config, changes string, apiKey string, opts *types.GenerationOptions) (string, error) {
 	switch provider {
 	case types.ProviderGemini:

cmd/cli/root.go

@@ -57,7 +57,12 @@ var creatCommitMsg = &cobra.Command{
 		if err != nil {
 			return err
 		}
-		CreateCommitMsg(dryRun)
+
+		autoCommit, err := cmd.Flags().GetBool("auto")
+		if err != nil {
+			return err
+		}
+		CreateCommitMsg(dryRun, autoCommit)
 		return nil
 	},
 }
@@ -76,6 +81,9 @@ func init() {
 	// Add --dry-run flag to the commit command
 	creatCommitMsg.Flags().Bool("dry-run", false, "Preview the prompt that would be sent to the LLM without making an API call")
 
+	// Add --auto flag to the commid command
+	creatCommitMsg.Flags().Bool("auto", false, "Automatically commit with the generated message")
+
 	rootCmd.AddCommand(creatCommitMsg)
 	rootCmd.AddCommand(llmCmd)
 	llmCmd.AddCommand(llmSetupCmd)

internal/groq/groq.go

@@ -8,7 +8,7 @@ import (
 	"net/http"
 	"os"
 
-	httpClient "github.com/dfanso/commit-msg/internal/http"
+	internalHTTP "github.com/dfanso/commit-msg/internal/http"
 	"github.com/dfanso/commit-msg/pkg/types"
 )
 
@@ -39,8 +39,14 @@ const defaultModel = "llama-3.3-70b-versatile"
 var (
 	// allow overrides in tests
 	baseURL = "https://api.groq.com/openai/v1/chat/completions"
+	// httpClient can be overridden in tests; defaults to the internal http client
+	httpClient *http.Client
 )
 
+func init() {
+	httpClient = internalHTTP.GetClient()
+}
+
 // GenerateCommitMessage calls Groq's OpenAI-compatible chat completions API.
 func GenerateCommitMessage(_ *types.Config, changes string, apiKey string, opts *types.GenerationOptions) (string, error) {
 	if changes == "" {
@@ -82,7 +88,7 @@ func GenerateCommitMessage(_ *types.Config, changes string, apiKey string, opts
 	req.Header.Set("Content-Type", "application/json")
 	req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", apiKey))
 
-	resp, err := httpClient.GetClient().Do(req)
+	resp, err := httpClient.Do(req)
 	if err != nil {
 		return "", fmt.Errorf("failed to call Groq API: %w", err)
 	}