refactor(config): update and standardize configuration keys

- rename and clarify git and LLM config keys for consistency
- adjust default values for timeouts and concurrency
- update version handling to use structured metadata
- modify test cases to reflect new config key names
- improve error handling and parsing for duration values

Signed-off-by: kovacs <mritd@linux.com>

Author: mritd

README.md

@@ -110,23 +110,23 @@ All settings are configured via `~/.gitconfig` under the `[gitflow]` section.
     llm-api-key = sk-or-v1-xxxxx
 
     # LLM settings
-    llm-host = https://openrouter.ai
+    llm-api-host = https://openrouter.ai
     llm-model = mistralai/devstral-2512:free
     llm-temperature = 0.3
-    llm-context = 5
-    llm-timeout = 120
-    llm-retries = 0
-    llm-lang = en
-    llm-concurrency = 5
+    llm-diff-context = 5
+    llm-request-timeout = 2m
+    llm-max-retries = 0
+    llm-output-lang = en
+    llm-max-concurrency = 3
 
     # Custom prompts (optional, language-specific)
-    llm-file-prompt = "Summarize this diff briefly."
+    llm-file-analysis-prompt = "Summarize this diff briefly."
     llm-commit-prompt-en = "Your custom English commit prompt."
     llm-commit-prompt-zh = "Your custom Chinese commit prompt."
     llm-commit-prompt-bilingual = "Your custom bilingual commit prompt."
 
     # Lucky commit prefix (hex characters, max 12)
-    lucky-commit = abc
+    lucky-commit-prefix = abc
 
     # SSH strict host key checking (default: false)
     ssh-strict-host-key = false
@@ -137,19 +137,19 @@ All settings are configured via `~/.gitconfig` under the `[gitflow]` section.
 | Key | Description | Default |
 |-----|-------------|---------|
 | `llm-api-key` | API key for cloud LLM providers | - |
-| `llm-host` | LLM API endpoint | see below |
+| `llm-api-host` | LLM API endpoint | see below |
 | `llm-model` | LLM model name | see below |
 | `llm-temperature` | Model temperature | `0.3` |
-| `llm-context` | Diff context lines | `5` |
-| `llm-timeout` | Request timeout (seconds) | `120` |
-| `llm-retries` | Retry count on failure | `0` |
-| `llm-lang` | Output language (`en`, `zh`, `bilingual`) | `en` |
-| `llm-concurrency` | Parallel file analysis limit | `5` |
-| `llm-file-prompt` | Custom file analysis prompt | - |
+| `llm-diff-context` | Diff context lines | `5` |
+| `llm-request-timeout` | Request timeout (Go duration, e.g., `2m`, `30s`) | `2m` |
+| `llm-max-retries` | Max retry count on failure | `0` |
+| `llm-output-lang` | Output language (`en`, `zh`, `bilingual`) | `en` |
+| `llm-max-concurrency` | Max parallel file analysis | `3` |
+| `llm-file-analysis-prompt` | Custom file analysis prompt | - |
 | `llm-commit-prompt-en` | Custom English commit prompt | - |
 | `llm-commit-prompt-zh` | Custom Chinese commit prompt | - |
 | `llm-commit-prompt-bilingual` | Custom bilingual commit prompt | - |
-| `lucky-commit` | Lucky commit hex prefix (max 12 chars) | - |
+| `lucky-commit-prefix` | Lucky commit hex prefix (max 12 chars) | - |
 | `ssh-strict-host-key` | SSH strict host key checking | `false` |
 
 ### Auto Generate (AI)
@@ -198,7 +198,7 @@ Generate commit hashes with a specific prefix using [lucky_commit](https://githu
 cargo install lucky_commit
 
 # Set the desired prefix (hex characters, max 12)
-git config --global gitflow.lucky-commit abc
+git config --global gitflow.lucky-commit-prefix abc
 
 # Commit as usual - hash will start with "abc"
 git ci

Taskfile.yml

@@ -4,7 +4,7 @@ vars:
   VERSION:
     sh: git symbolic-ref -q --short HEAD || git describe --tags --exact-match 2>/dev/null || echo "dev"
   BUILD_COMMIT:
-    sh: git rev-parse --short HEAD 2>/dev/null || echo "unknown"
+    sh: git rev-parse HEAD 2>/dev/null || echo "unknown"
   BUILD_DATE:
     sh: date "+%F %T"
 

cmd/root.go

@@ -4,13 +4,26 @@ package cmd
 import (
 	"fmt"
 	"os"
+	"strings"
 
+	"github.com/charmbracelet/lipgloss"
 	"github.com/spf13/cobra"
 
 	"github.com/mritd/gitflow-toolkit/v3/internal/ui/common"
 )
 
-var version = "dev"
+// VersionInfo holds version information for display.
+type VersionInfo struct {
+	Version   string
+	Commit    string
+	BuildDate string
+	GoVersion string
+	Platform  string
+}
+
+var versionInfo = VersionInfo{
+	Version: "dev",
+}
 
 // rootCmd represents the base command when called without any subcommands.
 var rootCmd = &cobra.Command{
@@ -38,7 +51,6 @@ Available commit types:
   chore    - Changing CI/CD
   perf     - Improving performance
   hotfix   - Bug fix urgently`,
-	Version: version,
 }
 
 // Execute adds all child commands to the root command and sets flags appropriately.
@@ -62,8 +74,54 @@ func init() {
 	rootCmd.CompletionOptions.DisableDefaultCmd = true
 }
 
-// SetVersion sets the version string.
-func SetVersion(v string) {
-	version = v
-	rootCmd.Version = v
+// SetVersionInfo sets the version information.
+func SetVersionInfo(info VersionInfo) {
+	versionInfo = info
+	rootCmd.Version = info.Version
+	// Set custom version template after version info is populated
+	rootCmd.SetVersionTemplate(renderVersion())
+}
+
+// renderVersion renders a styled version output.
+func renderVersion() string {
+	var sb strings.Builder
+
+	// Title style
+	titleStyle := lipgloss.NewStyle().
+		Foreground(common.ColorTitleFg).
+		Background(common.ColorTitleBg).
+		Bold(true).
+		Padding(0, 1)
+
+	// Label style (width includes space after colon)
+	labelStyle := lipgloss.NewStyle().
+		Foreground(common.ColorMuted).
+		Width(14)
+
+	// Value style
+	valueStyle := lipgloss.NewStyle().
+		Foreground(common.ColorSuccess)
+
+	// Commit style (dimmer for long hash)
+	commitStyle := lipgloss.NewStyle().
+		Foreground(common.ColorMuted)
+
+	// Layout
+	titleLayout := lipgloss.NewStyle().Padding(1, 0, 0, 2)
+	contentLayout := lipgloss.NewStyle().PaddingLeft(2)
+
+	sb.WriteString(titleLayout.Render(titleStyle.Render("gitflow-toolkit")))
+	sb.WriteString("\n\n")
+
+	// Version info rows
+	sb.WriteString(contentLayout.Render(labelStyle.Render("Version:") + valueStyle.Render(versionInfo.Version)))
+	sb.WriteString("\n")
+	sb.WriteString(contentLayout.Render(labelStyle.Render("Built:") + valueStyle.Render(versionInfo.BuildDate)))
+	sb.WriteString("\n")
+	sb.WriteString(contentLayout.Render(labelStyle.Render("Go Version:") + valueStyle.Render(versionInfo.GoVersion)))
+	sb.WriteString("\n")
+	sb.WriteString(contentLayout.Render(labelStyle.Render("Commit Hash:") + commitStyle.Render(versionInfo.Commit)))
+	sb.WriteString("\n\n")
+
+	return sb.String()
 }

config/gitconfig.go

@@ -5,6 +5,7 @@ import (
 	"runtime"
 	"strconv"
 	"strings"
+	"time"
 )
 
 // GitConfigSection name for gitflow-toolkit settings.
@@ -13,20 +14,20 @@ const GitConfigSection = "gitflow"
 // GitConfig keys.
 const (
 	GitConfigLLMAPIKey                = "llm-api-key"
-	GitConfigLLMHost                  = "llm-host"
+	GitConfigLLMAPIHost               = "llm-api-host"
 	GitConfigLLMModel                 = "llm-model"
 	GitConfigLLMTemperature           = "llm-temperature"
-	GitConfigLLMTimeout               = "llm-timeout"
-	GitConfigLLMRetries               = "llm-retries"
-	GitConfigLLMLang                  = "llm-lang"
-	GitConfigLLMContext               = "llm-context"
-	GitConfigLLMConcurrency           = "llm-concurrency"
-	GitConfigLLMFilePrompt            = "llm-file-prompt"
+	GitConfigLLMRequestTimeout        = "llm-request-timeout"
+	GitConfigLLMMaxRetries            = "llm-max-retries"
+	GitConfigLLMOutputLang            = "llm-output-lang"
+	GitConfigLLMDiffContext           = "llm-diff-context"
+	GitConfigLLMMaxConcurrency        = "llm-max-concurrency"
+	GitConfigLLMFileAnalysisPrompt    = "llm-file-analysis-prompt"
 	GitConfigLLMCommitPromptEN        = "llm-commit-prompt-en"
 	GitConfigLLMCommitPromptZH        = "llm-commit-prompt-zh"
 	GitConfigLLMCommitPromptBilingual = "llm-commit-prompt-bilingual"
-	GitConfigLuckyCommit              = "lucky-commit"
-	GitConfigSSHStrictHost            = "ssh-strict-host-key"
+	GitConfigLuckyCommitPrefix        = "lucky-commit-prefix"
+	GitConfigSSHStrictHostKey         = "ssh-strict-host-key"
 )
 
 // gitConfig runs git config --get and returns the value.
@@ -80,3 +81,14 @@ func GetBool(gitKey string, defaultVal bool) bool {
 	}
 	return defaultVal
 }
+
+// GetDuration returns a time.Duration config value from gitconfig, or default if not set.
+// Supports Go duration format (e.g., "30s", "2m", "1h30m").
+func GetDuration(gitKey string, defaultVal time.Duration) time.Duration {
+	if val := gitConfig(gitKey); val != "" {
+		if d, err := time.ParseDuration(val); err == nil {
+			return d
+		}
+	}
+	return defaultVal
+}

consts/consts.go

@@ -1,6 +1,8 @@
 // Package consts defines constants for gitflow-toolkit.
 package consts
 
+import "time"
+
 // Commit types following Angular commit message specification.
 const (
 	Feat     = "feat"
@@ -55,12 +57,12 @@ const (
 const (
 	LLMDefaultOllamaHost     = "http://localhost:11434"
 	LLMDefaultOpenRouterHost = "https://openrouter.ai"
-	LLMDefaultContext        = 5
-	LLMDefaultTimeout        = 120
+	LLMDefaultDiffContext    = 5
+	LLMDefaultRequestTimeout = 2 * time.Minute
 	LLMDefaultRetries        = 0
 	LLMDefaultLang           = "en"
 	LLMDefaultTemperature    = 0.3
-	LLMDefaultConcurrency    = 5
+	LLMDefaultConcurrency    = 3
 )
 
 // LLM language options.

internal/git/git.go

@@ -30,7 +30,7 @@ func Run(args ...string) (string, error) {
 	}
 
 	// Disable strict host key checking unless explicitly enabled via gitconfig
-	if !config.GetBool(config.GitConfigSSHStrictHost, false) {
+	if !config.GetBool(config.GitConfigSSHStrictHostKey, false) {
 		cmd.Env = append(os.Environ(), "GIT_SSH_COMMAND=ssh -o StrictHostKeyChecking=no")
 	}
 

internal/git/lucky.go

@@ -21,7 +21,7 @@ var (
 // GetLuckyPrefix returns the lucky commit prefix from gitconfig.
 // Returns empty string if not set.
 func GetLuckyPrefix() string {
-	return config.GetString(config.GitConfigLuckyCommit, "")
+	return config.GetString(config.GitConfigLuckyCommitPrefix, "")
 }
 
 // ValidateLuckyPrefix validates and normalizes the prefix.

internal/git/lucky_test.go

@@ -23,7 +23,7 @@ func TestValidateLuckyPrefix(t *testing.T) {
 		{"exactly 12 chars", "1234567890ab", "1234567890ab", false},
 		{"invalid chars", "xyz123", "", true},
 		{"invalid with space", "abc 123", "", true},
-		{"valid all zeros", "0000000000000000", "0000000000000000", false},
+		{"valid all zeros", "000000000000", "000000000000", false},
 	}
 
 	for _, tt := range tests {
@@ -65,7 +65,7 @@ func TestCheckLuckyCommit(t *testing.T) {
 func TestGetLuckyPrefix(t *testing.T) {
 	// NOTE: GetLuckyPrefix reads from gitconfig, which cannot be easily mocked.
 	// Skip if gitconfig has lucky-commit set.
-	if prefix := config.GetString(config.GitConfigLuckyCommit, ""); prefix != "" {
+	if prefix := config.GetString(config.GitConfigLuckyCommitPrefix, ""); prefix != "" {
 		t.Skip("Skipping: gitconfig has lucky-commit set")
 	}
 

internal/llm/client.go

@@ -78,7 +78,7 @@ func NewClient() *Client {
 	}
 
 	// Get host
-	host := config.GetString(config.GitConfigLLMHost, "")
+	host := config.GetString(config.GitConfigLLMAPIHost, "")
 	if host == "" {
 		host = defaultHost
 	} else {
@@ -98,12 +98,12 @@ func NewClient() *Client {
 	model := config.GetString(config.GitConfigLLMModel, defaultModel)
 
 	// Get other settings
-	timeout := config.GetInt(config.GitConfigLLMTimeout, consts.LLMDefaultTimeout)
-	retries := config.GetInt(config.GitConfigLLMRetries, consts.LLMDefaultRetries)
+	timeout := config.GetDuration(config.GitConfigLLMRequestTimeout, consts.LLMDefaultRequestTimeout)
+	retries := config.GetInt(config.GitConfigLLMMaxRetries, consts.LLMDefaultRetries)
 	temperature := config.GetFloat(config.GitConfigLLMTemperature, consts.LLMDefaultTemperature)
 
 	// Get language (validate value)
-	lang := config.GetString(config.GitConfigLLMLang, consts.LLMDefaultLang)
+	lang := config.GetString(config.GitConfigLLMOutputLang, consts.LLMDefaultLang)
 	switch lang {
 	case consts.LLMLangEN, consts.LLMLangZH, consts.LLMLangBilingual:
 		// valid
@@ -112,7 +112,7 @@ func NewClient() *Client {
 	}
 
 	// Get custom prompts
-	filePrompt := config.GetString(config.GitConfigLLMFilePrompt, "")
+	filePrompt := config.GetString(config.GitConfigLLMFileAnalysisPrompt, "")
 	commitPromptEN := config.GetString(config.GitConfigLLMCommitPromptEN, "")
 	commitPromptZH := config.GetString(config.GitConfigLLMCommitPromptZH, "")
 	commitPromptBilingual := config.GetString(config.GitConfigLLMCommitPromptBilingual, "")
@@ -121,7 +121,7 @@ func NewClient() *Client {
 		provider:              provider,
 		host:                  host,
 		apiKey:                apiKey,
-		timeout:               time.Duration(timeout) * time.Second,
+		timeout:               timeout,
 		retries:               retries,
 		lang:                  lang,
 		model:                 model,
@@ -368,12 +368,12 @@ func (c *Client) GetCommitPrompt(lang string) string {
 	}
 }
 
-// GetContext returns the configured diff context lines.
-func GetContext() int {
-	return config.GetInt(config.GitConfigLLMContext, consts.LLMDefaultContext)
+// GetDiffContext returns the configured diff context lines.
+func GetDiffContext() int {
+	return config.GetInt(config.GitConfigLLMDiffContext, consts.LLMDefaultDiffContext)
 }
 
 // GetConcurrency returns the configured concurrency limit for parallel file analysis.
 func GetConcurrency() int {
-	return config.GetInt(config.GitConfigLLMConcurrency, consts.LLMDefaultConcurrency)
+	return config.GetInt(config.GitConfigLLMMaxConcurrency, consts.LLMDefaultConcurrency)
 }

internal/llm/client_test.go

@@ -8,8 +8,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mritd/gitflow-toolkit/v3/consts"
 	"github.com/mritd/gitflow-toolkit/v3/config"
+	"github.com/mritd/gitflow-toolkit/v3/consts"
 )
 
 func TestNormalizeHost(t *testing.T) {
@@ -43,7 +43,7 @@ func TestNewClient_Defaults(t *testing.T) {
 	// Skip if any gitconfig LLM settings are set.
 	if config.GetString(config.GitConfigLLMAPIKey, "") != "" ||
 		config.GetString(config.GitConfigLLMModel, "") != "" ||
-		config.GetString(config.GitConfigLLMHost, "") != "" {
+		config.GetString(config.GitConfigLLMAPIHost, "") != "" {
 		t.Skip("Skipping: gitconfig has LLM settings")
 	}
 
@@ -58,8 +58,8 @@ func TestNewClient_Defaults(t *testing.T) {
 		if c.model != consts.LLMDefaultOllamaModel {
 			t.Errorf("model = %q, want %q", c.model, consts.LLMDefaultOllamaModel)
 		}
-		if c.timeout != time.Duration(consts.LLMDefaultTimeout)*time.Second {
-			t.Errorf("timeout = %v, want %v", c.timeout, time.Duration(consts.LLMDefaultTimeout)*time.Second)
+		if c.timeout != consts.LLMDefaultRequestTimeout {
+			t.Errorf("timeout = %v, want %v", c.timeout, consts.LLMDefaultRequestTimeout)
 		}
 	})
 }
@@ -213,15 +213,15 @@ func TestGenerate_OpenAI(t *testing.T) {
 	})
 }
 
-func TestGetContext(t *testing.T) {
+func TestGetDiffContext(t *testing.T) {
 	// NOTE: This test may be affected by ~/.gitconfig settings.
-	if ctx := config.GetString(config.GitConfigLLMContext, ""); ctx != "" {
-		t.Skip("Skipping: gitconfig has llm-context set")
+	if ctx := config.GetString(config.GitConfigLLMDiffContext, ""); ctx != "" {
+		t.Skip("Skipping: gitconfig has llm-diff-context set")
 	}
 
 	t.Run("default", func(t *testing.T) {
-		if got := GetContext(); got != consts.LLMDefaultContext {
-			t.Errorf("GetContext() = %d, want %d", got, consts.LLMDefaultContext)
+		if got := GetDiffContext(); got != consts.LLMDefaultDiffContext {
+			t.Errorf("GetDiffContext() = %d, want %d", got, consts.LLMDefaultDiffContext)
 		}
 	})
 }