Refactor: reuse shared message type in claude client

Author: Muneer320

cmd/cli/store/store.go

@@ -244,6 +244,17 @@ func ChangeDefault(Model types.LLMProvider) error {
 		}
 	}
 
+	found := false
+	for _, p := range cfg.LLMProviders {
+		if p.LLM == Model {
+			found = true
+			break
+		}
+	}
+	if !found {
+		return fmt.Errorf("cannot set default to %s: no saved entry", Model.String())
+	}
+
 	cfg.Default = Model
 
 	data, err = json.MarshalIndent(cfg, "", " ")
@@ -335,12 +346,18 @@ func UpdateAPIKey(Model types.LLMProvider, APIKey string) error {
 		}
 	}
 
+	updated := false
 	for i, p := range cfg.LLMProviders {
 		if p.LLM == Model {
 			cfg.LLMProviders[i].APIKey = APIKey
+			updated = true
 		}
 	}
 
+	if !updated {
+		return fmt.Errorf("no saved entry for %s to update", Model.String())
+	}
+
 	data, err = json.MarshalIndent(cfg, "", " ")
 	if err != nil {
 		return err

internal/claude/claude.go

@@ -12,15 +12,9 @@ import (
 
 // ClaudeRequest describes the payload sent to Anthropic's Claude messages API.
 type ClaudeRequest struct {
-	Model     string    `json:"model"`
-	Messages  []Message `json:"messages"`
-	MaxTokens int       `json:"max_tokens"`
-}
-
-// Message represents a single role/content pair exchanged with Claude.
-type Message struct {
-	Role    string `json:"role"`
-	Content string `json:"content"`
+	Model     string          `json:"model"`
+	Messages  []types.Message `json:"messages"`
+	MaxTokens int             `json:"max_tokens"`
 }
 
 // ClaudeResponse captures the subset of fields used from Anthropic responses.
@@ -41,7 +35,7 @@ func GenerateCommitMessage(config *types.Config, changes string, apiKey string,
 	reqBody := ClaudeRequest{
 		Model:     "claude-3-5-sonnet-20241022",
 		MaxTokens: 200,
-		Messages: []Message{
+		Messages: []types.Message{
 			{
 				Role:    "user",
 				Content: prompt,

internal/grok/grok.go

@@ -5,13 +5,38 @@ import (
 	"crypto/tls"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
+	"sync"
 	"time"
 
 	"github.com/dfanso/commit-msg/pkg/types"
 )
 
+var (
+	grokClientOnce sync.Once
+	grokClient     *http.Client
+)
+
+func getHTTPClient() *http.Client {
+	grokClientOnce.Do(func() {
+		transport := &http.Transport{
+			TLSHandshakeTimeout: 10 * time.Second,
+			MaxIdleConns:        10,
+			IdleConnTimeout:     30 * time.Second,
+			DisableCompression:  true,
+			TLSClientConfig: &tls.Config{
+				InsecureSkipVerify: false,
+			},
+		}
+		grokClient = &http.Client{
+			Timeout:   30 * time.Second,
+			Transport: transport,
+		}
+	})
+	return grokClient
+}
+
 // GenerateCommitMessage calls X.AI's Grok API to create a commit message from
 // the provided Git diff and generation options.
 func GenerateCommitMessage(config *types.Config, changes string, apiKey string, opts *types.GenerationOptions) (string, error) {
@@ -46,22 +71,7 @@ func GenerateCommitMessage(config *types.Config, changes string, apiKey string,
 	req.Header.Set("Content-Type", "application/json")
 	req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", apiKey))
 
-	// Configure HTTP client with improved TLS settings
-	transport := &http.Transport{
-		TLSHandshakeTimeout: 10 * time.Second,
-		MaxIdleConns:        10,
-		IdleConnTimeout:     30 * time.Second,
-		DisableCompression:  true,
-		// Add TLS config to handle server name mismatch
-		TLSClientConfig: &tls.Config{
-			InsecureSkipVerify: false, // Keep this false for security
-		},
-	}
-
-	client := &http.Client{
-		Timeout:   30 * time.Second,
-		Transport: transport,
-	}
+	client := getHTTPClient()
 	resp, err := client.Do(req)
 	if err != nil {
 		return "", err
@@ -70,7 +80,7 @@ func GenerateCommitMessage(config *types.Config, changes string, apiKey string,
 
 	// Check response status
 	if resp.StatusCode != http.StatusOK {
-		bodyBytes, _ := ioutil.ReadAll(resp.Body)
+		bodyBytes, _ := io.ReadAll(resp.Body)
 		return "", fmt.Errorf("API request failed with status %d: %s", resp.StatusCode, string(bodyBytes))
 	}
 

pkg/types/types.go

@@ -1,5 +1,7 @@
 package types
 
+// LLMProvider identifies the large language model backend used to author
+// commit messages.
 type LLMProvider string
 
 const (
@@ -11,35 +13,34 @@ const (
 	ProviderOllama LLMProvider = "Ollama"
 )
 
+// String returns the provider identifier as a plain string.
 func (p LLMProvider) String() string {
 	return string(p)
 }
 
+// IsValid reports whether the provider is part of the supported set.
 func (p LLMProvider) IsValid() bool {
 	switch p {
 	case ProviderOpenAI, ProviderClaude, ProviderGemini, ProviderGrok, ProviderGroq, ProviderOllama:
 		return true
-	// LLMProvider identifies the large language model backend used to author
-	// commit messages.
 	default:
 		return false
 	}
 }
 
+// GetSupportedProviders returns all available provider enums.
 func GetSupportedProviders() []LLMProvider {
 	return []LLMProvider{
 		ProviderOpenAI,
 		ProviderClaude,
 		ProviderGemini,
 		ProviderGrok,
-		// String returns the string form of the provider identifier.
 		ProviderGroq,
 		ProviderOllama,
 	}
 }
 
-// IsValid reports whether the provider is part of the supported set.
-
+// GetSupportedProviderStrings returns the human-friendly names for providers.
 func GetSupportedProviderStrings() []string {
 	providers := GetSupportedProviders()
 	strings := make([]string, len(providers))
@@ -49,42 +50,39 @@ func GetSupportedProviderStrings() []string {
 	return strings
 }
 
-// GetSupportedProviders returns all available provider enums.
-
+// ParseLLMProvider converts a string into an LLMProvider enum when supported.
 func ParseLLMProvider(s string) (LLMProvider, bool) {
 	provider := LLMProvider(s)
 	return provider, provider.IsValid()
 }
 
-// Configuration structure
+// Config stores CLI-level configuration including named repositories.
 type Config struct {
 	GrokAPI string                `json:"grok_api"`
 	Repos   map[string]RepoConfig `json:"repos"`
 }
 
-// GetSupportedProviderStrings returns the human-friendly names for providers.
-
-// Repository configuration
+// RepoConfig tracks metadata for a configured Git repository.
 type RepoConfig struct {
 	Path    string `json:"path"`
 	LastRun string `json:"last_run"`
 }
 
-// Grok/X.AI API request structure
+// GrokRequest represents a chat completion request sent to X.AI's API.
 type GrokRequest struct {
-	// ParseLLMProvider converts a string into an LLMProvider enum when supported.
 	Messages    []Message `json:"messages"`
 	Model       string    `json:"model"`
 	Stream      bool      `json:"stream"`
 	Temperature float64   `json:"temperature"`
 }
 
+// Message captures the role/content pairs exchanged with Grok.
 type Message struct {
 	Role    string `json:"role"`
 	Content string `json:"content"`
 }
 
-// Grok/X.AI API response structure
+// GrokResponse contains the relevant fields parsed from X.AI responses.
 type GrokResponse struct {
 	Message Message   `json:"message,omitempty"`
 	Choices []Choice  `json:"choices,omitempty"`
@@ -95,12 +93,14 @@ type GrokResponse struct {
 	Usage   UsageInfo `json:"usage,omitempty"`
 }
 
+// Choice details a single response option returned by Grok.
 type Choice struct {
 	Message      Message `json:"message"`
 	Index        int     `json:"index"`
 	FinishReason string  `json:"finish_reason"`
 }
 
+// UsageInfo reports token usage statistics from Grok responses.
 type UsageInfo struct {
 	PromptTokens     int `json:"prompt_tokens"`
 	CompletionTokens int `json:"completion_tokens"`