@thegitai/cli 1.0.0-preview.3 → 1.0.0-preview.4

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,12 @@ 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.
+
 ## 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

@@ -5,20 +5,16 @@ 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 { formatCliHelpText } from '../src/help-text.js';
 import { createIndex } from '../src/project-index.js';
-import { createSession, clearConversation } from '../src/session.js';
+import { createSession } from '../src/session.js';
 import { applySessionSnapshot, listSessionMetadata, loadSessionSnapshot, saveSessionState, } from '../src/session-store.js';
-import { runClientInteractive, shouldUseClientRatatuiShell, } from '../src/ui/repl.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,52 +108,12 @@ 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, }) {
     saveSessionState(session);
@@ -168,197 +124,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 +163,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 +221,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 +236,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,43 +253,19 @@ 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`));

package/dist/src/api/chat.js

@@ -6,6 +6,7 @@ import { createTraceContext, normalizeServerUrl, readErrorResponse, } from './ht
 import { collectClientEnvironment } from '../client-environment.js';
 import { collectProjectOrientation } from '../project-orientation.js';
 import { autoAttachImages } from '../core/image-path-extractor.js';
+import { formatTurnFailureMarker } from '../turn-failure-marker.js';
 export class TurnCancelledError extends Error {
     name = 'TurnCancelledError';
     constructor(message = 'Turn cancelled.') {
@@ -102,7 +103,7 @@ function preserveFailedTurnInput(session, input, category) {
     session.history.push({ role: 'user', parts: [{ text }], kind: 'turnStart' });
     session.history.push({
         role: 'model',
-        parts: [{ text: `Turn failed before completion: ${category}.` }],
+        parts: [{ text: formatTurnFailureMarker(category) }],
     });
 }
 function historyHasToolCall(session, callId) {

package/dist/src/help-text.js

@@ -22,6 +22,7 @@ const HELP_MARKDOWN = [
     '',
     '- `ai` — start an interactive chat session in the current repo',
     '- `ai "<request>"` — start an interactive session with `<request>` as the first message',
+    '- Coding sessions require terminal stdin and stdout; piped prompts are not supported.',
     '',
     '## Auth',
     '',
@@ -35,8 +36,8 @@ const HELP_MARKDOWN = [
     '',
     '- `ai --list-sessions` — list saved sessions for this repo',
     '- `ai --session <id|name>` — resume a saved session by id or name',
-    '- Sessions are stored locally and scoped to the current repo. The five',
-    '  most recent sessions per repo are kept.',
+    '- Sessions are stored locally and can be listed or resumed in the same repo.',
+    '  Continuing one requires the TheGitAI account used for that session.',
     '',
     '## Options',
     '',
@@ -105,7 +106,10 @@ const HELP_MARKDOWN = [
     '- Auth or permission errors → run `ai whoami` to confirm the signed-in',
     '  account.',
     '- Usage or quota errors → run `ai --usage`.',
-    '- Stuck on the wrong account → `ai logout`, then `ai login` again.',
+    '- Signed in with the wrong credentials → `ai logout`, then `ai login` with',
+    '  the account you intended to use.',
+    '- A local session was used with a different sign-in → sign in with the',
+    '  account you used for that session or start a new session.',
     '- For anything else, re-run the command and report the printed error',
     '  message — there is no client-side debug mode by design.',
 ].join('\n');
@@ -126,8 +130,15 @@ export function formatInteractiveHelpText() {
     return HELP_MARKDOWN;
 }
 export function formatCliHelpText({ color = false } = {}) {
-    if (!color)
-        return HELP_MARKDOWN;
+    if (!color) {
+        return HELP_MARKDOWN.split('\n')
+            .map((line) => line
+            .replace(/^#{1,6}\s+/, '')
+            .replace(/^-\s+/, '  ')
+            .replace(/`([^`]+)`/g, '$1')
+            .replace(/\*\*([^*]+)\*\*/g, '$1'))
+            .join('\n');
+    }
     return HELP_MARKDOWN.split('\n')
         .map((line) => {
         const heading = line.match(/^(#{1,6})\s+(.*)$/);

package/dist/src/turn-failure-marker.js

@@ -0,0 +1,11 @@
+const TURN_FAILURE_MARKER_PATTERN = /^Turn failed before completion: ([a-z][a-z0-9_-]*)\.?$/i;
+export function formatTurnFailureMarker(category) {
+    const normalized = category.trim().toLowerCase();
+    const safeCategory = /^[a-z][a-z0-9_-]*$/.test(normalized)
+        ? normalized
+        : 'unknown_error';
+    return `Turn failed before completion: ${safeCategory}.`;
+}
+export function isTurnFailureMarker(text) {
+    return TURN_FAILURE_MARKER_PATTERN.test(text.trim());
+}

package/dist/src/ui/repl.js

@@ -9,6 +9,7 @@ import { getJobBufferedOutput, getJobOutputPreview, hasRunningBackgroundJobs, ki
 import { clearTodos, listTodos, setTodoSession } from '../todo-list.js';
 import { setScratchSession } from '../scratch-dir.js';
 import { cancelActiveCommand } from '../executor.js';
+import { isTurnFailureMarker } from '../turn-failure-marker.js';
 import { setCommandOutputHook, withTuiMode } from '../runtime-mode.js';
 import { collectBackgroundJobUiKillMutations, collectBackgroundJobUiOutputMutations, } from '../tool-executor.js';
 import { clearConversation, } from '../session.js';
@@ -780,7 +781,7 @@ function displayUserTextFromHistoryEntry(entry) {
         .slice(contentStart, contentEnd === -1 ? text.length : contentEnd)
         .trim();
 }
-function buildTranscriptFromSessionHistory(history) {
+export function buildTranscriptFromSessionHistory(history) {
     const entries = [];
     const pendingCalls = new Map();
     for (const entry of history) {
@@ -826,6 +827,14 @@ function buildTranscriptFromSessionHistory(history) {
         }
         const text = textFromHistoryEntry(entry);
         if ((entry.role === 'model' || entry.role === 'assistant') && text) {
+            if (isTurnFailureMarker(text)) {
+                entries.push({
+                    body: 'This request did not complete.',
+                    kind: 'system',
+                    title: 'Previous turn',
+                });
+                continue;
+            }
             entries.push({ body: text, kind: 'assistant', title: 'Response' });
         }
     }
@@ -1273,17 +1282,12 @@ async function saveSessionBoth({ serverSessionClient, session, }) {
     saveSessionState(session);
     await serverSessionClient.save(session);
 }
-function shouldUseRatatuiShell() {
-    if (process.env.THEGITAI_PLAIN === '1')
-        return false;
-    return Boolean(process.stdin.isTTY && process.stdout.isTTY);
-}
-export function shouldUseClientRatatuiShell() {
-    return shouldUseRatatuiShell();
-}
 export async function runClientInteractive({ appendPromptHistory, authConfig, debugUi, projectIndex, serverModels, serverSessionClient, session, usageText, initialPrompt, }) {
-    if (!shouldUseRatatuiShell()) {
-        throw new Error('Client TUI requires an interactive terminal.');
+    if (process.stdin.isTTY !== true) {
+        throw new Error('stdin is not a terminal');
+    }
+    if (process.stdout.isTTY !== true) {
+        throw new Error('stdout is not a terminal');
     }
     await withTuiMode(async () => {
         setBackgroundJobSession(session.sessionId);
@@ -1968,7 +1972,6 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
                 syncBackgroundJobsState();
                 setTodoSession(session.sessionId);
                 syncTodosState();
-                await saveActiveSession();
                 syncShellStateFromSession();
                 store.update((next) => ({
                     ...next,

package/dist/src/ui/tui/build-frame.js

@@ -17,7 +17,7 @@ const OVERLAY_PANEL_MAX_WIDTH = 86;
 const OVERLAY_PANEL_MARGIN_LINES = 2;
 const OVERLAY_BORDER_COLOR = 'yellow';
 const OVERLAY_WARNING_COLOR = 'ansi256(208)';
-const MODEL_PICKER_PANEL_MAX_WIDTH = 120;
+const MODEL_PICKER_PANEL_MAX_WIDTH = 144;
 const MODEL_PICKER_PANEL_MARGIN_LINES = 2;
 const MODEL_PICKER_BORDER_COLOR = 'cyan';
 const MODEL_PICKER_ACCENT_COLOR = 'cyan';
@@ -689,10 +689,15 @@ function modelPickerHeaderLine(innerWidth) {
     }
     return line(modelPickerCell('#', MODEL_PICKER_NUMBER_WIDTH, heading), modelPickerCell('Model', MODEL_PICKER_MODEL_WIDTH, heading), span(MODEL_PICKER_SEPARATOR, { color: 'gray' }), modelPickerCell('Cost', MODEL_PICKER_COST_WIDTH, heading), span(MODEL_PICKER_SEPARATOR, { color: 'gray' }), modelPickerCell('Notes', modelPickerNotesWidth(innerWidth), heading));
 }
-function buildModelPickerPanel(options, selectedIndex, width) {
+function buildModelPickerPanel(options, selectedIndex, width, availableHeight) {
     const panelWidth = Math.max(28, Math.min(width, MODEL_PICKER_PANEL_MAX_WIDTH));
     const innerWidth = Math.max(1, panelWidth - 4);
-    const margin = Array.from({ length: MODEL_PICKER_PANEL_MARGIN_LINES }, () => plainLine(''));
+    const compactBodyLineCount = options.length + 6;
+    const spacerLineCount = Math.max(0, options.length - 1);
+    const useRowSpacing = compactBodyLineCount + spacerLineCount <= availableHeight;
+    const bodyLineCount = compactBodyLineCount + (useRowSpacing ? spacerLineCount : 0);
+    const marginLineCount = Math.max(0, Math.min(MODEL_PICKER_PANEL_MARGIN_LINES, Math.floor((availableHeight - bodyLineCount) / 2)));
+    const margin = Array.from({ length: marginLineCount }, () => plainLine(''));
     const body = [
         modelPickerTopBorder(panelWidth),
         modelPickerPanelSideLine(modelPickerHeaderLine(innerWidth), innerWidth),
@@ -700,6 +705,9 @@ function buildModelPickerPanel(options, selectedIndex, width) {
     ];
     options.forEach((option, index) => {
         body.push(...modelPickerItemLines(option, index === selectedIndex, innerWidth));
+        if (useRowSpacing && index < options.length - 1) {
+            body.push(modelPickerPanelSideLine(plainLine(''), innerWidth));
+        }
     });
     const fullHint = '↑/↓ navigate  •  Enter select  •  Esc cancel';
     const compactHint = '↑/↓  •  enter  •  esc';
@@ -774,7 +782,7 @@ function buildCommandPalettePanel(suggestions, selectedIndex, width) {
     body.push(modelPickerPanelSideLine(plainLine(''), innerWidth), modelPickerPanelSideLine(line(span('─'.repeat(innerWidth), { color: MODEL_PICKER_BORDER_COLOR })), innerWidth), modelPickerPanelSideLine(plainLine('↑/↓ choose  •  Tab or Enter accept  •  Esc cancel', { color: 'gray' }), innerWidth), plainLine(`╰${'─'.repeat(panelWidth - 2)}╯`, { color: MODEL_PICKER_BORDER_COLOR }));
     return [...margin, ...body, ...margin];
 }
-function buildOverlayLines(state, width, nowMs) {
+function buildOverlayLines(state, width, height, nowMs) {
     const lines = [];
     const panelWidth = Math.max(24, Math.min(width, OVERLAY_PANEL_MAX_WIDTH));
     const innerWidth = Math.max(1, panelWidth - 4);
@@ -847,7 +855,7 @@ function buildOverlayLines(state, width, nowMs) {
     }
     if (state.modelPickerOpen) {
         const options = buildModelPickerOptions(state.currentModelId, state.serverModels);
-        lines.push(...buildModelPickerPanel(options, state.modelPickerIndex, width));
+        lines.push(...buildModelPickerPanel(options, state.modelPickerIndex, width, height));
     }
     if (state.jobsPickerOpen) {
         lines.push(...buildJobsPickerLines(state, width, nowMs));
@@ -931,7 +939,7 @@ export function buildTuiFrame(state, cols, rows, spinnerFrame, elapsedSeconds, n
             lines: [...composerLines, plainLine(''), ...composerFooterLines(state)],
         });
     }
-    const overlayLines = buildOverlayLines(state, contentWidth, nowMs);
+    const overlayLines = buildOverlayLines(state, contentWidth, rows, nowMs);
     if (overlayLines.length > 0) {
         sections.push({ kind: 'overlay', lines: overlayLines });
     }

package/package.json

@@ -1,9 +1,21 @@
 {
   "name": "@thegitai/cli",
-  "version": "1.0.0-preview.3",
-  "description": "TheGitAI CLI client (source-visible, proprietary)",
+  "version": "1.0.0-preview.4",
+  "description": "TheGitAI is an AI coding agent for your terminal. It indexes your repository, writes and edits files, runs commands, and builds features with you.",
+  "keywords": [
+    "ai",
+    "ai-coding-agent",
+    "coding-agent",
+    "coding-assistant",
+    "terminal",
+    "cli",
+    "developer-tools"
+  ],
   "license": "SEE LICENSE IN LICENSE",
   "homepage": "https://thegit.ai",
+  "bugs": {
+    "email": "support@thegit.ai"
+  },
   "type": "module",
   "engines": {
     "node": ">=24"
@@ -25,10 +37,10 @@
     "@lydell/node-pty-linux-x64": "1.1.0",
     "@lydell/node-pty-win32-arm64": "1.1.0",
     "@lydell/node-pty-win32-x64": "1.1.0",
-    "@thegitai/tui-darwin-arm64": "1.0.0-preview.3",
-    "@thegitai/tui-darwin-x64": "1.0.0-preview.3",
-    "@thegitai/tui-linux-x64": "1.0.0-preview.3",
-    "@thegitai/tui-win32-x64": "1.0.0-preview.3",
+    "@thegitai/tui-darwin-arm64": "1.0.0-preview.4",
+    "@thegitai/tui-darwin-x64": "1.0.0-preview.4",
+    "@thegitai/tui-linux-x64": "1.0.0-preview.4",
+    "@thegitai/tui-win32-x64": "1.0.0-preview.4",
     "@vscode/ripgrep": "1.18.0"
   },
   "publishConfig": {