gent-cli 24.0.0 → 25.0.0

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();

package/src/utils/ai-service.js

@@ -1,209 +1,131 @@
-/**
- * ============================================================================
- * AI Service - Optional, key-gated Claude integration (hybrid layer)
- * ============================================================================
- *
- * PURPOSE:
- *   Power Gent's *optional* "smart" features (commit-message suggestions, diff
- *   explanations, AI-assisted conflict resolution). Every feature has a
- *   reliable algorithmic path; this layer only activates when the user has set
- *   an API key, and degrades gracefully (never throws into a command) when it
- *   is absent or the request fails.
- *
- * ENABLEMENT:
- *   Either set ANTHROPIC_API_KEY in the environment, OR save it once with
- *   `gent config set ai.api_key <key>` (stored in ~/.gent/cli-config.json).
- *   Optionally pick a model with GENT_AI_MODEL or `gent config set ai.model`.
- *   Default model: claude-opus-4-7. For a cheaper / faster option try
- *   claude-haiku-4-5 or claude-sonnet-4-6.
- *
- * IMPLEMENTATION NOTE:
- *   Calls the Anthropic Messages API (POST /v1/messages) directly over the
- *   project's existing `axios` dependency, to honour Gent's "no new runtime
- *   dependencies" constraint. A production app would normally use the official
- *   `@anthropic-ai/sdk`; raw HTTP is a deliberate trade-off here because the AI
- *   layer is optional and self-contained.
- *
- * ============================================================================
- */
+/** Direct, low-latency OpenAI client for Gent's local AI commands. */
 
 const axios = require('axios');
-const userConfig = require('./user-config');
 
-const API_URL = 'https://api.anthropic.com/v1/messages';
-const API_VERSION = '2023-06-01';
-const DEFAULT_MODEL = 'claude-opus-4-7';
+const API_URL = 'https://api.openai.com/v1/responses';
+const DEFAULT_MODEL = 'gpt-4.1-mini';
 
-// Per-process cache so repeated AI calls don't keep hitting disk.
-let _resolvedKey;
-let _resolvedKeySource;
-let _resolvedModel;
+const PROMPTS = Object.freeze({
+    chat: 'Answer as a concise senior engineer. Use the repository context. Give the direct answer first.',
+    review: 'Review fast. Return only concrete correctness, security, or regression risks, then brief fixes. If none, say "No blocking issues."',
+    merge: 'Resolve this merge conflict fast. Preserve both intended behaviors. Return only the final merged text with no markdown fence or explanation.',
+    commit: 'Write one concise conventional commit message. Return only the message.',
+    explain: 'Explain this change briefly and concretely. Return short bullets only.',
+    docs: 'Write concise, accurate repository documentation from only the supplied context.',
+    changelog: 'Create a concise user-facing changelog. Group related changes and omit filler.',
+    summary: 'Give a concise repository health assessment with the most important risk first.',
+});
 
-async function resolveKey() {
-    if (_resolvedKey !== undefined) {
-        return { value: _resolvedKey, source: _resolvedKeySource };
-    }
-    const r = await userConfig.getResolved('ai.api_key');
-    _resolvedKey = r.value || null;
-    _resolvedKeySource = r.source;
-    return { value: _resolvedKey, source: _resolvedKeySource };
+function getApiKey() {
+    return process.env.OPENAI_API_KEY || null;
 }
 
-async function resolveModel() {
-    if (_resolvedModel) return _resolvedModel;
-    const r = await userConfig.getResolved('ai.model');
-    _resolvedModel = r.value || DEFAULT_MODEL;
-    return _resolvedModel;
+function getModel() {
+    return process.env.GENT_AI_MODEL || DEFAULT_MODEL;
 }
 
-/**
- * Synchronous getter used in hot paths. Returns whatever was last resolved,
- * or falls back to env-only (the original behavior) on cold start.
- */
-function getApiKey() {
-    if (_resolvedKey !== undefined) return _resolvedKey;
-    return process.env.ANTHROPIC_API_KEY || null;
+function getApiUrl() {
+    return process.env.GENT_AI_API_URL || API_URL;
 }
 
-function getModel() {
-    if (_resolvedModel) return _resolvedModel;
-    return process.env.GENT_AI_MODEL || DEFAULT_MODEL;
+async function resolveKey() {
+    const value = getApiKey();
+    return { value, source: value ? 'local Gent installation' : 'unset' };
+}
+
+async function resolveModel() {
+    return getModel();
 }
 
-/**
- * Async pre-flight resolver — call once from a command before doing AI work
- * so isEnabled()/getModel() see the user-config values even if env is empty.
- */
 async function prime() {
-    await resolveKey();
-    await resolveModel();
+    return resolveKey();
 }
 
 function isEnabled() {
-    return !!getApiKey();
+    return Boolean(getApiKey());
 }
 
 function disabledHint() {
-    return 'AI features are off — save a key with `gent config set ai.api_key <key>` or set ANTHROPIC_API_KEY in your env.';
+    return 'Gent AI is unavailable in this CLI installation.';
 }
 
-/**
- * Low-level single-shot completion. Returns the assistant's text.
- * @param {Object} opts
- * @param {String} opts.prompt - user content
- * @param {String} [opts.system] - system prompt
- * @param {Number} [opts.maxTokens]
- * @returns {Promise<String>}
- */
-async function complete({ prompt, system, maxTokens = 1024, thinking = false }) {
-    // Make sure env/config-stored values are resolved even if the caller
-    // didn't prime() first.
-    await prime();
+function extractText(payload) {
+    const chunks = [];
+    for (const item of payload?.output || []) {
+        if (item.type !== 'message') continue;
+        for (const content of item.content || []) {
+            if (content.type === 'output_text' && content.text) chunks.push(content.text);
+        }
+    }
+    return chunks.join('').trim();
+}
 
+async function complete({ prompt, system, profile = 'chat', maxTokens = 1024 }) {
     const apiKey = getApiKey();
-    if (!apiKey) throw new Error('AI not enabled');
-
-    const body = {
-        model: getModel(),
-        max_tokens: maxTokens,
-        messages: [{ role: 'user', content: prompt }]
-    };
-    if (system) body.system = system;
-    // Adaptive thinking — opt-in per caller. We leave display at the API
-    // default ("omitted") so reasoning never leaks into CLI output; this just
-    // lets the model think harder on complex tasks (review, conflict resolve)
-    // without changing what the user sees.
-    if (thinking) body.thinking = { type: 'adaptive' };
+    if (!apiKey) throw new Error(disabledHint());
 
+    const instructions = [PROMPTS[profile], system].filter(Boolean).join('\n\n');
     try {
-        const res = await axios.post(API_URL, body, {
+        const response = await axios.post(getApiUrl(), {
+            model: getModel(),
+            input: prompt,
+            instructions,
+            max_output_tokens: maxTokens,
+            store: false,
+        }, {
             headers: {
-                'x-api-key': apiKey,
-                'anthropic-version': API_VERSION,
-                'content-type': 'application/json'
+                Authorization: `Bearer ${apiKey}`,
+                'Content-Type': 'application/json',
             },
-            timeout: 60000
+            timeout: 30000,
         });
-
-        const blocks = (res.data && res.data.content) || [];
-        return blocks
-            .filter(b => b.type === 'text')
-            .map(b => b.text)
-            .join('')
-            .trim();
-    } catch (err) {
-        throw enrichAiError(err);
+        const text = extractText(response.data);
+        if (!text) throw new Error('OpenAI returned an empty response');
+        return text;
+    } catch (error) {
+        throw enrichAiError(error);
     }
 }
 
-/**
- * Wrap raw Anthropic errors with hints that actually help the user.
- */
-function enrichAiError(err) {
-    const status = err?.response?.status;
-    const apiMsg = err?.response?.data?.error?.message || err?.response?.data?.message;
-    if (status === 401) {
-        return new Error('Anthropic rejected the API key (401). Check `gent config get ai.api_key` and try `gent ai test`.');
-    }
-    if (status === 404 || (apiMsg && /model/i.test(apiMsg))) {
-        return new Error(`Anthropic rejected the model "${getModel()}" — set a valid one with \`gent config set ai.model claude-opus-4-7\`.`);
-    }
-    if (status === 429) {
-        return new Error('Anthropic rate-limited the request (429). Retry in a moment or switch to a lighter model.');
-    }
-    if (apiMsg) return new Error(`AI request failed: ${apiMsg}`);
-    return err;
+function enrichAiError(error) {
+    const status = error?.response?.status;
+    const apiError = error?.response?.data?.error;
+    if (status === 401 || status === 403) return new Error('Gent AI credential was rejected.');
+    if (apiError?.code === 'insufficient_quota') return new Error('Gent AI quota is exhausted.');
+    if (status === 429) return new Error('Gent AI is busy. Retry in a moment.');
+    if (apiError?.message) return new Error(`Gent AI failed: ${apiError.message}`);
+    return error;
 }
 
-// ─── High-level helpers ─────────────────────────────────
-
-/**
- * Suggest a concise commit message from a staged diff / summary.
- * @param {String} diffSummary
- * @returns {Promise<String>}
- */
 async function suggestCommitMessage(diffSummary) {
-    const system =
-        'You write clear, conventional git commit messages. Reply with ONLY the commit ' +
-        'message: a concise imperative subject line (<=72 chars), optionally followed by ' +
-        'a blank line and short body. No quotes, no preamble, no markdown fences.';
-    const prompt = `Write a commit message for these staged changes:\n\n${diffSummary}`;
-    return complete({ system, prompt, maxTokens: 512 });
+    return complete({ profile: 'commit', prompt: diffSummary, maxTokens: 160 });
+}
+
+async function explainChanges(content, profile = 'explain') {
+    return complete({ profile, prompt: content, maxTokens: 500 });
 }
 
-/**
- * Explain a commit or diff in plain language.
- * @param {String} content - diff or commit details
- * @returns {Promise<String>}
- */
-async function explainChanges(content) {
-    const system =
-        'You are a senior engineer explaining a code change to a teammate. Summarize what ' +
-        'changed and why it matters in a few short bullet points. Be specific and concise.';
-    const prompt = `Explain these changes:\n\n${content}`;
-    return complete({ system, prompt, maxTokens: 1024 });
+async function reviewChanges(content, context = '') {
+    return complete({
+        profile: 'review',
+        system: context,
+        prompt: content,
+        maxTokens: 800,
+    });
 }
 
-/**
- * Propose a resolution for a single merge-conflict hunk.
- * @param {Object} hunk - { base?, ours, theirs, fileName? }
- * @returns {Promise<String>} the suggested merged text (no conflict markers)
- */
 async function resolveConflictHunk({ base, ours, theirs, fileName }) {
-    const system =
-        'You resolve git merge conflicts. Combine the intent of BOTH sides into a single ' +
-        'correct version. Reply with ONLY the resolved file section — no conflict markers, ' +
-        'no explanation, no markdown fences.';
     const prompt =
-        `File: ${fileName || 'unknown'}\n\n` +
-        `<<<<<<< BASE (common ancestor)\n${base || '(none)'}\n` +
-        `======= OURS\n${ours}\n` +
-        `======= THEIRS\n${theirs}\n>>>>>>>\n\n` +
-        'Return the merged result for this section.';
-    return complete({ system, prompt, maxTokens: 2048, thinking: true });
+        `File: ${fileName || 'unknown'}\n` +
+        `BASE:\n${base || '(none)'}\n\n` +
+        `OURS:\n${ours}\n\n` +
+        `THEIRS:\n${theirs}`;
+    return complete({ profile: 'merge', prompt, maxTokens: 1400 });
 }
 
 module.exports = {
+    PROMPTS,
+    DEFAULT_MODEL,
     isEnabled,
     getModel,
     getApiKey,
@@ -214,6 +136,7 @@ module.exports = {
     complete,
     suggestCommitMessage,
     explainChanges,
+    reviewChanges,
     resolveConflictHunk,
-    DEFAULT_MODEL,
+    extractText,
 };