gent-cli 23.0.0 → 24.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gent-cli",
-  "version": "23.0.0",
+  "version": "24.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 tests/file-system.test.js tests/web-urls.test.js && node tests/offline-e2e.js && node --test tests/git-compat/engine.test.js tests/git-compat/cli.test.js tests/git-compat/transport.test.js tests/git-compat/migrate.test.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 tests/web-urls.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 tests/web-urls.test.js tests/repos.test.js && node tests/offline-e2e.js && node --test tests/git-compat/engine.test.js tests/git-compat/cli.test.js tests/git-compat/transport.test.js tests/git-compat/migrate.test.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 tests/web-urls.test.js tests/repos.test.js",
     "test:e2e": "node tests/offline-e2e.js",
     "test:remote:e2e": "node tests/remote-e2e.js",
     "demo": "bash demo.sh",

package/src/commands/canonical.js

@@ -3,6 +3,7 @@
  */
 const fs = require('fs').promises;
 const path = require('path');
+const inquirer = require('inquirer');
 const repository = require('../utils/repository');
 const ops = require('../utils/gent-ops');
 const merge = require('../utils/merge-ops');
@@ -13,6 +14,7 @@ const { GitIndex } = require('../utils/git-index');
 const { Lock } = require('../utils/lockfile');
 const { AttributesMatcher, looksBinary } = require('../utils/attributes');
 const { formatUnifiedDiff } = require('../utils/diff-engine');
+const ai = require('../utils/ai-service');
 
 async function locatedCanonical() {
     let found;
@@ -165,10 +167,58 @@ const handlers = {
             process.exitCode = 1;
         } else console.log(result.status);
     },
-    async resolve(repo) {
+    async resolve(repo, options = {}) {
         const index = await GitIndex.read(repo.indexPath);
-        for (const name of index.conflicts().keys()) console.log(name);
-        console.log('Edit conflicted files, then gent add <path> and gent merge --continue.');
+        const names = [...index.conflicts().keys()];
+        if (!names.length) {
+            console.log('No merge conflicts to resolve.');
+            return;
+        }
+        if (!options.ai) {
+            for (const name of names) console.log(name);
+            console.log('Edit conflicted files, then gent add <path> and gent merge --continue.');
+            return;
+        }
+
+        await ai.prime();
+        if (!ai.isEnabled()) throw new Error(ai.disabledHint());
+
+        let resolved = 0;
+        for (const name of names) {
+            const sides = await merge.conflictSides(repo, name);
+            if ([sides.base, sides.ours, sides.theirs].some(value => value && looksBinary(value))) {
+                console.log(`Skipping binary conflict: ${name}`);
+                continue;
+            }
+            try {
+                const suggestion = await ai.resolveConflictHunk({
+                    base: sides.base?.toString('utf8') || '',
+                    ours: sides.ours?.toString('utf8') || '',
+                    theirs: sides.theirs?.toString('utf8') || '',
+                    fileName: name,
+                });
+                console.log(`\nAI suggestion for ${name} (review before accepting):\n${suggestion}`);
+                const { accept } = await inquirer.prompt([{
+                    type: 'confirm',
+                    name: 'accept',
+                    message: `Apply and stage this resolution for ${name}?`,
+                    default: false,
+                }]);
+                if (!accept) continue;
+                worktree.assertSafeCheckoutPath(repo, name);
+                await worktree.assertNoSymlinkParent(repo, name);
+                const absolute = path.join(repo.worktree, name);
+                await fs.mkdir(path.dirname(absolute), { recursive: true });
+                await fs.writeFile(absolute, suggestion, 'utf8');
+                await merge.markResolved(repo, name);
+                resolved++;
+                console.log(`Resolved and staged ${name}`);
+            } catch (error) {
+                console.log(`AI did not resolve ${name}: ${error.message}`);
+            }
+        }
+        console.log(`${resolved} of ${names.length} conflict(s) resolved with reviewed AI suggestions.`);
+        console.log('Review and test the files, then run gent merge --continue.');
     },
     async stash(repo, sub = 'push', options = {}) {
         const position = Number(options.index || 0);

package/src/commands/repos.js

@@ -5,25 +5,50 @@
 const chalk = require('chalk');
 const ora = require('ora');
 const path = require('path');
-const { API_ENDPOINTS } = require('../utils/constants');
+const inquirer = require('inquirer');
+const { API_ENDPOINTS, GENT_DIR, CONFIG_FILE } = require('../utils/constants');
 const apiClient = require('../utils/api-client');
 const authStorage = require('../utils/auth-storage');
+const { pathExists, readJSON, writeJSON } = require('../utils/fileSystem');
+const interactive = require('../utils/interactive');
+const initCommand = require('./init');
+const repository = require('../utils/repository');
 
 /**
  * List or create remote repositories
  * @param {Object} options
  */
-async function repos(options) {
+async function repos(extraNames, options) {
     try {
+        options = options || {};
+        extraNames = extraNames || [];
+        let local = null;
+
+        if (options.create) {
+            const validation = validateRepositoryName(options.create, extraNames);
+            if (!validation.valid) {
+                console.error(chalk.red(validation.message));
+                console.log(chalk.yellow(`Use "gent repos --create ${validation.suggestion}" instead.`));
+                console.log(chalk.gray('No repository was created.'));
+                process.exitCode = 1;
+                return;
+            }
+            local = await prepareLocalRepository(options);
+            if (!local) return;
+        } else if (extraNames.length) {
+            throw new Error('unexpected repository name; use --create <name>');
+        }
+
         const isAuth = await authStorage.isAuthenticated();
         if (!isAuth) {
             console.error(chalk.red('Not authenticated'));
             console.log(chalk.yellow('Run "gent login" first'));
+            process.exitCode = 1;
             return;
         }
 
         if (options.create) {
-            await createRepo(options);
+            await createRepo(options, local);
             return;
         }
 
@@ -73,7 +98,7 @@ async function listRepos() {
 /**
  * Create a new remote repository
  */
-async function createRepo(options) {
+async function createRepo(options, local) {
     const name = options.create;
     if (typeof name !== 'string' || !name) {
         console.error(chalk.red('Usage: gent repos --create <name>'));
@@ -91,13 +116,93 @@ async function createRepo(options) {
     if (options.defaultBranch) {
         payload.default_branch = options.defaultBranch;
     }
+    if (local.kind === 'canonical') payload.object_format = 'sha256';
 
-    const data = await apiClient.post(API_ENDPOINTS.REPOS_CREATE, payload);
-    const repo = data.repository || data;
+    let data;
+    try {
+        data = await apiClient.post(API_ENDPOINTS.REPOS_CREATE, payload);
+    } catch (error) {
+        spinner.stop();
+        throw error;
+    }
+    const remoteRepo = data.repository || data;
+    const remoteUrl = await linkOrigin(local, remoteRepo);
+
+    spinner.succeed(chalk.green(`Created repository '${remoteRepo.name}'`));
+    console.log(chalk.gray(`  URL: /api/repos/${remoteRepo.owner_id}/${remoteRepo.name}`));
+    console.log(chalk.green(`  Linked local repository to '${remoteUrl}' as origin`));
+}
+
+function validateRepositoryName(name, extraNames = []) {
+    const words = [name, ...extraNames].filter(value => typeof value === 'string' && value.trim());
+    const combined = words.join(' ').trim();
+    const suggestion = combined
+        .toLowerCase()
+        .replace(/[^a-z0-9._-]+/g, '-')
+        .replace(/-+/g, '-')
+        .replace(/^[-.]+|[-.]+$/g, '') || 'repository-name';
+    const valid = words.length === 1 && /^[A-Za-z0-9](?:[A-Za-z0-9._-]*[A-Za-z0-9])?$/.test(name);
+    return {
+        valid,
+        suggestion,
+        message: `Invalid repository name '${combined || String(name || '')}'. Repository names cannot contain spaces or unsupported characters.`,
+    };
+}
+
+async function prepareLocalRepository(options) {
+    const gentPath = path.join(process.cwd(), GENT_DIR);
+    if (!await pathExists(gentPath)) {
+        if (!options.yes) {
+            if (!interactive.isInteractive()) {
+                console.error(chalk.red('No local Gent repository exists in this folder.'));
+                console.log(chalk.yellow('Run "gent init" first, or retry with --yes to initialize and link it automatically.'));
+                process.exitCode = 1;
+                return null;
+            }
+            const { initialize } = await inquirer.prompt([{
+                type: 'confirm',
+                name: 'initialize',
+                message: 'No local Gent repository exists in this folder. Create it before creating and linking the remote?',
+                default: true,
+            }]);
+            if (!initialize) {
+                console.log(chalk.yellow('Cancelled. No local or remote repository was created.'));
+                return null;
+            }
+        }
+        await initCommand({ yes: true });
+    }
+
+    const legacyConfig = path.join(gentPath, CONFIG_FILE);
+    if (await pathExists(legacyConfig)) {
+        const config = await readJSON(legacyConfig);
+        if (config.remotes?.origin) throw new Error("remote 'origin' already exists; no repository was created");
+        return { kind: 'legacy', config, configPath: legacyConfig };
+    }
+
+    const canonical = await repository.open(process.cwd());
+    if (canonical.config.get('remote.origin.url')) throw new Error("remote 'origin' already exists; no repository was created");
+    return { kind: 'canonical', repo: canonical };
+}
+
+async function linkOrigin(local, remoteRepo) {
+    if (local.kind === 'legacy') {
+        const url = `/api/repos/${remoteRepo.owner_id}/${remoteRepo.name}`;
+        local.config.remotes = local.config.remotes || {};
+        local.config.remotes.origin = { url };
+        await writeJSON(local.configPath, local.config);
+        return url;
+    }
 
-    spinner.succeed(chalk.green(`Created repository '${repo.name}'`));
-    console.log(chalk.gray(`  URL: /api/repos/${repo.owner_id}/${repo.name}`));
-    console.log(chalk.gray(`  Use "gent remote add origin /api/repos/${repo.owner_id}/${repo.name}" to link`));
+    const base = (await apiClient.resolveBaseUrl()).replace(/\/$/, '');
+    const owner = remoteRepo.owner_username || remoteRepo.owner_id;
+    const url = `${base}/${encodeURIComponent(String(owner))}/${encodeURIComponent(remoteRepo.name)}.git`;
+    local.repo.localConfig.set('remote.origin.url', url);
+    local.repo.localConfig.set('remote.origin.fetch', '+refs/heads/*:refs/remotes/origin/*');
+    await local.repo.localConfig.save();
+    return url;
 }
 
 module.exports = repos;
+module.exports.validateRepositoryName = validateRepositoryName;
+module.exports.prepareLocalRepository = prepareLocalRepository;

package/src/commands/resolve.js

@@ -32,8 +32,15 @@ const authStorage = require('../utils/auth-storage');
 const journal = require('../utils/journal');
 const ai = require('../utils/ai-service');
 
-async function resolve() {
+async function resolve(options = {}) {
     try {
+        await ai.prime();
+        if (options.ai && !ai.isEnabled()) {
+            console.error(chalk.red(ai.disabledHint()));
+            process.exitCode = 1;
+            return;
+        }
+
         const gentPath = await getGentPath();
         const cwd = process.cwd();
 
@@ -92,7 +99,7 @@ async function resolve() {
                     continue;
                 }
                 idx++;
-                const resolvedLines = await resolveHunk(seg, file, idx, conflictCount);
+                const resolvedLines = await resolveHunk(seg, file, idx, conflictCount, options);
                 if (resolvedLines === null) { aborted = true; break; }
                 out.push(...resolvedLines);
             }
@@ -151,7 +158,7 @@ async function resolve() {
  * Prompt for one conflict hunk. Returns the chosen lines, or null to abort
  * (leave the rest of the file as-is with markers).
  */
-async function resolveHunk(seg, file, idx, total) {
+async function resolveHunk(seg, file, idx, total, options = {}) {
     console.log(chalk.gray(`  Conflict ${idx}/${total}:`));
     console.log(chalk.green('    <<< ours'));
     seg.ours.forEach(l => console.log(chalk.green(`      ${l}`)));
@@ -169,6 +176,12 @@ async function resolveHunk(seg, file, idx, total) {
     }
     choices.push({ name: 'Skip the rest of this file', value: 'skip' });
 
+    if (options.ai) {
+        const suggestion = await askAiForHunk(seg, file);
+        if (suggestion !== null) return suggestion;
+        console.log(chalk.yellow('    Choose a manual resolution instead.'));
+    }
+
     const { choice } = await inquirer.prompt([{
         type: 'list',
         name: 'choice',
@@ -191,28 +204,36 @@ async function resolveHunk(seg, file, idx, total) {
             return text.replace(/\n$/, '').split('\n');
         }
         case 'ai': {
-            try {
-                const suggestion = await ai.resolveConflictHunk({
-                    ours: seg.ours.join('\n'),
-                    theirs: seg.theirs.join('\n'),
-                    fileName: file
-                });
-                console.log(chalk.cyan('    AI suggestion:'));
-                suggestion.split('\n').forEach(l => console.log(chalk.cyan(`      ${l}`)));
-                const { accept } = await inquirer.prompt([{
-                    type: 'confirm', name: 'accept', message: 'Use this suggestion?', default: true
-                }]);
-                if (accept) return suggestion.split('\n');
-                return resolveHunk(seg, file, idx, total); // re-ask
-            } catch (err) {
-                console.log(chalk.yellow(`    AI failed (${err.message}); choose another option.`));
-                return resolveHunk(seg, file, idx, total);
-            }
+            const suggestion = await askAiForHunk(seg, file);
+            if (suggestion !== null) return suggestion;
+            return resolveHunk(seg, file, idx, total, { ai: false });
         }
         default: return seg.ours;
     }
 }
 
+async function askAiForHunk(seg, file) {
+    try {
+        const suggestion = await ai.resolveConflictHunk({
+            ours: seg.ours.join('\n'),
+            theirs: seg.theirs.join('\n'),
+            fileName: file
+        });
+        console.log(chalk.cyan('    AI suggestion (review before accepting):'));
+        suggestion.split('\n').forEach(line => console.log(chalk.cyan(`      ${line}`)));
+        const { accept } = await inquirer.prompt([{
+            type: 'confirm',
+            name: 'accept',
+            message: 'Use this AI suggestion?',
+            default: false,
+        }]);
+        return accept ? suggestion.split('\n') : null;
+    } catch (error) {
+        console.log(chalk.yellow(`    AI failed (${error.message}); no file was changed.`));
+        return null;
+    }
+}
+
 /** Store the resolved file as a blob, patch the tree entry, and stage it. */
 async function stageResolved(gentPath, staging, entriesByName, file, content) {
     const hash = await storeBlob(gentPath, content);

package/src/index.js

@@ -284,6 +284,7 @@ program
 program
     .command('resolve')
     .description('Interactively resolve merge conflicts left by "gent merge"')
+    .option('--ai', 'Ask AI for each conflict resolution and review it before applying')
     .action(resolveCommand);
 
 program
@@ -316,12 +317,13 @@ program
     .action(remoteCommand);
 
 program
-    .command('repos')
+    .command('repos [names...]')
     .description('List or create remote repositories')
     .option('--create <name>', 'Create a new remote repository')
     .option('--description <text>', 'Repository description (with --create)')
     .option('--private', 'Make repository private (with --create)')
     .option('--default-branch <name>', 'Default branch name (with --create)')
+    .option('-y, --yes', 'Initialize the current folder without prompting')
     .action(reposCommand);
 
 program