From b6be7302880acbc40e0b78127b8bc43be602c105 Mon Sep 17 00:00:00 2001 From: Zak El Fassi Date: Tue, 9 Sep 2025 22:47:00 -0700 Subject: [PATCH] feat(ai): add OpenAI-compatible commit message generation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - add pkg/ai client and prompt builder (OpenAI/OpenRouter compatible) - add “Generate AI commit message” option in commit menu (Ctrl+O, g) - introduce ai config block (provider/baseURL/model/temperature/etc.) - update English + JA/KO/NL/zh-CN i18n strings - add docs at docs/AI_Commits.md - add unit/integration tests --- docs/AI_Commits.md | 48 +++ pkg/ai/client.go | 211 +++++++++++++ pkg/ai/client_test.go | 289 ++++++++++++++++++ pkg/ai/prompt.go | 33 ++ pkg/ai/prompt_test.go | 207 +++++++++++++ pkg/config/ai_config_test.go | 269 ++++++++++++++++ pkg/config/user_config.go | 104 ++++++- pkg/gui/controllers/helpers/commits_helper.go | 146 ++++++--- pkg/i18n/english.go | 19 +- pkg/i18n/translations/ja.json | 4 +- pkg/i18n/translations/ko.json | 4 +- pkg/i18n/translations/nl.json | 4 +- pkg/i18n/translations/zh-CN.json | 4 +- .../tests/commit/ai_commit_message.go | 255 ++++++++++++++++ 14 files changed, 1538 insertions(+), 59 deletions(-) create mode 100644 docs/AI_Commits.md create mode 100644 pkg/ai/client.go create mode 100644 pkg/ai/client_test.go create mode 100644 pkg/ai/prompt.go create mode 100644 pkg/ai/prompt_test.go create mode 100644 pkg/config/ai_config_test.go create mode 100644 pkg/integration/tests/commit/ai_commit_message.go diff --git a/docs/AI_Commits.md b/docs/AI_Commits.md new file mode 100644 index 00000000000..92698adbd68 --- /dev/null +++ b/docs/AI_Commits.md @@ -0,0 +1,48 @@ +# AI Commit Messages + +Lazygit can generate commit messages using an OpenAI‑compatible API (OpenAI, OpenRouter, or a self‑hosted endpoint). + +## Setup + +Add an `ai` section to your `config.yml` (open via `e` in the Status panel): + +```yaml +ai: + # One of: openai | openrouter | custom (used only for sensible defaults) + provider: openai + # If empty, defaults to provider base (openai: https://api.openai.com/v1, openrouter: https://openrouter.ai/api/v1) + baseURL: "" + # Required: model id (e.g. "gpt-4o-mini" or an OpenRouter model) + model: "" + # If empty, defaults to OPENAI_API_KEY (openai) or OPENROUTER_API_KEY (openrouter) + apiKeyEnv: "" + temperature: 0.2 + maxTokens: 300 + stagedOnly: true + # One of: conventional | plain + commitStyle: conventional +``` + +Then export your API key (shell example): + +```bash +# For OpenAI +export OPENAI_API_KEY=your_key + +# For OpenRouter +# export OPENROUTER_API_KEY=your_key +``` + +## Usage + +1. Stage changes you want included in the message. +2. Press `c` to open the commit message panel. +3. Press `Ctrl+O` to open the commit menu. +4. Choose “Generate AI commit message” (shortcut `g`). + +The summary and description fields will be populated with the generated message. You can edit them before confirming the commit as usual. + +Notes: +- By default only the staged diff is sent. Set `ai.stagedOnly: false` to allow a fallback to consider tracked changes when nothing is staged. +- The client uses the OpenAI Chat Completions API schema and should work with any compatible endpoint. + diff --git a/pkg/ai/client.go b/pkg/ai/client.go new file mode 100644 index 00000000000..5bb3710a73c --- /dev/null +++ b/pkg/ai/client.go @@ -0,0 +1,211 @@ +package ai + +import ( + "bytes" + "context" + "encoding/json" + "errors" + "fmt" + "io" + "net/http" + "os" + "strings" + "time" + + "github.com/jesseduffield/lazygit/pkg/config" +) + +// ChatMessage and ChatRequest/Response mirror the OpenAI-compatible schema +// for the /chat/completions endpoint. +type ChatMessage struct { + Role string `json:"role"` + Content string `json:"content"` +} + +type ChatRequest struct { + Model string `json:"model"` + Messages []ChatMessage `json:"messages"` + Temperature float64 `json:"temperature,omitempty"` + MaxTokens int `json:"max_tokens,omitempty"` +} + +type ChatChoice struct { + Index int `json:"index"` + FinishReason string `json:"finish_reason"` + Message ChatMessage `json:"message"` +} + +type ChatResponse struct { + ID string `json:"id"` + Object string `json:"object"` + Created int64 `json:"created"` + Choices []ChatChoice `json:"choices"` +} + +type Client struct { + http *http.Client + baseURL string + apiKey string + model string + temp float64 + maxTokens int +} + +func defaultBaseURL(provider string) string { + switch strings.ToLower(provider) { + case "openrouter": + return "https://openrouter.ai/api/v1" + case "openai", "": + return "https://api.openai.com/v1" + default: + return provider // if somebody passed a URL by mistake into provider + } +} + +func defaultAPIKeyEnv(provider string) string { + switch strings.ToLower(provider) { + case "openrouter": + return "OPENROUTER_API_KEY" + default: + return "OPENAI_API_KEY" + } +} + +func NewClientFromConfig(cfg config.AIConfig) (*Client, error) { + // Validate configuration first + if err := cfg.Validate(); err != nil { + return nil, fmt.Errorf("invalid AI configuration: %w", err) + } + + apiKeyEnv := cfg.APIKeyEnv + if apiKeyEnv == "" { + apiKeyEnv = defaultAPIKeyEnv(cfg.Provider) + } + key := os.Getenv(apiKeyEnv) + if key == "" { + return nil, fmt.Errorf("missing API key; set %s", apiKeyEnv) + } + + baseURL := cfg.BaseURL + if baseURL == "" { + baseURL = defaultBaseURL(cfg.Provider) + } + + return &Client{ + http: &http.Client{Timeout: 45 * time.Second}, + baseURL: strings.TrimRight(baseURL, "/"), + apiKey: key, + model: cfg.Model, + temp: cfg.Temperature, + maxTokens: cfg.MaxTokens, + }, nil +} + +func (c *Client) chat(ctx context.Context, messages []ChatMessage) (string, error) { + reqBody := ChatRequest{ + Model: c.model, + Messages: messages, + Temperature: c.temp, + MaxTokens: c.maxTokens, + } + b, err := json.Marshal(reqBody) + if err != nil { + return "", fmt.Errorf("failed to marshal request: %w", err) + } + url := c.baseURL + "/chat/completions" + + req, err := http.NewRequestWithContext(ctx, http.MethodPost, url, bytes.NewReader(b)) + if err != nil { + return "", fmt.Errorf("failed to create request: %w", err) + } + req.Header.Set("Content-Type", "application/json") + req.Header.Set("Authorization", "Bearer "+c.apiKey) + + resp, err := c.http.Do(req) + if err != nil { + return "", fmt.Errorf("request failed: %w", err) + } + defer resp.Body.Close() + + if resp.StatusCode < 200 || resp.StatusCode >= 300 { + body, _ := io.ReadAll(resp.Body) + return "", fmt.Errorf("AI request failed (%s): %s", resp.Status, string(body)) + } + + var cr ChatResponse + if err := json.NewDecoder(resp.Body).Decode(&cr); err != nil { + return "", fmt.Errorf("failed to decode response: %w", err) + } + if len(cr.Choices) == 0 { + return "", errors.New("no choices in AI response") + } + return cr.Choices[0].Message.Content, nil +} + +// GenerateCommitMessage produces a subject and body from a diff and preferences. +func (c *Client) GenerateCommitMessage(ctx context.Context, diff string, style string, wrap int) (subject string, body string, err error) { + sys := ChatMessage{Role: "system", Content: systemPrompt(style, wrap)} + user := ChatMessage{Role: "user", Content: buildUserPrompt(diff)} + out, err := c.chatWithRetry(ctx, []ChatMessage{sys, user}) + if err != nil { + return "", "", err + } + + // Normalize newlines and split into subject/body + s := strings.TrimSpace(out) + lines := strings.Split(s, "\n") + if len(lines) == 0 { + return "", "", errors.New("empty AI response") + } + subject = strings.TrimSpace(lines[0]) + body = strings.TrimSpace(strings.Join(lines[1:], "\n")) + // Trim subject to 72 chars if it’s excessively long + if len([]rune(subject)) > 72 { + r := []rune(subject) + subject = string(r[:72]) + } + return subject, body, nil +} + +// chatWithRetry implements retry logic with exponential backoff for transient failures +func (c *Client) chatWithRetry(ctx context.Context, messages []ChatMessage) (string, error) { + var lastErr error + maxRetries := 3 + baseDelay := time.Second + + for attempt := 0; attempt < maxRetries; attempt++ { + result, err := c.chat(ctx, messages) + if err == nil { + return result, nil + } + + lastErr = err + + // Don't retry on context cancellation or certain error types + if errors.Is(err, context.Canceled) || errors.Is(err, context.DeadlineExceeded) { + return "", err + } + + // Don't retry on the last attempt + if attempt == maxRetries-1 { + break + } + + // Calculate delay with exponential backoff + delay := baseDelay * time.Duration(1<(): ", + "Types: feat, fix, docs, style, refactor, perf, test, chore, build, ci", + ) + default: + // plain: no extra rule + } + rules = append(rules, + "Subject should be concise, ideally <= 72 chars.", + fmt.Sprintf("Wrap body at ~%d chars when useful.", wrap), + "Focus on what and why; avoid restating diff line-by-line.", + "Do not include code fences or markdown headings.", + ) + return strings.Join(rules, "\n") +} + +func buildUserPrompt(diff string) string { + return "Diff of changes (unified):\n" + diff + "\n\nReturn subject on first line, optional body after." +} + diff --git a/pkg/ai/prompt_test.go b/pkg/ai/prompt_test.go new file mode 100644 index 00000000000..e0e83aeda7b --- /dev/null +++ b/pkg/ai/prompt_test.go @@ -0,0 +1,207 @@ +package ai + +import ( + "fmt" + "strings" + "testing" + + "github.com/stretchr/testify/assert" +) + +func TestSystemPrompt(t *testing.T) { + tests := []struct { + name string + style string + wrap int + expected []string // Expected strings to be present in the prompt + }{ + { + name: "conventional style", + style: "conventional", + wrap: 72, + expected: []string{ + "Write a high-quality git commit message from the provided diff.", + "Use Conventional Commits format: (): ", + "Types: feat, fix, docs, style, refactor, perf, test, chore, build, ci", + "Subject should be concise, ideally <= 72 chars.", + "Wrap body at ~72 chars when useful.", + "Focus on what and why; avoid restating diff line-by-line.", + "Do not include code fences or markdown headings.", + }, + }, + { + name: "conventional style with conv alias", + style: "conv", + wrap: 80, + expected: []string{ + "Write a high-quality git commit message from the provided diff.", + "Use Conventional Commits format: (): ", + "Types: feat, fix, docs, style, refactor, perf, test, chore, build, ci", + "Subject should be concise, ideally <= 72 chars.", + "Wrap body at ~80 chars when useful.", + "Focus on what and why; avoid restating diff line-by-line.", + "Do not include code fences or markdown headings.", + }, + }, + { + name: "plain style", + style: "plain", + wrap: 50, + expected: []string{ + "Write a high-quality git commit message from the provided diff.", + "Subject should be concise, ideally <= 72 chars.", + "Wrap body at ~50 chars when useful.", + "Focus on what and why; avoid restating diff line-by-line.", + "Do not include code fences or markdown headings.", + }, + }, + { + name: "empty style defaults to plain", + style: "", + wrap: 72, + expected: []string{ + "Write a high-quality git commit message from the provided diff.", + "Subject should be concise, ideally <= 72 chars.", + "Wrap body at ~72 chars when useful.", + "Focus on what and why; avoid restating diff line-by-line.", + "Do not include code fences or markdown headings.", + }, + }, + { + name: "unknown style defaults to plain", + style: "unknown", + wrap: 72, + expected: []string{ + "Write a high-quality git commit message from the provided diff.", + "Subject should be concise, ideally <= 72 chars.", + "Wrap body at ~72 chars when useful.", + "Focus on what and why; avoid restating diff line-by-line.", + "Do not include code fences or markdown headings.", + }, + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + prompt := systemPrompt(tt.style, tt.wrap) + + // Check that all expected strings are present + for _, expected := range tt.expected { + assert.Contains(t, prompt, expected, "Expected string not found in prompt") + } + + // Check that conventional commit rules are only present for conventional style + hasConventionalRules := strings.Contains(prompt, "Use Conventional Commits format") + if tt.style == "conventional" || tt.style == "conv" { + assert.True(t, hasConventionalRules, "Conventional commit rules should be present") + } else { + assert.False(t, hasConventionalRules, "Conventional commit rules should not be present") + } + }) + } +} + +func TestSystemPromptCaseInsensitive(t *testing.T) { + tests := []struct { + style string + hasConv bool + }{ + {"CONVENTIONAL", true}, + {"Conventional", true}, + {"conventional", true}, + {"CONV", true}, + {"Conv", true}, + {"conv", true}, + {"PLAIN", false}, + {"Plain", false}, + {"plain", false}, + } + + for _, tt := range tests { + t.Run(tt.style, func(t *testing.T) { + prompt := systemPrompt(tt.style, 72) + hasConventionalRules := strings.Contains(prompt, "Use Conventional Commits format") + assert.Equal(t, tt.hasConv, hasConventionalRules) + }) + } +} + +func TestBuildUserPrompt(t *testing.T) { + tests := []struct { + name string + diff string + expected string + }{ + { + name: "simple diff", + diff: "diff --git a/file.go b/file.go\n+func newFeature() {}", + expected: "Diff of changes (unified):\ndiff --git a/file.go b/file.go\n+func newFeature() {}\n\nReturn subject on first line, optional body after.", + }, + { + name: "empty diff", + diff: "", + expected: "Diff of changes (unified):\n\n\nReturn subject on first line, optional body after.", + }, + { + name: "multiline diff", + diff: "diff --git a/file.go b/file.go\n-old line\n+new line\n@@ -1,3 +1,3 @@", + expected: "Diff of changes (unified):\ndiff --git a/file.go b/file.go\n-old line\n+new line\n@@ -1,3 +1,3 @@\n\nReturn subject on first line, optional body after.", + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + result := buildUserPrompt(tt.diff) + assert.Equal(t, tt.expected, result) + }) + } +} + +func TestPromptStructure(t *testing.T) { + // Test that the system prompt has a consistent structure + prompt := systemPrompt("conventional", 72) + + // Should be multiple lines + lines := strings.Split(prompt, "\n") + assert.Greater(t, len(lines), 3, "Prompt should have multiple lines") + + // Should start with the main instruction + assert.True(t, strings.HasPrefix(prompt, "Write a high-quality git commit message")) + + // Should contain all the basic rules + basicRules := []string{ + "Subject should be concise", + "Focus on what and why", + "Do not include code fences", + } + + for _, rule := range basicRules { + assert.Contains(t, prompt, rule) + } +} + +func TestPromptWrapParameter(t *testing.T) { + tests := []int{50, 72, 80, 100, 120} + + for _, wrap := range tests { + t.Run(fmt.Sprintf("wrap_%d", wrap), func(t *testing.T) { + prompt := systemPrompt("plain", wrap) + expectedWrapText := fmt.Sprintf("Wrap body at ~%d chars when useful.", wrap) + assert.Contains(t, prompt, expectedWrapText) + }) + } +} + +func TestUserPromptFormat(t *testing.T) { + diff := "test diff content" + prompt := buildUserPrompt(diff) + + // Should have the expected structure + assert.Contains(t, prompt, "Diff of changes (unified):") + assert.Contains(t, prompt, diff) + assert.Contains(t, prompt, "Return subject on first line, optional body after.") + + // Should have proper spacing + parts := strings.Split(prompt, "\n\n") + assert.Len(t, parts, 2, "Should have two main parts separated by double newline") +} diff --git a/pkg/config/ai_config_test.go b/pkg/config/ai_config_test.go new file mode 100644 index 00000000000..7d304423fb5 --- /dev/null +++ b/pkg/config/ai_config_test.go @@ -0,0 +1,269 @@ +package config + +import ( + "testing" + + "github.com/stretchr/testify/assert" +) + +func TestAIConfigValidate(t *testing.T) { + tests := []struct { + name string + config AIConfig + expectError bool + errorMsg string + }{ + { + name: "valid config with all fields", + config: AIConfig{ + Provider: "openai", + BaseURL: "https://api.openai.com/v1", + Model: "gpt-4o-mini", + APIKeyEnv: "OPENAI_API_KEY", + Temperature: 0.2, + MaxTokens: 300, + StagedOnly: true, + CommitStyle: "conventional", + }, + expectError: false, + }, + { + name: "valid config with minimal fields", + config: AIConfig{ + Model: "gpt-4o-mini", + }, + expectError: false, + }, + { + name: "missing model", + config: AIConfig{ + Provider: "openai", + }, + expectError: true, + errorMsg: "ai.model is required", + }, + { + name: "empty model", + config: AIConfig{ + Model: "", + }, + expectError: true, + errorMsg: "ai.model is required", + }, + { + name: "temperature too low", + config: AIConfig{ + Model: "gpt-4o-mini", + Temperature: -0.1, + }, + expectError: true, + errorMsg: "ai.temperature must be between 0 and 2", + }, + { + name: "temperature too high", + config: AIConfig{ + Model: "gpt-4o-mini", + Temperature: 2.1, + }, + expectError: true, + errorMsg: "ai.temperature must be between 0 and 2", + }, + { + name: "valid temperature at boundary", + config: AIConfig{ + Model: "gpt-4o-mini", + Temperature: 0.0, + }, + expectError: false, + }, + { + name: "valid temperature at upper boundary", + config: AIConfig{ + Model: "gpt-4o-mini", + Temperature: 2.0, + }, + expectError: false, + }, + { + name: "negative max tokens", + config: AIConfig{ + Model: "gpt-4o-mini", + MaxTokens: -1, + }, + expectError: true, + errorMsg: "ai.maxTokens must be non-negative", + }, + { + name: "max tokens too small", + config: AIConfig{ + Model: "gpt-4o-mini", + MaxTokens: 5, + }, + expectError: true, + errorMsg: "ai.maxTokens must be at least 10 if specified", + }, + { + name: "valid max tokens at minimum", + config: AIConfig{ + Model: "gpt-4o-mini", + MaxTokens: 10, + }, + expectError: false, + }, + { + name: "zero max tokens (server decides)", + config: AIConfig{ + Model: "gpt-4o-mini", + MaxTokens: 0, + }, + expectError: false, + }, + { + name: "invalid provider", + config: AIConfig{ + Model: "gpt-4o-mini", + Provider: "invalid-provider", + }, + expectError: true, + errorMsg: "ai.provider must be one of: openai, openrouter, custom", + }, + { + name: "valid openai provider", + config: AIConfig{ + Model: "gpt-4o-mini", + Provider: "openai", + }, + expectError: false, + }, + { + name: "valid openrouter provider", + config: AIConfig{ + Model: "gpt-4o-mini", + Provider: "openrouter", + }, + expectError: false, + }, + { + name: "valid custom provider", + config: AIConfig{ + Model: "gpt-4o-mini", + Provider: "custom", + }, + expectError: false, + }, + { + name: "empty provider (defaults to openai)", + config: AIConfig{ + Model: "gpt-4o-mini", + Provider: "", + }, + expectError: false, + }, + { + name: "invalid commit style", + config: AIConfig{ + Model: "gpt-4o-mini", + CommitStyle: "invalid-style", + }, + expectError: true, + errorMsg: "ai.commitStyle must be one of: conventional, plain", + }, + { + name: "valid conventional commit style", + config: AIConfig{ + Model: "gpt-4o-mini", + CommitStyle: "conventional", + }, + expectError: false, + }, + { + name: "valid plain commit style", + config: AIConfig{ + Model: "gpt-4o-mini", + CommitStyle: "plain", + }, + expectError: false, + }, + { + name: "empty commit style (defaults to conventional)", + config: AIConfig{ + Model: "gpt-4o-mini", + CommitStyle: "", + }, + expectError: false, + }, + { + name: "multiple validation errors (should return first)", + config: AIConfig{ + Model: "", // Missing model + Temperature: 3.0, // Invalid temperature + MaxTokens: -5, // Invalid max tokens + Provider: "invalid", // Invalid provider + CommitStyle: "invalid", // Invalid commit style + }, + expectError: true, + errorMsg: "ai.model is required", // Should return the first error + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + err := tt.config.Validate() + + if tt.expectError { + assert.Error(t, err) + assert.Contains(t, err.Error(), tt.errorMsg) + } else { + assert.NoError(t, err) + } + }) + } +} + +func TestAIConfigValidateEdgeCases(t *testing.T) { + // Test with very large values + t.Run("very large max tokens", func(t *testing.T) { + config := AIConfig{ + Model: "gpt-4o-mini", + MaxTokens: 1000000, + } + err := config.Validate() + assert.NoError(t, err) + }) + + // Test with very precise temperature values + t.Run("precise temperature values", func(t *testing.T) { + config := AIConfig{ + Model: "gpt-4o-mini", + Temperature: 1.9999999, + } + err := config.Validate() + assert.NoError(t, err) + }) + + // Test with whitespace in string fields + t.Run("whitespace in model name", func(t *testing.T) { + config := AIConfig{ + Model: " gpt-4o-mini ", + } + // Note: The validation doesn't trim whitespace, so this should pass + // In a real implementation, you might want to add trimming + err := config.Validate() + assert.NoError(t, err) + }) +} + +func TestAIConfigDefaults(t *testing.T) { + // Test that the default configuration from GetDefaultConfig is valid + defaultConfig := GetDefaultConfig() + err := defaultConfig.AI.Validate() + + // The default config has an empty model, so it should fail validation + assert.Error(t, err) + assert.Contains(t, err.Error(), "ai.model is required") + + // But if we set a model, it should be valid + defaultConfig.AI.Model = "gpt-4o-mini" + err = defaultConfig.AI.Validate() + assert.NoError(t, err) +} diff --git a/pkg/config/user_config.go b/pkg/config/user_config.go index c30d030aeaf..b7635b044bb 100644 --- a/pkg/config/user_config.go +++ b/pkg/config/user_config.go @@ -1,6 +1,7 @@ package config import ( + "errors" "time" "github.com/karimkhaleel/jsonschema" @@ -36,8 +37,11 @@ type UserConfig struct { NotARepository string `yaml:"notARepository" jsonschema:"enum=prompt,enum=create,enum=skip,enum=quit"` // If true, display a confirmation when subprocess terminates. This allows you to view the output of the subprocess before returning to Lazygit. PromptToReturnFromSubprocess bool `yaml:"promptToReturnFromSubprocess"` - // Keybindings - Keybinding KeybindingConfig `yaml:"keybinding"` + // Keybindings + Keybinding KeybindingConfig `yaml:"keybinding"` + + // Configuration for AI-powered features like commit message generation + AI AIConfig `yaml:"ai"` } type RefresherConfig struct { @@ -298,6 +302,72 @@ type GitConfig struct { TruncateCopiedCommitHashesTo int `yaml:"truncateCopiedCommitHashesTo"` } +// AIConfig configures AI-powered features. The commit generator uses an +// OpenAI-compatible API (e.g. OpenAI, OpenRouter, or any self-hosted +// compatible endpoint). +type AIConfig struct { + // Provider hint. One of: 'openai' | 'openrouter' | 'custom'. Only used to + // infer sensible defaults; any OpenAI-compatible baseURL will work. + Provider string `yaml:"provider" jsonschema:"enum=openai,enum=openrouter,enum=custom,default=openai"` + // Base URL for the API. If empty, defaults to the provider's common URL: + // - openai: https://api.openai.com/v1 + // - openrouter: https://openrouter.ai/api/v1 + BaseURL string `yaml:"baseURL"` + // Model name, e.g. 'gpt-4o-mini' (OpenAI) or an OpenRouter model id. + Model string `yaml:"model"` + // Environment variable from which to read the API key. If empty, will + // default to OPENAI_API_KEY for provider 'openai' and OPENROUTER_API_KEY + // for provider 'openrouter'. + APIKeyEnv string `yaml:"apiKeyEnv"` + // Temperature for sampling (0-2 typical). + Temperature float64 `yaml:"temperature"` + // Max tokens for the response. Leave 0 to let the server decide. + MaxTokens int `yaml:"maxTokens" jsonschema:"minimum=0"` + // If true (default), only staged changes are sent to the AI. If false, + // both staged and unstaged diffs can be considered by generators that + // support it (current implementation uses staged only when true, and + // falls back to all tracked changes otherwise). + StagedOnly bool `yaml:"stagedOnly"` + // Style of commit message to generate. One of: 'conventional' | 'plain' + // (default: 'conventional') + CommitStyle string `yaml:"commitStyle" jsonschema:"enum=conventional,enum=plain"` +} + +// Validate validates the AI configuration parameters +func (cfg AIConfig) Validate() error { + if cfg.Model == "" { + return errors.New("ai.model is required") + } + + if cfg.Temperature < 0 || cfg.Temperature > 2 { + return errors.New("ai.temperature must be between 0 and 2") + } + + if cfg.MaxTokens < 0 { + return errors.New("ai.maxTokens must be non-negative") + } + + if cfg.MaxTokens > 0 && cfg.MaxTokens < 10 { + return errors.New("ai.maxTokens must be at least 10 if specified") + } + + validProviders := map[string]bool{ + "openai": true, "openrouter": true, "custom": true, "": true, + } + if !validProviders[cfg.Provider] { + return errors.New("ai.provider must be one of: openai, openrouter, custom") + } + + validStyles := map[string]bool{ + "conventional": true, "plain": true, "": true, + } + if !validStyles[cfg.CommitStyle] { + return errors.New("ai.commitStyle must be one of: conventional, plain") + } + + return nil +} + type PagerType string func (PagerType) JSONSchemaExtend(schema *jsonschema.Schema) { @@ -725,8 +795,8 @@ type IconProperties struct { } func GetDefaultConfig() *UserConfig { - return &UserConfig{ - Gui: GuiConfig{ + return &UserConfig{ + Gui: GuiConfig{ ScrollHeight: 2, ScrollPastBottom: true, ScrollOffMargin: 2, @@ -794,8 +864,8 @@ func GetDefaultConfig() *UserConfig { SwitchToFilesAfterStashPop: true, SwitchToFilesAfterStashApply: true, SwitchTabsWithPanelJumpKeys: false, - }, - Git: GitConfig{ + }, + Git: GitConfig{ Paging: PagingConfig{ ColorArg: "always", Pager: "", @@ -834,12 +904,22 @@ func GetDefaultConfig() *UserConfig { CommitPrefixes: map[string][]CommitPrefixConfig(nil), BranchPrefix: "", ParseEmoji: false, - TruncateCopiedCommitHashesTo: 12, - }, - Refresher: RefresherConfig{ - RefreshInterval: 10, - FetchInterval: 60, - }, + TruncateCopiedCommitHashesTo: 12, + }, + AI: AIConfig{ + Provider: "openai", + BaseURL: "", + Model: "", + APIKeyEnv: "", + Temperature: 0.2, + MaxTokens: 300, + StagedOnly: true, + CommitStyle: "conventional", + }, + Refresher: RefresherConfig{ + RefreshInterval: 10, + FetchInterval: 60, + }, Update: UpdateConfig{ Method: "prompt", Days: 14, diff --git a/pkg/gui/controllers/helpers/commits_helper.go b/pkg/gui/controllers/helpers/commits_helper.go index 306c689a1e4..8adaef0c08c 100644 --- a/pkg/gui/controllers/helpers/commits_helper.go +++ b/pkg/gui/controllers/helpers/commits_helper.go @@ -1,15 +1,17 @@ package helpers import ( - "errors" - "path/filepath" - "strings" - "time" - - "github.com/jesseduffield/gocui" - "github.com/jesseduffield/lazygit/pkg/commands/git_commands" - "github.com/jesseduffield/lazygit/pkg/gui/types" - "github.com/samber/lo" + "context" + "errors" + "path/filepath" + "strings" + "time" + + "github.com/jesseduffield/gocui" + "github.com/jesseduffield/lazygit/pkg/ai" + "github.com/jesseduffield/lazygit/pkg/commands/git_commands" + "github.com/jesseduffield/lazygit/pkg/gui/types" + "github.com/samber/lo" ) type CommitsHelper struct { @@ -202,34 +204,104 @@ func (self *CommitsHelper) OpenCommitMenu(suggestionFunc func(string) []*types.S } } - menuItems := []*types.MenuItem{ - { - Label: self.c.Tr.OpenInEditor, - OnPress: func() error { - return self.SwitchToEditor() - }, - Key: 'e', - DisabledReason: disabledReasonForOpenInEditor, - }, - { - Label: self.c.Tr.AddCoAuthor, - OnPress: func() error { - return self.addCoAuthor(suggestionFunc) - }, - Key: 'c', - }, - { - Label: self.c.Tr.PasteCommitMessageFromClipboard, - OnPress: func() error { - return self.pasteCommitMessageFromClipboard() - }, - Key: 'p', - }, - } - return self.c.Menu(types.CreateMenuOptions{ - Title: self.c.Tr.CommitMenuTitle, - Items: menuItems, - }) + menuItems := []*types.MenuItem{ + { + Label: self.c.Tr.OpenInEditor, + OnPress: func() error { + return self.SwitchToEditor() + }, + Key: 'e', + DisabledReason: disabledReasonForOpenInEditor, + }, + { + Label: self.c.Tr.GenerateAICommitMessage, + OnPress: func() error { + return self.generateCommitMessageWithAI() + }, + Key: 'g', + }, + { + Label: self.c.Tr.AddCoAuthor, + OnPress: func() error { + return self.addCoAuthor(suggestionFunc) + }, + Key: 'c', + }, + { + Label: self.c.Tr.PasteCommitMessageFromClipboard, + OnPress: func() error { + return self.pasteCommitMessageFromClipboard() + }, + Key: 'p', + }, + } + return self.c.Menu(types.CreateMenuOptions{ + Title: self.c.Tr.CommitMenuTitle, + Items: menuItems, + }) +} + +func (self *CommitsHelper) generateCommitMessageWithAI() error { + // Gather diff of staged files (plain, cached) + var diffs []string + for _, f := range self.c.Model().Files { + if f.HasStagedChanges { + d := self.c.Git().WorkingTree.WorktreeFileDiff(f, true, true) + if strings.TrimSpace(d) != "" { + diffs = append(diffs, d) + } + } + } + if len(diffs) == 0 { + // Fallback: if nothing staged, try all tracked files diffs (plain, not cached) + for _, f := range self.c.Model().Files { + if f.Tracked || f.Added { + d := self.c.Git().WorkingTree.WorktreeFileDiff(f, true, false) + if strings.TrimSpace(d) != "" { + diffs = append(diffs, d) + } + } + } + } + if len(diffs) == 0 { + return errors.New(self.c.Tr.NoFilesStagedTitle) + } + + diff := strings.Join(diffs, "\n\n") + + // Validate diff size to prevent sending excessively large diffs + const maxDiffSize = 50000 // ~50KB limit + if len(diff) > maxDiffSize { + return errors.New("diff too large for AI processing (limit: 50KB)") + } + + // Build client from config + cl, err := ai.NewClientFromConfig(self.c.UserConfig().AI) + if err != nil { + self.c.Alert(self.c.Tr.Error, err.Error()) + return err + } + + waitText := self.c.Tr.GeneratingAICommitMessageStatus + if waitText == "" { + waitText = "Generating commit message" + } + return self.c.WithWaitingStatus(waitText, func(gocui.Task) error { + ctx, cancel := context.WithTimeout(context.Background(), 45*time.Second) + defer cancel() + subject, body, err := cl.GenerateCommitMessage(ctx, diff, self.c.UserConfig().AI.CommitStyle, self.c.UserConfig().Git.Commit.AutoWrapWidth) + if err != nil { + return err + } + + // Update UI fields on UI thread + return self.c.OnUIThread(func() error { + self.setCommitSummary(subject) + self.setCommitDescription(body) + self.c.Contexts().CommitMessage.RenderSubtitle() + return nil + }) + }) } func (self *CommitsHelper) addCoAuthor(suggestionFunc func(string) []*types.Suggestion) error { diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go index 9db91b7a865..5f8b98dec30 100644 --- a/pkg/i18n/english.go +++ b/pkg/i18n/english.go @@ -915,7 +915,11 @@ type Bisect struct { CompleteTitle string CompletePrompt string CompletePromptIndeterminate string - Bisecting string + Bisecting string + + // AI commits + GenerateAICommitMessage string + GeneratingAICommitMessageStatus string } type Log struct { @@ -2093,8 +2097,8 @@ func EnglishTranslationSet() *TranslationSet { BisectMark: "Bisect mark", AddWorktree: "Add worktree", }, - Bisect: Bisect{ - Mark: "Mark current commit (%s) as %s", + Bisect: Bisect{ + Mark: "Mark current commit (%s) as %s", MarkStart: "Mark %s as %s (start bisect)", SkipCurrent: "Skip current commit (%s)", SkipSelected: "Skip selected commit (%s)", @@ -2108,9 +2112,12 @@ func EnglishTranslationSet() *TranslationSet { CompleteTitle: "Bisect complete", CompletePrompt: "Bisect complete! The following commit introduced the change:\n\n%s\n\nDo you want to reset 'git bisect' now?", CompletePromptIndeterminate: "Bisect complete! Some commits were skipped, so any of the following commits may have introduced the change:\n\n%s\n\nDo you want to reset 'git bisect' now?", - Bisecting: "Bisecting", - }, - Log: Log{ + Bisecting: "Bisecting", + }, + // AI commits + GenerateAICommitMessage: "Generate AI commit message", + GeneratingAICommitMessageStatus: "Generating commit message", + Log: Log{ EditRebase: "Beginning interactive rebase at '{{.ref}}'", HandleUndo: "Undoing last conflict resolution", RemoveFile: "Deleting path '{{.path}}'", diff --git a/pkg/i18n/translations/ja.json b/pkg/i18n/translations/ja.json index 4f2d014d094..bafde3e5599 100644 --- a/pkg/i18n/translations/ja.json +++ b/pkg/i18n/translations/ja.json @@ -978,5 +978,7 @@ "0.41.0": "- 'g'キーを押してgitリセットメニューを表示すると、'soft'ではなく'mixed'オプションが最初のデフォルトになりました。これは'mixed'が最も一般的に使用されるオプションだからです。\n- コミットメッセージパネルは、デフォルトで自動的にハードラップされるようになりました（つまり、余白に達すると改行文字が追加されます）。設定は次のように調整できます：\n\ngit:\n commit:\n autoWrapCommitMessage: true\n autoWrapWidth: 72\n\n- 'v'キーはすでにステージングビューで範囲選択を開始するために使用されていましたが、現在ではどのビューでも範囲選択を開始するために使用できます。残念ながら、これはコミットの貼り付け（チェリーピック）の'v'キーバインディングと競合するため、現在はコミットの貼り付けは'shift+V'で行われ、一貫性のために、コミットのコピーは単に'c'ではなく'shift+C'で行われるようになりました。'v'キーバインディングは範囲選択を開始する方法の1つに過ぎないことに注意してください：代わりにshift+上/下矢印を使用できます。したがって、チェリーピックキーバインディングを古い動作に設定したい場合は、設定に以下を設定してください：\n\nkeybinding:\n universal:\n toggleRangeSelect: \n commits:\n cherryPickCopy: 'c'\n pasteCommits: 'v'\n\n- 'shift-S'を使用したフィックスアップのスカッシュは、現在メニューを表示し、デフォルトオプションはブランチ内のすべてのfixupコミットをスカッシュすることです。選択したコミットの上にあるfixupコミットのみをスカッシュするという元の動作は、そのメニューの2番目のオプションとして引き続き利用できます。\n- プッシュ/プル/フェッチの読み込みステータスは、ポップアップではなくブランチに対して表示されるようになりました。これにより、例えば複数のブランチを並行してフェッチし、各ブランチのステータスを確認できます。\n- コミットビューのgitロググラフは、現在デフォルトで常に表示されるようになりました（以前はビューが最大化されている場合にのみ表示されていました）。これがうるさいと感じる場合は、ctrl+L -> 'Gitグラフを表示' -> '最大化時のみ'で元に戻すことができます。\n- リモートブランチでスペースを押すと、以前はリモートブランチからチェックアウトする新しいローカルブランチの名前を入力するプロンプトが表示されていました。現在は、リモートブランチを直接チェックアウトし、同じ名前の新しいローカルブランチまたはデタッチドヘッドのいずれかを選択できます。古い動作は引き続き'n'キーバインディングで利用できます。\n- フィルタリング（例えば'/'を押したとき）は、デフォルトでは以前ほどあいまいではありません；現在は部分文字列のみに一致します。複数の部分文字列はスペースで区切ることで一致させることができます。古い動作に戻したい場合は、設定に以下を設定してください：\n\ngui:\n filterMode: 'fuzzy'\n\t ", "0.44.0": "- gui.branchColors設定オプションは非推奨です；将来のバージョンで削除される予定です。代わりにgui.branchColorPatternsを使用してください。\n- 「feature/」、「bugfix/」、または「hotfix/」で始まるブランチの自動カラーリングが削除されました；これが必要な場合は、新しいgui.branchColorPatternsオプションを使用して簡単に設定できます。", "0.49.0": "- シェルコマンドの実行（':'プロンプトを使用）は、対話型シェルを使用しなくなりました。つまり、このプロンプトでシェルエイリアスを使用したい場合は、少し設定作業が必要です。詳細については、https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#using-aliases-or-functions-in-shell-commands を参照してください。" - } + }, + "GenerateAICommitMessage": "AIコミットメッセージを生成", + "GeneratingAICommitMessageStatus": "コミットメッセージを生成中" } diff --git a/pkg/i18n/translations/ko.json b/pkg/i18n/translations/ko.json index 0027658937a..acd56e76cd1 100644 --- a/pkg/i18n/translations/ko.json +++ b/pkg/i18n/translations/ko.json @@ -374,5 +374,7 @@ "CompleteTitle": "Bisect 완료" }, "Log": {}, - "BreakingChangesByVersion": {} + "BreakingChangesByVersion": {}, + "GenerateAICommitMessage": "AI 커밋 메시지 생성", + "GeneratingAICommitMessageStatus": "커밋 메시지 생성 중" } diff --git a/pkg/i18n/translations/nl.json b/pkg/i18n/translations/nl.json index 24b63f540a3..d3ee6c4b208 100644 --- a/pkg/i18n/translations/nl.json +++ b/pkg/i18n/translations/nl.json @@ -268,5 +268,7 @@ "Actions": {}, "Bisect": {}, "Log": {}, - "BreakingChangesByVersion": {} + "BreakingChangesByVersion": {}, + "GenerateAICommitMessage": "Genereer AI commit bericht", + "GeneratingAICommitMessageStatus": "Commit bericht genereren" } diff --git a/pkg/i18n/translations/zh-CN.json b/pkg/i18n/translations/zh-CN.json index ef566c61068..ecebeb56a1d 100644 --- a/pkg/i18n/translations/zh-CN.json +++ b/pkg/i18n/translations/zh-CN.json @@ -954,5 +954,7 @@ "0.41.0": "- 当您按“g”调出 git 重置菜单时，“mixed”选项现在是第一个也是默认选项，而不是“soft”。这是因为“mixed”是最常用的选项。\n- 提交消息面板现在默认自动硬换行（即，当您到达页边距时，它会添加换行符）。您可以像这样调整配置：\n\ngit:\n commit:\n autoWrapCommitMessage: true\n autoWrapWidth: 72\n\n- “v”键已在暂存视图中用于启动范围选择，但现在您可以使用它在任何视图中启动范围选择。不幸的是，这与粘贴提交（cherry-pick）的“v”键绑定冲突，因此现在粘贴提交是通过“shift+V”完成的，为了一致性，复制提交现在是通过“shift+C”而不是“c”。请注意，“v”键绑定只是启动范围选择的一种方法：您可以使用 shift+向上/向下箭头。因此，如果您想配置cherry-pick键绑定以获得旧行为，请在配置中设置以下内容：\n\nkeybinding:\n universal:\n toggleRangeSelect: \n commits:\n cherryPickCopy: 'c'\n pasteCommits: 'v'\n\n- 使用“shift-S”压缩修复现在会弹出一个菜单，默认选项是压缩分支中的所有修复提交。仅压缩所选提交之上的修复提交的原始行为仍然可以作为该菜单中的第二个选项使用。\n- Push/pull/fetch 加载状态现在显示在分支上，而不是在弹出窗口中。这允许您例如并行获取多个分支并查看每个分支的状态。\n- 提交视图中的 git 日志图现在始终默认显示（以前仅在视图最大化时显示）。如果您发现这太冗余了，您可以通过 ctrl+L -> 'Show git graph' -> 'when maximized' 将其改回来\n- 在远程分支上按空格用于显示输入新本地分支名称的提示，以从远程分支检出。现在它只是直接检查远程分支，让您在同名的新本地分支或分离的头之间进行选择。旧的行为仍然可以通过“n”键绑定使用。\n- 默认情况下，过滤（例如按“/”时）不太模糊；它现在只匹配子字符串。多个子字符串可以通过用空格分隔来匹配。如果您想恢复到旧的行为，请在配置中设置以下内容：\n\ngui:\n filterMode: 'fuzzy'\n\t ", "0.44.0": "- gui.branchColors 配置选项已弃用；其将在未来的版本中被移除。请使用 gui.branchColorPatterns 代替。\n- 以 \"feature/\"，\"bugfix/\" 和 \"hotfix/\" 开头的分支自动上色已移除；如果您想要保留该功能，可以通过设置新的 gui.branchColorPatterns 选项来启用。", "0.49.0": "- 执行shell命令（带':'提示符）不再使用交互式shell。如需在提示符中使用shell别名，需进行额外配置。详见：https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#using-aliases-or-functions-in-shell-commands" - } + }, + "GenerateAICommitMessage": "生成AI提交消息", + "GeneratingAICommitMessageStatus": "正在生成提交消息" } diff --git a/pkg/integration/tests/commit/ai_commit_message.go b/pkg/integration/tests/commit/ai_commit_message.go new file mode 100644 index 00000000000..334a792b77d --- /dev/null +++ b/pkg/integration/tests/commit/ai_commit_message.go @@ -0,0 +1,255 @@ +package commit + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var AICommitMessage = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Generate AI commit message for staged changes", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(config *config.AppConfig) { + // Configure AI settings for testing + config.UserConfig.AI.Provider = "openai" + config.UserConfig.AI.Model = "gpt-4o-mini" + config.UserConfig.AI.Temperature = 0.2 + config.UserConfig.AI.MaxTokens = 300 + config.UserConfig.AI.StagedOnly = true + config.UserConfig.AI.CommitStyle = "conventional" + }, + SetupRepo: func(shell *Shell) { + shell.CreateFileAndAdd("feature.go", `package main + +import "fmt" + +func main() { + fmt.Println("Hello, World!") +}`) + shell.CreateFileAndAdd("README.md", "# My Project\n\nThis is a test project.") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + // Note: This test will only work if the user has a valid API key set + // In a real CI environment, this test might be skipped or use a mock server + + t.Views().Commits(). + IsEmpty() + + t.Views().Files(). + IsFocused(). + Lines( + Contains("feature.go"), + Contains("README.md"), + ). + Press(keys.Files.CommitChanges) + + t.ExpectPopup().CommitMessagePanel(). + Title(Equals("Commit summary")). + Press(keys.Universal.OpenCommitMenu) + + t.ExpectPopup().Menu(). + Title(Equals("Commit menu")). + Select(Contains("Generate AI commit message")). + Confirm() + + // The AI generation might take some time, so we wait for the status + // In a real test, we might mock the AI response for faster execution + t.Views().CommitMessage(). + Content(MatchesRegexp(`^(feat|fix|docs|style|refactor|perf|test|chore|build|ci)(\(.+\))?: .+`)) + + // Verify we can still edit the generated message + t.Views().CommitMessage(). + Type(" - updated by user"). + Confirm() + + t.Views().Commits(). + Lines( + MatchesRegexp(`^(feat|fix|docs|style|refactor|perf|test|chore|build|ci)(\(.+\))?: .+ - updated by user`), + ) + }, +}) + +var AICommitMessageWithError = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Handle AI commit message generation errors gracefully", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(config *config.AppConfig) { + // Configure AI with invalid settings to trigger an error + config.UserConfig.AI.Provider = "openai" + config.UserConfig.AI.Model = "" // Missing model should cause validation error + config.UserConfig.AI.Temperature = 0.2 + config.UserConfig.AI.MaxTokens = 300 + config.UserConfig.AI.StagedOnly = true + config.UserConfig.AI.CommitStyle = "conventional" + }, + SetupRepo: func(shell *Shell) { + shell.CreateFileAndAdd("test.go", "package main") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Files(). + IsFocused(). + Press(keys.Files.CommitChanges) + + t.ExpectPopup().CommitMessagePanel(). + Press(keys.Universal.OpenCommitMenu) + + t.ExpectPopup().Menu(). + Title(Equals("Commit menu")). + Select(Contains("Generate AI commit message")). + Confirm() + + // Should show an error alert + t.ExpectPopup().Alert(). + Title(Equals("Error")). + Content(Contains("ai.model is required")). + Confirm() + + // Should return to the commit message panel + t.ExpectPopup().CommitMessagePanel(). + Type("manual commit message"). + Confirm() + + t.Views().Commits(). + Lines( + Contains("manual commit message"), + ) + }, +}) + +var AICommitMessageNoStagedFiles = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Handle AI commit message generation when no files are staged", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(config *config.AppConfig) { + config.UserConfig.AI.Provider = "openai" + config.UserConfig.AI.Model = "gpt-4o-mini" + config.UserConfig.AI.Temperature = 0.2 + config.UserConfig.AI.MaxTokens = 300 + config.UserConfig.AI.StagedOnly = true + config.UserConfig.AI.CommitStyle = "conventional" + }, + SetupRepo: func(shell *Shell) { + shell.CreateFile("unstaged.go", "package main") + // Don't stage the file + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Files(). + IsFocused(). + Lines( + Contains("unstaged.go"), + ). + Press(keys.Files.CommitChanges) + + t.ExpectPopup().CommitMessagePanel(). + Press(keys.Universal.OpenCommitMenu) + + t.ExpectPopup().Menu(). + Title(Equals("Commit menu")). + Select(Contains("Generate AI commit message")). + Confirm() + + // Should show an error about no staged files + t.ExpectPopup().Alert(). + Title(Equals("Error")). + Content(Contains("No files staged")). + Confirm() + + // Should return to the commit message panel + t.ExpectPopup().CommitMessagePanel(). + Cancel() + }, +}) + +var AICommitMessagePlainStyle = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Generate AI commit message with plain style", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(config *config.AppConfig) { + config.UserConfig.AI.Provider = "openai" + config.UserConfig.AI.Model = "gpt-4o-mini" + config.UserConfig.AI.Temperature = 0.2 + config.UserConfig.AI.MaxTokens = 300 + config.UserConfig.AI.StagedOnly = true + config.UserConfig.AI.CommitStyle = "plain" // Use plain style instead of conventional + }, + SetupRepo: func(shell *Shell) { + shell.CreateFileAndAdd("simple.txt", "Hello World") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Files(). + IsFocused(). + Press(keys.Files.CommitChanges) + + t.ExpectPopup().CommitMessagePanel(). + Press(keys.Universal.OpenCommitMenu) + + t.ExpectPopup().Menu(). + Title(Equals("Commit menu")). + Select(Contains("Generate AI commit message")). + Confirm() + + // For plain style, we expect a simple commit message without conventional format + t.Views().CommitMessage(). + Content(Not(MatchesRegexp(`^(feat|fix|docs|style|refactor|perf|test|chore|build|ci)(\(.+\))?: .+`))). + Content(Not(Equals(""))) // Should not be empty + + t.Views().CommitMessage(). + Confirm() + + t.Views().Commits(). + TopLines( + Not(MatchesRegexp(`^(feat|fix|docs|style|refactor|perf|test|chore|build|ci)(\(.+\))?: .+`)), + ) + }, +}) + +var AICommitMessageLargeDiff = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Handle AI commit message generation with large diff that exceeds size limit", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(config *config.AppConfig) { + config.UserConfig.AI.Provider = "openai" + config.UserConfig.AI.Model = "gpt-4o-mini" + config.UserConfig.AI.Temperature = 0.2 + config.UserConfig.AI.MaxTokens = 300 + config.UserConfig.AI.StagedOnly = true + config.UserConfig.AI.CommitStyle = "conventional" + }, + SetupRepo: func(shell *Shell) { + // Create a very large file to exceed the diff size limit + largeContent := "" + for i := 0; i < 2000; i++ { + largeContent += "This is a very long line that will make the diff very large when staged.\n" + } + shell.CreateFileAndAdd("large_file.txt", largeContent) + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Files(). + IsFocused(). + Press(keys.Files.CommitChanges) + + t.ExpectPopup().CommitMessagePanel(). + Press(keys.Universal.OpenCommitMenu) + + t.ExpectPopup().Menu(). + Title(Equals("Commit menu")). + Select(Contains("Generate AI commit message")). + Confirm() + + // Should show an error about diff being too large + t.ExpectPopup().Alert(). + Title(Equals("Error")). + Content(Contains("diff too large for AI processing")). + Confirm() + + // Should return to the commit message panel + t.ExpectPopup().CommitMessagePanel(). + Type("manual commit for large file"). + Confirm() + + t.Views().Commits(). + Lines( + Contains("manual commit for large file"), + ) + }, +})