moderado 0.4.28 → 0.4.34

package/dist/commands/chat.js

@@ -10,7 +10,7 @@ import { MemoryCredentialStore } from '../credentials.js';
 import { WindowsCredentialStore } from '../windows_credentials.js';
 import { TerminalApprovalHandler } from '../ui/terminal_approval.js';
 import { selectCompatibleModelOverlay, selectModelOverlay, showModelConnectionRequired } from '../ui/model_selector.js';
-import { connectProviderInteractive, isAuthenticationFailure, isModeradoCloudOAuthConnection, loginModeradoCloudInteractive, replaceProviderKeyInteractive } from '../ui/provider_connect.js';
+import { connectProviderInteractive, isAuthenticationFailure, isModeradoOAuthConnection, loginModeradoInteractive, replaceProviderKeyInteractive } from '../ui/provider_connect.js';
 import { initWorkspace } from './init.js';
 import { expandMentions, createWorkspaceFileSource } from '../ui/file_mentions.js';
 import { listFiles } from '../vendor/tools/index.js';
@@ -24,9 +24,15 @@ import { buildWorkspaceMap } from '../repo_map.js';
 import { evaluateTokenBudget, parseBudgetCommand } from '../budget.js';
 import { discoverSkills, formatSkillContext, formatSkillsList, getEnabledSkillNames, selectEnabledSkills, setSkillEnabled } from '../skills.js';
 import { getHelpCommandLines } from '../ui/help_content.js';
+import { forceExit } from '../http_shutdown.js';
 export function createConnectionProvider(connection) {
     return new NvidiaAdapter({ apiKey: connection.apiKey, baseUrl: connection.baseUrl, providerId: connection.id, providerName: connection.displayName });
 }
+export function getProviderStatusName(connection) {
+    return connection?.id === 'moderado' || connection?.id === 'moderado-cloud'
+        ? 'Moderado'
+        : connection?.displayName;
+}
 export function formatSessionExitSummary(session, modelId) {
     const usage = session.usage;
     const tokens = usage.available
@@ -173,8 +179,18 @@ export function formatTurnFailureAnswer(status, errorEvent, modelId, otherConnec
     const cleanDetail = rawDetail
         .replace(/^(?:NVIDIA NIM|OpenAI|OpenRouter|[a-zA-Z0-9_-]+)\s*(?:request failed|rate limit exceeded|service or model unavailable)?\s*(?:\([^)]*\))?\s*(?:during\s*streamChat)?:\s*/i, '')
         .trim();
+    if (errorEvent?.code === 'ERR_GATEWAY_UNAUTHORIZED') {
+        return `⚠️ **Gateway Authorization (${errorEvent.code}):**\n${cleanDetail}`;
+    }
+    if (errorEvent?.code?.toUpperCase().includes('RATE_LIMIT')) {
+        return `⚠️ **Model Error (${errorEvent.code}):**\n${cleanDetail || 'Provider rate limit reached.'}\n\n👉 **Suggestion:** The provider temporarily limited requests for \`${modelId}\`. Please retry shortly or choose another model with \`/model\`.`;
+    }
     return `⚠️ **Model Error (${errorEvent?.code || 'ERR_INFERENCE_FAILED'}):**\n${cleanDetail || 'Model returned no response.'}\n\n👉 **Suggestion:** The model \`${modelId}\` encountered an error. Switch models with \`/model\` or choose a provider with \`/connect\`${altSuggestion}.`;
 }
+/** A turn whose provider rejected its credential may recover by re-entering a key once. */
+export function turnFailedAuthentication(status, errorEvent) {
+    return status === 'failed' && isAuthenticationFailure(errorEvent);
+}
 export function resolveTurnAssistantAnswer(result, previousHistoryLength, lastErrorEvent, streamedAnswer = '', currentModel = 'unknown', otherConnections = []) {
     if (result.status === 'cancelled') {
         const partial = cleanConversationalFiller(streamedAnswer);
@@ -203,6 +219,8 @@ export function saveFailedTurnPrompt(history, prompt, partialResponse = '') {
     return [...history, { role: 'user', content: prompt }, { role: 'assistant', content: interruptedResponse }];
 }
 const CONTINUE_INTERRUPTED_TASK_PROMPT = 'Continue the interrupted task from the saved conversation. Start from the unfinished work and avoid repeating completed steps.';
+/** Braille spinner frames for the live "still running" status row. */
+const ACTIVITY_SPINNER_FRAMES = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
 function hasInterruptedTurn(messages) {
     for (let index = messages.length - 1; index >= 0; index -= 1) {
         const message = messages[index];
@@ -466,7 +484,8 @@ export function formatDirectWebSearchAnswer(result, modelConnected = false) {
         .filter((line) => line && line !== '...' && line !== '---' && !SEARCH_BLOCK_METADATA.test(line) && !/^https?:\/\//i.test(line));
     if (!lines.length)
         return 'Web search returned no readable content.';
-    return `${lines.slice(0, 10).join('\n')}\n\n(${modelConnected ? 'model summary unavailable — ' : 'no model connected — '}raw search excerpt)`;
+    const excerpt = lines.slice(0, 10).join('\n');
+    return `${excerpt}\n\n${modelConnected ? 'Live web search excerpt.' : 'Live web search excerpt. Connect a model for a summary.'}`;
 }
 /** Environment configuration overrides the persistent search provider preference. */
 export function resolveWebSearchProvider(config) {
@@ -838,6 +857,7 @@ export async function handleChatSession(args, version, signal) {
         else {
             let autoContinueRequested = false;
             const turn = await promptInteractiveTurn({
+                getProviderName: () => getProviderStatusName(activeConnection),
                 model: currentModel ?? 'No model connected — use /connect', tokens: Math.round(sessionTokens), cost: costLabel(), workspace: canonicalWorkspace, version,
                 usageAvailable: activeSession.usage.available, usageEstimated: activeSession.usage.estimated, initialMode: activeMode, initialAutoApprove: activeAutoApprove, isFirstTurn: isFirst, signal, chatQuestion: lastQuestion || undefined, chatAnswer: lastAnswer || undefined, chatThoughtTime: lastThoughtTime, chatTaskDone: lastTurnDone, outputTokenRate: lastOutputTokenRate, tokenUsage: lastTokenUsage,
                 queuedCommands: commandQueue.items,
@@ -856,7 +876,7 @@ export async function handleChatSession(args, version, signal) {
                     }
                     if (activeConnection.kind === 'openai-compatible') {
                         const modelId = await selectCompatibleModelOverlay({
-                            apiKey: activeConnection.id === 'moderado-cloud' ? undefined : activeConnection.apiKey,
+                            apiKey: activeConnection.id === 'moderado' ? undefined : activeConnection.apiKey,
                             baseUrl: activeConnection.baseUrl,
                             providerId: activeConnection.id,
                             providerName: activeConnection.displayName,
@@ -877,7 +897,7 @@ export async function handleChatSession(args, version, signal) {
                         }
                         return modelId;
                     }
-                    const selection = await selectModelOverlay({ apiKey: activeConnection.id === 'moderado-cloud' ? undefined : activeConnection.apiKey, currentModel, signal, saveSelectionByDefault: true, drawFrame });
+                    const selection = await selectModelOverlay({ apiKey: activeConnection.id === 'moderado' ? undefined : activeConnection.apiKey, currentModel, signal, saveSelectionByDefault: true, drawFrame });
                     if (selection.modelId && selection.modelId !== currentModel) {
                         currentModel = selection.modelId;
                         activeConnection = { ...activeConnection, defaultModel: selection.modelId };
@@ -895,7 +915,7 @@ export async function handleChatSession(args, version, signal) {
                     const connection = await connectProviderInteractive({
                         signal,
                         drawFrame,
-                        gatewayUrl: config.connections?.['moderado-cloud']?.baseUrl,
+                        gatewayUrl: config.connections?.moderado?.baseUrl,
                         activeConnection,
                         savedConnections: config.connections,
                         connectProviders: config.connectProviders,
@@ -1160,7 +1180,7 @@ export async function handleChatSession(args, version, signal) {
             lastTokenUsage = undefined;
             process.stdout.write('\x1b[H\x1b[J');
             process.stdout.write(renderFullWelcomeScreen({
-                model: currentModel ?? 'No model connected — use /connect', tokens: Math.round(sessionTokens), cost: costLabel(),
+                provider: getProviderStatusName(activeConnection), model: currentModel ?? 'No model connected — use /connect', tokens: Math.round(sessionTokens), cost: costLabel(),
                 usageAvailable: activeSession.usage.available, usageEstimated: activeSession.usage.estimated, workspace: canonicalWorkspace, mode: activeMode,
                 autoApprove: activeAutoApprove, chatQuestion: lastQuestion, chatAnswer: lastAnswer,
                 chatThoughtTime: lastThoughtTime, queuedCommands: commandQueue.items,
@@ -1176,7 +1196,7 @@ export async function handleChatSession(args, version, signal) {
             lastTokenUsage = undefined;
             process.stdout.write('\x1b[H\x1b[J');
             process.stdout.write(renderFullWelcomeScreen({
-                model: currentModel ?? 'No model connected — use /connect', tokens: Math.round(sessionTokens), cost: costLabel(),
+                provider: getProviderStatusName(activeConnection), model: currentModel ?? 'No model connected — use /connect', tokens: Math.round(sessionTokens), cost: costLabel(),
                 usageAvailable: activeSession.usage.available, usageEstimated: activeSession.usage.estimated, workspace: canonicalWorkspace, mode: activeMode,
                 autoApprove: activeAutoApprove, chatQuestion: lastQuestion, chatAnswer: lastAnswer,
                 chatThoughtTime: lastThoughtTime, queuedCommands: commandQueue.items,
@@ -1211,7 +1231,7 @@ export async function handleChatSession(args, version, signal) {
             }
             process.stdout.write('\x1b[H\x1b[J');
             process.stdout.write(renderFullWelcomeScreen({
-                model: currentModel ?? 'No model connected — use /connect', tokens: Math.round(sessionTokens), cost: costLabel(),
+                provider: getProviderStatusName(activeConnection), model: currentModel ?? 'No model connected — use /connect', tokens: Math.round(sessionTokens), cost: costLabel(),
                 usageAvailable: activeSession.usage.available, usageEstimated: activeSession.usage.estimated, workspace: canonicalWorkspace, mode: activeMode,
                 autoApprove: activeAutoApprove, chatQuestion: lastQuestion, chatAnswer: lastAnswer,
                 chatThoughtTime: lastThoughtTime,
@@ -1250,7 +1270,7 @@ export async function handleChatSession(args, version, signal) {
             lastTokenUsage = undefined;
             process.stdout.write('\x1b[H\x1b[J');
             process.stdout.write(renderFullWelcomeScreen({
-                model: currentModel ?? 'No model connected — use /connect', tokens: Math.round(sessionTokens), cost: costLabel(),
+                provider: getProviderStatusName(activeConnection), model: currentModel ?? 'No model connected — use /connect', tokens: Math.round(sessionTokens), cost: costLabel(),
                 usageAvailable: activeSession.usage.available, usageEstimated: activeSession.usage.estimated, workspace: canonicalWorkspace, mode: activeMode,
                 autoApprove: activeAutoApprove, chatQuestion: lastQuestion, chatAnswer: lastAnswer,
                 chatThoughtTime: lastThoughtTime,
@@ -1289,12 +1309,12 @@ export async function handleChatSession(args, version, signal) {
             lastOutputTokenRate = undefined;
             lastTokenUsage = undefined;
             process.stdout.write('\x1b[H\x1b[J');
-            process.stdout.write(renderFullWelcomeScreen({ model: currentModel ?? 'No model connected — use /connect', tokens: Math.round(sessionTokens), cost: costLabel(), usageAvailable: activeSession.usage.available, usageEstimated: activeSession.usage.estimated, workspace: canonicalWorkspace, mode: activeMode, autoApprove: activeAutoApprove, chatQuestion: lastQuestion, chatAnswer: lastAnswer, chatThoughtTime: lastThoughtTime, queuedCommands: commandQueue.items }, process.stdout.rows));
+            process.stdout.write(renderFullWelcomeScreen({ provider: getProviderStatusName(activeConnection), model: currentModel ?? 'No model connected — use /connect', tokens: Math.round(sessionTokens), cost: costLabel(), usageAvailable: activeSession.usage.available, usageEstimated: activeSession.usage.estimated, workspace: canonicalWorkspace, mode: activeMode, autoApprove: activeAutoApprove, chatQuestion: lastQuestion, chatAnswer: lastAnswer, chatThoughtTime: lastThoughtTime, queuedCommands: commandQueue.items }, process.stdout.rows));
             process.stdout.write(renderChatComposerCursor({ width: process.stdout.columns }, 0));
             continue;
         }
         if (trimmed === '/exit' || trimmed === '/quit') {
-            exitCleanly(exitMessage());
+            return await exitCleanly(exitMessage());
         }
         if (trimmed === '/help') {
             lastQuestion = trimmed;
@@ -1304,7 +1324,7 @@ export async function handleChatSession(args, version, signal) {
             lastTokenUsage = undefined;
             process.stdout.write('\x1b[H\x1b[J');
             process.stdout.write(renderFullWelcomeScreen({
-                model: currentModel ?? 'No model connected — use /connect', tokens: Math.round(sessionTokens), cost: costLabel(),
+                provider: getProviderStatusName(activeConnection), model: currentModel ?? 'No model connected — use /connect', tokens: Math.round(sessionTokens), cost: costLabel(),
                 usageAvailable: activeSession.usage.available, usageEstimated: activeSession.usage.estimated, workspace: canonicalWorkspace, mode: activeMode,
                 autoApprove: activeAutoApprove, chatQuestion: lastQuestion, chatAnswer: lastAnswer,
                 chatThoughtTime: lastThoughtTime,
@@ -1336,7 +1356,7 @@ export async function handleChatSession(args, version, signal) {
             sessionStore.save(activeSession);
             process.stdout.write('\x1b[H\x1b[J');
             process.stdout.write(renderFullWelcomeScreen({
-                model: currentModel ?? 'No model connected — use /connect', tokens: Math.round(sessionTokens), cost: costLabel(),
+                provider: getProviderStatusName(activeConnection), model: currentModel ?? 'No model connected — use /connect', tokens: Math.round(sessionTokens), cost: costLabel(),
                 usageAvailable: activeSession.usage.available, usageEstimated: activeSession.usage.estimated, workspace: canonicalWorkspace, mode: activeMode,
                 autoApprove: activeAutoApprove, chatQuestion: lastQuestion, chatAnswer: lastAnswer,
                 chatThoughtTime: lastThoughtTime,
@@ -1356,7 +1376,7 @@ export async function handleChatSession(args, version, signal) {
             sessionStore.save(activeSession);
             process.stdout.write('\x1b[H\x1b[J');
             process.stdout.write(renderFullWelcomeScreen({
-                model: currentModel ?? 'No model connected — use /connect', tokens: Math.round(sessionTokens), cost: costLabel(),
+                provider: getProviderStatusName(activeConnection), model: currentModel ?? 'No model connected — use /connect', tokens: Math.round(sessionTokens), cost: costLabel(),
                 usageAvailable: activeSession.usage.available, usageEstimated: activeSession.usage.estimated, workspace: canonicalWorkspace, mode: activeMode,
                 autoApprove: activeAutoApprove, chatQuestion: lastQuestion, chatAnswer: lastAnswer,
                 chatThoughtTime: lastThoughtTime,
@@ -1381,7 +1401,7 @@ export async function handleChatSession(args, version, signal) {
             lastTokenUsage = undefined;
             process.stdout.write('\x1b[H\x1b[J');
             process.stdout.write(renderFullWelcomeScreen({
-                model: currentModel ?? 'Web search', tokens: Math.round(sessionTokens), cost: costLabel(),
+                provider: getProviderStatusName(activeConnection), model: currentModel ?? 'Web search', tokens: Math.round(sessionTokens), cost: costLabel(),
                 usageAvailable: activeSession.usage.available, usageEstimated: activeSession.usage.estimated, workspace: canonicalWorkspace, mode: activeMode,
                 autoApprove: activeAutoApprove, chatQuestion: lastQuestion, chatAnswer: lastAnswer,
             }, process.stdout.rows));
@@ -1402,7 +1422,7 @@ export async function handleChatSession(args, version, signal) {
                 sessionStore.save(activeSession);
                 process.stdout.write('\x1b[H\x1b[J');
                 process.stdout.write(renderFullWelcomeScreen({
-                    model: currentModel ?? 'Web search', tokens: Math.round(sessionTokens), cost: costLabel(),
+                    provider: getProviderStatusName(activeConnection), model: currentModel ?? 'Web search', tokens: Math.round(sessionTokens), cost: costLabel(),
                     usageAvailable: activeSession.usage.available, usageEstimated: activeSession.usage.estimated, workspace: canonicalWorkspace, mode: activeMode,
                     autoApprove: activeAutoApprove, chatQuestion: lastQuestion, chatAnswer: lastAnswer,
                     chatThoughtTime: lastThoughtTime,
@@ -1418,13 +1438,13 @@ export async function handleChatSession(args, version, signal) {
                 drawFrame: (popupLines) => {
                     process.stdout.write('\x1b[H\x1b[J');
                     process.stdout.write(renderWelcomePopupLayer({
-                        model: currentModel ?? 'No model connected — use /connect',
+                        provider: getProviderStatusName(activeConnection), model: currentModel ?? 'No model connected — use /connect',
                         tokens: Math.round(sessionTokens), cost: costLabel(), workspace: canonicalWorkspace,
                         mode: activeMode, autoApprove: activeAutoApprove,
                         chatQuestion: lastQuestion, chatAnswer: lastAnswer,
                     }, popupLines, process.stdout.columns, process.stdout.rows));
                 },
-                gatewayUrl: config.connections?.['moderado-cloud']?.baseUrl,
+                gatewayUrl: config.connections?.moderado?.baseUrl,
                 activeConnection,
                 savedConnections: config.connections,
                 connectProviders: config.connectProviders,
@@ -1472,7 +1492,9 @@ export async function handleChatSession(args, version, signal) {
             lastAnswer = '';
             lastTurnDone = false;
             let taskStep;
-            let firstAssistantDeltaAt;
+            let activityLabel;
+            let activityFrame = 0;
+            let turnActive = true;
             let outputTokenRate;
             let budgetWarningIssued = false;
             let budgetStopped = false;
@@ -1480,12 +1502,32 @@ export async function handleChatSession(args, version, signal) {
             const usedModels = new Set();
             let answerPosition = { row: 15, column: getChatAnswerArea(process.stdout.columns).startColumn };
             let lastErrorEvent;
+            // Keep a live spinner on the status row for the whole turn: streaming
+            // text and silent tool execution both leave the screen looking settled.
+            const stopActivity = () => {
+                if (thinkingTimer) {
+                    clearInterval(thinkingTimer);
+                    thinkingTimer = undefined;
+                }
+            };
+            const paintActivity = (glyph, label) => {
+                process.stdout.write(renderChatThoughtTimeUpdate((Date.now() - startedAt) / 1000, taskStep, process.stdout.columns, { glyph, label }));
+            };
+            const startActivity = () => {
+                stopActivity();
+                if (!turnActive)
+                    return;
+                activityLabel = undefined;
+                thinkingTimer = setInterval(() => {
+                    paintActivity(ACTIVITY_SPINNER_FRAMES[activityFrame++ % ACTIVITY_SPINNER_FRAMES.length], activityLabel ?? 'Working');
+                }, 200);
+            };
             const redrawChatFrame = () => {
                 const thoughtTime = Math.max(0.001, (Date.now() - startedAt) / 1000);
                 const displayAnswer = streamedAnswer || lastAnswer;
                 process.stdout.write('\x1b[H\x1b[J');
                 process.stdout.write(renderFullWelcomeScreen({
-                    model: currentModel ?? 'No model connected — use /connect',
+                    provider: getProviderStatusName(activeConnection), model: currentModel ?? 'No model connected — use /connect',
                     tokens: Math.round(sessionTokens + (usageRecorded ? 0 : turnUsage?.usage.totalTokens ?? 0)),
                     cost: costLabel(),
                     usageAvailable: activeSession.usage.available, usageEstimated: activeSession.usage.estimated,
@@ -1507,8 +1549,24 @@ export async function handleChatSession(args, version, signal) {
                     const area = getChatAnswerArea(process.stdout.columns);
                     answerPosition = renderChatAnswerDelta(displayAnswer, { row: 15, column: area.startColumn }, area.wrapWidth, area.startColumn);
                 }
+                // The frame paints a static status; keep the live row authoritative while the turn runs.
+                if (thinkingTimer)
+                    paintActivity(ACTIVITY_SPINNER_FRAMES[activityFrame++ % ACTIVITY_SPINNER_FRAMES.length], activityLabel ?? 'Working');
             };
+            let generationEscapes = 0;
             const onGenerationKeypress = (str, key) => {
+                // Raw mode turns Ctrl+C into a keypress, not SIGINT, so the session-level
+                // handler never sees it. The first press aborts the turn; a second press
+                // means the abort did not take (a stalled stream or a hung tool), so
+                // leave instead of freezing with no way out.
+                const isCtrlC = (key?.ctrl && key.name === 'c') || str === '\x03';
+                if (isCtrlC) {
+                    generationEscapes += 1;
+                    if (generationEscapes > 1) {
+                        void forceExit(130);
+                        return;
+                    }
+                }
                 handleGenerationKeypress(str, key, commandQueue, {
                     abort: () => {
                         commandQueue.clear();
@@ -1522,9 +1580,18 @@ export async function handleChatSession(args, version, signal) {
                     },
                     onBtw: async (command) => {
                         const resume = suspendGenerationInput?.();
+                        stopActivity();
                         const ac = new AbortController();
+                        let btwEscapes = 0;
                         const onBtwKey = (s, k) => {
-                            if ((k && k.name === 'escape') || s === '\x1b') {
+                            const isCtrlC = (k && k.ctrl && k.name === 'c') || s === '\x03';
+                            if ((k && k.name === 'escape') || s === '\x1b' || isCtrlC) {
+                                // Escape/Ctrl+C stops the /btw query; a second Ctrl+C means the
+                                // query ignores the abort, so leave instead of freezing.
+                                if (isCtrlC && ++btwEscapes > 1) {
+                                    void forceExit(130);
+                                    return;
+                                }
                                 ac.abort();
                             }
                         };
@@ -1533,7 +1600,7 @@ export async function handleChatSession(args, version, signal) {
                             await executeBtwQuery(command, async (popupLines, frameOpts) => {
                                 process.stdout.write('\x1b[H\x1b[J');
                                 process.stdout.write(renderWelcomePopupLayer({
-                                    model: currentModel ?? 'No model connected',
+                                    provider: getProviderStatusName(activeConnection), model: currentModel ?? 'No model connected',
                                     tokens: Math.round(sessionTokens),
                                     cost: costLabel(),
                                     usageAvailable: activeSession.usage.available, usageEstimated: activeSession.usage.estimated,
@@ -1550,7 +1617,8 @@ export async function handleChatSession(args, version, signal) {
                                     await new Promise((dismissResolve) => {
                                         const onDismiss = (s, k) => {
                                             if ((k && (k.name === 'escape' || k.name === 'return' || k.name === 'enter')) ||
-                                                s === 'q' || s === 'Q' || s === '\x1b') {
+                                                s === 'q' || s === 'Q' || s === '\x1b' ||
+                                                (k && k.ctrl && k.name === 'c')) {
                                                 process.stdin.removeListener('keypress', onDismiss);
                                                 dismissResolve();
                                             }
@@ -1562,6 +1630,7 @@ export async function handleChatSession(args, version, signal) {
                         }
                         finally {
                             process.stdin.removeListener('keypress', onBtwKey);
+                            startActivity();
                             redrawChatFrame();
                             resume?.();
                         }
@@ -1569,6 +1638,8 @@ export async function handleChatSession(args, version, signal) {
                 });
             };
             if (process.stdin.isTTY) {
+                const onGenerationResize = () => redrawChatFrame();
+                process.stdout.on('resize', onGenerationResize);
                 const attachGenerationListener = () => {
                     readline.emitKeypressEvents(process.stdin);
                     process.stdin.resume();
@@ -1588,16 +1659,13 @@ export async function handleChatSession(args, version, signal) {
                 };
                 removeGenerationListener = () => {
                     process.stdin.removeListener('keypress', onGenerationKeypress);
+                    process.stdout.removeListener('resize', onGenerationResize);
                     suspendGenerationInput = undefined;
                 };
             }
             // Move to the chat layout before the provider can emit its first event.
             redrawChatFrame();
-            thinkingTimer = setInterval(() => {
-                if (!firstAssistantDeltaAt && !turnUsage) {
-                    process.stdout.write(renderChatThoughtTimeUpdate((Date.now() - startedAt) / 1000, taskStep, process.stdout.columns));
-                }
-            }, 400);
+            startActivity();
             const evidenceTask = liveSearch ? buildSearchAnswerTask(effectivePrompt, liveSearch) : undefined;
             const runAgent = () => loop.run(isReview ? createReviewTask(reviewFiles) : evidenceTask ?? createAgentTask(effectivePrompt, activeMode), {
                 workspaceRoot: canonicalWorkspace, provider: provider, tools: isReview ? createReviewToolRegistry() : tools, approvalHandler, router, policy,
@@ -1609,9 +1677,21 @@ export async function handleChatSession(args, version, signal) {
                         usedModels.add(event.newModelId);
                     if (event.type === 'progress') {
                         taskStep = { step: event.step, maxSteps: event.maxSteps ?? 0 };
-                        if (!firstAssistantDeltaAt)
-                            process.stdout.write(renderChatThoughtTimeUpdate((Date.now() - startedAt) / 1000, taskStep, process.stdout.columns));
+                        activityLabel = event.status;
+                        paintActivity(ACTIVITY_SPINNER_FRAMES[activityFrame++ % ACTIVITY_SPINNER_FRAMES.length], activityLabel ?? 'Working');
+                    }
+                    if (event.type === 'tool_call_initiated') {
+                        activityLabel = `Running ${event.toolName}`;
+                        paintActivity(ACTIVITY_SPINNER_FRAMES[activityFrame++ % ACTIVITY_SPINNER_FRAMES.length], activityLabel);
+                    }
+                    if (event.type === 'tool_result') {
+                        activityLabel = undefined;
+                        if (!thinkingTimer)
+                            startActivity();
                     }
+                    // The approval prompt owns the screen until the tool result arrives.
+                    if (event.type === 'approval_request')
+                        stopActivity();
                     if (event.type === 'gateway_status')
                         process.stdout.write(renderGatewayFallbackUpdate(event, process.stdout.columns || 80));
                     if (event.type === 'usage') {
@@ -1632,11 +1712,6 @@ export async function handleChatSession(args, version, signal) {
                         }
                     }
                     if (event.type === 'assistant_delta') {
-                        if (!firstAssistantDeltaAt && event.delta.trim().length > 0) {
-                            firstAssistantDeltaAt = Date.now();
-                            if (thinkingTimer)
-                                clearInterval(thinkingTimer);
-                        }
                         streamedAnswer += event.delta;
                         if (Date.now() - lastSessionCheckpointAt >= 1_000)
                             checkpointInterruptedTurn();
@@ -1661,28 +1736,24 @@ export async function handleChatSession(args, version, signal) {
                         checkpoints.recordPostWrite(canonicalWorkspace, paths);
                 },
             });
-            let result;
-            try {
-                checkpointInterruptedTurn();
-                result = await runAgent();
-            }
-            catch (error) {
-                if (!activeConnection || !isAuthenticationFailure(error))
-                    throw error;
-                if (thinkingTimer)
-                    clearInterval(thinkingTimer);
-                const cloudOAuth = isModeradoCloudOAuthConnection(activeConnection);
-                const cloudWithoutKey = activeConnection.id === 'moderado-cloud' && !activeConnection.apiKey;
-                process.stdout.write(cloudWithoutKey
+            /** Prompt for a replacement credential once, persist it, and activate it. Falsy when the user cancels. */
+            const recoverAuthenticationFailure = async () => {
+                if (!activeConnection)
+                    return undefined;
+                stopActivity();
+                const connection = activeConnection;
+                const moderadoOAuth = isModeradoOAuthConnection(connection);
+                const moderadoWithoutKey = connection.id === 'moderado' && !connection.apiKey;
+                process.stdout.write(moderadoWithoutKey
                     ? '\nThis free Gateway route requires a Moderado website API key. Sign in or enter a key to retry once.\n'
-                    : cloudOAuth
-                        ? '\nModerado Cloud rejected this browser login. Sign in again to retry once.\n'
-                        : `\nThe saved ${activeConnection.displayName} API key was rejected. Enter a replacement key to retry once.\n`);
-                const replacement = cloudOAuth || cloudWithoutKey
-                    ? await loginModeradoCloudInteractive({ signal, gatewayUrl: activeConnection.baseUrl })
-                    : await replaceProviderKeyInteractive(activeConnection, { signal });
+                    : moderadoOAuth
+                        ? '\nModerado rejected this browser login. Sign in again to retry once.\n'
+                        : `\nThe saved ${connection.displayName} API key was rejected. Enter a replacement key to retry once.\n`);
+                const replacement = moderadoOAuth || moderadoWithoutKey
+                    ? await loginModeradoInteractive({ signal, gatewayUrl: connection.baseUrl })
+                    : await replaceProviderKeyInteractive(connection, { signal });
                 if (!replacement)
-                    throw error;
+                    return undefined;
                 recordTurnUsage();
                 turnUsage = undefined;
                 usageRecorded = false;
@@ -1690,8 +1761,37 @@ export async function handleChatSession(args, version, signal) {
                 saveConnection(secured);
                 config = loadConfig();
                 activateConnection(secured);
+                startActivity();
+                return secured;
+            };
+            let result;
+            try {
+                checkpointInterruptedTurn();
                 result = await runAgent();
+                // The agent loop reports provider failures as error events and resolves
+                // with a failed result instead of throwing, so key re-entry must be
+                // offered here too. Retry once; a second failure falls through to the
+                // formatted error answer.
+                if (turnFailedAuthentication(result.status, lastErrorEvent) && activeConnection && await recoverAuthenticationFailure()) {
+                    lastErrorEvent = undefined;
+                    result = await runAgent();
+                }
             }
+            catch (error) {
+                if (!activeConnection || !isAuthenticationFailure(error))
+                    throw error;
+                if (!(await recoverAuthenticationFailure()))
+                    throw error;
+                result = await runAgent();
+            }
+            // The turn is over: replace the spinner with the settled state while
+            // usage accounting and catalog refresh finish.
+            turnActive = false;
+            stopActivity();
+            process.stdout.write(renderChatThoughtTimeUpdate((Date.now() - startedAt) / 1000, undefined, process.stdout.columns, {
+                glyph: result.status === 'completed' ? '✔' : '✖',
+                label: result.status === 'completed' ? 'Done' : result.status === 'cancelled' ? 'Stopped' : 'Failed',
+            }));
             if (turnUsage) {
                 let pricing;
                 const modelIds = new Set([...usedModels, result.selectedModel.id]);
@@ -1763,14 +1863,16 @@ export async function handleChatSession(args, version, signal) {
             lastQuestion = trimmed;
             lastThoughtTime = Math.max(0.001, (Date.now() - startedAt) / 1000);
             lastOutputTokenRate = outputTokenRate;
-            if (thinkingTimer)
-                clearInterval(thinkingTimer);
+            turnActive = false;
+            stopActivity();
             removeGenerationListener?.();
             redrawChatFrame();
         }
         catch (err) {
-            if (thinkingTimer)
+            if (thinkingTimer) {
                 clearInterval(thinkingTimer);
+                thinkingTimer = undefined;
+            }
             removeGenerationListener?.();
             recordTurnUsage();
             if (turnUsage)
@@ -1796,7 +1898,7 @@ export async function handleChatSession(args, version, signal) {
             lastOutputTokenRate = undefined;
             process.stdout.write('\x1b[H\x1b[J');
             process.stdout.write(renderFullWelcomeScreen({
-                model: currentModel ?? 'No model connected — use /connect',
+                provider: getProviderStatusName(activeConnection), model: currentModel ?? 'No model connected — use /connect',
                 tokens: Math.round(sessionTokens),
                 cost: costLabel(),
                 usageAvailable: activeSession.usage.available, usageEstimated: activeSession.usage.estimated,