@thegitai/cli 1.0.0-beta.9 → 1.0.0-preview.10

package/dist/src/ui/repl.js

@@ -1,13 +1,22 @@
 import { createRatatuiBridge } from './tui/bridge.js';
-import { buildTuiFrame, renderTranscriptEntryLines } from './tui/build-frame.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 { clearConversation, } from '../session.js';
-import { applySessionSnapshot, listSessionMetadata, loadSessionSnapshot, saveSessionState, } from '../session-store.js';
+import { collectBackgroundJobUiKillMutations, collectBackgroundJobUiOutputMutations, } from '../tool-executor.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';
@@ -103,8 +112,12 @@ export const SLASH_COMMANDS = [
         description: 'Open the session picker',
     },
     {
-        command: '/clear',
-        description: 'Clear conversation history',
+        command: '/jobs',
+        description: 'Background jobs: pick to view output or kill',
+    },
+    {
+        command: '/new',
+        description: 'start a new conversation; this session remains saved',
     },
     {
         command: '/exit',
@@ -550,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 ||
@@ -643,12 +681,33 @@ function buildWorkingToolEntry(event) {
         : '';
     if (call.name === 'run_command') {
         const command = String(call.args?.command ?? result?.command ?? '').trim();
+        if (result?.backgrounded === true && result?.jobId) {
+            return {
+                body: `$ ${truncate(command, 180)}\nBackground job ${String(result.jobId)} started.${error}`,
+                kind: result?.ok === true ? 'tool' : 'error',
+                preformatted: true,
+                title: 'Shell',
+            };
+        }
         return {
             body: `$ ${truncate(command, 180)}\n${formatRunCommandResultState(result)}${error}`,
             kind: result?.ok === true ? 'tool' : 'error',
             title: 'Shell',
         };
     }
+    if (call.name === 'shell_job_output' || call.name === 'shell_job_kill') {
+        const jobId = String(result?.jobId ?? call.args?.job_id ?? '').trim();
+        const status = String(result?.status ?? '').trim();
+        const exitCode = result?.exitCode;
+        const stateText = status
+            ? `${status}${exitCode != null ? ` (code ${exitCode})` : ''}`
+            : formatToolResultState(result);
+        return {
+            body: `${jobId || '(unknown job)'} · ${stateText}${error}`,
+            kind: result?.ok === true ? 'tool' : 'error',
+            title: call.name === 'shell_job_kill' ? 'Kill job' : 'Job output',
+        };
+    }
     if (call.name === 'run_node_script') {
         return {
             body: `node --input-type=module <script via stdin>\n${formatRunCommandResultState(result)}${error}`,
@@ -666,6 +725,32 @@ function buildWorkingToolEntry(event) {
         title: 'Tool',
     };
 }
+function buildBackgroundJobNoticeEntry(snapshot) {
+    const command = truncate(snapshot.command, 120);
+    const ran = formatJobElapsed((snapshot.endedAt ?? Date.now()) - snapshot.startedAt);
+    if (snapshot.status === 'error') {
+        return {
+            body: `✖ ${snapshot.id} (${command}) failed to start`,
+            kind: 'error',
+            preformatted: true,
+            title: 'Background job',
+        };
+    }
+    if (snapshot.status === 'killed') {
+        return {
+            body: `■ ${snapshot.id} (${command}) killed · ran ${ran}`,
+            kind: 'system',
+            preformatted: true,
+            title: 'Background job',
+        };
+    }
+    return {
+        body: `${snapshot.exitCode === 0 ? '✓' : '✖'} ${snapshot.id} (${command}) exited (code ${snapshot.exitCode ?? 1}) · ran ${ran}`,
+        kind: snapshot.exitCode === 0 ? 'system' : 'error',
+        preformatted: true,
+        title: 'Background job',
+    };
+}
 function findPendingToolCallByName(pendingCalls, name) {
     for (const [id, call] of pendingCalls) {
         if (call.name !== name)
@@ -699,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) {
@@ -745,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' });
         }
     }
@@ -814,11 +907,16 @@ function createShellStore(initialState) {
         },
         appendWorkingTool: (entry) => {
             const lastEntry = state.workingTools.at(-1);
-            if (sameTranscriptDraft(lastEntry, entry))
+            const isDuplicate = sameTranscriptDraft(lastEntry, entry);
+            if (isDuplicate && state.commandLog.length === 0) {
                 return;
+            }
             state = {
                 ...state,
-                workingTools: [...state.workingTools, entry].slice(-WORKING_TOOL_PREVIEW_ITEMS),
+                commandLog: [],
+                workingTools: isDuplicate
+                    ? state.workingTools
+                    : [...state.workingTools, entry].slice(-WORKING_TOOL_PREVIEW_ITEMS),
             };
             notify();
         },
@@ -865,9 +963,11 @@ function createInitialShellState(session, serverModels, debugUi) {
         activeTurnInput: '',
         activeTurnInputPreformatted: false,
         agentMode: session.agentMode,
+        analyzingImages: 0,
         approvalCursor: getDefaultApprovalCursor(),
         approvalPrompt: null,
         autoYes: session.autoYes,
+        backgroundJobs: [],
         busy: false,
         busySince: null,
         clockNow: Date.now(),
@@ -879,6 +979,9 @@ function createInitialShellState(session, serverModels, debugUi) {
         exiting: false,
         input: '',
         maxToolSteps: session.maxToolSteps,
+        jobsPickerExpandedId: null,
+        jobsPickerIndex: 0,
+        jobsPickerOpen: false,
         modelPickerIndex: getDefaultModelPickerIndex(session.modelId, serverModels.models),
         modelPickerOpen: false,
         projectRoot: session.rootDir,
@@ -899,6 +1002,7 @@ function createInitialShellState(session, serverModels, debugUi) {
         exitConfirmUntil: null,
         thinkingTitle: '',
         thinkingNotes: [],
+        todos: listTodos(),
         tokenUsage: formatClientTokenUsage(null),
         transcript: [],
         turnCounter: Math.max(0, session.history.filter((entry) => entry.role === 'user').length),
@@ -951,6 +1055,14 @@ function thinkingNoteFromStatus(status) {
     const note = text.slice('Thinking:'.length).trim();
     return note ? note : null;
 }
+function stripMarkdownEmphasis(text) {
+    return text
+        .replace(/\*\*\*(.+?)\*\*\*/g, '$1')
+        .replace(/___(.+?)___/g, '$1')
+        .replace(/\*\*(.+?)\*\*/g, '$1')
+        .replace(/__(.+?)__/g, '$1')
+        .replace(/(?<!\*)\*(?!\*)([^*\n]+?)\*(?!\*)/g, '$1');
+}
 function splitThinkingLines(text) {
     return text
         .split('\n')
@@ -959,13 +1071,13 @@ function splitThinkingLines(text) {
         .flatMap((line) => line
         .split(/(?<=[.!?])\s+(?=[A-Z0-9"'`])/)
         .map((part) => part.trim())
-        .filter(Boolean))
-        .map((line) => truncate(line, 120));
+        .filter(Boolean));
 }
 function thinkingPanelFromStatus(status) {
-    const text = thinkingNoteFromStatus(status);
-    if (!text)
+    const rawText = thinkingNoteFromStatus(status);
+    if (!rawText)
         return null;
+    const text = stripMarkdownEmphasis(rawText);
     const rawLines = text
         .split('\n')
         .map((line) => line.trim())
@@ -974,12 +1086,12 @@ function thinkingPanelFromStatus(status) {
         return null;
     if (rawLines.length === 1 && rawLines[0].length <= 72) {
         return {
-            title: truncate(rawLines[0], 72),
+            title: rawLines[0],
             notes: [],
         };
     }
     const title = rawLines.length > 1 && rawLines[0].length <= 72
-        ? truncate(rawLines[0], 72)
+        ? rawLines[0]
         : 'Thinking';
     const bodyLines = rawLines.length > 1 && rawLines[0].length <= 72 ? rawLines.slice(1) : rawLines;
     return {
@@ -997,7 +1109,10 @@ export function getInputCommandToken(input) {
     if (!trimmed.startsWith('/'))
         return '';
     const firstSpaceIndex = trimmed.indexOf(' ');
-    return firstSpaceIndex === -1 ? trimmed : trimmed.slice(0, firstSpaceIndex);
+    const token = firstSpaceIndex === -1 ? trimmed : trimmed.slice(0, firstSpaceIndex);
+    if (token.indexOf('/', 1) !== -1)
+        return '';
+    return token;
 }
 function shouldShowCommandPalette(state) {
     const trimmed = String(state.input ?? '').trim();
@@ -1006,7 +1121,8 @@ function shouldShowCommandPalette(state) {
         !state.modelPickerOpen &&
         !state.resumePickerOpen &&
         trimmed.startsWith('/') &&
-        !trimmed.includes(' '));
+        !trimmed.includes(' ') &&
+        getInputCommandToken(trimmed) !== '');
 }
 export function shouldRemountLiveFrameForComposerInputChange(current, nextInput) {
     const currentShowsCommands = shouldShowCommandPalette(current);
@@ -1135,7 +1251,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) {
@@ -1163,22 +1283,23 @@ 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));
         let currentServerModels = serverModels;
@@ -1189,6 +1310,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;
@@ -1201,6 +1323,11 @@ 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() }));
+        };
         let activeTurnGeneration = 0;
         let exitCtrlCArmed = false;
         let exitCtrlCTimer = null;
@@ -1229,14 +1356,25 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
                 store.update((current) => current.status === status ? { ...current, status: 'Ready' } : current);
             }, 2500);
         };
+        const terminalTitle = createTerminalTitleController({
+            write: (title) => bridge.setTitle(title),
+        });
+        const syncTerminalTitle = () => {
+            const state = store.getState();
+            terminalTitle.sync({
+                awaitingReview: Boolean(state.approvalPrompt || state.sudoPrompt),
+                busy: state.busy,
+            });
+        };
         const renderCurrentFrame = () => {
             if (!tuiReady)
                 return;
             const state = store.getState();
+            syncTerminalTitle();
             const elapsedSeconds = state.busySince
                 ? Math.max(0, Math.floor((Date.now() - state.busySince) / 1000))
                 : 0;
-            bridge.render(buildTuiFrame(state, terminalCols, terminalRows, spinnerFrame, elapsedSeconds));
+            bridge.render(buildTuiFrame(state, terminalCols, terminalRows, spinnerFrame, elapsedSeconds, Date.now()));
         };
         const remountTui = async () => {
             if (remountPromise) {
@@ -1387,7 +1525,7 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
             }));
         };
         const cancelActiveTurn = () => {
-            if (!store.getState().busy)
+            if (!store.getState().busy || newConversationInFlight)
                 return;
             disarmExitConfirm();
             dismissPendingApproval();
@@ -1396,9 +1534,6 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
             activeTurnAbort?.abort();
             activeTurnAbort = null;
             cancelActiveCommand();
-            // Ctrl+C with a queued message: recall it into the composer for editing
-            // rather than auto-submitting it against the cancelled turn. (Esc with a
-            // queued message clears the slot in shell-input without cancelling.)
             const queued = store.getState().queuedMessage;
             const cancelledEntries = [
                 ...takePendingTurnEntries(),
@@ -1434,14 +1569,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,
@@ -1521,6 +1648,7 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
             dismissPendingApproval();
             dismissPendingSudoPassword();
             exiting = true;
+            killAllBackgroundJobs();
             store.update((current) => ({
                 ...current,
                 exiting: true,
@@ -1528,9 +1656,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);
@@ -1667,7 +1831,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.`,
@@ -1675,6 +1840,87 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
                 title: 'Model',
             });
         };
+        const openJobsPicker = () => {
+            syncBackgroundJobsState();
+            store.update((current) => ({
+                ...current,
+                commandCursor: 0,
+                cursor: 0,
+                input: '',
+                jobsPickerExpandedId: null,
+                jobsPickerIndex: 0,
+                jobsPickerOpen: true,
+                status: 'Background jobs',
+            }));
+        };
+        const appendJobOutputEntry = async (jobId) => {
+            const id = jobId.trim();
+            await collectBackgroundJobUiOutputMutations({
+                session,
+                projectIndex,
+                jobId: id,
+            });
+            const job = listBackgroundJobs().find((candidate) => candidate.id === id);
+            const buffered = getJobBufferedOutput(id);
+            if (!job || !buffered) {
+                appendError(`Unknown background job id: ${id}`);
+                return;
+            }
+            const dropped = buffered.droppedChars > 0
+                ? `... (${buffered.droppedChars} chars of older output dropped) ...\n`
+                : '';
+            appendStaticEntry({
+                body: `${dropped}${buffered.output || '(no output captured)'}`,
+                kind: 'system',
+                preformatted: true,
+                title: `${job.id} output — ${truncate(job.command, 80)}`,
+            });
+        };
+        const selectedJobsPickerId = () => {
+            const current = store.getState();
+            if (!current.backgroundJobs.length)
+                return null;
+            const index = Math.min(Math.max(current.jobsPickerIndex, 0), current.backgroundJobs.length - 1);
+            return current.backgroundJobs[index]?.id ?? null;
+        };
+        const handleJobsPickerOutput = async () => {
+            const jobId = selectedJobsPickerId();
+            if (!jobId)
+                return;
+            await collectBackgroundJobUiOutputMutations({
+                session,
+                projectIndex,
+                jobId,
+            });
+            syncBackgroundJobsState();
+            store.update((current) => ({
+                ...current,
+                jobsPickerExpandedId: current.jobsPickerExpandedId === jobId ? null : jobId,
+            }));
+        };
+        const handleJobsPickerKill = async () => {
+            const jobId = selectedJobsPickerId();
+            if (!jobId)
+                return;
+            const killed = await killBackgroundJob(jobId);
+            await collectBackgroundJobUiKillMutations({
+                session,
+                projectIndex,
+                jobId,
+                result: killed,
+            });
+            syncBackgroundJobsState();
+            if (!killed.ok) {
+                appendError(killed.error ?? 'Background job kill failed.');
+            }
+            else if (killed.alreadyFinished) {
+                appendStaticEntry({
+                    body: `${jobId} had already finished.`,
+                    kind: 'system',
+                    title: 'Background jobs',
+                });
+            }
+        };
         const handleInlineModelSelection = async () => {
             const current = store.getState();
             const options = buildModelPickerOptions(current.currentModelId, current.serverModels);
@@ -1705,6 +1951,8 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
                 await switchToModel(selected.id);
             }
             catch (error) {
+                if (exitForAuthenticationError(error))
+                    return;
                 appendError(error.message);
             }
         };
@@ -1761,7 +2009,11 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
             try {
                 const snapshot = await loadInteractiveSession(selected.id);
                 applySessionSnapshot(session, snapshot);
-                await saveActiveSession();
+                setBackgroundJobSession(session.sessionId);
+                setScratchSession(session.sessionId);
+                syncBackgroundJobsState();
+                setTodoSession(session.sessionId);
+                syncTodosState();
                 syncShellStateFromSession();
                 store.update((next) => ({
                     ...next,
@@ -1784,6 +2036,8 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
                 await remountTui();
             }
             catch (error) {
+                if (exitForAuthenticationError(error))
+                    return;
                 store.update((next) => ({
                     ...next,
                     busy: false,
@@ -1802,8 +2056,6 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
             if (!queued || store.getState().busy || exiting) {
                 return;
             }
-            // Rehydrate attachments/chunks before submit: handleSubmit expands
-            // pastedChunks from the store and the turn picks up imageAttachments.
             store.update((current) => ({
                 ...current,
                 imageAttachments: queued.imageAttachments,
@@ -1830,9 +2082,6 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
                     });
                     return;
                 }
-                // Snapshot the raw (placeholder) body plus chunks/images so recall and
-                // flush round-trip the collapsed paste + attachments. Hold at most one;
-                // a second enqueue replaces the slot.
                 const pending = store.getState();
                 const snapshot = {
                     body: String(rawInput ?? ''),
@@ -1887,6 +2136,46 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
                 });
                 return;
             }
+            if (input === '/jobs' || input.startsWith('/jobs ')) {
+                const jobsArgs = input.slice('/jobs'.length).trim();
+                if (!jobsArgs) {
+                    openJobsPicker();
+                    return;
+                }
+                const killMatch = jobsArgs.match(/^kill\s+(\S+)$/);
+                if (killMatch) {
+                    const jobId = killMatch[1];
+                    const killed = await killBackgroundJob(jobId);
+                    await collectBackgroundJobUiKillMutations({
+                        session,
+                        projectIndex,
+                        jobId,
+                        result: killed,
+                    });
+                    if (!killed.ok) {
+                        appendError(killed.error ?? 'Background job kill failed.');
+                    }
+                    else if (killed.alreadyFinished) {
+                        appendStaticEntry({
+                            body: `${jobId} had already finished.`,
+                            kind: 'system',
+                            title: 'Background jobs',
+                        });
+                    }
+                    return;
+                }
+                const outputMatch = jobsArgs.match(/^output\s+(\S+)$/);
+                if (outputMatch) {
+                    await appendJobOutputEntry(outputMatch[1]);
+                    return;
+                }
+                appendStaticEntry({
+                    body: 'Usage: /jobs — open the jobs picker · /jobs output <id> — full output · /jobs kill <id> — kill one',
+                    kind: 'system',
+                    title: 'Background jobs',
+                });
+                return;
+            }
             if (input === '/usage') {
                 store.update((current) => ({
                     ...current,
@@ -1901,14 +2190,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;
             }
@@ -1922,14 +2215,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;
             }
@@ -1949,31 +2246,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;
@@ -1983,6 +2317,9 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
             const turnAbort = new AbortController();
             activeTurnAbort = turnAbort;
             lastTurnStartedAt = turnStartedAt;
+            todosTouchedThisTurn = false;
+            clearTodos();
+            syncTodosState();
             const userEntry = {
                 body: input,
                 kind: 'user',
@@ -1995,6 +2332,7 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
                 ...current,
                 activeTurnInput: input,
                 activeTurnInputPreformatted: preformatted,
+                analyzingImages: 0,
                 busy: true,
                 busySince: turnStartedAt,
                 clockNow: turnStartedAt,
@@ -2019,7 +2357,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,
@@ -2037,6 +2376,22 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
                 await appendSettledTurnEntries(turnEntries, result.text ?? '', () => turnGeneration === activeTurnGeneration && !turnAbort.signal.aborted);
                 if (turnGeneration !== activeTurnGeneration)
                     return;
+                if (todosTouchedThisTurn) {
+                    todosTouchedThisTurn = false;
+                    const todoItems = listTodos();
+                    if (todoItems.length > 0) {
+                        appendStaticEntry({
+                            body: '',
+                            kind: 'system',
+                            title: `To-dos · ${formatTodoProgress(todoItems)}`,
+                            todoList: todoItems,
+                        });
+                        if (todoItems.every((item) => item.status === 'completed')) {
+                            clearTodos();
+                            syncTodosState();
+                        }
+                    }
+                }
                 store.update((current) => ({
                     ...current,
                     busy: false,
@@ -2054,6 +2409,8 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
                     return;
                 }
                 const cancelled = isTurnCancelledError(error);
+                if (exitForAuthenticationError(error))
+                    return;
                 store.update((current) => ({
                     ...current,
                     activeTurnInput: '',
@@ -2078,15 +2435,14 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
                             title: 'System',
                         },
                     ]);
-                    await saveActiveSession();
+                    if (!(await saveActiveSession()))
+                        return;
                 }
                 else {
                     appendStaticEntries(turnEntries);
                     appendError(error.message);
                 }
                 await remountTui();
-                // A cancelled turn never auto-submits the queue (Ctrl+C recalls it via
-                // cancelActiveTurn); only a genuine error flushes a pending message.
                 if (!cancelled && turnGeneration === activeTurnGeneration) {
                     await flushQueuedMessage();
                 }
@@ -2100,6 +2456,12 @@ 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) => ({
@@ -2119,6 +2481,13 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
         };
         session.onToolEvent = (event) => {
             syncShellStateFromSession();
+            if (event.call.name === 'update_todos') {
+                syncTodosState();
+                if (event.result?.ok === true) {
+                    todosTouchedThisTurn = true;
+                    return;
+                }
+            }
             if (isFileChangeTool(event.call.name)) {
                 const entry = buildFileChangeEntry(event);
                 store.appendWorkingTool(entry);
@@ -2127,6 +2496,52 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
             }
             store.appendWorkingTool(buildWorkingToolEntry(event));
         };
+        const jobDetailLines = (jobId) => {
+            const buffered = getJobBufferedOutput(jobId);
+            if (!buffered)
+                return [];
+            const lines = buffered.output
+                .replace(/\r\n/g, '\n')
+                .replace(/\r/g, '\n')
+                .split('\n')
+                .filter((line) => line.trim().length > 0);
+            const visible = lines.slice(-20);
+            return buffered.droppedChars > 0
+                ? [
+                    `... (${buffered.droppedChars} chars of older output dropped) ...`,
+                    ...visible,
+                ]
+                : visible;
+        };
+        const syncBackgroundJobsState = () => {
+            const jobsForDisplay = listBackgroundJobs().map((job) => {
+                const preview = getJobOutputPreview(job.id, 3);
+                return {
+                    id: job.id,
+                    command: job.command,
+                    status: job.status,
+                    exitCode: job.exitCode,
+                    startedAt: job.startedAt,
+                    endedAt: job.endedAt,
+                    firstOutputLine: preview?.firstLine ?? '',
+                    tailLines: preview?.tailLines ?? [],
+                    detailLines: jobDetailLines(job.id),
+                };
+            });
+            store.update((current) => ({
+                ...current,
+                backgroundJobs: jobsForDisplay,
+                jobsPickerExpandedId: jobsForDisplay.some((job) => job.id === current.jobsPickerExpandedId)
+                    ? current.jobsPickerExpandedId
+                    : null,
+            }));
+        };
+        setBackgroundJobUpdateHook((snapshot) => {
+            syncBackgroundJobsState();
+            if (snapshot.status !== 'running') {
+                appendTurnAwareEntry(buildBackgroundJobNoticeEntry(snapshot));
+            }
+        });
         projectIndex.onStatus = session.onStatus;
         projectIndex.onContextLog = session.onContextLog;
         session.requestSudoPassword = async ({ command, prompt, signal }) => openSudoPasswordPrompt(command, prompt, signal);
@@ -2186,6 +2601,8 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
             onResumeSession: handleInlineResumeSelection,
             onSelectionCopy: handleAppSelectionCopy,
             onSelectModel: handleInlineModelSelection,
+            onJobsPickerOutput: handleJobsPickerOutput,
+            onJobsPickerKill: handleJobsPickerKill,
             onSudoPasswordInput: handleSudoPasswordInput,
             onSubmit: handleSubmit,
         };
@@ -2199,7 +2616,10 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
             }
         }, 120);
         const clockTimer = setInterval(() => {
-            if (store.getState().busy) {
+            if (hasRunningBackgroundJobs()) {
+                syncBackgroundJobsState();
+            }
+            if (store.getState().busy || hasRunningBackgroundJobs()) {
                 renderCurrentFrame();
             }
         }, 1000);
@@ -2243,8 +2663,17 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
             clearInterval(clockTimer);
             unsubscribe();
             clearLiveFrameRemountTimer();
+            terminalTitle.dispose();
+            killAllBackgroundJobs();
+            setBackgroundJobSession(null);
+            setScratchSession(null);
+            setTodoSession(null);
+            setBackgroundJobUpdateHook(null);
             await bridge.close();
+            releaseTerminalWrites();
             setCommandOutputHook(null);
         }
     });
+    if (fatalError)
+        throw fatalError;
 }