gent-cli 24.0.0 → 25.0.0

package/QUICKSTART.md

@@ -60,7 +60,7 @@ gent status -s   # short format
 gent commit -m "Initial commit"
 ```
 
-Let AI suggest a message from your staged diff (requires `ANTHROPIC_API_KEY`):
+Let local Gent AI suggest a message from your staged diff:
 
 ```bash
 gent commit --ai
@@ -158,16 +158,17 @@ gent summary --ai             # + a short AI-written health narrative
 
 ## Optional AI Features
 
-All AI features are off by default and have a non-AI fallback.
+AI calls run directly from the CLI using the installation-provisioned credential.
+Users are never prompted for a provider key. Commands with a non-AI path
+continue to work offline.
 
 ```bash
-export ANTHROPIC_API_KEY=sk-ant-...
-export GENT_AI_MODEL=claude-haiku-4-5   # optional; default is claude-opus-4-8
-
 gent commit --ai       # AI-suggested commit message
 gent explain           # plain-language diff summary
 gent resolve           # adds "Ask AI" option per conflict hunk
 gent summary --ai      # health narrative
+gent chat              # interactive repository chat
+gent merge dev --ai    # merge, AI-resolve conflicts, commit, then review
 ```
 
 ---

package/README.md

@@ -24,7 +24,7 @@ Beyond a faithful git-like workflow, Gent adds:
 - **`gent undo` / `gent redo`** — a one-command safety net over an operation journal (friendlier than `git reflog`).
 - **`gent resolve`** — an interactive conflict resolver (ours / theirs / both / edit / AI).
 - **`gent summary`** — a repository health dashboard, plus **`gent log --graph`**.
-- **Optional AI** (`gent commit --ai`, `gent explain`, `gent summary --ai`, AI option in `gent resolve`) — off by default, enabled with `ANTHROPIC_API_KEY`.
+- **Direct local AI** (`gent chat`, `gent review`, `gent merge --ai`, `gent resolve --ai`) — low-latency OpenAI calls from the CLI with task-specific prompts and no per-command key prompt.
 - **Genti, your terminal mascot** — a mint one-eyed sky-jelly that *acts out* your workflow: it floats a file crate to the cloud on `gent push`, carries one home on `gent pull`, and reconciles two branches on `gent merge`. It plays once (in place, no scrollback spam) after a successful command. Meet it directly with `gent pet` (add `--loop` to keep it running; try `gent pet push|pull|merge|auth`). Set `GENT_NO_PET=1` (or run in CI / a non-interactive shell) to turn the celebrations off.
 
 See [docs/COMMANDS.md](docs/COMMANDS.md) for the full reference and
@@ -489,7 +489,9 @@ Undo never deletes your working files; for content-discarding operations
 
 ```bash
 gent summary                      # repository health & statistics dashboard
-gent summary --ai                 # + a short AI-written assessment (needs a key)
+gent summary --ai                 # + a short AI-written assessment
+gent chat                         # interactive repository chat
+gent merge feature --ai           # merge, AI-resolve conflicts, commit, then review
 gent log --graph                  # ASCII commit graph with branches and merges
 gent explain                      # explain the latest commit in plain language
 gent explain <commit>             # explain a specific commit
@@ -498,12 +500,11 @@ gent explain --staged             # explain currently staged changes
 
 ### Optional AI features
 
-AI is off by default and every feature has a non-AI fallback. Enable it with:
+AI calls run directly from the CLI using the credential provisioned for the
+installation. Commands never prompt users for a provider key. Fast task-specific
+prompts keep review, merge resolution, chat, and summaries concise.
 
 ```bash
-export ANTHROPIC_API_KEY=sk-ant-...
-export GENT_AI_MODEL=claude-haiku-4-5   # optional; default is claude-opus-4-8
-
 gent commit --ai                  # suggest a commit message from the staged diff
 gent explain                      # narrate a diff instead of just printing it
 gent resolve                      # adds an "Ask AI" choice per conflict hunk

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gent-cli",
-  "version": "24.0.0",
+  "version": "25.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 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": "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 tests/ai-service.test.js && node tests/offline-e2e.js && node tests/ai-merge.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 tests/ai-service.test.js",
     "test:e2e": "node tests/offline-e2e.js",
     "test:remote:e2e": "node tests/remote-e2e.js",
     "demo": "bash demo.sh",

package/src/commands/ai.js

@@ -1,21 +1,14 @@
 /**
  * AI Command - Manage and verify AI integration.
  *
- *   gent ai status            → show key source, model, where it came from
+ *   gent ai status            → show the managed service status
  *   gent ai test              → make a tiny live request to confirm it works
- *   gent ai models            → list the model ids gent suggests
+ *   gent ai models            → show provider management information
  */
 
 const chalk = require('chalk');
 const ora = require('ora');
 const ai = require('../utils/ai-service');
-const userConfig = require('../utils/user-config');
-
-const SUGGESTED_MODELS = [
-    { id: 'claude-opus-4-7', tag: 'flagship', note: 'Highest quality' },
-    { id: 'claude-sonnet-4-6', tag: 'balanced', note: 'Strong, faster, cheaper' },
-    { id: 'claude-haiku-4-5', tag: 'fastest', note: 'Fastest & cheapest' },
-];
 
 async function aiCommand(subcommand) {
     const sub = (subcommand || 'status').toLowerCase();
@@ -31,32 +24,28 @@ async function aiCommand(subcommand) {
 }
 
 async function status() {
-    const { value: key, source: keySource } = await ai.resolveKey();
-    const model = await ai.resolveModel();
-    const { source: modelSource } = await userConfig.getResolved('ai.model');
+    const { value: available, source } = await ai.resolveKey();
 
     console.log(chalk.bold.cyan('\nGent AI status\n'));
-    if (key) {
-        console.log(`  ${chalk.green('●')} API key:   ${userConfig.maskSecret(key)}  ${chalk.gray(`[${keySource}]`)}`);
+    if (available) {
+        console.log(`  ${chalk.green('●')} Service:   ${chalk.white(`direct OpenAI [${source}]`)}`);
     } else {
-        console.log(`  ${chalk.gray('○')} API key:   ${chalk.gray('not set')}`);
+        console.log(`  ${chalk.gray('○')} Service:   ${chalk.gray('unavailable')}`);
         console.log(chalk.gray('             ↳ ' + ai.disabledHint()));
     }
-    console.log(`  ${chalk.green('●')} Model:     ${model}  ${chalk.gray(`[${modelSource}]`)}`);
-    console.log(chalk.gray('\n  Run `gent ai test` to verify the key actually works.'));
+    console.log(`  ${chalk.green('●')} Model:     ${await ai.resolveModel()}`);
+    console.log(chalk.gray('\n  Run `gent ai test` to verify the service.'));
     console.log();
 }
 
 async function test() {
-    const { value: key } = await ai.resolveKey();
-    if (!key) {
-        console.error(chalk.red('No AI key configured.'));
-        console.log(chalk.yellow('Set one with `gent config set ai.api_key <key>`.'));
+    const { value: available } = await ai.resolveKey();
+    if (!available) {
+        console.error(chalk.red(ai.disabledHint()));
         process.exit(1);
     }
 
-    const model = await ai.resolveModel();
-    const spinner = ora(`Pinging Anthropic (${model})...`).start();
+    const spinner = ora('Pinging Gent AI...').start();
     try {
         const reply = await ai.complete({
             prompt: 'Reply with the single word: pong',
@@ -70,13 +59,9 @@ async function test() {
 }
 
 async function models() {
-    const current = await ai.resolveModel();
-    console.log(chalk.bold.cyan('\nSuggested Claude models\n'));
-    for (const m of SUGGESTED_MODELS) {
-        const active = m.id === current ? chalk.green(' (current)') : '';
-        console.log(`  ${chalk.cyan(m.id.padEnd(22))} ${chalk.gray(m.tag.padEnd(10))} ${m.note}${active}`);
-    }
-    console.log(chalk.gray('\n  Switch with: gent config set ai.model <id>\n'));
+    console.log(chalk.bold.cyan('\nGent AI model\n'));
+    console.log(chalk.white(`  ${await ai.resolveModel()} (current)`));
+    console.log(chalk.gray('  Optimized for low-latency review, merge, and chat.\n'));
 }
 
 module.exports = aiCommand;

package/src/commands/ask.js

@@ -6,7 +6,7 @@
  *   gent ask "what's pending on the current branch?"
  *
  * Builds a compact repo summary (README + last N commits + tree listing) and
- * sends it as context. Falls back to a useful text dump if no AI key is set.
+ * sends it as context. Falls back to a useful text dump when signed out.
  */
 
 const path = require('path');
@@ -30,6 +30,7 @@ async function ask(question, options = {}) {
         const gentPath = await getGentPath();
         const context = await buildRepoContext(gentPath);
 
+        await ai.prime();
         if (!ai.isEnabled()) {
             console.log(chalk.yellow(ai.disabledHint()));
             console.log(chalk.gray('\nHere is the raw repo context you can pipe into another tool:\n'));
@@ -40,6 +41,7 @@ async function ask(question, options = {}) {
         const spinner = ora(`Asking ${ai.getModel()}...`).start();
         try {
             const answer = await ai.complete({
+                profile: 'chat',
                 system:
                     'You are a senior engineer answering questions about a software repository. ' +
                     'Be concrete and concise. If the answer is not in the context, say so. ' +
@@ -119,3 +121,4 @@ async function findReadme(cwd) {
 }
 
 module.exports = ask;
+module.exports.buildRepoContext = buildRepoContext;

package/src/commands/canonical.js

@@ -156,16 +156,29 @@ const handlers = {
     async merge(repo, branch, options) {
         if (options.abort) return merge.abortMerge(repo);
         if (options.continue) return merge.concludeMerge(repo, options.message);
+        if (options.ai) {
+            await ai.prime();
+            if (!ai.isEnabled()) throw new Error(ai.disabledHint());
+        }
+        const beforeMerge = options.ai ? (await repo.refs.head()).oid : null;
         const result = await merge.merge(repo, branch, options);
         if (result.status === 'conflicts') {
             for (const conflict of result.conflicts) {
                 if (conflict.kind === 'content') console.log(`Auto-merging ${conflict.path}`);
                 console.log(`CONFLICT (${conflict.kind}): Merge conflict in ${conflict.path}`);
             }
-            console.log('Automatic merge failed; fix conflicts and then commit the result.');
-            console.log('Resolve files, stage with gent add, then gent merge --continue or gent commit -m <message>.');
-            process.exitCode = 1;
-        } else console.log(result.status);
+            if (options.ai) {
+                console.log('Resolving all text conflicts with Gent AI...');
+                await handlers.resolve(repo, { ai: true });
+            } else {
+                console.log('Automatic merge failed; fix conflicts and then commit the result.');
+                console.log('Resolve files, stage with gent add, then gent merge --continue or gent commit -m <message>.');
+                process.exitCode = 1;
+            }
+        } else {
+            console.log(result.status);
+            if (options.ai) await reviewCanonicalMerge(repo, beforeMerge, result.oid);
+        }
     },
     async resolve(repo, options = {}) {
         const index = await GitIndex.read(repo.indexPath);
@@ -174,6 +187,18 @@ const handlers = {
             console.log('No merge conflicts to resolve.');
             return;
         }
+        if (!options.ai && 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', value: 'manual' },
+                ],
+            }]);
+            options.ai = mode === 'ai';
+        }
         if (!options.ai) {
             for (const name of names) console.log(name);
             console.log('Edit conflicted files, then gent add <path> and gent merge --continue.');
@@ -197,14 +222,6 @@ const handlers = {
                     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);
@@ -217,8 +234,15 @@ const handlers = {
                 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.');
+        console.log(`${resolved} of ${names.length} conflict(s) resolved with Gent AI.`);
+        if (resolved !== names.length) {
+            console.log('Unresolved conflicts remain; no merge commit was created.');
+            process.exitCode = 1;
+            return;
+        }
+        const commit = await merge.concludeMerge(repo);
+        console.log(`Merge committed: ${commit.oid.slice(0, 12)}`);
+        await reviewCanonicalMerge(repo, (await repo.objects.readCommit(commit.oid)).parents[0], commit.oid);
     },
     async stash(repo, sub = 'push', options = {}) {
         const position = Number(options.index || 0);
@@ -280,6 +304,41 @@ const handlers = {
     }
 };
 
+async function reviewCanonicalMerge(repo, beforeOid, afterOid) {
+    if (!beforeOid || !afterOid) return;
+    const beforeCommit = await repo.objects.readCommit(beforeOid);
+    const afterCommit = await repo.objects.readCommit(afterOid);
+    const before = await worktree.readTreeRecursive(repo, beforeCommit.tree);
+    const after = await worktree.readTreeRecursive(repo, afterCommit.tree);
+    const diff = (await treeDiffText(repo, before, after)).slice(0, 16000);
+    if (!diff) {
+        console.log('AI review: no content changes to review.');
+        return;
+    }
+    console.log('\nAI review of the completed merge');
+    try {
+        console.log(await ai.reviewChanges(diff, 'Review the completed merge result. Focus on integration regressions.'));
+    } catch (error) {
+        console.log(`Post-merge AI review unavailable: ${error.message}`);
+    }
+}
+
+async function treeDiffText(repo, before, after) {
+    const parts = [];
+    for (const name of new Set([...before.keys(), ...after.keys()])) {
+        const a = before.get(name), b = after.get(name);
+        const read = item => item ? repo.objects.readBlob(item.oid) : Buffer.alloc(0);
+        const oldBytes = await read(a), newBytes = await read(b);
+        if (oldBytes.equals(newBytes) && a?.mode === b?.mode) continue;
+        if (looksBinary(oldBytes) || looksBinary(newBytes)) {
+            parts.push(`${name}: binary file changed`);
+        } else {
+            parts.push(formatUnifiedDiff(name, oldBytes.toString(), newBytes.toString()));
+        }
+    }
+    return parts.filter(Boolean).join('\n\n');
+}
+
 async function printTreeDiff(repo, before, after, files = [], stat = false) {
     const wanted = files.map(name => repo.relativePath(path.resolve(name)));
     for (const name of new Set([...before.keys(), ...after.keys()])) {

package/src/commands/changelog.js

@@ -40,6 +40,7 @@ async function changelog(range, options = {}) {
         )}`;
         console.log('\n' + header + '\n');
 
+        if (!options.plain) await ai.prime();
         if (options.plain || !ai.isEnabled()) {
             for (const c of selected) {
                 const short = (c.hash || '').slice(0, 7);
@@ -59,6 +60,7 @@ async function changelog(range, options = {}) {
         const spinner = ora(`Grouping with ${ai.getModel()}...`).start();
         try {
             const out = await ai.complete({
+                profile: 'changelog',
                 system:
                     'You write release-note-style changelogs. Group commits into ' +
                     'Features / Fixes / Improvements / Other. Keep each bullet to one line ' +

package/src/commands/chat.js

@@ -0,0 +1,80 @@
+/** Interactive, repository-aware Gent AI chat. */
+
+const chalk = require('chalk');
+const inquirer = require('inquirer');
+const ora = require('ora');
+const { getGentPath } = require('../utils/fileSystem');
+const ai = require('../utils/ai-service');
+const { buildRepoContext } = require('./ask');
+
+const MAX_HISTORY_CHARS = 12000;
+
+async function chat(initialMessage) {
+    try {
+        await ai.prime();
+        if (!ai.isEnabled()) {
+            console.error(chalk.red(ai.disabledHint()));
+            process.exitCode = 1;
+            return;
+        }
+
+        const gentPath = await getGentPath();
+        const context = await buildRepoContext(gentPath);
+        const history = [];
+
+        if (initialMessage && initialMessage.trim()) {
+            await reply(initialMessage.trim(), context, history);
+            return;
+        }
+        if (!process.stdin.isTTY || !process.stdout.isTTY) {
+            console.error(chalk.red('Usage: gent chat "<message>"'));
+            process.exitCode = 1;
+            return;
+        }
+
+        console.log(chalk.bold.cyan(`\nGent AI chat (${ai.getModel()})`));
+        console.log(chalk.gray('Type exit or quit to finish.\n'));
+        while (true) {
+            const { message } = await inquirer.prompt([{
+                type: 'input',
+                name: 'message',
+                message: 'You:',
+            }]);
+            const text = message.trim();
+            if (!text) continue;
+            if (/^(exit|quit)$/i.test(text)) break;
+            await reply(text, context, history);
+        }
+    } catch (error) {
+        console.error(chalk.red('Chat failed:'), error.message);
+        process.exitCode = 1;
+    }
+}
+
+async function reply(message, context, history) {
+    const previous = history
+        .map(turn => `User: ${turn.user}\nAssistant: ${turn.assistant}`)
+        .join('\n\n')
+        .slice(-MAX_HISTORY_CHARS);
+    const spinner = ora('Thinking...').start();
+    try {
+        const answer = await ai.complete({
+            profile: 'chat',
+            prompt:
+                `Repository context:\n${context}\n\n` +
+                (previous ? `Conversation:\n${previous}\n\n` : '') +
+                `User: ${message}`,
+            maxTokens: 700,
+        });
+        spinner.stop();
+        console.log(chalk.cyan('Gent AI: ') + answer + '\n');
+        history.push({ user: message, assistant: answer });
+        while (JSON.stringify(history).length > MAX_HISTORY_CHARS && history.length > 1) {
+            history.shift();
+        }
+    } catch (error) {
+        spinner.fail(chalk.red(error.message));
+    }
+}
+
+module.exports = chat;

package/src/commands/commit.js

@@ -41,6 +41,7 @@ async function commit(options) {
 
         // Optional: AI-suggested commit message (`gent commit --ai`)
         if (!message && options.ai) {
+            await ai.prime();
             if (!ai.isEnabled()) {
                 console.log(chalk.yellow(ai.disabledHint()));
             } else {

package/src/commands/config.js

@@ -7,12 +7,10 @@
  *   gent config unset <key>               → remove a setting
  *   gent config path                      → print config file location
  *
- *   gent config set ai.api_key <key>      ← stored obfuscated
  *   gent config set api.base_url http://localhost:8000
  */
 
 const chalk = require('chalk');
-const inquirer = require('inquirer');
 const userConfig = require('../utils/user-config');
 
 async function config(subcommand, args, options) {
@@ -102,26 +100,13 @@ async function set(key, value, options) {
         process.exit(1);
     }
 
-    // Secret prompt: if no value given for ai.api_key, prompt with masking.
-    if ((value === undefined || value === '') && key === 'ai.api_key') {
-        const answers = await inquirer.prompt([{
-            type: 'password',
-            name: 'value',
-            message: 'Anthropic API key:',
-            mask: '*',
-            validate: (input) => input.length > 0 || 'Key cannot be empty',
-        }]);
-        value = answers.value;
-    }
-
     if (value === undefined) {
         console.error(chalk.red('Usage: gent config set <key> <value>'));
         process.exit(1);
     }
 
     await userConfig.set(key, value);
-    const display = key === 'ai.api_key' ? userConfig.maskSecret(value) : value;
-    console.log(chalk.green(`✓ ${key} = ${display}`));
+    console.log(chalk.green(`✓ ${key} = ${value}`));
 
     const envName = userConfig.ENV_OVERRIDES[key];
     if (envName && process.env[envName]) {

package/src/commands/docs.js

@@ -30,6 +30,7 @@ async function docs(options = {}) {
         const cwd = process.cwd();
         const gentPath = await getGentPath();
 
+        await ai.prime();
         if (!ai.isEnabled()) {
             console.error(chalk.red('AI is required for `gent docs`.'));
             console.log(chalk.yellow(ai.disabledHint()));
@@ -45,6 +46,7 @@ async function docs(options = {}) {
         let draft;
         try {
             draft = await ai.complete({
+                profile: 'docs',
                 system:
                     'You write clear, accurate, well-formatted README.md files. ' +
                     'Use plain GitHub-flavored Markdown. Do not invent features that are not ' +

package/src/commands/doctor.js

@@ -2,7 +2,7 @@
  * Doctor Command - Health check for the gent CLI.
  *
  *   gent doctor              → run all checks
- *   gent doctor --ai         → also ping Anthropic with a 1-token request
+ *   gent doctor --ai         → also ping the Gent AI service
  *
  * Each row prints PASS / WARN / FAIL plus a hint on how to fix the issue.
  */
@@ -131,37 +131,37 @@ async function checkApi() {
 }
 
 async function checkAiKey(probe) {
-    const { value: key, source } = await ai.resolveKey();
-    if (!key) {
+    const { value: available, source } = await ai.resolveKey();
+    if (!available) {
         return {
-            name: 'AI key',
+            name: 'AI service',
             status: 'warn',
-            detail: 'not configured (AI features will be skipped, not failed)',
-            hint: 'Run `gent config set ai.api_key <key>` or set ANTHROPIC_API_KEY.',
+            detail: 'unavailable in this CLI installation',
+            hint: 'Ask the Gent distributor to provision the local AI credential.',
         };
     }
 
     if (!probe) {
         return {
-            name: 'AI key',
+            name: 'AI service',
             status: 'pass',
-            detail: `present [${source}], model: ${await ai.resolveModel()} (use --ai to live-test)`,
+            detail: `direct OpenAI [${source}], model: ${await ai.resolveModel()} (use --ai to live-test)`,
         };
     }
 
     try {
         await ai.complete({ prompt: 'ping', maxTokens: 4 });
         return {
-            name: 'AI key',
+            name: 'AI service',
             status: 'pass',
-            detail: `verified — model ${await ai.resolveModel()} responded`,
+            detail: 'verified — OpenAI responded',
         };
     } catch (err) {
         return {
-            name: 'AI key',
+            name: 'AI service',
             status: 'fail',
             detail: err.message,
-            hint: 'Re-check the key (`gent config set ai.api_key`) or model (`gent config set ai.model`).',
+            hint: 'Retry later or ask the Gent distributor to check AI quota and credentials.',
         };
     }
 }

package/src/commands/explain.js

@@ -4,9 +4,8 @@
  * ============================================================================
  *
  * PURPOSE:
- *   Turn a diff into a human explanation. With an API key set this uses Claude;
- *   without one it still prints the unified diff plus a hint, so the command is
- *   useful either way.
+ *   Turn a diff into a human explanation. AI-enabled installations get a fast
+ *   review; other installations still get the unified diff plus a hint.
  *
  * USAGE:
  *   gent explain            → explain the latest commit (HEAD)
@@ -116,6 +115,7 @@ async function explain(ref, 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()}`));

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
@@ -25,6 +27,11 @@ async function merge(sourceBranch, options) {
     const spinner = ora(`Merging '${sourceBranch}'...`).start();
 
     try {
+        if (options.ai) {
+            await ai.prime();
+            if (!ai.isEnabled()) throw new Error(ai.disabledHint());
+        }
+
         const gentPath = await getGentPath();
         const cwd = path.dirname(gentPath);
         const repository = await readJSON(path.join(gentPath, COMMITS_FILE));
@@ -95,6 +102,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 +145,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 +212,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 +229,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) {