@thegitai/cli 1.0.0-preview.5 → 1.0.0-preview.51

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

@@ -1,6 +1,12 @@
+import { shortcutsPanelAvailable } from './shortcuts.js';
+import { moveComposerCursorVertically } from './composer-layout.js';
 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 { 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, 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;
 function isClipboardImagePasteKey(key) {
     if (process.platform === 'win32') {
         return ((key.ctrl || key.meta) &&
@@ -9,6 +15,38 @@ 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)
+        return false;
+    const outcome = handleUserInputPromptEvent(current.userInputPrompt, event, handlers.getUserInputViewport?.());
+    store.update((state) => ({
+        ...state,
+        userInputPrompt: outcome.state,
+    }));
+    if (outcome.result) {
+        void handlers.onResolveUserInput?.(outcome.result);
+    }
+    return true;
+}
+function composerIsEmpty(state) {
+    return (!state.input &&
+        state.cursor === 0 &&
+        state.pastedChunks.length === 0 &&
+        state.promptHistoryCursor === null);
+}
+function composerHasDiscardableDraft(state) {
+    if (!composerIsEmpty(state))
+        return true;
+    return !state.busy && state.imageAttachments.length > 0;
+}
 function shouldShowCommandPalette(state) {
     if (state.busy ||
         state.exiting ||
@@ -18,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();
@@ -68,12 +108,47 @@ function pasteTextFromClipboard(store, handlers) {
     if (!text) {
         store.update((state) => ({
             ...state,
-            status: 'Clipboard has no text to paste',
+            transientStatus: 'Clipboard has no text to paste',
         }));
         return;
     }
     insertPastedText(store, handlers, text);
 }
+function scrollTranscript(store, handlers, delta) {
+    if (delta === 0)
+        return;
+    store.update((current) => {
+        const limit = handlers.getTranscriptScrollLimit?.() ??
+            current.transcript.reduce((total, entry) => total + 2 + (entry.body ? entry.body.split('\n').length : 0), 0);
+        const next = current.transcriptScrollOffset + delta;
+        return {
+            ...current,
+            transcriptScrollOffset: Math.max(0, Math.min(next, limit)),
+        };
+    });
+}
+function scrollTranscriptTo(store, handlers, offset) {
+    store.update((current) => {
+        const limit = handlers.getTranscriptScrollLimit?.() ??
+            current.transcript.reduce((total, entry) => total + 2 + (entry.body ? entry.body.split('\n').length : 0), 0);
+        return {
+            ...current,
+            transcriptScrollOffset: Math.max(0, Math.min(Math.trunc(offset), limit)),
+        };
+    });
+}
+function scrollApprovalPreview(store, handlers, delta) {
+    if (delta === 0)
+        return;
+    store.update((current) => {
+        const limit = handlers.getApprovalScrollLimit?.() ?? 0;
+        const next = (current.approvalScrollOffset ?? 0) + delta;
+        return {
+            ...current,
+            approvalScrollOffset: Math.max(0, Math.min(next, limit)),
+        };
+    });
+}
 function filterResumeSessionsLocal(sessions, filter, serverModels) {
     const q = filter.trim().toLowerCase();
     if (!q)
@@ -88,6 +163,12 @@ function filterResumeSessionsLocal(sessions, filter, serverModels) {
 }
 export function handleShellKeyEvent(store, handlers, event) {
     if (event.kind === 'paste') {
+        if (applyUserInputPromptEvent(store, handlers, {
+            kind: 'paste',
+            text: event.text,
+        })) {
+            return;
+        }
         insertPastedText(store, handlers, event.text);
         return;
     }
@@ -110,33 +191,67 @@ export function handleShellKeyEvent(store, handlers, event) {
         return;
     }
     if (event.kind === 'contextMenu') {
+        if (store.getState().userInputPrompt) {
+            const text = (handlers.readClipboardText ?? readClipboardText)();
+            if (text) {
+                applyUserInputPromptEvent(store, handlers, { kind: 'paste', text });
+            }
+            return;
+        }
         pasteTextFromClipboard(store, handlers);
         return;
     }
     if (event.kind === 'transcriptScroll') {
-        const delta = Math.trunc(event.deltaLines);
-        if (delta !== 0) {
-            store.update((current) => {
-                const limit = handlers.getTranscriptScrollLimit?.() ??
-                    current.transcript.reduce((total, entry) => total + 2 + (entry.body ? entry.body.split('\n').length : 0), 0);
-                const next = current.transcriptScrollOffset + delta;
-                return {
-                    ...current,
-                    transcriptScrollOffset: Math.max(0, Math.min(next, limit)),
-                };
-            });
-        }
+        scrollTranscript(store, handlers, Math.trunc(event.deltaLines));
+        return;
+    }
+    if (event.kind === 'transcriptScrollTo') {
+        scrollTranscriptTo(store, handlers, Number(event.offset ?? 0));
         return;
     }
     if (event.kind !== 'key')
         return;
     const key = event;
     const state = store.getState();
+    const commandPaletteActive = shouldShowCommandPalette(state);
+    const commandSuggestions = commandPaletteActive
+        ? getSlashCommandSuggestions(state.input)
+        : [];
+    const prepareForComposerInputChange = (current, nextInput) => {
+        if (shouldRemountLiveFrameForComposerInputChange(current, nextInput)) {
+            handlers.onLiveFrameShapeChange();
+        }
+    };
     if (key.ctrl && key.input === 'c') {
+        if (state.userInputPrompt) {
+            handlers.onCtrlC?.();
+            return;
+        }
         if (state.sudoPrompt) {
             handlers.onSudoPasswordInput({ kind: 'cancel' });
             return;
         }
+        if (state.queuedMessage) {
+            handlers.onLiveFrameShapeChange();
+            store.update((current) => ({ ...current, queuedMessage: null }));
+            return;
+        }
+        if (composerHasDiscardableDraft(state)) {
+            store.update((current) => {
+                prepareForComposerInputChange(current, '');
+                return {
+                    ...current,
+                    commandCursor: 0,
+                    cursor: 0,
+                    imageAttachments: current.busy ? current.imageAttachments : [],
+                    input: '',
+                    pastedChunks: [],
+                    promptHistoryCursor: null,
+                    promptHistoryDraft: '',
+                };
+            });
+            return;
+        }
         if (handlers.onCtrlC) {
             handlers.onCtrlC();
             return;
@@ -144,15 +259,10 @@ export function handleShellKeyEvent(store, handlers, event) {
         handlers.onRequestExit();
         return;
     }
-    const commandPaletteActive = shouldShowCommandPalette(state);
-    const commandSuggestions = commandPaletteActive
-        ? getSlashCommandSuggestions(state.input)
-        : [];
-    const prepareForComposerInputChange = (current, nextInput) => {
-        if (shouldRemountLiveFrameForComposerInputChange(current, nextInput)) {
-            handlers.onLiveFrameShapeChange();
-        }
-    };
+    if (state.userInputPrompt &&
+        applyUserInputPromptEvent(store, handlers, key)) {
+        return;
+    }
     if (state.sudoPrompt) {
         if (key.escape) {
             handlers.onSudoPasswordInput({ kind: 'cancel' });
@@ -176,24 +286,32 @@ export function handleShellKeyEvent(store, handlers, event) {
         return;
     }
     if (state.approvalPrompt) {
-        const directChoice = resolveApprovalChoiceFromInput(key.input);
-        if (directChoice) {
-            void handlers.onResolveApproval(directChoice);
-            return;
-        }
-        if (key.escape) {
-            void handlers.onResolveApproval('n');
+        if (key.pageUp || key.pageDown) {
+            const delta = key.pageUp ? -APPROVAL_PREVIEW_PAGE_ROWS : APPROVAL_PREVIEW_PAGE_ROWS;
+            if (key.shift) {
+                scrollTranscript(store, handlers, key.pageUp ? 8 : -8);
+            }
+            else {
+                scrollApprovalPreview(store, handlers, delta);
+            }
             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;
     }
@@ -201,24 +319,18 @@ export function handleShellKeyEvent(store, handlers, event) {
         return;
     }
     if (key.pageUp || key.pageDown) {
-        store.update((current) => {
-            const transcriptLines = handlers.getTranscriptScrollLimit?.() ??
-                current.transcript.reduce((total, entry) => total + 2 + (entry.body ? entry.body.split('\n').length : 0), 0);
-            const next = current.transcriptScrollOffset + (key.pageUp ? 8 : -8);
-            return {
-                ...current,
-                transcriptScrollOffset: Math.max(0, Math.min(next, transcriptLines)),
-            };
-        });
+        scrollTranscript(store, handlers, key.pageUp ? 8 : -8);
         return;
     }
     if (state.jobsPickerOpen) {
-        if (key.escape) {
+        if (key.escape || (key.ctrl && key.input === 'b' && !key.meta && !key.shift)) {
+            handlers.onLiveFrameShapeChange();
             store.update((current) => ({
                 ...current,
                 jobsPickerExpandedId: null,
                 jobsPickerOpen: false,
-                status: 'Ready',
+                jobsPickerReturnStatus: null,
+                status: current.jobsPickerReturnStatus ?? 'Ready',
             }));
             return;
         }
@@ -306,6 +418,28 @@ export function handleShellKeyEvent(store, handlers, event) {
         }
         return;
     }
+    if (state.shortcutsOpen) {
+        if (key.escape || key.returnKey || key.input === '?' || key.input === 'q') {
+            handlers.onLiveFrameShapeChange();
+            store.update((current) => ({ ...current, shortcutsOpen: false }));
+        }
+        return;
+    }
+    if (key.ctrl && key.input === 'b' && !key.meta && !key.shift) {
+        if ((state.backgroundJobs ?? []).length > 0) {
+            handlers.onOpenJobsPicker();
+        }
+        return;
+    }
+    if (key.ctrl && key.input === 'g' && !key.meta && !key.shift) {
+        handlers.onToggleNotifications?.();
+        return;
+    }
+    if (key.input === '?' && !key.ctrl && !key.meta && shortcutsPanelAvailable(state)) {
+        handlers.onLiveFrameShapeChange();
+        store.update((current) => ({ ...current, shortcutsOpen: true }));
+        return;
+    }
     if (key.escape) {
         if (state.busy) {
             if (state.queuedMessage) {
@@ -317,10 +451,7 @@ export function handleShellKeyEvent(store, handlers, event) {
             return;
         }
         store.update((current) => {
-            if (!current.input &&
-                current.cursor === 0 &&
-                current.pastedChunks.length === 0 &&
-                current.promptHistoryCursor === null) {
+            if (composerIsEmpty(current)) {
                 return current;
             }
             prepareForComposerInputChange(current, '');
@@ -337,9 +468,22 @@ export function handleShellKeyEvent(store, handlers, event) {
         return;
     }
     if (key.tab && key.shift) {
+        if (state.busy) {
+            handlers.onAgentModeChangeBlocked?.();
+            return;
+        }
         handlers.onCycleAgentMode();
         return;
     }
+    if (state.busy && state.queuedMessage) {
+        if (key.returnKey) {
+            void handlers.onFireQueuedMessage?.();
+            return;
+        }
+        if (!key.upArrow && !isClipboardImagePasteKey(key)) {
+            return;
+        }
+    }
     if (commandPaletteActive && (key.upArrow || key.downArrow)) {
         store.update((current) => ({
             ...current,
@@ -348,7 +492,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;
@@ -367,9 +511,13 @@ export function handleShellKeyEvent(store, handlers, event) {
             });
             return;
         }
-        if (state.busy)
+        const nextCursor = moveComposerCursorVertically(state.input, state.cursor, handlers.getComposerInputWidth?.() ?? Number.POSITIVE_INFINITY, -1);
+        if (nextCursor === null && state.busy)
             return;
         store.update((current) => {
+            if (nextCursor !== null) {
+                return { ...current, commandCursor: 0, cursor: nextCursor };
+            }
             const next = navigatePromptHistory(current, 'previous');
             prepareForComposerInputChange(current, next.input);
             return next;
@@ -377,9 +525,13 @@ export function handleShellKeyEvent(store, handlers, event) {
         return;
     }
     if (key.downArrow) {
-        if (state.busy)
+        const nextCursor = moveComposerCursorVertically(state.input, state.cursor, handlers.getComposerInputWidth?.() ?? Number.POSITIVE_INFINITY, 1);
+        if (nextCursor === null && state.busy)
             return;
         store.update((current) => {
+            if (nextCursor !== null) {
+                return { ...current, commandCursor: 0, cursor: nextCursor };
+            }
             const next = navigatePromptHistory(current, 'next');
             prepareForComposerInputChange(current, next.input);
             return next;
@@ -399,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);
@@ -467,12 +619,16 @@ export function handleShellKeyEvent(store, handlers, event) {
     }
     if (isClipboardImagePasteKey(key)) {
         const current = store.getState();
-        if (current.busy)
-            return;
-        const liveAttachments = current.imageAttachments.filter((attachment) => current.input.includes(`[Image #${attachment.index}]`));
-        if (liveAttachments.length >= 2) {
+        const target = current.queuedMessage
+            ? {
+                body: current.queuedMessage.body,
+                attachments: current.queuedMessage.imageAttachments,
+            }
+            : { body: current.input, attachments: current.imageAttachments };
+        const liveAttachments = target.attachments.filter((attachment) => target.body.includes(`[Image #${attachment.index}]`));
+        if (liveAttachments.length >= MAX_IMAGES_PER_MESSAGE) {
             store.appendEntry({
-                body: 'Maximum of 2 images per message. Send the current message first.',
+                body: `Maximum of ${MAX_IMAGES_PER_MESSAGE} images per message. Send the current message first.`,
                 kind: 'error',
                 title: 'Image',
             });
@@ -480,22 +636,49 @@ export function handleShellKeyEvent(store, handlers, event) {
         }
         try {
             const clipResult = readClipboardImage();
+            if (totalAttachmentBytes(liveAttachments) +
+                approximateBase64DecodedBytes(clipResult.base64Data) >
+                MAX_TOTAL_IMAGE_BYTES_PER_MESSAGE) {
+                store.appendEntry({
+                    body: `This image would put the message over the ${Math.round(MAX_TOTAL_IMAGE_BYTES_PER_MESSAGE / 1024 / 1024)}MB combined image limit. Send the current message first.`,
+                    kind: 'error',
+                    title: 'Image',
+                });
+                return;
+            }
             const idx = liveAttachments.length === 0
                 ? 1
                 : Math.max(...liveAttachments.map((attachment) => attachment.index)) + 1;
-            store.update((shellState) => ({
-                ...shellState,
-                imageAttachments: [
-                    ...liveAttachments,
-                    {
-                        index: idx,
-                        mimeType: clipResult.mimeType,
-                        base64Data: clipResult.base64Data,
-                        source: 'clipboard',
-                    },
-                ],
-                ...insertAtCursor(shellState, `[Image #${idx}] `),
-            }));
+            const cached = tryCacheAttachmentBytes({
+                base64Data: clipResult.base64Data,
+                mimeType: clipResult.mimeType,
+            });
+            const attachment = {
+                index: cached?.index ?? idx,
+                mimeType: clipResult.mimeType,
+                base64Data: clipResult.base64Data,
+                source: 'clipboard',
+                ...(cached ? { cachePath: cached.cachePath } : {}),
+            };
+            const marker = attachment.index;
+            store.update((shellState) => {
+                const nextAttachments = [...liveAttachments, attachment];
+                if (shellState.queuedMessage) {
+                    return {
+                        ...shellState,
+                        queuedMessage: {
+                            ...shellState.queuedMessage,
+                            body: `${shellState.queuedMessage.body} [Image #${marker}]`.trim(),
+                            imageAttachments: nextAttachments,
+                        },
+                    };
+                }
+                return {
+                    ...shellState,
+                    imageAttachments: nextAttachments,
+                    ...insertAtCursor(shellState, `[Image #${marker}] `),
+                };
+            });
         }
         catch (error) {
             if (error?.code === 'NO_IMAGE') {

package/dist/src/ui/tui/shortcuts.js

@@ -0,0 +1,61 @@
+import { agentModeCycleSequence } from '../../agent-mode.js';
+export function shortcutsPanelAvailable(state) {
+    return (!state.exiting &&
+        !state.approvalPrompt &&
+        !state.sudoPrompt &&
+        !state.userInputPrompt &&
+        !state.queuedMessage &&
+        !state.input &&
+        (state.cursor ?? 0) === 0 &&
+        (state.pastedChunks?.length ?? 0) === 0 &&
+        state.promptHistoryCursor == null);
+}
+export function buildShortcutGroups(platform = process.platform) {
+    const imagePaste = platform === 'win32' ? 'Alt+V' : 'Ctrl+V';
+    const textPaste = platform === 'darwin' ? 'Cmd+V' : 'Ctrl+Shift+V';
+    return [
+        {
+            title: 'Composer',
+            rows: [
+                { keys: 'Enter', description: 'Send your message' },
+                {
+                    keys: 'Shift+Tab',
+                    description: `Cycle ${agentModeCycleSequence()} (between turns)`,
+                },
+                { keys: '/', description: 'Slash commands — /help lists them all' },
+                { keys: '↑ / ↓', description: 'Earlier prompts' },
+                { keys: 'Esc', description: 'Clear the composer' },
+                { keys: 'Ctrl+C', description: 'Clear the composer, or quit when empty' },
+                { keys: 'Ctrl+G', description: 'Desktop notifications — toggle on or off' },
+            ],
+        },
+        {
+            title: 'While the agent is working',
+            rows: [
+                { keys: 'Enter', description: 'Queue a message; Enter again sends it into the turn' },
+                { keys: '↑', description: 'Bring a queued message back to edit it' },
+                { keys: 'Esc', description: 'Discard the queued message, or cancel the turn' },
+                { keys: 'Ctrl+C', description: 'Cancel the turn' },
+                { keys: 'Ctrl+B', description: 'Background jobs' },
+            ],
+        },
+        {
+            title: 'Clipboard & images',
+            rows: [
+                { keys: imagePaste, description: 'Paste a screenshot into the message' },
+                { keys: textPaste, description: 'Paste text (your terminal’s own shortcut)' },
+                { keys: 'Right-click', description: 'Paste, or copy the link under the cursor' },
+            ],
+        },
+        {
+            title: 'Transcript',
+            rows: [
+                { keys: 'PageUp / PageDown', description: 'Scroll — the mouse wheel works too' },
+                { keys: 'Drag', description: 'Select and copy' },
+                { keys: 'Double-click', description: 'Copy a word' },
+                { keys: 'Triple-click', description: 'Copy a whole row' },
+                { keys: 'Left-click', description: 'Open a link' },
+            ],
+        },
+    ];
+}

package/dist/src/ui/tui/terminal-theme.js

@@ -0,0 +1,28 @@
+export function isDarkTerminalBackground(env = process.env) {
+    const raw = String(env.COLORFGBG ?? '').trim();
+    if (!raw)
+        return false;
+    const parts = raw
+        .split(/[;:]/)
+        .map((part) => part.trim())
+        .filter(Boolean);
+    const bgToken = parts[parts.length - 1];
+    if (!bgToken)
+        return false;
+    const bg = Number(bgToken);
+    if (!Number.isFinite(bg))
+        return false;
+    return bg >= 0 && bg < 7;
+}
+export function mutedStyle(env = process.env) {
+    if (isDarkTerminalBackground(env)) {
+        return { color: 'ansi256(247)' };
+    }
+    return { color: 'gray' };
+}
+export function mutedColor(env = process.env) {
+    if (isDarkTerminalBackground(env)) {
+        return 'ansi256(247)';
+    }
+    return 'gray';
+}