@thegitai/cli 1.0.0-preview.33 → 1.0.0-preview.35

package/dist/src/api/chat.js

@@ -7,6 +7,7 @@ import { isUserInputQuestionArray } from './contracts.js';
 import { createTraceContext, gatewayFailureCategory, normalizeServerUrl, readErrorResponse, } from './http.js';
 import { collectClientEnvironment } from '../client-environment.js';
 import { collectProjectOrientation } from '../project-orientation.js';
+import { describeSessionImageStore } from '../core/session-image-store.js';
 import { autoAttachImages } from '../core/image-path-extractor.js';
 import { formatTurnFailureMarker } from '../turn-failure-marker.js';
 export class TurnCancelledError extends Error {
@@ -546,6 +547,7 @@ export async function sendServerUserMessage({ config, session, input, imageAttac
         backgroundJobUpdate: backgroundJobUpdate || undefined,
         clientEnvironment: collectClientEnvironment({ env: session.env }),
         projectOrientation: collectProjectOrientation(session.rootDir) ?? undefined,
+        sessionImageStore: describeSessionImageStore(session.env) ?? undefined,
         imageAttachments: imageAttachmentsForServer(requestImageAttachments),
         maxToolSteps: session.maxToolSteps,
         autoYes: session.autoYes,

package/dist/src/core/session-image-store.js

@@ -111,6 +111,53 @@ export function readSessionImageByIndex(index, env = process.env) {
     }
     return null;
 }
+export function describeSessionImageStore(env = process.env) {
+    if (!activeSessionId)
+        return null;
+    const dir = getSessionImageDir(activeSessionId, env);
+    if (!existsSync(dir))
+        return null;
+    const indices = [];
+    try {
+        for (const name of readdirSync(dir)) {
+            const parsed = Number.parseInt(path.basename(name, path.extname(name)), 10);
+            if (Number.isInteger(parsed) && parsed >= 1)
+                indices.push(parsed);
+        }
+    }
+    catch {
+        return null;
+    }
+    if (indices.length === 0)
+        return null;
+    return { dir, indices: indices.sort((a, b) => a - b) };
+}
+const MAX_STORE_DIR_CHARS = 512;
+const MAX_STORE_INDICES = 200;
+const STORE_CONTROL_CHARS = /[\u0000-\u001f\u007f]/g;
+export function normalizeSessionImageStore(value) {
+    if (!value || typeof value !== 'object')
+        return null;
+    const record = value;
+    const dir = String(record.dir ?? '')
+        .replace(STORE_CONTROL_CHARS, ' ')
+        .trim()
+        .slice(0, MAX_STORE_DIR_CHARS);
+    if (!dir)
+        return null;
+    const seen = new Set();
+    for (const raw of Array.isArray(record.indices) ? record.indices : []) {
+        const parsed = Number(raw);
+        if (!Number.isInteger(parsed) || parsed < 1)
+            continue;
+        seen.add(parsed);
+        if (seen.size >= MAX_STORE_INDICES)
+            break;
+    }
+    if (seen.size === 0)
+        return null;
+    return { dir, indices: [...seen].sort((a, b) => a - b) };
+}
 export class SessionImageError extends Error {
     code;
     constructor(message, code) {

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';
@@ -147,6 +148,17 @@ export const SLASH_COMMANDS = [
         description: 'Quit the current session',
     },
 ];
+export function composerAttachmentsAfterCancel(queuedAttachments, inFlightAttachments) {
+    const seen = new Set();
+    const kept = [];
+    for (const attachment of [...queuedAttachments, ...inFlightAttachments]) {
+        if (seen.has(attachment.index))
+            continue;
+        seen.add(attachment.index);
+        kept.push(attachment);
+    }
+    return kept;
+}
 function getShellWidth(columns) {
     const safeColumns = Math.max(columns, 20);
     const targetWidth = Math.floor(safeColumns * TUI_WIDTH_RATIO);
@@ -1413,6 +1425,7 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
         let latestUsageSummary = null;
         let pendingTurnEntries = [];
         let activeTurnAbort = null;
+        let activeTurnImageAttachments = [];
         let activeServerTurnId = null;
         let unacknowledged = new Map();
         const blockedRows = new WeakMap();
@@ -1674,6 +1687,8 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
             activeTurnAbort = null;
             cancelActiveCommand();
             const queued = store.getState().queuedMessage;
+            const restoredAttachments = composerAttachmentsAfterCancel(queued ? queued.imageAttachments : [], activeTurnImageAttachments);
+            activeTurnImageAttachments = [];
             const cancelledEntries = [
                 ...takePendingTurnEntries(),
                 {
@@ -1691,7 +1706,7 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
                 busySince: null,
                 commandLog: [],
                 cursor: queued ? queued.body.length : current.cursor,
-                imageAttachments: queued ? queued.imageAttachments : [],
+                imageAttachments: restoredAttachments,
                 input: queued ? queued.body : current.input,
                 pastedChunks: queued ? queued.pastedChunks : current.pastedChunks,
                 promptHistoryCursor: queued ? null : current.promptHistoryCursor,
@@ -2672,6 +2687,7 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
             pendingTurnEntries = [];
             queueTurnEntry(userEntry);
             resetThinkingPacer();
+            activeTurnImageAttachments = imageAttachments;
             store.update((current) => ({
                 ...current,
                 activeTurnInput: input,
@@ -2725,6 +2741,7 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
                 if (!(await saveActiveSession()))
                     return;
                 syncShellStateFromSession();
+                activeTurnImageAttachments = [];
                 store.update((current) => ({
                     ...current,
                     activeTurnInput: '',
@@ -2778,6 +2795,8 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
                 const cancelled = isTurnCancelledError(error);
                 if (exitForAuthenticationError(error))
                     return;
+                const failedTurnAttachments = activeTurnImageAttachments;
+                activeTurnImageAttachments = [];
                 store.update((current) => ({
                     ...current,
                     activeTurnInput: '',
@@ -2786,7 +2805,7 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
                     busyPausedAt: null,
                     busySince: null,
                     commandLog: [],
-                    imageAttachments: [],
+                    imageAttachments: failedTurnAttachments,
                     status: cancelled ? 'Ready' : 'Turn failed',
                     thinkingTitle: '',
                     thinkingNotes: [],
@@ -2951,11 +2970,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,50 +41,47 @@ 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;
+const COMPOSER_MARKER_PATTERN = /\[Image #\d+\]|\[Pasted Text: [^\]\n]*\]/g;
+function composerMarkerMask(text) {
+    const mask = new Array(text.length).fill(false);
+    for (const match of text.matchAll(COMPOSER_MARKER_PATTERN)) {
+        const start = match.index ?? 0;
+        for (let offset = start; offset < start + match[0].length; offset += 1) {
+            mask[offset] = true;
         }
-        capturedCursor = true;
+    }
+    return mask;
+}
+function composerRowSpans(text, mask, cursorCol) {
+    const spans = [];
+    const push = (value, marker, cursor) => {
+        if (!value)
+            return;
+        spans.push(span(value, {
+            ...(marker ? { color: 'cyan' } : {}),
+            ...(cursor ? { inverse: 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();
+    let cut = 0;
+    const flushTo = (end) => {
+        while (cut < end) {
+            const marker = mask[cut] ?? false;
+            let runEnd = cut + 1;
+            while (runEnd < end && (mask[runEnd] ?? false) === marker)
+                runEnd += 1;
+            push(text.slice(cut, runEnd), marker, false);
+            cut = runEnd;
         }
-        if (char === '\r')
-            continue;
-        if (char === '\n') {
-            rows.push('');
-            continue;
-        }
-        rows[rows.length - 1] = `${rows[rows.length - 1] ?? ''}${char}`;
-    }
-    if (!capturedCursor) {
-        captureCursor();
+    };
+    if (cursorCol === null) {
+        flushTo(text.length);
+        return spans;
     }
-    return { cursorCol, cursorRow, rows };
+    flushTo(Math.min(cursorCol, text.length));
+    push(text[cursorCol] ?? ' ', mask[cursorCol] ?? false, true);
+    cut = Math.min(cursorCol + 1, text.length);
+    flushTo(text.length);
+    return spans;
 }
 function buildComposerInputLines(input, cursor, promptLabel, placeholder, width) {
     if (!input) {
@@ -95,20 +93,22 @@ function buildComposerInputLines(input, cursor, promptLabel, placeholder, width)
     const inputWidth = Math.max(1, width - labelWidth);
     const { cursorCol, cursorRow, rows } = splitComposerInput(input, cursor, inputWidth);
     const firstRow = Math.min(Math.max(cursorRow - COMPOSER_INPUT_MAX_ROWS + 1, 0), Math.max(rows.length - COMPOSER_INPUT_MAX_ROWS, 0));
+    const rowOffsets = [];
+    let consumed = 0;
+    for (const row of rows) {
+        rowOffsets.push(consumed);
+        consumed += row.length;
+    }
+    const mask = composerMarkerMask(rows.join(''));
     return rows
         .slice(firstRow, firstRow + COMPOSER_INPUT_MAX_ROWS)
         .map((text, index) => {
         const absoluteRow = firstRow + index;
+        const rowStart = rowOffsets[absoluteRow] ?? 0;
         const label = index === 0
             ? span(promptLabel, { color: 'cyan' })
             : span(' '.repeat(labelWidth));
-        if (absoluteRow !== cursorRow) {
-            return line(label, span(text));
-        }
-        const before = text.slice(0, cursorCol);
-        const cursorChar = text[cursorCol] ?? ' ';
-        const after = text.slice(cursorCol + 1);
-        return line(label, span(before), span(cursorChar, { inverse: true }), span(after));
+        return line(label, ...composerRowSpans(text, mask.slice(rowStart, rowStart + text.length), absoluteRow === cursorRow ? cursorCol : null));
     });
 }
 function getEntryColor(kind) {
@@ -1190,7 +1190,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 +1208,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 +1240,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.33",
+  "version": "1.0.0-preview.35",
   "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,11 +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.33",
-    "@thegitai/tui-darwin-x64": "1.0.0-preview.33",
-    "@thegitai/tui-linux-arm64": "1.0.0-preview.33",
-    "@thegitai/tui-linux-x64": "1.0.0-preview.33",
-    "@thegitai/tui-win32-x64": "1.0.0-preview.33",
+    "@thegitai/tui-darwin-arm64": "1.0.0-preview.35",
+    "@thegitai/tui-darwin-x64": "1.0.0-preview.35",
+    "@thegitai/tui-linux-arm64": "1.0.0-preview.35",
+    "@thegitai/tui-linux-x64": "1.0.0-preview.35",
+    "@thegitai/tui-win32-x64": "1.0.0-preview.35",
     "@vscode/ripgrep": "1.18.0"
   },
   "repository": {