gent-cli 27.0.0 → 29.0.0

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`**.
-- **Managed AI** (`gent chat`, `gent review`, `gent merge --ai`, `gent resolve --ai`) — low-latency AI through the signed-in Gent account, with task-specific prompts and no user API-key setup.
+- **Direct local AI** (`gent chat`, `gent review`, `gent merge --ai`, `gent resolve --ai`) — low-latency OpenRouter calls from the CLI with task-specific prompts. Configure once with `gent ai configure`.
 - **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
@@ -500,14 +500,18 @@ gent explain --staged             # explain currently staged changes
 
 ### Optional AI features
 
-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.
+AI calls run directly from the CLI. Run `gent ai configure` once to enter the
+OpenRouter key through a masked prompt; Gent stores it locally with owner-only
+permissions. Fast task-specific prompts keep review, merge resolution, chat,
+and summaries concise.
 
 ```bash
+gent ai configure                 # configure OpenRouter once on this computer
+gent ai configure <your-key>      # same, non-interactive (scripts, SSH)
+gent ai configure <your-key> --model vendor/model   # pin a different model
 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
+gent resolve                      # ours/theirs/both/AI/edit/skip per conflict hunk
 ```
 
 ### Tags

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gent-cli",
-  "version": "27.0.0",
+  "version": "29.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 tests/ai-service.test.js tests/auth-storage.test.js tests/resolve-options.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 tests/auth-storage.test.js tests/resolve-options.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 tests/auth-storage.test.js tests/local-ai-config.test.js tests/resolve-options.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 tests/auth-storage.test.js tests/local-ai-config.test.js tests/resolve-options.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,28 +1,68 @@
 /**
  * AI Command - Manage and verify AI integration.
  *
- *   gent ai status            → show the managed service status
+ *   gent ai configure         → securely save your own key for this computer
+ *   gent ai configure <key>   → same, without the interactive prompt
+ *   gent ai status            → show local AI status
  *   gent ai test              → make a tiny live request to confirm it works
  *   gent ai models            → show provider management information
  */
 
 const chalk = require('chalk');
+const inquirer = require('inquirer');
 const ora = require('ora');
 const ai = require('../utils/ai-service');
+const localAiConfig = require('../utils/local-ai-config');
 
-async function aiCommand(subcommand) {
+async function aiCommand(subcommand, key, options = {}) {
     const sub = (subcommand || 'status').toLowerCase();
     switch (sub) {
+        case 'configure': return configure(key, options);
         case 'status': return status();
         case 'test': return test();
         case 'models': return models();
         default:
             console.error(chalk.red(`Unknown subcommand '${sub}'`));
-            console.log(chalk.gray('Usage: gent ai <status|test|models>'));
+            console.log(chalk.gray('Usage: gent ai <configure|status|test|models>'));
             process.exit(1);
     }
 }
 
+async function configure(key, options = {}) {
+    // A key passed as an argument keeps `gent ai configure` usable in scripts,
+    // over SSH, and anywhere stdin is not a terminal.
+    let apiKey = typeof key === 'string' ? key.trim() : '';
+
+    if (!apiKey) {
+        if (!process.stdin.isTTY || !process.stdout.isTTY) {
+            console.error(chalk.red('No terminal available for the masked prompt.'));
+            console.log(chalk.gray('  Pass the key directly: gent ai configure <your-openrouter-key>'));
+            process.exitCode = 1;
+            return;
+        }
+        ({ apiKey } = await inquirer.prompt([{
+            type: 'password',
+            name: 'apiKey',
+            message: 'OpenRouter API key:',
+            mask: '*',
+            validate: value => localAiConfig.validateApiKey(value) || 'Enter a valid OpenRouter key beginning with sk-or-v1-.',
+        }]));
+    }
+
+    if (!localAiConfig.validateApiKey(apiKey)) {
+        console.error(chalk.red('That is not a valid OpenRouter key. Keys begin with sk-or-v1-.'));
+        console.log(chalk.gray('  Create one at https://openrouter.ai/keys'));
+        process.exitCode = 1;
+        return;
+    }
+
+    const savedPath = await localAiConfig.saveApiKey(apiKey, { model: options.model });
+    console.log(chalk.green('✓ Gent AI configured for this computer with your own key.'));
+    console.log(chalk.gray(`  Stored locally in ${savedPath} with owner-only permissions.`));
+    console.log(chalk.gray(`  Model: ${await ai.resolveModel()}`));
+    console.log(chalk.gray('  Run `gent ai test` to verify it.'));
+}
+
 async function status() {
     const { value: available, source } = await ai.resolveKey();
 
@@ -49,7 +89,7 @@ async function test() {
     try {
         const reply = await ai.complete({
             prompt: 'Reply with the single word: pong',
-            maxTokens: 8,
+            maxTokens: 32,
         });
         spinner.succeed(chalk.green(`✓ Reachable. Reply: "${reply}"`));
     } catch (err) {

package/src/commands/canonical.js

@@ -216,7 +216,7 @@ const handlers = {
                 continue;
             }
             try {
-                const suggestion = await ai.resolveConflictHunk({
+                const resolution = await ai.resolveConflictHunk({
                     base: sides.base?.toString('utf8') || '',
                     ours: sides.ours?.toString('utf8') || '',
                     theirs: sides.theirs?.toString('utf8') || '',
@@ -226,10 +226,11 @@ const handlers = {
                 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 fs.writeFile(absolute, resolution.merged, 'utf8');
                 await merge.markResolved(repo, name);
                 resolved++;
                 console.log(`Resolved and staged ${name}`);
+                console.log(`  AI: ${resolution.summary}`);
             } catch (error) {
                 console.log(`AI did not resolve ${name}: ${error.message}`);
             }

package/src/commands/doctor.js

@@ -137,7 +137,7 @@ async function checkAiKey(probe) {
             name: 'AI service',
             status: 'warn',
             detail: 'unavailable in this CLI installation',
-            hint: 'Ask the Gent distributor to provision the local AI credential.',
+            hint: 'Run `gent ai configure` once on this computer.',
         };
     }
 
@@ -154,14 +154,14 @@ async function checkAiKey(probe) {
         return {
             name: 'AI service',
             status: 'pass',
-            detail: 'verified — OpenAI responded',
+            detail: 'verified — OpenRouter responded',
         };
     } catch (err) {
         return {
             name: 'AI service',
             status: 'fail',
             detail: err.message,
-            hint: 'Retry later or ask the Gent distributor to check AI quota and credentials.',
+            hint: 'Run `gent ai configure` to replace the key, or check credits at https://openrouter.ai/credits.',
         };
     }
 }

package/src/commands/resolve.js

@@ -33,13 +33,6 @@ const journal = require('../utils/journal');
 const ai = require('../utils/ai-service');
 const reviewCommand = require('./review');
 
-function resolutionModes() {
-    return [
-        { name: 'Resolve with AI (fast) — resolve, commit, then review', value: 'ai' },
-        { name: 'Resolve manually — choose each conflict', value: 'manual' },
-    ];
-}
-
 async function resolve(options = {}) {
     try {
         await ai.prime();
@@ -72,16 +65,6 @@ async function resolve(options = {}) {
             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: resolutionModes(),
-            }]);
-            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).
@@ -110,6 +93,7 @@ async function resolve(options = {}) {
             let idx = 0;
             let aborted = false;
             const out = [];
+            const aiSummaries = [];
 
             for (const seg of segments) {
                 if (seg.type === 'text') {
@@ -117,7 +101,7 @@ async function resolve(options = {}) {
                     continue;
                 }
                 idx++;
-                const resolvedLines = await resolveHunk(seg, file, idx, conflictCount, options);
+                const resolvedLines = await resolveHunk(seg, file, idx, conflictCount, options, aiSummaries);
                 if (resolvedLines === null) { aborted = true; break; }
                 out.push(...resolvedLines);
             }
@@ -137,6 +121,9 @@ async function resolve(options = {}) {
             } else {
                 await stageResolved(gentPath, staging, entriesByName, file, resolvedContent);
                 console.log(chalk.green(`  ✓ resolved ${file}`));
+                if (aiSummaries.length) {
+                    console.log(chalk.gray(`    AI: ${summarizeFileChanges(aiSummaries)}`));
+                }
             }
         }
 
@@ -181,24 +168,17 @@ async function resolve(options = {}) {
  * 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, options = {}) {
+async function resolveHunk(seg, file, idx, total, options = {}, aiSummaries = []) {
     console.log(chalk.gray(`  Conflict ${idx}/${total}:`));
     console.log(chalk.green('    <<< ours'));
     seg.ours.forEach(l => console.log(chalk.green(`      ${l}`)));
     console.log(chalk.red('    >>> theirs'));
     seg.theirs.forEach(l => console.log(chalk.red(`      ${l}`)));
 
-    const choices = [
-        { name: 'Keep ours', value: 'ours' },
-        { name: 'Keep theirs', value: 'theirs' },
-        { name: 'Keep both (ours then theirs)', value: 'both' },
-        { name: 'Edit manually', value: 'edit' }
-    ];
-    choices.splice(3, 0, { name: `Resolve with AI (${ai.getModel()})`, value: 'ai' });
-    choices.push({ name: 'Skip the rest of this file', value: 'skip' });
+    const choices = resolutionChoices();
 
     if (options.ai) {
-        const suggestion = await askAiForHunk(seg, file, true);
+        const suggestion = await askAiForHunk(seg, file, true, aiSummaries);
         if (suggestion !== null) return suggestion;
         return null;
     }
@@ -225,40 +205,64 @@ async function resolveHunk(seg, file, idx, total, options = {}) {
             return text.replace(/\n$/, '').split('\n');
         }
         case 'ai': {
-            const suggestion = await askAiForHunk(seg, file);
+            const suggestion = await askAiForHunk(seg, file, false, aiSummaries);
             if (suggestion !== null) return suggestion;
-            return resolveHunk(seg, file, idx, total, { ai: false });
+            return resolveHunk(seg, file, idx, total, { ai: false }, aiSummaries);
         }
         default: return seg.ours;
     }
 }
 
-async function askAiForHunk(seg, file, autoAccept = false) {
+function resolutionChoices() {
+    return [
+        { name: 'Keep ours', value: 'ours' },
+        { name: 'Keep theirs', value: 'theirs' },
+        { name: 'Keep both (ours then theirs)', value: 'both' },
+        { name: `Resolve with AI (${ai.getModel()})`, value: 'ai' },
+        { name: 'Edit manually', value: 'edit' },
+        { name: 'Skip the rest of this file', value: 'skip' },
+    ];
+}
+
+async function askAiForHunk(seg, file, autoAccept = false, aiSummaries = []) {
     try {
-        const suggestion = await ai.resolveConflictHunk({
+        const resolution = 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');
+            aiSummaries.push(resolution.summary);
+            return resolution.merged.split('\n');
         }
         console.log(chalk.cyan('    AI suggestion (review before accepting):'));
-        suggestion.split('\n').forEach(line => console.log(chalk.cyan(`      ${line}`)));
+        resolution.merged.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;
+        if (!accept) return null;
+        aiSummaries.push(resolution.summary);
+        return resolution.merged.split('\n');
     } catch (error) {
         console.log(chalk.yellow(`    AI failed (${error.message}); no file was changed.`));
         return null;
     }
 }
 
+function summarizeFileChanges(summaries) {
+    const summary = [...new Set(summaries)].join('; ');
+    const words = summary.split(/\s+/);
+    const wordLimited = words.length <= 32
+        ? summary
+        : `${words.slice(0, 32).join(' ')}...`;
+    return wordLimited.length <= 220
+        ? wordLimited
+        : `${wordLimited.slice(0, 217).trimEnd()}...`;
+}
+
 /** 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);
@@ -326,4 +330,4 @@ async function finalizeMerge(gentPath, staging, mergeState, entriesByName) {
 }
 
 module.exports = resolve;
-module.exports.resolutionModes = resolutionModes;
+module.exports.resolutionChoices = resolutionChoices;

package/src/index.js

@@ -369,8 +369,9 @@ program
     .action(doctorCommand);
 
 program
-    .command('ai [subcommand]')
-    .description('Inspect AI integration (status|test|models)')
+    .command('ai [subcommand] [key]')
+    .description('Configure or inspect local AI (configure|status|test|models)')
+    .option('--model <id>', 'Pin an OpenRouter model id for this computer')
     .action(aiCommand);
 
 // ─── Platform-special (AI-powered) ──────────────────────

package/src/utils/ai-service.js

@@ -1,17 +1,19 @@
-/** Managed AI client for Gent commands, with a direct local-development override. */
+/** Direct, low-latency OpenRouter client for Gent's local AI commands. */
 
 const axios = require('axios');
-const apiClient = require('./api-client');
-const authStorage = require('./auth-storage');
 
-const API_URL = 'https://api.openai.com/v1/responses';
-const DEFAULT_MODEL = 'gpt-4.1-mini';
-let managedEnabled = false;
+const API_URL = 'https://openrouter.ai/api/v1/chat/completions';
+const DEFAULT_MODEL = 'xiaomi/mimo-v2.5:nitro';
+// The default model reasons before answering, and those tokens come out of the
+// same budget as the reply. Too small a budget returns content: null with
+// finish_reason "length", so keep a floor and add headroom on every request.
+const MIN_OUTPUT_TOKENS = 256;
+const REASONING_HEADROOM = 512;
 
 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.',
+    merge: 'Resolve this merge conflict fast. Preserve both intended behaviors. Return only valid JSON with this shape: {"merged":"final merged text","summary":"one sentence, at most 18 words, saying what was kept or combined"}. Do not use markdown fences.',
     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.',
@@ -20,7 +22,9 @@ const PROMPTS = Object.freeze({
 });
 
 function getApiKey() {
-    return process.env.OPENAI_API_KEY || null;
+    // OPENAI_API_KEY stays readable so installs configured before the
+    // OpenRouter switch keep working until they reconfigure.
+    return process.env.OPENROUTER_API_KEY || process.env.OPENAI_API_KEY || null;
 }
 
 function getModel() {
@@ -33,9 +37,7 @@ function getApiUrl() {
 
 async function resolveKey() {
     const value = getApiKey();
-    if (value) return { value, source: 'local Gent installation' };
-    managedEnabled = Boolean(await authStorage.getAccessToken());
-    return { value: managedEnabled ? 'managed' : null, source: managedEnabled ? 'managed Gent service' : 'unset' };
+    return { value, source: value ? 'local CLI configuration (OpenRouter)' : 'unset' };
 }
 
 async function resolveModel() {
@@ -47,15 +49,27 @@ async function prime() {
 }
 
 function isEnabled() {
-    return Boolean(getApiKey()) || managedEnabled;
+    return Boolean(getApiKey());
 }
 
 function disabledHint() {
-    return 'Gent AI is unavailable. Sign in with `gent login` and try again.';
+    return 'Gent AI is unavailable. Run `gent ai configure` once on this computer.';
 }
 
 function extractText(payload) {
     const chunks = [];
+    // OpenRouter / chat-completions shape.
+    for (const choice of payload?.choices || []) {
+        const content = choice?.message?.content;
+        if (typeof content === 'string') {
+            chunks.push(content);
+        } else if (Array.isArray(content)) {
+            for (const part of content) {
+                if (typeof part?.text === 'string') chunks.push(part.text);
+            }
+        }
+    }
+    // Responses-API shape, still accepted so a custom GENT_AI_API_URL works.
     for (const item of payload?.output || []) {
         if (item.type !== 'message') continue;
         for (const content of item.content || []) {
@@ -65,38 +79,40 @@ function extractText(payload) {
     return chunks.join('').trim();
 }
 
+function truncatedByBudget(payload) {
+    return (payload?.choices || []).some(choice => choice?.finish_reason === 'length');
+}
+
 async function complete({ prompt, system, profile = 'chat', maxTokens = 1024 }) {
     const apiKey = getApiKey();
-    if (!apiKey && !managedEnabled) await resolveKey();
-    if (!apiKey && !managedEnabled) throw new Error(disabledHint());
+    if (!apiKey) throw new Error(disabledHint());
     const instructions = [PROMPTS[profile], system].filter(Boolean).join('\n\n');
+    const budget = Math.max(MIN_OUTPUT_TOKENS, maxTokens) + REASONING_HEADROOM;
     try {
-        if (!apiKey) {
-            const response = await apiClient.post('/api/ai/complete/', {
-                profile,
-                prompt,
-                system,
-                max_tokens: maxTokens,
-            });
-            const text = response?.output_text?.trim();
-            if (!text) throw new Error('Gent AI returned an empty response');
-            return text;
-        }
         const response = await axios.post(getApiUrl(), {
             model: getModel(),
-            input: prompt,
-            instructions,
-            max_output_tokens: maxTokens,
-            store: false,
+            messages: [
+                ...(instructions ? [{ role: 'system', content: instructions }] : []),
+                { role: 'user', content: prompt },
+            ],
+            max_tokens: budget,
+            // Keep reasoning models brief; ignored by models without reasoning.
+            reasoning: { effort: 'low' },
         }, {
             headers: {
                 Authorization: `Bearer ${apiKey}`,
                 'Content-Type': 'application/json',
+                'HTTP-Referer': 'https://github.com/gent-cli',
+                'X-Title': 'Gent CLI',
             },
-            timeout: 30000,
+            timeout: 60000,
         });
         const text = extractText(response.data);
-        if (!text) throw new Error('OpenAI returned an empty response');
+        if (!text) {
+            throw new Error(truncatedByBudget(response.data)
+                ? `Model "${getModel()}" used the whole ${budget}-token budget before replying. Raise it or set GENT_AI_MODEL to a lighter model.`
+                : `Model "${getModel()}" returned an empty response.`);
+        }
         return text;
     } catch (error) {
         throw enrichAiError(error);
@@ -107,12 +123,14 @@ function enrichAiError(error) {
     const status = error?.response?.status;
     const apiError = error?.response?.data?.error;
     const apiCode = typeof apiError === 'object' ? apiError?.code : null;
-    if (status === 401) return new Error('Sign in with `gent login` to use Gent AI.');
-    if (status === 404) return new Error('Gent AI is not available on this Gent server yet.');
-    if (status === 403) return new Error('Gent AI access was rejected.');
-    if (status === 503) return new Error('Gent AI is temporarily unavailable.');
-    if (apiCode === 'insufficient_quota') return new Error('Gent AI quota is exhausted.');
-    if (status === 429) return new Error('Gent AI is busy. Retry in a moment.');
+    const apiType = typeof apiError === 'object' ? apiError?.type : null;
+    const quotaCodes = ['insufficient_quota', 'credit_balance_exhausted', 'billing_hard_limit_reached'];
+    if (status === 401 || status === 403) return new Error('OpenRouter rejected the configured CLI credential. Run `gent ai configure` with a valid key.');
+    if (status === 404) return new Error(`OpenRouter has no model "${getModel()}". Set GENT_AI_MODEL to a model id from https://openrouter.ai/models.`);
+    if (status === 402 || quotaCodes.includes(apiCode) || quotaCodes.includes(apiType)) {
+        return new Error('OpenRouter billing: this key has no credits left. Add credits at https://openrouter.ai/credits — the key itself is valid.');
+    }
+    if (status === 429) return new Error('Gent AI is rate limited. Retry in a moment.');
     if (apiError?.message) return new Error(`Gent AI failed: ${apiError.message}`);
     if (typeof apiError === 'string') return new Error(apiError);
     return error;
@@ -141,12 +159,49 @@ async function resolveConflictHunk({ base, ours, theirs, fileName }) {
         `BASE:\n${base || '(none)'}\n\n` +
         `OURS:\n${ours}\n\n` +
         `THEIRS:\n${theirs}`;
-    return complete({ profile: 'merge', prompt, maxTokens: 1400 });
+    const response = await complete({ profile: 'merge', prompt, maxTokens: 1400 });
+    return parseMergeResolution(response);
+}
+
+function parseMergeResolution(response) {
+    const cleaned = response
+        .replace(/^```(?:json)?\s*/i, '')
+        .replace(/\s*```$/, '')
+        .trim();
+    try {
+        const parsed = JSON.parse(cleaned);
+        if (typeof parsed.merged !== 'string') throw new Error('missing merged text');
+        return {
+            merged: parsed.merged,
+            summary: briefSummary(parsed.summary),
+        };
+    } catch {
+        return {
+            merged: response,
+            summary: 'Combined the conflicting changes.',
+        };
+    }
+}
+
+function briefSummary(value) {
+    const summary = typeof value === 'string'
+        ? value.replace(/\s+/g, ' ').trim()
+        : '';
+    if (!summary) return 'Combined the conflicting changes.';
+    const words = summary.split(' ');
+    const wordLimited = words.length <= 18
+        ? summary
+        : `${words.slice(0, 18).join(' ')}...`;
+    return wordLimited.length <= 160
+        ? wordLimited
+        : `${wordLimited.slice(0, 157).trimEnd()}...`;
 }
 
 module.exports = {
     PROMPTS,
     DEFAULT_MODEL,
+    MIN_OUTPUT_TOKENS,
+    REASONING_HEADROOM,
     isEnabled,
     getModel,
     getApiKey,
@@ -159,5 +214,6 @@ module.exports = {
     explainChanges,
     reviewChanges,
     resolveConflictHunk,
+    parseMergeResolution,
     extractText,
 };

package/src/utils/local-ai-config.js

@@ -0,0 +1,51 @@
+const fs = require('fs').promises;
+const os = require('os');
+const path = require('path');
+const { GENT_DIR } = require('./constants');
+
+const KEY_NAME = 'OPENROUTER_API_KEY';
+// Written alongside the key so an install configured before the OpenRouter
+// switch does not keep pinning a stale OpenAI model id.
+const LEGACY_KEY_NAMES = ['OPENAI_API_KEY'];
+
+function getEnvPath() {
+    return path.join(os.homedir(), GENT_DIR, '.env');
+}
+
+function validateApiKey(value) {
+    return typeof value === 'string' && /^sk-or-v1-[A-Za-z0-9]{32,}$/.test(value.trim());
+}
+
+async function saveApiKey(value, { model } = {}) {
+    const apiKey = typeof value === 'string' ? value.trim() : '';
+    if (!validateApiKey(apiKey)) throw new Error('Enter a valid OpenRouter API key beginning with sk-or-v1-.');
+
+    const envPath = getEnvPath();
+    const directory = path.dirname(envPath);
+    const existing = await fs.readFile(envPath, 'utf8').catch(error => {
+        if (error.code === 'ENOENT') return '';
+        throw error;
+    });
+    const managed = [KEY_NAME, ...LEGACY_KEY_NAMES];
+    const lines = existing
+        .split(/\r?\n/)
+        .filter(line => !managed.some(name => new RegExp(`^\\s*${name}\\s*=`).test(line)))
+        // Drop any model pinned for a previous provider; the service default wins.
+        .filter(line => !/^\s*GENT_AI_MODEL\s*=/.test(line));
+    while (lines.length && lines[lines.length - 1] === '') lines.pop();
+    lines.push(`${KEY_NAME}=${apiKey}`);
+    if (model) lines.push(`GENT_AI_MODEL=${model}`);
+
+    await fs.mkdir(directory, { recursive: true, mode: 0o700 });
+    const temporary = `${envPath}.tmp-${process.pid}`;
+    await fs.writeFile(temporary, lines.join('\n') + '\n', { encoding: 'utf8', mode: 0o600 });
+    await fs.rename(temporary, envPath);
+    await fs.chmod(envPath, 0o600);
+    process.env[KEY_NAME] = apiKey;
+    for (const name of LEGACY_KEY_NAMES) delete process.env[name];
+    if (model) process.env.GENT_AI_MODEL = model;
+    else delete process.env.GENT_AI_MODEL;
+    return envPath;
+}
+
+module.exports = { getEnvPath, validateApiKey, saveApiKey, KEY_NAME };