@thegitai/cli 1.0.0-preview.34 → 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

@@ -148,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);
@@ -1414,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();
@@ -1675,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(),
                 {
@@ -1692,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,
@@ -2673,6 +2687,7 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
             pendingTurnEntries = [];
             queueTurnEntry(userEntry);
             resetThinkingPacer();
+            activeTurnImageAttachments = imageAttachments;
             store.update((current) => ({
                 ...current,
                 activeTurnInput: input,
@@ -2726,6 +2741,7 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
                 if (!(await saveActiveSession()))
                     return;
                 syncShellStateFromSession();
+                activeTurnImageAttachments = [];
                 store.update((current) => ({
                     ...current,
                     activeTurnInput: '',
@@ -2779,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: '',
@@ -2787,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: [],

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

@@ -41,6 +41,48 @@ const MODEL_PICKER_BORDER_COLOR = 'cyan';
 const MODEL_PICKER_ACCENT_COLOR = 'cyan';
 const MODEL_PICKER_HIGHLIGHT_BG = 'ansi256(87)';
 const MODEL_PICKER_META_INDENT = '     ';
+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;
+        }
+    }
+    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 } : {}),
+        }));
+    };
+    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 (cursorCol === null) {
+        flushTo(text.length);
+        return spans;
+    }
+    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) {
         return [
@@ -51,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) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thegitai/cli",
-  "version": "1.0.0-preview.34",
+  "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.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",
+    "@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": {