gent-cli 26.0.0 → 27.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`**.
-- **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.
+- **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.
 - **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

package/package.json

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

package/src/commands/ai.js

@@ -28,7 +28,7 @@ async function status() {
 
     console.log(chalk.bold.cyan('\nGent AI status\n'));
     if (available) {
-        console.log(`  ${chalk.green('●')} Service:   ${chalk.white(`direct OpenAI [${source}]`)}`);
+        console.log(`  ${chalk.green('●')} Service:   ${chalk.white(source)}`);
     } else {
         console.log(`  ${chalk.gray('○')} Service:   ${chalk.gray('unavailable')}`);
         console.log(chalk.gray('             ↳ ' + ai.disabledHint()));

package/src/commands/doctor.js

@@ -145,7 +145,7 @@ async function checkAiKey(probe) {
         return {
             name: 'AI service',
             status: 'pass',
-            detail: `direct OpenAI [${source}], model: ${await ai.resolveModel()} (use --ai to live-test)`,
+            detail: `${source}, model: ${await ai.resolveModel()} (use --ai to live-test)`,
         };
     }
 

package/src/commands/resolve.js

@@ -33,6 +33,13 @@ 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();
@@ -65,15 +72,12 @@ async function resolve(options = {}) {
             return;
         }
 
-        if (!options.ai && ai.isEnabled() && process.stdin.isTTY && process.stdout.isTTY) {
+        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 — choose each conflict', value: 'manual' },
-                ],
+                choices: resolutionModes(),
             }]);
             options.ai = mode === 'ai';
         }
@@ -190,9 +194,7 @@ async function resolveHunk(seg, file, idx, total, options = {}) {
         { name: 'Keep both (ours then theirs)', value: 'both' },
         { name: 'Edit manually', value: 'edit' }
     ];
-    if (ai.isEnabled()) {
-        choices.splice(3, 0, { name: `Ask AI (${ai.getModel()})`, value: 'ai' });
-    }
+    choices.splice(3, 0, { name: `Resolve with AI (${ai.getModel()})`, value: 'ai' });
     choices.push({ name: 'Skip the rest of this file', value: 'skip' });
 
     if (options.ai) {
@@ -324,3 +326,4 @@ async function finalizeMerge(gentPath, staging, mergeState, entriesByName) {
 }
 
 module.exports = resolve;
+module.exports.resolutionModes = resolutionModes;

package/src/utils/ai-service.js

@@ -1,9 +1,12 @@
-/** Direct, low-latency OpenAI client for Gent's local AI commands. */
+/** Managed AI client for Gent commands, with a direct local-development override. */
 
 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 PROMPTS = Object.freeze({
     chat: 'Answer as a concise senior engineer. Use the repository context. Give the direct answer first.',
@@ -30,7 +33,9 @@ function getApiUrl() {
 
 async function resolveKey() {
     const value = getApiKey();
-    return { value, source: value ? 'local Gent installation' : 'unset' };
+    if (value) return { value, source: 'local Gent installation' };
+    managedEnabled = Boolean(await authStorage.getAccessToken());
+    return { value: managedEnabled ? 'managed' : null, source: managedEnabled ? 'managed Gent service' : 'unset' };
 }
 
 async function resolveModel() {
@@ -42,11 +47,11 @@ async function prime() {
 }
 
 function isEnabled() {
-    return Boolean(getApiKey());
+    return Boolean(getApiKey()) || managedEnabled;
 }
 
 function disabledHint() {
-    return 'Gent AI is unavailable in this CLI installation.';
+    return 'Gent AI is unavailable. Sign in with `gent login` and try again.';
 }
 
 function extractText(payload) {
@@ -62,10 +67,21 @@ function extractText(payload) {
 
 async function complete({ prompt, system, profile = 'chat', maxTokens = 1024 }) {
     const apiKey = getApiKey();
-    if (!apiKey) throw new Error(disabledHint());
-
+    if (!apiKey && !managedEnabled) await resolveKey();
+    if (!apiKey && !managedEnabled) throw new Error(disabledHint());
     const instructions = [PROMPTS[profile], system].filter(Boolean).join('\n\n');
     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,
@@ -90,10 +106,15 @@ async function complete({ prompt, system, profile = 'chat', maxTokens = 1024 })
 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.');
+    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.');
     if (apiError?.message) return new Error(`Gent AI failed: ${apiError.message}`);
+    if (typeof apiError === 'string') return new Error(apiError);
     return error;
 }