gent-cli 2.1.0 → 5.0.1

package/src/commands/remote.js

@@ -1,131 +1,115 @@
 /**
- * Remote Command - Manage remote repositories
- * Add, remove, and list remote repository configurations
+ * ============================================================================
+ * Remote Command - Manage remote repository connections
+ * ============================================================================
+ *
+ * PURPOSE:
+ *   Configure remote backend server URLs for push/pull. Like `git remote`.
+ *
+ * USAGE:
+ *   gent remote                        → List remotes
+ *   gent remote add <name> <url>       → Add a remote (e.g. origin)
+ *   gent remote remove <name>          → Remove a remote
+ *   gent remote set-url <name> <url>   → Update remote URL
+ *
+ * STORAGE:
+ *   Stored in .gent/config.json under "remotes" key:
+ *   { "origin": { "url": "https://gent-api.onrender.com/api/repos/my-repo/" } }
+ *
+ * BACKEND EXPECTATIONS:
+ *   The URL is the base endpoint for a repository resource:
+ *     GET  <url>/              → Repo metadata
+ *     POST <url>/push/         → Push commits/objects
+ *     GET  <url>/pull/         → Pull commits/objects
+ *     GET  <url>/refs/         → List remote branch refs
+ *
+ * ============================================================================
  */
 
-const chalk = require('chalk');
 const path = require('path');
-const ora = require('ora');
-const { getRemoteConfig, addRemote, removeRemote } = require('../utils/cloud-sync');
-const { GENT_DIR } = require('../utils/constants');
-const { pathExists } = require('../utils/fileSystem');
-const repoService = require('../services/repo-service');
-const authStorage = require('../utils/auth-storage');
+const chalk = require('chalk');
+const { getGentPath, readJSON, writeJSON } = require('../utils/fileSystem');
+const { CONFIG_FILE } = require('../utils/constants');
 
 /**
- * Manage remote repositories
- * @param {string} action - Action to perform (add, remove, or list)
- * @param {string} name - Remote name
- * @param {string} url - Remote URL (owner_id/repo_name)
- * @param {Object} options - Command options
+ * Manage remotes
+ * @param {String} subcommand - add|remove|set-url (null = list)
+ * @param {Array} args
+ * @param {Object} options
  */
-async function remote(action, name, url, options) {
+async function remote(subcommand, args, options) {
     try {
-        const cwd = process.cwd();
-        const gentPath = path.join(cwd, GENT_DIR);
-
-        // Check if in a gent repository
-        if (!(await pathExists(gentPath))) {
-            console.error(chalk.red('Error: Not a gent repository'));
-            console.log(chalk.yellow('Run'), chalk.cyan('gent init'), chalk.yellow('to initialize a repository'));
-            process.exit(1);
-        }
-
-        // List remotes (default action)
-        if (!action || action === 'list' || options.verbose) {
-            const config = await getRemoteConfig(cwd);
-            const remotes = Object.keys(config.remotes || {});
-
-            if (remotes.length === 0) {
-                console.log(chalk.yellow('No remotes configured'));
-                console.log(chalk.gray('Add a remote with:'), chalk.cyan('gent remote add <name> <owner_id>/<repo_name>'));
-                return;
-            }
-
-            console.log(chalk.cyan('Configured remotes:\n'));
-            for (const remoteName of remotes) {
-                const remote = config.remotes[remoteName];
-                if (options.verbose) {
-                    console.log(chalk.bold(remoteName));
-                    console.log(chalk.gray(`  Owner ID: ${remote.owner_id}`));
-                    console.log(chalk.gray(`  Repository: ${remote.repo_name}`));
-                    console.log(chalk.gray(`  URL: ${remote.owner_id}/${remote.repo_name}\n`));
-                } else {
-                    console.log(`${remoteName}\t${remote.owner_id}/${remote.repo_name}`);
+        const gentPath = await getGentPath();
+        const configPath = path.join(gentPath, CONFIG_FILE);
+        const config = await readJSON(configPath);
+        config.remotes = config.remotes || {};
+
+        switch (subcommand) {
+            case 'add': {
+                const [name, url] = args || [];
+                if (!name || !url) {
+                    console.error(chalk.red('Usage: gent remote add <name> <url>'));
+                    return;
                 }
+                if (config.remotes[name]) {
+                    console.error(chalk.red(`Remote '${name}' already exists`));
+                    return;
+                }
+                config.remotes[name] = { url };
+                await writeJSON(configPath, config);
+                console.log(chalk.green(`Added remote '${name}' → ${url}`));
+                break;
             }
-            return;
-        }
-
-        // Add remote
-        if (action === 'add') {
-            if (!name || !url) {
-                console.error(chalk.red('Error: Remote name and URL are required'));
-                console.log(chalk.yellow('Usage:'), chalk.cyan('gent remote add <name> <owner_id>/<repo_name>'));
-                process.exit(1);
-            }
-
-            // Parse owner_id/repo_name
-            const parts = url.split('/');
-            if (parts.length !== 2) {
-                console.error(chalk.red('Error: Invalid remote URL format'));
-                console.log(chalk.yellow('Expected:'), chalk.cyan('<owner_id>/<repo_name>'));
-                process.exit(1);
-            }
-
-            const ownerId = parseInt(parts[0]);
-            const repoName = parts[1];
-
-            if (isNaN(ownerId)) {
-                console.error(chalk.red('Error: Owner ID must be a number'));
-                process.exit(1);
-            }
-
-            // Check authentication
-            const user = await authStorage.getUser();
-            if (!user) {
-                console.error(chalk.red('Error: You must be logged in to add a remote'));
-                console.log(chalk.yellow('Run'), chalk.cyan('gent login'), chalk.yellow('to authenticate'));
-                process.exit(1);
+            case 'remove': {
+                const name = args && args[0];
+                if (!name) {
+                    console.error(chalk.red('Usage: gent remote remove <name>'));
+                    return;
+                }
+                if (!config.remotes[name]) {
+                    console.error(chalk.red(`Remote '${name}' not found`));
+                    return;
+                }
+                delete config.remotes[name];
+                await writeJSON(configPath, config);
+                console.log(chalk.green(`Removed remote '${name}'`));
+                break;
             }
-
-            // Verify repository exists
-            const spinner = ora('Verifying repository...').start();
-            try {
-                await repoService.getRepository(ownerId, repoName);
-                spinner.succeed('Repository verified');
-            } catch (error) {
-                spinner.fail('Repository not found or access denied');
-                throw error;
+            case 'set-url': {
+                const [name, url] = args || [];
+                if (!name || !url) {
+                    console.error(chalk.red('Usage: gent remote set-url <name> <url>'));
+                    return;
+                }
+                if (!config.remotes[name]) {
+                    console.error(chalk.red(`Remote '${name}' not found`));
+                    return;
+                }
+                config.remotes[name].url = url;
+                await writeJSON(configPath, config);
+                console.log(chalk.green(`Updated '${name}' → ${url}`));
+                break;
             }
-
-            // Add remote
-            await addRemote(name, ownerId, repoName, cwd);
-            console.log(chalk.green(`✓ Remote '${name}' added: ${ownerId}/${repoName}`));
-            return;
-        }
-
-        // Remove remote
-        if (action === 'remove' || action === 'rm') {
-            if (!name) {
-                console.error(chalk.red('Error: Remote name is required'));
-                console.log(chalk.yellow('Usage:'), chalk.cyan('gent remote remove <name>'));
-                process.exit(1);
+            default: {
+                // List remotes
+                const names = Object.keys(config.remotes);
+                if (names.length === 0) {
+                    console.log(chalk.gray('No remotes configured'));
+                    console.log(chalk.yellow('Use "gent remote add origin <url>" to add one'));
+                    return;
+                }
+                for (const name of names) {
+                    const verbose = options.verbose ? chalk.gray(` → ${config.remotes[name].url}`) : '';
+                    console.log(chalk.cyan(name) + verbose);
+                }
             }
-
-            await removeRemote(name, cwd);
-            console.log(chalk.green(`✓ Remote '${name}' removed`));
-            return;
         }
-
-        // Unknown action
-        console.error(chalk.red(`Error: Unknown action '${action}'`));
-        console.log(chalk.yellow('Available actions:'), chalk.cyan('add, remove, list'));
-        process.exit(1);
-
     } catch (error) {
-        console.error(chalk.red('Failed to manage remote'));
-        console.error(chalk.red('Error:'), error.message);
+        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);
     }
 }

package/src/commands/reset.js

@@ -0,0 +1,149 @@
+/**
+ * ============================================================================
+ * Reset Command - Unstage files or reset HEAD to a previous commit
+ * ============================================================================
+ *
+ * PURPOSE:
+ *   Undo staging (soft) or move branch pointer back (hard). Like `git reset`.
+ *
+ * USAGE:
+ *   gent reset <file...>       → Unstage specific file(s) (keep working tree)
+ *   gent reset                 → Unstage all files
+ *   gent reset --hard <hash>   → Move HEAD to commit, discard changes
+ *   gent reset --soft <hash>   → Move HEAD to commit, keep staging
+ *
+ * ALGORITHM:
+ *   Soft: removes entries from staging.entries matching given paths.
+ *   Hard: resets commits.json branch pointer + restores working tree blobs.
+ *
+ * BACKEND EXPECTATIONS:
+ *   POST /api/repos/:id/reset/ { mode, targetHash }
+ *   Backend should update remote HEAD and prune unreachable commits.
+ *
+ * ============================================================================
+ */
+
+const fs = require('fs').promises;
+const path = require('path');
+const chalk = require('chalk');
+const ora = require('ora');
+const { getGentPath, readJSON, writeJSON, pathExists } = require('../utils/fileSystem');
+const { STAGING_FILE, COMMITS_FILE } = require('../utils/constants');
+const { readBlobAsString } = require('../utils/hash-engine');
+
+/**
+ * Reset staging or HEAD
+ * @param {Array} files - Files to unstage (empty = all)
+ * @param {Object} options
+ */
+async function reset(files, options) {
+    try {
+        const gentPath = await getGentPath();
+        const cwd = process.cwd();
+
+        if (options.hard || options.soft) {
+            await resetHead(gentPath, cwd, files, options);
+        } else {
+            await unstageFiles(gentPath, files);
+        }
+    } 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);
+    }
+}
+
+/**
+ * Unstage files from staging area
+ */
+async function unstageFiles(gentPath, files) {
+    const stagingPath = path.join(gentPath, STAGING_FILE);
+    const staging = await readJSON(stagingPath);
+
+    if (!staging.entries || staging.entries.length === 0) {
+        console.log(chalk.yellow('Nothing to unstage'));
+        return;
+    }
+
+    let removed = 0;
+
+    if (!files || files.length === 0) {
+        removed = staging.entries.length;
+        staging.entries = [];
+        staging.files = [];
+    } else {
+        const removeSet = new Set(files);
+        const before = staging.entries.length;
+        staging.entries = staging.entries.filter(e => !removeSet.has(e.path));
+        staging.files = staging.entries.map(e => e.path);
+        removed = before - staging.entries.length;
+    }
+
+    await writeJSON(stagingPath, staging);
+    console.log(chalk.green(`Unstaged ${removed} file(s)`));
+}
+
+/**
+ * Reset HEAD to specific commit
+ */
+async function resetHead(gentPath, cwd, args, options) {
+    const targetHash = args && args.length > 0 ? args[0] : null;
+    const repository = await readJSON(path.join(gentPath, COMMITS_FILE));
+    const currentBranch = repository.currentBranch;
+    const commits = repository.commits || [];
+
+    if (!targetHash) {
+        console.error(chalk.red('Provide a commit hash to reset to'));
+        return;
+    }
+
+    // Find target commit (support short hashes)
+    const target = commits.find(c =>
+        c.hash === targetHash || c.hash.startsWith(targetHash)
+    );
+
+    if (!target) {
+        console.error(chalk.red(`Commit '${targetHash}' not found`));
+        return;
+    }
+
+    const spinner = ora(`Resetting to ${target.hash.substring(0, 7)}...`).start();
+
+    // Move branch pointer
+    repository.branches[currentBranch] = target.hash;
+    await writeJSON(path.join(gentPath, COMMITS_FILE), repository);
+
+    if (options.hard) {
+        // Restore working tree from target commit
+        const tree = target.tree || (target.files || []).map(f => ({
+            name: f.path || f.name, hash: f.hash
+        }));
+
+        for (const entry of tree) {
+            try {
+                const content = await readBlobAsString(gentPath, entry.hash);
+                const fullPath = path.join(cwd, entry.name || entry.path);
+                await fs.mkdir(path.dirname(fullPath), { recursive: true });
+                await fs.writeFile(fullPath, content, 'utf-8');
+            } catch {
+                // Blob may not exist for legacy commits
+            }
+        }
+
+        // Clear staging
+        const stagingPath = path.join(gentPath, STAGING_FILE);
+        await writeJSON(stagingPath, { entries: [], files: [] });
+
+        spinner.succeed(chalk.green(`HEAD is now at ${target.hash.substring(0, 7)} (hard reset)`));
+        console.log(chalk.gray(`  ${target.message}`));
+    } else {
+        // Soft reset: keep staging
+        spinner.succeed(chalk.green(`HEAD is now at ${target.hash.substring(0, 7)} (soft reset)`));
+        console.log(chalk.gray(`  Staging area preserved. ${target.message}`));
+    }
+}
+
+module.exports = reset;

package/src/commands/rm.js

@@ -0,0 +1,85 @@
+/**
+ * ============================================================================
+ * Rm Command - Remove files from working tree and staging
+ * ============================================================================
+ *
+ * PURPOSE:
+ *   Remove files from tracking and optionally from disk. Like `git rm`.
+ *
+ * USAGE:
+ *   gent rm <file...>          → Remove file(s) from tracking + disk
+ *   gent rm --cached <file...> → Remove from staging only (keep on disk)
+ *
+ * ALGORITHM:
+ *   Adds a "deleted" entry to staging so commit records the removal.
+ *   Without --cached, also deletes the file from the filesystem.
+ *
+ * BACKEND EXPECTATIONS:
+ *   Deletion is recorded as absence in the commit tree. Backend removes
+ *   file entry from tree when processing the push.
+ *
+ * ============================================================================
+ */
+
+const fs = require('fs').promises;
+const path = require('path');
+const chalk = require('chalk');
+const { getGentPath, readJSON, writeJSON, pathExists } = require('../utils/fileSystem');
+const { STAGING_FILE } = require('../utils/constants');
+
+/**
+ * Remove files
+ * @param {Array} files
+ * @param {Object} options
+ */
+async function rm(files, options) {
+    try {
+        const gentPath = await getGentPath();
+        const cwd = process.cwd();
+        const stagingPath = path.join(gentPath, STAGING_FILE);
+        const staging = await readJSON(stagingPath);
+
+        const entries = staging.entries || [];
+        const entryMap = new Map(entries.map(e => [e.path, e]));
+        let removed = 0;
+
+        for (const file of files) {
+            const relPath = path.relative(cwd, path.resolve(cwd, file));
+
+            // Stage deletion
+            entryMap.set(relPath, {
+                path: relPath,
+                hash: null,
+                status: 'deleted',
+                binary: false,
+                stats: { insertions: 0, deletions: 0 }
+            });
+
+            // Delete from disk unless --cached
+            if (!options.cached) {
+                const fullPath = path.join(cwd, relPath);
+                if (await pathExists(fullPath)) {
+                    await fs.unlink(fullPath);
+                }
+            }
+
+            removed++;
+            console.log(chalk.red(`  rm ${relPath}`));
+        }
+
+        staging.entries = Array.from(entryMap.values());
+        staging.files = staging.entries.filter(e => e.status !== 'deleted').map(e => e.path);
+        await writeJSON(stagingPath, staging);
+
+        console.log(chalk.green(`\nRemoved ${removed} file(s)`));
+    } 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);
+    }
+}
+
+module.exports = rm;

package/src/commands/show.js

@@ -0,0 +1,167 @@
+/**
+ * ============================================================================
+ * Show Command - Show details of a commit, tag, or tree
+ * ============================================================================
+ *
+ * PURPOSE:
+ *   Display detailed information about a specific commit including author,
+ *   message, tree hash, parent, and full diff. Like `git show`.
+ *
+ * USAGE:
+ *   gent show                  → Show HEAD commit details with diff
+ *   gent show <hash>           → Show specific commit
+ *   gent show <tag>            → Show commit referenced by tag
+ *
+ * ALGORITHM:
+ *   Retrieves commit from commits.json, reads blob content from object store,
+ *   computes diff against parent commit's tree, and displays unified diff.
+ *
+ * BACKEND EXPECTATIONS:
+ *   GET /api/repos/:id/commits/:hash/ — returns commit object with tree
+ *
+ * ============================================================================
+ */
+
+const path = require('path');
+const chalk = require('chalk');
+const { getGentPath, readJSON } = require('../utils/fileSystem');
+const { COMMITS_FILE } = require('../utils/constants');
+const { readBlobAsString } = require('../utils/hash-engine');
+const { formatUnifiedDiff } = require('../utils/diff-engine');
+
+/**
+ * Show commit details
+ * @param {String} ref - Commit hash, tag name, or empty for HEAD
+ * @param {Object} options
+ */
+async function show(ref, options) {
+    try {
+        const gentPath = await getGentPath();
+        const repository = await readJSON(path.join(gentPath, COMMITS_FILE));
+        const commits = repository.commits || [];
+        const tags = repository.tags || {};
+
+        let targetHash = ref;
+
+        // Default to HEAD
+        if (!targetHash) {
+            targetHash = repository.branches[repository.currentBranch];
+            if (!targetHash) {
+                console.log(chalk.yellow('No commits yet'));
+                return;
+            }
+        }
+
+        // Resolve tag name → hash
+        if (tags[targetHash]) {
+            targetHash = tags[targetHash].hash;
+        }
+
+        // Find commit (support short hashes)
+        const commit = commits.find(c =>
+            c.hash === targetHash || c.hash.startsWith(targetHash)
+        );
+
+        if (!commit) {
+            console.error(chalk.red(`Commit '${ref || 'HEAD'}' not found`));
+            return;
+        }
+
+        // Display commit header
+        console.log(chalk.yellow(`commit ${commit.hash}`));
+        if (commit.mergeParent) {
+            console.log(chalk.gray(`Merge: ${commit.parent?.substring(0, 7)} ${commit.mergeParent.substring(0, 7)}`));
+        }
+        console.log(chalk.white(`Author: ${commit.author.name} <${commit.author.email}>`));
+        console.log(chalk.white(`Date:   ${new Date(commit.timestamp).toLocaleString()}`));
+        if (commit.treeHash) {
+            console.log(chalk.gray(`Tree:   ${commit.treeHash.substring(0, 7)}`));
+        }
+        console.log('');
+        console.log(chalk.white(`    ${commit.message}`));
+        console.log('');
+
+        if (commit.stats) {
+            console.log(chalk.gray(`    ${commit.stats.filesChanged} file(s), `) +
+                chalk.green(`+${commit.stats.insertions}`) + ' ' +
+                chalk.red(`-${commit.stats.deletions}`));
+            console.log('');
+        }
+
+        // Show diff against parent
+        if (!options.noPatch) {
+            await showCommitDiff(gentPath, commits, commit);
+        }
+
+    } 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);
+    }
+}
+
+/**
+ * Display diff between commit and its parent
+ */
+async function showCommitDiff(gentPath, commits, commit) {
+    const parentCommit = commit.parent
+        ? commits.find(c => c.hash === commit.parent)
+        : null;
+
+    const currentTree = commit.tree || (commit.files || []).map(f => ({
+        name: f.path || f.name, hash: f.hash
+    }));
+    const parentTree = parentCommit
+        ? (parentCommit.tree || (parentCommit.files || []).map(f => ({
+            name: f.path || f.name, hash: f.hash
+        })))
+        : [];
+
+    const parentMap = new Map(parentTree.map(f => [f.name || f.path, f.hash]));
+    const currentMap = new Map(currentTree.map(f => [f.name || f.path, f.hash]));
+
+    // Files changed
+    const allPaths = new Set([...parentMap.keys(), ...currentMap.keys()]);
+
+    for (const filePath of allPaths) {
+        const oldHash = parentMap.get(filePath);
+        const newHash = currentMap.get(filePath);
+
+        if (oldHash === newHash) continue;
+
+        try {
+            const oldContent = oldHash ? await readBlobAsString(gentPath, oldHash) : '';
+            const newContent = newHash ? await readBlobAsString(gentPath, newHash) : '';
+
+            const unified = formatUnifiedDiff(filePath, oldContent, newContent);
+            if (unified) {
+                printColorizedDiff(unified);
+            }
+        } catch {
+            // Blob missing for legacy commits
+            if (!oldHash && newHash) {
+                console.log(chalk.green(`+ new file: ${filePath}`));
+            } else if (oldHash && !newHash) {
+                console.log(chalk.red(`- deleted: ${filePath}`));
+            } else {
+                console.log(chalk.yellow(`~ modified: ${filePath} (blob not available)`));
+            }
+        }
+    }
+}
+
+function printColorizedDiff(unifiedDiff) {
+    for (const line of unifiedDiff.split('\n')) {
+        if (line.startsWith('---') || line.startsWith('+++')) console.log(chalk.bold(line));
+        else if (line.startsWith('@@')) console.log(chalk.cyan(line));
+        else if (line.startsWith('+')) console.log(chalk.green(line));
+        else if (line.startsWith('-')) console.log(chalk.red(line));
+        else console.log(line);
+    }
+    console.log('');
+}
+
+module.exports = show;