gent-cli 2.1.0 → 5.0.1

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}/{name}/',
-        REPOS_DELETE: '/api/repos/{owner_id}/{name}/delete/',
-
-        // Blob endpoints
-        BLOB_GET: '/api/repos/{owner_id}/{name}/blob/{sha}/',
-        BLOB_CREATE: '/api/repos/{owner_id}/{name}/blob/create/',
-
-        // Tree endpoints
-        TREE_GET: '/api/repos/{owner_id}/{name}/tree/{sha}/',
-        TREE_CREATE: '/api/repos/{owner_id}/{name}/tree/create/',
-
-        // Commit endpoints
-        COMMITS_LIST: '/api/repos/{owner_id}/{name}/commits/',
-        COMMITS_GET: '/api/repos/{owner_id}/{name}/commits/{sha}/',
-        COMMITS_CREATE: '/api/repos/{owner_id}/{name}/commits/create/',
-
-        // Branch endpoints
-        BRANCHES_LIST: '/api/repos/{owner_id}/{name}/branches/',
-        BRANCHES_GET: '/api/repos/{owner_id}/{name}/branches/{branch_name}/',
-        BRANCHES_CREATE: '/api/repos/{owner_id}/{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

package/src/utils/diff-engine.js

@@ -0,0 +1,236 @@
+/**
+ * ============================================================================
+ * Diff Engine - Line-level LCS diff with hunk generation and unified format
+ * ============================================================================
+ *
+ * PURPOSE:
+ *   Compute minimal edit scripts between two text files, classify each line
+ *   as insert / delete / equal, generate unified diff output.
+ *
+ * ALGORITHM: Longest Common Subsequence (LCS)
+ *   - Build M×N dynamic programming matrix where M,N = line counts
+ *   - dp[i][j] = length of LCS of first i lines of A and first j lines of B
+ *   - Recurrence:
+ *       if A[i] == B[j]:  dp[i][j] = dp[i-1][j-1] + 1
+ *       else:             dp[i][j] = max(dp[i-1][j], dp[i][j-1])
+ *   - Backtrack from dp[M][N] to produce edit operations
+ *   - Time: O(M*N), Space: O(M*N) — uses Uint32Array for memory efficiency
+ *
+ * INSERTION/DELETION CLASSIFICATION:
+ *   During backtrack:
+ *   - A[i]==B[j] → EQUAL (line unchanged)
+ *   - Move up (i-1) → DELETE (line only in old version)
+ *   - Move left (j-1) → INSERT (line only in new version)
+ *
+ * HUNK GENERATION:
+ *   Groups adjacent changes with N context lines (default 3) into hunks.
+ *   Changes within 2*N+1 lines of each other merge into one hunk.
+ *   Output format matches unified diff:
+ *     @@ -oldStart,oldCount +newStart,newCount @@
+ *
+ * BACKEND EXPECTATIONS:
+ *   Diffs are computed locally. Backend does NOT need diff support.
+ *   Backend stores blob objects; clients compute diffs on demand.
+ *
+ * ============================================================================
+ */
+
+const { splitLines } = require('./hash-engine');
+
+// ─── Core LCS / Diff ────────────────────────────────────
+
+/**
+ * Build LCS length matrix.
+ * @param {String[]} a
+ * @param {String[]} b
+ * @returns {Array<Uint32Array>}
+ */
+function buildLcsMatrix(a, b) {
+    const rows = a.length + 1;
+    const cols = b.length + 1;
+    const matrix = Array.from({ length: rows }, () => new Uint32Array(cols));
+
+    for (let i = 1; i < rows; i++) {
+        for (let j = 1; j < cols; j++) {
+            if (a[i - 1] === b[j - 1]) {
+                matrix[i][j] = matrix[i - 1][j - 1] + 1;
+            } else {
+                matrix[i][j] = Math.max(matrix[i - 1][j], matrix[i][j - 1]);
+            }
+        }
+    }
+    return matrix;
+}
+
+/**
+ * Backtrack LCS matrix → line operations.
+ * @param {String[]} oldLines
+ * @param {String[]} newLines
+ * @returns {Array<{type: 'equal'|'insert'|'delete', oldLine: number, newLine: number, content: String}>}
+ */
+function buildLineOperations(oldLines, newLines) {
+    const matrix = buildLcsMatrix(oldLines, newLines);
+    const ops = [];
+    let i = oldLines.length;
+    let j = newLines.length;
+
+    while (i > 0 || j > 0) {
+        if (i > 0 && j > 0 && oldLines[i - 1] === newLines[j - 1]) {
+            ops.push({ type: 'equal', oldLine: i, newLine: j, content: oldLines[i - 1] });
+            i--; j--;
+        } else if (j > 0 && (i === 0 || matrix[i][j - 1] >= matrix[i - 1][j])) {
+            ops.push({ type: 'insert', oldLine: i, newLine: j, content: newLines[j - 1] });
+            j--;
+        } else {
+            ops.push({ type: 'delete', oldLine: i, newLine: j, content: oldLines[i - 1] });
+            i--;
+        }
+    }
+
+    return ops.reverse();
+}
+
+/**
+ * Diff two texts → operations + stats.
+ * @param {String} oldText
+ * @param {String} newText
+ * @returns {{ algorithm: string, operations: Array, stats: Object }}
+ */
+function diffText(oldText, newText) {
+    const oldLines = splitLines(oldText);
+    const newLines = splitLines(newText);
+    const operations = buildLineOperations(oldLines, newLines);
+    const stats = summarizeOperations(operations);
+    return { algorithm: 'lcs-line-v1', operations, stats };
+}
+
+/**
+ * Count insert/delete/equal ops.
+ * @param {Array} operations
+ * @returns {{insertions, deletions, unchanged, changes}}
+ */
+function summarizeOperations(operations) {
+    let insertions = 0, deletions = 0, unchanged = 0;
+    for (const op of operations) {
+        if (op.type === 'insert') insertions++;
+        else if (op.type === 'delete') deletions++;
+        else unchanged++;
+    }
+    return { insertions, deletions, unchanged, changes: insertions + deletions };
+}
+
+// ─── Hunk Generation ────────────────────────────────────
+
+/**
+ * Group diff ops into hunks with context lines (like git diff).
+ * @param {Array} ops - From buildLineOperations
+ * @param {Number} contextLines - Context around changes (default 3)
+ * @returns {Array<{oldStart, oldCount, newStart, newCount, lines: String[]}>}
+ */
+function generateHunks(ops, contextLines = 3) {
+    const changeIndices = [];
+    for (let i = 0; i < ops.length; i++) {
+        if (ops[i].type !== 'equal') changeIndices.push(i);
+    }
+    if (changeIndices.length === 0) return [];
+
+    // Group changes within contextLines*2 of each other
+    const groups = [];
+    let group = [changeIndices[0]];
+    for (let i = 1; i < changeIndices.length; i++) {
+        if (changeIndices[i] - changeIndices[i - 1] <= contextLines * 2 + 1) {
+            group.push(changeIndices[i]);
+        } else {
+            groups.push(group);
+            group = [changeIndices[i]];
+        }
+    }
+    groups.push(group);
+
+    const hunks = [];
+    for (const g of groups) {
+        const first = g[0];
+        const last = g[g.length - 1];
+        const start = Math.max(0, first - contextLines);
+        const end = Math.min(ops.length - 1, last + contextLines);
+
+        let oldLine = 0, newLine = 0;
+        for (let i = 0; i < start; i++) {
+            if (ops[i].type === 'equal' || ops[i].type === 'delete') oldLine++;
+            if (ops[i].type === 'equal' || ops[i].type === 'insert') newLine++;
+        }
+
+        const hunkOldStart = oldLine + 1;
+        const hunkNewStart = newLine + 1;
+        let hunkOldCount = 0, hunkNewCount = 0;
+        const lines = [];
+
+        for (let i = start; i <= end; i++) {
+            const op = ops[i];
+            if (op.type === 'equal') {
+                lines.push(` ${op.content}`);
+                hunkOldCount++; hunkNewCount++;
+            } else if (op.type === 'delete') {
+                lines.push(`-${op.content}`);
+                hunkOldCount++;
+            } else {
+                lines.push(`+${op.content}`);
+                hunkNewCount++;
+            }
+        }
+
+        hunks.push({ oldStart: hunkOldStart, oldCount: hunkOldCount, newStart: hunkNewStart, newCount: hunkNewCount, lines });
+    }
+    return hunks;
+}
+
+// ─── Unified Diff Format ────────────────────────────────
+
+/**
+ * Format as unified diff string (like `git diff`).
+ * @param {String} filePath
+ * @param {String} oldText
+ * @param {String} newText
+ * @returns {String}
+ */
+function formatUnifiedDiff(filePath, oldText, newText) {
+    const oldLines = splitLines(oldText);
+    const newLines = splitLines(newText);
+    const ops = buildLineOperations(oldLines, newLines);
+    const hunks = generateHunks(ops);
+    if (hunks.length === 0) return '';
+
+    const out = [`--- a/${filePath}`, `+++ b/${filePath}`];
+    for (const h of hunks) {
+        out.push(`@@ -${h.oldStart},${h.oldCount} +${h.newStart},${h.newCount} @@`);
+        out.push(...h.lines);
+    }
+    return out.join('\n');
+}
+
+// ─── Patch Application ──────────────────────────────────
+
+/**
+ * Apply operations to reconstruct target from source.
+ * @param {Array} ops
+ * @returns {String[]} Reconstructed lines
+ */
+function applyOperations(ops) {
+    const result = [];
+    for (const op of ops) {
+        if (op.type === 'equal' || op.type === 'insert') {
+            result.push(op.content);
+        }
+    }
+    return result;
+}
+
+module.exports = {
+    diffText,
+    summarizeOperations,
+    buildLcsMatrix,
+    buildLineOperations,
+    generateHunks,
+    formatUnifiedDiff,
+    applyOperations
+};

package/src/utils/fileSystem.js

@@ -5,7 +5,7 @@
 
 const fs = require('fs').promises;
 const path = require('path');
-const { GENT_DIR, DEFAULT_IGNORE_PATTERNS, IGNORE_FILE, OBJECTS_DIR } = require('./constants');
+const { GENT_DIR, DEFAULT_IGNORE_PATTERNS, IGNORE_FILE } = require('./constants');
 
 /**
  * Check if a path exists
@@ -113,31 +113,23 @@ async function getAllFiles(dir, ignorePatterns = []) {
  */
 function shouldIgnore(filePath, patterns) {
     const normalizedPath = filePath.replace(/\\/g, '/');
-    const segments = normalizedPath.split('/');
 
     for (const pattern of patterns) {
-        const normalizedPattern = pattern.replace(/\/$/, '');
-
-        // Check if any segment matches the pattern (for directory-level ignores like node_modules)
-        if (segments.some(segment => segment === normalizedPattern)) {
-            return true;
-        }
-
-        // Exact match or starts with pattern
-        if (normalizedPath === normalizedPattern || normalizedPath.startsWith(normalizedPattern + '/')) {
+        // Exact match
+        if (normalizedPath === pattern || normalizedPath.startsWith(pattern + '/')) {
             return true;
         }
 
         // Wildcard match
-        if (normalizedPattern.includes('*')) {
-            const regex = new RegExp('^' + normalizedPattern.replace(/\*/g, '.*') + '$');
+        if (pattern.includes('*')) {
+            const regex = new RegExp('^' + pattern.replace(/\*/g, '.*') + '$');
             if (regex.test(normalizedPath)) {
                 return true;
             }
         }
 
         // Extension match
-        if (normalizedPattern.startsWith('*.') && normalizedPath.endsWith(normalizedPattern.substring(1))) {
+        if (pattern.startsWith('*.') && normalizedPath.endsWith(pattern.substring(1))) {
             return true;
         }
     }
@@ -178,53 +170,11 @@ async function getTrackedFiles(gentPath, commitHash) {
     }
 
     const repository = await readJSON(path.join(gentPath, 'commits.json'));
-    const commit = repository.commits.find(c => c.sha === commitHash);
+    const commit = repository.commits.find(c => c.hash === commitHash);
 
     return commit ? commit.files : [];
 }
 
-/**
- * Get path to the objects directory
- * @returns {Promise<String>}
- */
-async function getObjectsPath() {
-    const gentPath = await getGentPath();
-    const objectsPath = path.join(gentPath, OBJECTS_DIR);
-    await ensureDir(objectsPath);
-    return objectsPath;
-}
-
-/**
- * Save file content as a blob
- * @param {String} content - File content
- * @param {String} hash - Content hash
- */
-async function saveBlob(content, hash) {
-    const objectsPath = await getObjectsPath();
-    const blobPath = path.join(objectsPath, hash);
-
-    // Only write if it doesn't exist (content-addressable, immutable)
-    if (!await pathExists(blobPath)) {
-        await fs.writeFile(blobPath, content, 'utf-8');
-    }
-}
-
-/**
- * Get file content from blob
- * @param {String} hash - Content hash
- * @returns {Promise<String>}
- */
-async function getBlob(hash) {
-    const objectsPath = await getObjectsPath();
-    const blobPath = path.join(objectsPath, hash);
-
-    if (!await pathExists(blobPath)) {
-        return ''; // Return empty string if blob missing (shouldn't happen in healthy repo)
-    }
-
-    return fs.readFile(blobPath, 'utf-8');
-}
-
 module.exports = {
     pathExists,
     ensureDir,
@@ -234,7 +184,5 @@ module.exports = {
     getAllFiles,
     shouldIgnore,
     getIgnorePatterns,
-    getTrackedFiles,
-    saveBlob,
-    getBlob
+    getTrackedFiles
 };