youmna-git-glance 1.1.2 → 1.1.4

package/README.md

@@ -1,24 +1,96 @@
-# 🚀 Git Glance
+# 🦋 youmna-git (ygit)
 
-A lightweight, beautiful CLI dashboard to get an instant overview of your Git repository status. Built with Node.js.
+**The AI-Powered Git Assistant that makes your workflow glide.**
 
-[![npm version](https://img.shields.io/npm/v/youmna-git-glance.svg)](https://www.npmjs.com/package/youmna-git-glance)
+[![npm version](https://img.shields.io/npm/v/youmna-git.svg)](https://www.npmjs.com/package/youmna-git)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 
+`youmna-git` is a professional-grade CLI tool that transforms your terminal into a smart dashboard. Powered by **Google Gemini 3.0**, it doesn't just show you your git status—it helps you write code, review bugs, and understand your history.
+
+---
+
 ## ✨ Features
-- 📊 **Instant Summary:** View current branch and remote URLs.
-- 🕒 **Latest Commit:** See the most recent commit message and author.
-- 📂 **File Tracking:** Instantly see how many files have been modified.
-- 🎨 **Beautiful UI:** Clean, color-coded dashboard output.
+
+- 📊 **Smart Dashboard:** A beautiful, color-coded summary of your branch, changes, and latest commits.
+- 🤖 **Gemini AI Commit:** Instantly generate professional, one-line commit messages by analyzing your file changes.
+- 🔍 **AI Code Review:** Get a senior-level review of your current diff to spot bugs before you push.
+- 💬 **Repo Chat:** Ask questions like "What did I change in the last hour?" and get answers based on your git logs.
+- 🛡️ **Merge Helper:** Solve complex merge conflicts with a step-by-step AI resolution plan.
+- ⚡ **Lightweight & Fast:** Built for speed, keeping your hands on the keyboard.
+---
 
 ## 📦 Installation
+
 Install the tool globally using npm:
 
 ```bash
-npm install -g youmna-git-glance
-``````
+npm install -g youmna-git
+```
+----------
+# 🦋 youmna-git (ygit)
+
+**The AI-Powered Git Assistant that makes your workflow glide.**
+
+[![npm version](https://img.shields.io/npm/v/youmna-git.svg)](https://www.npmjs.com/package/youmna-git)
+[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
+
+`youmna-git` is a professional-grade CLI tool that transforms your terminal into a smart dashboard. Powered by **Google Gemini 1.5 Flash**, it doesn't just show you your git status—it helps you write code, review bugs, and understand your history.
 
-🚀 Usage
+---
+
+## 🔑 Setup
+
+To use the AI features (Commit, Review, Chat), you need to get a free API Key from Google:
+
+1.  **Get your Key:** Go to [Google AI Studio](https://aistudio.google.com/) and click **"Get API key"**.
+2.  **Add to Environment:** Create a file named `.env` in your project root or add it to your shell profile:
+    ```text
+    GEMINI_API_KEY=your_key_here
+    ```
+3.  **Important:** Make sure your `.env` `.npmrc` files are added to your `.gitignore` so your key stays private!
+
+---
+
+## 🚀 Usage
+
+Simply type `ygit` to launch the main dashboard, or use these commands:
+
+⭐ **Launch the interactive dashboard**
 ```bash
-git-glance
-```
+ygit
+```
+
+⭐ **Generate an AI commit message for staged changes**
+```bash
+ygit commit
+```
+
+⭐ **Analyze current code diff for bugs**
+```bash
+ygit review
+```
+
+⭐ **Ask a question about your history**
+```bash
+ygit chat "What features did I add yesterday?"
+```
+
+⭐ **Get help resolving active merge conflicts**
+```bash
+ygit merge-help
+```
+
+
+🤝 Contributing
+
+Contributions are welcome! Please feel free to submit a Pull Request.
+
+1- Fork the Project
+
+2- Create your Feature Branch (git checkout -b feature/AmazingFeature)
+
+3- Commit your Changes (git commit -m 'Add some AmazingFeature')
+
+4- Push to the Branch (git push origin feature/AmazingFeature)
+
+5- Open a Pull Request

package/index.js

@@ -1,50 +1,166 @@
 #!/usr/bin/env node
-
+import { program } from 'commander';
 import { simpleGit } from 'simple-git';
-import chalk from 'chalk';
-import boxen from 'boxen';
-import ora from 'ora';
+import { GoogleGenerativeAI } from '@google/generative-ai';
+import 'dotenv/config';
+import { primary, success, accent, error, text, createSpinner, createBox, createProgressBar, log, logError } from './utils/ui.js'; // Updated import
+import fs from 'fs'; // Ensure you have this import at the top
 
 const git = simpleGit();
 
-async function showGitStats() {
-    const spinner = ora('Fetching Git Info...').start();
+// --- Gemini AI Setup ---
+const genAI = new GoogleGenerativeAI(process.env.GEMINI_API_KEY);
+const model = genAI.getGenerativeModel({ 
+  model: process.env.GEMINI_MODEL || "gemini-3-flash-preview" 
+});
+
+// --- 📊 THE DASHBOARD (Default) ---
+async function showDashboard() {
+  const spinner = createSpinner('Loading Git Dashboard...').start();
+  try {
+    const isRepo = await git.checkIsRepo();
+    if (!isRepo) {
+      spinner.fail(error('Error: Not a git repository!'));
+      return;
+    }
+
+    const status = await git.status();
+    const logResult = await git.log({ n: 1 });
+    const remote = await git.getRemotes(true);
+    spinner.stop();
+
+    const stats = `
+${primary.bold('Branch:')}    ${text(status.current)}
+${success.bold('Latest:')}    ${text(logResult.latest.message)}
+${accent.bold('Author:')}    ${text(logResult.latest.author_name)}
+${primary.bold('Status:')}    ${text(status.files.length + ' files modified')}
+${primary.bold('Remote:')}    ${text(remote[0]?.refs.fetch || 'None')}
+    `;
+
+    log(createBox(stats, { title: '🚀 Youmna Git Dashboard (Hacker Mode)', borderColor: primary.toString() })); // Using new createBox
+  } catch (err) {
+    spinner.fail(error('Failed to load dashboard.'));
+    logError(err.message);
+  }
+}
 
+// --- 🤖 AI COMMANDS ---
+program.name('ygit').version('2.2.0').description('Personal AI Git Assistant powered by Gemini');
+
+// 1. AI Commit Suggestion
+program
+  .command('commit')
+  .description('Suggest a commit message using Gemini AI')
+  .action(async () => {
+    const spinner = createSpinner('AI is analyzing changes...').start();
+    try {
+      const diff = await git.diff();
+      if (!diff) return spinner.info(text('No changes found to describe.'));
+
+      const prompt = `Write a professional, concise one-line git commit message for these changes: ${diff.substring(0, 5000)}`;
+      const result = await model.generateContent(prompt);
+      
+      spinner.stop();
+      log(createBox(success(result.response.text().trim()), { title: '✨ Gemini Suggestion', borderColor: 'green' }));
+    } catch (err) {
+      spinner.stop();
+      if (err.message.includes('429')) {
+        logError("Quota reached! Please wait 60 seconds before trying again.");
+      } else if (err.message.includes('404')) {
+        logError("Model not found. Ensure line 12 is: gemini-3-flash-preview");
+      } else {
+        logError(err.message);
+      }
+    }
+  });
+
+// 2. AI Code Review
+program
+  .command('review')
+  .description('Let Gemini review your code for bugs')
+  .action(async () => {
+    const spinner = createSpinner('Gemini is inspecting your code...', accent).start();
     try {
-        const isRepo = await git.checkIsRepo();
-        if (!isRepo) {
-            spinner.fail(chalk.red('Error: Not a git repository!'));
-            return;
+      const diff = await git.diff();
+      const prompt = `You are a senior reviewer. Spot bugs or messy logic in this diff. Be concise: ${diff.substring(0, 5000)}`;
+      const result = await model.generateContent(prompt);
+      
+      spinner.stop();
+
+log(createBox(text(result.response.text()), { 
+    title: '🔍 AI Code Review', 
+    borderColor: 'magenta' 
+}));
+    } catch (err) { spinner.fail(error('Review failed.')); logError(err.message); }
+  });
+
+// 3. Repo Chat
+program
+  .command('chat <question>')
+  .description('Ask a question about your git history')
+  .action(async (question) => {
+    const spinner = createSpinner('Consulting history...').start();
+    try {
+      const logs = await git.log({ n: 10 });
+      const prompt = `Based on these git logs: ${JSON.stringify(logs)}, answer: ${question}`;
+      const result = await model.generateContent(prompt);
+
+      spinner.stop();
+      log(`${accent('🤖 Gemini Assistant:')} ${text(result.response.text())}`);
+    } catch (err) { spinner.fail(error('Chat failed.')); logError(err.message); }
+  });
+
+// 4. AI-Powered Merge Conflict Helper (FIXED)
+program
+  .command('merge-help')
+  .description('Analyze and suggest resolutions for merge conflicts')
+  .action(async () => {
+    const spinner = createSpinner('Scanning for 💔 conflicts...').start();
+    try {
+      const status = await git.status();
+      const conflictedFiles = status.conflicted; // Get files that are "unmerged"
+
+      if (conflictedFiles.length === 0) {
+        spinner.succeed(success('No merge conflicts detected! Everything is clean.'));
+        return;
+      }
+
+      const conflictDetails = [];
+      for (const file of conflictedFiles) {
+        // We read from the disk (worktree) instead of the Git index
+        // This avoids the "Stage 0" error
+        const content = await fs.promises.readFile(file, 'utf8');
+        if (content.includes('<<<<<<<')) {
+          conflictDetails.push(`File: ${file}\n${content}`);
         }
+      }
+
+      if (conflictDetails.length === 0) {
+        spinner.fail(error('Conflicted files found, but no markers (<<<<<<<) detected.'));
+        return;
+      }
+
+      spinner.text = primary('Gemini is resolving the puzzle...');
+      const prompt = `You are a Git Expert. Explain the conflict and suggest a solution for:
+      ${conflictDetails.join('\n\n').substring(0, 8000)}`;
 
-        const status = await git.status();
-        const log = await git.log({ n: 1 });
-        const remote = await git.getRemotes(true);
-
-        spinner.stop();
-
-        
-        const stats = `
-${chalk.cyan.bold('Branch:')}    ${chalk.white(status.current)}
-${chalk.green.bold('Latest:')}    ${chalk.white(log.latest.message)}
-${chalk.yellow.bold('Author:')}    ${chalk.white(log.latest.author_name)}
-${chalk.magenta.bold('Changes:')}   ${chalk.white(status.files.length + ' files modified')}
-${chalk.blue.bold('Remote:')}    ${chalk.white(remote[0]?.refs.fetch || 'None')}
-        `;
-
-        console.log(boxen(stats, { 
-            padding: 1, 
-            margin: 1, 
-            borderStyle: 'round', 
-            title: 'Git Glance Dashboard', 
-            titleAlignment: 'center',
-            borderColor: 'cyan' 
-        }));
-
-    } catch (error) {
-        spinner.fail(chalk.red('Something went wrong!'));
-        console.error(error);
+      const result = await model.generateContent(prompt);
+      spinner.stop();
+
+      log(createBox(text(result.response.text()), { 
+          title: '🛡️ AI Merge Resolution', 
+          borderColor: 'red' 
+      }));
+
+    } catch (err) {
+      spinner.stop();
+      logError("Could not analyze conflicts: " + err.message);
     }
+  });
+
+// Default behavior
+if (!process.argv.slice(2).length) {
+  showDashboard();
 }
 
-showGitStats();
+program.parse(process.argv);

package/package.json

@@ -1,14 +1,19 @@
 {
   "name": "youmna-git-glance",
-  "version": "1.1.2",
+  "version": "1.1.4",
+  "description": "AI-powered Git assistant using Google Gemini with advanced features 🦋",
   "type": "module",
   "bin": {
-    "git-glance": "./index.js"
+    "ygit": "./index.js"
   },
   "dependencies": {
-    "simple-git": "^3.27.0",
-    "chalk": "^5.3.0",
+    "@google/generative-ai": "^0.24.1",
     "boxen": "^7.1.1",
-    "ora": "^8.0.1"
+    "chalk": "^5.3.0",
+    "cli-progress": "^3.12.0",
+    "commander": "^11.1.0",
+    "dotenv": "^16.4.2",
+    "ora": "^8.0.1",
+    "simple-git": "^3.27.0"
   }
-}
+}

package/utils/ui.js

@@ -0,0 +1,57 @@
+// utils/ui.js
+import chalk from 'chalk';
+import boxen from 'boxen';
+import ora from 'ora';
+import cliProgress from 'cli-progress'; // New dependency for progress bar
+
+// --- Theme Colors ---
+export const primary = chalk.hex('#00FFFF'); // Electric Cyan
+export const success = chalk.hex('#00FF00'); // Bright Green
+export const accent = chalk.hex('#FF00FF'); // Magenta
+export const warning = chalk.hex('#FFFF00'); // Yellow
+export const error = chalk.hex('#FF0000'); // Red
+export const text = chalk.whiteBright;
+
+// --- CLI Components ---
+// utils/ui.js
+export const createSpinner = (textMsg, color = primary) => {
+    // Safe check for hex codes
+    const match = color.toString().match(/#(?:[0-9a-fA-F]{3}){1,2}/);
+    const spinnerColor = match ? match[0] : 'cyan'; 
+
+    return ora({
+        text: color(textMsg),
+        spinner: { interval: 80, frames: ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'] },
+        // Don't pass hex codes to 'ora', use 'cyan' as a fallback
+        color: spinnerColor.startsWith('#') ? 'cyan' : spinnerColor 
+    });
+};
+
+export const createProgressBar = (name = "Progress", barSize = 20) => {
+    const bar = new cliProgress.SingleBar({
+        format: `${accent('{bar}')} ${text('{percentage}%')} | {value}/{total} ${primary(name)}`,
+        barCompleteChar: '\u2588', // Full block
+        barIncompleteChar: '\u2591', // Light shade
+        hideCursor: true,
+        barsize: barSize,
+        linewrap: false
+    }, cliProgress.Presets.shades_classic);
+    return bar;
+};
+
+export const createBox = (content, options = {}) => {
+    const defaultOptions = {
+        padding: 1,
+        margin: 1,
+        borderStyle: 'double', // Hacker Mode border
+        borderColor: primary.name,
+        titleAlignment: 'center',
+        ...options
+    };
+    return boxen(content, defaultOptions);
+};
+
+export const log = (message, color = text) => console.log(color(message));
+export const logError = (message) => console.error(error('Error: ') + error(message));
+export const logSuccess = (message) => console.log(success(message));
+export const logWarning = (message) => console.log(warning(message));