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

package/dist/src/api/chat.js

@@ -248,6 +248,26 @@ async function postUserInputResult({ config, turnId, requestId, result, fetchImp
         throw await readErrorResponse(response, trace.traceId);
     }
 }
+export async function postInterjection({ config, turnId, text, messageId, fetchImpl = globalThis.fetch, traceId, }) {
+    const payload = { text, messageId };
+    const trace = createTraceContext(traceId);
+    const response = await fetchImpl(`${normalizeServerUrl(config.serverUrl)}/v1/chat/turn/${encodeURIComponent(turnId)}/interject`, {
+        method: 'POST',
+        headers: {
+            authorization: `Bearer ${config.token}`,
+            'content-type': 'application/json',
+            ...trace.headers,
+        },
+        body: JSON.stringify(payload),
+    });
+    if (response.status === 410) {
+        return 'stale';
+    }
+    if (!response.ok) {
+        throw await readErrorResponse(response, trace.traceId);
+    }
+    return 'delivered';
+}
 const turnIdOverrides = new WeakMap();
 function enterServerTurnId(session, serverSessionTurnId) {
     const active = turnIdOverrides.get(session);
@@ -309,7 +329,7 @@ async function executeAndPostToolResult({ config, projectIndex, session, event,
         }
     }
 }
-async function consumeTurnStream({ response, config, projectIndex, session, input, fetchImpl, signal, traceId, }) {
+async function consumeTurnStream({ response, config, projectIndex, session, input, fetchImpl, signal, traceId, onTurnStart, onInterjectionDelivered, }) {
     if (!response.body) {
         throw new Error('Server returned an empty chat stream.');
     }
@@ -345,6 +365,16 @@ async function consumeTurnStream({ response, config, projectIndex, session, inpu
         }
     }
     async function handleEvent(event) {
+        if (event.event === 'turn-start') {
+            const turnId = String(event.data?.turnId ?? '').trim();
+            if (turnId)
+                onTurnStart?.(turnId);
+            return;
+        }
+        if (event.event === 'interjection-delivered') {
+            onInterjectionDelivered?.(event.data);
+            return;
+        }
         if (event.event === 'status') {
             const data = event.data;
             if (data?.phase === 'analyzing_image') {
@@ -478,7 +508,7 @@ async function consumeTurnStream({ response, config, projectIndex, session, inpu
     }
     return finalResult.current;
 }
-export async function sendServerUserMessage({ config, projectIndex, session, input, imageAttachments = [], fetchImpl = globalThis.fetch, signal, }) {
+export async function sendServerUserMessage({ config, projectIndex, session, input, imageAttachments = [], fetchImpl = globalThis.fetch, signal, onTurnStart, onInterjectionDelivered, }) {
     const autoAttach = autoAttachImages(input, session.rootDir, imageAttachments);
     const requestImageAttachments = autoAttach.attachments.length > 0
         ? [...imageAttachments, ...autoAttach.attachments]
@@ -535,6 +565,8 @@ export async function sendServerUserMessage({ config, projectIndex, session, inp
             fetchImpl,
             signal,
             traceId: trace.traceId,
+            onTurnStart,
+            onInterjectionDelivered,
         });
         applySessionSnapshot(session, result.snapshot, { preserveAgentMode: true });
         return {

package/dist/src/help-text.js

@@ -59,6 +59,13 @@ const HELP_MARKDOWN = [
     '- **Enter** sends • **Shift+Tab** cycles modes • **Esc** cancels the turn •',
     '  **Ctrl+C** clears the composer or the queued message, and quits once there',
     '  is nothing left to clear. These are the same on macOS, Linux, and Windows.',
+    '- **While the agent is working**, Enter queues your message and locks the',
+    '  composer. Press **Enter** again to send it into the running turn: the agent',
+    '  picks it up at its next step instead of waiting for the turn to finish, and',
+    '  the Your messages panel tracks it from queued to delivered. **↑** brings it',
+    '  back for editing and **Esc**/**Ctrl+C** discards it; both unlock the',
+    '  composer for the next message. Messages with images cannot be sent mid-turn',
+    '  and are sent with the next prompt instead.',
     `- **Paste** into the composer with your terminal's paste shortcut (\`${PASTE_SHORTCUT}\``,
     '  on this system) or by right-clicking the composer.',
     '- **Copy** from the transcript by dragging to select; double-click copies a',
@@ -85,8 +92,11 @@ const HELP_MARKDOWN = [
     '## Safety & approvals',
     '',
     '- TheGitAI asks before running shell commands or applying file edits.',
-    '- At each prompt: **y** approves once, **a** approves the rest of the',
-    '  session, **n** denies.',
+    '- At each prompt: **↑/↓** moves between choices, **Enter** confirms the',
+    '  highlighted one, and **Esc** denies. Deny is selected by default, and the',
+    '  choices are Approve once, Approve all remaining actions, and Deny.',
+    '  Single-letter shortcuts were removed on purpose: a prompt can appear',
+    '  while you are typing, and a stray letter must never approve anything.',
     '- If an approved `sudo` command needs a password, the TUI shows the exact',
     '  command and keeps the password masked and local.',
     '- `-y` / `--yes` at startup auto-approves every shell command and file',

package/dist/src/ui/repl.js

@@ -852,6 +852,13 @@ export function buildTranscriptFromSessionHistory(history) {
             }
             continue;
         }
+        if (entry.role === 'user' && entry.kind === 'userInterjection') {
+            const text = String(entry.userInput ?? '').trim();
+            if (text) {
+                entries.push({ body: text, kind: 'user', title: 'You · sent mid-turn' });
+            }
+            continue;
+        }
         const text = textFromHistoryEntry(entry);
         if ((entry.role === 'model' || entry.role === 'assistant') && text) {
             if (isTurnFailureMarker(text)) {
@@ -1022,6 +1029,7 @@ function createInitialShellState(session, serverModels, debugUi) {
         resumePickerSessions: [],
         transcriptScrollOffset: 0,
         queuedMessage: null,
+        turnMessages: [],
         serverModels: serverModels.models,
         sudoPrompt: null,
         status: 'Ready',
@@ -1282,16 +1290,6 @@ export function getApprovalChoiceForCursor(cursor) {
     return (APPROVAL_OPTIONS[Math.min(Math.max(cursor, 0), APPROVAL_OPTIONS.length - 1)]
         ?.value ?? 'n');
 }
-export function resolveApprovalChoiceFromInput(input) {
-    const normalizedInput = String(input ?? '').trim().toLowerCase();
-    if (normalizedInput === 'y')
-        return 'y';
-    if (normalizedInput === 'a')
-        return 'a';
-    if (normalizedInput === 'n')
-        return 'n';
-    return null;
-}
 export function pauseBusyClock(state, nowMs) {
     if (state.busySince === null || state.busyPausedAt !== null)
         return state;
@@ -1393,6 +1391,9 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
         let latestUsageSummary = null;
         let pendingTurnEntries = [];
         let activeTurnAbort = null;
+        let activeServerTurnId = null;
+        let unacknowledged = new Map();
+        const blockedRows = new WeakMap();
         let newConversationInFlight = false;
         let todosTouchedThisTurn = false;
         const syncTodosState = () => {
@@ -1677,6 +1678,7 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
                 status: 'Ready',
                 thinkingTitle: '',
                 thinkingNotes: [],
+                turnMessages: [],
                 workingTools: [],
                 tokenUsage: formatClientTokenUsage(busyElapsedMs(current, Date.now()), latestUsageSummary),
             }));
@@ -1936,6 +1938,7 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
             store.update((current) => ({
                 ...pauseBusyClock(current, Date.now()),
                 approvalCursor: getDefaultApprovalCursor(),
+                approvalOpenedAt: Date.now(),
                 approvalScrollOffset: 0,
                 approvalPrompt: {
                     title,
@@ -2230,6 +2233,129 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
             }));
             await handleSubmit(queued.body);
         };
+        let turnMessageCounter = 0;
+        const upsertTurnMessage = (id, patch) => {
+            store.update((current) => ({
+                ...current,
+                turnMessages: current.turnMessages.map((message) => message.id === id ? { ...message, ...patch } : message),
+            }));
+        };
+        const recoverUnacknowledgedMessages = (autoSubmits = true) => {
+            if (unacknowledged.size === 0)
+                return;
+            const stranded = [...unacknowledged.values()];
+            unacknowledged = new Map();
+            for (const { row } of stranded) {
+                upsertTurnMessage(row, {
+                    state: 'queued',
+                    note: autoSubmits
+                        ? 'not read — sending as the next prompt'
+                        : 'not read — left in the composer',
+                });
+            }
+            const existing = store.getState().queuedMessage;
+            const combined = [
+                ...stranded.map((entry) => entry.queued),
+                ...(existing ? [existing] : []),
+            ];
+            const body = combined
+                .map((entry) => entry.body)
+                .filter((entry) => entry.trim())
+                .join('\n\n');
+            if (!body.trim())
+                return;
+            scheduleLiveFrameRemount();
+            store.update((current) => ({
+                ...current,
+                queuedMessage: {
+                    body,
+                    imageAttachments: combined.flatMap((entry) => entry.imageAttachments),
+                    pastedChunks: combined.flatMap((entry) => entry.pastedChunks),
+                },
+            }));
+        };
+        const fireQueuedMessage = async () => {
+            const state = store.getState();
+            const queued = state.queuedMessage;
+            if (!queued || !state.busy || exiting)
+                return;
+            const text = (queued.pastedChunks.length
+                ? expandPastedChunks(queued.body, queued.pastedChunks)
+                : queued.body).trim();
+            if (!text)
+                return;
+            const turnId = activeServerTurnId;
+            const blockedReason = queued.imageAttachments.length > 0
+                ? 'waiting — images go with the next prompt'
+                : !turnId
+                    ? 'waiting for the turn to end'
+                    : null;
+            const existingRow = blockedRows.get(queued);
+            if (existingRow !== undefined) {
+                upsertTurnMessage(existingRow, {
+                    state: 'queued',
+                    ...(blockedReason ? { note: blockedReason } : {}),
+                });
+                if (blockedReason || !turnId)
+                    return;
+            }
+            const id = existingRow ?? ++turnMessageCounter;
+            const messageId = `m${id}_${Date.now().toString(36)}`;
+            if (existingRow === undefined) {
+                scheduleLiveFrameRemount();
+                store.update((current) => ({
+                    ...current,
+                    turnMessages: [
+                        ...current.turnMessages,
+                        {
+                            id,
+                            text,
+                            state: blockedReason ? 'queued' : 'sending',
+                            ...(blockedReason ? { note: blockedReason } : {}),
+                        },
+                    ],
+                }));
+            }
+            if (blockedReason || !turnId) {
+                blockedRows.set(queued, id);
+                return;
+            }
+            blockedRows.delete(queued);
+            unacknowledged.set(messageId, { row: id, queued });
+            scheduleLiveFrameRemount();
+            store.update((current) => current.queuedMessage === queued
+                ? { ...current, queuedMessage: null }
+                : current);
+            queueTurnEntry({
+                body: text,
+                kind: 'user',
+                preformatted: queued.pastedChunks.length > 0,
+                title: 'You · sent mid-turn',
+            });
+            const rollback = (note) => {
+                if (!unacknowledged.delete(messageId))
+                    return;
+                upsertTurnMessage(id, { state: 'queued', note });
+                scheduleLiveFrameRemount();
+                store.update((current) => current.queuedMessage ? current : { ...current, queuedMessage: queued });
+            };
+            let outcome;
+            try {
+                outcome = await chat.postInterjection({
+                    config: authConfig,
+                    turnId,
+                    text,
+                    messageId,
+                });
+            }
+            catch (error) {
+                rollback(`not sent — ${error?.message ?? 'request failed'}`);
+                return;
+            }
+            if (outcome === 'stale') {
+                rollback('turn ended — sending as the next prompt');
+            }
+        };
         const handleSubmit = async (rawInput) => {
             const chunks = store.getState().pastedChunks;
             const expanded = chunks.length
@@ -2481,6 +2607,7 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
             }
             latestUsageSummary = null;
             disarmExitConfirm();
+            unacknowledged = new Map();
             const turnStartedAt = Date.now();
             const turnGeneration = ++activeTurnGeneration;
             const turnAbort = new AbortController();
@@ -2513,6 +2640,7 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
                 transcriptScrollOffset: 0,
                 tokenUsage: formatClientTokenUsage(0, latestUsageSummary),
                 turnCounter: current.turnCounter + 1,
+                turnMessages: [],
                 workingTools: [],
             }));
             try {
@@ -2523,6 +2651,25 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
                     input,
                     imageAttachments,
                     signal: turnAbort.signal,
+                    onTurnStart: (serverTurnId) => {
+                        if (turnGeneration !== activeTurnGeneration)
+                            return;
+                        activeServerTurnId = serverTurnId;
+                    },
+                    onInterjectionDelivered: (event) => {
+                        if (turnGeneration !== activeTurnGeneration)
+                            return;
+                        for (const messageId of event.messageIds ?? []) {
+                            const pending = unacknowledged.get(messageId);
+                            if (!pending)
+                                continue;
+                            unacknowledged.delete(messageId);
+                            upsertTurnMessage(pending.row, {
+                                state: 'delivered',
+                                note: undefined,
+                            });
+                        }
+                    },
                 });
                 if (turnGeneration !== activeTurnGeneration)
                     return;
@@ -2571,6 +2718,7 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
                     status: result.waitingForApproval ? 'Awaiting approval' : 'Ready',
                     tokenUsage: formatClientTokenUsage(Date.now() - turnStartedAt, latestUsageSummary),
                 }));
+                recoverUnacknowledgedMessages();
                 await flushQueuedMessage();
             }
             catch (error) {
@@ -2616,6 +2764,7 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
                     appendError(error.message);
                 }
                 await remountTui();
+                recoverUnacknowledgedMessages(!cancelled);
                 if (!cancelled && turnGeneration === activeTurnGeneration) {
                     await flushQueuedMessage();
                 }
@@ -2626,7 +2775,9 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
                 }
                 if (turnGeneration === activeTurnGeneration) {
                     lastTurnStartedAt = null;
+                    activeServerTurnId = null;
                 }
+                recoverUnacknowledgedMessages();
             }
         };
         session.onImageAnalysis = (activeImageCount) => {
@@ -2791,6 +2942,7 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
             onJobsPickerKill: handleJobsPickerKill,
             onSudoPasswordInput: handleSudoPasswordInput,
             onSubmit: handleSubmit,
+            onFireQueuedMessage: fireQueuedMessage,
         };
         const unsubscribe = store.subscribe(() => {
             renderCurrentFrame();

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 = ['Approve once', 'Approve all remaining actions', 'Deny'];
+        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, getApprovalChoiceForCursor, 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,15 +290,6 @@ 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,
@@ -299,6 +297,13 @@ export function handleShellKeyEvent(store, handlers, event) {
             }));
             return;
         }
+        if (approvalIsGuarded(state)) {
+            return;
+        }
+        if (key.escape) {
+            void handlers.onResolveApproval('n');
+            return;
+        }
         if (key.returnKey) {
             void handlers.onResolveApproval(getApprovalChoiceForCursor(state.approvalCursor));
         }
@@ -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.16",
   "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.16",
+    "@thegitai/tui-darwin-x64": "1.0.0-preview.16",
+    "@thegitai/tui-linux-x64": "1.0.0-preview.16",
+    "@thegitai/tui-win32-x64": "1.0.0-preview.16",
     "@vscode/ripgrep": "1.18.0"
   },
   "publishConfig": {