@thegitai/cli 1.0.0-preview.2 → 1.0.0-preview.21

package/README.md

@@ -1,8 +1,10 @@
-# TheGitAI
+# TheGitAI — AI coding agent for your terminal
 
-Interactive terminal coding agent. Talk to your repo in plain English — it reads
-your code, makes edits, runs the commands a task needs, and keeps long-running
-processes going while you work, all with your approval.
+TheGitAI is an AI coding agent for your terminal. It indexes your repository,
+writes and edits files, runs commands, and builds features with you.
+
+Talk to your repo in plain English. TheGitAI can keep long-running processes
+going while you work, all with your approval.
 
 ## Install
 
@@ -26,6 +28,32 @@ ai --version        print the version and exit
 
 Run `ai --help` for sessions, modes, keys, and chat commands.
 
+Coding sessions require an interactive terminal on stdin and stdout. Piped
+one-shot prompts are not supported. Saved history is local to the repo and can
+always be viewed or resumed from that computer. Continuing it through the
+service requires the TheGitAI account used for that session. Local sessions can
+also be listed while signed out or offline.
+
+CLI login tokens use a rolling 24-hour inactivity timeout. If one expires during
+any server request, the CLI saves the local session, removes the expired
+credential, and asks you to run `ai login` before resuming.
+
+## Structured questions
+
+The agent can pause its current turn to ask up to four related questions in one
+form. Use **↑ / ↓**, the displayed option number, or **Enter** to choose, and
+**← / →** to move between questions. **Something else / add details** is the
+numbered final option; focus it and type, paste, or press **Enter** to add a
+single-line note. On single-select questions it is mutually exclusive with the
+listed choices, and **↑ / ↓** leaves its editor when the note is empty.
+Multi-select questions toggle choices. The last question has an explicit
+**Submit answers** row. **Esc** closes an open note first and otherwise cancels
+the form; **Ctrl+C** cancels the whole turn.
+
+Answers return to the same turn, and completed question/answer records remain
+readable when the session is resumed. Default, Auto-Accept, and Plan modes all
+support the form; Auto-Accept does not choose answers for you.
+
 ## Visible to-do list
 
 For larger multi-step tasks, the agent keeps a compact to-do list on screen so

package/dist/bin/ai.js

@@ -4,21 +4,17 @@ import { stdin as input, stdout as output } from 'node:process';
 import readline from 'node:readline/promises';
 import { ServerApi } from '../src/api/index.js';
 import { loginViaBrowser } from '../src/api/browser-login.js';
-import { isTransientNetworkError } from '../src/api/http.js';
-import { formatCliHelpText, formatInteractiveHelpText, } from '../src/help-text.js';
-import { renderMarkdownForTerminal } from '../src/markdown-renderer.js';
+import { authenticationErrorMessage, isAuthenticationError, isTransientNetworkError, } from '../src/api/http.js';
+import { formatCliHelpText } from '../src/help-text.js';
 import { createIndex } from '../src/project-index.js';
-import { createSession, clearConversation } from '../src/session.js';
-import { applySessionSnapshot, listSessionMetadata, loadSessionSnapshot, saveSessionState, } from '../src/session-store.js';
-import { runClientInteractive, shouldUseClientRatatuiShell, } from '../src/ui/repl.js';
+import { createSession } from '../src/session.js';
+import { applySessionSnapshot, listSessionMetadata, loadSessionSnapshot, saveSessionState, sessionHasUserMessage, } from '../src/session-store.js';
+import { runClientInteractive } from '../src/ui/repl.js';
 import { appendPromptToFile } from '../src/ui/prompt-history-store.js';
 import { formatSessionExitNotice } from '../src/session-exit.js';
 import { formatUsageText } from '../src/usage.js';
 import { formatVersionLine } from '../src/version.js';
 import { parseArgs } from '../src/cli-args.js';
-import { getJobBufferedOutput, killBackgroundJob, killAllBackgroundJobs, listBackgroundJobs, setBackgroundJobSession, } from '../src/background-jobs.js';
-import { collectBackgroundJobUiKillMutations, collectBackgroundJobUiOutputMutations, } from '../src/tool-executor.js';
-import { setScratchSession } from '../src/scratch-dir.js';
 const DEFAULT_SERVER_URL = 'https://thegit.ai';
 const { auth, chat, models, sessions } = ServerApi;
 function printUsage() {
@@ -112,54 +108,16 @@ function printSessionList(rootDir, sessions, serverModels) {
         }
     }
 }
-function printStartupBanner(rootDir, modelLabel, autoYes) {
-    console.log(chalk.dim(`Project: ${rootDir}`));
-    console.log(chalk.dim(`Model: ${modelLabel}`));
-    if (autoYes) {
-        console.log(chalk.dim('Auto-confirm: enabled'));
-    }
-}
-function printSessionStartup(session) {
-    console.log(chalk.dim(`Session: ${session.sessionName ? `${session.sessionName} ` : ''}${session.sessionId}`));
-}
 function printSessionExit(session) {
     console.log(chalk.dim(`\n${formatSessionExitNotice(session.sessionId)}\n`));
 }
 function modelLabel(serverModels, modelId) {
-    return (serverModels.models.find((model) => model.id === modelId)?.label ??
-        'Unknown model');
-}
-function formatJobElapsedMs(ms) {
-    const totalSeconds = Math.max(0, Math.floor(ms / 1000));
-    if (totalSeconds < 60)
-        return `${totalSeconds}s`;
-    const minutes = Math.floor(totalSeconds / 60);
-    if (minutes < 60)
-        return `${minutes}m${String(totalSeconds % 60).padStart(2, '0')}s`;
-    return `${Math.floor(minutes / 60)}h${String(minutes % 60).padStart(2, '0')}m`;
-}
-function makeConfirmCommand(session) {
-    return async (command) => {
-        console.log(chalk.bold(`\nCommand approval needed:\n${command}\n`));
-        const answer = (await promptText('Approve? [y]es/[a]ll/[n]o', 'n')).toLowerCase();
-        if (answer === 'a' || answer === 'all') {
-            session.autoYes = true;
-            return true;
-        }
-        return answer === 'y' || answer === 'yes';
-    };
-}
-function makeConfirmPatch(session) {
-    return async (filePath) => {
-        const answer = (await promptText(`Apply patch to ${filePath}? [y]es/[a]ll/[n]o`, 'n')).toLowerCase();
-        if (answer === 'a' || answer === 'all') {
-            session.autoYes = true;
-            return true;
-        }
-        return answer === 'y' || answer === 'yes';
-    };
+    return (serverModels?.models.find((model) => model.id === modelId)?.label ??
+        `Model ${modelId}`);
 }
 async function saveSessionBoth({ session, serverSessionClient, }) {
+    if (!sessionHasUserMessage(session))
+        return;
     saveSessionState(session);
     try {
         await serverSessionClient.save(session);
@@ -168,197 +126,18 @@ async function saveSessionBoth({ session, serverSessionClient, }) {
         console.error(chalk.yellow(`Warning: session save failed: ${error.message}`));
     }
 }
-async function promptForModelSelection(currentModelId, authConfig) {
-    const serverModels = await models.fetchServerModels({ config: authConfig });
-    console.log(chalk.bold('\nAvailable models'));
-    for (const model of serverModels.models) {
-        const marker = model.id === currentModelId ? '*' : ' ';
-        console.log(`${marker} ${model.id}  ${model.label}`);
-    }
-    console.log();
-    const selected = (await promptText('Model id', '')).trim() || null;
-    if (!selected) {
-        return { selected: null, serverModels };
-    }
-    return {
-        selected: models.validateServerModel(selected, serverModels),
-        serverModels,
-    };
-}
-async function promptForResumeSession(rootDir, serverModels) {
-    const sessions = listSessionMetadata(rootDir);
-    if (!sessions.length) {
-        console.log(chalk.dim('No saved sessions for this repo.\n'));
-        return null;
-    }
-    printSessionList(rootDir, sessions, serverModels);
-    console.log();
-    const identifier = (await promptText('Session id or name', '')).trim();
-    if (!identifier) {
-        return null;
-    }
-    return loadSessionSnapshot(rootDir, identifier);
-}
-async function runTurn({ authConfig, projectIndex, serverSessionClient, session, inputText, }) {
-    const prompt = String(inputText ?? '').trim();
-    if (!prompt)
-        return;
-    appendPromptHistory(prompt, session.env);
-    const result = await chat.sendServerUserMessage({
-        config: authConfig,
-        projectIndex,
-        session,
-        input: prompt,
-    });
-    if (result.text) {
-        console.log(`\n${chalk.green('TheGitAI>')}`);
-        console.log(renderMarkdownForTerminal(result.text));
-        console.log();
-    }
-    await saveSessionBoth({ session, serverSessionClient });
-}
-async function mainInteractive({ authConfig, projectIndex, serverModels, serverSessionClient, session, usageText, initialPrompt, }) {
-    if (initialPrompt) {
-        console.log(chalk.dim(`Prompt: "${initialPrompt}"`));
-        await runTurn({
-            authConfig,
-            projectIndex,
-            serverSessionClient,
-            session,
-            inputText: initialPrompt,
-        });
-    }
-    while (true) {
-        const inputText = await promptText('you');
-        const trimmed = inputText.trim();
-        if (!trimmed)
-            continue;
-        if (trimmed === '/exit')
-            return;
-        if (trimmed === '/help') {
-            console.log(renderMarkdownForTerminal(formatInteractiveHelpText()));
-            continue;
-        }
-        if (trimmed === '/usage') {
-            console.log(await usageText());
-            continue;
-        }
-        if (trimmed === '/clear') {
-            clearConversation(session);
-            await saveSessionBoth({ session, serverSessionClient });
-            console.log(chalk.dim('Conversation cleared.\n'));
-            continue;
-        }
-        if (trimmed === '/jobs' || trimmed.startsWith('/jobs ')) {
-            const jobsArgs = trimmed.slice('/jobs'.length).trim();
-            const killMatch = jobsArgs.match(/^kill\s+(\S+)$/);
-            if (killMatch) {
-                const jobId = killMatch[1];
-                const killed = await killBackgroundJob(jobId);
-                await collectBackgroundJobUiKillMutations({
-                    session,
-                    projectIndex,
-                    jobId,
-                    result: killed,
-                });
-                if (!killed.ok) {
-                    console.log(chalk.red(killed.error ?? 'Background job kill failed.'));
-                }
-                else if (killed.alreadyFinished) {
-                    console.log(chalk.dim(`${jobId} had already finished.`));
-                }
-                continue;
-            }
-            const outputMatch = jobsArgs.match(/^output\s+(\S+)$/);
-            if (outputMatch) {
-                const jobId = outputMatch[1];
-                await collectBackgroundJobUiOutputMutations({
-                    session,
-                    projectIndex,
-                    jobId,
-                });
-                const job = listBackgroundJobs().find((candidate) => candidate.id === jobId);
-                const buffered = getJobBufferedOutput(jobId);
-                if (!job || !buffered) {
-                    console.log(chalk.red(`Unknown background job id: ${jobId}`));
-                    continue;
-                }
-                if (buffered.droppedChars > 0) {
-                    console.log(chalk.dim(`... (${buffered.droppedChars} chars of older output dropped) ...`));
-                }
-                console.log(buffered.output || chalk.dim('(no output captured)'));
-                continue;
-            }
-            if (jobsArgs) {
-                console.log(chalk.dim('Usage: /jobs — list · /jobs output <id> — full output · /jobs kill <id> — kill'));
-                continue;
-            }
-            const jobsList = listBackgroundJobs();
-            if (!jobsList.length) {
-                console.log(chalk.dim('No background jobs in this session.'));
-                continue;
-            }
-            for (const job of jobsList) {
-                const elapsed = formatJobElapsedMs((job.endedAt ?? Date.now()) - job.startedAt);
-                const stateText = job.status === 'running'
-                    ? `running · ${elapsed}`
-                    : job.status === 'killed'
-                        ? `killed · ran ${elapsed}`
-                        : job.status === 'error'
-                            ? 'failed to start'
-                            : `exited (code ${job.exitCode ?? 1}) · ran ${elapsed}`;
-                console.log(`${job.id} · ${stateText}\n    $ ${job.command}`);
-            }
-            continue;
-        }
-        if (trimmed === '/resume') {
-            const snapshot = await promptForResumeSession(session.rootDir, serverModels);
-            if (!snapshot) {
-                console.log(chalk.dim('Resume cancelled.\n'));
-                continue;
-            }
-            applySessionSnapshot(session, snapshot);
-            setBackgroundJobSession(session.sessionId);
-            setScratchSession(session.sessionId);
-            await saveSessionBoth({ session, serverSessionClient });
-            console.log(chalk.dim(`Resumed session${session.sessionName ? ` "${session.sessionName}"` : ''} (${session.sessionId})\n`));
-            continue;
-        }
-        if (trimmed === '/model' || trimmed.startsWith('/model ')) {
-            const inline = trimmed.slice('/model'.length).trim();
-            let serverModels;
-            let selected = null;
-            if (inline) {
-                serverModels = await models.fetchServerModels({ config: authConfig });
-                selected = models.validateServerModel(inline, serverModels);
-            }
-            else {
-                const response = await promptForModelSelection(session.modelId, authConfig);
-                serverModels = response.serverModels;
-                selected = response.selected;
-            }
-            if (!selected) {
-                console.log(chalk.dim('Model selection cancelled.\n'));
-                continue;
-            }
-            session.modelId = selected;
-            models.updateSelectedModelCache({
-                config: authConfig,
-                selectedModelId: selected,
-                serverModels,
-            });
-            await saveSessionBoth({ session, serverSessionClient });
-            console.log(chalk.dim(`Switched to ${modelLabel(serverModels, selected)}.\n`));
-            continue;
-        }
-        await runTurn({
-            authConfig,
-            projectIndex,
-            serverSessionClient,
-            session,
-            inputText: trimmed,
-        });
-    }
+function requireInteractiveTerminal() {
+    if (process.stdin.isTTY !== true) {
+        console.error('Error: stdin is not a terminal');
+        process.exitCode = 1;
+        return false;
+    }
+    if (process.stdout.isTTY !== true) {
+        console.error('Error: stdout is not a terminal');
+        process.exitCode = 1;
+        return false;
+    }
+    return true;
 }
 export async function main() {
     const { autoYes, help, version, usage, command, commandArgs, session: sessionIdentifier, listSessions, unknownOption, prompt, } = parseArgs(process.argv);
@@ -386,6 +165,22 @@ export async function main() {
         return;
     }
     const rootDir = process.cwd();
+    if (listSessions) {
+        const activeServerUrl = auth.readCliAuthConfig()?.serverUrl ?? DEFAULT_SERVER_URL;
+        printSessionList(rootDir, listSessionMetadata(rootDir), models.selectCacheForServer(models.readCachedServerModels(), activeServerUrl));
+        return;
+    }
+    const sourceSnapshot = sessionIdentifier
+        ? loadSessionSnapshot(rootDir, sessionIdentifier)
+        : null;
+    if (sessionIdentifier && !sourceSnapshot) {
+        console.error(`Error: No saved session named or identified by "${sessionIdentifier}" is available for this repo. Run \`ai --list-sessions\`.`);
+        process.exitCode = 1;
+        return;
+    }
+    if (!requireInteractiveTerminal()) {
+        return;
+    }
     const authConfig = requireCliAuthConfig();
     const serverSessionClient = sessions.createServerSessionClient({ config: authConfig });
     const cachedModels = models.selectCacheForServer(models.readCachedServerModels(), authConfig.serverUrl);
@@ -428,13 +223,6 @@ export async function main() {
     if (offlineNotice) {
         console.error(chalk.yellow(`⚠ Couldn't reach TheGitAI (${offlineNotice}). Starting with cached settings — it will reconnect on your next message.`));
     }
-    if (listSessions) {
-        printSessionList(rootDir, listSessionMetadata(rootDir), serverModels);
-        return;
-    }
-    const sourceSnapshot = sessionIdentifier
-        ? loadSessionSnapshot(rootDir, sessionIdentifier)
-        : null;
     const selectedModelId = models.selectServerModel({
         requestedModelId: sourceSnapshot?.modelId ?? null,
         cached: cachedModels,
@@ -450,13 +238,9 @@ export async function main() {
         autoYes,
         modelId: selectedModelId,
     });
-    session.confirmCommand = makeConfirmCommand(session);
-    session.confirmPatch = makeConfirmPatch(session);
     if (sourceSnapshot) {
         applySessionSnapshot(session, sourceSnapshot);
-        await saveSessionBoth({ session, serverSessionClient });
     }
-    setScratchSession(session.sessionId);
     const projectIndex = createIndex({
         rootDir,
         onStatus: (message) => {
@@ -471,45 +255,27 @@ export async function main() {
         },
     });
     const initialPrompt = prompt || undefined;
-    if (shouldUseClientRatatuiShell()) {
-        await runClientInteractive({
-            appendPromptHistory: (value) => appendPromptHistory(value, session.env),
-            authConfig,
-            debugUi: whoami.debugUi,
-            projectIndex,
-            serverModels,
-            serverSessionClient,
-            session,
-            initialPrompt,
-            usageText: async () => formatUsageText(await auth.fetchWhoamiResponse({ config: authConfig })),
-        });
-        await saveSessionBoth({ session, serverSessionClient });
-        printSessionExit(session);
-        return;
-    }
-    printStartupBanner(rootDir, modelLabel(serverModels, session.modelId), session.autoYes);
-    printSessionStartup(session);
-    setBackgroundJobSession(session.sessionId);
-    try {
-        await mainInteractive({
-            authConfig,
-            projectIndex,
-            serverModels,
-            serverSessionClient,
-            session,
-            usageText: async () => formatUsageText(await auth.fetchWhoamiResponse({ config: authConfig })),
-            initialPrompt,
-        });
-        await saveSessionBoth({ session, serverSessionClient });
-        printSessionExit(session);
-    }
-    finally {
-        killAllBackgroundJobs({ sessionId: session.sessionId, remove: true });
-        setBackgroundJobSession(null);
-        setScratchSession(null);
-    }
+    await runClientInteractive({
+        appendPromptHistory: (value) => appendPromptHistory(value, session.env),
+        authConfig,
+        debugUi: whoami.debugUi,
+        projectIndex,
+        serverModels,
+        serverSessionClient,
+        session,
+        initialPrompt,
+        usageText: async () => formatUsageText(await auth.fetchWhoamiResponse({ config: authConfig })),
+    });
+    await saveSessionBoth({ session, serverSessionClient });
+    printSessionExit(session);
 }
 main().catch((error) => {
-    console.error(chalk.red(`\n✖ Error: ${error.message}\n`));
+    if (isAuthenticationError(error)) {
+        auth.clearCliAuthConfig();
+        console.error(chalk.red(`\n✖ Error: ${authenticationErrorMessage(error)}\n`));
+    }
+    else {
+        console.error(chalk.red(`\n✖ Error: ${error.message}\n`));
+    }
     process.exit(1);
 });

package/dist/src/agent-mode.js

@@ -46,7 +46,7 @@ export function nextAgentMode(mode) {
 export function agentModeAllowsTool(mode, toolName) {
     return mode !== 'plan' || PLAN_MODE_TOOL_NAMES.has(toolName);
 }
-function getUnquotedShellText(command) {
+export function getUnquotedShellText(command) {
     let quote = null;
     let escaped = false;
     let text = '';

package/dist/src/api/auth.js

@@ -1,7 +1,7 @@
 import { existsSync, mkdirSync, readFileSync, rmSync, writeFileSync, } from 'node:fs';
 import path from 'node:path';
 import { getClientStateDir } from '../client-state.js';
-import { ServerApiError, authorizedJson, createTraceContext, failureMessage, normalizeServerUrl, readJsonResponse, retryTransient, } from './http.js';
+import { ServerApiError, authorizedJson, createTraceContext, failureCode, failureMessage, normalizeServerUrl, readJsonResponse, retryTransient, } from './http.js';
 export function getAuthConfigPath(env = process.env) {
     const configured = String(env.THEGITAI_AUTH_CONFIG ?? '').trim();
     if (configured) {
@@ -78,6 +78,6 @@ export async function logoutFromServer({ config, fetchImpl = globalThis.fetch, }
     });
     if (!response.ok && response.status !== 401) {
         const data = (await readJsonResponse(response));
-        throw new ServerApiError(failureMessage(data, response.status), response.status, trace.traceId);
+        throw new ServerApiError(failureMessage(data, response.status), response.status, trace.traceId, failureCode(data));
     }
 }

package/dist/src/api/browser-login.js

@@ -1,8 +1,10 @@
+import { execSync } from 'node:child_process';
 import crypto from 'node:crypto';
+import { readFileSync } from 'node:fs';
 import http from 'node:http';
 import os from 'node:os';
 import { openUrl } from '../core/open-url.js';
-import { ServerApiError, createTraceContext, failureMessage, normalizeServerUrl, readJsonResponse, } from './http.js';
+import { ServerApiError, createTraceContext, failureCode, failureMessage, normalizeServerUrl, readJsonResponse, } from './http.js';
 const DEFAULT_WEBSITE_URL = 'https://thegit.ai';
 const DEFAULT_SERVER_URL = 'https://thegit.ai';
 const DEFAULT_TIMEOUT_MS = 5 * 60 * 1000;
@@ -21,6 +23,73 @@ function defaultDeviceName() {
         return os.hostname();
     }
 }
+function readLinuxOsPrettyName() {
+    try {
+        const content = readFileSync('/etc/os-release', 'utf8');
+        return content.match(/^PRETTY_NAME="?([^"\n]*)"?$/m)?.[1]?.trim() ?? '';
+    }
+    catch {
+        return '';
+    }
+}
+function macArchLabel() {
+    try {
+        if (process.arch === 'arm64')
+            return 'Apple Silicon';
+        if (os.cpus().some((cpu) => cpu.model.includes('Apple'))) {
+            return 'Apple Silicon';
+        }
+    }
+    catch {
+    }
+    return 'Intel';
+}
+export function describeOperatingSystem() {
+    try {
+        if (process.platform === 'linux') {
+            const base = readLinuxOsPrettyName() || `Linux ${os.release()}`;
+            return process.arch === 'arm64' ? `${base}, ARM64` : base;
+        }
+        if (process.platform === 'darwin') {
+            let version = '';
+            try {
+                version = execSync('sw_vers -productVersion', {
+                    stdio: ['ignore', 'pipe', 'ignore'],
+                })
+                    .toString()
+                    .trim();
+            }
+            catch {
+            }
+            return `${version ? `macOS ${version}` : 'macOS'}, ${macArchLabel()}`;
+        }
+        if (process.platform === 'win32') {
+            let label = '';
+            try {
+                label = os.version();
+            }
+            catch {
+            }
+            const build = Number(os.release().split('.')[2] ?? '0');
+            if (build >= 22000)
+                label = label.replace(/Windows 10/i, 'Windows 11');
+            const base = label || `Windows ${os.release()}`;
+            return process.arch === 'arm64' ? `${base}, ARM64` : base;
+        }
+        return `${process.platform} ${os.release()}`;
+    }
+    catch {
+        return process.platform;
+    }
+}
+export function withOperatingSystemInfo(name) {
+    const trimmed = name.trim();
+    const osLabel = describeOperatingSystem();
+    const combined = osLabel && !trimmed.includes(osLabel)
+        ? `${trimmed} (${osLabel})`
+        : trimmed;
+    return combined.slice(0, 180);
+}
 export function generatePkce() {
     const verifier = crypto.randomBytes(32).toString('base64url');
     const challenge = crypto
@@ -56,7 +125,7 @@ async function exchangeCodeForToken({ serverUrl, code, codeVerifier, fetchImpl,
     });
     const data = (await readJsonResponse(response));
     if (!response.ok) {
-        throw new ServerApiError(failureMessage(data, response.status), response.status, trace.traceId);
+        throw new ServerApiError(failureMessage(data, response.status), response.status, trace.traceId, failureCode(data));
     }
     const token = String(data?.token ?? '').trim();
     const customer = data?.customer;
@@ -77,7 +146,7 @@ export async function loginViaBrowser(options) {
     const fetchImpl = options.fetchImpl ?? globalThis.fetch;
     const openBrowser = options.openBrowser ?? openUrl;
     const onUrl = options.onUrl ?? (() => { });
-    const deviceName = options.deviceName ?? defaultDeviceName();
+    const deviceName = withOperatingSystemInfo(options.deviceName ?? defaultDeviceName());
     const { verifier, challenge } = generatePkce();
     if (options.noBrowser) {
         const authUrl = buildAuthUrl(websiteUrl, {