gent-cli 2.0.0 → 5.0.0

package/src/commands/push.js

@@ -1,113 +1,206 @@
 /**
- * Push Command - Push local commits to cloud repository
- * Uploads commits, trees, and blobs to the cloud
+ * ============================================================================
+ * Push Command - Upload local commits and objects to remote
+ * ============================================================================
+ *
+ * PURPOSE:
+ *   Send local commits, blobs, and tree objects to the backend API server.
+ *   Like `git push`.
+ *
+ * USAGE:
+ *   gent push                          → Push current branch to origin
+ *   gent push <remote> <branch>        → Push specific branch to remote
+ *   gent push --force                  → Force push (overwrite remote)
+ *
+ * ALGORITHM:
+ *   1. Read local commits since last known remote HEAD
+ *   2. Collect all blob objects referenced by those commits
+ *   3. POST packfile (commits + blobs + trees) to remote /push/ endpoint
+ *   4. Remote updates branch pointer
+ *
+ * DATA FORMAT SENT TO BACKEND:
+ *   POST /api/repos/:id/push/
+ *   {
+ *     branch: "main",
+ *     force: false,
+ *     commits: [ { hash, message, author, timestamp, parent, treeHash, tree, files, stats } ],
+ *     objects: [ { hash, type: "blob", data: "<base64>" } ],
+ *     tags: { "v1.0": { hash, message, ... } }
+ *   }
+ *
+ * BACKEND EXPECTATIONS:
+ *   - Validate auth (JWT Bearer token)
+ *   - Verify fast-forward (reject non-ff unless force=true)
+ *   - Store blob objects in backend object store
+ *   - Append commits to branch history
+ *   - Update branch refs
+ *   - Return { success, ref, hash }
+ *
+ * ============================================================================
  */
 
-const chalk = require('chalk');
+const fs = require('fs').promises;
 const path = require('path');
+const chalk = require('chalk');
 const ora = require('ora');
-const { pathExists, readJSON } = require('../utils/fileSystem');
-const { GENT_DIR, COMMITS_FILE } = require('../utils/constants');
-const { getRemote, syncCommitsToCloud } = require('../utils/cloud-sync');
+const { getGentPath, readJSON, writeJSON } = require('../utils/fileSystem');
+const { COMMITS_FILE, CONFIG_FILE } = require('../utils/constants');
+const apiClient = require('../utils/api-client');
 const authStorage = require('../utils/auth-storage');
-const repoService = require('../services/repo-service');
+const { readBlob, objectExists } = require('../utils/hash-engine');
 
 /**
- * Push local commits to cloud
- * @param {string} remoteName - Remote name (default: origin)
- * @param {string} branchName - Branch name (optional)
- * @param {Object} options - Command options
+ * Push commits to remote
+ * @param {String} remoteName
+ * @param {String} branchName
+ * @param {Object} options
  */
 async function push(remoteName, branchName, 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);
-        }
-
-        // Check authentication
-        const user = await authStorage.getUser();
-        if (!user) {
-            console.error(chalk.red('Error: You must be logged in to push'));
-            console.log(chalk.yellow('Run'), chalk.cyan('gent login'), chalk.yellow('to authenticate'));
-            process.exit(1);
-        }
+    const spinner = ora('Preparing push...').start();
 
-        // Default to 'origin' if no remote specified
-        remoteName = remoteName || 'origin';
-
-        // Get remote configuration
-        const remote = await getRemote(remoteName, cwd);
-        if (!remote) {
-            console.error(chalk.red(`Error: Remote '${remoteName}' not found`));
-            console.log(chalk.yellow('Add a remote with:'), chalk.cyan('gent remote add origin <owner_id>/<repo_name>'));
-            console.log(chalk.yellow('Or list remotes with:'), chalk.cyan('gent remote'));
-            process.exit(1);
+    try {
+        // Auth check
+        const isAuth = await authStorage.isAuthenticated();
+        if (!isAuth) {
+            spinner.fail(chalk.red('Not authenticated'));
+            console.log(chalk.yellow('Run "gent login" first'));
+            return;
         }
 
-        // Get current branch if not specified
-        const commitsData = await readJSON(path.join(gentPath, COMMITS_FILE));
-        branchName = branchName || commitsData.currentBranch;
-
-        if (!branchName) {
-            console.error(chalk.red('Error: No branch specified and no current branch found'));
-            process.exit(1);
+        const gentPath = await getGentPath();
+        const configPath = path.join(gentPath, CONFIG_FILE);
+        const config = await readJSON(configPath);
+        config.remotes = config.remotes || {};
+
+        // Resolve remote
+        const remote = remoteName || 'origin';
+        const remoteConfig = config.remotes[remote];
+        if (!remoteConfig) {
+            spinner.fail(chalk.red(`Remote '${remote}' not found`));
+            console.log(chalk.yellow('Use "gent remote add origin <url>" to configure'));
+            return;
         }
 
-        // Get commits for the branch
-        const commits = commitsData.commits || [];
-        const branchCommitSha = commitsData.branches[branchName];
+        const repository = await readJSON(path.join(gentPath, COMMITS_FILE));
+        const branch = branchName || repository.currentBranch;
+        const localHead = repository.branches[branch];
 
-        if (!branchCommitSha) {
-            console.error(chalk.red(`Error: Branch '${branchName}' not found`));
-            process.exit(1);
+        if (!localHead) {
+            spinner.fail(chalk.red(`Branch '${branch}' has no commits`));
+            return;
         }
 
-        // Get commits to push (find all commits in the branch)
-        const commitsToPush = [];
-        let currentSha = branchCommitSha;
-
-        while (currentSha) {
-            const commit = commits.find(c => (c.sha || c.hash) === currentSha);
-            if (!commit) break;
-
-            commitsToPush.unshift(commit); // Add to beginning to maintain order
-            const parents = Array.isArray(commit.parent) ? commit.parent : (commit.parent ? [commit.parent] : []);
-            currentSha = parents.length > 0 ? parents[0] : null;
-        }
+        // Determine which commits to push (since last pushed ref)
+        config.remoteRefs = config.remoteRefs || {};
+        const lastPushed = config.remoteRefs[`${remote}/${branch}`] || null;
+        const commits = repository.commits || [];
+        const commitsToPush = getCommitsSince(commits, localHead, lastPushed);
 
         if (commitsToPush.length === 0) {
-            console.log(chalk.yellow('Nothing to push'));
+            spinner.succeed(chalk.green('Everything up-to-date'));
             return;
         }
 
-        console.log(chalk.cyan(`Pushing ${commitsToPush.length} commit(s) to ${remoteName}/${branchName}...`));
+        spinner.text = `Pushing ${commitsToPush.length} commit(s) to ${remote}/${branch}...`;
 
-        // Verify repository exists
-        const spinner = ora('Verifying remote repository...').start();
-        try {
-            await repoService.getRepository(remote.owner_id, remote.repo_name);
-            spinner.succeed('Remote repository verified');
-        } catch (error) {
-            spinner.fail('Remote repository not found or access denied');
-            throw error;
+        // Collect all blob hashes from commits to push
+        const blobHashes = new Set();
+        for (const commit of commitsToPush) {
+            const tree = commit.tree || commit.files || [];
+            for (const entry of tree) {
+                const h = entry.hash;
+                if (h) blobHashes.add(h);
+            }
         }
 
-        // Push commits
-        await syncCommitsToCloud(commitsToPush, remote.owner_id, remote.repo_name, branchName, cwd);
+        // Read blob data for transfer
+        const objects = [];
+        for (const hash of blobHashes) {
+            try {
+                if (await objectExists(gentPath, hash)) {
+                    const data = await readBlob(gentPath, hash);
+                    objects.push({
+                        hash,
+                        type: 'blob',
+                        data: data.toString('base64')
+                    });
+                }
+            } catch {
+                // Skip missing blobs
+            }
+        }
 
-        console.log(chalk.green(`\n✓ Successfully pushed to ${remoteName}/${branchName}`));
+        // Build push payload
+        const payload = {
+            branch,
+            force: !!options.force,
+            commits: commitsToPush.map(c => ({
+                hash: c.hash,
+                message: c.message,
+                author: c.author,
+                timestamp: c.timestamp,
+                parent: c.parent,
+                mergeParent: c.mergeParent || null,
+                treeHash: c.treeHash || null,
+                tree: c.tree || null,
+                files: c.files || [],
+                stats: c.stats || {}
+            })),
+            objects,
+            tags: repository.tags || {}
+        };
+
+        // Send to backend
+        const response = await apiClient.post(
+            `${remoteConfig.url}/push/`,
+            payload
+        );
+
+        // Update remote ref
+        config.remoteRefs[`${remote}/${branch}`] = localHead;
+        await writeJSON(configPath, config);
+
+        spinner.succeed(chalk.green(`Pushed ${commitsToPush.length} commit(s) to ${remote}/${branch}`));
+        console.log(chalk.gray(`  ${localHead.substring(0, 7)} → ${remote}/${branch}`));
+        console.log(chalk.gray(`  ${objects.length} object(s) transferred`));
 
     } catch (error) {
-        console.error(chalk.red('Failed to push'));
-        console.error(chalk.red('Error:'), error.message);
+        spinner.fail(chalk.red('Push failed'));
+
+        if (error.response?.status === 409) {
+            console.error(chalk.red('Remote has changes you don\'t have locally'));
+            console.log(chalk.yellow('Run "gent pull" first, or use "gent push --force"'));
+        } else if (error.response?.status === 401) {
+            console.error(chalk.red('Authentication failed — run "gent login"'));
+        } else if (error.response?.data?.message) {
+            console.error(chalk.red(error.response.data.message));
+        } else {
+            console.error(chalk.red('Error:'), error.message);
+        }
         process.exit(1);
     }
 }
 
+/**
+ * Get commits from tip back to (but excluding) stopHash.
+ * @param {Array} allCommits
+ * @param {String} tipHash
+ * @param {String|null} stopHash
+ * @returns {Array}
+ */
+function getCommitsSince(allCommits, tipHash, stopHash) {
+    const commitMap = new Map(allCommits.map(c => [c.hash, c]));
+    const result = [];
+    let current = tipHash;
+
+    while (current && current !== stopHash) {
+        const commit = commitMap.get(current);
+        if (!commit) break;
+        result.push(commit);
+        current = commit.parent;
+    }
+
+    return result.reverse(); // oldest first
+}
+
 module.exports = push;

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;