@thegitai/cli 1.0.0-preview.44 → 1.0.0-preview.46

package/README.md

@@ -17,10 +17,10 @@ Supports Node.js 22 and newer. Node.js 24 is recommended.
 ## Updates
 
 `ai` checks for a newer release each time it starts, and offers to install it
-for you. TheGitAI serves the current release only, so an older CLI can fail
-partway through a session. Press Enter to update — the CLI installs it and asks
-you to start `ai` again, so the whole session runs one version — or choose
-**Skip** to go on with the version you have. Skipping lasts for that session
+for you. TheGitAI works best on the latest version, and an older CLI may not
+work optimally. **Update now** is already selected, so Enter takes it — the CLI
+installs the update and asks you to start `ai` again, so the whole session runs
+one version — while ↑/↓ moves to **Skip** to go on with the version you have. Skipping lasts for that session
 only; the next start asks again. Ctrl+C quits without installing anything.
 
 ## Usage
@@ -78,12 +78,18 @@ 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.
+single-line note; **Enter** commits it and moves on the way any other choice
+does — to the next question, or to **Submit answers** on the last one — without
+submitting the form. 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.
 
+Only the option you are on shows its description, so the whole form — every
+option, the note row, **Submit answers**, and the key hints — stays on screen
+without scrolling. Move between options to read the others.
+
 Answers return to the same turn, and completed question/answer records remain
 readable when the session is resumed. Default, Bypass all permissions, and Plan
 modes all support the form; Bypass all permissions does not choose answers for

package/dist/src/agent-mode.js

@@ -148,12 +148,9 @@ export function agentModeLabel(mode) {
         return 'Bypass all permissions';
     if (mode === 'plan')
         return 'Plan · read-only';
-    return 'Default · asks to edit & run unless permitted';
+    return 'Default · Ask for Approval';
 }
 export function agentModeLabelTiers(mode) {
-    if (mode === 'default') {
-        return [agentModeLabel(mode), 'Default · asks to edit & run'];
-    }
     return [agentModeLabel(mode)];
 }
 export function agentModeShortLabel(mode) {

package/dist/src/help-text.js

@@ -46,10 +46,12 @@ const HELP_MARKDOWN = [
     '## Updates',
     '',
     '- On start, `ai` says when a newer release is published and offers to install',
-    '  it. TheGitAI serves the current release only, so an older CLI can fail',
-    '  partway through a session, in ways the transcript cannot explain.',
-    '- Enter takes the update; the CLI installs it and asks you to start `ai`',
-    '  again, so the whole session runs one version.',
+    '  it. TheGitAI works best on the latest version, and an older CLI may not',
+    '  work optimally.',
+    '- **Update now** is selected when the offer appears, so **Enter** takes the',
+    '  update; **↑/↓** moves to **Skip**, and the number keys still jump straight',
+    '  to a row. The CLI installs the update and asks you to start `ai` again, so',
+    '  the whole session runs one version.',
     '- Skipping starts the session on the version you have and asks again next',
     '  time. A release cannot be silenced for good — that is what keeps a broken',
     '  combination from lasting.',
@@ -64,10 +66,10 @@ const HELP_MARKDOWN = [
     '',
     '## Modes',
     '',
-    '- Default · asks to edit & run unless permitted — asks before creating,',
-    '  editing or deleting files, before running commands, and before touching a',
-    '  website. Each answer can be remembered for the rest of the session, and',
-    '  once it is, Default stops asking for that action; see Safety & approvals.',
+    '- Default · Ask for Approval — asks before creating, editing or deleting',
+    '  files, before running commands, and before touching a website. Each answer',
+    '  can be remembered for the rest of the session, and once it is, Default',
+    '  stops asking for that action; see Safety & approvals.',
     '- Bypass all permissions — approves every command, file edit, deletion and',
     '  browser action for the rest of the session, without asking. Shown in red',
     '  in the footer. Blocked commands stay blocked.',
@@ -103,8 +105,25 @@ const HELP_MARKDOWN = [
         ? ['- On Mac laptops without dedicated keys, **Home/End** are `Fn+←` / `Fn+→`.']
         : []),
     '',
+    '## Questions',
+    '',
+    '- The agent can pause a turn to ask up to four questions in one form.',
+    '  **↑/↓** moves, the option number or **Enter** chooses, **←/→** moves',
+    '  between questions, and the last question has a **Submit answers** row.',
+    '- Only the option you are on shows its description, so the whole form fits',
+    '  on screen. Move to an option to read what it means.',
+    '- **Something else / add details** is the numbered final option: focus it',
+    '  and type. **Enter** commits the note and moves to the next question, or to',
+    '  Submit on the last one — it never submits the form for you.',
+    '- **Esc** closes an open note first, and otherwise cancels the form.',
+    '',
     '## Chat commands',
     '',
+    '- Type `/` to open the command picker. It ranks what you type, so a typo or',
+    '  a stray plural (`/moddel`, `/models`) still finds the command, and a word',
+    '  from the description does too (`/bug` finds `/report`). It shows the five',
+    '  best matches and counts the rest; **↑/↓** chooses, **Tab** or **Enter**',
+    '  accepts, **Esc** closes it.',
     '- `/help` — show this help',
     '- `/about` — show version and platform info',
     '- `/report` — file a bug privately through the TheGitAI website in your',

package/dist/src/ui/repl.js

@@ -7,7 +7,8 @@ import { backendFor, createNotificationQueue, } from './tui/desktop-notification
 import { readPreferences, writePreferences } from '../preferences.js';
 import { createTerminalTitleController } from './tui/terminal-title.js';
 import { captureTerminalWrites, releaseTerminalWrites, } from './tui/terminal-writes.js';
-export { getSlashCommandSuggestions } from './tui/build-frame.js';
+import { getInputCommandToken, getSlashCommandSuggestions, SLASH_COMMANDS, slashCommandMatchesToken, } from './slash-commands.js';
+export { getInputCommandToken, getSlashCommandSuggestions, SLASH_COMMANDS, slashCommandMatchesToken, };
 import { composerInputWidth, frameContentWidth } from './tui/composer-layout.js';
 import { agentModeLabel, nextAgentMode, } from '../agent-mode.js';
 import { chat, models } from '../api/index.js';
@@ -110,52 +111,6 @@ export function buildTurnFailureHintEntries(cancelled) {
         },
     ];
 }
-export const SLASH_COMMANDS = [
-    {
-        command: '/help',
-        description: 'Show available chat commands',
-    },
-    {
-        command: '/about',
-        description: 'Show version and platform info',
-    },
-    {
-        command: '/report',
-        description: 'Report a bug privately on the TheGitAI website',
-    },
-    {
-        command: '/usage',
-        description: 'Show account usage percentage and reset times',
-    },
-    {
-        command: '/model',
-        description: 'Switch the active model',
-    },
-    {
-        command: '/resume',
-        description: 'Open the session picker',
-    },
-    {
-        command: '/jobs',
-        description: 'Background jobs: pick to view output or kill',
-    },
-    {
-        command: '/notify',
-        description: 'Toggle desktop notifications when a turn ends (Ctrl+G)',
-    },
-    {
-        command: '/new',
-        description: 'start a new conversation; this session remains saved',
-    },
-    {
-        command: '/logout',
-        description: 'Sign out and quit',
-    },
-    {
-        command: '/exit',
-        description: 'Quit the current session',
-    },
-];
 export function composerAttachmentsAfterCancel(queuedAttachments, inFlightAttachments) {
     const seen = new Set();
     const kept = [];
@@ -1255,16 +1210,6 @@ export const EXIT_CTRL_C_CONFIRM_MS = 3000;
 export function isExitConfirmActive(exitConfirmUntil, now = Date.now()) {
     return exitConfirmUntil != null && now < exitConfirmUntil;
 }
-export function getInputCommandToken(input) {
-    const trimmed = String(input ?? '').trim();
-    if (!trimmed.startsWith('/'))
-        return '';
-    const firstSpaceIndex = trimmed.indexOf(' ');
-    const token = firstSpaceIndex === -1 ? trimmed : trimmed.slice(0, firstSpaceIndex);
-    if (token.indexOf('/', 1) !== -1)
-        return '';
-    return token;
-}
 function shouldShowCommandPalette(state) {
     const trimmed = String(state.input ?? '').trim();
     return (!state.busy &&
@@ -1272,8 +1217,9 @@ function shouldShowCommandPalette(state) {
         !state.modelPickerOpen &&
         !state.resumePickerOpen &&
         trimmed.startsWith('/') &&
-        !trimmed.includes(' ') &&
-        getInputCommandToken(trimmed) !== '');
+        !String(state.input ?? '').includes(' ') &&
+        getInputCommandToken(trimmed) !== '' &&
+        getSlashCommandSuggestions(trimmed).length > 0);
 }
 export function shouldRemountLiveFrameForComposerInputChange(current, nextInput) {
     const currentShowsCommands = shouldShowCommandPalette(current);
@@ -1296,9 +1242,6 @@ export function applySlashCommandSuggestion(currentInput, suggestion) {
         input: `${before}${suggestion.command}${after}`,
     };
 }
-export function isExactSlashCommandToken(token) {
-    return SLASH_COMMANDS.some((command) => command.command === token);
-}
 export function insertAtCursor(state, text) {
     const before = state.input.slice(0, state.cursor);
     const after = state.input.slice(state.cursor);

package/dist/src/ui/slash-commands.js

@@ -0,0 +1,121 @@
+export const SLASH_COMMANDS = [
+    { command: '/model', description: 'Switch the active model' },
+    { command: '/help', description: 'Show available chat commands' },
+    { command: '/usage', description: 'Show account usage percentage and reset times' },
+    {
+        command: '/resume',
+        description: 'Open the session picker to resume a previous session',
+    },
+    { command: '/new', description: 'start a new conversation; this session remains saved' },
+    { command: '/jobs', description: 'Background jobs: pick to view output or kill' },
+    {
+        command: '/notify',
+        description: 'Toggle desktop notifications when a turn ends (Ctrl+G)',
+    },
+    { command: '/report', description: 'Report a bug privately on the TheGitAI website' },
+    { command: '/about', description: 'Show version and platform info' },
+    { command: '/logout', description: 'Sign out and quit' },
+    { command: '/exit', description: 'Quit the current session', aliases: ['/quit'] },
+];
+export const SLASH_COMMAND_SUGGESTION_LIMIT = 5;
+export function getInputCommandToken(input) {
+    const trimmed = String(input ?? '').trimStart();
+    const match = trimmed.match(/^\/[^\s]*/);
+    const token = match?.[0] ?? '';
+    if (token.indexOf('/', 1) !== -1)
+        return '';
+    return token;
+}
+export function slashCommandMatchesToken(option, token) {
+    return option.command === token || (option.aliases?.includes(token) ?? false);
+}
+const MATCH_EXACT = 0;
+const MATCH_PREFIX = 100;
+const MATCH_OVERTYPED = 200;
+const MATCH_TYPO = 300;
+const MATCH_IN_NAME = 400;
+const MATCH_IN_DESCRIPTION = 500;
+const MATCH_NONE = 600;
+function typoBudget(body) {
+    if (body.length <= 3)
+        return 0;
+    if (body.length <= 5)
+        return 1;
+    return 2;
+}
+function editDistanceWithin(a, b, max) {
+    if (a === b)
+        return 0;
+    if (max <= 0)
+        return null;
+    if (Math.abs(a.length - b.length) > max)
+        return null;
+    const width = b.length + 1;
+    let beforePrevious = [];
+    let previous = Array.from({ length: width }, (_, index) => index);
+    for (let i = 1; i <= a.length; i += 1) {
+        const current = new Array(width);
+        current[0] = i;
+        let best = i;
+        for (let j = 1; j < width; j += 1) {
+            const substitution = a[i - 1] === b[j - 1] ? 0 : 1;
+            let cost = Math.min(previous[j] + 1, current[j - 1] + 1, previous[j - 1] + substitution);
+            if (i > 1 && j > 1 && a[i - 1] === b[j - 2] && a[i - 2] === b[j - 1]) {
+                cost = Math.min(cost, beforePrevious[j - 2] + 1);
+            }
+            current[j] = cost;
+            if (cost < best)
+                best = cost;
+        }
+        if (best > max)
+            return null;
+        beforePrevious = previous;
+        previous = current;
+    }
+    const distance = previous[b.length];
+    return distance <= max ? distance : null;
+}
+function scoreSlashCommand(option, token) {
+    const command = option.command;
+    const body = token.slice(1);
+    if (!body)
+        return MATCH_PREFIX;
+    const spellings = [command, ...(option.aliases ?? [])];
+    if (slashCommandMatchesToken(option, token))
+        return MATCH_EXACT;
+    if (spellings.some((spelling) => spelling.startsWith(token)))
+        return MATCH_PREFIX;
+    const overtyped = spellings.find((spelling) => token.startsWith(spelling));
+    if (overtyped) {
+        return MATCH_OVERTYPED + Math.min(token.length - overtyped.length, 99);
+    }
+    const distances = spellings
+        .map((spelling) => editDistanceWithin(body, spelling.slice(1), typoBudget(body)))
+        .filter((distance) => distance !== null);
+    if (distances.length)
+        return MATCH_TYPO + Math.min(...distances);
+    if (command.includes(body))
+        return MATCH_IN_NAME;
+    if (option.description.toLowerCase().includes(body))
+        return MATCH_IN_DESCRIPTION;
+    return MATCH_NONE;
+}
+function rankSlashCommands(input) {
+    const token = getInputCommandToken(input).toLowerCase();
+    if (!token)
+        return [];
+    return SLASH_COMMANDS.map((option, order) => ({
+        option,
+        order,
+        score: scoreSlashCommand(option, token),
+    }))
+        .filter((entry) => entry.score < MATCH_NONE)
+        .sort((a, b) => a.score - b.score || a.order - b.order)
+        .map((entry) => entry.option);
+}
+export function getSlashCommandSuggestions(input) {
+    return rankSlashCommands(input).slice(0, SLASH_COMMAND_SUGGESTION_LIMIT);
+}
+export function getHiddenSlashCommandCount(input) {
+    return Math.max(0, rankSlashCommands(input).length - SLASH_COMMAND_SUGGESTION_LIMIT);
+}

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

@@ -1,6 +1,7 @@
 import { agentModeColor, agentModeLabelTiers, agentModeShortLabel, } from '../../agent-mode.js';
 import { singleLinePreview, truncate } from '../../utils.js';
 import { formatClientTokenUsage } from '../repl.js';
+import { getHiddenSlashCommandCount, getSlashCommandSuggestions, } from '../slash-commands.js';
 import { renderFormattedBodyLines, renderPreformattedBodyLines, } from './markdown-render.js';
 import { displayWidth, line, padToWidth, plainLine, sliceToWidth, span, wrapText, } from './text.js';
 import { isDarkTerminalBackground, mutedColor, mutedStyle } from './terminal-theme.js';
@@ -44,6 +45,7 @@ export function footerNotificationHint(status) {
 }
 const FOOTER_CYCLE_HINT = ' (shift+tab to cycle)';
 const OVERLAY_PANEL_MAX_WIDTH = 86;
+const USER_INPUT_PANEL_MAX_WIDTH = 120;
 const OVERLAY_PANEL_MARGIN_LINES = 2;
 const OVERLAY_PANEL_MARGIN_MIN_ROWS = 30;
 const OVERLAY_BORDER_COLOR = 'yellow';
@@ -188,19 +190,6 @@ export function formatPromptDirectoryLabel(projectRoot, homeDir = process.env.HO
 export function formatPromptSessionIdLabel(showSessionId, sessionId) {
     return showSessionId ? String(sessionId ?? '').trim() : '';
 }
-const CLIENT_SLASH_COMMANDS = [
-    { command: '/help', description: 'Show available chat commands' },
-    { command: '/about', description: 'Show version and platform info' },
-    { command: '/usage', description: 'Show account usage percentage and reset times' },
-    { command: '/model', description: 'Switch the active model' },
-    { command: '/resume', description: 'Open the session picker to resume a previous session' },
-    { command: '/jobs', description: 'Background jobs: pick to view output or kill' },
-    { command: '/notify', description: 'Toggle desktop notifications when a turn ends (Ctrl+G)' },
-    { command: '/report', description: 'Report a bug privately on the TheGitAI website' },
-    { command: '/new', description: 'start a new conversation; this session remains saved' },
-    { command: '/logout', description: 'Sign out and quit' },
-    { command: '/exit', description: 'Quit the current session' },
-];
 function buildModelPickerOptions(currentModelId, serverModels) {
     return serverModels.map((model) => ({
         id: model.id,
@@ -212,38 +201,7 @@ function buildModelPickerOptions(currentModelId, serverModels) {
         note: model.description,
     }));
 }
-function getInputCommandToken(input) {
-    const trimmed = String(input ?? '').trimStart();
-    const match = trimmed.match(/^\/[^\s]*/);
-    const token = match?.[0] ?? '';
-    if (token.indexOf('/', 1) !== -1)
-        return '';
-    return token;
-}
-function scoreSlashCommand(option, token) {
-    if (option.command === token)
-        return 0;
-    if (option.command.startsWith(token))
-        return 1;
-    if (option.command.includes(token.slice(1)))
-        return 2;
-    if (option.description.toLowerCase().includes(token.slice(1)))
-        return 3;
-    return 4;
-}
-export function getSlashCommandSuggestions(input) {
-    const token = getInputCommandToken(input).toLowerCase();
-    if (!token)
-        return [];
-    const ranked = [...CLIENT_SLASH_COMMANDS].sort((a, b) => {
-        const scoreDiff = scoreSlashCommand(a, token) - scoreSlashCommand(b, token);
-        if (scoreDiff !== 0)
-            return scoreDiff;
-        return a.command.localeCompare(b.command);
-    });
-    const matches = ranked.filter((option) => scoreSlashCommand(option, token) < 4);
-    return (matches.length ? matches : ranked).slice(0, 5);
-}
+export { getSlashCommandSuggestions };
 function formatModelLabel(modelId, serverModels) {
     return serverModels.find((model) => model.id === modelId)?.label ?? 'Unknown model';
 }
@@ -817,8 +775,8 @@ function overlayPanelContentBudget(height) {
     const margins = overlayPanelMarginLineCount(height) * 2;
     return Math.max(1, Math.floor(height) - margins - 2);
 }
-function buildOverlayPanel(rows, width, color, height = Number.POSITIVE_INFINITY) {
-    const panelWidth = Math.max(24, Math.min(width, OVERLAY_PANEL_MAX_WIDTH));
+function buildOverlayPanel(rows, width, color, height = Number.POSITIVE_INFINITY, maxWidth = OVERLAY_PANEL_MAX_WIDTH) {
+    const panelWidth = Math.max(24, Math.min(width, maxWidth));
     const innerWidth = Math.max(1, panelWidth - 4);
     const margin = Array.from({
         length: overlayPanelMarginLineCount(height),
@@ -1060,7 +1018,7 @@ function commandPaletteItemLines(option, selected, innerWidth) {
         modelPickerPanelSideLine(line(span(`${MODEL_PICKER_META_INDENT}${option.description}`, { color: 'gray' })), innerWidth),
     ];
 }
-function buildCommandPalettePanel(suggestions, selectedIndex, width) {
+function buildCommandPalettePanel(suggestions, selectedIndex, hiddenCount, width) {
     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(''));
@@ -1079,6 +1037,12 @@ function buildCommandPalettePanel(suggestions, selectedIndex, width) {
             body.push(commandPaletteSeparatorLine(innerWidth));
         }
     });
+    if (hiddenCount > 0) {
+        body.push(commandPaletteSeparatorLine(innerWidth), modelPickerPanelSideLine(plainLine(`  ${hiddenCount} more  •  keep typing to narrow`, {
+            color: 'gray',
+            dim: true,
+        }), innerWidth));
+    }
     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];
 }
@@ -1104,6 +1068,9 @@ export function buildWorkingClockLine(state, elapsedSeconds) {
 export function approvalPanelInnerWidth(width) {
     return Math.max(1, Math.max(24, Math.min(width, OVERLAY_PANEL_MAX_WIDTH)) - 4);
 }
+export function userInputPanelInnerWidth(width) {
+    return Math.max(1, Math.max(24, Math.min(width, USER_INPUT_PANEL_MAX_WIDTH)) - 4);
+}
 export function approvalPaddingEnabled(height) {
     return height >= APPROVAL_PADDING_MIN_ROWS;
 }
@@ -1212,7 +1179,7 @@ function buildOverlayLines(state, width, height, nowMs) {
         if (height < 3) {
             return [];
         }
-        return buildOverlayPanel(buildUserInputOverlayLines(state.userInputPrompt, innerWidth, overlayPanelContentBudget(height)), width, USER_INPUT_BORDER_COLOR, height);
+        return buildOverlayPanel(buildUserInputOverlayLines(state.userInputPrompt, userInputPanelInnerWidth(width), overlayPanelContentBudget(height)), width, USER_INPUT_BORDER_COLOR, height, USER_INPUT_PANEL_MAX_WIDTH);
     }
     if (state.approvalPrompt) {
         const prompt = state.approvalPrompt;
@@ -1325,7 +1292,7 @@ function buildOverlayLines(state, width, height, nowMs) {
         state.input.trimStart().startsWith('/') &&
         !state.input.includes(' ') &&
         suggestions.length > 0) {
-        lines.push(...buildCommandPalettePanel(suggestions, state.commandCursor, width));
+        lines.push(...buildCommandPalettePanel(suggestions, state.commandCursor, getHiddenSlashCommandCount(state.input), width));
     }
     return lines;
 }
@@ -1337,7 +1304,7 @@ export function userInputViewportForFrame(state, cols, rows, spinnerFrame, elaps
     const liveRows = buildLiveLines(state, contentWidth, spinnerFrame, elapsedSeconds, nowMs).length;
     const overlayHeight = Math.max(0, rows - liveRows - composerFooterLines(state, contentWidth).length);
     return {
-        width: approvalPanelInnerWidth(contentWidth),
+        width: userInputPanelInnerWidth(contentWidth),
         maxRows: overlayPanelContentBudget(overlayHeight),
     };
 }

package/dist/src/ui/tui/shell-input.js

@@ -3,7 +3,7 @@ import { moveComposerCursorVertically } from './composer-layout.js';
 import { readClipboardImage, readClipboardText } from '../../core/clipboard.js';
 import { MAX_IMAGES_PER_MESSAGE, MAX_TOTAL_IMAGE_BYTES_PER_MESSAGE, approximateBase64DecodedBytes, totalAttachmentBytes, } from '../../core/image-limits.js';
 import { tryCacheAttachmentBytes } from '../../core/session-image-store.js';
-import { applySlashCommandSuggestion, buildModelPickerOptions, deleteAtCursor, deleteBeforeCursor, getInputCommandToken, getNextApprovalCursor, getNextModelPickerIndex, getSlashCommandSuggestions, insertAtCursor, isExactSlashCommandToken, navigatePromptHistory, shouldRemountLiveFrameForComposerInputChange, } from '../repl.js';
+import { applySlashCommandSuggestion, buildModelPickerOptions, deleteAtCursor, deleteBeforeCursor, getInputCommandToken, getNextApprovalCursor, getNextModelPickerIndex, getSlashCommandSuggestions, insertAtCursor, navigatePromptHistory, shouldRemountLiveFrameForComposerInputChange, slashCommandMatchesToken, } from '../repl.js';
 import { buildPastePlaceholder, shouldCollapsePaste, } from '../paste-collapse.js';
 import { handleUserInputPromptEvent, } from './user-input.js';
 const APPROVAL_PREVIEW_PAGE_ROWS = 3;
@@ -56,7 +56,9 @@ function shouldShowCommandPalette(state) {
         return false;
     }
     const token = getInputCommandToken(state.input);
-    return token.startsWith('/') && !token.includes(' ');
+    if (!token.startsWith('/') || state.input.includes(' '))
+        return false;
+    return getSlashCommandSuggestions(state.input).length > 0;
 }
 function insertPastedText(store, handlers, text) {
     const current = store.getState();
@@ -549,10 +551,10 @@ export function handleShellKeyEvent(store, handlers, event) {
     }
     if (key.returnKey) {
         const token = getInputCommandToken(state.input);
-        if (commandPaletteActive && !isExactSlashCommandToken(token)) {
-            const suggestion = commandSuggestions[Math.min(state.commandCursor, commandSuggestions.length - 1)];
-            if (!suggestion)
-                return;
+        const suggestion = commandSuggestions[Math.min(state.commandCursor, commandSuggestions.length - 1)];
+        if (commandPaletteActive &&
+            suggestion &&
+            !slashCommandMatchesToken(suggestion, token)) {
             store.update((current) => {
                 const nextInput = applySlashCommandSuggestion(current.input, suggestion);
                 prepareForComposerInputChange(current, nextInput.input);

package/dist/src/ui/tui/user-input.js

@@ -139,9 +139,19 @@ function editOpenNote(state, event) {
     const question = currentQuestion(state);
     const current = state.customText[question.id] ?? '';
     const cursor = Math.max(0, Math.min(state.noteCursor, current.length));
-    if (event.escape || event.returnKey) {
+    if (event.escape) {
         return { ...state, noteOpen: false };
     }
+    if (event.returnKey) {
+        const closed = { ...state, noteOpen: false };
+        if (question.multiSelect || !current.trim()) {
+            return closed;
+        }
+        const index = questionIndex(closed);
+        return index < closed.questions.length - 1
+            ? setQuestion(closed, index + 1)
+            : setCursor(closed, question, SUBMIT_CURSOR);
+    }
     if (event.tab)
         return state;
     if ((event.upArrow || event.downArrow) && !current.trim()) {
@@ -433,8 +443,10 @@ function buildUserInputContent(state, width) {
         }), ...(recommendation
             ? [span(recommendation, { color: 'green' })]
             : [])));
-        for (const description of wrapText(option.description, Math.max(8, width - 5))) {
-            lines.push(plainLine(`     ${description}`, { color: 'gray' }));
+        if (focused) {
+            for (const description of wrapText(option.description, Math.max(8, width - 5))) {
+                lines.push(plainLine(`     ${description}`, { color: 'gray' }));
+            }
         }
         if (state.contentScrollAnchor === option.id) {
             anchorRange = { start: blockStart, end: lines.length - 1 };
@@ -490,23 +502,38 @@ function buildUserInputContent(state, width) {
     if (state.validationMessage) {
         lines.push(plainLine(state.validationMessage, { color: 'yellow' }));
     }
-    lines.push(plainLine(state.noteOpen
-        ? 'Type a single-line note • ↑/↓ moves when empty • Enter saves • Esc closes • PgUp/PgDn scroll'
+    const footer = plainLine(state.noteOpen
+        ? 'Type a single-line note • ↑/↓ moves when empty • Enter saves • Esc closes'
         : question.multiSelect
-            ? `↑/↓ move • 1–${otherNumber} choose • Enter toggles/edits • ←/→ questions • PgUp/PgDn scroll • Esc cancels`
-            : `↑/↓ move • 1–${otherNumber} choose • Enter selects/edits • ←/→ questions • PgUp/PgDn scroll • Esc cancels`, { color: 'gray' }));
+            ? `↑/↓ move • 1–${otherNumber} choose • Enter toggles/edits • ←/→ questions • Esc cancels`
+            : `↑/↓ move • 1–${otherNumber} choose • Enter selects/edits • ←/→ questions • Esc cancels`, { color: 'gray' });
     return {
         anchorRange,
+        footer: clipLineToWidth(footer, width),
         lines: lines.map((row) => clipLineToWidth(row, width)),
     };
 }
 function buildUserInputWindow(state, width, maxRows) {
     const content = buildUserInputContent(state, width);
-    if (!Number.isFinite(maxRows) || content.lines.length <= maxRows) {
-        return { lines: content.lines, maxOffset: 0, offset: 0 };
+    if (!Number.isFinite(maxRows)) {
+        return {
+            lines: [...content.lines, content.footer],
+            maxOffset: 0,
+            offset: 0,
+        };
     }
     const rowBudget = Math.max(1, Math.floor(maxRows));
-    const visibleRowBudget = rowBudget === 1 ? 1 : rowBudget - 1;
+    if (rowBudget === 1) {
+        return { lines: [content.footer], maxOffset: 0, offset: 0 };
+    }
+    if (content.lines.length <= rowBudget - 1) {
+        return {
+            lines: [...content.lines, content.footer],
+            maxOffset: 0,
+            offset: 0,
+        };
+    }
+    const visibleRowBudget = Math.max(1, rowBudget - 2);
     const maxOffset = Math.max(0, content.lines.length - visibleRowBudget);
     let offset = Math.max(0, Math.min(state.contentScrollOffset, maxOffset));
     const range = content.anchorRange;
@@ -527,13 +554,11 @@ function buildUserInputWindow(state, width, maxRows) {
         offset = Math.max(0, Math.min(offset, maxOffset));
     }
     const visible = content.lines.slice(offset, offset + visibleRowBudget);
-    if (rowBudget === 1) {
-        return { lines: visible, maxOffset, offset };
-    }
     return {
         lines: [
             ...visible,
             plainLine(fitText(`Rows ${offset + 1}–${offset + visible.length} of ${content.lines.length} · PgUp/PgDn scroll`, width), { color: 'gray' }),
+            content.footer,
         ],
         maxOffset,
         offset,

package/dist/src/update-check.js

@@ -1,6 +1,7 @@
 import { spawn } from 'node:child_process';
 import path from 'node:path';
 import { stdin as input, stdout as output } from 'node:process';
+import { emitKeypressEvents } from 'node:readline';
 import readline from 'node:readline/promises';
 import { fileURLToPath } from 'node:url';
 import chalk from './colors.js';
@@ -35,21 +36,55 @@ export function buildUpdateOffer({ currentVersion, latestVersion, moduleDir, })
         display: [program, ...args].join(' '),
     };
 }
-export function formatUpdateScreen(offer) {
+export const UPDATE_OPTIONS = ['update', 'skip'];
+const UPDATE_KEY_HINT = '↑/↓ choose  •  Enter accepts  •  Ctrl+C quits';
+function formatUpdateHeader(offer) {
     return [
         '',
         `  ${chalk.yellow('✨ Update available')} — ${chalk.dim(offer.currentVersion)} → ${chalk.bold(offer.latestVersion)}`,
         '',
-        '  TheGitAI supports the current release only. On an older CLI a session',
-        '  can fail partway through, in ways this terminal cannot explain.',
+        '  TheGitAI works best with the latest version. TheGitAI may not work',
+        '  optimally if not updated.',
         '',
-        `  ${chalk.cyan('1.')} Update now ${chalk.dim(`(runs \`${offer.display}\`)`)}`,
-        `  ${chalk.cyan('2.')} Skip ${chalk.dim('(Agent may not work optimally)')}`,
+    ].join('\n');
+}
+export function formatUpdateOptions(offer, selectedIndex = 0) {
+    const rows = [
+        { note: `(runs \`${offer.display}\`)`, text: 'Update now' },
+        { note: '(Agent may not work optimally)', text: 'Skip' },
+    ];
+    return [
+        ...rows.map(({ note, text }, index) => index === selectedIndex
+            ? `  ${chalk.cyan(`› ${index + 1}. ${text}`)} ${chalk.dim(note)}`
+            : `    ${chalk.dim(`${index + 1}.`)} ${text} ${chalk.dim(note)}`),
         '',
-        `  ${chalk.dim('Press Enter to update, or 2 to skip.')}`,
+        `  ${chalk.dim(UPDATE_KEY_HINT)}`,
         '',
     ].join('\n');
 }
+export function formatUpdateScreen(offer, selectedIndex = 0) {
+    return `${formatUpdateHeader(offer)}\n${formatUpdateOptions(offer, selectedIndex)}`;
+}
+export function readUpdateKey(key, selectedIndex) {
+    const name = key.name ?? '';
+    if (key.ctrl && (name === 'c' || name === 'd')) {
+        return { kind: 'answer', answer: 'cancel' };
+    }
+    if (name === 'return' || name === 'enter') {
+        return { kind: 'answer', answer: UPDATE_OPTIONS[selectedIndex] ?? 'update' };
+    }
+    if (name === 'up' || (name === 'tab' && key.sequence === '\u001b[Z')) {
+        return { kind: 'select', index: Math.max(selectedIndex - 1, 0) };
+    }
+    if (name === 'down' || name === 'tab') {
+        return { kind: 'select', index: Math.min(selectedIndex + 1, UPDATE_OPTIONS.length - 1) };
+    }
+    const digit = Number.parseInt(key.sequence ?? '', 10);
+    if (Number.isInteger(digit) && digit >= 1 && digit <= UPDATE_OPTIONS.length) {
+        return { kind: 'answer', answer: UPDATE_OPTIONS[digit - 1] };
+    }
+    return { kind: 'ignore' };
+}
 export function readUpdateChoice(answer) {
     const value = answer.trim().toLowerCase();
     if (value === '' || value === '1' || value === 'y' || value === 'yes') {
@@ -67,7 +102,56 @@ export async function resolveUpdateAnswer(question) {
         throw error;
     }
 }
-async function askUpdateChoice() {
+export function renderedRowCount(text, columns) {
+    const width = Math.max(1, columns);
+    const lines = text.split('\n');
+    if (lines[lines.length - 1] === '')
+        lines.pop();
+    return lines.reduce((rows, line) => {
+        const visible = [...line.replace(/\x1b\[[0-9;]*m/g, '')].length;
+        return rows + Math.max(1, Math.ceil(visible / width));
+    }, 0);
+}
+async function askUpdateChoiceWithKeys(offer) {
+    let selected = 0;
+    const show = (index) => {
+        const rows = renderedRowCount(`${formatUpdateOptions(offer, selected)}\n`, output.columns ?? 80);
+        selected = index;
+        output.write(`\u001b[${rows}A\u001b[0J${formatUpdateOptions(offer, selected)}\n`);
+    };
+    emitKeypressEvents(input);
+    const wasRaw = input.isRaw === true;
+    input.setRawMode(true);
+    input.resume();
+    try {
+        return await new Promise((resolve) => {
+            const onKeypress = (_text, key) => {
+                const action = readUpdateKey(key ?? {}, selected);
+                if (action.kind === 'ignore')
+                    return;
+                if (action.kind === 'select') {
+                    if (action.index !== selected)
+                        show(action.index);
+                    return;
+                }
+                const chosen = UPDATE_OPTIONS.indexOf(action.answer);
+                if (chosen >= 0 && chosen !== selected)
+                    show(chosen);
+                input.off('keypress', onKeypress);
+                resolve(action.answer);
+            };
+            input.on('keypress', onKeypress);
+        });
+    }
+    finally {
+        if (!wasRaw)
+            input.setRawMode(false);
+        input.pause();
+    }
+}
+async function askUpdateChoice(offer) {
+    if (input.isTTY && output.isTTY)
+        return await askUpdateChoiceWithKeys(offer);
     const rl = readline.createInterface({ input, output });
     try {
         return await resolveUpdateAnswer(() => rl.question('  ▸ '));
@@ -93,7 +177,7 @@ export async function offerUpdateAtStartup({ currentVersion, latestVersion, ask
     if (!offer)
         return 'none';
     write(`${formatUpdateScreen(offer)}\n`);
-    const answer = await ask();
+    const answer = await ask(offer);
     if (answer === 'cancel') {
         write(`\n  ${chalk.dim('Cancelled. Nothing was installed.')}\n\n`);
         return 'cancelled';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thegitai/cli",
-  "version": "1.0.0-preview.44",
+  "version": "1.0.0-preview.46",
   "description": "TheGitAI is an agentic AI coding tool for your terminal. It reads and searches your repository, writes and edits files, runs your tests, and verifies the change before handing it back.",
   "keywords": [
     "agentic-ai",
@@ -44,11 +44,11 @@
     "@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.44",
-    "@thegitai/tui-darwin-x64": "1.0.0-preview.44",
-    "@thegitai/tui-linux-arm64": "1.0.0-preview.44",
-    "@thegitai/tui-linux-x64": "1.0.0-preview.44",
-    "@thegitai/tui-win32-x64": "1.0.0-preview.44",
+    "@thegitai/tui-darwin-arm64": "1.0.0-preview.46",
+    "@thegitai/tui-darwin-x64": "1.0.0-preview.46",
+    "@thegitai/tui-linux-arm64": "1.0.0-preview.46",
+    "@thegitai/tui-linux-x64": "1.0.0-preview.46",
+    "@thegitai/tui-win32-x64": "1.0.0-preview.46",
     "@vscode/ripgrep": "1.18.0"
   },
   "repository": {