gent-cli 10.0.0 → 11.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gent-cli",
-  "version": "10.0.0",
+  "version": "11.0.0",
   "description": "A modern, Git-like version control CLI with cloud sync, AI-powered superpowers (ask/review/docs/changelog), and zero-friction setup (gent setup/doctor/config).",
   "main": "src/index.js",
   "bin": {
@@ -8,8 +8,8 @@
   },
   "scripts": {
     "start": "node src/index.js",
-    "test": "node --check src/index.js && node --test tests/diff.test.js tests/merge.test.js tests/hash.test.js tests/merge-base.test.js && node tests/offline-e2e.js",
-    "test:unit": "node --test tests/diff.test.js tests/merge.test.js tests/hash.test.js tests/merge-base.test.js",
+    "test": "node --check src/index.js && node --test tests/diff.test.js tests/merge.test.js tests/hash.test.js tests/merge-base.test.js tests/file-system.test.js && node tests/offline-e2e.js",
+    "test:unit": "node --test tests/diff.test.js tests/merge.test.js tests/hash.test.js tests/merge-base.test.js tests/file-system.test.js",
     "test:e2e": "node tests/offline-e2e.js",
     "test:remote:e2e": "node tests/remote-e2e.js",
     "demo": "bash demo.sh",

package/src/utils/constants.js

@@ -92,6 +92,8 @@ module.exports = {
         '.gent',
         'node_modules',
         '.git',
+        '.gitignore',
+        '.gentignore',
         '.DS_Store',
         '*.log',
         '.env',

package/src/utils/fileSystem.js

@@ -7,6 +7,8 @@ const fs = require('fs').promises;
 const path = require('path');
 const { GENT_DIR, DEFAULT_IGNORE_PATTERNS, IGNORE_FILE } = require('./constants');
 
+const GIT_IGNORE_FILE = '.gitignore';
+
 /**
  * Check if a path exists
  * @param {String} path - Path to check
@@ -115,21 +117,35 @@ function shouldIgnore(filePath, patterns) {
     const normalizedPath = filePath.replace(/\\/g, '/');
 
     for (const pattern of patterns) {
+        const normalizedPattern = normalizeIgnorePattern(pattern);
+        if (!normalizedPattern) {
+            continue;
+        }
+
         // Exact match
-        if (normalizedPath === pattern || normalizedPath.startsWith(pattern + '/')) {
+        if (normalizedPath === normalizedPattern || normalizedPath.startsWith(normalizedPattern + '/')) {
             return true;
         }
 
+        // Basename match
+        if (!normalizedPattern.includes('/') && !normalizedPattern.includes('*')) {
+            const parts = normalizedPath.split('/');
+            if (parts.includes(normalizedPattern)) {
+                return true;
+            }
+        }
+
         // Wildcard match
-        if (pattern.includes('*')) {
-            const regex = new RegExp('^' + pattern.replace(/\*/g, '.*') + '$');
-            if (regex.test(normalizedPath)) {
+        if (normalizedPattern.includes('*')) {
+            const wildcardRegex = normalizedPattern.split('*').map(escapeRegex).join('.*');
+            const regex = new RegExp('^' + wildcardRegex + '$');
+            if (regex.test(normalizedPath) || regex.test(path.posix.basename(normalizedPath))) {
                 return true;
             }
         }
 
         // Extension match
-        if (pattern.startsWith('*.') && normalizedPath.endsWith(pattern.substring(1))) {
+        if (normalizedPattern.startsWith('*.') && normalizedPath.endsWith(normalizedPattern.substring(1))) {
             return true;
         }
     }
@@ -137,6 +153,56 @@ function shouldIgnore(filePath, patterns) {
     return false;
 }
 
+function normalizeIgnorePattern(pattern) {
+    return pattern
+        .replace(/\\/g, '/')
+        .replace(/^\.\//, '')
+        .replace(/^\/+/, '')
+        .replace(/\/+$/, '');
+}
+
+function escapeRegex(pattern) {
+    return pattern.replace(/[.+?^${}()|[\]\\]/g, '\\$&');
+}
+
+function parseIgnoreContent(content, basePath = '') {
+    return content.split('\n')
+        .map(line => line.trim())
+        .filter(line => line && !line.startsWith('#') && !line.startsWith('!'))
+        .map(line => normalizeIgnorePattern(path.posix.join(basePath, line)))
+        .filter(Boolean);
+}
+
+async function collectGitIgnorePatterns(rootDir, patterns) {
+    async function scan(currentDir) {
+        const entries = await fs.readdir(currentDir, { withFileTypes: true });
+        const relativeDir = path.relative(rootDir, currentDir).replace(/\\/g, '/');
+        const gitIgnore = entries.find(entry => entry.isFile() && entry.name === GIT_IGNORE_FILE);
+
+        if (gitIgnore) {
+            const ignorePath = path.join(currentDir, GIT_IGNORE_FILE);
+            const content = await fs.readFile(ignorePath, 'utf-8');
+            patterns.push(...parseIgnoreContent(content, relativeDir));
+        }
+
+        for (const entry of entries) {
+            if (!entry.isDirectory()) {
+                continue;
+            }
+
+            const fullPath = path.join(currentDir, entry.name);
+            const relativePath = path.relative(rootDir, fullPath);
+            if (shouldIgnore(relativePath, patterns)) {
+                continue;
+            }
+
+            await scan(fullPath);
+        }
+    }
+
+    await scan(rootDir);
+}
+
 /**
  * Get ignore patterns from .gentignore file
  * @param {String} dir - Directory to check
@@ -148,13 +214,11 @@ async function getIgnorePatterns(dir) {
 
     if (await pathExists(ignorePath)) {
         const content = await fs.readFile(ignorePath, 'utf-8');
-        const lines = content.split('\n')
-            .map(line => line.trim())
-            .filter(line => line && !line.startsWith('#'));
-
-        patterns.push(...lines);
+        patterns.push(...parseIgnoreContent(content));
     }
 
+    await collectGitIgnorePatterns(dir, patterns);
+
     return patterns;
 }