gent-cli 24.0.0 → 26.0.0

package/src/commands/merge.js

@@ -15,6 +15,8 @@ const { findMergeBase, mergeTreeEntries, autoMerge } = require('../utils/merge-e
 const { storeTree, readBlob, hashBlob } = require('../utils/hash-engine');
 const pet = require('./pet');
 const journal = require('../utils/journal');
+const ai = require('../utils/ai-service');
+const reviewCommand = require('./review');
 
 /**
  * Merge a branch into the current branch
@@ -22,7 +24,8 @@ const journal = require('../utils/journal');
  * @param {Object} options - Command options
  */
 async function merge(sourceBranch, options) {
-    const spinner = ora(`Merging '${sourceBranch}'...`).start();
+    options = options || {};
+    const spinner = ora(options.abort ? 'Aborting merge...' : `Merging '${sourceBranch}'...`).start();
 
     try {
         const gentPath = await getGentPath();
@@ -32,6 +35,18 @@ async function merge(sourceBranch, options) {
         const branches = repository.branches || {};
         const currentBranch = repository.currentBranch;
 
+        if (options.abort) {
+            await abortMerge(gentPath, cwd, repository, spinner);
+            return;
+        }
+        if (options.continue) {
+            throw new Error('Legacy merge continuation uses "gent resolve"');
+        }
+        if (options.ai) {
+            await ai.prime();
+            if (!ai.isEnabled()) throw new Error(ai.disabledHint());
+        }
+
         // Validate branches
         if (!branches.hasOwnProperty(sourceBranch)) {
             spinner.fail(chalk.red(`Branch '${sourceBranch}' not found`));
@@ -95,6 +110,10 @@ async function merge(sourceBranch, options) {
 
             spinner.succeed(chalk.green(`Fast-forward merge: ${currentBranch} → ${theirsHash.substring(0, 7)}`));
             await pet.celebrate('merge');
+            if (options.ai) {
+                console.log(chalk.bold.cyan('\nAI review of the completed merge'));
+                await reviewCommand(theirsHash, { head: true });
+            }
             return;
         }
 
@@ -134,8 +153,10 @@ async function merge(sourceBranch, options) {
                 }
             }
 
-            console.log(chalk.yellow(`\nConflict markers: <<<<<<< HEAD / ======= / >>>>>>> ${sourceBranch}`));
-            console.log(chalk.cyan('Resolve conflicts, then run "gent add" and "gent commit"'));
+            if (!options.ai) {
+                console.log(chalk.yellow(`\nConflict markers: <<<<<<< HEAD / ======= / >>>>>>> ${sourceBranch}`));
+                console.log(chalk.cyan('Resolve conflicts, then run "gent resolve"'));
+            }
         }
 
         // Store merged tree
@@ -199,6 +220,10 @@ async function merge(sourceBranch, options) {
             console.log(chalk.gray(`  Ours: ${oursHash.substring(0, 7)}  Theirs: ${theirsHash.substring(0, 7)}`));
             console.log(chalk.green(`  ${autoResolved} file(s) merged automatically`));
             await pet.celebrate('merge');
+            if (options.ai) {
+                console.log(chalk.bold.cyan('\nAI review of the completed merge'));
+                await reviewCommand(mergeCommit.hash, { head: true });
+            }
         } else {
             // Stage the merge state for manual resolution
             const staging = await readJSON(path.join(gentPath, STAGING_FILE));
@@ -212,7 +237,12 @@ async function merge(sourceBranch, options) {
                 conflicts: mergeResult.conflicts
             };
             await writeJSON(path.join(gentPath, STAGING_FILE), staging);
-            process.exitCode = 1;
+            if (options.ai) {
+                process.exitCode = 0;
+                await require('./resolve')({ ai: true });
+            } else {
+                process.exitCode = 1;
+            }
         }
 
     } catch (error) {
@@ -254,8 +284,11 @@ function safePath(cwd, relativePath) {
 
 async function assertCleanWorkingTree(gentPath, cwd, commit) {
     const staging = await readJSON(path.join(gentPath, STAGING_FILE));
-    if ((staging.entries || []).length || (staging.files || []).length || staging.mergeState) {
-        throw new Error('Commit or stash staged changes before merging');
+    if (staging.mergeState) {
+        throw new Error('A merge is already in progress; run "gent resolve" or "gent merge --abort"');
+    }
+    if ((staging.entries || []).length || (staging.files || []).length) {
+        throw new Error('Commit, stash, or unstage current changes before merging');
     }
     for (const entry of treeOf(commit)) {
         const fullPath = safePath(cwd, entry.name || entry.path);
@@ -266,6 +299,44 @@ async function assertCleanWorkingTree(gentPath, cwd, commit) {
     }
 }
 
+async function abortMerge(gentPath, cwd, repository, spinner) {
+    const staging = await readJSON(path.join(gentPath, STAGING_FILE));
+    const state = staging.mergeState;
+    if (!state) {
+        spinner.info(chalk.yellow('No merge in progress'));
+        return;
+    }
+
+    const oursCommit = (repository.commits || []).find(commit => commit.hash === state.oursHash);
+    if (!oursCommit) throw new Error('Cannot abort merge: original commit is missing');
+
+    const oursTree = treeOf(oursCommit);
+    const mergeTree = state.mergedEntries || [];
+    const oursNames = new Set(oursTree.map(entry => entry.name || entry.path));
+    const restored = new Map();
+    for (const entry of oursTree) {
+        restored.set(entry.name || entry.path, await readBlob(gentPath, entry.hash));
+    }
+    for (const entry of mergeTree) {
+        const name = entry.name || entry.path;
+        if (!oursNames.has(name)) {
+            await fs.unlink(safePath(cwd, name)).catch(error => {
+                if (error.code !== 'ENOENT') throw error;
+            });
+        }
+    }
+    for (const [name, bytes] of restored) {
+        const fullPath = safePath(cwd, name);
+        await fs.mkdir(path.dirname(fullPath), { recursive: true });
+        await fs.writeFile(fullPath, bytes);
+    }
+    staging.entries = [];
+    staging.files = [];
+    staging.mergeState = null;
+    await writeJSON(path.join(gentPath, STAGING_FILE), staging);
+    spinner.succeed(chalk.green('Merge aborted; working tree restored'));
+}
+
 async function checkoutTree(gentPath, cwd, previousEntries, nextEntries) {
     const previous = new Map(previousEntries.map(entry => [entry.name || entry.path, entry]));
     const next = new Map(nextEntries.map(entry => [entry.name || entry.path, entry]));

package/src/commands/resolve.js

@@ -31,6 +31,7 @@ const { generateCommitHash } = require('../utils/helpers');
 const authStorage = require('../utils/auth-storage');
 const journal = require('../utils/journal');
 const ai = require('../utils/ai-service');
+const reviewCommand = require('./review');
 
 async function resolve(options = {}) {
     try {
@@ -64,6 +65,19 @@ async function resolve(options = {}) {
             return;
         }
 
+        if (!options.ai && ai.isEnabled() && process.stdin.isTTY && process.stdout.isTTY) {
+            const { mode } = await inquirer.prompt([{
+                type: 'list',
+                name: 'mode',
+                message: 'How should Gent resolve this merge?',
+                choices: [
+                    { name: 'Merge with AI (fast) — resolve, commit, then review', value: 'ai' },
+                    { name: 'Resolve manually — choose each conflict', value: 'manual' },
+                ],
+            }]);
+            options.ai = mode === 'ai';
+        }
+
         console.log(chalk.bold.cyan(`\nResolving merge of '${mergeState.sourceBranch}' — ${markerFiles.length} file(s)\n`));
 
         // Working copy of merged tree entries (we patch hashes as files resolve).
@@ -126,23 +140,28 @@ async function resolve(options = {}) {
 
         if (unresolvedFiles > 0) {
             console.log(chalk.yellow(`\n${unresolvedFiles} file(s) still have conflicts. Re-run "gent resolve" when ready.`));
+            process.exitCode = 1;
             return;
         }
 
         // All conflicts resolved — offer to finalize the merge commit.
-        const { finalize } = await inquirer.prompt([{
+        const finalize = options.ai || (await inquirer.prompt([{
             type: 'confirm',
             name: 'finalize',
             message: 'All conflicts resolved. Create the merge commit now?',
             default: true
-        }]);
+        }])).finalize;
 
         if (!finalize) {
             console.log(chalk.cyan('Resolved files staged. Run "gent commit" when ready.'));
             return;
         }
 
-        await finalizeMerge(gentPath, staging, mergeState, entriesByName);
+        const mergeCommit = await finalizeMerge(gentPath, staging, mergeState, entriesByName);
+        if (options.ai) {
+            console.log(chalk.bold.cyan('\nAI review of the completed merge'));
+            await reviewCommand(mergeCommit.hash, { head: true });
+        }
     } catch (error) {
         if (error.code === 'ENOENT' && error.message.includes('.gent')) {
             console.error(chalk.red('Error: Not a gent repository'));
@@ -177,9 +196,9 @@ async function resolveHunk(seg, file, idx, total, options = {}) {
     choices.push({ name: 'Skip the rest of this file', value: 'skip' });
 
     if (options.ai) {
-        const suggestion = await askAiForHunk(seg, file);
+        const suggestion = await askAiForHunk(seg, file, true);
         if (suggestion !== null) return suggestion;
-        console.log(chalk.yellow('    Choose a manual resolution instead.'));
+        return null;
     }
 
     const { choice } = await inquirer.prompt([{
@@ -212,13 +231,17 @@ async function resolveHunk(seg, file, idx, total, options = {}) {
     }
 }
 
-async function askAiForHunk(seg, file) {
+async function askAiForHunk(seg, file, autoAccept = false) {
     try {
         const suggestion = await ai.resolveConflictHunk({
             ours: seg.ours.join('\n'),
             theirs: seg.theirs.join('\n'),
             fileName: file
         });
+        if (autoAccept) {
+            console.log(chalk.green(`    ✓ AI resolved ${file}`));
+            return suggestion.split('\n');
+        }
         console.log(chalk.cyan('    AI suggestion (review before accepting):'));
         suggestion.split('\n').forEach(line => console.log(chalk.cyan(`      ${line}`)));
         const { accept } = await inquirer.prompt([{
@@ -297,6 +320,7 @@ async function finalizeMerge(gentPath, staging, mergeState, entriesByName) {
     await writeJSON(path.join(gentPath, STAGING_FILE), staging);
 
     console.log(chalk.green(`\n✓ Merge committed — ${mergeCommit.hash.substring(0, 7)}`));
+    return mergeCommit;
 }
 
 module.exports = resolve;

package/src/commands/review.js

@@ -7,7 +7,7 @@
  *   gent review <ref>          → review diff for that commit
  *
  * Output: prioritized bug/risk list followed by smaller polish suggestions.
- * Without an AI key, prints the raw diff so the command still has value.
+ * Without local AI, prints the raw diff so the command still has value.
  */
 
 const path = require('path');
@@ -73,6 +73,7 @@ async function review(refArg, options = {}) {
 
         console.log(chalk.bold.cyan(`\n${title}\n`));
 
+        await ai.prime();
         if (!ai.isEnabled()) {
             console.log(trimmed);
             console.log(chalk.gray(`\n${ai.disabledHint()}`));
@@ -82,6 +83,7 @@ async function review(refArg, options = {}) {
         const spinner = ora(`Reviewing with ${ai.getModel()}...`).start();
         try {
             const out = await ai.complete({
+                profile: 'review',
                 system:
                     'You are a senior code reviewer. Given a unified diff, list concrete ' +
                     'issues you would block on, then smaller suggestions. Format:\n' +
@@ -90,8 +92,7 @@ async function review(refArg, options = {}) {
                     '🟢 Looks good\n  - one-line positive note\n' +
                     'Be specific. If nothing is wrong, say so plainly.',
                 prompt: `Review this diff:\n\n${trimmed}`,
-                maxTokens: 1500,
-                thinking: true,
+                maxTokens: 800,
             });
             spinner.stop();
             console.log(out + '\n');

package/src/commands/setup.js

@@ -3,7 +3,7 @@
  *
  *   gent setup
  *
- * Walks the user through: backend URL → login/register → AI key → identity.
+ * Walks the user through: backend URL → login/register → identity.
  * Each step is skippable; nothing is required.
  */
 
@@ -15,7 +15,6 @@ const axios = require('axios');
 const userConfig = require('../utils/user-config');
 const authStorage = require('../utils/auth-storage');
 const authService = require('../services/auth-service');
-const ai = require('../utils/ai-service');
 
 async function setup() {
     console.log(boxen(
@@ -26,7 +25,6 @@ async function setup() {
 
     await stepBackend();
     await stepAuth();
-    await stepAiKey();
     await stepIdentity();
 
     console.log(chalk.green('\n✓ Setup complete!'));
@@ -125,56 +123,8 @@ async function stepAuth() {
     }
 }
 
-async function stepAiKey() {
-    console.log(chalk.bold('\n3. AI features (optional)'));
-    const existing = await ai.resolveKey();
-    if (existing.value) {
-        console.log(chalk.gray(`   Key already configured [${existing.source}] — skipping.`));
-        return;
-    }
-
-    console.log(chalk.gray('   Gent uses Anthropic Claude for commit-message suggestions,'));
-    console.log(chalk.gray('   diff explanations, AI conflict resolution, code review, and more.'));
-    console.log(chalk.gray('   Get a key at: https://console.anthropic.com/settings/keys'));
-
-    const { provide } = await inquirer.prompt([{
-        type: 'confirm',
-        name: 'provide',
-        message: 'Add an Anthropic API key now?',
-        default: true,
-    }]);
-    if (!provide) return;
-
-    const { key } = await inquirer.prompt([{
-        type: 'password',
-        name: 'key',
-        message: 'Anthropic API key:',
-        mask: '*',
-        validate: (v) => v.length > 0 || 'Cannot be empty',
-    }]);
-
-    await userConfig.set('ai.api_key', key);
-
-    const { testNow } = await inquirer.prompt([{
-        type: 'confirm',
-        name: 'testNow',
-        message: 'Test the key now (1 small request)?',
-        default: true,
-    }]);
-    if (testNow) {
-        const spinner = ora('Asking Claude to say hi...').start();
-        try {
-            await ai.complete({ prompt: 'Reply with the single word: ok', maxTokens: 4 });
-            spinner.succeed(chalk.green('AI key works'));
-        } catch (err) {
-            spinner.fail(chalk.red(err.message));
-            console.log(chalk.yellow('   You can fix this with `gent config set ai.api_key <key>`.'));
-        }
-    }
-}
-
 async function stepIdentity() {
-    console.log(chalk.bold('\n4. Default identity'));
+    console.log(chalk.bold('\n3. Default identity'));
     const currentName = await userConfig.getResolved('user.name');
     const currentEmail = await userConfig.getResolved('user.email');
 

package/src/commands/summary.js

@@ -150,12 +150,16 @@ async function summary(options = {}) {
         }));
 
         if (options.ai) {
+            await ai.prime();
             if (!ai.isEnabled()) {
                 console.log(chalk.gray(ai.disabledHint()));
             } else {
                 try {
                     const facts = lines.join('\n').replace(/\[[0-9;]*m/g, ''); // strip colors
-                    const narrative = await ai.explainChanges(`Repository stats:\n${facts}\n\nGive a 2-3 sentence health assessment.`);
+                    const narrative = await ai.explainChanges(
+                        `Repository stats:\n${facts}\n\nGive a 2-3 sentence health assessment.`,
+                        'summary',
+                    );
                     console.log(chalk.cyan(narrative));
                 } catch (err) {
                     console.log(chalk.yellow(`AI summary failed: ${err.message}`));

package/src/index.js

@@ -13,7 +13,7 @@
  *   History:     commit, log, show, tag, explain
  *   Branching:   branch, checkout, merge, resolve, stash
  *   Safety:      undo, redo
- *   Insight:     summary, ask, review, docs, changelog
+ *   Insight:     summary, ask, chat, review, docs, changelog
  *   Remote:      remote, repos, members, push, pull, search, web, share
  *   Auth:        register, login, logout, whoami, password
  *   AI:          ai (status|test|models)
@@ -72,6 +72,7 @@ const doctorCommand = require('./commands/doctor');
 const setupCommand = require('./commands/setup');
 const aiCommand = require('./commands/ai');
 const askCommand = route('ask', require('./commands/ask'));
+const chatCommand = require('./commands/chat');
 const reviewCommand = route('review', require('./commands/review'));
 const docsCommand = route('docs', require('./commands/docs'));
 const changelogCommand = route('changelog', require('./commands/changelog'));
@@ -188,7 +189,7 @@ program
     .description('Record changes to the repository')
     .option('-m, --message <message>', 'Commit message')
     .option('-a, --all', 'Automatically stage all modified files')
-    .option('--ai', 'Suggest a commit message with AI (needs ANTHROPIC_API_KEY)')
+    .option('--ai', 'Suggest a commit message with local Gent AI')
     .action(commitCommand);
 
 program
@@ -222,7 +223,7 @@ program
 program
     .command('summary')
     .description('Show a repository health & statistics dashboard')
-    .option('--ai', 'Add an AI-written health narrative (needs ANTHROPIC_API_KEY)')
+    .option('--ai', 'Add an AI-written health narrative')
     .action(summaryCommand);
 
 // ─── Branching & Merging ────────────────────────────────
@@ -258,6 +259,7 @@ program
     .command('merge [branch]')
     .description('Merge a branch into the current branch (3-way smart merge)')
     .option('-m, --message <message>', 'Merge commit message')
+    .option('--ai', 'Resolve conflicts with AI, commit, then review the merge')
     .option('--continue', 'Finish a resolved canonical merge')
     .option('--abort', 'Abort a canonical merge')
     .action(async (branch, options) => {
@@ -284,7 +286,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')
+    .option('--ai', 'Resolve every text conflict with AI, commit, then review')
     .action(resolveCommand);
 
 program
@@ -352,18 +354,18 @@ program
 
 program
     .command('setup')
-    .description('Interactive first-run wizard (backend URL, login, AI key, identity)')
+    .description('Interactive first-run wizard (backend URL, login, identity)')
     .action(setupCommand);
 
 program
     .command('config [subcommand] [args...]')
-    .description('Manage CLI settings (list|get|set|unset|path) — e.g. gent config set ai.api_key <key>')
+    .description('Manage CLI settings (list|get|set|unset|path)')
     .action(configCommand);
 
 program
     .command('doctor')
-    .description('Run a health check across node, repo, auth, backend, and AI key')
-    .option('--ai', 'Also live-test the AI key with a tiny request')
+    .description('Run a health check across node, repo, auth, backend, and Gent AI')
+    .option('--ai', 'Also live-test Gent AI with a tiny request')
     .action(doctorCommand);
 
 program
@@ -375,7 +377,7 @@ program
 
 program
     .command('ask [question]')
-    .description('Ask Claude a question about this repo (needs AI key)')
+    .description('Ask local Gent AI a question about this repo')
     .action(async (question, options) => {
         if (!question && interactive.isInteractive()) {
             question = await interactive.promptAsk();
@@ -390,6 +392,11 @@ program
     .option('--head', 'Force review of HEAD commit')
     .action(reviewCommand);
 
+program
+    .command('chat [message]')
+    .description('Chat with Gent AI about the current repository')
+    .action(chatCommand);
+
 program
     .command('docs')
     .description('Generate a README.md draft for this repo using AI')
@@ -552,7 +559,7 @@ function showQuickstart() {
     console.log(chalk.gray('A Git-like VCS with cloud sync + AI superpowers.\n'));
     console.log(chalk.bold('First time? Try:'));
     console.log(`  ${chalk.cyan('gent auto')}               ${chalk.gray('guided init → commit → push (interactive)')}`);
-    console.log(`  ${chalk.cyan('gent setup')}              ${chalk.gray('configure login + AI key + remote')}`);
+    console.log(`  ${chalk.cyan('gent setup')}              ${chalk.gray('configure login + identity + remote')}`);
     console.log(`  ${chalk.cyan('gent doctor')}             ${chalk.gray('check everything is wired up')}`);
     console.log(`  ${chalk.cyan('gent template list')}      ${chalk.gray('scaffold a starter project')}`);
     console.log();
@@ -560,9 +567,11 @@ function showQuickstart() {
     console.log(`  ${chalk.cyan('gent init && gent add -A && gent commit -m "init"')}`);
     console.log(`  ${chalk.cyan('gent push')} / ${chalk.cyan('gent pull')} / ${chalk.cyan('gent merge <branch>')}`);
     console.log();
-    console.log(chalk.bold('AI features (need an Anthropic key):'));
+    console.log(chalk.bold('Local AI features:'));
+    console.log(`  ${chalk.cyan('gent chat')}               ${chalk.gray('interactive repository chat')}`);
     console.log(`  ${chalk.cyan('gent ask "what does this repo do?"')}`);
     console.log(`  ${chalk.cyan('gent review')}             ${chalk.gray('review staged changes')}`);
+    console.log(`  ${chalk.cyan('gent merge dev --ai')}      ${chalk.gray('resolve, commit, then review')}`);
     console.log(`  ${chalk.cyan('gent docs --write')}       ${chalk.gray('generate README.md')}`);
     console.log(`  ${chalk.cyan('gent changelog')}          ${chalk.gray('grouped release notes')}`);
     console.log();