@thegitai/cli 1.0.0-preview.2 → 1.0.0-preview.20

package/dist/src/ui/tui/markdown-render.js

@@ -1,6 +1,8 @@
-import { line, plainLine, span, wrapText } from './text.js';
-const TABLE_BORDER_WIDTH = 2;
-const TABLE_CELL_OVERHEAD_WIDTH = 3;
+import { displayWidth, line, padToWidth, plainLine, sliceToWidth, span, wrapText, wrapToWidth, } from './text.js';
+const MIN_TABLE_COLUMN_WIDTH = 3;
+function tableRowOverhead(columnCount) {
+    return 3 * columnCount + 1;
+}
 function parseInlineSegments(text) {
     const source = String(text ?? '');
     const segments = [];
@@ -110,45 +112,37 @@ function stripInlineFormattingForWidth(text) {
         .replace(/\*\*([^*]+)\*\*/g, '$1');
 }
 function fitTableColumnWidths(columnWidths, maxWidth) {
-    const widths = columnWidths.map((width) => Math.max(3, Math.floor(width)));
-    if (widths.length === 0)
-        return widths;
-    const overhead = TABLE_BORDER_WIDTH + widths.length * TABLE_CELL_OVERHEAD_WIDTH;
-    const budget = Math.max(widths.length * 3, maxWidth - overhead);
-    const total = widths.reduce((sum, width) => sum + width, 0);
-    if (total <= budget)
-        return widths;
-    let remaining = budget;
-    const scaled = widths.map((width) => {
-        const next = Math.max(3, Math.floor((width / total) * budget));
-        remaining -= next;
-        return next;
-    });
-    while (remaining > 0) {
-        let targetIndex = 0;
-        for (let index = 1; index < widths.length; index++) {
-            if (widths[index] - scaled[index] > widths[targetIndex] - scaled[targetIndex]) {
-                targetIndex = index;
-            }
-        }
-        scaled[targetIndex]++;
-        remaining--;
+    const columnCount = columnWidths.length;
+    if (columnCount === 0)
+        return [];
+    const natural = columnWidths.map((width) => Math.max(1, Math.floor(width)));
+    const budget = Math.floor(maxWidth) - tableRowOverhead(columnCount);
+    const total = natural.reduce((sum, width) => sum + width, 0);
+    if (budget >= total)
+        return natural;
+    const floorWidth = Math.max(1, Math.min(MIN_TABLE_COLUMN_WIDTH, Math.floor(budget / columnCount)));
+    const widths = natural.map((width) => Math.min(width, floorWidth));
+    let used = widths.reduce((sum, width) => sum + width, 0);
+    if (used > budget) {
+        const share = Math.max(1, Math.floor(budget / columnCount));
+        for (let index = 0; index < columnCount; index++)
+            widths[index] = share;
+        used = share * columnCount;
     }
-    while (remaining < 0) {
-        let targetIndex = -1;
-        for (let index = 0; index < scaled.length; index++) {
-            if (scaled[index] <= 3)
+    let remaining = budget - used;
+    while (remaining > 0) {
+        let grew = false;
+        for (let index = 0; index < columnCount && remaining > 0; index++) {
+            if (widths[index] >= natural[index])
                 continue;
-            if (targetIndex === -1 || scaled[index] > scaled[targetIndex]) {
-                targetIndex = index;
-            }
+            widths[index]++;
+            remaining--;
+            grew = true;
         }
-        if (targetIndex === -1)
+        if (!grew)
             break;
-        scaled[targetIndex]--;
-        remaining++;
     }
-    return scaled;
+    return widths;
 }
 function normalizeMarkdownTableCells(cells, columnCount) {
     return Array.from({ length: columnCount }, (_, index) => cells[index] ?? '');
@@ -176,7 +170,7 @@ function parseMarkdownTableBlock(lines, startIndex) {
     const normalizedHeaders = normalizeMarkdownTableCells(headers, columnCount);
     const columnWidths = normalizedHeaders.map((header, columnIndex) => {
         const values = [header, ...rows.map((row) => row[columnIndex] ?? '')];
-        return Math.max(3, ...values.map((value) => stripInlineFormattingForWidth(value).length));
+        return Math.max(MIN_TABLE_COLUMN_WIDTH, ...values.map((value) => displayWidth(stripInlineFormattingForWidth(value))));
     });
     return {
         nextIndex,
@@ -280,24 +274,42 @@ function wrapInlineToLines(text, width, bodyColor, prefix = '') {
         rowWidth = 0;
     };
     const appendSpan = (part) => {
-        const current = rows[rows.length - 1];
-        const limit = safeWidth - (indent ? prefix.length : 0);
+        let current = rows[rows.length - 1];
         let remaining = part.text;
         while (remaining.length > 0) {
+            const limit = safeWidth - (rows.length === 1 && indent ? displayWidth(prefix) : 0);
             const room = limit - rowWidth;
             if (room <= 0) {
                 startRow();
+                current = rows[rows.length - 1];
                 continue;
             }
-            if (remaining.length <= room) {
+            const width = displayWidth(remaining);
+            if (width <= room) {
                 current.push(span(remaining, styleFromSpan(part)));
-                rowWidth += remaining.length;
+                rowWidth += width;
                 remaining = '';
                 break;
             }
-            current.push(span(remaining.slice(0, room), styleFromSpan(part)));
-            remaining = remaining.slice(room);
+            if (rowWidth > 0) {
+                if (/^\s+$/.test(remaining)) {
+                    remaining = '';
+                    break;
+                }
+                startRow();
+                current = rows[rows.length - 1];
+                continue;
+            }
+            const head = sliceToWidth(remaining, room);
+            if (!head || (displayWidth(head) > room && current.length > 0)) {
+                startRow();
+                current = rows[rows.length - 1];
+                continue;
+            }
+            current.push(span(head, styleFromSpan(part)));
+            remaining = remaining.slice(head.length);
             startRow();
+            current = rows[rows.length - 1];
         }
     };
     for (const segment of segments) {
@@ -316,36 +328,35 @@ function wrapInlineToLines(text, width, bodyColor, prefix = '') {
         return line(...bodySpans);
     });
 }
-function padCell(text, width) {
-    const plain = stripInlineFormattingForWidth(text);
-    if (plain.length >= width)
-        return plain.slice(0, width);
-    return plain + ' '.repeat(width - plain.length);
-}
 function renderTableLines(table, width) {
     const columnWidths = fitTableColumnWidths(table.columnWidths, width);
+    const border = (left, joint, right) => line(span(left +
+        columnWidths.map((colWidth) => '─'.repeat(colWidth + 2)).join(joint) +
+        right, { color: 'cyan', dim: true }));
     const renderRow = (cells, bold) => {
-        const parts = columnWidths.map((colWidth, index) => span(` ${padCell(cells[index] ?? '', colWidth)} `, {
-            color: 'cyan',
-            bold,
-        }));
-        return line(span('│', { color: 'cyan' }), ...parts, span('│', { color: 'cyan' }));
+        const wrapped = columnWidths.map((colWidth, index) => wrapToWidth(stripInlineFormattingForWidth(cells[index] ?? ''), colWidth));
+        const height = Math.max(1, ...wrapped.map((cellLines) => cellLines.length));
+        const rows = [];
+        for (let row = 0; row < height; row++) {
+            const spans = [span('│', { color: 'cyan' })];
+            for (let column = 0; column < columnWidths.length; column++) {
+                const text = wrapped[column]?.[row] ?? '';
+                spans.push(span(` ${padToWidth(text, columnWidths[column])} `, {
+                    color: 'cyan',
+                    bold,
+                }));
+                spans.push(span('│', { color: 'cyan' }));
+            }
+            rows.push(line(...spans));
+        }
+        return rows;
     };
-    const separator = line(span('├' +
-        columnWidths.map((colWidth) => '─'.repeat(colWidth + 2)).join('┼') +
-        '┤', { color: 'cyan', dim: true }));
-    const top = line(span('┌' +
-        columnWidths.map((colWidth) => '─'.repeat(colWidth + 2)).join('┬') +
-        '┐', { color: 'cyan', dim: true }));
-    const bottom = line(span('└' +
-        columnWidths.map((colWidth) => '─'.repeat(colWidth + 2)).join('┴') +
-        '┘', { color: 'cyan', dim: true }));
     return [
-        top,
-        renderRow(table.headers, true),
-        separator,
-        ...table.rows.map((row) => renderRow(row, false)),
-        bottom,
+        border('┌', '┬', '┐'),
+        ...renderRow(table.headers, true),
+        border('├', '┼', '┤'),
+        ...table.rows.flatMap((row) => renderRow(row, false)),
+        border('└', '┴', '┘'),
     ];
 }
 function getEntryColor(kind) {
@@ -410,10 +421,7 @@ export function renderFormattedBodyLines(body, width, kind) {
         }
         if (formattedLine.kind === 'table' && formattedLine.table) {
             output.push(...renderTableLines(formattedLine.table, bodyWidth).map((tableLine) => {
-                const spans = tableLine.spans.map((part) => ({
-                    ...part,
-                    text: `  ${part.text}`,
-                }));
+                const spans = tableLine.spans.map((part, index) => index === 0 ? { ...part, text: `  ${part.text}` } : part);
                 return { spans };
             }));
             continue;

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

@@ -1,6 +1,8 @@
 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;
 function isClipboardImagePasteKey(key) {
     if (process.platform === 'win32') {
         return ((key.ctrl || key.meta) &&
@@ -9,6 +11,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 ||
@@ -74,6 +108,41 @@ function pasteTextFromClipboard(store, handlers) {
     }
     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 +157,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 +185,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 +253,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 +280,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,15 +313,7 @@ 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) {
@@ -317,10 +421,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, '');
@@ -340,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,
@@ -348,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/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';
+}

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

@@ -1,3 +1,4 @@
+import { isTuiMode } from '../../runtime-mode.js';
 const BRAILLE_SPINNER_FRAMES = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴'];
 const TITLE_BRAND = 'TheGitAI';
 const TITLE_MARK_PREFIX = '❯_';
@@ -19,6 +20,8 @@ export function formatTerminalTitle(state, spinnerFrame = 0) {
     return `${TITLE_MARK_PREFIX}● ${TITLE_BRAND}`;
 }
 export function writeTerminalTitle(title, stream = process.stdout) {
+    if (isTuiMode())
+        return;
     if (!('isTTY' in stream) || !stream.isTTY)
         return;
     stream.write(`\x1b]0;${title}\x07`);

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

@@ -0,0 +1,48 @@
+const MAX_CAPTURED_CHARS = 1_000_000;
+let restore = null;
+let captured = [];
+let capturedChars = 0;
+function chunkToString(chunk, encoding) {
+    if (typeof chunk === 'string')
+        return chunk;
+    if (chunk instanceof Uint8Array) {
+        return Buffer.from(chunk).toString(typeof encoding === 'string' ? encoding : 'utf8');
+    }
+    return String(chunk ?? '');
+}
+export function captureTerminalWrites() {
+    if (restore)
+        return;
+    const streams = [process.stdout, process.stderr];
+    const originals = streams.map((stream) => stream.write.bind(stream));
+    for (const stream of streams) {
+        stream.write = (chunk, encoding, callback) => {
+            if (capturedChars < MAX_CAPTURED_CHARS) {
+                const text = chunkToString(chunk, encoding);
+                captured.push(text);
+                capturedChars += text.length;
+            }
+            const done = typeof encoding === 'function' ? encoding : callback;
+            if (typeof done === 'function')
+                done();
+            return true;
+        };
+    }
+    restore = () => {
+        streams.forEach((stream, index) => {
+            stream.write = originals[index];
+        });
+    };
+}
+export function releaseTerminalWrites() {
+    if (!restore)
+        return;
+    restore();
+    restore = null;
+    if (captured.length > 0) {
+        const text = captured.join('');
+        captured = [];
+        capturedChars = 0;
+        process.stderr.write(text);
+    }
+}