@thegitai/cli 1.0.0-preview.1 → 1.0.0-preview.11

package/dist/src/ui/repl.js

@@ -1,17 +1,22 @@
 import { createRatatuiBridge } from './tui/bridge.js';
 import { buildTuiFrame, formatJobElapsed, formatTodoProgress, renderTranscriptEntryLines, } 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';
 import { agentModeLabel, nextAgentMode, } from '../agent-mode.js';
 import { chat, models } from '../api/index.js';
 import { isTurnCancelledError } from '../api/chat.js';
 import { getJobBufferedOutput, getJobOutputPreview, hasRunningBackgroundJobs, killAllBackgroundJobs, killBackgroundJob, listBackgroundJobs, setBackgroundJobSession, setBackgroundJobUpdateHook, } from '../background-jobs.js';
 import { clearTodos, listTodos, setTodoSession } from '../todo-list.js';
+import { setScratchSession } from '../scratch-dir.js';
 import { cancelActiveCommand } from '../executor.js';
+import { isTurnFailureMarker } from '../turn-failure-marker.js';
+import { clearCliAuthConfig } from '../api/auth.js';
+import { authenticationErrorMessage, isAuthenticationError, } from '../api/http.js';
 import { setCommandOutputHook, withTuiMode } from '../runtime-mode.js';
 import { collectBackgroundJobUiKillMutations, collectBackgroundJobUiOutputMutations, } from '../tool-executor.js';
-import { clearConversation, } from '../session.js';
-import { applySessionSnapshot, listSessionMetadata, loadSessionSnapshot, saveSessionState, } from '../session-store.js';
+import { startNewConversation, } from '../session.js';
+import { applySessionSnapshot, listSessionMetadata, loadSessionSnapshot, saveSessionState, sessionHasUserMessage, } from '../session-store.js';
 import { truncate } from '../utils.js';
 import { writeClipboardText } from '../core/clipboard.js';
 import { openUrl } from '../core/open-url.js';
@@ -111,8 +116,8 @@ export const SLASH_COMMANDS = [
         description: 'Background jobs: pick to view output or kill',
     },
     {
-        command: '/clear',
-        description: 'Clear conversation history',
+        command: '/new',
+        description: 'start a new conversation; this session remains saved',
     },
     {
         command: '/exit',
@@ -558,6 +563,31 @@ function buildFileChangeEntry(event) {
             title: skipped ? `${verb} skipped: ${filePath}` : `${verb} failed: ${filePath}`,
         };
     }
+    if (result?.scratch === true) {
+        const scratchName = truncate(filePath.split(/[\\/]/).filter(Boolean).at(-1) ?? filePath, 72);
+        if (call.name === 'delete_file') {
+            return {
+                body: '',
+                filePath,
+                kind: 'tool',
+                title: result?.deleted === true
+                    ? `Removed scratch file: ${scratchName}`
+                    : `Scratch delete skipped: ${scratchName}`,
+            };
+        }
+        const content = typeof call.args?.content === 'string' ? call.args.content : '';
+        const lineSummary = call.name === 'write_file' && content
+            ? ` (${splitDiffLines(content).length} lines)`
+            : '';
+        return {
+            body: '',
+            filePath,
+            kind: 'tool',
+            title: call.name === 'write_file'
+                ? `Wrote scratch file: ${scratchName}${lineSummary}`
+                : `Edited scratch file: ${scratchName}`,
+        };
+    }
     if (call.name === 'undo_edit') {
         const dryRun = result?.dryRun === true ||
             result?.dry_run === true ||
@@ -754,7 +784,7 @@ function displayUserTextFromHistoryEntry(entry) {
         .slice(contentStart, contentEnd === -1 ? text.length : contentEnd)
         .trim();
 }
-function buildTranscriptFromSessionHistory(history) {
+export function buildTranscriptFromSessionHistory(history) {
     const entries = [];
     const pendingCalls = new Map();
     for (const entry of history) {
@@ -800,6 +830,14 @@ function buildTranscriptFromSessionHistory(history) {
         }
         const text = textFromHistoryEntry(entry);
         if ((entry.role === 'model' || entry.role === 'assistant') && text) {
+            if (isTurnFailureMarker(text)) {
+                entries.push({
+                    body: 'This request did not complete.',
+                    kind: 'system',
+                    title: 'Previous turn',
+                });
+                continue;
+            }
             entries.push({ body: text, kind: 'assistant', title: 'Response' });
         }
     }
@@ -925,6 +963,7 @@ function createInitialShellState(session, serverModels, debugUi) {
         activeTurnInput: '',
         activeTurnInputPreformatted: false,
         agentMode: session.agentMode,
+        analyzingImages: 0,
         approvalCursor: getDefaultApprovalCursor(),
         approvalPrompt: null,
         autoYes: session.autoYes,
@@ -1034,6 +1073,13 @@ function splitThinkingLines(text) {
         .map((part) => part.trim())
         .filter(Boolean));
 }
+const LIVE_STATUS_PANEL_MAX_CHARS = 72;
+function liveStatusPanelTitle(status) {
+    const text = String(status ?? '').trim();
+    if (!text || text.includes('\n'))
+        return '';
+    return text.length <= LIVE_STATUS_PANEL_MAX_CHARS ? text : '';
+}
 function thinkingPanelFromStatus(status) {
     const rawText = thinkingNoteFromStatus(status);
     if (!rawText)
@@ -1212,7 +1258,11 @@ export function buildModelPickerOptions(currentModelId, serverModels) {
     return serverModels.map((model) => ({
         id: model.id,
         label: model.label,
-        meta: model.id === currentModelId ? 'current' : '',
+        publicId: model.id,
+        costRating: model.costRating,
+        current: model.id === currentModelId,
+        disabled: false,
+        note: model.description,
     }));
 }
 function getDefaultModelPickerIndex(currentModelId, serverModels) {
@@ -1240,23 +1290,22 @@ function appendCommandLog(state, text) {
     };
 }
 async function saveSessionBoth({ serverSessionClient, session, }) {
+    if (!sessionHasUserMessage(session))
+        return;
     saveSessionState(session);
     await serverSessionClient.save(session);
 }
-function shouldUseRatatuiShell() {
-    if (process.env.THEGITAI_PLAIN === '1')
-        return false;
-    return Boolean(process.stdin.isTTY && process.stdout.isTTY);
-}
-export function shouldUseClientRatatuiShell() {
-    return shouldUseRatatuiShell();
-}
 export async function runClientInteractive({ appendPromptHistory, authConfig, debugUi, projectIndex, serverModels, serverSessionClient, session, usageText, initialPrompt, }) {
-    if (!shouldUseRatatuiShell()) {
-        throw new Error('Client TUI requires an interactive terminal.');
+    if (process.stdin.isTTY !== true) {
+        throw new Error('stdin is not a terminal');
+    }
+    if (process.stdout.isTTY !== true) {
+        throw new Error('stdout is not a terminal');
     }
+    let fatalError = null;
     await withTuiMode(async () => {
         setBackgroundJobSession(session.sessionId);
+        setScratchSession(session.sessionId);
         setTodoSession(session.sessionId);
         const store = createShellStore(createInitialShellState(session, serverModels, debugUi));
         store.replaceTranscript(createSessionTranscript(session));
@@ -1268,6 +1317,7 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
         let cleanupSudoPasswordPrompt = null;
         let sudoPasswordBuffer = '';
         const bridge = createRatatuiBridge();
+        captureTerminalWrites();
         const { handleShellKeyEvent } = await import('./tui/shell-input.js');
         let terminalCols = 80;
         let terminalRows = 24;
@@ -1280,6 +1330,7 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
         let latestUsageSummary = null;
         let pendingTurnEntries = [];
         let activeTurnAbort = null;
+        let newConversationInFlight = false;
         let todosTouchedThisTurn = false;
         const syncTodosState = () => {
             store.update((current) => ({ ...current, todos: listTodos() }));
@@ -1312,7 +1363,9 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
                 store.update((current) => current.status === status ? { ...current, status: 'Ready' } : current);
             }, 2500);
         };
-        const terminalTitle = createTerminalTitleController();
+        const terminalTitle = createTerminalTitleController({
+            write: (title) => bridge.setTitle(title),
+        });
         const syncTerminalTitle = () => {
             const state = store.getState();
             terminalTitle.sync({
@@ -1479,7 +1532,7 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
             }));
         };
         const cancelActiveTurn = () => {
-            if (!store.getState().busy)
+            if (!store.getState().busy || newConversationInFlight)
                 return;
             disarmExitConfirm();
             dismissPendingApproval();
@@ -1523,14 +1576,6 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
                 scheduleLiveFrameRemount();
             void remountTui();
         };
-        const saveActiveSession = async () => {
-            try {
-                await saveSessionBoth({ serverSessionClient, session });
-            }
-            catch (error) {
-                appendError(`Session save failed: ${error.message}`);
-            }
-        };
         const syncShellStateFromSession = () => {
             store.update((current) => ({
                 ...current,
@@ -1618,9 +1663,45 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
                 status: 'Exiting...',
             }));
             void bridge.close().then(() => {
+                releaseTerminalWrites();
                 resolveDone?.();
             });
         };
+        const exitForAuthenticationError = (error) => {
+            if (!isAuthenticationError(error))
+                return false;
+            clearCliAuthConfig(session.env);
+            if (sessionHasUserMessage(session)) {
+                saveSessionState(session);
+            }
+            fatalError = new Error(authenticationErrorMessage(error));
+            requestExit();
+            return true;
+        };
+        const saveActiveSession = async () => {
+            try {
+                await saveSessionBoth({ serverSessionClient, session });
+                return true;
+            }
+            catch (error) {
+                if (exitForAuthenticationError(error))
+                    return false;
+                appendError(`Session save failed: ${error.message}`);
+                return true;
+            }
+        };
+        const saveActiveSessionOrAbort = async () => {
+            try {
+                await saveSessionBoth({ serverSessionClient, session });
+                return true;
+            }
+            catch (error) {
+                if (exitForAuthenticationError(error))
+                    return false;
+                appendError(`Session save failed: ${error.message}`);
+                return false;
+            }
+        };
         const openSudoPasswordPrompt = (command, prompt, signal) => new Promise((resolve) => {
             if (exiting || signal?.aborted) {
                 resolve(null);
@@ -1757,7 +1838,8 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
                 selectedModelId: selected,
                 serverModels: fresh,
             });
-            await saveActiveSession();
+            if (!(await saveActiveSession()))
+                return;
             syncShellStateFromSession();
             appendStaticEntry({
                 body: `Switched to ${formatModelLabel(selected, fresh.models)}. Conversation history preserved.`,
@@ -1876,6 +1958,8 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
                 await switchToModel(selected.id);
             }
             catch (error) {
+                if (exitForAuthenticationError(error))
+                    return;
                 appendError(error.message);
             }
         };
@@ -1933,10 +2017,10 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
                 const snapshot = await loadInteractiveSession(selected.id);
                 applySessionSnapshot(session, snapshot);
                 setBackgroundJobSession(session.sessionId);
+                setScratchSession(session.sessionId);
                 syncBackgroundJobsState();
                 setTodoSession(session.sessionId);
                 syncTodosState();
-                await saveActiveSession();
                 syncShellStateFromSession();
                 store.update((next) => ({
                     ...next,
@@ -1959,6 +2043,8 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
                 await remountTui();
             }
             catch (error) {
+                if (exitForAuthenticationError(error))
+                    return;
                 store.update((next) => ({
                     ...next,
                     busy: false,
@@ -2111,14 +2197,18 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
                     });
                 }
                 catch (error) {
+                    if (exitForAuthenticationError(error))
+                        return;
                     appendError(error.message);
                 }
                 finally {
-                    store.update((current) => ({
-                        ...current,
-                        busy: false,
-                        status: 'Ready',
-                    }));
+                    if (!exiting) {
+                        store.update((current) => ({
+                            ...current,
+                            busy: false,
+                            status: 'Ready',
+                        }));
+                    }
                 }
                 return;
             }
@@ -2132,14 +2222,18 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
                     await openResumePicker();
                 }
                 catch (error) {
+                    if (exitForAuthenticationError(error))
+                        return;
                     appendError(error.message);
                 }
                 finally {
-                    store.update((current) => ({
-                        ...current,
-                        busy: false,
-                        status: current.resumePickerOpen ? 'Select a session to resume' : 'Ready',
-                    }));
+                    if (!exiting) {
+                        store.update((current) => ({
+                            ...current,
+                            busy: false,
+                            status: current.resumePickerOpen ? 'Select a session to resume' : 'Ready',
+                        }));
+                    }
                 }
                 return;
             }
@@ -2159,33 +2253,68 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
                     }
                 }
                 catch (error) {
+                    if (exitForAuthenticationError(error))
+                        return;
                     appendError(error.message);
                 }
                 finally {
+                    if (!exiting) {
+                        store.update((current) => ({
+                            ...current,
+                            busy: false,
+                            status: current.modelPickerOpen ? 'Select a model' : 'Ready',
+                        }));
+                    }
+                }
+                return;
+            }
+            if (input === '/new') {
+                newConversationInFlight = true;
+                store.update((current) => ({
+                    ...current,
+                    busy: true,
+                    busySince: Date.now(),
+                    imageAttachments: [],
+                    queuedMessage: null,
+                    status: 'Starting a new conversation...',
+                }));
+                if (!(await saveActiveSessionOrAbort())) {
+                    newConversationInFlight = false;
                     store.update((current) => ({
                         ...current,
                         busy: false,
-                        status: current.modelPickerOpen ? 'Select a model' : 'Ready',
+                        busySince: null,
+                        status: 'Ready',
                     }));
+                    await flushQueuedMessage();
+                    return;
                 }
-                return;
-            }
-            if (input === '/clear') {
-                clearConversation(session);
+                startNewConversation(session);
+                setBackgroundJobSession(session.sessionId);
+                setScratchSession(session.sessionId);
+                setTodoSession(session.sessionId);
                 clearTodos();
+                syncBackgroundJobsState();
                 syncTodosState();
                 latestUsageSummary = null;
-                await saveActiveSession();
                 store.replaceTranscript([
                     {
-                        body: 'Conversation cleared.',
+                        body: 'Started a new conversation. The previous session remains saved.',
                         kind: 'system',
-                        title: 'System',
+                        title: 'Session',
                     },
                 ]);
+                await saveActiveSession();
                 syncShellStateFromSession();
-                store.update((current) => ({ ...current, queuedMessage: null }));
+                newConversationInFlight = false;
+                store.update((current) => ({
+                    ...current,
+                    busy: false,
+                    busySince: null,
+                    status: 'Ready',
+                }));
                 await remountTui();
+                await flushQueuedMessage();
                 return;
             }
             latestUsageSummary = null;
@@ -2196,6 +2325,8 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
             activeTurnAbort = turnAbort;
             lastTurnStartedAt = turnStartedAt;
             todosTouchedThisTurn = false;
+            clearTodos();
+            syncTodosState();
             const userEntry = {
                 body: input,
                 kind: 'user',
@@ -2208,6 +2339,7 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
                 ...current,
                 activeTurnInput: input,
                 activeTurnInputPreformatted: preformatted,
+                analyzingImages: 0,
                 busy: true,
                 busySince: turnStartedAt,
                 clockNow: turnStartedAt,
@@ -2232,7 +2364,8 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
                     return;
                 latestUsageSummary = result.usageSummary ?? null;
                 const turnEntries = takePendingTurnEntries();
-                await saveActiveSession();
+                if (!(await saveActiveSession()))
+                    return;
                 syncShellStateFromSession();
                 store.update((current) => ({
                     ...current,
@@ -2283,6 +2416,8 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
                     return;
                 }
                 const cancelled = isTurnCancelledError(error);
+                if (exitForAuthenticationError(error))
+                    return;
                 store.update((current) => ({
                     ...current,
                     activeTurnInput: '',
@@ -2307,7 +2442,8 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
                             title: 'System',
                         },
                     ]);
-                    await saveActiveSession();
+                    if (!(await saveActiveSession()))
+                        return;
                 }
                 else {
                     appendStaticEntries(turnEntries);
@@ -2327,13 +2463,19 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
                 }
             }
         };
+        session.onImageAnalysis = (activeImageCount) => {
+            store.update((current) => ({
+                ...current,
+                analyzingImages: Math.max(0, activeImageCount),
+            }));
+        };
         session.onStatus = (message) => {
             const panel = thinkingPanelFromStatus(message);
             store.update((current) => ({
                 ...current,
                 status: message,
-                thinkingTitle: panel?.title ?? current.thinkingTitle,
-                thinkingNotes: panel?.notes ?? current.thinkingNotes,
+                thinkingTitle: panel ? panel.title : liveStatusPanelTitle(message),
+                thinkingNotes: panel ? panel.notes : [],
                 tokenUsage: formatClientTokenUsage(current.busySince == null ? null : Date.now() - current.busySince, latestUsageSummary),
             }));
         };
@@ -2531,10 +2673,14 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
             terminalTitle.dispose();
             killAllBackgroundJobs();
             setBackgroundJobSession(null);
+            setScratchSession(null);
             setTodoSession(null);
             setBackgroundJobUpdateHook(null);
             await bridge.close();
+            releaseTerminalWrites();
             setCommandOutputHook(null);
         }
     });
+    if (fatalError)
+        throw fatalError;
 }

package/dist/src/ui/tui/bridge.js

@@ -155,6 +155,9 @@ export function createRatatuiBridge() {
         clear() {
             writeParent({ op: 'clear' });
         },
+        setTitle(title) {
+            writeParent({ op: 'title', text: title });
+        },
         async close() {
             if (closed)
                 return;