@thegitai/cli 1.0.0-preview.15 → 1.0.0-preview.17

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

@@ -2,7 +2,7 @@ import { agentModeLabel } from '../../agent-mode.js';
 import { singleLinePreview, truncate } from '../../utils.js';
 import { formatClientTokenUsage } from '../repl.js';
 import { renderFormattedBodyLines, renderPreformattedBodyLines, } from './markdown-render.js';
-import { displayWidth, line, plainLine, sliceToWidth, span, wrapText, } from './text.js';
+import { displayWidth, line, padToWidth, plainLine, sliceToWidth, span, wrapText, } from './text.js';
 import { buildUserInputOverlayLines, } from './user-input.js';
 const WORKING_CLOCK_ICON = '◷';
 const BRAILLE_SPINNER_FRAMES = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴'];
@@ -286,6 +286,46 @@ function todoItemLine(item, width, progressTick = null) {
     }
     return line(span('  ○ ', { color: 'gray' }), span(text));
 }
+const TURN_MESSAGE_PANEL_MAX_ROWS = 6;
+const TURN_MESSAGE_LABEL = {
+    queued: 'queued',
+    sending: 'Processing . . .',
+    delivered: 'delivered',
+};
+function turnMessageLine(message, width, progressTick) {
+    const DECORATION = 6;
+    const budget = Math.max(1, width - DECORATION);
+    const preferredLabel = Math.max(...Object.values(TURN_MESSAGE_LABEL).map((value) => displayWidth(value)));
+    const labelWidth = Math.min(Math.max(1, Math.floor(budget / 2)), Math.max(preferredLabel, displayWidth(message.note ?? '')));
+    const label = fitLine(message.note ?? TURN_MESSAGE_LABEL[message.state], labelWidth);
+    const textWidth = Math.max(1, budget - labelWidth);
+    const text = padToWidth(fitLine(`"${message.text}"`, textWidth), textWidth);
+    if (message.state === 'delivered') {
+        return line(span('  ● ', { color: 'green' }), span(text, { color: 'gray', dim: true }), span(`  ${label}`, { color: 'green' }));
+    }
+    if (message.state === 'sending') {
+        return line(span(`  ${todoInProgressGlyph(progressTick)} `, {
+            color: TODO_IN_PROGRESS_COLOR,
+        }), span(text, { color: TODO_IN_PROGRESS_COLOR, bold: true }), span(`  ${label}`, { color: TODO_IN_PROGRESS_COLOR }));
+    }
+    return line(span('  ○ ', { color: 'cyan' }), span(text, { color: 'cyan' }), span(`  ${label}`, { color: 'gray' }));
+}
+export function buildTurnMessageLines(messages, width, progressTick = null) {
+    if (messages.length === 0)
+        return [];
+    const lines = [
+        line(span('Your messages', { color: 'cyan', bold: true })),
+    ];
+    const visible = messages.slice(-(TURN_MESSAGE_PANEL_MAX_ROWS - 1));
+    const hidden = messages.length - visible.length;
+    if (hidden > 0) {
+        lines.push(line(span(`  ● ${hidden} earlier`, { color: 'gray', dim: true })));
+    }
+    for (const message of visible) {
+        lines.push(turnMessageLine(message, width, progressTick));
+    }
+    return lines;
+}
 export function formatTodoProgress(items) {
     const done = items.filter((item) => item.status === 'completed').length;
     return `${done}/${items.length} done`;
@@ -472,7 +512,7 @@ function composerFooterLines(state) {
         return lines;
     }
     const busyHelperText = state.queuedMessage
-        ? 'Enter re-queues • ↑ edit queued • Esc / Ctrl+C clear queued'
+        ? 'Enter sends it to the agent • ↑ edit • Esc / Ctrl+C discard'
         : state.input
             ? 'Enter queues • Esc cancels turn • Ctrl+C clears draft'
             : 'Enter queues • Esc / Ctrl+C cancel turn';
@@ -649,6 +689,11 @@ function buildLiveLines(state, width, spinnerFrame, elapsedSeconds, nowMs) {
         lines.push(plainLine(''));
     }
     lines.push(plainLine(buildWorkingClockLine(state, elapsedSeconds), { color: 'yellow' }));
+    const turnMessages = state.turnMessages ?? [];
+    if (turnMessages.length > 0) {
+        lines.push(plainLine(''));
+        lines.push(...buildTurnMessageLines(turnMessages, width, todoProgressTick(nowMs)));
+    }
     const todos = state.todos ?? [];
     if (todos.length > 0) {
         lines.push(plainLine(''));
@@ -1055,25 +1100,19 @@ function buildOverlayLines(state, width, height, nowMs) {
             if (padded)
                 lines.push(plainLine(''));
         }
-        const options = [
-            { value: 'y', label: 'Approve once' },
-            { value: 'a', label: 'Approve all remaining actions' },
-            { value: 'n', label: 'Deny' },
-        ];
-        options.forEach((option, index) => {
+        const options = (prompt.options ?? []).map((option) => option.label);
+        options.forEach((label, index) => {
             const selected = index === state.approvalCursor;
             lines.push(line(span(selected ? '› ' : '  ', {
                 color: selected ? APPROVAL_ACCENT_COLOR : 'gray',
-            }), span(option.value, {
+            }), span(label, {
                 color: selected ? APPROVAL_ACCENT_COLOR : undefined,
                 bold: selected,
-            }), span(` ${option.label}`, {
-                color: selected ? APPROVAL_ACCENT_COLOR : undefined,
             })));
         });
         if (padded)
             lines.push(plainLine(''));
-        lines.push(plainLine('Press y, a, or n • ↑/↓ moves • Enter confirms', {
+        lines.push(plainLine('↑/↓ moves • Enter confirms • Esc denies', {
             color: 'gray',
         }));
         return buildOverlayPanel(lines, width, OVERLAY_BORDER_COLOR, height);
@@ -1198,11 +1237,10 @@ export function buildTuiFrame(state, cols, rows, spinnerFrame, elapsedSeconds, n
             composerLines.push(line(span('Starting a new conversation…', { color: 'gray', dim: true })));
         }
         else if (state.queuedMessage) {
-            const preview = truncate(state.queuedMessage.body.trim().replace(/\s+/g, ' '), 60);
             const imageCount = state.queuedMessage.imageAttachments.length;
-            composerLines.push(line(span(`↳ Queued · "${preview}"`, { color: 'gray', dim: true }), ...(imageCount > 0
-                ? [span(` +${imageCount} img`, { color: 'gray', dim: true })]
-                : []), span('   ↑ edit · esc cancel', { color: 'gray', dim: true })));
+            composerLines.push(line(span('Queued', { color: 'cyan', bold: true }), span('  Enter', { color: 'cyan', bold: true }), span(imageCount > 0
+                ? ' sends it with the next prompt'
+                : ' sends it to the agent now', { color: 'gray' }), span('  ·  ↑', { color: 'cyan', bold: true }), span(' edit', { color: 'gray' }), span('  ·  Esc', { color: 'cyan', bold: true }), span(' discard', { color: 'gray' })));
         }
         else {
             const promptLabel = state.busy ? 'queue> ' : '❯ ';

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

@@ -1,5 +1,5 @@
 import { readClipboardImage, readClipboardText } from '../../core/clipboard.js';
-import { applySlashCommandSuggestion, buildModelPickerOptions, deleteAtCursor, deleteBeforeCursor, getApprovalChoiceForCursor, getInputCommandToken, getNextApprovalCursor, getNextModelPickerIndex, getSlashCommandSuggestions, insertAtCursor, isExactSlashCommandToken, navigatePromptHistory, resolveApprovalChoiceFromInput, shouldRemountLiveFrameForComposerInputChange, } from '../repl.js';
+import { applySlashCommandSuggestion, buildModelPickerOptions, deleteAtCursor, deleteBeforeCursor, getInputCommandToken, getNextApprovalCursor, getNextModelPickerIndex, getSlashCommandSuggestions, insertAtCursor, isExactSlashCommandToken, navigatePromptHistory, shouldRemountLiveFrameForComposerInputChange, } from '../repl.js';
 import { buildPastePlaceholder, shouldCollapsePaste, } from '../paste-collapse.js';
 import { handleUserInputPromptEvent, } from './user-input.js';
 const APPROVAL_PREVIEW_PAGE_ROWS = 3;
@@ -11,6 +11,13 @@ function isClipboardImagePasteKey(key) {
     }
     return key.ctrl && key.input === 'v' && !key.shift && !key.meta;
 }
+export const APPROVAL_INPUT_GUARD_MS = 500;
+function approvalIsGuarded(state) {
+    const openedAt = state.approvalOpenedAt;
+    if (typeof openedAt !== 'number')
+        return false;
+    return Date.now() - openedAt < APPROVAL_INPUT_GUARD_MS;
+}
 function applyUserInputPromptEvent(store, handlers, event) {
     const current = store.getState();
     if (!current.userInputPrompt)
@@ -283,24 +290,22 @@ export function handleShellKeyEvent(store, handlers, event) {
             }
             return;
         }
-        const directChoice = key.ctrl || key.meta ? null : resolveApprovalChoiceFromInput(key.input);
-        if (directChoice) {
-            void handlers.onResolveApproval(directChoice);
-            return;
-        }
-        if (key.escape) {
-            void handlers.onResolveApproval('n');
-            return;
-        }
         if (key.upArrow || key.downArrow) {
             store.update((current) => ({
                 ...current,
-                approvalCursor: getNextApprovalCursor(current.approvalCursor, key.upArrow ? -1 : 1),
+                approvalCursor: getNextApprovalCursor(current.approvalCursor, key.upArrow ? -1 : 1, current.approvalPrompt?.options?.length ?? 0),
             }));
             return;
         }
+        if (approvalIsGuarded(state)) {
+            return;
+        }
+        if (key.escape) {
+            void handlers.onResolveApproval(-1);
+            return;
+        }
         if (key.returnKey) {
-            void handlers.onResolveApproval(getApprovalChoiceForCursor(state.approvalCursor));
+            void handlers.onResolveApproval(state.approvalCursor);
         }
         return;
     }
@@ -436,6 +441,15 @@ export function handleShellKeyEvent(store, handlers, event) {
         handlers.onCycleAgentMode();
         return;
     }
+    if (state.busy && state.queuedMessage) {
+        if (key.returnKey) {
+            void handlers.onFireQueuedMessage?.();
+            return;
+        }
+        if (!key.upArrow) {
+            return;
+        }
+    }
     if (commandPaletteActive && (key.upArrow || key.downArrow)) {
         store.update((current) => ({
             ...current,
@@ -444,7 +458,7 @@ export function handleShellKeyEvent(store, handlers, event) {
         return;
     }
     if (key.upArrow) {
-        if (state.busy && state.input.trim() === '' && state.queuedMessage) {
+        if (state.busy && state.queuedMessage) {
             handlers.onLiveFrameShapeChange();
             store.update((current) => {
                 const queued = current.queuedMessage;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thegitai/cli",
-  "version": "1.0.0-preview.15",
+  "version": "1.0.0-preview.17",
   "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",
@@ -37,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.15",
-    "@thegitai/tui-darwin-x64": "1.0.0-preview.15",
-    "@thegitai/tui-linux-x64": "1.0.0-preview.15",
-    "@thegitai/tui-win32-x64": "1.0.0-preview.15",
+    "@thegitai/tui-darwin-arm64": "1.0.0-preview.17",
+    "@thegitai/tui-darwin-x64": "1.0.0-preview.17",
+    "@thegitai/tui-linux-x64": "1.0.0-preview.17",
+    "@thegitai/tui-win32-x64": "1.0.0-preview.17",
     "@vscode/ripgrep": "1.18.0"
   },
   "publishConfig": {