@thegitai/cli 1.0.0-preview.10 → 1.0.0-preview.12

package/dist/src/api/chat.js

@@ -1,6 +1,6 @@
 import { drainBackgroundJobNotifications } from '../background-jobs.js';
 import { createPromptCheckpoint, sanitizeSessionSafetyForServer, } from '../session-safety.js';
-import { applySessionSnapshot, snapshotFromSession, } from '../session-store.js';
+import { applySessionSnapshot, saveSessionState, snapshotFromSession, } from '../session-store.js';
 import { executeLocalToolCall } from '../tool-executor.js';
 import { createTraceContext, normalizeServerUrl, readErrorResponse, } from './http.js';
 import { collectClientEnvironment } from '../client-environment.js';
@@ -18,11 +18,13 @@ export class ChatTurnFailedError extends Error {
     category;
     retryable;
     traceId;
-    constructor(message, category = 'unknown_error', retryable = false, traceId = '') {
+    partialSnapshot;
+    constructor(message, category = 'unknown_error', retryable = false, traceId = '', partialSnapshot) {
         super(traceId ? `${message}\nTrace ID: ${traceId}` : message);
         this.category = category;
         this.retryable = retryable;
         this.traceId = traceId;
+        this.partialSnapshot = partialSnapshot;
     }
 }
 export function isTurnCancelledError(error) {
@@ -102,6 +104,12 @@ export function preserveCancelledTurnInput(session, input) {
         userInput: text,
     });
 }
+function appendTurnFailureMarker(session, category) {
+    session.history.push({
+        role: 'model',
+        parts: [{ text: formatTurnFailureMarker(category) }],
+    });
+}
 function preserveFailedTurnInput(session, input, category) {
     const text = input.trim();
     if (!text)
@@ -112,10 +120,7 @@ function preserveFailedTurnInput(session, input, category) {
         kind: 'turnStart',
         userInput: text,
     });
-    session.history.push({
-        role: 'model',
-        parts: [{ text: formatTurnFailureMarker(category) }],
-    });
+    appendTurnFailureMarker(session, category);
 }
 function historyHasToolCall(session, callId) {
     return session.history.some((entry) => (entry.parts ?? []).some((part) => String(part?.functionCall?.id ?? '') === callId));
@@ -155,7 +160,7 @@ function publicStatusMessage(data) {
         ? event.toolName
         : 'tool';
     if (event.phase === 'thinking')
-        return 'Thinking...';
+        return 'Exploring options...';
     if (event.phase === 'analyzing_image') {
         return (event.imageCount ?? 1) > 1 ? 'Analyzing images...' : 'Analyzing image...';
     }
@@ -377,7 +382,7 @@ async function consumeTurnStream({ response, config, projectIndex, session, inpu
             if (event.event === 'cancelled') {
                 throw new TurnCancelledError(message);
             }
-            throw new ChatTurnFailedError(message, typeof event.data?.category === 'string' ? event.data.category : 'unknown_error', Boolean(event.data?.retryable), typeof event.data?.traceId === 'string' ? event.data.traceId : traceId);
+            throw new ChatTurnFailedError(message, typeof event.data?.category === 'string' ? event.data.category : 'unknown_error', Boolean(event.data?.retryable), typeof event.data?.traceId === 'string' ? event.data.traceId : traceId, event.data?.snapshot);
         }
     }
     try {
@@ -494,8 +499,19 @@ export async function sendServerUserMessage({ config, projectIndex, session, inp
                 ? error
                 : new TurnCancelledError();
         }
-        session.history.length = preTurnHistoryLength;
-        preserveFailedTurnInput(session, requestInputBase, error instanceof ChatTurnFailedError ? error.category : 'unknown_error');
+        const category = error instanceof ChatTurnFailedError ? error.category : 'unknown_error';
+        const partial = error instanceof ChatTurnFailedError ? error.partialSnapshot : undefined;
+        if (partial) {
+            applySessionSnapshot(session, partial, { preserveAgentMode: true });
+        }
+        else {
+            session.history.length = preTurnHistoryLength;
+            preserveFailedTurnInput(session, requestInputBase, category);
+        }
+        try {
+            saveSessionState(session, session.env);
+        }
+        catch { }
         throw error;
     }
     finally {

package/dist/src/ui/repl.js

@@ -1,5 +1,5 @@
 import { createRatatuiBridge } from './tui/bridge.js';
-import { buildTuiFrame, formatJobElapsed, formatTodoProgress, renderTranscriptEntryLines, } from './tui/build-frame.js';
+import { buildTuiFrame, formatJobElapsed, formatTodoProgress, pickThinkingFallbackPhrase, renderTranscriptEntryLines, THINKING_FALLBACK_PHRASES, } from './tui/build-frame.js';
 import { createTerminalTitleController } from './tui/terminal-title.js';
 import { captureTerminalWrites, releaseTerminalWrites, } from './tui/terminal-writes.js';
 export { getSlashCommandSuggestions } from './tui/build-frame.js';
@@ -1073,6 +1073,24 @@ function splitThinkingLines(text) {
         .map((part) => part.trim())
         .filter(Boolean));
 }
+const LIVE_STATUS_PANEL_MAX_CHARS = 72;
+const TOOL_PROGRESS_STATUS_PATTERN = /^(?:Tool:\s|Running\s\S+(?:\slocally)?\.\.\.$)/i;
+export function isToolProgressStatus(status) {
+    return TOOL_PROGRESS_STATUS_PATTERN.test(String(status ?? '').trim());
+}
+function holdOrPickFallback(currentTitle) {
+    return THINKING_FALLBACK_PHRASES.includes(currentTitle.trim())
+        ? currentTitle
+        : pickThinkingFallbackPhrase();
+}
+function liveStatusPanelTitle(status) {
+    const text = String(status ?? '').trim();
+    if (!text || text.includes('\n'))
+        return '';
+    if (isToolProgressStatus(text))
+        return '';
+    return text.length <= LIVE_STATUS_PANEL_MAX_CHARS ? text : '';
+}
 function thinkingPanelFromStatus(status) {
     const rawText = thinkingNoteFromStatus(status);
     if (!rawText)
@@ -1096,7 +1114,7 @@ function thinkingPanelFromStatus(status) {
     const bodyLines = rawLines.length > 1 && rawLines[0].length <= 72 ? rawLines.slice(1) : rawLines;
     return {
         title,
-        notes: splitThinkingLines(bodyLines.join('\n')).slice(-3),
+        notes: splitThinkingLines(bodyLines.join('\n')).slice(0, 3),
     };
 }
 export const EXIT_CTRL_C_CONFIRM_MESSAGE = 'Press Ctrl+C again to quit.';
@@ -1332,6 +1350,36 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
         let exitCtrlCArmed = false;
         let exitCtrlCTimer = null;
         let transientStatusTimer = null;
+        const THINKING_MIN_DWELL_MS = 3_000;
+        let thinkingAppliedAt = 0;
+        let pendingThinking = null;
+        const applyThinking = (next) => {
+            thinkingAppliedAt = Date.now();
+            pendingThinking = null;
+            store.update((current) => ({
+                ...current,
+                thinkingTitle: next.title || holdOrPickFallback(current.thinkingTitle),
+                thinkingNotes: next.notes,
+            }));
+        };
+        const queueThinkingUpdate = (next) => {
+            if (Date.now() - thinkingAppliedAt >= THINKING_MIN_DWELL_MS) {
+                applyThinking(next);
+                return;
+            }
+            pendingThinking = next;
+        };
+        const flushPendingThinking = () => {
+            if (!pendingThinking)
+                return;
+            if (Date.now() - thinkingAppliedAt < THINKING_MIN_DWELL_MS)
+                return;
+            applyThinking(pendingThinking);
+        };
+        const resetThinkingPacer = () => {
+            thinkingAppliedAt = 0;
+            pendingThinking = null;
+        };
         const done = new Promise((resolve) => {
             resolveDone = resolve;
         });
@@ -1531,6 +1579,7 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
             dismissPendingApproval();
             dismissPendingSudoPassword();
             activeTurnGeneration += 1;
+            resetThinkingPacer();
             activeTurnAbort?.abort();
             activeTurnAbort = null;
             cancelActiveCommand();
@@ -2328,6 +2377,7 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
             };
             pendingTurnEntries = [];
             queueTurnEntry(userEntry);
+            resetThinkingPacer();
             store.update((current) => ({
                 ...current,
                 activeTurnInput: input,
@@ -2467,10 +2517,12 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
             store.update((current) => ({
                 ...current,
                 status: message,
-                thinkingTitle: panel?.title ?? current.thinkingTitle,
-                thinkingNotes: panel?.notes ?? current.thinkingNotes,
                 tokenUsage: formatClientTokenUsage(current.busySince == null ? null : Date.now() - current.busySince, latestUsageSummary),
             }));
+            queueThinkingUpdate({
+                title: panel ? panel.title : liveStatusPanelTitle(message),
+                notes: panel ? panel.notes : [],
+            });
         };
         session.onContextLog = (message) => {
             store.update((current) => ({
@@ -2612,6 +2664,7 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
         const spinnerTimer = setInterval(() => {
             spinnerFrame = (spinnerFrame + 1) % 6;
             if (store.getState().busy) {
+                flushPendingThinking();
                 renderCurrentFrame();
             }
         }, 120);

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

@@ -238,13 +238,35 @@ function formatRelativeTime(isoDate) {
         return `${hours}h ago`;
     return `${Math.floor(hours / 24)}d ago`;
 }
-function todoItemLine(item, width) {
+const TODO_IN_PROGRESS_FRAMES = [
+    '\u25CB',
+    '\u25D4',
+    '\u25D1',
+    '\u25D5',
+    '\u25CF',
+];
+const TODO_IN_PROGRESS_STATIC_GLYPH = '\u25D1';
+export const TODO_IN_PROGRESS_STEP_MS = 1_500;
+export function todoProgressTick(nowMs) {
+    return Math.floor(nowMs / TODO_IN_PROGRESS_STEP_MS);
+}
+function todoInProgressGlyph(progressTick) {
+    if (progressTick === null)
+        return TODO_IN_PROGRESS_STATIC_GLYPH;
+    const index = ((progressTick % TODO_IN_PROGRESS_FRAMES.length) +
+        TODO_IN_PROGRESS_FRAMES.length) %
+        TODO_IN_PROGRESS_FRAMES.length;
+    return TODO_IN_PROGRESS_FRAMES[index];
+}
+function todoItemLine(item, width, progressTick = null) {
     const text = fitLine(item.text, Math.max(8, width - 5));
     if (item.status === 'completed') {
         return line(span('  ✔ ', { color: 'green' }), span(text, { color: 'gray', dim: true }));
     }
     if (item.status === 'in_progress') {
-        return line(span('  ◐ ', { color: TODO_IN_PROGRESS_COLOR }), span(text, { color: TODO_IN_PROGRESS_COLOR, bold: true }));
+        return line(span(`  ${todoInProgressGlyph(progressTick)} `, {
+            color: TODO_IN_PROGRESS_COLOR,
+        }), span(text, { color: TODO_IN_PROGRESS_COLOR, bold: true }));
     }
     return line(span('  ○ ', { color: 'gray' }), span(text));
 }
@@ -252,7 +274,7 @@ export function formatTodoProgress(items) {
     const done = items.filter((item) => item.status === 'completed').length;
     return `${done}/${items.length} done`;
 }
-export function renderTodoListLines(items, width, { header = false } = {}) {
+export function renderTodoListLines(items, width, { header = false, progressTick = null } = {}) {
     if (items.length === 0)
         return [];
     const lines = [];
@@ -277,7 +299,7 @@ export function renderTodoListLines(items, width, { header = false } = {}) {
     const budget = itemRowBudget - (collapsedDone > 0 ? 1 : 0);
     const visible = remaining.length > budget ? remaining.slice(0, budget - 1) : remaining;
     for (const item of visible) {
-        lines.push(todoItemLine(item, width));
+        lines.push(todoItemLine(item, width, progressTick));
     }
     if (remaining.length > visible.length) {
         lines.push(plainLine(`  … +${remaining.length - visible.length} more`, {
@@ -512,17 +534,48 @@ function buildJobsPickerLines(state, width, nowMs) {
     }));
     return lines;
 }
+export const THINKING_FALLBACK_PHRASES = [
+    'Working out where to start...',
+    'Deciding what comes first...',
+    'Lining up the pieces...',
+    'Untangling the details...',
+    'Deciding what not to touch...',
+    'Checking what this would break...',
+    'Choosing the smaller change...',
+    'Picking the least clever option...',
+    'Resisting the obvious answer...',
+    'Trying the boring explanation first...',
+    'Checking whether the assumption holds...',
+    'Asking what would have to be true...',
+    'Reading it the way the machine would...',
+    'Testing the story against the code...',
+    'Working out what actually changed...',
+    'Finding the smallest thing that explains it...',
+    'Looking for the part that is not settled yet...',
+    'Making sure this is the simple version...',
+];
+export function pickThinkingFallbackPhrase() {
+    const index = Math.floor(Math.random() * THINKING_FALLBACK_PHRASES.length);
+    return THINKING_FALLBACK_PHRASES[index];
+}
+function withProgressEllipsis(title) {
+    const text = title.trim();
+    if (!text)
+        return text;
+    return /(?:\.\.\.|…)$/.test(text) ? text : `${text}...`;
+}
 function thinkingHeaderLine(spinnerFrame, title, width) {
     const spinner = `${BRAILLE_SPINNER_FRAMES[spinnerFrame % BRAILLE_SPINNER_FRAMES.length]} `;
-    const fittedTitle = title
-        ? fitLine(title, Math.max(8, width - spinner.length - 'Thinking'.length - 3))
+    const decorated = withProgressEllipsis(title);
+    const fittedTitle = decorated
+        ? fitLine(decorated, Math.max(8, width - spinner.length - 'Thinking'.length - 3))
         : '';
     return line(span(spinner, { color: 'green' }), span('Thinking', { color: 'green', bold: true }), ...(fittedTitle ? [span(` · ${fittedTitle}`, { color: 'ansi256(248)' })] : []));
 }
 function thinkingNoteLine(note, width) {
     return line(span('│  ', { color: 'green' }), span(fitLine(note, Math.max(8, width - 3)), { color: 'ansi256(248)' }));
 }
-function buildLiveLines(state, width, spinnerFrame, elapsedSeconds) {
+function buildLiveLines(state, width, spinnerFrame, elapsedSeconds, nowMs) {
     if (!state.busy)
         return [];
     const lines = [plainLine('')];
@@ -561,7 +614,10 @@ function buildLiveLines(state, width, spinnerFrame, elapsedSeconds) {
     const todos = state.todos ?? [];
     if (todos.length > 0) {
         lines.push(plainLine(''));
-        lines.push(...renderTodoListLines(todos, width, { header: true }));
+        lines.push(...renderTodoListLines(todos, width, {
+            header: true,
+            progressTick: todoProgressTick(nowMs),
+        }));
     }
     const visibleTitle = state.thinkingTitle.trim();
     const visibleNotes = state.thinkingNotes.filter(Boolean);
@@ -571,11 +627,12 @@ function buildLiveLines(state, width, spinnerFrame, elapsedSeconds) {
             const minimalText = visibleTitle && visibleTitle !== 'Thinking'
                 ? visibleTitle
                 : (visibleNotes[visibleNotes.length - 1] ?? '');
-            lines.push(thinkingHeaderLine(spinnerFrame, minimalText, width));
+            lines.push(thinkingHeaderLine(spinnerFrame, minimalText || THINKING_FALLBACK_PHRASES[0], width));
         }
         else {
-            lines.push(thinkingHeaderLine(spinnerFrame, visibleTitle, width));
-            for (const note of visibleNotes.slice(-THINKING_NOTE_PREVIEW_ROWS)) {
+            const headerTitle = visibleTitle && visibleTitle !== 'Thinking' ? visibleTitle : '';
+            lines.push(thinkingHeaderLine(spinnerFrame, headerTitle || THINKING_FALLBACK_PHRASES[0], width));
+            for (const note of visibleNotes.slice(0, THINKING_NOTE_PREVIEW_ROWS)) {
                 lines.push(thinkingNoteLine(note, width));
             }
         }
@@ -960,7 +1017,7 @@ export function buildTuiFrame(state, cols, rows, spinnerFrame, elapsedSeconds, n
         transcriptLines.push(...block);
     });
     const sections = [];
-    const liveLines = buildLiveLines(state, contentWidth, spinnerFrame, elapsedSeconds);
+    const liveLines = buildLiveLines(state, contentWidth, spinnerFrame, elapsedSeconds, nowMs);
     if (liveLines.length > 0) {
         sections.push({ kind: 'live', lines: liveLines });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thegitai/cli",
-  "version": "1.0.0-preview.10",
+  "version": "1.0.0-preview.12",
   "description": "TheGitAI is an AI coding agent for your terminal. It indexes your repository, writes and edits files, runs commands, and builds features with you.",
   "keywords": [
     "ai",
@@ -37,10 +37,10 @@
     "@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.10",
-    "@thegitai/tui-darwin-x64": "1.0.0-preview.10",
-    "@thegitai/tui-linux-x64": "1.0.0-preview.10",
-    "@thegitai/tui-win32-x64": "1.0.0-preview.10",
+    "@thegitai/tui-darwin-arm64": "1.0.0-preview.12",
+    "@thegitai/tui-darwin-x64": "1.0.0-preview.12",
+    "@thegitai/tui-linux-x64": "1.0.0-preview.12",
+    "@thegitai/tui-win32-x64": "1.0.0-preview.12",
     "@vscode/ripgrep": "1.18.0"
   },
   "publishConfig": {