fix - review comments

Author: Laaaaksh

README.md

@@ -35,6 +35,7 @@ Looking to contribute? Check out:
 🎛️ **Interactive Review Flow** - Accept, regenerate with new styles, or open the message in your editor before committing  
 📊 **File Statistics Display** - Visual preview of changed files and line counts  
 💡 **Smart Security Scrubbing** - Automatically removes API keys, passwords, and sensitive data from diffs  
+💾 **Intelligent Caching** - Reduces API costs by caching generated messages for similar changes  
 🚀 **Easy to Use** - Simple CLI interface with beautiful terminal UI  
 ⚡️ **Fast** - Quick generation of commit messages
 
@@ -53,6 +54,36 @@ You can use **Google Gemini**, **Grok**, **Claude**, **ChatGPT**, or **Ollama**
 
 All scrubbing happens locally before any data leaves your machine, ensuring your secrets stay secure.
 
+## 💾 Intelligent Caching
+
+`commit-msg` includes a smart caching system that reduces API costs and improves performance:
+
+- **Automatic Cache Management** - Similar code changes generate the same commit message without API calls
+- **Cost Savings** - Avoid redundant API requests for identical or similar changes
+- **Performance Boost** - Instant retrieval of cached messages for repeated patterns
+- **Cache Statistics** - Track hit rates, total savings, and cache performance
+- **Secure Storage** - Cache files are stored with restricted permissions (600) for security
+- **Automatic Cleanup** - Old cache entries are automatically removed based on age and usage
+
+### Cache Management Commands
+
+```bash
+# View cache statistics
+commit cache stats
+
+# Clear all cached messages
+commit cache clear
+
+# Remove old cached messages
+commit cache cleanup
+```
+
+The cache intelligently identifies similar changes by analyzing:
+- File modifications and additions
+- Code structure and patterns
+- Commit context and style preferences
+- LLM provider and generation options
+
 ---
 
 ## 📦 Installation
@@ -221,6 +252,8 @@ This makes it easy to tweak the tone, iterate on suggestions, or fine-tune the f
 - ✅ Create conventional commit messages
 - 📋 Auto-copy to clipboard for immediate use
 - 🎨 Beautiful terminal UI with file statistics and previews
+- 💾 Reduce API costs with intelligent caching for similar changes
+- ⚡️ Get instant results for repeated code patterns
 
 ---
 
@@ -256,6 +289,19 @@ Select: Change API Key
 Select: Delete
 ```
 
+### Cache Management
+
+```bash
+# View cache statistics and performance
+commit cache stats
+
+# Clear all cached messages
+commit cache clear
+
+# Remove old cached messages (based on age and usage)
+commit cache cleanup
+```
+
 ---
 
 ## Getting API Keys

cmd/cli/store/store.go

@@ -40,15 +40,10 @@ func NewStoreMethods() (*StoreMethods, error) {
 	}, nil
 }
 
-// Initializes Keyring instance
+// KeyringInit initializes a StoreMethods instance with both keyring and cache support.
+// This function is kept for backward compatibility with main.go.
 func KeyringInit() (*StoreMethods, error) {
-	ring, err := keyring.Open(keyring.Config{
-		ServiceName: "commit-msg",
-	})
-	if err != nil {
-		return nil, fmt.Errorf("failed to open keyring: %w", err)
-	}
-	return &StoreMethods{ring: ring}, nil
+	return NewStoreMethods()
 }
 
 // LLMProvider represents a single stored LLM provider and its credential.

internal/cache/cache.go

@@ -59,27 +59,35 @@ func NewCacheManager() (*CacheManager, error) {
 
 // Get retrieves a cached commit message if it exists.
 func (cm *CacheManager) Get(provider types.LLMProvider, diff string, opts *types.GenerationOptions) (*types.CacheEntry, bool) {
-	cm.mutex.RLock()
-	defer cm.mutex.RUnlock()
-
 	key := cm.hasher.GenerateCacheKey(provider, diff, opts)
-	entry, exists := cm.entries[key]
 
+	// Phase 1: Read with RLock to check existence and copy the entry
+	cm.mutex.RLock()
+	entry, exists := cm.entries[key]
 	if !exists {
+		cm.mutex.RUnlock()
+		// Update miss statistics with write lock
+		cm.mutex.Lock()
 		cm.stats.TotalMisses++
 		cm.updateHitRate()
+		cm.mutex.Unlock()
 		return nil, false
 	}
 
-	// Update access statistics
+	// Create a copy of the entry to avoid external mutation
+	entryCopy := *entry
+	cm.mutex.RUnlock()
+
+	// Phase 2: Update shared stats and entry with write lock
+	cm.mutex.Lock()
+	// Update access statistics on the original entry
 	entry.LastAccessedAt = time.Now().Format(time.RFC3339)
 	entry.AccessCount++
 	cm.stats.TotalHits++
-
-	// Update hit rate
 	cm.updateHitRate()
+	cm.mutex.Unlock()
 
-	return entry, true
+	return &entryCopy, true
 }
 
 // Set stores a commit message in the cache.
@@ -133,10 +141,10 @@ func (cm *CacheManager) Clear() error {
 
 // GetStats returns cache statistics.
 func (cm *CacheManager) GetStats() *types.CacheStats {
-	cm.mutex.RLock()
-	defer cm.mutex.RUnlock()
+	cm.mutex.Lock()
+	defer cm.mutex.Unlock()
 
-	// Calculate additional stats
+	// Calculate additional stats (mutates cm.stats)
 	cm.calculateStats()
 
 	// Return a copy to avoid race conditions
@@ -149,7 +157,17 @@ func (cm *CacheManager) Cleanup() error {
 	cm.mutex.Lock()
 	defer cm.mutex.Unlock()
 
-	return cm.cleanupOldEntries()
+	// Clean up old entries in memory
+	if err := cm.cleanupOldEntries(); err != nil {
+		return fmt.Errorf("failed to cleanup old entries: %w", err)
+	}
+
+	// Persist the cleaned cache to disk
+	if err := cm.saveCache(); err != nil {
+		return fmt.Errorf("failed to persist cache after cleanup: %w", err)
+	}
+
+	return nil
 }
 
 // loadCache loads the cache from disk.
@@ -176,14 +194,21 @@ func (cm *CacheManager) loadCache() error {
 	if cacheData.Stats != nil {
 		cm.stats = cacheData.Stats
 	}
+	if cm.entries == nil {
+		cm.entries = make(map[string]*types.CacheEntry)
+	}
+	if cm.stats == nil {
+		cm.stats = &types.CacheStats{}
+	}
+	cm.stats.TotalEntries = len(cm.entries)
 
 	return nil
 }
 
 // saveCache saves the cache to disk.
 func (cm *CacheManager) saveCache() error {
 	// Ensure directory exists
-	if err := os.MkdirAll(filepath.Dir(cm.filePath), 0755); err != nil {
+	if err := os.MkdirAll(filepath.Dir(cm.filePath), 0700); err != nil {
 		return fmt.Errorf("failed to create cache directory: %w", err)
 	}
 
@@ -202,7 +227,7 @@ func (cm *CacheManager) saveCache() error {
 		return fmt.Errorf("failed to marshal cache data: %w", err)
 	}
 
-	if err := os.WriteFile(cm.filePath, data, 0644); err != nil {
+	if err := os.WriteFile(cm.filePath, data, 0600); err != nil {
 		return fmt.Errorf("failed to write cache file: %w", err)
 	}
 
@@ -233,7 +258,7 @@ func (cm *CacheManager) cleanupOldEntries() error {
 
 	// If we still have too many entries, remove least recently accessed
 	if len(cm.entries)-len(keysToDelete) > cm.config.MaxEntries {
-		cm.removeLeastAccessed(keysToDelete)
+		keysToDelete = cm.removeLeastAccessed(keysToDelete)
 	}
 
 	// Delete the selected entries
@@ -247,7 +272,7 @@ func (cm *CacheManager) cleanupOldEntries() error {
 }
 
 // removeLeastAccessed removes the least recently accessed entries.
-func (cm *CacheManager) removeLeastAccessed(existingKeysToDelete []string) {
+func (cm *CacheManager) removeLeastAccessed(existingKeysToDelete []string) []string {
 	type entryWithKey struct {
 		key   string
 		entry *types.CacheEntry
@@ -282,6 +307,8 @@ func (cm *CacheManager) removeLeastAccessed(existingKeysToDelete []string) {
 	for i := 0; i < entriesToRemove && i < len(entries); i++ {
 		existingKeysToDelete = append(existingKeysToDelete, entries[i].key)
 	}
+
+	return existingKeysToDelete
 }
 
 // updateHitRate calculates and updates the hit rate.

internal/cache/hasher.go

@@ -73,12 +73,6 @@ func (h *DiffHasher) shouldSkipLine(line string) bool {
 		return true
 	}
 
-	// Skip lines with file paths (but keep the actual changes)
-	if strings.Contains(line, "/") && (strings.HasPrefix(line, "+") || strings.HasPrefix(line, "-")) {
-		// This is a file path line, skip it
-		return true
-	}
-
 	return false
 }