gims 0.6.7 → 0.8.2

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';
     
-    // Auto-detection with preference order (Gemini first - fastest and cheapest)
+    // 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';
+
+    // 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] || '';
   }
@@ -48,12 +51,12 @@ class AIProviderManager {
 
   setCache(cacheKey, result, usedLocal = false) {
     if (!this.config.cacheEnabled) return;
-    
+
     if (this.cache.size >= this.maxCacheSize) {
       const firstKey = this.cache.keys().next().value;
       this.cache.delete(firstKey);
     }
-    
+
     this.cache.set(cacheKey, {
       result,
       usedLocal,
@@ -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}`);
       }
@@ -103,9 +106,9 @@ class AIProviderManager {
   }
 
   async generateWithGroq(prompt, model, options) {
-    const groq = new OpenAI({ 
-      apiKey: process.env.GROQ_API_KEY, 
-      baseURL: process.env.GROQ_BASE_URL || 'https://api.groq.com/openai/v1' 
+    const groq = new OpenAI({
+      apiKey: process.env.GROQ_API_KEY,
+      baseURL: process.env.GROQ_BASE_URL || 'https://api.groq.com/openai/v1'
     });
     const actualModel = model || this.getDefaultModel('groq');
     const response = await groq.chat.completions.create({
@@ -118,11 +121,11 @@ class AIProviderManager {
   }
 
   async generateCommitMessage(diff, options = {}) {
-    const { 
-      provider: preferredProvider = 'auto', 
-      conventional = false, 
+    const {
+      provider: preferredProvider = this.config.provider || 'auto',
+      conventional = this.config.conventional || false,
       body = false,
-      verbose = false 
+      verbose = false
     } = options;
 
     // Check cache first
@@ -134,11 +137,9 @@ class AIProviderManager {
     }
 
     const providerChain = this.buildProviderChain(preferredProvider);
-    
+
     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);
@@ -148,10 +149,10 @@ class AIProviderManager {
         const prompt = this.buildPrompt(diff, { conventional, body });
         const result = await this.generateWithProvider(provider, prompt, options);
         const cleaned = this.cleanCommitMessage(result, { body });
-        
+
         this.setCache(cacheKey, cleaned, false);
         return { message: cleaned, usedLocal: false };
-        
+
       } catch (error) {
         if (verbose) Progress.warning(`${provider} failed: ${error.message}`);
         continue;
@@ -166,37 +167,41 @@ 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) {
     const { conventional, body } = options;
-    
-    const style = conventional 
+
+    const style = conventional
       ? 'Use Conventional Commits format (e.g., feat:, fix:, chore:) for the subject.'
       : 'Subject must be a single short line.';
-    
-    const bodyInstr = body 
+
+    const bodyInstr = body
       ? 'Provide a short subject line followed by an optional body separated by a blank line.'
       : 'Return only a short subject line without extra quotes.';
-    
+
     return `Write a concise git commit message for these changes:\n${diff}\n\n${style} ${bodyInstr}`;
   }
 
   cleanCommitMessage(message, options = {}) {
     if (!message) return 'Update project code';
-    
+
     // Remove markdown formatting
     let cleaned = message
       .replace(/```[\s\S]*?```/g, '')
@@ -212,7 +217,7 @@ class AIProviderManager {
 
     const lines = cleaned.split('\n').map(l => l.trim()).filter(Boolean);
     let subject = (lines[0] || '').replace(/\s{2,}/g, ' ').replace(/[\s:,.!;]+$/g, '').trim();
-    
+
     if (subject.length === 0) subject = 'Update project code';
     // No length restriction - allow AI to generate full commit messages
 
@@ -226,16 +231,16 @@ class AIProviderManager {
   async generateLocalHeuristic(diff, options) {
     // This would need access to git status - simplified version
     const { conventional = false } = options;
-    
+
     // Analyze diff for patterns
     const lines = diff.split('\n');
     const additions = lines.filter(l => l.startsWith('+')).length;
     const deletions = lines.filter(l => l.startsWith('-')).length;
     const files = (diff.match(/diff --git/g) || []).length;
-    
+
     let type = 'chore';
     let subject = 'update files';
-    
+
     if (additions > deletions * 2) {
       type = 'feat';
       subject = files === 1 ? 'add new functionality' : `add features to ${files} files`;
@@ -249,37 +254,39 @@ class AIProviderManager {
       type = 'docs';
       subject = 'update documentation';
     }
-    
+
     return conventional ? `${type}: ${subject}` : subject.charAt(0).toUpperCase() + subject.slice(1);
   }
 
   async generateMultipleSuggestions(diff, options = {}, count = 3) {
     const suggestions = [];
     const baseOptions = { ...options };
-    
+
     // Generate different styles
     const variants = [
       { ...baseOptions, conventional: false },
       { ...baseOptions, conventional: true },
       { ...baseOptions, conventional: true, body: true }
     ];
-    
+
     for (let i = 0; i < Math.min(count, variants.length); i++) {
       try {
-        const suggestion = await this.generateCommitMessage(diff, variants[i]);
-        if (!suggestions.includes(suggestion)) {
-          suggestions.push(suggestion);
+        const result = await this.generateCommitMessage(diff, variants[i]);
+        // Extract message string from result object
+        const message = result.message || result;
+        if (message && !suggestions.includes(message)) {
+          suggestions.push(message);
         }
       } catch (error) {
         // Skip failed generations
       }
     }
-    
+
     // Ensure we have at least one suggestion
     if (suggestions.length === 0) {
       suggestions.push('Update project files');
     }
-    
+
     return suggestions;
   }
 }

package/bin/lib/git/analyzer.js

@@ -1,4 +1,5 @@
 const { color } = require('../utils/colors');
+const { Intelligence } = require('../utils/intelligence');
 
 /**
  * Enhanced git analysis and insights
@@ -6,17 +7,22 @@ const { color } = require('../utils/colors');
 class GitAnalyzer {
   constructor(git) {
     this.git = git;
+    this.intelligence = new Intelligence(git);
   }
 
   async getEnhancedStatus() {
     try {
       const status = await this.git.status();
       const insights = await this.generateStatusInsights(status);
-      
+      const sessionStats = await this.intelligence.getSessionStats();
+      const branchContext = await this.intelligence.detectBranchContext();
+
       return {
         ...status,
         insights,
-        summary: this.generateStatusSummary(status)
+        summary: this.generateStatusSummary(status),
+        sessionStats,
+        branchContext,
       };
     } catch (error) {
       throw new Error(`Failed to get git status: ${error.message}`);
@@ -32,47 +38,48 @@ class GitAnalyzer {
     const untracked = Array.isArray(status.not_added) ? status.not_added : [];
 
     if (files.length === 0) return 'Working tree clean';
-    
+
     const parts = [];
     if (staged.length > 0) parts.push(`${staged.length} staged`);
     if (modified.length > 0) parts.push(`${modified.length} modified`);
     if (created.length > 0) parts.push(`${created.length} new`);
     if (deleted.length > 0) parts.push(`${deleted.length} deleted`);
     if (untracked.length > 0) parts.push(`${untracked.length} untracked`);
-    
+
     return parts.join(', ');
   }
 
   async generateStatusInsights(status) {
     const insights = [];
-    
+
     // Ensure arrays exist and have proper methods
     const modified = Array.isArray(status.modified) ? status.modified : [];
     const created = Array.isArray(status.created) ? status.created : [];
     const deleted = Array.isArray(status.deleted) ? status.deleted : [];
     const files = Array.isArray(status.files) ? status.files : [];
-    
+    const staged = Array.isArray(status.staged) ? status.staged : [];
+
     // Check for common patterns
     if (modified.some(f => String(f).includes('package.json'))) {
       insights.push('📦 Dependencies may have changed - consider updating package-lock.json');
     }
-    
+
     if (created.some(f => String(f).includes('.env'))) {
       insights.push('🔐 New environment file detected - ensure it\'s in .gitignore');
     }
-    
+
     if (modified.some(f => String(f).includes('README'))) {
       insights.push('📚 Documentation updated - good practice!');
     }
-    
+
     if (deleted.length > created.length + modified.length) {
       insights.push('🧹 Cleanup operation detected - removing more than adding');
     }
-    
+
     if (files.length > 20) {
-      insights.push('📊 Large changeset - consider breaking into smaller commits');
+      insights.push('📊 Large changeset - consider using `g split` to break into smaller commits');
     }
-    
+
     // Check for test files
     const testFiles = files.filter(f => {
       const fileName = String(f);
@@ -81,7 +88,7 @@ class GitAnalyzer {
     if (testFiles.length > 0) {
       insights.push('🧪 Test files modified - great for code quality!');
     }
-    
+
     // Check for config files
     const configFiles = files.filter(f => {
       const fileName = String(f);
@@ -90,7 +97,12 @@ class GitAnalyzer {
     if (configFiles.length > 0) {
       insights.push('⚙️ Configuration changes detected');
     }
-    
+
+    // Suggest staging if nothing staged
+    if (staged.length === 0 && files.length > 0) {
+      insights.push('💡 Nothing staged yet - use `g o --all` to stage and commit everything');
+    }
+
     return insights;
   }
 
@@ -98,7 +110,11 @@ class GitAnalyzer {
     try {
       const log = await this.git.log({ maxCount: limit });
       const commits = log.all;
-      
+
+      if (commits.length === 0) {
+        return { totalCommits: 0 };
+      }
+
       const analysis = {
         totalCommits: commits.length,
         authors: [...new Set(commits.map(c => c.author_name))],
@@ -106,7 +122,7 @@ class GitAnalyzer {
         conventionalCommits: commits.filter(c => /^(feat|fix|docs|style|refactor|test|chore)(\(.+\))?:/.test(c.message)).length,
         recentActivity: this.analyzeRecentActivity(commits)
       };
-      
+
       return analysis;
     } catch (error) {
       return { error: error.message };
@@ -117,10 +133,10 @@ class GitAnalyzer {
     const now = new Date();
     const oneDayAgo = new Date(now - 24 * 60 * 60 * 1000);
     const oneWeekAgo = new Date(now - 7 * 24 * 60 * 60 * 1000);
-    
+
     const recentCommits = commits.filter(c => new Date(c.date) > oneDayAgo);
     const weeklyCommits = commits.filter(c => new Date(c.date) > oneWeekAgo);
-    
+
     return {
       last24h: recentCommits.length,
       lastWeek: weeklyCommits.length,
@@ -133,16 +149,20 @@ class GitAnalyzer {
     const additions = lines.filter(l => l.startsWith('+')).length;
     const deletions = lines.filter(l => l.startsWith('-')).length;
     const files = (diff.match(/diff --git/g) || []).length;
-    
+
     let complexity = 'simple';
+    let emoji = '🟢';
     if (files > 10 || additions + deletions > 500) {
       complexity = 'complex';
+      emoji = '🔴';
     } else if (files > 5 || additions + deletions > 100) {
       complexity = 'moderate';
+      emoji = '🟡';
     }
-    
+
     return {
       complexity,
+      emoji,
       files,
       additions,
       deletions,
@@ -151,81 +171,132 @@ class GitAnalyzer {
   }
 
   formatStatusOutput(enhancedStatus) {
-    const { 
-      files = [], 
-      staged = [], 
-      modified = [], 
-      created = [], 
-      deleted = [], 
-      not_added = [], 
-      insights = [], 
-      summary = 'Unknown status' 
+    const {
+      files = [],
+      staged = [],
+      modified = [],
+      created = [],
+      deleted = [],
+      not_added = [],
+      insights = [],
+      summary = 'Unknown status',
+      sessionStats = {},
+      branchContext = {},
     } = enhancedStatus;
-    
+
     let output = '';
-    
-    // Header
-    output += `${color.bold('Git Status')}\n`;
-    output += `${color.dim(summary)}\n\n`;
-    
+
+    // Header with branch info
+    output += `${color.bold('Git Status')}`;
+    if (branchContext.branch) {
+      output += ` ${color.dim('on')} ${color.cyan(branchContext.branch)}`;
+      if (branchContext.type) {
+        output += ` ${color.dim(`(${branchContext.type})`)}`;
+      }
+    }
+    output += '\n';
+    output += `${color.dim(summary)}\n`;
+
+    // Session stats
+    if (sessionStats.timeSinceLastCommit) {
+      output += `${color.dim(`Last commit: ${sessionStats.timeSinceLastCommit}`)}`;
+      if (sessionStats.commitsToday > 0) {
+        output += `${color.dim(` • ${sessionStats.commitsToday} commit${sessionStats.commitsToday > 1 ? 's' : ''} today`)}`;
+      }
+      output += '\n';
+    }
+    output += '\n';
+
     // Staged changes
     if (staged.length > 0) {
       output += `${color.green('Staged for commit:')}\n`;
       staged.forEach(file => {
-        output += `  ${color.green('+')} ${file}\n`;
+        const emoji = Intelligence.getFileEmoji(file);
+        output += `  ${color.green('+')} ${emoji} ${file}\n`;
       });
       output += '\n';
     }
-    
+
     // Modified files
     if (modified.length > 0) {
       output += `${color.yellow('Modified (not staged):')}\n`;
       modified.forEach(file => {
-        output += `  ${color.yellow('M')} ${file}\n`;
+        const emoji = Intelligence.getFileEmoji(file);
+        output += `  ${color.yellow('M')} ${emoji} ${file}\n`;
       });
       output += '\n';
     }
-    
+
     // New files
     if (created.length > 0) {
       output += `${color.cyan('New files:')}\n`;
       created.forEach(file => {
-        output += `  ${color.cyan('N')} ${file}\n`;
+        const emoji = Intelligence.getFileEmoji(file);
+        output += `  ${color.cyan('N')} ${emoji} ${file}\n`;
       });
       output += '\n';
     }
-    
+
     // Deleted files
     if (deleted.length > 0) {
       output += `${color.red('Deleted:')}\n`;
       deleted.forEach(file => {
-        output += `  ${color.red('D')} ${file}\n`;
+        const emoji = Intelligence.getFileEmoji(file);
+        output += `  ${color.red('D')} ${emoji} ${file}\n`;
       });
       output += '\n';
     }
-    
+
     // Untracked files
     if (not_added.length > 0) {
       output += `${color.dim('Untracked files:')}\n`;
       not_added.slice(0, 10).forEach(file => {
-        output += `  ${color.dim('?')} ${file}\n`;
+        const emoji = Intelligence.getFileEmoji(file);
+        output += `  ${color.dim('?')} ${emoji} ${file}\n`;
       });
       if (not_added.length > 10) {
         output += `  ${color.dim(`... and ${not_added.length - 10} more`)}\n`;
       }
       output += '\n';
     }
-    
+
     // AI Insights
     if (insights.length > 0) {
-      output += `${color.cyan('💡 AI Insights:')}\n`;
+      output += `${color.cyan('💡 Insights:')}\n`;
       insights.forEach(insight => {
         output += `  ${insight}\n`;
       });
     }
-    
+
     return output;
   }
+
+  /**
+   * Get today's commits formatted nicely
+   */
+  async getTodayCommits() {
+    try {
+      const today = new Date();
+      today.setHours(0, 0, 0, 0);
+      const log = await this.git.log({ '--since': today.toISOString() });
+      return log.all;
+    } catch (error) {
+      return [];
+    }
+  }
+
+  /**
+   * Format commit for display
+   */
+  formatCommit(commit, index) {
+    const hash = color.yellow(commit.hash.substring(0, 7));
+    const message = commit.message.split('\n')[0];
+    const time = new Date(commit.date).toLocaleTimeString('en-US', {
+      hour: '2-digit',
+      minute: '2-digit'
+    });
+    return `  ${color.dim(`${index + 1}.`)} ${hash} ${message} ${color.dim(`(${time})`)}`;
+  }
 }
 
 module.exports = { GitAnalyzer };

package/bin/lib/utils/colors.js

@@ -8,8 +8,23 @@ const color = {
   cyan: (s) => `\x1b[36m${s}\x1b[0m`,
   blue: (s) => `\x1b[34m${s}\x1b[0m`,
   magenta: (s) => `\x1b[35m${s}\x1b[0m`,
+  white: (s) => `\x1b[37m${s}\x1b[0m`,
+  gray: (s) => `\x1b[90m${s}\x1b[0m`,
   bold: (s) => `\x1b[1m${s}\x1b[0m`,
   dim: (s) => `\x1b[2m${s}\x1b[0m`,
+  italic: (s) => `\x1b[3m${s}\x1b[0m`,
+  underline: (s) => `\x1b[4m${s}\x1b[0m`,
+  // Background colors
+  bgGreen: (s) => `\x1b[42m\x1b[30m${s}\x1b[0m`,
+  bgYellow: (s) => `\x1b[43m\x1b[30m${s}\x1b[0m`,
+  bgRed: (s) => `\x1b[41m\x1b[37m${s}\x1b[0m`,
+  bgCyan: (s) => `\x1b[46m\x1b[30m${s}\x1b[0m`,
+  bgBlue: (s) => `\x1b[44m\x1b[37m${s}\x1b[0m`,
+  // Compound styles
+  success: (s) => `\x1b[32m✓\x1b[0m ${s}`,
+  warning: (s) => `\x1b[33m⚠\x1b[0m ${s}`,
+  error: (s) => `\x1b[31m✗\x1b[0m ${s}`,
+  info: (s) => `\x1b[36mℹ\x1b[0m ${s}`,
   reset: '\x1b[0m'
 };