@thegitai/cli 1.0.0-preview.32 → 1.0.0-preview.34

package/dist/src/ui/repl.js

@@ -4,6 +4,7 @@ import { approvalScrollLimit, buildTuiFrame, formatJobElapsed, formatTodoProgres
 import { createTerminalTitleController } from './tui/terminal-title.js';
 import { captureTerminalWrites, releaseTerminalWrites, } from './tui/terminal-writes.js';
 export { getSlashCommandSuggestions } from './tui/build-frame.js';
+import { composerInputWidth, frameContentWidth } from './tui/composer-layout.js';
 import { agentModeLabel, nextAgentMode, } from '../agent-mode.js';
 import { chat, models } from '../api/index.js';
 import { isTurnCancelledError } from '../api/chat.js';
@@ -2951,11 +2952,12 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
         };
         const shellInputHandlers = {
             getApprovalScrollLimit: () => {
-                const contentWidth = Math.max(20, Math.floor(terminalCols * 0.95) - 2);
+                const contentWidth = frameContentWidth(terminalCols);
                 return approvalScrollLimit(store.getState().approvalPrompt, contentWidth, terminalRows);
             },
+            getComposerInputWidth: () => composerInputWidth(terminalCols, store.getState()),
             getTranscriptScrollLimit: () => {
-                const contentWidth = Math.max(20, Math.floor(terminalCols * 0.95) - 2);
+                const contentWidth = frameContentWidth(terminalCols);
                 const blocks = store.getState().transcript.map((entry) => renderTranscriptEntryLines(entry, contentWidth));
                 return blocks.reduce((total, block, index) => total + block.length + (index > 0 ? 1 : 0), 0);
             },

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

@@ -5,6 +5,7 @@ import { renderFormattedBodyLines, renderPreformattedBodyLines, } from './markdo
 import { displayWidth, line, padToWidth, plainLine, sliceToWidth, span, wrapText, } from './text.js';
 import { isDarkTerminalBackground, mutedColor, mutedStyle } from './terminal-theme.js';
 import { buildUserInputOverlayLines, } from './user-input.js';
+import { composerPromptLabel, frameContentWidth, splitComposerInput, } from './composer-layout.js';
 const WORKING_CLOCK_ICON = '◷';
 const BRAILLE_SPINNER_FRAMES = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴'];
 const TODO_PANEL_MAX_ROWS = 12;
@@ -40,51 +41,6 @@ const MODEL_PICKER_BORDER_COLOR = 'cyan';
 const MODEL_PICKER_ACCENT_COLOR = 'cyan';
 const MODEL_PICKER_HIGHLIGHT_BG = 'ansi256(87)';
 const MODEL_PICKER_META_INDENT = '     ';
-function splitComposerInput(input, cursor, width) {
-    const safeWidth = Math.max(1, width);
-    const normalizedCursor = Math.min(Math.max(cursor, 0), input.length);
-    const rows = [''];
-    let cursorRow = 0;
-    let cursorCol = 0;
-    let capturedCursor = false;
-    const captureCursor = () => {
-        if (capturedCursor)
-            return;
-        const current = rows[rows.length - 1] ?? '';
-        if (current.length >= safeWidth) {
-            rows.push('');
-            cursorRow = rows.length - 1;
-            cursorCol = 0;
-        }
-        else {
-            cursorRow = rows.length - 1;
-            cursorCol = current.length;
-        }
-        capturedCursor = true;
-    };
-    for (let index = 0; index < input.length; index += 1) {
-        const char = input[index] ?? '';
-        if (char !== '\n' &&
-            char !== '\r' &&
-            (rows[rows.length - 1]?.length ?? 0) >= safeWidth) {
-            rows.push('');
-        }
-        if (index === normalizedCursor) {
-            captureCursor();
-        }
-        if (char === '\r')
-            continue;
-        if (char === '\n') {
-            rows.push('');
-            continue;
-        }
-        rows[rows.length - 1] = `${rows[rows.length - 1] ?? ''}${char}`;
-    }
-    if (!capturedCursor) {
-        captureCursor();
-    }
-    return { cursorCol, cursorRow, rows };
-}
 function buildComposerInputLines(input, cursor, promptLabel, placeholder, width) {
     if (!input) {
         return [
@@ -1190,7 +1146,7 @@ function countSectionLines(sections) {
     return sections.reduce((sum, section) => sum + section.lines.length, 0);
 }
 export function userInputViewportForFrame(state, cols, rows, spinnerFrame, elapsedSeconds, nowMs = 0) {
-    const contentWidth = Math.max(20, Math.floor(cols * 0.95) - 2);
+    const contentWidth = frameContentWidth(cols);
     const liveRows = buildLiveLines(state, contentWidth, spinnerFrame, elapsedSeconds, nowMs).length;
     const overlayHeight = Math.max(0, rows - liveRows - composerFooterLines(state).length);
     return {
@@ -1208,7 +1164,7 @@ function sliceTranscriptLines(lines, maxLines, scrollOffset) {
     return lines.slice(start, start + maxLines);
 }
 export function buildTuiFrame(state, cols, rows, spinnerFrame, elapsedSeconds, nowMs = 0) {
-    const contentWidth = Math.max(20, Math.floor(cols * 0.95) - 2);
+    const contentWidth = frameContentWidth(cols);
     const gutter = Math.max(Math.floor((cols - contentWidth) / 2), 0);
     const buildTranscriptLines = (wrapWidth) => {
         const blocks = state.transcript.map((entry) => cachedTranscriptEntryLines(entry, wrapWidth));
@@ -1240,7 +1196,7 @@ export function buildTuiFrame(state, cols, rows, spinnerFrame, elapsedSeconds, n
                 : ' 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> ' : '❯ ';
+            const promptLabel = composerPromptLabel(state);
             const placeholder = state.busy
                 ? 'Type to queue the next message'
                 : 'Type a request or /help';

package/dist/src/ui/tui/composer-layout.js

@@ -0,0 +1,76 @@
+export const COMPOSER_PROMPT_LABEL_IDLE = '❯ ';
+export const COMPOSER_PROMPT_LABEL_BUSY = 'queue> ';
+export function composerPromptLabel(state) {
+    return state.busy ? COMPOSER_PROMPT_LABEL_BUSY : COMPOSER_PROMPT_LABEL_IDLE;
+}
+export function frameContentWidth(cols) {
+    return Math.max(20, Math.floor(cols * 0.95) - 2);
+}
+export function composerInputWidth(cols, state) {
+    return Math.max(1, frameContentWidth(cols) - composerPromptLabel(state).length);
+}
+function buildComposerLayout(input, cursor, width) {
+    const safeWidth = Math.max(1, width);
+    const normalizedCursor = Math.min(Math.max(cursor, 0), input.length);
+    const rows = [{ cursorOffsets: [0], text: '' }];
+    let cursorRow = 0;
+    let cursorCol = 0;
+    let capturedCursor = false;
+    const currentRow = () => rows[rows.length - 1];
+    const addRow = (offset) => {
+        rows.push({ cursorOffsets: [offset], text: '' });
+    };
+    const captureCursor = () => {
+        if (capturedCursor)
+            return;
+        if (currentRow().text.length >= safeWidth) {
+            addRow(normalizedCursor);
+        }
+        cursorRow = rows.length - 1;
+        cursorCol = currentRow().text.length;
+        capturedCursor = true;
+    };
+    for (let index = 0; index < input.length; index += 1) {
+        const char = input[index] ?? '';
+        if (char !== '\n' &&
+            char !== '\r' &&
+            currentRow().text.length >= safeWidth) {
+            addRow(index);
+        }
+        if (index === normalizedCursor) {
+            captureCursor();
+        }
+        if (char === '\r') {
+            currentRow().cursorOffsets[currentRow().text.length] = index + 1;
+            continue;
+        }
+        if (char === '\n') {
+            currentRow().cursorOffsets[currentRow().text.length] =
+                input[index - 1] === '\r' ? index - 1 : index;
+            addRow(index + 1);
+            continue;
+        }
+        currentRow().text += char;
+        currentRow().cursorOffsets.push(index + 1);
+    }
+    if (!capturedCursor) {
+        captureCursor();
+    }
+    return { cursorCol, cursorRow, rows };
+}
+export function splitComposerInput(input, cursor, width) {
+    const layout = buildComposerLayout(input, cursor, width);
+    return {
+        cursorCol: layout.cursorCol,
+        cursorRow: layout.cursorRow,
+        rows: layout.rows.map((row) => row.text),
+    };
+}
+export function moveComposerCursorVertically(input, cursor, width, direction) {
+    const layout = buildComposerLayout(input, cursor, width);
+    const targetRow = layout.rows[layout.cursorRow + direction];
+    if (!targetRow)
+        return null;
+    const targetCol = Math.min(layout.cursorCol, targetRow.text.length);
+    return targetRow.cursorOffsets[targetCol] ?? null;
+}

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

@@ -1,3 +1,4 @@
+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';
@@ -479,9 +480,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;
@@ -489,9 +494,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;

package/package.json

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