gent-cli 2.0.0 → 5.0.0

package/src/commands/status.js

@@ -1,14 +1,33 @@
 /**
- * Status Command - Show the working tree status
- * Displays staged, modified, and untracked files
+ * ============================================================================
+ * Status Command - Show working tree status
+ * ============================================================================
+ *
+ * PURPOSE:
+ *   Display staged, modified, untracked, and deleted files. Like `git status`.
+ *
+ * USAGE:
+ *   gent status                → Detailed status
+ *   gent status -s             → Short format
+ *
+ * ALGORITHM:
+ *   Computes SHA-256 blob hash for each working file, compares against:
+ *   - Staging entries (from gent add)
+ *   - Last commit tree (from commits.json)
+ *   Classifies files as staged/modified/untracked/deleted.
+ *
+ * BACKEND EXPECTATIONS:
+ *   None (local only).
+ *
+ * ============================================================================
  */
 
 const fs = require('fs').promises;
 const path = require('path');
 const chalk = require('chalk');
-const { getGentPath, readJSON, pathExists, getTrackedFiles, getIgnorePatterns } = require('../utils/fileSystem');
+const { getGentPath, readJSON, pathExists, getIgnorePatterns, getAllFiles } = require('../utils/fileSystem');
 const { STAGING_FILE, COMMITS_FILE } = require('../utils/constants');
-const { getFileHash, getAllFiles } = require('../utils/helpers');
+const { hashBlob } = require('../utils/hash-engine');
 
 /**
  * Show repository status
@@ -19,59 +38,66 @@ async function status(options) {
         const gentPath = await getGentPath();
         const cwd = process.cwd();
 
-        // Read staging area and commits
         const staging = await readJSON(path.join(gentPath, STAGING_FILE));
         const repository = await readJSON(path.join(gentPath, COMMITS_FILE));
 
-        const stagedFiles = staging.files || [];
+        const stagedEntries = staging.entries || [];
+        const stagedFiles = stagedEntries.map(e => e.path);
         const currentBranch = repository.currentBranch || 'main';
-        const lastCommit = repository.branches[currentBranch];
+        const lastCommitHash = repository.branches[currentBranch];
+
+        // Build HEAD tree map: path → blobHash
+        const lastCommit = lastCommitHash
+            ? (repository.commits || []).find(c => c.hash === lastCommitHash)
+            : null;
+        const trackedMap = new Map();
+        if (lastCommit) {
+            const tree = lastCommit.tree || lastCommit.files || [];
+            for (const f of tree) trackedMap.set(f.path || f.name, f.hash);
+        }
 
-        // Get all files in the working directory
+        // Get all working directory files
         const ignorePatterns = await getIgnorePatterns(cwd);
         const allFiles = await getAllFiles(cwd, ignorePatterns);
 
-        // Get tracked files from last commit
-        const trackedFiles = await getTrackedFiles(gentPath, lastCommit);
-
-        // Categorize files
         const stagedSet = new Set(stagedFiles);
-        const trackedSet = new Set(trackedFiles.map(f => f.path));
-
         const modified = [];
         const untracked = [];
         const deleted = [];
 
-        // Check for modifications and untracked files
-        for (const file of allFiles) {
-            const relativePath = path.relative(cwd, file);
-
-            if (trackedSet.has(relativePath)) {
-                // Check if modified
-                const currentHash = await getFileHash(file);
-                const trackedFile = trackedFiles.find(f => f.path === relativePath);
-
-                if (trackedFile && currentHash !== trackedFile.hash && !stagedSet.has(relativePath)) {
-                    modified.push(relativePath);
+        // Check working tree against HEAD
+        for (const absFile of allFiles) {
+            const relPath = path.relative(cwd, absFile);
+            const headHash = trackedMap.get(relPath);
+
+            if (headHash) {
+                // Tracked file — check modification via blob hash
+                const content = await fs.readFile(absFile);
+                const currentHash = hashBlob(content);
+                if (currentHash !== headHash && !stagedSet.has(relPath)) {
+                    modified.push(relPath);
                 }
-            } else if (!stagedSet.has(relativePath)) {
-                untracked.push(relativePath);
+            } else if (!stagedSet.has(relPath)) {
+                untracked.push(relPath);
             }
         }
 
         // Check for deleted files
-        for (const trackedFile of trackedFiles) {
-            const fullPath = path.join(cwd, trackedFile.path);
-            if (!await pathExists(fullPath) && !stagedSet.has(trackedFile.path)) {
-                deleted.push(trackedFile.path);
+        for (const [trackedPath] of trackedMap) {
+            const fullPath = path.join(cwd, trackedPath);
+            if (!await pathExists(fullPath) && !stagedSet.has(trackedPath)) {
+                deleted.push(trackedPath);
             }
         }
 
-        // Display status
+        // Check for merge in progress
+        const mergeState = staging.mergeState || null;
+
+        // Display
         if (options.short) {
-            displayShortStatus(stagedFiles, modified, untracked, deleted);
+            displayShortStatus(stagedEntries, modified, untracked, deleted);
         } else {
-            displayDetailedStatus(currentBranch, stagedFiles, modified, untracked, deleted, lastCommit);
+            displayDetailedStatus(currentBranch, stagedEntries, modified, untracked, deleted, lastCommitHash, mergeState);
         }
 
     } catch (error) {
@@ -88,9 +114,13 @@ async function status(options) {
 /**
  * Display detailed status output
  */
-function displayDetailedStatus(branch, staged, modified, untracked, deleted, lastCommit) {
+function displayDetailedStatus(branch, stagedEntries, modified, untracked, deleted, lastCommit, mergeState) {
     console.log(chalk.bold(`On branch ${chalk.cyan(branch)}`));
 
+    if (mergeState) {
+        console.log(chalk.yellow(`Merging branch '${mergeState.sourceBranch}'`));
+    }
+
     if (!lastCommit) {
         console.log(chalk.gray('No commits yet\n'));
     } else {
@@ -98,12 +128,15 @@ function displayDetailedStatus(branch, staged, modified, untracked, deleted, las
     }
 
     // Staged files
-    if (staged.length > 0) {
+    if (stagedEntries.length > 0) {
         console.log(chalk.green.bold('Changes to be committed:'));
         console.log(chalk.gray('  (use "gent reset <file>..." to unstage)\n'));
-        staged.forEach(file => {
-            console.log(chalk.green(`\t${file}`));
-        });
+        for (const entry of stagedEntries) {
+            const icon = entry.status === 'added' ? 'new file:  '
+                : entry.status === 'deleted' ? 'deleted:   '
+                    : 'modified:  ';
+            console.log(chalk.green(`\t${icon}${entry.path}`));
+        }
         console.log();
     }
 
@@ -136,9 +169,9 @@ function displayDetailedStatus(branch, staged, modified, untracked, deleted, las
     }
 
     // Status summary
-    if (staged.length === 0 && modified.length === 0 && untracked.length === 0 && deleted.length === 0) {
-        console.log(chalk.green('✓ Working tree clean'));
-    } else if (staged.length === 0) {
+    if (stagedEntries.length === 0 && modified.length === 0 && untracked.length === 0 && deleted.length === 0) {
+        console.log(chalk.green('Working tree clean'));
+    } else if (stagedEntries.length === 0) {
         console.log(chalk.yellow('No changes added to commit (use "gent add" to track files)'));
     }
 }
@@ -146,10 +179,11 @@ function displayDetailedStatus(branch, staged, modified, untracked, deleted, las
 /**
  * Display short status output
  */
-function displayShortStatus(staged, modified, untracked, deleted) {
-    staged.forEach(file => {
-        console.log(chalk.green('A  ') + file);
-    });
+function displayShortStatus(stagedEntries, modified, untracked, deleted) {
+    for (const entry of stagedEntries) {
+        const code = entry.status === 'added' ? 'A ' : entry.status === 'deleted' ? 'D ' : 'M ';
+        console.log(chalk.green(code) + entry.path);
+    }
 
     modified.forEach(file => {
         console.log(chalk.red(' M ') + file);

package/src/commands/tag.js

@@ -0,0 +1,146 @@
+/**
+ * ============================================================================
+ * Tag Command - Create, list, and delete named references to commits
+ * ============================================================================
+ *
+ * PURPOSE:
+ *   Mark specific commits with version labels (e.g. v1.0.0). Like `git tag`.
+ *
+ * USAGE:
+ *   gent tag                   → List all tags
+ *   gent tag <name>            → Create lightweight tag on HEAD
+ *   gent tag <name> -m <msg>   → Create annotated tag with message
+ *   gent tag -d <name>         → Delete a tag
+ *
+ * ALGORITHM:
+ *   Tags stored in commits.json under "tags" map: { name → { hash, message, ... } }
+ *   Lightweight tag = just a name pointing to commit hash.
+ *   Annotated tag = includes tagger info, message, timestamp.
+ *
+ * BACKEND EXPECTATIONS:
+ *   POST /api/repos/:id/tags/ { name, hash, message, annotated }
+ *   GET  /api/repos/:id/tags/
+ *   DELETE /api/repos/:id/tags/:name/
+ *
+ * ============================================================================
+ */
+
+const path = require('path');
+const chalk = require('chalk');
+const { getGentPath, readJSON, writeJSON } = require('../utils/fileSystem');
+const { COMMITS_FILE, CONFIG_FILE } = require('../utils/constants');
+const authStorage = require('../utils/auth-storage');
+
+/**
+ * Manage tags
+ * @param {String} name - Tag name (optional)
+ * @param {Object} options
+ */
+async function tag(name, options) {
+    try {
+        const gentPath = await getGentPath();
+        const repository = await readJSON(path.join(gentPath, COMMITS_FILE));
+        repository.tags = repository.tags || {};
+
+        if (options.delete) {
+            await deleteTag(options.delete, repository, gentPath);
+            return;
+        }
+
+        if (name) {
+            await createTag(name, repository, gentPath, options);
+            return;
+        }
+
+        // List tags
+        listTags(repository);
+
+    } catch (error) {
+        if (error.code === 'ENOENT' && error.message.includes('.gent')) {
+            console.error(chalk.red('Error: Not a gent repository'));
+        } else {
+            console.error(chalk.red('Error:'), error.message);
+        }
+        process.exit(1);
+    }
+}
+
+/**
+ * List all tags
+ */
+function listTags(repository) {
+    const tags = Object.keys(repository.tags).sort();
+
+    if (tags.length === 0) {
+        console.log(chalk.gray('No tags'));
+        return;
+    }
+
+    for (const tagName of tags) {
+        const t = repository.tags[tagName];
+        const short = t.hash ? t.hash.substring(0, 7) : '???????';
+        const msg = t.message ? chalk.gray(` — ${t.message}`) : '';
+        console.log(chalk.yellow(tagName) + chalk.gray(` → ${short}`) + msg);
+    }
+}
+
+/**
+ * Create a tag
+ */
+async function createTag(name, repository, gentPath, options) {
+    if (repository.tags[name]) {
+        console.error(chalk.red(`Tag '${name}' already exists`));
+        process.exit(1);
+    }
+
+    const currentBranch = repository.currentBranch;
+    const commitHash = repository.branches[currentBranch];
+
+    if (!commitHash) {
+        console.error(chalk.red('No commits to tag'));
+        return;
+    }
+
+    const tagObj = { hash: commitHash };
+
+    // Annotated tag
+    if (options.message) {
+        const config = await readJSON(path.join(gentPath, CONFIG_FILE));
+        let taggerName = config.user.name;
+        let taggerEmail = config.user.email;
+
+        if (!taggerName || !taggerEmail) {
+            const user = await authStorage.getUser();
+            if (user) {
+                taggerName = taggerName || [user.first_name, user.last_name].filter(Boolean).join(' ');
+                taggerEmail = taggerEmail || user.email;
+            }
+        }
+
+        tagObj.message = options.message;
+        tagObj.annotated = true;
+        tagObj.tagger = { name: taggerName || 'Unknown', email: taggerEmail || '' };
+        tagObj.timestamp = new Date().toISOString();
+    }
+
+    repository.tags[name] = tagObj;
+    await writeJSON(path.join(gentPath, COMMITS_FILE), repository);
+
+    console.log(chalk.green(`Created tag '${name}' → ${commitHash.substring(0, 7)}`));
+}
+
+/**
+ * Delete a tag
+ */
+async function deleteTag(name, repository, gentPath) {
+    if (!repository.tags[name]) {
+        console.error(chalk.red(`Tag '${name}' not found`));
+        process.exit(1);
+    }
+
+    delete repository.tags[name];
+    await writeJSON(path.join(gentPath, COMMITS_FILE), repository);
+    console.log(chalk.green(`Deleted tag '${name}'`));
+}
+
+module.exports = tag;

package/src/index.js

@@ -1,25 +1,46 @@
 #!/usr/bin/env node
 
 /**
- * Gent CLI - A Git-like version control system
+ * ============================================================================
+ * Gent CLI - A Git-like version control system with cloud backend
  * Main entry point for the CLI application
- * 
- * @author Your Name
- * @version 1.0.0
+ * ============================================================================
+ *
+ * COMMANDS:
+ *   Repository:  init, clone
+ *   Staging:     add, rm, reset, status, diff
+ *   History:     commit, log, show, tag
+ *   Branching:   branch, checkout, merge, stash
+ *   Remote:      remote, push, pull
+ *   Auth:        register, login, logout, whoami
+ *
+ * @author Abdalrahman Kanawati
+ * @version 2.0.0
  */
 
 const { program } = require('commander');
 const chalk = require('chalk');
 const packageJson = require('../package.json');
 
-// Import commands
+// Import core commands
 const initCommand = require('./commands/init');
+const cloneCommand = require('./commands/clone');
 const statusCommand = require('./commands/status');
 const addCommand = require('./commands/add');
+const rmCommand = require('./commands/rm');
+const resetCommand = require('./commands/reset');
+const diffCommand = require('./commands/diff');
 const commitCommand = require('./commands/commit');
 const logCommand = require('./commands/log');
+const showCommand = require('./commands/show');
+const tagCommand = require('./commands/tag');
 const branchCommand = require('./commands/branch');
 const checkoutCommand = require('./commands/checkout');
+const mergeCommand = require('./commands/merge');
+const stashCommand = require('./commands/stash');
+const remoteCommand = require('./commands/remote');
+const pushCommand = require('./commands/push');
+const pullCommand = require('./commands/pull');
 
 // Import auth commands
 const registerCommand = require('./commands/register');
@@ -27,30 +48,27 @@ const loginCommand = require('./commands/login');
 const logoutCommand = require('./commands/logout');
 const whoamiCommand = require('./commands/whoami');
 
-// Import cloud repository commands
-const createCommand = require('./commands/create');
-const listCommand = require('./commands/list');
-const cloneCommand = require('./commands/clone');
-const pushCommand = require('./commands/push');
-const pullCommand = require('./commands/pull');
-const remoteCommand = require('./commands/remote');
-
 // Configure CLI
 program
     .name('gent')
-    .description(chalk.cyan('🚀 Gent - A Git-like version control CLI'))
+    .description(chalk.cyan('Gent - A Git-like version control CLI with cloud backend'))
     .version(packageJson.version, '-v, --version', 'Output the current version');
 
-// Register commands
+// ─── Repository Setup ───────────────────────────────────
+
 program
     .command('init')
     .description('Initialize a new gent repository')
     .option('-y, --yes', 'Skip prompts and use defaults')
-    .option('--cloud', 'Create a corresponding cloud repository')
-    .option('-d, --description <description>', 'Repository description (for cloud)')
-    .option('-p, --private', 'Make cloud repository private')
     .action(initCommand);
 
+program
+    .command('clone <url> [directory]')
+    .description('Clone a remote repository')
+    .action(cloneCommand);
+
+// ─── Staging & Working Tree ─────────────────────────────
+
 program
     .command('status')
     .description('Show the working tree status')
@@ -63,12 +81,33 @@ program
     .option('-A, --all', 'Add all files')
     .action(addCommand);
 
+program
+    .command('rm <files...>')
+    .description('Remove files from working tree and staging')
+    .option('--cached', 'Only remove from staging, keep file on disk')
+    .action(rmCommand);
+
+program
+    .command('reset [files...]')
+    .description('Unstage files or reset HEAD to a commit')
+    .option('--hard <hash>', 'Reset HEAD and working tree to commit')
+    .option('--soft <hash>', 'Reset HEAD but keep staging')
+    .action(resetCommand);
+
+program
+    .command('diff [files...]')
+    .description('Show changes between working tree, staging, and commits')
+    .option('--staged', 'Show staged changes vs last commit')
+    .option('--stat', 'Show diffstat summary only')
+    .action(diffCommand);
+
+// ─── History ────────────────────────────────────────────
+
 program
     .command('commit')
     .description('Record changes to the repository')
     .option('-m, --message <message>', 'Commit message')
     .option('-a, --all', 'Automatically stage all modified files')
-    .option('--push', 'Push to remote after commit')
     .action(commitCommand);
 
 program
@@ -76,8 +115,24 @@ program
     .description('Show commit logs')
     .option('-n, --number <count>', 'Limit the number of commits to show', '10')
     .option('--oneline', 'Show each commit on a single line')
+    .option('--stat', 'Show file change statistics')
     .action(logCommand);
 
+program
+    .command('show [ref]')
+    .description('Show commit details and diff')
+    .option('--no-patch', 'Suppress diff output')
+    .action(showCommand);
+
+program
+    .command('tag [name]')
+    .description('Create, list, or delete tags')
+    .option('-m, --message <message>', 'Create annotated tag with message')
+    .option('-d, --delete <name>', 'Delete a tag')
+    .action(tagCommand);
+
+// ─── Branching & Merging ────────────────────────────────
+
 program
     .command('branch')
     .description('List, create, or delete branches')
@@ -92,7 +147,40 @@ program
     .option('-b, --create', 'Create a new branch')
     .action(checkoutCommand);
 
-// Authentication commands
+program
+    .command('merge <branch>')
+    .description('Merge a branch into the current branch (3-way smart merge)')
+    .option('-m, --message <message>', 'Merge commit message')
+    .action(mergeCommand);
+
+program
+    .command('stash [subcommand]')
+    .description('Stash working tree changes (pop|list|drop|apply)')
+    .option('-m, --message <message>', 'Stash message')
+    .option('-i, --index <index>', 'Stash index for pop/apply/drop')
+    .action(stashCommand);
+
+// ─── Remote & Sync ──────────────────────────────────────
+
+program
+    .command('remote [subcommand] [args...]')
+    .description('Manage remote connections (add|remove|set-url)')
+    .option('-v, --verbose', 'Show remote URLs')
+    .action(remoteCommand);
+
+program
+    .command('push [remote] [branch]')
+    .description('Push local commits to remote')
+    .option('-f, --force', 'Force push (overwrite remote)')
+    .action(pushCommand);
+
+program
+    .command('pull [remote] [branch]')
+    .description('Pull and merge remote commits')
+    .action(pullCommand);
+
+// ─── Authentication ─────────────────────────────────────
+
 program
     .command('register')
     .description('Create a new user account')
@@ -115,43 +203,6 @@ program
     .description('Display current user information')
     .action(whoamiCommand);
 
-// Cloud repository commands
-program
-    .command('create <repo-name>')
-    .description('Create a new cloud repository')
-    .option('-d, --description <description>', 'Repository description')
-    .option('-p, --private', 'Make repository private')
-    .option('-y, --yes', 'Skip prompts and use defaults')
-    .option('--init-local', 'Initialize local repository and link remote')
-    .action(createCommand);
-
-program
-    .command('list')
-    .alias('ls')
-    .description('List all your cloud repositories')
-    .action(listCommand);
-
-program
-    .command('clone <repo-url> [directory]')
-    .description('Clone a cloud repository (format: owner_id/repo_name)')
-    .action(cloneCommand);
-
-program
-    .command('push [remote] [branch]')
-    .description('Push local commits to cloud')
-    .action(pushCommand);
-
-program
-    .command('pull [remote] [branch]')
-    .description('Pull commits from cloud to local')
-    .action(pullCommand);
-
-program
-    .command('remote [action] [name] [url]')
-    .description('Manage remote repositories')
-    .option('-v, --verbose', 'Show verbose output')
-    .action(remoteCommand);
-
 // Help command
 program
     .command('help [command]')

package/src/utils/constants.js

@@ -11,42 +11,26 @@ module.exports = {
     COMMITS_FILE: 'commits.json',
     HEAD_FILE: 'HEAD',
     AUTH_FILE: 'auth.json',
-    OBJECTS_DIR: 'objects',
-    REMOTE_CONFIG_FILE: 'remote.json',
 
     // API Configuration
     API_BASE_URL: 'https://gent-api.onrender.com',
     API_ENDPOINTS: {
-        // Auth endpoints
         LOGIN: '/api/auth/login/',
         REGISTER: '/api/auth/register/',
         LOGOUT: '/api/auth/logout/',
         REFRESH: '/api/auth/token/refresh/',
         PROFILE: '/api/auth/profile/',
 
-        // Repository endpoints
-        REPOS_LIST: '/api/repos/',
-        REPOS_CREATE: '/api/repos/create/',
-        REPOS_GET: '/api/repos/{owner_id}/{project_name}/',
-        REPOS_DELETE: '/api/repos/{owner_id}/{project_name}/delete/',
-
-        // Blob endpoints
-        BLOB_GET: '/api/repos/{owner_id}/{project_name}/blob/{sha}/',
-        BLOB_CREATE: '/api/repos/{owner_id}/{project_name}/blob/create/',
-
-        // Tree endpoints
-        TREE_GET: '/api/repos/{owner_id}/{project_name}/tree/{sha}/',
-        TREE_CREATE: '/api/repos/{owner_id}/{project_name}/tree/create/',
-
-        // Commit endpoints
-        COMMITS_LIST: '/api/repos/{owner_id}/{project_name}/commits/',
-        COMMITS_GET: '/api/repos/{owner_id}/{project_name}/commits/{sha}/',
-        COMMITS_CREATE: '/api/repos/{owner_id}/{project_name}/commits/create/',
-
-        // Branch endpoints
-        BRANCHES_LIST: '/api/repos/{owner_id}/{project_name}/branches/',
-        BRANCHES_GET: '/api/repos/{owner_id}/{project_name}/branches/{branch_name}/',
-        BRANCHES_CREATE: '/api/repos/{owner_id}/{project_name}/branches/create/'
+        // Repository endpoints (used by push/pull/clone)
+        // Base: /api/repos/:id/
+        REPOS: '/api/repos/',
+        REPO_PUSH: '/push/',       // POST - upload commits + objects
+        REPO_PULL: '/pull/',       // GET  - download commits + objects since hash
+        REPO_CLONE: '/clone/',     // GET  - full repo download
+        REPO_REFS: '/refs/',       // GET  - list remote branch refs
+        REPO_TAGS: '/tags/',       // GET/POST/DELETE - tag management
+        REPO_MERGE: '/merge/',     // POST - server-side merge request
+        REPO_COMMITS: '/commits/', // GET  - commit history
     },
 
     // Default ignore patterns