youmna-git-glance 1.1.5 → 1.1.6

package/README.md

@@ -1,11 +1,20 @@
-# 🦋 youmna-git (ygit)
+# 🦋 youmna-git-glance (ygit)
+**The Git Assistant with Long-Term Memory.**
+[![npm version](https://img.shields.io/npm/v/youmna-git-glance.svg)](https://www.npmjs.com/package/youmna-git-glance)
+[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 
-**The AI-Powered Git Assistant that makes your workflow glide.**
+`youmna-git-glance` is an AI-native CLI that transforms your repository's history into an active knowledge base. Powered by Google Gemini, it uses intelligent keyword extraction to scout your entire commit history, providing AI-powered code reviews, automated professional commits, and context-aware chat that truly understands your codebase.
 
-[![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.
+---
+
+## 🎥 Demo
+
+<a href="https://www.youtube.com/watch?v=Jxc45Jc_-dc" target="_blank">
+  <img src="https://img.youtube.com/vi/Jxc45Jc_-dc/maxresdefault.jpg" alt="ygit Demo Video" width="600px">
+</a>
+
+*Click to watch the full walkthrough (AI Review, Smart Chat, and Merge Resolution)*
 
 ---
 
@@ -14,9 +23,10 @@
 - 📊 **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.
+- 💬 **Smart Context Chat:** Ask natural questions about your repository. The AI scans your entire git history using intelligent keyword matching to find relevant commits and deliver context-aware answers.
 - 🛡️ **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
@@ -24,17 +34,14 @@
 Install the tool globally using npm:
 
 ```bash
-npm install -g youmna-git
+npm install -g youmna-git-glance
 ```
-----------
-# 🦋 youmna-git (ygit)
 
-**The AI-Powered Git Assistant that makes your workflow glide.**
+Then use it anywhere with:
 
-[![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.
+```bash
+ygit
+```
 
 ---
 
@@ -42,12 +49,12 @@ npm install -g youmna-git
 
 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!
+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` and `.npmrc` files are added to your `.gitignore` so your key stays private!
 
 ---
 
@@ -70,27 +77,57 @@ ygit commit
 ygit review
 ```
 
-⭐ **Ask a question about your history**
+⭐ **Ask a question about your repository history**
 ```bash
 ygit chat "What features did I add yesterday?"
 ```
 
+The chat command uses advanced keyword extraction to intelligently search your entire git history. It identifies important keywords from your question (like "features", "login", "bugfix") and searches across all branches to find the most relevant commits. If no matches are found, it falls back to your 10 most recent commits, ensuring you always get contextual answers about your work.
+
+**Chat Examples:**
+```bash
+ygit chat "When did I fix the authentication bug?"
+ygit chat "What changes did I make to the database module?"
+ygit chat "Show me commits related to the API refactor"
+```
+
 ⭐ **Get help resolving active merge conflicts**
 ```bash
 ygit merge-help
 ```
 
+---
 
-🤝 Contributing
+## 🤝 Contributing
 
 Contributions are welcome! Please feel free to submit a Pull Request.
 
-1- Fork the Project
+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
+
+---
+
+## 📄 License
+
+This project is licensed under the MIT License. Feel free to use and modify it.
 
-2- Create your Feature Branch (git checkout -b feature/AmazingFeature)
+---
+
+## 📞 Support & Community
 
-3- Commit your Changes (git commit -m 'Add some AmazingFeature')
+- **Issues:** If you run into any trouble, please open an [issue on GitHub](https://github.com/YoumnaSalloum/git-glance-cli/issues).
+- **Feature Requests:** Have an idea for a new AI command? Let us know in the issues!
+- **Pull Requests:** We love community contributions. Feel free to fork the repo and submit a PR.
+
+---
+
+## 🚀 Happy Coding! 🎉
+
+---
 
-4- Push to the Branch (git push origin feature/AmazingFeature)
+## Keywords
 
-5- Open a Pull Request
+`git` `gemini` `ai` `cli` `automation` `code-review` `commit-messages` `merge-conflicts` `git-assistant` `developer-tools` `terminal` `productivity`

package/index.js

@@ -1,10 +1,9 @@
-#!/usr/bin/env node
 import { program } from 'commander';
 import { simpleGit } from 'simple-git';
 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
+import fs from 'fs'; 
 
 const git = simpleGit();
 
@@ -14,7 +13,6 @@ 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 {
@@ -37,14 +35,13 @@ ${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
+    log(createBox(stats, { title: '🚀 Youmna Git Dashboard (Hacker Mode)', borderColor: primary.toString() })); 
   } 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
@@ -54,8 +51,12 @@ program
   .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 diff = await git.diff(['--cached']); 
+      
+      if (!diff) {
+        spinner.info(text('No staged changes found. Use "git add" first!'));
+        return;
+      }
 
       const prompt = `Write a professional, concise one-line git commit message for these changes: ${diff.substring(0, 5000)}`;
       const result = await model.generateContent(prompt);
@@ -81,8 +82,14 @@ program
   .action(async () => {
     const spinner = createSpinner('Gemini is inspecting your code...', accent).start();
     try {
-      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 diff = await git.diff(['HEAD']);
+      
+      if (!diff) {
+        spinner.info(text('No changes found to review.'));
+        return;
+      }
+      
+      const prompt = `You are a senior reviewer. Spot bugs or messy logic in this diff: ${diff.substring(0, 5000)}`;
       const result = await model.generateContent(prompt);
       
       spinner.stop();
@@ -94,23 +101,43 @@ log(createBox(text(result.response.text()), {
     } catch (err) { spinner.fail(error('Review failed.')); logError(err.message); }
   });
 
-// 3. Repo Chat
+// 3. Repo Chat with Smart Context
 program
   .command('chat <question>')
-  .description('Ask a question about your git history')
+  .description('Ask a question about your git history (Smart Context)')
   .action(async (question) => {
-    const spinner = createSpinner('Consulting history...').start();
+    const spinner = createSpinner('Scanning history for context...').start();
     try {
-      const logs = await git.log({ n: 10 });
-      const prompt = `Based on these git logs: ${JSON.stringify(logs)}, answer: ${question}`;
+      const keywords = question.toLowerCase().split(' ').filter(word => word.length > 3);
+      
+      let contextLogs;
+      
+      if (keywords.length > 0) {
+        const args = [
+          '--all',
+          '--grep=' + keywords.join('|'), 
+          '-i', 
+          '-n', '15'
+        ];
+        contextLogs = await git.log(args);
+      }
+
+      if (!contextLogs || contextLogs.all.length === 0) {
+        contextLogs = await git.log(['-n', '10']);
+      }
+
+      const prompt = `You are a Git Expert. Answer this question based on these logs: ${JSON.stringify(contextLogs.all)}. Question: "${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); }
+      log(`${accent.bold('🤖 Gemini Assistant:')}\n${text(result.response.text())}`);
+    } catch (err) { 
+      spinner.fail(error('Chat failed.')); 
+      logError(err.message); 
+    }
   });
 
-// 4. AI-Powered Merge Conflict Helper (FIXED)
+// 4. AI-Powered Merge Conflict Resolution
 program
   .command('merge-help')
   .description('Analyze and suggest resolutions for merge conflicts')
@@ -118,7 +145,7 @@ program
     const spinner = createSpinner('Scanning for 💔 conflicts...').start();
     try {
       const status = await git.status();
-      const conflictedFiles = status.conflicted; // Get files that are "unmerged"
+      const conflictedFiles = status.conflicted;
 
       if (conflictedFiles.length === 0) {
         spinner.succeed(success('No merge conflicts detected! Everything is clean.'));
@@ -127,8 +154,6 @@ program
 
       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}`);
@@ -158,7 +183,6 @@ program
     }
   });
 
-// Default behavior
 if (!process.argv.slice(2).length) {
   showDashboard();
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   
     "name": "youmna-git-glance",
-    "version": "1.1.5",
+    "version": "1.1.6",
     "repository": {
       "type": "git",
       "url": "https://github.com/YoumnaSalloum/youmna-git-glance.git"

package/utils/ui.js

@@ -1,28 +1,24 @@
-// 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
+import cliProgress from 'cli-progress'; 
 
 // --- 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 primary = chalk.hex('#00FFFF');
+export const success = chalk.hex('#00FF00');
+export const accent = chalk.hex('#FF00FF');
+export const warning = chalk.hex('#FFFF00');
+export const error = chalk.hex('#FF0000');
 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 
     });
 };
@@ -30,8 +26,8 @@ export const createSpinner = (textMsg, color = primary) => {
 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
+        barCompleteChar: '\u2588', 
+        barIncompleteChar: '\u2591',
         hideCursor: true,
         barsize: barSize,
         linewrap: false
@@ -43,7 +39,7 @@ export const createBox = (content, options = {}) => {
     const defaultOptions = {
         padding: 1,
         margin: 1,
-        borderStyle: 'double', // Hacker Mode border
+        borderStyle: 'double',
         borderColor: primary.name,
         titleAlignment: 'center',
         ...options