-a5ed7c2: Initial implementation of Ollama providdser integration

Author: manyfacedqod

cmd/config.go

@@ -0,0 +1,83 @@
+// File: cmd/config.go
+package cmd
+
+import (
+	"fmt"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"strings"
+
+	"smartcommit/config"
+
+	"github.com/spf13/cobra"
+)
+
+var ConfigCmd = &cobra.Command{
+	Use:   "config",
+	Short: "View or change 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")
+	},
+}
+
+var showCmd = &cobra.Command{
+	Use:   "show",
+	Short: "Display current configuration",
+	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.")
+			return
+		}
+
+		cfg := config.LoadOrDefault()
+		tmpfile := filepath.Join(os.TempDir(), "smartcommit_system_prompt.txt")
+		os.WriteFile(tmpfile, []byte(cfg.SystemPrompt), 0644)
+
+		editor := os.Getenv("EDITOR")
+		if editor == "" {
+			editor = "vim"
+		}
+
+		execCmd := exec.Command(editor, tmpfile)
+		execCmd.Stdin = os.Stdin
+		execCmd.Stdout = os.Stdout
+		execCmd.Stderr = os.Stderr
+		execCmd.Run()
+
+		updated, _ := os.ReadFile(tmpfile)
+		cfg.SystemPrompt = strings.TrimSpace(string(updated))
+		if err := config.Save(cfg); err != nil {
+			fmt.Println("❌ Failed to save:", err)
+			return
+		}
+		fmt.Println("✅ Updated system prompt")
+	},
+}
+
+func init() {
+	ConfigCmd.AddCommand(setCmd, showCmd, editCmd)
+}

cmd/generate.go

@@ -0,0 +1,98 @@
+package cmd
+
+import (
+	"bufio"
+	"fmt"
+	"os"
+	"os/exec"
+	"smartcommit/config"
+	"smartcommit/diff"
+	"smartcommit/llm"
+	"smartcommit/prompt"
+
+	promptui "github.com/manifoldco/promptui"
+	"github.com/spf13/cobra"
+)
+
+var GenerateCmd = &cobra.Command{
+	Use:   "generate",
+	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 {
+			fmt.Println("❌ No staged changes found.")
+			return
+		}
+
+		promptText := prompt.Build(diffText, cfg.SystemPrompt)
+
+		provider, err := llm.GetProvider(cfg)
+		if err != nil {
+			fmt.Println("❌", err)
+			return
+		}
+
+		message, err := provider.Generate(promptText)
+		if err != nil {
+			fmt.Println("❌ Generation failed:", err)
+			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: ")
+
+			choice, _ := reader.ReadString('\n')
+			switch choice[:1] {
+			case "c":
+				runGitCommit(message)
+				return
+			case "e":
+				promptText = editPrompt(promptText)
+				message, _ = provider.Generate(promptText)
+			case "r":
+				message, _ = provider.Generate(promptText)
+			case "q":
+				return
+			default:
+				fmt.Println("❓ Invalid choice.")
+			}
+		}
+	},
+}
+
+func runGitCommit(msg string) {
+	fmt.Println("✅ Committing with:")
+	fmt.Println(msg)
+	_ = os.WriteFile(".git/COMMIT_EDITMSG", []byte(msg), 0644)
+	_ = executeCommand("git", "commit", "-F", ".git/COMMIT_EDITMSG")
+}
+
+func executeCommand(name string, args ...string) error {
+	c := exec.Command(name, args...)
+	c.Stdin = os.Stdin
+	c.Stdout = os.Stdout
+	c.Stderr = os.Stderr
+	return c.Run()
+}
+
+func editPrompt(defaultPrompt string) string {
+	prompt := promptui.Prompt{
+		Label:   "Edit Prompt",
+		Default: defaultPrompt,
+		AllowEdit: true,
+	}
+	result, err := prompt.Run()
+	if err != nil {
+		return defaultPrompt
+	}
+	return result
+}

config/config.go

@@ -0,0 +1,87 @@
+// File: config/config.go
+package config
+
+import (
+	"fmt"
+	"os"
+	"path/filepath"
+	"strings"
+
+	"gopkg.in/yaml.v3"
+)
+
+type Config struct {
+	Provider     string `yaml:"provider"`
+	Model        string `yaml:"model"`
+	APIKey       string `yaml:"api_key"`
+	SystemPrompt string `yaml:"system_prompt"`
+}
+
+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.",
+	}
+}
+
+func configPath() string {
+	configDir, _ := os.UserConfigDir()
+	full := filepath.Join(configDir, "smartcommit", "config.yaml")
+	fmt.Println("🕵️ Config path being used:", full) // <- add this
+	return full
+}
+
+
+func LoadOrDefault() *Config {
+	path := configPath()
+	data, err := os.ReadFile(path)
+	if err != nil {
+		return defaultConfig()
+	}
+	var cfg Config
+	if err := yaml.Unmarshal(data, &cfg); err != nil {
+		return defaultConfig()
+	}
+	return &cfg
+}
+
+func Save(cfg *Config) error {
+	path := configPath()
+	os.MkdirAll(filepath.Dir(path), 0755)
+	data, err := yaml.Marshal(cfg)
+	if err != nil {
+		return err
+	}
+	return os.WriteFile(path, data, 0644)
+}
+
+func (cfg *Config) Set(key, value string) {
+	switch strings.ToLower(key) {
+	case "provider":
+		cfg.Provider = value
+	case "model":
+		cfg.Model = value
+	case "api_key":
+		cfg.APIKey = value
+	case "system_prompt":
+		cfg.SystemPrompt = value
+	}
+}
+
+func (cfg *Config) PrettyPrint() {
+	fmt.Println("Current config:")
+	fmt.Println("  provider:      ", cfg.Provider)
+	fmt.Println("  model:         ", cfg.Model)
+	if cfg.APIKey != "" {
+		fmt.Println("  api_key:       ", mask(cfg.APIKey))
+	}
+	fmt.Println("  system_prompt: ", cfg.SystemPrompt)
+}
+
+func mask(s string) string {
+	if len(s) <= 6 {
+		return "******"
+	}
+	return s[:3] + "..." + s[len(s)-3:]
+}

diff/git.go

@@ -0,0 +1,13 @@
+package diff
+
+import (
+	"os/exec"
+)
+
+func GetStagedDiff() (string, error) {
+	out, err := exec.Command("git", "diff", "--cached").Output()
+	if err != nil {
+		return "", err
+	}
+	return string(out), nil
+}

go.mod

@@ -0,0 +1,16 @@
+module smartcommit
+
+go 1.24.5
+
+require (
+	github.com/manifoldco/promptui v0.9.0
+	github.com/spf13/cobra v1.9.1
+	gopkg.in/yaml.v3 v3.0.1
+)
+
+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
+)

go.sum

@@ -0,0 +1,22 @@
+github.com/chzyer/logex v1.1.10 h1:Swpa1K6QvQznwJRcfTfQJmTE72DqScAa40E+fbHEXEE=
+github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
+github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e h1:fY5BOSpyZCqRo5OhCuC+XN+r/bBCmeuuJtjz+bCNIf8=
+github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
+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/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=
+github.com/manifoldco/promptui v0.9.0/go.mod h1:ka04sppxSGFAtxX0qhlYQjISsg9mR4GWtQEhdbn6Pgg=
+github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
+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=
+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=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

llm/ollama.go

@@ -0,0 +1,46 @@
+package llm
+
+import (
+	"bytes"
+	"encoding/json"
+	"errors"
+	"net/http"
+)
+
+type OllamaProvider struct {
+	Model string
+}
+
+func (o *OllamaProvider) Name() string {
+	return "ollama"
+}
+
+func (o *OllamaProvider) Generate(prompt string) (string, error) {
+	payload := map[string]interface{}{
+		"model":  o.Model,
+		"prompt": prompt,
+		"stream": false,
+	}
+
+	body, _ := json.Marshal(payload)
+
+	resp, err := http.Post("http://localhost:11434/api/generate", "application/json", bytes.NewBuffer(body))
+	if err != nil {
+		return "", err
+	}
+	defer resp.Body.Close()
+
+	var result struct {
+		Response string `json:"response"`
+	}
+
+	err = json.NewDecoder(resp.Body).Decode(&result)
+	if err != nil {
+		return "", err
+	}
+	if result.Response == "" {
+		return "", errors.New("no response from model")
+	}
+
+	return result.Response, nil
+}

llm/provider.go

@@ -0,0 +1,6 @@
+package llm
+
+type Provider interface {
+	Name() string
+	Generate(prompt string) (string, error)
+}