Merge pull request #37 from fcmiranda/feature/opencode-support

feat: integrate opencode CLI provider with automatic model fallback a…

Author: m7medVision

README.md

@@ -11,7 +11,7 @@ AI-powered Git commit message generator that analyzes your staged changes and ou
 
 - Generates configurable number of commit message suggestions from your staged diff
 -  Generates 10 pull request titles based on the diff between the current branch and a target branch
-- Providers: GitHub Copilot (default), OpenAI, Anthropic (Claude Code CLI)
+- Providers: opencode (default, free models), GitHub Copilot, OpenAI, Anthropic (Claude Code CLI), Gemini CLI
 - Multi-language support: Any language (English, Arabic, Korean, etc.)
 - Interactive config to pick provider/model/language and set keys
 - Simple output suitable for piping into TUI menus (one message per line)
@@ -22,6 +22,8 @@ AI-powered Git commit message generator that analyzes your staged changes and ou
 go install github.com/m7medvision/lazycommit@latest
 ```
 
+The default provider is `opencode`, so install and authenticate the `opencode` CLI before running `lazycommit commit`.
+
 Or build from source:
 
 ```bash
@@ -80,8 +82,16 @@ lazycommit uses a two-file configuration system to separate sensitive provider s
 Contains API keys, tokens, and provider-specific settings. **Do not share this file.**
 
 ```yaml
-active_provider: copilot # default if a GitHub token is found
+active_provider: opencode # default; uses opencode CLI free models
 providers:
+  opencode:
+    model: "opencode/minimax-m2.5-free" # Uses opencode CLI - no API key needed
+    fallback_models:
+      - "opencode/minimax-m2.5-free"
+      - "opencode/ling-2.6-flash-free"
+      - "opencode/hy3-preview-free"
+      - "opencode/nemotron-3-super-free"
+    num_suggestions: 10
   copilot:
     api_key: "$GITHUB_TOKEN"   # Uses GitHub token; token is exchanged internally
     model: "gpt-4o"            # or "openai/gpt-4o"; both accepted
@@ -264,6 +274,7 @@ If you are using Commitizen with Lazygit, you can add this custom command:
 ## Troubleshooting
 
 - "No staged changes to commit." — run `git add` first.
+- "opencode CLI not found" — install `opencode` or switch providers with `lazycommit config set`.
 - "API key not set" — set the appropriate key in `.lazycommit.yaml` or env var and rerun.
 - Copilot errors about token exchange — ensure your GitHub token has models scope or is valid; try setting `GITHUB_TOKEN`.
 

cmd/commit.go

@@ -41,9 +41,9 @@ var commitCmd = &cobra.Command{
 
 		providerName := config.GetProvider()
 
-		// API key is not needed for anthropic provider (uses CLI)
+		// API keys are not needed for CLI-backed providers.
 		var apiKey string
-		if providerName != "anthropic" {
+		if providerName != "anthropic" && providerName != "gemini" && providerName != "opencode" {
 			var err error
 			apiKey, err = config.GetAPIKey()
 			if err != nil {
@@ -53,7 +53,7 @@ var commitCmd = &cobra.Command{
 		}
 
 		var model string
-		if providerName == "copilot" || providerName == "openai" || providerName == "anthropic" {
+		if providerName == "copilot" || providerName == "openai" || providerName == "anthropic" || providerName == "gemini" || providerName == "opencode" {
 			var err error
 			model, err = config.GetModel()
 			if err != nil {
@@ -86,6 +86,12 @@ var commitCmd = &cobra.Command{
 				numSuggestions = 10
 			}
 			aiProvider = provider.NewGeminiProvider(model, numSuggestions)
+		case "opencode":
+			numSuggestions := config.GetNumSuggestions()
+			if numSuggestions <= 0 {
+				numSuggestions = 10
+			}
+			aiProvider = provider.NewOpencodeProvider(model, config.GetFallbackModels(), numSuggestions)
 		default:
 			// Default to copilot if provider is not set or unknown
 			aiProvider = provider.NewCopilotProvider(apiKey, endpoint)

cmd/config.go

@@ -81,7 +81,7 @@ func runInteractiveConfig() {
 
 	providerPrompt := &survey.Select{
 		Message: "Choose a provider:",
-		Options: []string{"openai", "copilot", "anthropic", "gemini"},
+		Options: []string{"opencode", "openai", "copilot", "anthropic", "gemini"},
 		Default: currentProvider,
 	}
 	var selectedProvider string
@@ -152,8 +152,8 @@ func runInteractiveConfig() {
 		fmt.Printf("Language set to: %s\n", langValue)
 	}
 
-	// API key configuration - skip for copilot, anthropic and gemini
-	if selectedProvider != "copilot" && selectedProvider != "anthropic" && selectedProvider != "gemini" {
+	// API key configuration - skip for CLI-backed providers and copilot token exchange.
+	if selectedProvider != "copilot" && selectedProvider != "anthropic" && selectedProvider != "gemini" && selectedProvider != "opencode" {
 		apiKeyPrompt := &survey.Input{
 			Message: fmt.Sprintf("Enter API Key for %s:", selectedProvider),
 		}
@@ -175,13 +175,16 @@ func runInteractiveConfig() {
 		fmt.Println("Anthropic provider uses Claude Code CLI - no API key needed.")
 	} else if selectedProvider == "gemini" {
 		fmt.Println("Gemini provider uses Gemini CLI - no API key needed.")
+	} else if selectedProvider == "opencode" {
+		fmt.Println("opencode provider uses opencode CLI - no API key needed.")
 	}
 
 	availableModels := map[string][]string{
 		"openai":    {},
 		"copilot":   {},
 		"anthropic": {},
 		"gemini":    {},
+		"opencode":  {},
 	}
 
 	modelDisplayToID := map[string]string{}
@@ -222,6 +225,12 @@ func runInteractiveConfig() {
 			availableModels["gemini"] = append(availableModels["gemini"], display)
 			modelDisplayToID[display] = m.APIModel
 		}
+	case "opencode":
+		for _, m := range models.OpencodeModels {
+			display := fmt.Sprintf("%s (%s)", m.Name, m.APIModel)
+			availableModels["opencode"] = append(availableModels["opencode"], display)
+			modelDisplayToID[display] = m.APIModel
+		}
 	}
 
 	modelPrompt := &survey.Select{
@@ -232,7 +241,7 @@ func runInteractiveConfig() {
 	// Try to set the default to the current model if possible
 	isValidDefault := false
 	currentDisplay := ""
-	if selectedProvider == "openai" || selectedProvider == "anthropic" || selectedProvider == "copilot" || selectedProvider == "gemini" {
+	if selectedProvider == "openai" || selectedProvider == "anthropic" || selectedProvider == "copilot" || selectedProvider == "gemini" || selectedProvider == "opencode" {
 		for display, id := range modelDisplayToID {
 			if id == currentModel || display == currentModel {
 				isValidDefault = true
@@ -261,7 +270,7 @@ func runInteractiveConfig() {
 	}
 
 	selectedModel := selectedDisplay
-	if selectedProvider == "openai" || selectedProvider == "anthropic" || selectedProvider == "copilot" || selectedProvider == "gemini" {
+	if selectedProvider == "openai" || selectedProvider == "anthropic" || selectedProvider == "copilot" || selectedProvider == "gemini" || selectedProvider == "opencode" {
 		selectedModel = modelDisplayToID[selectedDisplay]
 	}
 
@@ -274,8 +283,8 @@ func runInteractiveConfig() {
 		fmt.Printf("Model set to: %s\n", selectedModel)
 	}
 
-	// Number of suggestions configuration for anthropic and gemini
-	if selectedProvider == "anthropic" || selectedProvider == "gemini" {
+	// Number of suggestions configuration for CLI-backed providers.
+	if selectedProvider == "anthropic" || selectedProvider == "gemini" || selectedProvider == "opencode" {
 		numSuggestionsPrompt := &survey.Input{
 			Message: "Number of commit message suggestions (default: 10):",
 			Default: "10",
@@ -299,8 +308,8 @@ func runInteractiveConfig() {
 	// Get current endpoint
 	currentEndpoint, _ := config.GetEndpoint()
 
-	// Endpoint configuration prompt - skip for anthropic and gemini since they use CLI
-	if selectedProvider != "anthropic" && selectedProvider != "gemini" {
+	// Endpoint configuration prompt - skip CLI-backed providers.
+	if selectedProvider != "anthropic" && selectedProvider != "gemini" && selectedProvider != "opencode" {
 		endpointPrompt := &survey.Input{
 			Message: "Enter custom endpoint URL (leave empty for default):",
 			Default: currentEndpoint,

cmd/pr.go

@@ -51,9 +51,9 @@ var prCmd = &cobra.Command{
 
 		providerName := config.GetProvider()
 
-		// API key is not needed for anthropic provider (uses CLI)
+		// API keys are not needed for CLI-backed providers.
 		var apiKey string
-		if providerName != "anthropic" {
+		if providerName != "anthropic" && providerName != "gemini" && providerName != "opencode" {
 			var err error
 			apiKey, err = config.GetAPIKey()
 			if err != nil {
@@ -63,7 +63,7 @@ var prCmd = &cobra.Command{
 		}
 
 		var model string
-		if providerName == "copilot" || providerName == "openai" || providerName == "anthropic" {
+		if providerName == "copilot" || providerName == "openai" || providerName == "anthropic" || providerName == "gemini" || providerName == "opencode" {
 			var err error
 			model, err = config.GetModel()
 			if err != nil {
@@ -90,6 +90,9 @@ var prCmd = &cobra.Command{
 		case "gemini":
 			numSuggestions := config.GetNumSuggestions()
 			aiProvider = provider.NewGeminiProvider(model, numSuggestions)
+		case "opencode":
+			numSuggestions := config.GetNumSuggestions()
+			aiProvider = provider.NewOpencodeProvider(model, config.GetFallbackModels(), numSuggestions)
 		default:
 			// Default to copilot if provider is not set or unknown
 			aiProvider = provider.NewCopilotProvider(apiKey, endpoint)

internal/config/config.go

@@ -14,10 +14,11 @@ import (
 )
 
 type ProviderConfig struct {
-	APIKey         string `mapstructure:"api_key"`
-	Model          string `mapstructure:"model"`
-	EndpointURL    string `mapstructure:"endpoint_url"`
-	NumSuggestions int    `mapstructure:"num_suggestions"`
+	APIKey         string   `mapstructure:"api_key"`
+	Model          string   `mapstructure:"model"`
+	EndpointURL    string   `mapstructure:"endpoint_url"`
+	NumSuggestions int      `mapstructure:"num_suggestions"`
+	FallbackModels []string `mapstructure:"fallback_models"`
 }
 
 type Config struct {
@@ -34,15 +35,22 @@ func InitConfig() {
 
 	viper.SetConfigFile(filepath.Join(getConfigDir(), ".lazycommit.yaml"))
 
+	viper.SetDefault("active_provider", "opencode")
+	viper.SetDefault("providers.opencode.model", "opencode/minimax-m2.5-free")
+	viper.SetDefault("providers.opencode.fallback_models", []string{
+		"opencode/minimax-m2.5-free",
+		"opencode/ling-2.6-flash-free",
+		"opencode/hy3-preview-free",
+		"opencode/nemotron-3-super-free",
+	})
+	viper.SetDefault("providers.opencode.num_suggestions", 10)
+
 	if token, err := LoadGitHubToken(); err == nil && token != "" {
-		viper.SetDefault("active_provider", "copilot")
 		viper.SetDefault("providers.copilot.api_key", token)
-		viper.SetDefault("providers.copilot.model", "openai/gpt-5-mini")
-	} else {
-		viper.SetDefault("active_provider", "openai")
-		viper.SetDefault("providers.openai.model", "openai/gpt-5-mini")
 	}
 
+	viper.SetDefault("providers.copilot.model", "openai/gpt-5-mini")
+	viper.SetDefault("providers.openai.model", "openai/gpt-5-mini")
 	viper.SetDefault("providers.anthropic.model", "claude-haiku-4-5")
 	viper.SetDefault("providers.anthropic.num_suggestions", 10)
 	viper.SetDefault("providers.gemini.model", "flash")
@@ -153,6 +161,8 @@ func GetEndpoint() (string, error) {
 		return "", nil // Anthropic uses CLI, no endpoint needed
 	case "gemini":
 		return "", nil // Gemini uses CLI, no endpoint needed
+	case "opencode":
+		return "", nil // opencode uses CLI, no endpoint needed
 	default:
 		return "", fmt.Errorf("no default endpoint available for provider '%s'", cfg.ActiveProvider)
 	}
@@ -280,6 +290,17 @@ func GetNumSuggestions() int {
 	return providerConfig.NumSuggestions
 }
 
+func GetFallbackModels() []string {
+	if cfg == nil {
+		InitConfig()
+	}
+	providerConfig, err := GetActiveProviderConfig()
+	if err != nil {
+		return nil
+	}
+	return providerConfig.FallbackModels
+}
+
 func SetNumSuggestions(provider, numSuggestions string) error {
 	if cfg == nil {
 		InitConfig()

internal/provider/models/models.go

@@ -26,6 +26,7 @@ const (
 	ProviderOpenAI    ModelProvider = "openai"
 	ProviderAnthropic ModelProvider = "anthropic"
 	ProviderGemini    ModelProvider = "gemini"
+	ProviderOpencode  ModelProvider = "opencode"
 
 	GPT41        ModelID = "gpt-4.1"
 	GPT41Mini    ModelID = "gpt-4.1-mini"
@@ -48,6 +49,11 @@ const (
 	GeminiFlashLite ModelID = "flash-lite"
 	Gemini25Pro     ModelID = "gemini-2.5-pro"
 	Gemini25Flash   ModelID = "gemini-2.5-flash"
+
+	OpencodeMinimaxM25Free     ModelID = "opencode/minimax-m2.5-free"
+	OpencodeLing26FlashFree    ModelID = "opencode/ling-2.6-flash-free"
+	OpencodeHy3PreviewFree     ModelID = "opencode/hy3-preview-free"
+	OpencodeNemotron3SuperFree ModelID = "opencode/nemotron-3-super-free"
 )
 
 var OpenAIModels = map[ModelID]Model{
@@ -281,3 +287,30 @@ var GeminiModels = map[ModelID]Model{
 		SupportsAttachments: true,
 	},
 }
+
+var OpencodeModels = map[ModelID]Model{
+	OpencodeMinimaxM25Free: {
+		ID:       OpencodeMinimaxM25Free,
+		Name:     "Minimax M2.5 Free",
+		Provider: ProviderOpencode,
+		APIModel: string(OpencodeMinimaxM25Free),
+	},
+	OpencodeLing26FlashFree: {
+		ID:       OpencodeLing26FlashFree,
+		Name:     "Ling 2.6 Flash Free",
+		Provider: ProviderOpencode,
+		APIModel: string(OpencodeLing26FlashFree),
+	},
+	OpencodeHy3PreviewFree: {
+		ID:       OpencodeHy3PreviewFree,
+		Name:     "HY3 Preview Free",
+		Provider: ProviderOpencode,
+		APIModel: string(OpencodeHy3PreviewFree),
+	},
+	OpencodeNemotron3SuperFree: {
+		ID:       OpencodeNemotron3SuperFree,
+		Name:     "Nemotron 3 Super Free",
+		Provider: ProviderOpencode,
+		APIModel: string(OpencodeNemotron3SuperFree),
+	},
+}