neoctl 0.1.17 → 0.1.19

package/dist/repl/index.js

@@ -1,6 +1,5 @@
 #!/usr/bin/env node
 import fs from "node:fs/promises";
-import { existsSync, readFileSync } from "node:fs";
 import path from "node:path";
 import { stdin, stdout } from "node:process";
 import React, { useCallback, useEffect, useRef, useState } from "react";
@@ -8,29 +7,25 @@ import { Box, Static, Text, render, useApp, useInput } from "ink";
 import stripAnsi from "strip-ansi";
 import wrapAnsi from "wrap-ansi";
 import { QueryEngine } from "../core/query-engine.js";
-import { getUserDotEnvPath, loadDefaultDotEnvFiles } from "../model/env.js";
+import { loadDefaultDotEnvFiles } from "../model/env.js";
 import { readModelProviderConfig } from "../model/config.js";
-import { findModelMetadata, loadModelCatalog, reasoningEffortsForModel, resolveContextWindowTokens } from "../model/context-window.js";
+import { loadModelCatalog, reasoningEffortsForModel, resolveContextWindowTokens } from "../model/context-window.js";
 import { CommunicationLogger, LoggingModelGateway } from "../model/communication-logger.js";
-import { createModelGatewayFromConfig, createModelGatewayFromProcessEnv } from "../model/provider-factory.js";
+import { createModelGatewayFromProcessEnv } from "../model/provider-factory.js";
 import { ToolRegistry } from "../tools/registry.js";
+import { echoTool } from "../tools/builtins/echo-tool.js";
 import { editTool, writeTool } from "../tools/builtins/edit-tool.js";
 import { createExecTool } from "../tools/builtins/exec-tool.js";
 import { listDirectoryTool, readFileTool } from "../tools/builtins/filesystem-tools.js";
 import { grepTool } from "../tools/builtins/grep-tool.js";
 import { searchTool } from "../tools/builtins/search-tool.js";
 import { planTool } from "../tools/builtins/plan-tool.js";
-import { createOpenAIImageGenerationTool } from "../tools/builtins/image-generation-tool.js";
 import { createAgentTool, resumeAgentTask } from "../agents/agent-tool.js";
 import { createTaskTools } from "../tasks/task-tools.js";
 import { TaskStore } from "../tasks/task-store.js";
-import { cliHelpText, isModelReasoningArgument, isValidReplCommandLine, parseCliReplCommandArgs, parseReplCommand, helpText, replCommandDefinitions } from "./commands.js";
+import { isModelReasoningArgument, isValidReplCommandLine, parseReplCommand, helpText, replCommandDefinitions } from "./commands.js";
 import { estimateMarkdownLineCount, markdownRenderKey, MarkdownText } from "./markdown-renderer.js";
-import { writeSessionMarkdownExport } from "../session/session-export.js";
 import { readClipboard } from "./clipboard.js";
-import { formatTipLine, initialTipIndex, tipAt } from "../tips.js";
-import { openDirectory } from "../open-directory.js";
-import { runWebServer } from "../web/index.js";
 const e = React.createElement;
 class SessionUsageTracker {
     totals = emptyUsageTotals();
@@ -88,45 +83,14 @@ function sumUsageTokens(left, right) {
         return undefined;
     return (left ?? 0) + (right ?? 0);
 }
-async function main(argv = process.argv.slice(2)) {
-    const webArgs = parseWebCliArgs(argv);
-    if (webArgs) {
-        await runWebServer(webArgs);
-        return;
-    }
-    const initialCommand = parseCliReplCommandArgs(argv);
-    if (argv.length > 0 && !initialCommand) {
-        console.error(`Unknown or incomplete command: ${argv.join(" ")}\n\n${cliHelpText(binaryName())}`);
-        process.exitCode = 1;
-        return;
-    }
-    if (initialCommand?.definition.name === "/help") {
-        console.log(cliHelpText(binaryName()));
-        return;
-    }
+async function main() {
     const runtime = await createRuntime();
-    const instance = render(e(InkRepl, { runtime, initialCommandLine: initialCommand?.line }), {
+    const instance = render(e(InkRepl, { runtime }), {
         exitOnCtrlC: false,
     });
     await instance.waitUntilExit();
     console.log("bye.");
 }
-function parseWebCliArgs(argv) {
-    if (argv.length === 0)
-        return undefined;
-    const first = argv[0];
-    if (first !== "-web" && first !== "--web")
-        return undefined;
-    return argv.slice(1);
-}
-function binaryName() {
-    const arg = process.argv[1];
-    if (!arg)
-        return "neo";
-    const parsed = path.parse(arg);
-    const name = parsed.name || "neo";
-    return name === "index" ? "neo" : name;
-}
 function createTaskNotificationSource(taskStore) {
     return {
         collectUnnotifiedCompletions() {
@@ -150,6 +114,7 @@ async function createRuntime() {
     const modelGateway = new LoggingModelGateway(createModelGatewayFromProcessEnv(process.env), communicationLogger);
     const taskStore = new TaskStore();
     const tools = new ToolRegistry();
+    tools.register(echoTool);
     tools.register(editTool);
     tools.register(writeTool);
     tools.register(createExecTool({ taskStore }));
@@ -157,8 +122,6 @@ async function createRuntime() {
     tools.register(readFileTool);
     tools.register(grepTool);
     tools.register(searchTool);
-    if (modelConfig?.provider === "openai")
-        tools.register(createOpenAIImageGenerationTool());
     tools.register(planTool);
     const agentRuntime = { modelGateway, tools, taskStore };
     tools.register(createAgentTool(agentRuntime));
@@ -182,7 +145,6 @@ async function createRuntime() {
         modelGateway,
         tools,
         taskNotificationSource,
-        commands: replCommandDefinitions.map((command) => command.usage),
         session: {
             enabled: process.env.AGENT_SESSION_TRANSCRIPT !== "0",
             sessionId: process.env.AGENT_SESSION_ID,
@@ -194,59 +156,65 @@ async function createRuntime() {
         },
     });
     await engine.initialize();
-    const initialMetrics = await engine.contextMetrics();
     return {
         engine,
         communicationLogger,
-        modelGateway,
-        agentRuntime,
         usage: new SessionUsageTracker(),
         taskStore,
-        tools,
-        initialMetrics,
+        initialMetrics: initialContextMetrics(modelConfig?.model, engine.snapshot().messages, tools.names().length),
         defaultReasoning: modelConfig?.defaultReasoning,
-        envPath: process.env.NEO_ENV_FILE?.trim() ? path.resolve(process.env.NEO_ENV_FILE.trim()) : envLoad.userDotEnvPath,
         envNotice: envLoad.createdUserDotEnv ? formatCreatedEnvNotice(envLoad.userDotEnvPath) : undefined,
     };
 }
-function syncImageGenerationTool(runtime, provider) {
-    runtime.tools.unregister("image2");
-    if (provider === "openai")
-        runtime.tools.register(createOpenAIImageGenerationTool());
-}
 function formatCreatedEnvNotice(path) {
-    return `Created default config file: ${path}\nSet MODEL_PROVIDER and the matching provider section (for example OPENAI_API_KEY or KIMI_API_KEY), then restart neo.`;
+    return `Created default config file: ${path}\nFill MODEL_API_KEY in that file, then restart neo.`;
 }
 function parseResumeFlag(value) {
     if (!value)
         return false;
     return ["1", "true", "yes", "latest"].includes(value.toLowerCase());
 }
-function activeBackgroundTasks(runtime) {
-    return runtime.taskStore.list().filter((task) => !runtime.taskStore.isTerminal(task));
-}
-function runningSessionIds(runs) {
-    return [...runs.keys()];
+function initialContextMetrics(model, messageCount, toolCount) {
+    const window = resolveContextWindowTokens(model);
+    return {
+        model,
+        estimatedInputTokens: 0,
+        estimatedChars: 0,
+        messageCount,
+        toolCount,
+        contextWindowTokens: window.tokens,
+        contextWindowSource: window.source,
+        contextUsageRatio: window.tokens ? 0 : undefined,
+        modelMetadata: window.model
+            ? {
+                id: window.model.id,
+                provider: window.model.provider,
+                maxOutputTokens: window.model.maxOutputTokens,
+                knowledgeCutoff: window.model.knowledgeCutoff,
+                reasoning: window.model.reasoning,
+                imageInput: window.model.imageInput,
+                source: window.model.source,
+            }
+            : undefined,
+    };
 }
-function initialStatus(runtime, metrics = runtime.initialMetrics) {
+function initialStatus(runtime) {
     return {
         phase: "ready",
         metrics: {
-            ...metrics,
+            ...runtime.initialMetrics,
             messageCount: runtime.engine.snapshot().messages,
         },
         streamedOutputTokens: 0,
         activityTick: 0,
     };
 }
-async function resetStatus(runtime) {
-    return initialStatus(runtime, await runtime.engine.contextMetrics());
-}
-function setTerminalTitle(title, prefix = TERMINAL_TITLE_WORKING_PREFIX) {
+function setTerminalTitle(title, dotFilled = true) {
     if (!stdout.isTTY)
         return;
     const safeTitle = title.replace(/[\u0000-\u001f\u007f]+/g, " ").replace(/\s+/g, " ").trim();
-    const decoratedTitle = `${prefix}${safeTitle || "neo"}`.slice(0, 120);
+    const dotPrefix = dotFilled ? TERMINAL_TITLE_DOT_FILLED_PREFIX : TERMINAL_TITLE_DOT_BLANK_PREFIX;
+    const decoratedTitle = `${dotPrefix}${safeTitle || "neo"}`.slice(0, 120);
     stdout.write(`\u001b]0;${decoratedTitle}\u0007`);
 }
 function playReadySound() {
@@ -369,7 +337,7 @@ function pushTextBlock(blocks, text) {
 function escapeRegExp(value) {
     return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
-function InkRepl({ runtime, initialCommandLine }) {
+function InkRepl({ runtime }) {
     const app = useApp();
     const lineId = useRef(0);
     const assistantLineId = useRef(undefined);
@@ -386,19 +354,13 @@ function InkRepl({ runtime, initialCommandLine }) {
     const queuedAttachmentsRef = useRef(undefined);
     const [cursor, setCursor] = useState(0);
     const [promptPlaceholder, setPromptPlaceholder] = useState(undefined);
-    const [tipIndex, setTipIndex] = useState(() => initialTipIndex(runtime.engine.snapshot().session?.sessionId ?? process.cwd()));
     const [busy, setBusy] = useState(false);
     const [status, setStatus] = useState(() => initialStatus(runtime));
     const sessionTitleRef = useRef(sessionTerminalTitle(runtime.engine.snapshot().session));
-    const [backgroundTasks, setBackgroundTasks] = useState(() => activeBackgroundTasks(runtime));
-    const [backgroundSessionRuns, setBackgroundSessionRuns] = useState([]);
-    const backgroundSessionRunsRef = useRef(new Map());
-    const suppressReattachedStreamingRef = useRef(new Set());
-    const activePromptRunRef = useRef(undefined);
+    const [backgroundTaskCount, setBackgroundTaskCount] = useState(() => runtime.taskStore.activeCount());
     const [animationTick, setAnimationTick] = useState(0);
-    const [terminalTitlePrefix, setTerminalTitlePrefix] = useState(TERMINAL_TITLE_READY_PREFIX);
-    const backgroundTaskCount = backgroundTasks.length;
-    const terminalTitleWorking = isActivePhase(status.phase) || backgroundTaskCount > 0 || backgroundSessionRuns.length > 0;
+    const [terminalTitleDotVisible, setTerminalTitleDotVisible] = useState(true);
+    const terminalTitleWorking = isActivePhase(status.phase) || backgroundTaskCount > 0;
     const [sessionsBrowser, setSessionsBrowser] = useState(undefined);
     const inputRef = useRef(input);
     const queuedInputRef = useRef(undefined);
@@ -415,8 +377,6 @@ function InkRepl({ runtime, initialCommandLine }) {
     const [pasteStatus, setPasteStatus] = useState(undefined);
     const pasteStatusTimerRef = useRef(undefined);
     const [slashCompletionIndex, setSlashCompletionIndex] = useState(0);
-    const [loginForm, setLoginForm] = useState(undefined);
-    const loginFormRef = useRef(undefined);
     useEffect(() => {
         enableTerminalFocusReporting();
         enableTerminalMouseReporting();
@@ -426,35 +386,36 @@ function InkRepl({ runtime, initialCommandLine }) {
         };
     }, []);
     useEffect(() => {
-        if (!busy && backgroundTaskCount === 0 && backgroundSessionRuns.length === 0)
+        if (!busy && backgroundTaskCount === 0)
             return undefined;
         const interval = setInterval(() => setAnimationTick((current) => current + 1), REPL_ANIMATION_INTERVAL_MS);
         return () => clearInterval(interval);
-    }, [busy, backgroundTaskCount, backgroundSessionRuns.length]);
+    }, [busy, backgroundTaskCount]);
     useEffect(() => {
-        const updateBackgroundTasks = () => setBackgroundTasks(activeBackgroundTasks(runtime));
-        updateBackgroundTasks();
-        return runtime.taskStore.subscribe(updateBackgroundTasks);
+        const updateBackgroundTaskCount = () => setBackgroundTaskCount(runtime.taskStore.activeCount());
+        updateBackgroundTaskCount();
+        return runtime.taskStore.subscribe(updateBackgroundTaskCount);
     }, [runtime]);
     useEffect(() => {
         if (!terminalTitleWorking) {
-            setTerminalTitlePrefix(TERMINAL_TITLE_READY_PREFIX);
+            setTerminalTitleDotVisible(true);
             return undefined;
         }
-        setTerminalTitlePrefix(TERMINAL_TITLE_WORKING_PREFIX);
-        return undefined;
+        setTerminalTitleDotVisible(true);
+        const interval = setInterval(() => setTerminalTitleDotVisible((visible) => !visible), TERMINAL_TITLE_BLINK_INTERVAL_MS);
+        return () => clearInterval(interval);
     }, [terminalTitleWorking]);
     useEffect(() => {
         const updateTitle = (snapshot) => {
             sessionTitleRef.current = sessionTerminalTitle(snapshot);
-            setTerminalTitle(sessionTitleRef.current, terminalTitlePrefix);
+            setTerminalTitle(sessionTitleRef.current, terminalTitleDotVisible);
         };
         updateTitle(runtime.engine.snapshot().session);
         return runtime.engine.onSessionTitleChange(updateTitle);
-    }, [runtime, terminalTitlePrefix]);
+    }, [runtime, terminalTitleDotVisible]);
     useEffect(() => {
-        setTerminalTitle(sessionTitleRef.current, terminalTitlePrefix);
-    }, [terminalTitlePrefix]);
+        setTerminalTitle(sessionTitleRef.current, terminalTitleDotVisible);
+    }, [terminalTitleDotVisible]);
     const setPromptState = (text, nextCursor, options) => {
         const safeCursor = Math.max(0, Math.min(nextCursor, text.length));
         inputRef.current = text;
@@ -481,10 +442,6 @@ function InkRepl({ runtime, initialCommandLine }) {
         setSlashCompletionIndex(safeIndex);
     };
     const resetSlashCompletionSelection = () => setSlashCompletionSelection(0);
-    const setLoginFormState = (next) => {
-        loginFormRef.current = next;
-        setLoginForm(next);
-    };
     const syncAttachmentsForText = (text) => {
         const next = attachmentsRef.current.filter((attachment) => text.includes(attachment.label));
         if (next.length === attachmentsRef.current.length)
@@ -511,11 +468,9 @@ function InkRepl({ runtime, initialCommandLine }) {
         }, PASTE_STATUS_DISPLAY_MS);
         pasteStatusTimerRef.current = timer;
     };
-    const advanceTip = () => setTipIndex((current) => current + 1);
     const insertAtCursor = (value) => {
         const currentText = inputRef.current;
         const currentCursor = cursorRef.current;
-        advanceTip();
         setPromptState(`${currentText.slice(0, currentCursor)}${value}${currentText.slice(currentCursor)}`, currentCursor + value.length);
     };
     const insertAttachmentLabel = (attachment) => {
@@ -531,10 +486,6 @@ function InkRepl({ runtime, initialCommandLine }) {
                 return;
             }
             if (payload.type === "image") {
-                if (!runtime.engine.canAcceptImageInput()) {
-                    setPasteStatusMessage("current model does not support image input; image was not added");
-                    return;
-                }
                 const id = ++imageAttachmentCounterRef.current;
                 insertAttachmentLabel({ id, kind: "image", label: `[img#${id}]`, image: payload.image });
                 setPasteStatusMessage(undefined);
@@ -587,73 +538,17 @@ function InkRepl({ runtime, initialCommandLine }) {
     const replaceLine = (id, patch) => {
         setLines((current) => current.map((line) => line.id === id ? { ...line, ...patch, renderedKey: undefined } : line));
     };
-    const syncBackgroundSessionRuns = () => {
-        setBackgroundSessionRuns([...backgroundSessionRunsRef.current.values()]);
-    };
-    const detachRunningForeground = (reason) => {
-        if (!busyRef.current)
-            return false;
-        const snapshot = runtime.engine.snapshot().session;
-        const sessionId = snapshot?.sessionId ?? `session-${Date.now().toString(36)}`;
-        const run = activePromptRunRef.current;
-        if (run && !backgroundSessionRunsRef.current.has(sessionId)) {
-            const backgroundRun = {
-                sessionId,
-                title: snapshot?.title,
-                reason,
-                startedAt: Date.now(),
-                engine: runtime.engine,
-                abortController: activeAbortController.current ?? new AbortController(),
-                promise: run,
-            };
-            backgroundSessionRunsRef.current.set(sessionId, backgroundRun);
-            syncBackgroundSessionRuns();
-            setSessionsBrowser((current) => current ? { ...current, runningSessionIds: runningSessionIds(backgroundSessionRunsRef.current) } : current);
-            run.finally(() => {
-                backgroundSessionRunsRef.current.delete(sessionId);
-                suppressReattachedStreamingRef.current.delete(backgroundRun.engine);
-                syncBackgroundSessionRuns();
-                setSessionsBrowser((current) => current ? { ...current, runningSessionIds: runningSessionIds(backgroundSessionRunsRef.current) } : current);
-            }).catch(() => undefined);
-        }
-        activeAbortController.current = undefined;
-        interruptArmed.current = false;
-        setQueuedPromptState(undefined);
-        setBusyState(false);
-        setStatus((current) => ({ ...current, phase: "ready", detail: undefined }));
-        append(systemLine(`Detached running ${sessionId} to background for ${reason}.`));
-        return true;
-    };
-    const resetForegroundView = (metrics) => {
+    const resumeSnapshot = (snapshot) => {
         runtime.usage.reset();
-        setStatus(initialStatus(runtime, metrics));
+        setStatus(initialStatus(runtime));
         resetLinesToHistory(runtime, setLines, lineId);
         assistantLineId.current = undefined;
         thinkingLineId.current = undefined;
         finalizedThinkingLineId.current = undefined;
         toolLineIds.current.clear();
         clearPendingToolResultTimers();
-    };
-    const resumeSnapshot = (snapshot, metrics) => {
-        resetForegroundView(metrics);
         append(systemLine(formatResume(snapshot)));
     };
-    const reattachRunningSession = async (run) => {
-        detachRunningForeground("session switch");
-        backgroundSessionRunsRef.current.delete(run.sessionId);
-        syncBackgroundSessionRuns();
-        setSessionsBrowser((current) => current ? { ...current, runningSessionIds: runningSessionIds(backgroundSessionRunsRef.current) } : current);
-        runtime.engine = run.engine;
-        activeAbortController.current = run.abortController;
-        interruptArmed.current = false;
-        activePromptRunRef.current = run.promise;
-        suppressReattachedStreamingRef.current.add(run.engine);
-        const metrics = await runtime.engine.contextMetrics();
-        resetForegroundView(metrics);
-        setBusyState(true);
-        setStatus((current) => ({ ...current, phase: "running", detail: "working" }));
-        append(systemLine(`reattached running session ${run.sessionId}`));
-    };
     const finalizeLiveLine = (id) => {
         if (id === undefined)
             return;
@@ -798,12 +693,14 @@ function InkRepl({ runtime, initialCommandLine }) {
         const trimmed = text.trim();
         if (!trimmed)
             return;
-        if (submitAttachments.some((attachment) => attachment.kind === "image") && !runtime.engine.canAcceptImageInput()) {
-            append({ kind: "error", text: "Current model does not support image input; image attachments were not added to the conversation." });
-            return;
-        }
         if (busyRef.current) {
-            detachRunningForeground("new prompt");
+            if (queuedInputRef.current !== undefined)
+                return;
+            setQueuedPromptState(text, submitAttachments);
+            setHistorySelection(undefined);
+            setPromptState("", 0);
+            clearAttachments();
+            return;
         }
         history.current = [text, ...history.current.filter((entry) => entry !== text)].slice(0, 100);
         setHistorySelection(undefined);
@@ -901,68 +798,16 @@ function InkRepl({ runtime, initialCommandLine }) {
         if (command.type === "reset") {
             runtime.engine.reset();
             runtime.usage.reset();
-            setStatus(await resetStatus(runtime));
+            setStatus(initialStatus(runtime));
             append(systemLine("transcript reset"));
             return;
         }
         if (command.type === "state") {
-            const contextMetrics = await runtime.engine.contextMetrics();
-            append(systemLine(formatReplData({ ...runtime.engine.snapshot(), contextMetrics, communicationLog: runtime.communicationLogger.snapshot() }, 12000), EXPANDED_SUMMARY_MAX_LINES));
-            return;
-        }
-        if (command.type === "export") {
-            setBusyState(true);
-            setStatus((current) => ({ ...current, phase: "running", detail: "exporting session", activityTick: current.activityTick + 1 }));
-            try {
-                const line = await handleExportCommand(command, runtime);
-                append(line);
-            }
-            catch (error) {
-                append({ kind: "error", text: error instanceof Error ? error.message : String(error) });
-            }
-            finally {
-                setBusyState(false);
-                setStatus((current) => ({ ...current, phase: "ready", detail: undefined, activityTick: current.activityTick + 1 }));
-            }
-            return;
-        }
-        if (command.type === "env") {
-            const envDirectory = path.dirname(runtime.envPath);
-            try {
-                await fs.mkdir(envDirectory, { recursive: true });
-                await openDirectory(envDirectory);
-                append({ kind: "system", title: "System", text: `Opened env directory: ${envDirectory}`, format: "plain", previewStyle: "summary" });
-            }
-            catch (error) {
-                append({ kind: "error", text: `Failed to open env directory ${envDirectory}: ${error instanceof Error ? error.message : String(error)}`, format: "plain" });
-            }
-            return;
-        }
-        if (command.type === "new") {
-            detachRunningForeground("new session");
-            runtime.engine = runtime.engine.forkForSession(undefined, false);
-            await runtime.engine.initialize();
-            const snapshot = runtime.engine.snapshot().session;
-            const metrics = await runtime.engine.contextMetrics();
-            runtime.usage.reset();
-            setStatus(initialStatus(runtime, metrics));
-            resetLinesToHistory(runtime, setLines, lineId);
-            assistantLineId.current = undefined;
-            thinkingLineId.current = undefined;
-            finalizedThinkingLineId.current = undefined;
-            toolLineIds.current.clear();
-            clearPendingToolResultTimers();
-            append(systemLine(snapshot ? `new session ${snapshot.sessionId}` : "new session"));
+            append(systemLine(formatReplData({ ...runtime.engine.snapshot(), communicationLog: runtime.communicationLogger.snapshot() }, 12000), EXPANDED_SUMMARY_MAX_LINES));
             return;
         }
         if (command.type === "sessions") {
-            await handleSessionsCommand(runtime, runningSessionIds(backgroundSessionRunsRef.current), setSessionsBrowser, (line) => append(line));
-            return;
-        }
-        if (command.type === "login") {
-            setSessionsBrowser(undefined);
-            setLoginFormState(createLoginFormState(runtime.envPath));
-            append(systemLine("Opening provider login. Use ↑/↓ to choose, Enter to continue/save, Esc to cancel."));
+            await handleSessionsCommand(runtime, setSessionsBrowser, (line) => append(line));
             return;
         }
         if (command.type === "log") {
@@ -970,23 +815,9 @@ function InkRepl({ runtime, initialCommandLine }) {
             return;
         }
         if (command.type === "model") {
-            setBusyState(true);
-            setStatus((current) => ({ ...current, phase: "running", detail: "saving model settings", activityTick: current.activityTick + 1 }));
-            try {
-                const line = await handleModelCommand(command, runtime);
-                const metrics = await runtime.engine.contextMetrics();
-                setStatus((current) => ({
-                    ...current,
-                    phase: "ready",
-                    detail: undefined,
-                    metrics,
-                    activityTick: current.activityTick + 1,
-                }));
-                append(line);
-            }
-            finally {
-                setBusyState(false);
-            }
+            const line = handleModelCommand(command, runtime);
+            setStatus((current) => ({ ...current, metrics: { ...initialContextMetrics(runtime.engine.getModelSettings().model, runtime.engine.snapshot().messages, runtime.initialMetrics.toolCount), messageCount: runtime.engine.snapshot().messages } }));
+            append(line);
             return;
         }
         if (text.trimStart().startsWith("/")) {
@@ -994,10 +825,6 @@ function InkRepl({ runtime, initialCommandLine }) {
             return;
         }
         const promptPayload = buildPromptPayload(command.text, submitAttachments);
-        if (promptPayload.blocks?.some((block) => block.type === "image") && !runtime.engine.canAcceptImageInput()) {
-            append({ kind: "error", text: "Current model does not support image input; image attachments were not added to the conversation." });
-            return;
-        }
         append({ kind: "user", text });
         const abortController = new AbortController();
         activeAbortController.current = abortController;
@@ -1013,41 +840,20 @@ function InkRepl({ runtime, initialCommandLine }) {
             outputTokenUpdatedAt: undefined,
             retryCooldownUntil: undefined,
         }));
-        const engine = runtime.engine;
-        const run = (async () => {
-            for await (const event of engine.sendUserText(promptPayload.text, { abortSignal: abortController.signal, blocks: promptPayload.blocks, displayText: text })) {
-                if (runtime.engine !== engine)
-                    continue;
-                if (suppressReattachedStreamingRef.current.has(engine)) {
-                    if (event.type === "message" || event.type === "terminal" || event.type === "error" || event.type === "context.metrics" || event.type === "usage") {
-                        if (event.type === "message" || event.type === "terminal" || event.type === "error")
-                            suppressReattachedStreamingRef.current.delete(engine);
-                        handleEvent(event);
-                    }
-                    continue;
-                }
+        try {
+            for await (const event of runtime.engine.sendUserText(promptPayload.text, { abortSignal: abortController.signal, blocks: promptPayload.blocks, displayText: text })) {
                 handleEvent(event);
             }
-        })();
-        activePromptRunRef.current = run;
-        try {
-            await run;
         }
         catch (error) {
-            if (runtime.engine === engine) {
-                finalizeLiveLine(assistantLineId.current);
-                finalizeThinkingLine();
-                finalizeActiveToolLines();
-                assistantLineId.current = undefined;
-                finalizedThinkingLineId.current = undefined;
-                append({ kind: "error", text: error instanceof Error ? error.message : String(error) });
-            }
+            finalizeLiveLine(assistantLineId.current);
+            finalizeThinkingLine();
+            finalizeActiveToolLines();
+            assistantLineId.current = undefined;
+            finalizedThinkingLineId.current = undefined;
+            append({ kind: "error", text: error instanceof Error ? error.message : String(error) });
         }
         finally {
-            if (activePromptRunRef.current === run)
-                activePromptRunRef.current = undefined;
-            if (runtime.engine !== engine)
-                return;
             if (activeAbortController.current === abortController)
                 activeAbortController.current = undefined;
             interruptArmed.current = false;
@@ -1074,7 +880,6 @@ function InkRepl({ runtime, initialCommandLine }) {
         }
     };
     useEffect(() => {
-        setTipIndex(initialTipIndex(runtime.engine.snapshot().session?.sessionId ?? process.cwd()));
         setLines(initialLines(runtime, lineId));
         assistantLineId.current = undefined;
         thinkingLineId.current = undefined;
@@ -1083,26 +888,16 @@ function InkRepl({ runtime, initialCommandLine }) {
         clearPendingToolResultTimers();
         setStatus(initialStatus(runtime));
         setSessionsBrowser(undefined);
-        setLoginFormState(undefined);
         setQueuedPromptState(undefined);
         setPromptState("", 0);
     }, [runtime]);
-    useEffect(() => {
-        if (initialCommandLine === undefined)
-            return;
-        void submitLine(initialCommandLine);
-    }, []);
     const terminalSize = useTerminalSize();
     const width = terminalSize.columns;
     const inputLockedByQueue = busy && queuedInput !== undefined;
     const prompt = promptPrefix(busy);
-    const currentTip = tipAt(tipIndex);
-    const activePlaceholder = input.length === 0 ? promptPlaceholder ?? currentTip.placeholder : undefined;
-    const promptDisplayText = input;
-    const promptDisplayCursor = cursor;
-    const promptLayoutText = activePlaceholder ? ` ${activePlaceholder}` : promptDisplayText;
-    const promptLayoutCursor = activePlaceholder ? 0 : promptDisplayCursor;
-    const slashCompletions = inputLockedByQueue || (input.length === 0 && promptPlaceholder !== undefined) || loginForm ? [] : slashCommandCompletions(input, cursor);
+    const promptDisplayText = input.length === 0 && promptPlaceholder ? promptPlaceholder : input;
+    const promptDisplayCursor = input.length === 0 && promptPlaceholder ? promptPlaceholder.length : cursor;
+    const slashCompletions = inputLockedByQueue || promptPlaceholder ? [] : slashCommandCompletions(input, cursor);
     const visibleSlashCompletionCount = slashCompletions.length;
     const selectedSlashCompletionIndex = visibleSlashCompletionCount === 0
         ? 0
@@ -1110,7 +905,7 @@ function InkRepl({ runtime, initialCommandLine }) {
     if (selectedSlashCompletionIndex !== slashCompletionIndexRef.current) {
         slashCompletionIndexRef.current = selectedSlashCompletionIndex;
     }
-    const promptHeight = promptTextView(promptLayoutText, promptLayoutCursor, width, prompt).length + slashCompletionViewHeight(slashCompletions) + (queuedInput !== undefined ? QUEUED_INPUT_RENDER_ROWS : 0) + (pasteStatus ? 1 : 0);
+    const promptHeight = promptTextView(promptDisplayText, promptDisplayCursor, width, prompt).length + slashCompletionViewHeight(slashCompletions) + (queuedInput !== undefined ? QUEUED_INPUT_RENDER_ROWS : 0) + (pasteStatus ? 1 : 0);
     const firstDynamicLineIndex = lines.findIndex((line) => lineNeedsDynamicRender(line, messageContentWidth(width)));
     const staticLines = firstDynamicLineIndex === -1 ? lines : lines.slice(0, firstDynamicLineIndex);
     const dynamicLines = firstDynamicLineIndex === -1 ? [] : lines.slice(firstDynamicLineIndex);
@@ -1118,10 +913,9 @@ function InkRepl({ runtime, initialCommandLine }) {
         const blockIndex = staticLines.length + i;
         return sum + (blockIndex > 0 ? MESSAGE_BLOCK_SPACING_LINES : 0);
     }, 0);
-    const statusRenderRows = STATUS_BAR_RENDER_ROWS + backgroundTaskStatusRenderRows(backgroundTasks.length);
+    const statusRenderRows = STATUS_BAR_RENDER_ROWS + (backgroundTaskCount > 0 ? BACKGROUND_TASK_STATUS_RENDER_ROWS : 0);
     const sessionsBrowserHeight = sessionsBrowser ? sessionsBrowserViewHeight(sessionsBrowser) : 0;
-    const loginFormHeight = loginForm ? loginFormViewHeight(loginForm) : 0;
-    const liveViewportLines = Math.max(MIN_LIVE_VIEWPORT_LINES, terminalSize.rows - promptHeight - statusRenderRows - sessionsBrowserHeight - loginFormHeight - dynamicMarginOverhead - 1);
+    const liveViewportLines = Math.max(MIN_LIVE_VIEWPORT_LINES, terminalSize.rows - promptHeight - statusRenderRows - sessionsBrowserHeight - dynamicMarginOverhead - 1);
     useInput((value, key) => {
         if (isTerminalFocusInSequence(value)) {
             terminalFocusedRef.current = true;
@@ -1169,10 +963,6 @@ function InkRepl({ runtime, initialCommandLine }) {
                 restoreQueuedPromptToEditor();
             return;
         }
-        if (loginFormRef.current) {
-            handleLoginFormInput(value, key, loginFormRef.current, setLoginFormState, runtime, append, setStatus);
-            return;
-        }
         if (sessionsBrowser) {
             if (key.escape) {
                 setSessionsBrowser(undefined);
@@ -1198,17 +988,10 @@ function InkRepl({ runtime, initialCommandLine }) {
                 const selected = sessionsBrowser.sessions[sessionAbsoluteIndex(sessionsBrowser)];
                 if (selected) {
                     setSessionsBrowser(undefined);
-                    const running = backgroundSessionRunsRef.current.get(selected.sessionId);
-                    if (running) {
-                        void reattachRunningSession(running);
-                    }
-                    else {
-                        detachRunningForeground("session switch");
-                        void handleResumeCommand(selected.sessionId, runtime, (line) => append(line)).then((result) => {
-                            if (result)
-                                resumeSnapshot(result.snapshot, result.metrics);
-                        });
-                    }
+                    void handleResumeCommand(selected.sessionId, runtime, (line) => append(line)).then((resumed) => {
+                        if (resumed)
+                            resumeSnapshot(resumed);
+                    });
                 }
                 return;
             }
@@ -1240,10 +1023,6 @@ function InkRepl({ runtime, initialCommandLine }) {
         if (key.backspace || key.delete) {
             const currentText = inputRef.current;
             const currentCursor = cursorRef.current;
-            if (currentText.length === 0) {
-                setTipIndex((current) => current + 1);
-                return;
-            }
             if (currentCursor > 0) {
                 setPromptState(`${currentText.slice(0, currentCursor - 1)}${currentText.slice(currentCursor)}`, currentCursor - 1);
             }
@@ -1255,10 +1034,6 @@ function InkRepl({ runtime, initialCommandLine }) {
                 setSlashCompletionSelection((slashCompletionIndexRef.current + completionCount - SLASH_COMPLETION_PAGE_SIZE) % completionCount);
                 return;
             }
-            if (inputRef.current.length === 0) {
-                setTipIndex((current) => current - 1);
-                return;
-            }
             setPromptState(inputRef.current, cursorRef.current - 1);
             return;
         }
@@ -1268,32 +1043,18 @@ function InkRepl({ runtime, initialCommandLine }) {
                 setSlashCompletionSelection((slashCompletionIndexRef.current + SLASH_COMPLETION_PAGE_SIZE) % completionCount);
                 return;
             }
-            if (inputRef.current.length === 0) {
-                setTipIndex((current) => current + 1);
-                return;
-            }
             setPromptState(inputRef.current, cursorRef.current + 1);
             return;
         }
         if (key.home) {
-            if (inputRef.current.length === 0)
-                setTipIndex(0);
-            else
-                setPromptState(inputRef.current, 0);
+            setPromptState(inputRef.current, 0);
             return;
         }
         if (key.end) {
-            if (inputRef.current.length === 0)
-                setTipIndex((current) => current + 1);
-            else
-                setPromptState(inputRef.current, inputRef.current.length);
+            setPromptState(inputRef.current, inputRef.current.length);
             return;
         }
         if (key.upArrow) {
-            if (inputRef.current.length === 0 && history.current.length === 0) {
-                setTipIndex((current) => current - 1);
-                return;
-            }
             const completionCount = slashCompletionSelectableCount(inputRef.current, cursorRef.current);
             if (completionCount > 0) {
                 setSlashCompletionSelection((slashCompletionIndexRef.current + completionCount - 1) % completionCount);
@@ -1307,10 +1068,6 @@ function InkRepl({ runtime, initialCommandLine }) {
             return;
         }
         if (key.downArrow) {
-            if (inputRef.current.length === 0 && historyIndexRef.current === undefined) {
-                setTipIndex((current) => current + 1);
-                return;
-            }
             const completionCount = slashCompletionSelectableCount(inputRef.current, cursorRef.current);
             if (completionCount > 0) {
                 setSlashCompletionSelection((slashCompletionIndexRef.current + 1) % completionCount);
@@ -1332,10 +1089,6 @@ function InkRepl({ runtime, initialCommandLine }) {
         }
         if (key.tab) {
             const currentText = inputRef.current;
-            if (currentText.length === 0) {
-                setTipIndex((current) => current + 1);
-                return;
-            }
             const currentCursor = cursorRef.current;
             const completions = slashCommandCompletions(currentText, currentCursor);
             const completion = completions[Math.min(slashCompletionIndexRef.current, completions.length - 1)];
@@ -1347,10 +1100,9 @@ function InkRepl({ runtime, initialCommandLine }) {
         }
         if (value && !key.ctrl && !key.meta) {
             insertAtCursor(value);
-            return;
         }
     });
-    return e(Box, { flexDirection: "column" }, e((Static), { items: staticLines, children: (line, index) => e(MessageBlock, { key: line.id, line, width, blockIndex: index }) }), e(MessageList, { lines: dynamicLines, width, liveMaxLines: liveViewportLines, lineIndexOffset: staticLines.length, onMarkdownRenderComplete: markLineRendered }), sessionsBrowser ? e(SessionsBrowser, { state: sessionsBrowser, width }) : null, loginForm ? e(LoginFormView, { state: loginForm, width }) : null, e(StatusBar, { status, animationTick, width }), backgroundTasks.length > 0 ? e(BackgroundTaskStatusLine, { tasks: backgroundTasks, width }) : null, pasteStatus ? e(PasteStatusLine, { text: pasteStatus, width }) : null, queuedInput !== undefined ? e(QueuedInputLine, { text: queuedInput, width }) : null, e(PromptLine, { text: promptDisplayText, cursor: promptDisplayCursor, busy, locked: inputLockedByQueue, placeholder: input.length === 0 && promptPlaceholder !== undefined, ghostText: activePlaceholder, width, prompt, slashCompletions, selectedSlashCompletionIndex, attachments }));
+    return e(Box, { flexDirection: "column" }, e((Static), { items: staticLines, children: (line, index) => e(MessageBlock, { key: line.id, line, width, blockIndex: index }) }), e(MessageList, { lines: dynamicLines, width, liveMaxLines: liveViewportLines, lineIndexOffset: staticLines.length, onMarkdownRenderComplete: markLineRendered }), sessionsBrowser ? e(SessionsBrowser, { state: sessionsBrowser, width }) : null, e(StatusBar, { status, animationTick, width }), backgroundTaskCount > 0 ? e(BackgroundTaskStatusLine, { count: backgroundTaskCount, width }) : null, pasteStatus ? e(PasteStatusLine, { text: pasteStatus, width }) : null, queuedInput !== undefined ? e(QueuedInputLine, { text: queuedInput, width }) : null, e(PromptLine, { text: promptDisplayText, cursor: promptDisplayCursor, busy, locked: inputLockedByQueue, placeholder: input.length === 0 && promptPlaceholder !== undefined, width, prompt, slashCompletions, selectedSlashCompletionIndex, attachments }));
 }
 const MessageList = React.memo(function MessageList({ lines, width, liveMaxLines, lineIndexOffset = 0, onMarkdownRenderComplete }) {
     const contentWidth = messageContentWidth(width);
@@ -1376,17 +1128,9 @@ function MessageLine({ line, width, contentWidth = messageContentWidth(width), t
         const display = displayWindowForLine(line, summaryWidth, line.live ? liveMaxLines : undefined);
         return e(Box, { flexDirection: "row" }, useRoleMarker ? e(Text, { color: markerColorForKind(line.kind) }, messageRoleMarker(line.kind)) : null, e(Box, { flexDirection: "column", width: summaryWidth }, ...renderDisplayText(line, summaryWidth, display.maxLines, display.skipTop)));
     }
-    const useRoleMarker = !titleProvidesToolMarker(line);
-    const lineWidth = useRoleMarker ? contentWidth : toolWidth;
-    const clipPendingMarkdown = !line.live && onMarkdownRenderComplete !== undefined && lineNeedsDynamicRender(line, lineWidth);
-    const display = displayWindowForLine(line, lineWidth, line.live || clipPendingMarkdown ? liveMaxLines : undefined);
-    const contentNodes = [];
-    if (line.title)
-        contentNodes.push(renderBlockTitle(line));
-    if (line.bodyTitle)
-        contentNodes.push(e(Text, { key: `body-title-${line.id}`, bold: true }, line.bodyTitle));
-    contentNodes.push(...renderDisplayText(line, lineWidth, display.maxLines, display.skipTop, onMarkdownRenderComplete));
-    return e(Box, { flexDirection: "row" }, useRoleMarker ? e(Text, { color: markerColorForKind(line.kind) }, messageRoleMarker(line.kind)) : null, e(Box, { flexDirection: "column", width: lineWidth }, ...contentNodes));
+    const clipPendingMarkdown = !line.live && onMarkdownRenderComplete !== undefined && lineNeedsDynamicRender(line, contentWidth);
+    const display = displayWindowForLine(line, contentWidth, line.live || clipPendingMarkdown ? liveMaxLines : undefined);
+    return e(Box, { flexDirection: "row" }, e(Text, { color: markerColorForKind(line.kind) }, messageRoleMarker(line.kind)), e(Box, { flexDirection: "column", width: contentWidth }, ...renderDisplayText(line, contentWidth, display.maxLines, display.skipTop, onMarkdownRenderComplete)));
 }
 function displayWindowForLine(line, width, maxLines) {
     if (maxLines === undefined)
@@ -1456,21 +1200,12 @@ function summaryTitle(line) {
 function summaryUsesRoleMarker(line) {
     return line.previewStyle === "summary" && (line.kind === "system" || line.kind === "meta");
 }
-function titleProvidesToolMarker(line) {
-    return line.kind === "tool" && !!line.title && (line.title.startsWith("◇ ") || line.title.startsWith("◆ "));
-}
 function titleStatusMarker(status) {
     return status === "success" ? "✓" : "✗";
 }
 function titleStatusColor(status) {
     return status === "success" ? "green" : "red";
 }
-function renderBlockTitle(line) {
-    const title = line.title ?? titleForKind(line.kind);
-    if (!line.titleStatus)
-        return e(Text, { key: `title-${line.id}`, color: colorForKind(line.kind), bold: true }, title);
-    return e(Text, { key: `title-${line.id}`, color: colorForKind(line.kind), bold: true }, `${title} `, e(Text, { color: titleStatusColor(line.titleStatus), bold: true }, titleStatusMarker(line.titleStatus)));
-}
 function renderSummaryBlock(line, width, maxLines, skipTop = 0) {
     const allPreviewLines = renderSummaryLines(line, width);
     const preview = clipStrings(allPreviewLines, maxLines, skipTop);
@@ -1702,27 +1437,10 @@ function StatusBar({ status, animationTick, width: terminalWidth }) {
     const segments = fitStatusSegments(renderCompactStatusSegments(status, animationTick, width, inputTokens, outputTokens, displayPhase), width);
     return e(Box, { marginTop: 1, width, height: 1, overflow: "hidden" }, ...segments.map((segment, index) => e(Text, { key: index, color: segment.color ?? "gray", bold: segment.bold ?? false }, segment.text)));
 }
-function backgroundTaskStatusRenderRows(taskCount) {
-    if (taskCount <= 0)
-        return 0;
-    return 1 + Math.min(taskCount, 2);
-}
-function BackgroundTaskStatusLine({ tasks, width: terminalWidth }) {
+function BackgroundTaskStatusLine({ count, width: terminalWidth }) {
     const width = statusBarWidth(terminalWidth);
-    const summary = `◇ background tools: ${tasks.length} task${tasks.length === 1 ? "" : "s"}`;
-    const detailTasks = tasks.slice(0, 2);
-    return e(Box, { flexDirection: "column", width, overflow: "hidden" }, e(Text, { color: "yellow" }, fitToWidth(summary, width)), ...detailTasks.map((task) => e(Text, { key: task.taskId, color: "yellow" }, fitToWidth(`  ${task.type}:${truncateMiddle(task.description || task.agentId || task.taskId, Math.max(12, width - 30))} · ${task.status} · ${formatElapsed(Date.now() - new Date(task.createdAt).getTime())}`, width))));
-}
-function formatElapsed(ms) {
-    const seconds = Math.max(0, Math.floor(ms / 1000));
-    if (seconds < 60)
-        return `${seconds}s`;
-    const minutes = Math.floor(seconds / 60);
-    const remainder = seconds % 60;
-    if (minutes < 60)
-        return `${minutes}m${remainder.toString().padStart(2, "0")}s`;
-    const hours = Math.floor(minutes / 60);
-    return `${hours}h${(minutes % 60).toString().padStart(2, "0")}m`;
+    const text = count <= 3 ? "◇".repeat(Math.max(0, count)) : `◇×${count}`;
+    return e(Box, { width, height: 1, overflow: "hidden" }, e(Text, { color: "yellow" }, fitToWidth(text, width)));
 }
 function renderCompactStatusSegments(status, animationTick, width, inputTokens, outputTokens, displayPhase = status.phase) {
     const phase = displayPhase;
@@ -1733,7 +1451,7 @@ function renderCompactStatusSegments(status, animationTick, width, inputTokens,
     const context = renderContextParts(status.metrics);
     const fixedText = [
         phaseText,
-        context.percent,
+        `ctx ${context.used} / ${context.limit} (${context.percent})`,
         `↑ ${inputValue}`,
         `↓ ${outputValue}`,
     ].join(STATUS_SEPARATOR);
@@ -1750,7 +1468,9 @@ function renderCompactStatusSegments(status, animationTick, width, inputTokens,
         statusDividerSegment(),
         { text: model },
         statusDividerSegment(),
-        { text: context.percent, color: contextColor(status.metrics) },
+        statusLabelSegment("ctx"),
+        { text: ` ${context.used} / ${context.limit}` },
+        { text: ` (${context.percent})`, color: contextColor(status.metrics) },
         statusDividerSegment(),
         statusLabelSegment("↑", tokenInputColor),
         { text: ` ${inputValue}` },
@@ -1896,16 +1616,10 @@ function selectedSlashCommandCompletion(text, cursor, selectedIndex) {
         return undefined;
     return completions[Math.max(0, Math.min(selectedIndex, completions.length - 1))];
 }
-function PromptLine({ text, cursor, busy, locked, placeholder = false, ghostText, width, prompt, slashCompletions, selectedSlashCompletionIndex, attachments }) {
-    const displayText = text.length === 0 && ghostText ? ` ${ghostText}` : text;
-    const displayCursor = text.length === 0 && ghostText ? 0 : cursor;
-    const visualLines = promptTextView(displayText, displayCursor, width, prompt);
+function PromptLine({ text, cursor, busy, locked, placeholder = false, width, prompt, slashCompletions, selectedSlashCompletionIndex, attachments }) {
+    const visualLines = promptTextView(text, cursor, width, prompt);
     const inputColor = placeholder ? "gray" : (!locked && isValidReplCommandLine(text) ? "cyan" : undefined);
-    return e(Box, { flexDirection: "column" }, ...visualLines.map((line, index) => {
-        const isGhostLine = text.length === 0 && ghostText !== undefined;
-        const afterColor = isGhostLine ? "gray" : inputColor;
-        return e(Box, { key: `prompt-${index}`, height: 1, overflow: "hidden" }, e(Text, { color: locked ? "gray" : "cyan" }, index === 0 ? prompt : " ".repeat(prompt.length)), ...renderPromptPart(line.before, inputColor, attachments, `prompt-${index}-before`), e(Text, { key: `prompt-${index}-cursor`, inverse: true, color: inputColor }, line.selected), ...renderPromptPart(line.after, afterColor, attachments, `prompt-${index}-after`));
-    }), ...SlashCompletionLines({ completions: slashCompletions, width, prompt, selectedIndex: selectedSlashCompletionIndex }));
+    return e(Box, { flexDirection: "column" }, ...visualLines.map((line, index) => e(Box, { key: `prompt-${index}`, height: 1, overflow: "hidden" }, e(Text, { color: locked ? "gray" : "cyan" }, index === 0 ? prompt : " ".repeat(prompt.length)), ...renderPromptPart(line.before, inputColor, attachments, `prompt-${index}-before`), e(Text, { key: `prompt-${index}-cursor`, inverse: true, color: inputColor }, line.selected), ...renderPromptPart(line.after, inputColor, attachments, `prompt-${index}-after`))), ...SlashCompletionLines({ completions: slashCompletions, width, prompt, selectedIndex: selectedSlashCompletionIndex }));
 }
 function PasteStatusLine({ text, width: terminalWidth }) {
     const width = statusBarWidth(terminalWidth);
@@ -1964,41 +1678,17 @@ function SlashCompletionLines({ completions, width, prompt, selectedIndex }) {
         e(Text, { key: "slash-completion-footer", color: "gray" }, fitToWidth(footer, contentWidth)),
     ].map((line, index) => e(Box, { key: `slash-completion-line-${index}`, height: 1, overflow: "hidden" }, e(Text, { color: "gray" }, " ".repeat(prompt.length)), line));
 }
-async function handleModelCommand(command, runtime) {
+function handleModelCommand(command, runtime) {
     const current = runtime.engine.getModelSettings();
     const nextModel = command.model ?? current.model;
     const validationError = validateModelReasoningArgument(nextModel, command.reasoning);
     if (validationError)
         return { kind: "error", text: validationError };
     const reasoningUpdate = resolveModelReasoningUpdate(command.reasoning, current.reasoning, nextModel, command.model !== undefined);
-    const changed = command.model !== undefined || command.reasoning !== undefined;
-    if (changed) {
+    if (command.model !== undefined || command.reasoning !== undefined) {
         runtime.engine.setModel(nextModel, reasoningUpdate.reasoning, reasoningUpdate.update);
-        try {
-            const { providerChanged } = await persistModelCommandSettings(runtime, command, reasoningUpdate);
-            if (providerChanged) {
-                const config = readModelProviderConfig(process.env);
-                if (config) {
-                    const innerGateway = createModelGatewayFromConfig(config);
-                    runtime.modelGateway.setInner(innerGateway);
-                    runtime.agentRuntime.modelGateway = runtime.modelGateway;
-                    runtime.engine.setModelProvider({
-                        modelGateway: runtime.modelGateway,
-                        model: config.model,
-                        fallbackModel: config.fallbackModel,
-                        reasoning: config.defaultReasoning,
-                    });
-                    syncImageGenerationTool(runtime, config.provider);
-                    runtime.defaultReasoning = config.defaultReasoning;
-                }
-            }
-        }
-        catch (error) {
-            return { kind: "error", text: `Model settings changed for this session, but saving to ${runtime.envPath} failed: ${error instanceof Error ? error.message : String(error)}` };
-        }
     }
-    const settings = formatModelSettings(runtime.engine.getModelSettings(), runtime.defaultReasoning);
-    return systemLine(changed ? `${settings}\nSaved to ${runtime.envPath}` : settings);
+    return systemLine(formatModelSettings(runtime.engine.getModelSettings(), runtime.defaultReasoning));
 }
 function resolveModelReasoningUpdate(value, current, modelId, modelChanged) {
     if (value === "off")
@@ -2012,62 +1702,6 @@ function resolveModelReasoningUpdate(value, current, modelId, modelChanged) {
     }
     return { reasoning: current, update: false };
 }
-async function persistModelCommandSettings(runtime, command, reasoningUpdate) {
-    const currentProvider = currentModelProvider();
-    let targetProvider = currentProvider;
-    const updates = {};
-    if (command.model !== undefined) {
-        const metadata = findModelMetadata(command.model);
-        if (metadata) {
-            const modelProvider = parseLoginProvider(metadata.provider);
-            if (modelProvider) {
-                targetProvider = modelProvider;
-                if (targetProvider !== currentProvider)
-                    updates.MODEL_PROVIDER = targetProvider;
-            }
-        }
-        updates[modelEnvKeyForProvider(targetProvider)] = command.model.trim() || undefined;
-    }
-    if (command.reasoning !== undefined || reasoningUpdate.update) {
-        updates.MODEL_REASONING_EFFORT = envValueForReasoning(reasoningUpdate.reasoning);
-        updates.MODEL_REASONING_SUMMARY = undefined;
-    }
-    if (Object.keys(updates).length === 0)
-        return { providerChanged: false };
-    await writeEnvUpdates(runtime.envPath, updates);
-    applyEnvUpdatesToProcess(updates);
-    runtime.defaultReasoning = reasoningUpdate.update ? reasoningUpdate.reasoning : runtime.defaultReasoning;
-    return { providerChanged: targetProvider !== currentProvider };
-}
-function currentModelProvider() {
-    return parseLoginProvider(process.env.MODEL_PROVIDER) ?? "openai";
-}
-function modelEnvKeyForProvider(provider) {
-    if (provider === "deepseek")
-        return "DEEPSEEK_MODEL";
-    if (provider === "kimi")
-        return "KIMI_MODEL";
-    return "OPENAI_MODEL";
-}
-function envValueForReasoning(reasoning) {
-    if (reasoning === null)
-        return "off";
-    return reasoning?.effort;
-}
-async function writeEnvUpdates(envPath, updates, removeKeys = []) {
-    await fs.mkdir(path.dirname(envPath), { recursive: true });
-    const existing = existsSync(envPath) ? readFileSync(envPath, "utf8") : "";
-    const next = updateEnvContent(existing, updates, removeKeys);
-    await fs.writeFile(envPath, next, "utf8");
-}
-function applyEnvUpdatesToProcess(updates) {
-    for (const [key, value] of Object.entries(updates)) {
-        if (value === undefined)
-            delete process.env[key];
-        else
-            process.env[key] = value;
-    }
-}
 function validateModelReasoningArgument(modelId, reasoning) {
     if (!reasoning || reasoning === "default" || reasoning === "off")
         return undefined;
@@ -2290,38 +1924,18 @@ function reduceStatus(status, event) {
     }
     return status;
 }
-async function handleSessionsCommand(runtime, runningSessionIds, setBrowser, append) {
+async function handleSessionsCommand(runtime, setBrowser, append) {
     const sessions = await runtime.engine.listSessions(Number.POSITIVE_INFINITY);
     if (sessions.length === 0) {
         setBrowser(undefined);
         append(systemLine("No saved sessions found."));
         return;
     }
-    setBrowser({ sessions, runningSessionIds, pageSize: SESSIONS_DEFAULT_PAGE_SIZE, pageIndex: 0, selectedIndex: 0 });
-}
-async function handleExportCommand(command, runtime) {
-    const snapshot = runtime.engine.snapshot();
-    if (!snapshot.session)
-        throw new Error("session transcripts are disabled; cannot export current session");
-    const promptSnapshot = await runtime.engine.promptExportSnapshot();
-    const result = await writeSessionMarkdownExport({
-        outputPath: command.path,
-        session: snapshot.session,
-        agentId: snapshot.agentId,
-        promptSnapshot,
-        engineSnapshot: { ...snapshot, communicationLog: runtime.communicationLogger.snapshot(), usage: runtime.usage.snapshot() },
-    });
-    return systemLine(`Exported current session to ${result.outputPath}\nEntries: ${result.entries}\nMessages: ${result.messages}\nBytes: ${result.bytes}`);
+    setBrowser({ sessions, pageSize: SESSIONS_DEFAULT_PAGE_SIZE, pageIndex: 0, selectedIndex: 0 });
 }
 async function handleResumeCommand(sessionId, runtime, append) {
     try {
-        runtime.engine = runtime.engine.forkForSession(sessionId, true);
-        await runtime.engine.initialize();
-        const snapshot = runtime.engine.snapshot().session;
-        if (!snapshot)
-            throw new Error("session transcripts are disabled");
-        const metrics = await runtime.engine.contextMetrics();
-        return { snapshot, metrics };
+        return await runtime.engine.resumeSession(sessionId);
     }
     catch (error) {
         append({ kind: "error", text: error instanceof Error ? error.message : String(error) });
@@ -2346,7 +1960,6 @@ async function handleDeleteSessionCommand(sessionId, current, runtime, setBrowse
             setBrowser({
                 ...current,
                 sessions: nextSessions,
-                runningSessionIds: current.runningSessionIds.filter((id) => id !== sessionId),
                 pageIndex,
                 selectedIndex: Math.min(current.selectedIndex, Math.max(0, pageLength - 1)),
             });
@@ -2363,11 +1976,11 @@ function initialLines(runtime, lineId) {
         ? ` Session: ${session.sessionId}${session.resumedMessages > 0 ? ` (${session.resumedMessages} resumed messages)` : ""}.`
         : "";
     const lines = [
-        { id: 0, kind: "system", title: "System", text: `Interactive UI enabled. Type /help for commands.${suffix}\n${formatTipLine(tipAt(initialTipIndex(session?.sessionId ?? process.cwd())))}`, previewStyle: "summary" },
+        { id: 0, kind: "system", title: "System", text: `Interactive UI enabled. Type /help for commands.${suffix}`, previewStyle: "summary" },
     ];
     lineId.current = 0;
     if (runtime.envNotice)
-        lines.push({ id: ++lineId.current, kind: "system", title: "Config", text: runtime.envNotice, format: "plain", previewStyle: "summary" });
+        lines.push({ id: ++lineId.current, kind: "system", title: "Config", text: runtime.envNotice, previewStyle: "summary" });
     for (const line of restoredHistoryLines(runtime))
         lines.push({ id: ++lineId.current, ...line });
     return lines;
@@ -2386,71 +1999,6 @@ function restoredHistoryLines(runtime) {
     }
     return lines;
 }
-const LOGIN_PROVIDERS = ["openai", "deepseek", "kimi"];
-const SHARED_LOGIN_FIELDS = [
-    { key: "reasoningEffort", label: "Reasoning effort", envKey: "MODEL_REASONING_EFFORT", scope: "shared", options: ["", "off", "none", "minimal", "low", "medium", "high", "xhigh", "max"] },
-    { key: "reasoningSummary", label: "Reasoning summary", envKey: "MODEL_REASONING_SUMMARY", scope: "shared", options: ["", "auto", "concise", "detailed"] },
-    { key: "maxOutputTokens", label: "Max output tokens", envKey: "MODEL_MAX_OUTPUT_TOKENS", scope: "shared", placeholder: "800" },
-    { key: "timeoutMs", label: "Timeout ms", envKey: "MODEL_TIMEOUT_MS", scope: "shared", placeholder: "120000" },
-    { key: "streamIdleTimeoutMs", label: "Stream idle timeout ms", envKey: "MODEL_STREAM_IDLE_TIMEOUT_MS", scope: "shared", placeholder: "120000" },
-    { key: "maxRetries", label: "Max retries", envKey: "MODEL_MAX_RETRIES", scope: "shared", placeholder: "2" },
-];
-const LOGIN_FIELD_DEFINITIONS = {
-    openai: [
-        { key: "apiKey", label: "API key", envKey: "OPENAI_API_KEY", scope: "provider", required: true, secret: true, placeholder: "sk-..." },
-        { key: "baseUrl", label: "Base URL", envKey: "OPENAI_BASE_URL", scope: "provider", placeholder: "https://api.openai.com" },
-        { key: "model", label: "Model", envKey: "OPENAI_MODEL", scope: "provider", required: true, placeholder: "gpt-5.5" },
-        { key: "fallbackModel", label: "Fallback model", envKey: "OPENAI_FALLBACK_MODEL", scope: "provider" },
-        { key: "endpoint", label: "Endpoint", envKey: "OPENAI_ENDPOINT", scope: "provider", placeholder: "auto", options: ["auto", "responses", "chat"] },
-        ...SHARED_LOGIN_FIELDS,
-    ],
-    deepseek: [
-        { key: "apiKey", label: "API key", envKey: "DEEPSEEK_API_KEY", scope: "provider", required: true, secret: true, placeholder: "sk-..." },
-        { key: "baseUrl", label: "Base URL", envKey: "DEEPSEEK_BASE_URL", scope: "provider", placeholder: "https://api.deepseek.com" },
-        { key: "model", label: "Model", envKey: "DEEPSEEK_MODEL", scope: "provider", required: true, placeholder: "deepseek-chat" },
-        { key: "fallbackModel", label: "Fallback model", envKey: "DEEPSEEK_FALLBACK_MODEL", scope: "provider" },
-        ...SHARED_LOGIN_FIELDS,
-    ],
-    kimi: [
-        { key: "apiKey", label: "API key", envKey: "KIMI_API_KEY", scope: "provider", required: true, secret: true, placeholder: "sk-..." },
-        { key: "baseUrl", label: "Base URL", envKey: "KIMI_BASE_URL", scope: "provider", placeholder: "https://api.moonshot.cn/v1" },
-        { key: "model", label: "Model", envKey: "KIMI_MODEL", scope: "provider", required: true, placeholder: "kimi-k2.6" },
-        { key: "fallbackModel", label: "Fallback model", envKey: "KIMI_FALLBACK_MODEL", scope: "provider" },
-        ...SHARED_LOGIN_FIELDS,
-    ],
-};
-const DEPRECATED_MODEL_ENV_KEYS = [
-    "MODEL_API_KEY",
-    "MODEL_BASE_URL",
-    "MODEL_ID",
-    "MODEL_FALLBACK_ID",
-    "MODEL_ENDPOINT",
-    "OPENAI_PROVIDER",
-    "OPENAI_REASONING_EFFORT",
-    "OPENAI_REASONING_SUMMARY",
-    "OPENAI_MAX_OUTPUT_TOKENS",
-    "OPENAI_TIMEOUT_MS",
-    "OPENAI_STREAM_IDLE_TIMEOUT_MS",
-    "OPENAI_MAX_RETRIES",
-    "DEEPSEEK_REASONING_EFFORT",
-    "DEEPSEEK_REASONING_SUMMARY",
-    "DEEPSEEK_MAX_OUTPUT_TOKENS",
-    "DEEPSEEK_TIMEOUT_MS",
-    "DEEPSEEK_STREAM_IDLE_TIMEOUT_MS",
-    "DEEPSEEK_MAX_RETRIES",
-    "KIMI_REASONING_EFFORT",
-    "KIMI_REASONING_SUMMARY",
-    "KIMI_MAX_OUTPUT_TOKENS",
-    "KIMI_TIMEOUT_MS",
-    "KIMI_STREAM_IDLE_TIMEOUT_MS",
-    "KIMI_MAX_RETRIES",
-    "MOONSHOT_REASONING_EFFORT",
-    "MOONSHOT_REASONING_SUMMARY",
-    "MOONSHOT_MAX_OUTPUT_TOKENS",
-    "MOONSHOT_TIMEOUT_MS",
-    "MOONSHOT_STREAM_IDLE_TIMEOUT_MS",
-    "MOONSHOT_MAX_RETRIES",
-];
 function sessionsPageCount(state) {
     return Math.max(1, Math.ceil(state.sessions.length / state.pageSize));
 }
@@ -2493,363 +2041,23 @@ function SessionsBrowser({ state, width }) {
     return e(Box, { flexDirection: "column", marginTop: 1 }, e(Text, { color: "cyan", bold: true }, fitToWidth(header, contentWidth)), ...pageItems.map((session, index) => {
         const selected = index === state.selectedIndex;
         const absoluteIndex = state.pageIndex * state.pageSize + index;
-        const row = formatSessionBrowserRow(session, absoluteIndex, contentWidth, state.runningSessionIds.includes(session.sessionId));
+        const row = formatSessionBrowserRow(session, absoluteIndex, contentWidth);
         return e(Text, { key: session.sessionId, color: "white" }, e(Text, {
             color: selected ? "black" : "white",
             backgroundColor: selected ? "cyan" : undefined,
         }, row.numberPrefix), row.rest);
     }), e(Text, { color: "gray" }, fitToWidth(footer, contentWidth)));
 }
-function handleLoginFormInput(value, key, state, setLoginFormState, runtime, append, setStatus) {
-    if (key.escape) {
-        if (state.step === "fields")
-            setLoginFormState({ ...state, step: "provider" });
-        else {
-            setLoginFormState(undefined);
-            append(systemLine("Login cancelled."));
-        }
-        return;
-    }
-    if (state.step === "provider") {
-        if (key.upArrow) {
-            setLoginFormState(moveLoginProviderSelection(state, -1));
-            return;
-        }
-        if (key.downArrow) {
-            setLoginFormState(moveLoginProviderSelection(state, 1));
-            return;
-        }
-        if (key.return) {
-            const provider = state.providers[state.selectedProviderIndex] ?? state.provider;
-            setLoginFormState({ ...loginFormForProvider(provider, state.envPath), step: "fields" });
-            return;
-        }
-        return;
-    }
-    const fields = LOGIN_FIELD_DEFINITIONS[state.provider];
-    const field = fields[state.selectedFieldIndex];
-    if (!field)
-        return;
-    if (key.upArrow) {
-        setLoginFormState(moveLoginFieldSelection(state, -1));
-        return;
-    }
-    if (key.downArrow) {
-        setLoginFormState(moveLoginFieldSelection(state, 1));
-        return;
-    }
-    if (key.leftArrow) {
-        setLoginFormState({ ...state, cursor: Math.max(0, state.cursor - 1) });
-        return;
-    }
-    if (key.rightArrow) {
-        const current = state.values[field.key] ?? "";
-        setLoginFormState({ ...state, cursor: Math.min(current.length, state.cursor + 1) });
-        return;
-    }
-    if (key.tab && field.options?.length) {
-        setLoginFormState(cycleLoginFieldOption(state, field));
-        return;
-    }
-    if (key.backspace || key.delete) {
-        setLoginFormState(deleteLoginFieldCharacter(state, field));
-        return;
-    }
-    if (key.return) {
-        void submitLoginForm(state, runtime, append, setLoginFormState, setStatus);
-        return;
-    }
-    if (value && !key.ctrl && !key.meta) {
-        setLoginFormState(insertLoginFieldText(state, field, value));
-    }
-}
-function moveLoginProviderSelection(state, delta) {
-    const selectedProviderIndex = (state.selectedProviderIndex + delta + state.providers.length) % state.providers.length;
-    return { ...state, selectedProviderIndex, provider: state.providers[selectedProviderIndex] ?? state.provider };
-}
-function moveLoginFieldSelection(state, delta) {
-    const fields = LOGIN_FIELD_DEFINITIONS[state.provider];
-    const selectedFieldIndex = (state.selectedFieldIndex + delta + fields.length) % fields.length;
-    const field = fields[selectedFieldIndex];
-    return { ...state, selectedFieldIndex, cursor: field ? (state.values[field.key] ?? "").length : 0 };
-}
-function cycleLoginFieldOption(state, field) {
-    const options = field.options ?? [];
-    const current = state.values[field.key] ?? "";
-    const index = options.indexOf(current);
-    const next = options[(index + 1 + options.length) % options.length] ?? "";
-    return { ...state, values: { ...state.values, [field.key]: next }, cursor: next.length };
-}
-function insertLoginFieldText(state, field, value) {
-    const current = state.values[field.key] ?? "";
-    const cursor = Math.max(0, Math.min(state.cursor, current.length));
-    const next = `${current.slice(0, cursor)}${value}${current.slice(cursor)}`;
-    return { ...state, values: { ...state.values, [field.key]: next }, cursor: cursor + value.length };
-}
-function deleteLoginFieldCharacter(state, field) {
-    const current = state.values[field.key] ?? "";
-    const cursor = Math.max(0, Math.min(state.cursor, current.length));
-    if (cursor <= 0)
-        return state;
-    const next = `${current.slice(0, cursor - 1)}${current.slice(cursor)}`;
-    return { ...state, values: { ...state.values, [field.key]: next }, cursor: cursor - 1 };
-}
-async function submitLoginForm(state, runtime, append, setLoginFormState, setStatus) {
-    const validationError = validateLoginForm(state);
-    if (validationError) {
-        append({ kind: "error", text: validationError });
-        return;
-    }
-    try {
-        await saveLoginFormToEnv(state);
-        applyLoginFormToProcessEnv(state);
-        const config = readModelProviderConfig(process.env);
-        if (!config)
-            throw new Error("Saved provider config could not be loaded from environment.");
-        const innerGateway = createModelGatewayFromConfig(config);
-        runtime.modelGateway.setInner(innerGateway);
-        runtime.agentRuntime.modelGateway = runtime.modelGateway;
-        runtime.engine.setModelProvider({
-            modelGateway: runtime.modelGateway,
-            model: config.model,
-            fallbackModel: config.fallbackModel,
-            reasoning: config.defaultReasoning,
-        });
-        syncImageGenerationTool(runtime, config.provider);
-        runtime.defaultReasoning = config.defaultReasoning;
-        const metrics = await runtime.engine.contextMetrics();
-        setStatus((current) => ({
-            ...current,
-            metrics,
-            activityTick: current.activityTick + 1,
-        }));
-        setLoginFormState(undefined);
-        append(systemLine(`Saved ${state.provider} login to ${state.envPath}\n${formatModelSettings(runtime.engine.getModelSettings(), runtime.defaultReasoning)}`, EXPANDED_SUMMARY_MAX_LINES));
-    }
-    catch (error) {
-        append({ kind: "error", text: `Login save failed: ${error instanceof Error ? error.message : String(error)}` });
-    }
-}
-function validateLoginForm(state) {
-    for (const field of LOGIN_FIELD_DEFINITIONS[state.provider]) {
-        const value = (state.values[field.key] ?? "").trim();
-        if (field.required && !value)
-            return `${field.label} is required.`;
-        if (field.options?.length && value && !field.options.includes(value))
-            return `${field.label} must be one of: ${field.options.filter(Boolean).join(", ")}`;
-    }
-    for (const fieldKey of ["maxOutputTokens", "timeoutMs", "streamIdleTimeoutMs", "maxRetries"]) {
-        const value = state.values[fieldKey]?.trim();
-        if (value && !Number.isFinite(Number(value)))
-            return `${fieldKey} must be a number.`;
-    }
-    return undefined;
-}
-function createLoginFormState(envPath = getUserDotEnvPath()) {
-    const env = parseEnvFileSafe(envPath);
-    const currentProvider = parseLoginProvider(env.MODEL_PROVIDER ?? process.env.MODEL_PROVIDER) ?? guessLoginProvider(env);
-    return loginFormForProvider(currentProvider, envPath, env);
-}
-function loginFormForProvider(provider, envPath, env = parseEnvFileSafe(envPath)) {
-    const selectedProviderIndex = Math.max(0, LOGIN_PROVIDERS.indexOf(provider));
-    return {
-        step: "provider",
-        providers: LOGIN_PROVIDERS,
-        selectedProviderIndex,
-        provider,
-        selectedFieldIndex: 0,
-        cursor: 0,
-        values: loginValuesForProvider(provider, env),
-        envPath,
-    };
-}
-function loginValuesForProvider(provider, env) {
-    const values = {};
-    for (const field of LOGIN_FIELD_DEFINITIONS[provider]) {
-        values[field.key] = env[field.envKey] ?? "";
-    }
-    if (provider === "kimi") {
-        values.apiKey ||= env.MOONSHOT_API_KEY ?? process.env.MOONSHOT_API_KEY ?? "";
-        values.baseUrl ||= env.MOONSHOT_BASE_URL ?? process.env.MOONSHOT_BASE_URL ?? "";
-        values.model ||= env.MOONSHOT_MODEL ?? process.env.MOONSHOT_MODEL ?? "";
-        values.fallbackModel ||= env.MOONSHOT_FALLBACK_MODEL ?? process.env.MOONSHOT_FALLBACK_MODEL ?? "";
-    }
-    if (!values.baseUrl)
-        values.baseUrl = defaultBaseUrlForLoginProvider(provider);
-    if (!values.model)
-        values.model = defaultModelForLoginProvider(provider);
-    if (provider === "openai" && !values.endpoint)
-        values.endpoint = "auto";
-    return values;
-}
-function parseLoginProvider(value) {
-    if (value === "openai" || value === "deepseek" || value === "kimi")
-        return value;
-    return undefined;
-}
-function guessLoginProvider(env) {
-    if (env.KIMI_API_KEY ?? env.MOONSHOT_API_KEY ?? process.env.KIMI_API_KEY ?? process.env.MOONSHOT_API_KEY)
-        return "kimi";
-    if (env.DEEPSEEK_API_KEY ?? process.env.DEEPSEEK_API_KEY)
-        return "deepseek";
-    return "openai";
-}
-function defaultBaseUrlForLoginProvider(provider) {
-    if (provider === "deepseek")
-        return "https://api.deepseek.com";
-    if (provider === "kimi")
-        return "https://api.moonshot.cn/v1";
-    return "https://api.openai.com";
-}
-function defaultModelForLoginProvider(provider) {
-    if (provider === "deepseek")
-        return "deepseek-chat";
-    if (provider === "kimi")
-        return "kimi-k2.6";
-    return "gpt-5.5";
-}
-function loginFormViewHeight(state) {
-    return state.step === "provider" ? state.providers.length + 3 : LOGIN_FIELD_DEFINITIONS[state.provider].length + 4;
-}
-function LoginFormView({ state, width }) {
-    const contentWidth = Math.max(30, width);
-    if (state.step === "provider") {
-        return e(Box, { flexDirection: "column", marginTop: 1 }, e(Text, { color: "cyan", bold: true }, fitToWidth(`Login: choose provider · saving to ${state.envPath}`, contentWidth)), ...state.providers.map((provider, index) => e(Text, { key: provider, color: "white" }, e(Text, { color: index === state.selectedProviderIndex ? "black" : "white", backgroundColor: index === state.selectedProviderIndex ? "cyan" : undefined }, `${index + 1}.`.padStart(3)), e(Text, { color: "gray" }, " "), e(Text, { color: "cyan" }, provider))), e(Text, { color: "gray" }, fitToWidth("↑/↓ select · Enter edit config · Esc close", contentWidth)));
-    }
-    const fields = LOGIN_FIELD_DEFINITIONS[state.provider];
-    const maxLabel = Math.max(...fields.map((field) => field.label.length));
-    return e(Box, { flexDirection: "column", marginTop: 1 }, e(Text, { color: "cyan", bold: true }, fitToWidth(`Login: ${state.provider} · ${state.envPath}`, contentWidth)), ...fields.map((field, index) => {
-        const selected = index === state.selectedFieldIndex;
-        const rawValue = state.values[field.key] ?? "";
-        const visibleValue = formatLoginFieldValue(field, rawValue, selected ? state.cursor : undefined);
-        const placeholder = rawValue ? "" : (field.placeholder ? ` (${field.placeholder})` : "");
-        return e(Text, { key: field.key, color: "white" }, e(Text, { color: selected ? "black" : "white", backgroundColor: selected ? "cyan" : undefined }, `${index + 1}.`.padStart(3)), e(Text, { color: field.required ? "yellow" : "gray" }, ` ${field.label.padEnd(maxLabel)} `), e(Text, { color: field.scope === "shared" ? "blue" : "gray" }, field.scope === "shared" ? "shared " : "provider "), e(Text, { color: rawValue ? "white" : "gray" }, fitToWidth(`${visibleValue}${placeholder}`, Math.max(8, contentWidth - maxLabel - 14))));
-    }), e(Text, { color: "gray" }, fitToWidth("↑/↓ field · ←/→ cursor · type edit · Tab cycle choices · Enter save · Esc back/cancel", contentWidth)), e(Text, { color: "gray" }, fitToWidth("Provider fields save as OPENAI_* / DEEPSEEK_* / KIMI_*; shared runtime fields save as MODEL_*.", contentWidth)));
-}
-function formatLoginFieldValue(field, value, cursor) {
-    const display = field.secret && value ? "•".repeat(Math.min(value.length, 24)) : value;
-    if (cursor === undefined)
-        return display;
-    const safeCursor = Math.max(0, Math.min(cursor, display.length));
-    const selected = display[safeCursor] ?? " ";
-    return `${display.slice(0, safeCursor)}█${selected === " " ? "" : display.slice(safeCursor + 1)}`;
-}
-function applyLoginFormToProcessEnv(state) {
-    applyEnvUpdatesToProcess(envEntriesForLoginForm(state));
-    for (const key of DEPRECATED_MODEL_ENV_KEYS)
-        delete process.env[key];
-}
-async function saveLoginFormToEnv(state) {
-    await writeEnvUpdates(state.envPath, envEntriesForLoginForm(state), DEPRECATED_MODEL_ENV_KEYS);
-}
-function envEntriesForLoginForm(state) {
-    const entries = {
-        MODEL_PROVIDER: state.provider,
-    };
-    for (const field of LOGIN_FIELD_DEFINITIONS[state.provider]) {
-        const value = (state.values[field.key] ?? "").trim();
-        entries[field.envKey] = value || undefined;
-    }
-    if (state.provider === "kimi") {
-        entries.MOONSHOT_API_KEY = undefined;
-        entries.MOONSHOT_BASE_URL = undefined;
-        entries.MOONSHOT_MODEL = undefined;
-        entries.MOONSHOT_FALLBACK_MODEL = undefined;
-    }
-    return entries;
-}
-function updateEnvContent(content, updates, removeKeys = []) {
-    const keys = new Set(Object.keys(updates));
-    const removals = new Set(removeKeys);
-    const seen = new Set();
-    const lines = content ? content.split(/\r?\n/) : [];
-    const updatedLines = lines.map((line) => {
-        const parsed = parseEnvLine(line);
-        if (!parsed)
-            return line;
-        if (removals.has(parsed.key) && !keys.has(parsed.key))
-            return undefined;
-        if (!keys.has(parsed.key))
-            return line;
-        seen.add(parsed.key);
-        const value = updates[parsed.key];
-        if (value === undefined)
-            return undefined;
-        return `${parsed.key}=${quoteEnvValue(value)}`;
-    }).filter((line) => line !== undefined);
-    const missing = Object.entries(updates).filter((entry) => !seen.has(entry[0]) && entry[1] !== undefined);
-    if (missing.length > 0) {
-        const grouped = groupLoginEnvEntries(missing);
-        appendEnvGroup(updatedLines, "# Neo active provider", grouped.active);
-        appendEnvGroup(updatedLines, "# OpenAI provider settings", grouped.openai);
-        appendEnvGroup(updatedLines, "# DeepSeek provider settings", grouped.deepseek);
-        appendEnvGroup(updatedLines, "# Kimi provider settings", grouped.kimi);
-        appendEnvGroup(updatedLines, "# Shared model runtime settings", grouped.shared);
-    }
-    return `${updatedLines.join("\n").replace(/\n*$/u, "")}\n`;
-}
-function groupLoginEnvEntries(entries) {
-    return {
-        active: entries.filter(([key]) => key === "MODEL_PROVIDER"),
-        openai: entries.filter(([key]) => key.startsWith("OPENAI_")),
-        deepseek: entries.filter(([key]) => key.startsWith("DEEPSEEK_")),
-        kimi: entries.filter(([key]) => key.startsWith("KIMI_") || key.startsWith("MOONSHOT_")),
-        shared: entries.filter(([key]) => key.startsWith("MODEL_") && key !== "MODEL_PROVIDER"),
-    };
-}
-function appendEnvGroup(lines, header, entries) {
-    if (entries.length === 0)
-        return;
-    if (lines.length > 0 && lines[lines.length - 1]?.trim())
-        lines.push("");
-    lines.push(header);
-    for (const [key, value] of entries)
-        lines.push(`${key}=${quoteEnvValue(value)}`);
-}
-function parseEnvFileSafe(envPath) {
-    if (!existsSync(envPath))
-        return {};
-    const env = {};
-    for (const line of readFileSync(envPath, "utf8").split(/\r?\n/)) {
-        const parsed = parseEnvLine(line);
-        if (parsed)
-            env[parsed.key] = stripEnvQuotes(parsed.value.trim());
-    }
-    return env;
-}
-function parseEnvLine(line) {
-    const trimmed = line.trim();
-    if (!trimmed || trimmed.startsWith("#"))
-        return undefined;
-    const separator = trimmed.indexOf("=");
-    if (separator <= 0)
-        return undefined;
-    const key = trimmed.slice(0, separator).trim();
-    if (!/^[A-Za-z_][A-Za-z0-9_]*$/.test(key))
-        return undefined;
-    return { key, value: trimmed.slice(separator + 1) };
-}
-function quoteEnvValue(value) {
-    if (/^[A-Za-z0-9_./:@+-]*$/.test(value))
-        return value;
-    return JSON.stringify(value);
-}
-function stripEnvQuotes(value) {
-    if ((value.startsWith('"') && value.endsWith('"')) || (value.startsWith("'") && value.endsWith("'")))
-        return value.slice(1, -1);
-    return value;
-}
-function formatSessionBrowserRow(session, absoluteIndex, width, running = false) {
+function formatSessionBrowserRow(session, absoluteIndex, width) {
     const numberPrefix = `${absoluteIndex + 1}.`.padStart(4);
     const title = session.title?.trim() || "(untitled)";
-    const runningTag = running ? " · running" : "";
     const updated = session.updatedAt ? ` · ${formatSessionTimestamp(session.updatedAt)}` : "";
     const messages = ` · ${session.messages} messages`;
-    const fixedParts = `${numberPrefix} ${runningTag}${updated}${messages}`;
+    const fixedParts = `${numberPrefix} ${updated}${messages}`;
     const idBudget = Math.max(12, Math.min(32, Math.floor(width * 0.28)));
     const id = truncateMiddle(session.sessionId, idBudget);
     const titleBudget = Math.max(8, width - fixedParts.length - id.length - 5);
-    const row = fitToWidth(`${numberPrefix} ${truncateMiddle(title, titleBudget)} · ${id}${runningTag}${updated}${messages}`, width);
+    const row = fitToWidth(`${numberPrefix} ${truncateMiddle(title, titleBudget)} · ${id}${updated}${messages}`, width);
     return { numberPrefix, rest: row.slice(numberPrefix.length) };
 }
 function formatSessionTimestamp(value) {
@@ -2928,7 +2136,7 @@ function kindForRole(role) {
 }
 function titleForKind(kind) {
     if (kind === "thinking")
-        return `${THINKING_MARKER} think`;
+        return `${THINKING_MARKER} Think`;
     if (kind === "tool")
         return "Tool";
     if (kind === "error")
@@ -2982,7 +2190,6 @@ function formatToolUse(toolUse) {
         return {
             kind: "tool",
             title: toolTitle(toolUse.name, "running"),
-            bodyTitle: planToolBodyTitle(toolUse.input),
             text: formatPlanToolPayload(toolUse.input),
         };
     }
@@ -2998,7 +2205,6 @@ function formatToolResultLine(toolName, output, ok) {
     const line = {
         kind: ok ? "tool" : "error",
         title: toolTitle(toolName, "finished"),
-        bodyTitle: formatted.bodyTitle,
         titleStatus: ok ? "success" : "failure",
         text: formatted.text,
         format: formatted.format,
@@ -3040,12 +2246,10 @@ function isPlanToolPayload(value) {
             (item.status === "pending" || item.status === "in_progress" || item.status === "completed"));
     });
 }
-function planToolBodyTitle(payload) {
-    const title = payload.title?.trim();
-    return title ? title : undefined;
-}
 function formatPlanToolPayload(payload) {
     const sections = [];
+    if (payload.title?.trim())
+        sections.push(`**${payload.title.trim()}**`);
     if (payload.summary?.trim())
         sections.push(payload.summary.trim());
     if (payload.note?.trim())
@@ -3133,11 +2337,26 @@ function isReplScalar(value) {
     return value === null || value === undefined || typeof value !== "object" || value instanceof Date;
 }
 function formatToolResult(toolName, output, ok) {
-    if ((toolName === "edit" || toolName === "write") && isRecord(output) && isEditToolOutput(output)) {
+    if (toolName === "edit" && isRecord(output) && isEditToolOutput(output)) {
         return { text: formatEditToolDiff(output, ok), format: "ansi", summaryMaxLines: EDIT_TOOL_SUMMARY_MAX_LINES };
     }
     if (isExecOutput(output)) {
-        return { text: formatExecToolResult(output, ok), format: "ansi", summaryMaxLines: EXPANDED_SUMMARY_MAX_LINES };
+        const status = output.timedOut
+            ? "timed out"
+            : output.exitCode === 0
+                ? "exit 0"
+                : `exit ${output.exitCode ?? output.signal ?? "unknown"}`;
+        const sections = [
+            `${status} · ${output.durationMs}ms`,
+            `$ ${output.command}`,
+        ];
+        if (output.stdout)
+            sections.push("stdout:", output.stdout.replace(/\s+$/u, ""));
+        if (output.stderr)
+            sections.push("stderr:", output.stderr.replace(/\s+$/u, ""));
+        if (!output.stdout && !output.stderr)
+            sections.push(ok ? "no output" : "no captured output");
+        return { text: sections.join("\n"), format: "ansi" };
     }
     if (typeof output === "string" && hasAnsi(output)) {
         return { text: output, format: "ansi" };
@@ -3154,11 +2373,8 @@ function formatToolResult(toolName, output, ok) {
     if (toolName === "search" && isRecord(output)) {
         return { text: formatWebSearchToolResult(output, ok), summaryMaxLines: EXPANDED_SUMMARY_MAX_LINES };
     }
-    if (toolName === "image2" && isRecord(output)) {
-        return { text: formatImageGenerationToolResult(output, ok), summaryMaxLines: 4 };
-    }
     if (toolName === "plan" && isPlanToolPayload(output)) {
-        return { text: formatPlanToolPayload(output), bodyTitle: planToolBodyTitle(output), full: true };
+        return { text: formatPlanToolPayload(output), full: true };
     }
     return { text: `${ok ? "ok" : "failed"}\n${formatJson(output, 6000)}`, summaryMaxLines: EXPANDED_SUMMARY_MAX_LINES };
 }
@@ -3247,54 +2463,9 @@ function isExecOutput(value) {
         typeof record.stdout === "string" &&
         typeof record.stderr === "string");
 }
-function formatExecToolResult(output, ok) {
-    const status = output.timedOut
-        ? "timed out"
-        : output.exitCode === 0
-            ? "exit 0"
-            : `exit ${output.exitCode ?? output.signal ?? "unknown"}`;
-    const lines = [
-        "exec result",
-        `status: ${status}`,
-        `duration: ${output.durationMs}ms`,
-        `command: ${output.command}`,
-    ];
-    const stdout = output.stdout.replace(/\s+$/u, "");
-    const stderr = output.stderr.replace(/\s+$/u, "");
-    if (stdout)
-        lines.push("stdout:", stdout);
-    if (stderr)
-        lines.push("stderr:", stderr);
-    if (!stdout && !stderr)
-        lines.push(ok ? "output: (none)" : "output: (not captured)");
-    return lines.join("\n");
-}
 function isRecord(value) {
     return !!value && typeof value === "object" && !Array.isArray(value);
 }
-function formatImageGenerationToolResult(output, ok) {
-    const error = typeof output.error === "string" ? output.error : undefined;
-    if (!ok || error)
-        return ["image generation failed", error ?? formatReplData(output, 1200)].join("\n");
-    const provider = typeof output.provider === "string" ? output.provider : "openai";
-    const model = typeof output.model === "string" ? output.model : undefined;
-    const returnedImages = typeof output.returnedImages === "number" ? output.returnedImages : Array.isArray(output.images) ? output.images.length : undefined;
-    const size = typeof output.size === "string" ? output.size : undefined;
-    const quality = typeof output.quality === "string" ? output.quality : undefined;
-    const format = typeof output.outputFormat === "string" ? output.outputFormat : undefined;
-    const lines = [`generated ${returnedImages ?? 0} image${returnedImages === 1 ? "" : "s"}`];
-    const details = [provider, model, size, quality && quality !== "auto" ? quality : undefined, format].filter((value) => Boolean(value));
-    if (details.length > 0)
-        lines.push(details.join(" · "));
-    const duration = imageGenerationDuration(output);
-    if (duration !== undefined)
-        lines.push(`duration: ${duration}ms`);
-    return lines.join("\n");
-}
-function imageGenerationDuration(output) {
-    const value = output.duration ?? output.elapsed ?? output.durationMs ?? output.elapsedMs;
-    return typeof value === "number" && Number.isFinite(value) ? Math.max(0, Math.round(value)) : undefined;
-}
 function formatListToolResult(output, ok) {
     const pathValue = typeof output.path === "string" ? output.path : "";
     const typeValue = typeof output.type === "string" ? output.type : "result";
@@ -3442,9 +2613,11 @@ function formatGrepContextLine(line, marker) {
 }
 function renderContextParts(metrics) {
     if (!metrics)
-        return { percent: "?" };
+        return { used: "?", limit: "?", percent: "?" };
+    const used = compactNumber(metrics.estimatedInputTokens);
+    const limit = metrics.contextWindowTokens ? compactNumber(metrics.contextWindowTokens) : "?";
     const percent = metrics.contextUsageRatio === undefined ? "?" : `${(metrics.contextUsageRatio * 100).toFixed(1)}%`;
-    return { percent };
+    return { used, limit, percent };
 }
 function contextColor(metrics) {
     const ratio = metrics?.contextUsageRatio;
@@ -3727,8 +2900,9 @@ function isFullWidthCodePoint(codePoint) {
         (codePoint >= 0x20000 && codePoint <= 0x3fffd)));
 }
 const SESSIONS_DEFAULT_PAGE_SIZE = 10;
-const TERMINAL_TITLE_WORKING_PREFIX = "● ";
-const TERMINAL_TITLE_READY_PREFIX = "✓ ";
+const TERMINAL_TITLE_DOT_FILLED_PREFIX = "● ";
+const TERMINAL_TITLE_DOT_BLANK_PREFIX = "  ";
+const TERMINAL_TITLE_BLINK_INTERVAL_MS = 1000;
 const REPL_ANIMATION_INTERVAL_MS = 420;
 const TOOL_RESULT_REPLACEMENT_DELAY_MS = 2000;
 const TOKEN_PULSE_MS = 900;