gims 0.8.1 → 0.8.2

package/README.md

@@ -1,98 +1,318 @@
+<div align="center">
+
 # 🚀 GIMS - Git Made Simple
 
 [![npm version](https://img.shields.io/npm/v/gims.svg)](https://npmjs.org/package/gims)
+[![npm downloads](https://img.shields.io/npm/dm/gims.svg)](https://npmjs.org/package/gims)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 [![AI Powered](https://img.shields.io/badge/AI-Powered-blueviolet.svg)](https://github.com/s41r4j/gims)
+[![Node.js](https://img.shields.io/badge/Node.js->=18.18.0-green.svg)](https://nodejs.org)
 
 **AI-powered Git CLI that writes your commit messages for you**
 
 *Because life's too short for "fix stuff" commits* 🎯
 
-## ⚡ Quick Start
+[Installation](#-installation) • [Quick Start](#-quick-start) • [Commands](#-commands) • [AI Setup](#-ai-providers) • [Configuration](#-configuration)
+
+</div>
+
+---
+
+## ✨ Features
+
+- 🤖 **AI-Generated Commits** — Let AI analyze your changes and write meaningful commit messages
+- 📊 **Smart Status** — Enhanced git status with file type detection and insights
+- 🔄 **Workflow Shortcuts** — Common multi-step operations condensed to single commands
+- 📈 **Commit Analytics** — Track your commit streak, patterns, and statistics
+- 🔍 **Code Review** — Get AI-powered code review before committing
+- 🛡️ **Safe Operations** — Built-in safeguards for destructive commands
+- ⚡ **Lightning Fast** — Optimized for speed with intelligent caching
+
+---
+
+## 📦 Installation
 
 ```bash
-# Install
 npm install -g gims
+```
+
+**Requirements:** Node.js >= 18.18.0
+
+---
+
+## ⚡ Quick Start
 
-# Setup AI (choose one)
-g setup --api-key gemini    # Free & fast (recommended)
-g setup --api-key openai    # High quality
-g setup --api-key groq      # Ultra fast
+```bash
+# 1. Setup AI provider (choose one)
+g setup --api-key gemini    # 🆓 Free & fast (recommended)
+g setup --api-key openai    # 🎯 High quality
+g setup --api-key groq      # ⚡ Ultra fast
 
-# Use it
-g s    # Check status with AI insights
-g o    # AI commit + push
+# 2. Start using it!
+g s                         # Check status with AI insights
+g o                         # AI commit + push (one command!)
 ```
 
-## 🎯 Main Commands
+### Your New Workflow
 
-### 🧠 Smart Commands
-| Command | Description |
-|---------|-------------|
-| `g s` | Enhanced status with AI insights |
-| `g o` | AI commit + push |
-| `g l` | AI commit locally |
-| `g wip` | Quick WIP commit |
-| `g r` | AI code review |
-| `g t` | Show today's commits |
-| `g stats` | Personal commit statistics |
+```bash
+# Before (traditional git)
+git add .
+git commit -m "trying to think of message..."
+git push
+
+# After (with GIMS)
+g o                         # That's it. AI handles the rest.
+```
+
+---
+
+## 📚 Commands
+
+### 🧠 Core Commands
+
+| Command | Alias | Description |
+|---------|-------|-------------|
+| `g status` | `g s` | Enhanced status with AI insights & file type emojis |
+| `g oneshot` | `g o` | Stage all → AI commit → Push (full workflow) |
+| `g local` | `g l` | Stage all → AI commit (no push) |
+| `g suggest` | `g sg` | Get AI commit message suggestions |
+| `g wip` | — | Quick work-in-progress commit |
+
+### 📊 Analytics & Review
+
+| Command | Alias | Description |
+|---------|-------|-------------|
+| `g review` | `g r` | AI code review with complexity analysis |
+| `g today` | `g t` | Show all commits made today |
+| `g stats` | — | Personal statistics: streak, patterns, style |
+| `g split` | — | AI suggestions for splitting large changesets |
 
 ### ⚡ Workflow Shortcuts
-| Command | What it does |
-|---------|--------------|
-| `g sp` | **Safe Pull** (Stash → Pull → Pop) |
-| `g fix` | **Smart Fix** for branch sync issues |
-| `g main` | Switch to main/master + pull |
-| `g ss` | Quick stash save |
-| `g pop` | Pop latest stash |
-| `g us` | Unstage all files |
-| `g x` | Discard all changes (with confirm) |
-
-### 🛠️ Helper Commands
+
+| Command | Alias | What it does |
+|---------|-------|--------------|
+| `g safe-pull` | `g sp` | Stash → Pull → Pop (safe pull with uncommitted changes) |
+| `g fix` | — | Smart fix for diverged/ahead/behind branches |
+| `g main` | — | Switch to main/master + pull latest |
+| `g stash-save` | `g ss` | Quick stash with auto-generated name |
+| `g stash-pop` | `g pop` | Pop the latest stash |
+| `g unstage` | `g us` | Unstage all staged files |
+| `g discard` | `g x` | Discard all changes (requires `--yes`) |
+
+### 🛠️ Git Helpers
+
+| Command | Alias | Description |
+|---------|-------|-------------|
+| `g last` | — | Show last commit details with diff |
+| `g conflicts` | — | Conflict resolution helper |
+| `g cleanup` | `g clean` | Remove local branches deleted from remote |
+| `g list` | `g ls` | Compact commit history |
+| `g amend` | `g a` | Amend the previous commit |
+| `g undo` | `g u` | Undo last commit (keep changes) |
+| `g delete-branch` | `g del` | Delete branch locally and remotely |
+
+### 🔧 Setup & Config
+
 | Command | Description |
 |---------|-------------|
-| `g last` | Show last commit details |
-| `g conflicts` | Conflict resolution helper |
-| `g clean` | Remove dead local branches |
-| `g ls` | Commit history (short) |
-| `g a` | Amend previous commit |
+| `g setup` | Interactive setup wizard |
+| `g setup --api-key <provider>` | Quick API key setup |
+| `g config --list` | View all settings |
+| `g config --set key=value` | Update configuration |
+| `g quick-help` / `g q` | Quick command reference |
+
+---
+
+## 🤖 AI Providers
+
+GIMS supports multiple AI providers. Choose based on your needs:
+
+| Provider | Model | Speed | Quality | Cost |
+|----------|-------|-------|---------|------|
+| **Gemini** | `gemini-3-flash-preview` | ⚡⚡⚡ | ⭐⭐⭐ | 🆓 Free |
+| **Groq** | `groq/compound` | ⚡⚡⚡⚡ | ⭐⭐⭐ | 🆓 Free tier |
+| **OpenAI** | `gpt-5.2-2025-12-11` | ⚡⚡ | ⭐⭐⭐⭐ | 💰 Paid |
+
+### Setting Up API Keys
+
+#### Option 1: Interactive Setup (Recommended)
 
-## 🤖 AI Models
+```bash
+g setup --api-key gemini    # Guided setup with instructions
+g setup --api-key openai
+g setup --api-key groq
+```
 
-- **Gemini**: `gemini-2.5-flash` (Free, fast, recommended)
-- **OpenAI**: `gpt-5` (High quality)
-- **Groq**: `groq/compound` (Ultra fast)
+#### Option 2: Environment Variables (Auto-detected)
 
-## 📖 Examples
+GIMS automatically detects API keys from environment variables. Add to your shell profile (`~/.zshrc`, `~/.bashrc`, etc.):
 
 ```bash
-# Daily workflow
-g s              # Check status
-g sp             # Safe pull updates
-g fix            # Fix any sync issues
-g o              # Commit + push
-
-# Power functions
-g r              # Review code before commit
-g stats          # Check your streak
-g split          # Split big changesets
+# Gemini (recommended - free)
+export GEMINI_API_KEY="your-api-key-here"
+
+# OpenAI
+export OPENAI_API_KEY="your-api-key-here"
+
+# Groq
+export GROQ_API_KEY="your-api-key-here"
 ```
 
+Then reload your shell: `source ~/.zshrc`
+
+> **💡 Tip:** If multiple API keys are set, GIMS auto-selects in order: Gemini → OpenAI → Groq
+
+### Getting API Keys
+
+<details>
+<summary><b>🔷 Gemini (Recommended)</b></summary>
+
+1. Visit [Google AI Studio](https://aistudio.google.com/app/apikey)
+2. Create a new API key
+3. Set it: `export GEMINI_API_KEY="your-key"` or run `g setup --api-key gemini`
+
+</details>
+
+<details>
+<summary><b>🟢 Groq</b></summary>
+
+1. Visit [Groq Console](https://console.groq.com/keys)
+2. Create a new API key
+3. Set it: `export GROQ_API_KEY="your-key"` or run `g setup --api-key groq`
+
+</details>
+
+<details>
+<summary><b>🟡 OpenAI</b></summary>
+
+1. Visit [OpenAI Platform](https://platform.openai.com/api-keys)
+2. Create a new API key
+3. Set it: `export OPENAI_API_KEY="your-key"` or run `g setup --api-key openai`
+
+</details>
+
+---
+
 ## 🔧 Configuration
 
 ```bash
-g config --set conventional=true   # Enable conventional commits
-g config --set autoStage=true      # Auto-stage changes
-g config --list                    # View all settings
+# View current settings
+g config --list
+
+# Enable conventional commits (feat:, fix:, etc.)
+g config --set conventional=true
+
+# Auto-stage all changes before commit
+g config --set autoStage=true
+
+# Disable clipboard copy
+g config --set copy=false
+
+# Show/hide progress indicators
+g config --set progressIndicators=true
+```
+
+### Configuration Options
+
+| Option | Type | Default | Description |
+|--------|------|---------|-------------|
+| `provider` | string | `auto` | AI provider: `gemini`, `openai`, `groq`, `auto`, `none` |
+| `model` | string | — | Override default model for provider |
+| `conventional` | boolean | `false` | Use Conventional Commits format |
+| `autoStage` | boolean | `false` | Auto-stage all changes |
+| `copy` | boolean | `true` | Copy suggestions to clipboard |
+| `progressIndicators` | boolean | `true` | Show progress spinners |
+
+---
+
+## 📖 Usage Examples
+
+### Daily Workflow
+
+```bash
+g s              # Check what's changed
+g sp             # Safe pull (won't lose uncommitted work)
+# ... do your work ...
+g o              # Commit everything with AI message + push
+```
+
+### Code Review Before Commit
+
+```bash
+g r              # Get AI review of your changes
+g o              # Commit if review looks good
 ```
 
-## 🆘 Help
+### Handling Branch Issues
 
 ```bash
-g --help    # All commands
-g q         # Quick reference
+g fix            # See sync status and options
+g fix --ai       # Get AI recommendation
+g fix --merge    # Merge remote changes
+g fix --rebase   # Rebase onto remote
 ```
 
+### Working with Stashes
+
+```bash
+g ss             # Quick stash
+g main           # Switch to main and pull
+# ... check something ...
+g pop            # Get your work back
+```
+
+### Large Changeset
+
+```bash
+g split          # Get suggestions for splitting changes
+g sg --multiple  # Get multiple commit message options
+```
+
+---
+
+## 🆚 GIMS vs Plain Git
+
+| Task | Git | GIMS |
+|------|-----|------|
+| Commit & push | `git add . && git commit -m "msg" && git push` | `g o` |
+| Pull with uncommitted changes | `git stash && git pull && git stash pop` | `g sp` |
+| Check status | `git status` | `g s` (+ AI insights) |
+| Fix diverged branch | Multiple commands + decisions | `g fix --ai` |
+| Code review | External tool | `g r` |
+
+---
+
+## 🆘 Getting Help
+
+```bash
+g --help         # Full command list with descriptions
+g q              # Quick reference card
+g <command> -h   # Help for specific command
+```
+
+---
+
+## 🤝 Contributing
+
+Contributions are welcome! Feel free to:
+
+- 🐛 Report bugs
+- 💡 Suggest features
+- 🔧 Submit pull requests
+
+---
+
 ## 📄 License
 
-MIT © [S41R4J](https://github.com/s41r4j)
+MIT © [S41R4J](https://github.com/s41r4j)
+
+---
+
+<div align="center">
+
+**[⬆ Back to Top](#-gims---git-made-simple)**
+
+Made with ❤️ for developers who'd rather code than write commit messages
+
+</div>

package/bin/lib/ai/providers.js

@@ -15,22 +15,25 @@ class AIProviderManager {
 
   resolveProvider(preference = 'auto') {
     if (preference === 'none') return 'none';
-    if (preference === 'openai') return process.env.OPENAI_API_KEY ? 'openai' : 'none';
-    if (preference === 'gemini') return process.env.GEMINI_API_KEY ? 'gemini' : 'none';
-    if (preference === 'groq') return process.env.GROQ_API_KEY ? 'groq' : 'none';
+    
+    // Check if preferred provider's key is available
+    if (preference === 'openai' && process.env.OPENAI_API_KEY) return 'openai';
+    if (preference === 'gemini' && process.env.GEMINI_API_KEY) return 'gemini';
+    if (preference === 'groq' && process.env.GROQ_API_KEY) return 'groq';
 
-    // Auto-detection with preference order (Gemini first - fastest and cheapest)
+    // Fallback: try any available provider (priority: Gemini → OpenAI → Groq)
     if (process.env.GEMINI_API_KEY) return 'gemini';
     if (process.env.OPENAI_API_KEY) return 'openai';
     if (process.env.GROQ_API_KEY) return 'groq';
+    
     return 'none';
   }
 
   getDefaultModel(provider) {
     const defaults = {
-      'gemini': 'gemini-2.5-flash',     // Latest and fastest
-      'openai': 'gpt-5',                // Latest GPT model
-      'groq': 'groq/compound'           // Latest Groq model
+      'gemini': 'gemini-3-flash-preview',  // Latest Gemini model
+      'openai': 'gpt-5.2-2025-12-11',      // Latest GPT model
+      'groq': 'groq/compound'              // Latest Groq model
     };
     return defaults[provider] || '';
   }
@@ -67,11 +70,11 @@ class AIProviderManager {
     try {
       switch (provider) {
         case 'gemini':
-          return await this.generateWithGemini(prompt, model || 'gemini-2.0-flash', options);
+          return await this.generateWithGemini(prompt, model || this.getDefaultModel('gemini'), options);
         case 'openai':
-          return await this.generateWithOpenAI(prompt, model || 'gpt-4o-mini', options);
+          return await this.generateWithOpenAI(prompt, model || this.getDefaultModel('openai'), options);
         case 'groq':
-          return await this.generateWithGroq(prompt, model || 'llama-3.1-8b-instant', options);
+          return await this.generateWithGroq(prompt, model || this.getDefaultModel('groq'), options);
         default:
           throw new Error(`Unknown provider: ${provider}`);
       }
@@ -119,8 +122,8 @@ class AIProviderManager {
 
   async generateCommitMessage(diff, options = {}) {
     const {
-      provider: preferredProvider = 'auto',
-      conventional = false,
+      provider: preferredProvider = this.config.provider || 'auto',
+      conventional = this.config.conventional || false,
       body = false,
       verbose = false
     } = options;
@@ -137,8 +140,6 @@ class AIProviderManager {
 
     for (const provider of providerChain) {
       try {
-        if (verbose) Progress.info(`Trying provider: ${provider}`);
-
         if (provider === 'local') {
           const result = await this.generateLocalHeuristic(diff, options);
           this.setCache(cacheKey, result, true);
@@ -167,17 +168,21 @@ class AIProviderManager {
   buildProviderChain(preferred) {
     const available = [];
 
+    // First, try the preferred provider if its key is available
     if (preferred !== 'auto' && preferred !== 'none') {
-      const resolved = this.resolveProvider(preferred);
-      if (resolved !== 'none') available.push(resolved);
-    } else if (preferred === 'auto') {
-      if (process.env.GEMINI_API_KEY) available.push('gemini');
-      if (process.env.OPENAI_API_KEY) available.push('openai');
-      if (process.env.GROQ_API_KEY) available.push('groq');
+      if (preferred === 'gemini' && process.env.GEMINI_API_KEY) available.push('gemini');
+      else if (preferred === 'openai' && process.env.OPENAI_API_KEY) available.push('openai');
+      else if (preferred === 'groq' && process.env.GROQ_API_KEY) available.push('groq');
     }
 
+    // Then add all other available providers as fallbacks
+    if (process.env.GEMINI_API_KEY && !available.includes('gemini')) available.push('gemini');
+    if (process.env.OPENAI_API_KEY && !available.includes('openai')) available.push('openai');
+    if (process.env.GROQ_API_KEY && !available.includes('groq')) available.push('groq');
+
+    // Local heuristics as final fallback
     available.push('local');
-    return [...new Set(available)];
+    return available;
   }
 
   buildPrompt(diff, options) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gims",
-  "version": "0.8.1",
+  "version": "0.8.2",
   "description": "Git Made Simple – AI‑powered git helper with smart insights, stats & code review",
   "author": "S41R4J",
   "license": "MIT",