gent-cli 1.8.0 → 2.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gent-cli",
-  "version": "1.8.0",
+  "version": "2.0.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/create.js

@@ -76,14 +76,17 @@ async function create(repoName, options) {
             'main'
         );
 
-        spinner.succeed(chalk.green(`Repository created: ${repository.name}`));
+        const ownerId = repository.owner_id || repository.owner?.id || repository.owner;
+        const name = repository.name || repository.project_name || repoName;
+
+        spinner.succeed(chalk.green(`Repository created: ${name}`));
 
         console.log(chalk.cyan('\nRepository Details:'));
-        console.log(chalk.gray('  Name:'), repository.name);
-        console.log(chalk.gray('  Owner:'), repository.owner_email);
+        console.log(chalk.gray('  Name:'), name);
+        console.log(chalk.gray('  Owner:'), ownerId);
         console.log(chalk.gray('  Private:'), repository.is_private ? 'Yes' : 'No');
         console.log(chalk.gray('  Description:'), repository.description || '(none)');
-        console.log(chalk.gray('  Created:'), new Date(repository.created_at).toLocaleString());
+        console.log(chalk.gray('  Created:'), new Date(repository.created_at || repository.created || new Date()).toLocaleString());
 
         // Initialize local repository if requested
         if (options.initLocal) {
@@ -96,7 +99,7 @@ async function create(repoName, options) {
             await ensureDir(path.join(gentPath, 'refs', 'heads'));
 
             // Add remote
-            await addRemote('origin', repository.owner_id, repository.name, cwd);
+            await addRemote('origin', ownerId, name, cwd);
 
             console.log(chalk.green('\n✓ Local repository initialized and remote added'));
             console.log(chalk.yellow('\nNext steps:'));

package/src/commands/init.js

@@ -127,8 +127,11 @@ node_modules/
                         'main'
                     );
 
-                    await addRemote('origin', repository.owner_id, repository.name, cwd);
-                    spinner.succeed(chalk.green(`Created cloud repository: ${repository.owner_id}/${repository.name}`));
+                    const ownerId = repository.owner_id || repository.owner?.id || repository.owner;
+                    const name = repository.name || repository.project_name || repoName;
+
+                    await addRemote('origin', ownerId, name, cwd);
+                    spinner.succeed(chalk.green(`Created cloud repository: ${ownerId}/${name}`));
                     console.log(chalk.gray(`Remote 'origin' added`));
                 } catch (error) {
                     console.log(chalk.red(`\nFailed to create cloud repository: ${error.message}`));

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

@@ -32,6 +32,7 @@ async function createRepository(name, description = '', isPrivate = false, defau
     try {
         const response = await apiClient.post(API_ENDPOINTS.REPOS_CREATE, {
             name,
+            project_name: name, // Add project_name as well for consistency
             description,
             is_private: isPrivate,
             default_branch: defaultBranch
@@ -58,12 +59,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 +75,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 +91,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 +112,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 +129,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 +148,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 +165,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 +182,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 +198,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 +215,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 +236,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 +252,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 });
             }
         }
 

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

@@ -113,23 +113,31 @@ async function getAllFiles(dir, ignorePatterns = []) {
  */
 function shouldIgnore(filePath, patterns) {
     const normalizedPath = filePath.replace(/\\/g, '/');
+    const segments = normalizedPath.split('/');
 
     for (const pattern of patterns) {
-        // Exact match
-        if (normalizedPath === pattern || normalizedPath.startsWith(pattern + '/')) {
+        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 + '/')) {
             return true;
         }
 
         // Wildcard match
-        if (pattern.includes('*')) {
-            const regex = new RegExp('^' + pattern.replace(/\*/g, '.*') + '$');
+        if (normalizedPattern.includes('*')) {
+            const regex = new RegExp('^' + normalizedPattern.replace(/\*/g, '.*') + '$');
             if (regex.test(normalizedPath)) {
                 return true;
             }
         }
 
         // Extension match
-        if (pattern.startsWith('*.') && normalizedPath.endsWith(pattern.substring(1))) {
+        if (normalizedPattern.startsWith('*.') && normalizedPath.endsWith(normalizedPattern.substring(1))) {
             return true;
         }
     }