gent-cli 1.7.0 → 1.9.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gent-cli",
-  "version": "1.7.0",
+  "version": "1.9.0",
   "description": "A modern, Git-like version control CLI with built-in cloud authentication and global user identity management.",
   "main": "src/index.js",
   "bin": {

package/src/commands/commit.js

@@ -82,21 +82,22 @@ async function commit(options) {
 
         // Create commit object
         const commit = {
-            hash: generateCommitHash(),
+            sha: generateCommitHash(),
             message: message,
             author: {
                 name: authorName,
                 email: authorEmail
             },
             timestamp: new Date().toISOString(),
-            parent: repository.branches[repository.currentBranch] || null,
+            parent: repository.branches[repository.currentBranch] ? [repository.branches[repository.currentBranch]] : [],
             files: []
         };
 
         // Create a map of parent files for quick lookup
         const parentFilesMap = new Map();
-        if (commit.parent) {
-            const parentCommit = repository.commits.find(c => c.hash === commit.parent);
+        if (commit.parent && commit.parent.length > 0) {
+            const parentSha = commit.parent[0];
+            const parentCommit = repository.commits.find(c => c.sha === parentSha);
             if (parentCommit) {
                 parentCommit.files.forEach(f => parentFilesMap.set(f.path, f.hash));
             }
@@ -140,7 +141,7 @@ async function commit(options) {
         // Add commit to repository
         repository.commits = repository.commits || [];
         repository.commits.push(commit);
-        repository.branches[repository.currentBranch] = commit.hash;
+        repository.branches[repository.currentBranch] = commit.sha;
 
         // Save repository and clear staging
         await writeJSON(path.join(gentPath, COMMITS_FILE), repository);
@@ -150,7 +151,7 @@ async function commit(options) {
         spinner.succeed(chalk.green('✓ Changes committed successfully!'));
 
         // Display commit info
-        console.log(chalk.cyan(`\n[${repository.currentBranch} ${commit.hash.substring(0, 7)}] ${message}`));
+        console.log(chalk.cyan(`\n[${repository.currentBranch} ${commit.sha.substring(0, 7)}] ${message}`));
         console.log(chalk.gray(`Author: ${commit.author.name} <${commit.author.email}>`));
         console.log(chalk.gray(`Date: ${new Date(commit.timestamp).toLocaleString()}`));
         console.log(chalk.gray(`\n${commit.files.length} file(s) changed`));

package/src/commands/log.js

@@ -55,10 +55,10 @@ function displayDetailedLog(commits, currentCommitHash, currentBranch) {
     console.log(chalk.bold.cyan(`\nCommit History (${currentBranch} branch):\n`));
 
     commits.forEach((commit, index) => {
-        const isHead = commit.hash === currentCommitHash;
+        const isHead = commit.sha === currentCommitHash;
         const headLabel = isHead ? chalk.yellow.bold(' (HEAD)') : '';
 
-        console.log(chalk.yellow(`commit ${commit.hash}`) + headLabel);
+        console.log(chalk.yellow(`commit ${commit.sha}`) + headLabel);
         console.log(chalk.white(`Author: ${commit.author.name} <${commit.author.email}>`));
         console.log(chalk.white(`Date:   ${new Date(commit.timestamp).toLocaleString()}`));
         console.log(chalk.gray(`        (${formatDistanceToNow(new Date(commit.timestamp), { addSuffix: true })})`));
@@ -79,9 +79,9 @@ function displayDetailedLog(commits, currentCommitHash, currentBranch) {
  */
 function displayOnelineLog(commits, currentCommitHash) {
     commits.forEach(commit => {
-        const isHead = commit.hash === currentCommitHash;
+        const isHead = commit.sha === currentCommitHash;
         const headLabel = isHead ? chalk.yellow(' (HEAD)') : '';
-        const shortHash = chalk.yellow(commit.hash.substring(0, 7));
+        const shortHash = chalk.yellow(commit.sha.substring(0, 7));
         const message = chalk.white(commit.message);
         const timeAgo = chalk.gray(`(${formatDistanceToNow(new Date(commit.timestamp), { addSuffix: true })})`);
 

package/src/commands/pull.js

@@ -92,7 +92,7 @@ async function pull(remoteName, branchName, options) {
                     },
                     timestamp: cloudCommit.committed_at,
                     parent: cloudCommit.parent_shas || [],
-                    files: {} // Files are stored in objects directory
+                    files: cloudCommit.files || []
                 });
             }
         }

package/src/commands/push.js

@@ -73,11 +73,12 @@ async function push(remoteName, branchName, options) {
         let currentSha = branchCommitSha;
 
         while (currentSha) {
-            const commit = commits.find(c => c.sha === currentSha);
+            const commit = commits.find(c => (c.sha || c.hash) === currentSha);
             if (!commit) break;
 
             commitsToPush.unshift(commit); // Add to beginning to maintain order
-            currentSha = commit.parent ? commit.parent[0] : null;
+            const parents = Array.isArray(commit.parent) ? commit.parent : (commit.parent ? [commit.parent] : []);
+            currentSha = parents.length > 0 ? parents[0] : null;
         }
 
         if (commitsToPush.length === 0) {

package/src/services/repo-service.js

@@ -58,12 +58,12 @@ async function listRepositories() {
 /**
  * Get repository details
  * @param {number} ownerId - Owner user ID
- * @param {string} repoName - Repository name
+ * @param {string} projectName - Project name
  * @returns {Promise<Object>} Repository data
  */
-async function getRepository(ownerId, repoName) {
+async function getRepository(ownerId, projectName) {
     try {
-        const url = buildUrl(API_ENDPOINTS.REPOS_GET, { owner_id: ownerId, repo_name: repoName });
+        const url = buildUrl(API_ENDPOINTS.REPOS_GET, { owner_id: ownerId, project_name: projectName });
         const response = await apiClient.get(url);
         return response;
     } catch (error) {
@@ -74,12 +74,12 @@ async function getRepository(ownerId, repoName) {
 /**
  * Delete a repository
  * @param {number} ownerId - Owner user ID
- * @param {string} repoName - Repository name
+ * @param {string} projectName - Project name
  * @returns {Promise<Object>} Delete response
  */
-async function deleteRepository(ownerId, repoName) {
+async function deleteRepository(ownerId, projectName) {
     try {
-        const url = buildUrl(API_ENDPOINTS.REPOS_DELETE, { owner_id: ownerId, repo_name: repoName });
+        const url = buildUrl(API_ENDPOINTS.REPOS_DELETE, { owner_id: ownerId, project_name: projectName });
         const response = await apiClient.delete(url);
         return response;
     } catch (error) {
@@ -90,14 +90,14 @@ async function deleteRepository(ownerId, repoName) {
 /**
  * Create a blob (file content) in the repository
  * @param {number} ownerId - Owner user ID
- * @param {string} repoName - Repository name
+ * @param {string} projectName - Project name
  * @param {string} content - File content
  * @param {string} encoding - Encoding type (utf-8 or base64)
  * @returns {Promise<Object>} Created blob data
  */
-async function createBlob(ownerId, repoName, content, encoding = 'utf-8') {
+async function createBlob(ownerId, projectName, content, encoding = 'utf-8') {
     try {
-        const url = buildUrl(API_ENDPOINTS.BLOB_CREATE, { owner_id: ownerId, repo_name: repoName });
+        const url = buildUrl(API_ENDPOINTS.BLOB_CREATE, { owner_id: ownerId, project_name: projectName });
         const response = await apiClient.post(url, {
             content,
             encoding
@@ -111,13 +111,13 @@ async function createBlob(ownerId, repoName, content, encoding = 'utf-8') {
 /**
  * Get a blob by SHA
  * @param {number} ownerId - Owner user ID
- * @param {string} repoName - Repository name
+ * @param {string} projectName - Project name
  * @param {string} sha - Blob SHA
  * @returns {Promise<Object>} Blob data
  */
-async function getBlob(ownerId, repoName, sha) {
+async function getBlob(ownerId, projectName, sha) {
     try {
-        const url = buildUrl(API_ENDPOINTS.BLOB_GET, { owner_id: ownerId, repo_name: repoName, sha });
+        const url = buildUrl(API_ENDPOINTS.BLOB_GET, { owner_id: ownerId, project_name: projectName, sha });
         const response = await apiClient.get(url);
         return response;
     } catch (error) {
@@ -128,13 +128,13 @@ async function getBlob(ownerId, repoName, sha) {
 /**
  * Create a tree (directory structure) in the repository
  * @param {number} ownerId - Owner user ID
- * @param {string} repoName - Repository name
+ * @param {string} projectName - Project name
  * @param {Array} entries - Tree entries
  * @returns {Promise<Object>} Created tree data
  */
-async function createTree(ownerId, repoName, entries) {
+async function createTree(ownerId, projectName, entries) {
     try {
-        const url = buildUrl(API_ENDPOINTS.TREE_CREATE, { owner_id: ownerId, repo_name: repoName });
+        const url = buildUrl(API_ENDPOINTS.TREE_CREATE, { owner_id: ownerId, project_name: projectName });
         const response = await apiClient.post(url, {
             entries
         });
@@ -147,13 +147,13 @@ async function createTree(ownerId, repoName, entries) {
 /**
  * Get a tree by SHA
  * @param {number} ownerId - Owner user ID
- * @param {string} repoName - Repository name
+ * @param {string} projectName - Project name
  * @param {string} sha - Tree SHA
  * @returns {Promise<Object>} Tree data
  */
-async function getTree(ownerId, repoName, sha) {
+async function getTree(ownerId, projectName, sha) {
     try {
-        const url = buildUrl(API_ENDPOINTS.TREE_GET, { owner_id: ownerId, repo_name: repoName, sha });
+        const url = buildUrl(API_ENDPOINTS.TREE_GET, { owner_id: ownerId, project_name: projectName, sha });
         const response = await apiClient.get(url);
         return response;
     } catch (error) {
@@ -164,13 +164,13 @@ async function getTree(ownerId, repoName, sha) {
 /**
  * Create a commit in the repository
  * @param {number} ownerId - Owner user ID
- * @param {string} repoName - Repository name
+ * @param {string} projectName - Project name
  * @param {Object} commitData - Commit data (message, tree_sha, parent_shas, author_name, author_email, branch)
  * @returns {Promise<Object>} Created commit data
  */
-async function createCommit(ownerId, repoName, commitData) {
+async function createCommit(ownerId, projectName, commitData) {
     try {
-        const url = buildUrl(API_ENDPOINTS.COMMITS_CREATE, { owner_id: ownerId, repo_name: repoName });
+        const url = buildUrl(API_ENDPOINTS.COMMITS_CREATE, { owner_id: ownerId, project_name: projectName });
         const response = await apiClient.post(url, commitData);
         return response;
     } catch (error) {
@@ -181,12 +181,12 @@ async function createCommit(ownerId, repoName, commitData) {
 /**
  * List all commits in a repository
  * @param {number} ownerId - Owner user ID
- * @param {string} repoName - Repository name
+ * @param {string} projectName - Project name
  * @returns {Promise<Array>} List of commits
  */
-async function listCommits(ownerId, repoName) {
+async function listCommits(ownerId, projectName) {
     try {
-        const url = buildUrl(API_ENDPOINTS.COMMITS_LIST, { owner_id: ownerId, repo_name: repoName });
+        const url = buildUrl(API_ENDPOINTS.COMMITS_LIST, { owner_id: ownerId, project_name: projectName });
         const response = await apiClient.get(url);
         return response;
     } catch (error) {
@@ -197,13 +197,13 @@ async function listCommits(ownerId, repoName) {
 /**
  * Get a commit by SHA
  * @param {number} ownerId - Owner user ID
- * @param {string} repoName - Repository name
+ * @param {string} projectName - Project name
  * @param {string} sha - Commit SHA
  * @returns {Promise<Object>} Commit data
  */
-async function getCommit(ownerId, repoName, sha) {
+async function getCommit(ownerId, projectName, sha) {
     try {
-        const url = buildUrl(API_ENDPOINTS.COMMITS_GET, { owner_id: ownerId, repo_name: repoName, sha });
+        const url = buildUrl(API_ENDPOINTS.COMMITS_GET, { owner_id: ownerId, project_name: projectName, sha });
         const response = await apiClient.get(url);
         return response;
     } catch (error) {
@@ -214,14 +214,14 @@ async function getCommit(ownerId, repoName, sha) {
 /**
  * Create a branch in the repository
  * @param {number} ownerId - Owner user ID
- * @param {string} repoName - Repository name
+ * @param {string} projectName - Project name
  * @param {string} branchName - Branch name
  * @param {string} commitSha - Commit SHA to point the branch to
  * @returns {Promise<Object>} Created branch data
  */
-async function createBranch(ownerId, repoName, branchName, commitSha) {
+async function createBranch(ownerId, projectName, branchName, commitSha) {
     try {
-        const url = buildUrl(API_ENDPOINTS.BRANCHES_CREATE, { owner_id: ownerId, repo_name: repoName });
+        const url = buildUrl(API_ENDPOINTS.BRANCHES_CREATE, { owner_id: ownerId, project_name: projectName });
         const response = await apiClient.post(url, {
             name: branchName,
             commit_sha: commitSha
@@ -235,12 +235,12 @@ async function createBranch(ownerId, repoName, branchName, commitSha) {
 /**
  * List all branches in a repository
  * @param {number} ownerId - Owner user ID
- * @param {string} repoName - Repository name
+ * @param {string} projectName - Project name
  * @returns {Promise<Array>} List of branches
  */
-async function listBranches(ownerId, repoName) {
+async function listBranches(ownerId, projectName) {
     try {
-        const url = buildUrl(API_ENDPOINTS.BRANCHES_LIST, { owner_id: ownerId, repo_name: repoName });
+        const url = buildUrl(API_ENDPOINTS.BRANCHES_LIST, { owner_id: ownerId, project_name: projectName });
         const response = await apiClient.get(url);
         return response;
     } catch (error) {
@@ -251,13 +251,13 @@ async function listBranches(ownerId, repoName) {
 /**
  * Get a branch by name
  * @param {number} ownerId - Owner user ID
- * @param {string} repoName - Repository name
+ * @param {string} projectName - Project name
  * @param {string} branchName - Branch name
  * @returns {Promise<Object>} Branch data
  */
-async function getBranch(ownerId, repoName, branchName) {
+async function getBranch(ownerId, projectName, branchName) {
     try {
-        const url = buildUrl(API_ENDPOINTS.BRANCHES_GET, { owner_id: ownerId, repo_name: repoName, branch_name: branchName });
+        const url = buildUrl(API_ENDPOINTS.BRANCHES_GET, { owner_id: ownerId, project_name: projectName, branch_name: branchName });
         const response = await apiClient.get(url);
         return response;
     } catch (error) {

package/src/utils/cloud-sync.js

@@ -125,7 +125,7 @@ async function uploadCommit(commit, treeSha, ownerId, repoName, branchName) {
         const commitData = {
             message: commit.message,
             tree_sha: treeSha,
-            parent_shas: commit.parent || [],
+            parent_shas: Array.isArray(commit.parent) ? commit.parent : (commit.parent ? [commit.parent] : []),
             author_name: commit.author.name,
             author_email: commit.author.email,
             branch: branchName
@@ -161,11 +161,12 @@ async function syncCommitsToCloud(commits, ownerId, repoName, branchName, cwd) {
 
         // Read files from commit
         const files = [];
-        for (const [filePath, fileSha] of Object.entries(commit.files || {})) {
-            const objectPath = path.join(cwd, GENT_DIR, OBJECTS_DIR, fileSha);
+        const commitFiles = Array.isArray(commit.files) ? commit.files : [];
+        for (const file of commitFiles) {
+            const objectPath = path.join(cwd, GENT_DIR, OBJECTS_DIR, file.hash);
             if (await pathExists(objectPath)) {
                 const content = await fs.readFile(objectPath, 'utf-8');
-                files.push({ path: filePath, content });
+                files.push({ path: file.path, content });
             }
         }
 
@@ -212,6 +213,12 @@ async function syncCommitsFromCloud(ownerId, repoName, cwd) {
             // Download tree
             const tree = await repoService.getTree(ownerId, repoName, commit.tree_sha);
 
+            // Store entries for local metadata
+            commit.files = tree.entries.map(entry => ({
+                path: entry.path,
+                hash: entry.sha
+            }));
+
             // Download blobs from tree entries
             const blobShas = tree.entries.map(entry => entry.sha);
             const blobMap = await downloadBlobs(blobShas, ownerId, repoName);

package/src/utils/constants.js

@@ -27,26 +27,26 @@ module.exports = {
         // Repository endpoints
         REPOS_LIST: '/api/repos/',
         REPOS_CREATE: '/api/repos/create/',
-        REPOS_GET: '/api/repos/{owner_id}/{repo_name}/',
-        REPOS_DELETE: '/api/repos/{owner_id}/{repo_name}/delete/',
+        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}/{repo_name}/blob/{sha}/',
-        BLOB_CREATE: '/api/repos/{owner_id}/{repo_name}/blob/create/',
+        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}/{repo_name}/tree/{sha}/',
-        TREE_CREATE: '/api/repos/{owner_id}/{repo_name}/tree/create/',
+        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}/{repo_name}/commits/',
-        COMMITS_GET: '/api/repos/{owner_id}/{repo_name}/commits/{sha}/',
-        COMMITS_CREATE: '/api/repos/{owner_id}/{repo_name}/commits/create/',
+        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}/{repo_name}/branches/',
-        BRANCHES_GET: '/api/repos/{owner_id}/{repo_name}/branches/{branch_name}/',
-        BRANCHES_CREATE: '/api/repos/{owner_id}/{repo_name}/branches/create/'
+        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/'
     },
 
     // Default ignore patterns

package/src/utils/fileSystem.js

@@ -170,7 +170,7 @@ async function getTrackedFiles(gentPath, commitHash) {
     }
 
     const repository = await readJSON(path.join(gentPath, 'commits.json'));
-    const commit = repository.commits.find(c => c.hash === commitHash);
+    const commit = repository.commits.find(c => c.sha === commitHash);
 
     return commit ? commit.files : [];
 }