atom-lite 0.4.1 → 0.5.1

package/dist/cli/app.js

@@ -1,4 +1,5 @@
 import { loadConfig } from "../config/load.js";
+import { defaultAgentDir, userConfigDir } from "../config/paths.js";
 import { saveProviderSelection, saveTheme, } from "../config/write.js";
 import { resolveApiKey, saveApiKey } from "../config/credentials.js";
 import { join } from "node:path";
@@ -20,6 +21,9 @@ import { Transcript } from "./transcript.js";
 import { AgentRuntime } from "../agent/loop.js";
 import { JsonlSessionStore } from "../sessions/store.js";
 import { ExtensionLoader } from "../extensions/loader.js";
+import { collectExtensionTools } from "../extensions/tool-adapter.js";
+import { denyProject, trustProject } from "../extensions/trust.js";
+import { ProjectTrustPrompt } from "./trust-prompt.js";
 import { formatSessionList, formatSessionSearch, searchSessions, sessionTitleFromEvents, } from "../sessions/search.js";
 import { providerSwitchNotice, sessionHistoryLines, sessionSelectionFromEvents, } from "../sessions/history.js";
 import { blockAtLine, createMouseCapture, handleMouseEvent, parseSgrMouse, shouldEnableMouse, } from "./mouse.js";
@@ -28,7 +32,7 @@ import { McpManager, formatMcpStatus, formatMcpDoctor, createMcpTools } from "..
 import { createProvider } from "../providers/factory.js";
 import { availableProviderNames, getPreset, listModelsForProvider, materializeProviderConfig, probeApiKey, providerLabel, PROVIDER_PRESETS, } from "../providers/catalog.js";
 import { ContextManager } from "../context/manager.js";
-import { ProcessTerminal, isKeyRelease, isKeyRepeat, Key, matchesKey, } from "@earendil-works/pi-tui";
+import { ProcessTerminal, isKeyRelease, isKeyRepeat, Key, matchesKey, wrapTextWithAnsi, } from "@earendil-works/pi-tui";
 export async function run(args) {
     let providerOverride;
     let modelOverride;
@@ -41,9 +45,15 @@ export async function run(args) {
     let listSessions = false;
     let searchSessionsQuery;
     const positional = [];
+    const extensionPaths = [];
     for (let i = 0; i < args.length; i++) {
         const a = args[i];
-        if (a === "--provider")
+        if (a === "-e" || a === "--extension") {
+            const path = args[++i];
+            if (path)
+                extensionPaths.push(path);
+        }
+        else if (a === "--provider")
             providerOverride = args[++i];
         else if (a === "--model")
             modelOverride = args[++i];
@@ -68,7 +78,7 @@ export async function run(args) {
         else if (a === "--no-tools")
             positional.push("__notools__");
         else if (a === "--help") {
-            process.stdout.write("atom-lite [task] [--provider NAME] [--model MODEL] [--continue] [--session ID] [--list-sessions] [--search-sessions QUERY] [--no-tools] [--json] [--debug] [--theme NAME] [--no-color] [--version] [--help]\n");
+            process.stdout.write("atom-lite [task] [--provider NAME] [--model MODEL] [--continue] [--session ID] [--list-sessions] [--search-sessions QUERY] [--no-tools] [--json] [--debug] [--theme NAME] [--no-color] [-e PATH] [--version] [--help]\n");
             return;
         }
         else if (a.startsWith("--")) {
@@ -145,20 +155,101 @@ export async function run(args) {
             }
         },
     });
+    const extensionUICallbacks = {};
+    const extensionProviderNames = new Set();
+    function resolveExtensionApiKey(value) {
+        if (typeof value !== "string" || !value)
+            return undefined;
+        if (value.startsWith("!")) {
+            try {
+                const { execFileSync } = require("node:child_process");
+                const parts = value.slice(1).trim().split(/\s+/);
+                return execFileSync(parts[0], parts.slice(1), { encoding: "utf8" }).trim();
+            }
+            catch {
+                return undefined;
+            }
+        }
+        if (value.startsWith("$"))
+            return process.env[value.slice(1)] ?? value;
+        if (value.startsWith("${") && value.endsWith("}"))
+            return process.env[value.slice(2, -1)] ?? value;
+        return value;
+    }
     const extensionLoader = new ExtensionLoader({
-        userDir: join(process.env.HOME ?? "", ".config", "atom-lite", "extensions"),
+        cliPaths: extensionPaths,
+        cwd: process.cwd(),
+        agentDir: defaultAgentDir(),
+        userDir: join(userConfigDir(), "extensions"),
         projectDir: process.cwd(),
-        trustedProjects: config.extensions?.trustedProjects,
     });
-    void extensionLoader.loadAll().catch(() => {
+    const pendingTrust = extensionLoader
+        .discover()
+        .filter((entry) => entry.source === "project" &&
+        !entry.trusted &&
+        entry.skipReason === "project is not trusted");
+    if (!interactive && pendingTrust.length > 0) {
+        process.stderr.write(`atom-lite: skipping ${pendingTrust.length} untrusted project extension(s); run interactively to review\n`);
+    }
+    await extensionLoader.loadAll().catch(() => {
         // Extension failures are reported per extension.
     });
+    // Remove any previously bridged extension providers before re-bridging.
+    for (const name of extensionProviderNames) {
+        delete config.providers[name];
+    }
+    extensionProviderNames.clear();
+    // Bridge Pi-style extension providers into Atom-lite's config so they
+    // appear in /provider, /model, and the command palette.
+    for (const loaded of extensionLoader.list()) {
+        for (const [name, provider] of (loaded.registries?.providers ?? new Map())) {
+            const cfg = provider?.config ?? {};
+            const firstModel = Array.isArray(cfg.models) && cfg.models.length > 0
+                ? (cfg.models[0].id ?? cfg.models[0].name ?? "default")
+                : "default";
+            const apiKey = resolveExtensionApiKey(cfg.apiKey);
+            const headers = { ...(cfg.headers ?? {}) };
+            if (cfg.authHeader && apiKey)
+                headers.Authorization = `Bearer ${apiKey}`;
+            config.providers[name] = {
+                type: "openai-compatible",
+                baseUrl: cfg.baseUrl,
+                model: firstModel,
+                apiKey: apiKey ?? null,
+                apiKeyEnv: null,
+                headers,
+                contextWindow: cfg.models?.[0]?.contextWindow,
+            };
+            extensionProviderNames.add(name);
+        }
+    }
+    const extensionTools = collectExtensionTools(extensionLoader);
+    const allTools = [...builtInTools, ...extensionTools];
+    const extensionDispatch = async (event, payload) => {
+        const results = [];
+        for (const loaded of extensionLoader.list()) {
+            const handlers = loaded.registries.handlers.get(event);
+            if (!handlers)
+                continue;
+            for (const handler of handlers) {
+                try {
+                    results.push(await handler(payload, loaded.context ?? {}));
+                }
+                catch (error) {
+                    // eslint-disable-next-line no-console
+                    console.error(`[extension:${loaded.id}] handler error: ${error instanceof Error ? error.message : String(error)}`);
+                }
+            }
+        }
+        return results;
+    };
     const contextManager = new ContextManager({
         systemPrompt: "You are a coding assistant.",
         maxInputTokens: config.context.maxInputTokens ?? null,
         reserveOutputTokens: config.context.reserveOutputTokens,
         compactAtPercent: config.context.compactAtPercent,
         maxProjectInstructionBytes: config.context.maxProjectInstructionBytes,
+        compactEveryNTurns: config.context.compactEveryNTurns ?? 0,
         provider,
         model: modelOverride ?? "default",
         userInstructionsPath: undefined,
@@ -178,13 +269,14 @@ export async function run(args) {
         provider,
         model: modelOverride,
         workspace: process.cwd(),
-        tools: builtInTools,
+        tools: allTools,
         approvals,
         contextManager,
+        extensionDispatch,
         bashConcurrency: config.runtime.bashConcurrency,
     });
     mcpManager.onToolsChanged = () => {
-        runtime.setTools([...builtInTools, ...createMcpTools(mcpManager)]);
+        runtime.setTools([...builtInTools, ...extensionTools, ...createMcpTools(mcpManager)]);
     };
     if (oneShot || !interactive) {
         // non-interactive / one-shot path
@@ -194,7 +286,7 @@ export async function run(args) {
         try {
             if (useTools) {
                 await mcpManager.syncTools();
-                runtime.setTools([...builtInTools, ...createMcpTools(mcpManager)]);
+                runtime.setTools([...builtInTools, ...extensionTools, ...createMcpTools(mcpManager)]);
             }
             const result = await runtime.runAgentTurn(oneShot || " ", session, controller.signal);
             if (jsonMode) {
@@ -218,14 +310,14 @@ export async function run(args) {
         return;
     }
     // ---- Interactive TUI (first-class) ----
-    const { TuiMainScreen, Text, Input, Editor, Container, Spacer, ScrollView, Loader, Markdown, Box } = await import("@earendil-works/pi-tui");
-    const terminal = new ProcessTerminal();
-    const tui = new TuiMainScreen(terminal);
+    const { TuiAltScreen, Text, Input, Editor, Container, Spacer, ScrollView, VStack, Loader, Markdown, Box } = await import("@earendil-works/pi-tui");
     const mouseEnabled = shouldEnableMouse({
         interactive,
         configured: config.ui.mouse,
         stdoutIsTTY: process.stdout.isTTY === true,
     });
+    const terminal = new ProcessTerminal();
+    const tui = new TuiAltScreen(terminal, false, undefined, { mouse: mouseEnabled });
     const mouseCapture = createMouseCapture((data) => terminal.write(data));
     let effortLevel = "medium";
     runtime.setEffort(effortLevel);
@@ -308,14 +400,16 @@ export async function run(args) {
         input.setAutocompleteProvider(new CombinedAutocompleteProvider(commandRegistry.autocomplete(), process.cwd()));
     }
     input.setAutocompleteProvider(new CombinedAutocompleteProvider(commandRegistry.autocomplete(), process.cwd()));
-    tui.addChild(output);
-    tui.addChild(new Spacer());
-    tui.addChild(input);
-    tui.addChild(statusBar);
+    const root = new VStack([]);
+    root.addChild(output, { grow: 1 });
+    root.addChild(new Spacer(1));
+    root.addChild(input);
+    root.addChild(statusBar);
     // folder:branch info below the status line, dimmed
-    tui.addChild(header);
+    root.addChild(header);
     const dropdownContainer = new Container();
-    tui.addChild(dropdownContainer);
+    root.addChild(dropdownContainer);
+    tui.setLayoutRoot(root);
     tui.setFocus(input);
     if (!noColor) {
         try {
@@ -331,6 +425,27 @@ export async function run(args) {
             // COLORFGBG/dark fallback.
         }
     }
+    class ThinkingBlock {
+        buffer = "";
+        render(width) {
+            const lines = [theme.tokens.dim("💭 thinking")];
+            const sep = theme.tokens.dim("│ ");
+            const contentWidth = Math.max(1, width - 2);
+            const logicalLines = this.buffer.length > 0 ? this.buffer.split("\\n") : [""];
+            for (const logical of logicalLines) {
+                const wrapped = wrapTextWithAnsi(logical, contentWidth);
+                if (wrapped.length === 0) {
+                    lines.push(sep);
+                }
+                else {
+                    for (const part of wrapped)
+                        lines.push(sep + theme.tokens.dim(part));
+                }
+            }
+            return lines;
+        }
+        invalidate() { }
+    }
     let thinkingText = null;
     let thinkingBuffer = "";
     let showThinking = config.ui.showThinking;
@@ -348,29 +463,82 @@ export async function run(args) {
         closeActiveOverlay = undefined;
         close?.();
     }
-    function appendLine(text) {
+    function appendLine(text, style = theme.tokens.text) {
         if (thinkingText) {
             thinkingText = null;
             thinkingBuffer = "";
         }
         streamText.finalize();
-        transcript.addLine(text);
+        transcript.add(new Text(style(text)));
         tui.requestRender();
     }
     function appendDelta(delta) {
         streamText.append(delta);
         tui.requestRender();
     }
+    /** Review project-local extensions once per project decision. */
+    function maybeReviewProjectTrust() {
+        if (uiModalOpen)
+            return;
+        const pending = extensionLoader
+            .discover()
+            .filter((entry) => entry.source === "project" &&
+            !entry.trusted &&
+            entry.skipReason === "project is not trusted");
+        if (pending.length === 0)
+            return;
+        uiModalOpen = true;
+        closeOverlay();
+        dropdownContainer.clear();
+        const prompt = new ProjectTrustPrompt(pending.map((entry) => ({
+            id: entry.id,
+            entryPath: entry.entryPath,
+            version: entry.manifest?.version,
+            capabilities: entry.manifest?.capabilities ?? [],
+        })), process.cwd(), (decision) => {
+            uiModalOpen = false;
+            dropdownContainer.clear();
+            tui.setFocus(input);
+            if (decision === "approve") {
+                trustProject(process.cwd());
+                appendLine("approved project extensions");
+            }
+            else {
+                denyProject(process.cwd());
+                appendLine("denied project extensions");
+            }
+            void extensionLoader
+                .loadAll()
+                .then(() => {
+                runtime.setTools([
+                    ...builtInTools,
+                    ...collectExtensionTools(extensionLoader),
+                    ...createMcpTools(mcpManager),
+                ]);
+                appendLine(`extensions: ${extensionLoader.list().length} processed (see /extensions)`);
+                tui.requestRender();
+            })
+                .catch((error) => {
+                appendLine(`extensions: reload failed: ${error instanceof Error ? error.message : String(error)}`);
+            });
+        });
+        dropdownContainer.addChild(prompt);
+        tui.setFocus(prompt);
+        tui.requestRender();
+    }
     function thinkingBody() {
         return thinkingBuffer
             .split("\n")
-            .map((line) => theme.tokens.dim(`| ${line}`))
+            .map((line) => theme.tokens.dim(`│ ${line}`))
             .join("\n");
     }
     function finalizeText() {
         streamText.finalize();
     }
     let activeTurnController = null;
+    const messageQueue = [];
+    const steeringQueue = [];
+    runtime.setSteeringQueue(steeringQueue);
     /** Run one interactive turn while keeping the status bar's activity fresh. */
     async function runTurn(prompt) {
         activity.start("formulating");
@@ -379,7 +547,7 @@ export async function run(args) {
         try {
             if (useTools) {
                 await mcpManager.syncTools();
-                runtime.setTools([...builtInTools, ...createMcpTools(mcpManager)]);
+                runtime.setTools([...builtInTools, ...extensionTools, ...createMcpTools(mcpManager)]);
             }
             await runtime.runAgentTurn(prompt, session, controller.signal);
         }
@@ -394,6 +562,11 @@ export async function run(args) {
         finally {
             activeTurnController = null;
             activity.stop();
+            if (messageQueue.length > 0) {
+                const next = messageQueue.shift();
+                appendLine(`> ${next}`, theme.tokens.user);
+                void runTurn(next);
+            }
         }
     }
     function updateStatus() {
@@ -467,6 +640,17 @@ export async function run(args) {
     refreshContextWindow();
     const MODEL_CACHE_TTL_MS = 5 * 60 * 1000;
     const modelCache = new Map();
+    for (const loaded of extensionLoader.list()) {
+        for (const [name, provider] of (loaded.registries?.providers ?? new Map())) {
+            const cfg = provider?.config ?? {};
+            const models = Array.isArray(cfg.models)
+                ? cfg.models.map((m) => m.id ?? m.name).filter(Boolean)
+                : [];
+            if (models.length > 0) {
+                modelCache.set(name, { models, at: Date.now() });
+            }
+        }
+    }
     function profileConfig(profile) {
         return config.providers[profile];
     }
@@ -927,6 +1111,7 @@ export async function run(args) {
         updateStatus,
         runDoctor,
         runMcp,
+        runCompact,
         runExport,
         openModelPicker,
         openProviderPicker,
@@ -935,10 +1120,22 @@ export async function run(args) {
         openSessionsPicker,
         searchSessions: searchSessionsInStore,
         renameSession,
-        listExtensions: () => extensionLoader
-            .list()
-            .map((ext) => `${ext.id}\t${ext.source}\t${ext.status}${ext.error ? `\t${ext.error}` : ""}`)
-            .join("\n") || "No extensions loaded.",
+        listExtensions: () => {
+            const report = extensionLoader.report();
+            if (report.length === 0)
+                return "No extensions discovered.";
+            return report
+                .map((ext) => {
+                const origin = ext.origin ? `${ext.source}:${ext.origin}` : ext.source;
+                const version = ext.version ? `v${ext.version}` : "-";
+                const counts = `${ext.toolCount} tools / ${ext.commandCount} commands`;
+                const error = ext.error ? `\t${ext.error}` : "";
+                return `${ext.id}\t${origin}\t${version}\t${ext.status}\t${counts}\t${ext.entryPath}${error}`;
+            })
+                .join("\n");
+        },
+        extensionDoctor: () => extensionLoader.doctor(),
+        reloadExtensions,
         switchModel: switchModelTarget,
         startProviderSetup,
         setEffort: setEffortTarget,
@@ -1164,6 +1361,108 @@ export async function run(args) {
         }
         tui.requestRender();
     }
+    async function reloadExtensions() {
+        const previous = extensionLoader.list();
+        // Emit session_shutdown and extension_unload before unloading.
+        for (const loaded of previous) {
+            const handlers = loaded.registries?.handlers?.get?.("session_shutdown");
+            if (handlers) {
+                for (const handler of handlers) {
+                    try {
+                        await handler({ type: "session_shutdown", reason: "reload" }, (loaded.context ?? {}));
+                    }
+                    catch (error) {
+                        appendLine(`extension shutdown error: ${error instanceof Error ? error.message : String(error)}`);
+                    }
+                }
+            }
+        }
+        await extensionLoader.unloadAll();
+        try {
+            await extensionLoader.loadAll();
+        }
+        catch (error) {
+            appendLine(`extensions: reload failed: ${error instanceof Error ? error.message : String(error)}`);
+            tui.requestRender();
+            return;
+        }
+        // Remove previously bridged providers, then re-bridge.
+        for (const name of extensionProviderNames) {
+            delete config.providers[name];
+            modelCache.delete(name);
+        }
+        extensionProviderNames.clear();
+        for (const loaded of extensionLoader.list()) {
+            for (const [name, provider] of (loaded.registries?.providers ?? new Map())) {
+                const cfg = provider?.config ?? {};
+                const firstModel = Array.isArray(cfg.models) && cfg.models.length > 0
+                    ? (cfg.models[0].id ?? cfg.models[0].name ?? "default")
+                    : "default";
+                const apiKey = resolveExtensionApiKey(cfg.apiKey);
+                const headers = { ...(cfg.headers ?? {}) };
+                if (cfg.authHeader && apiKey)
+                    headers.Authorization = `Bearer ${apiKey}`;
+                config.providers[name] = {
+                    type: "openai-compatible",
+                    baseUrl: cfg.baseUrl,
+                    model: firstModel,
+                    apiKey: apiKey ?? null,
+                    apiKeyEnv: null,
+                    headers,
+                    contextWindow: cfg.models?.[0]?.contextWindow,
+                };
+                extensionProviderNames.add(name);
+                const models = Array.isArray(cfg.models)
+                    ? cfg.models.map((m) => m.id ?? m.name).filter(Boolean)
+                    : [];
+                if (models.length > 0)
+                    modelCache.set(name, { models, at: Date.now() });
+            }
+        }
+        // Re-apply extension tools.
+        try {
+            await mcpManager.syncTools();
+        }
+        catch {
+            // ignore
+        }
+        runtime.setTools([
+            ...builtInTools,
+            ...collectExtensionTools(extensionLoader),
+            ...createMcpTools(mcpManager),
+        ]);
+        // Emit session_start with reason reload.
+        for (const loaded of extensionLoader.list()) {
+            const handlers = loaded.registries?.handlers?.get?.("session_start");
+            if (handlers) {
+                for (const handler of handlers) {
+                    try {
+                        await handler({ type: "session_start", reason: "reload" }, (loaded.context ?? {}));
+                    }
+                    catch (error) {
+                        appendLine(`extension start error: ${error instanceof Error ? error.message : String(error)}`);
+                    }
+                }
+            }
+        }
+        appendLine(`extensions: ${extensionLoader.list().length} reloaded (see /extensions)`);
+        tui.requestRender();
+    }
+    // Wire interactive extension UI callbacks now that the TUI exists.
+    extensionUICallbacks.notify = (message, type) => {
+        const style = type === "error"
+            ? theme.tokens.error
+            : type === "warning"
+                ? theme.tokens.warning
+                : theme.tokens.accent;
+        appendLine(`${style(`[ext]`)} ${message}`);
+    };
+    extensionUICallbacks.requestRender = () => tui.requestRender();
+    extensionUICallbacks.getToolsExpanded = () => expandTools;
+    extensionUICallbacks.setToolsExpanded = (expanded) => {
+        if (expandTools !== expanded)
+            toggleTools();
+    };
     function toggleToolBoxAtScreenRow(screenY) {
         const width = terminal.columns;
         const outputHeight = Math.max(1, output.viewportHeight || output.render(width).length);
@@ -1189,6 +1488,9 @@ export async function run(args) {
         const event = parseSgrMouse(data);
         if (!event)
             return undefined;
+        // Let the alt-screen TUI own wheel scrolling; only intercept clicks.
+        if (event.type === "wheel")
+            return undefined;
         if (!mouseEnabled)
             return { consume: true };
         handleMouseEvent(event, {
@@ -1227,18 +1529,19 @@ export async function run(args) {
             if (!showThinking)
                 return;
             if (!thinkingText) {
-                thinkingText = new Text(theme.tokens.dim("Thinking..."));
+                thinkingText = new ThinkingBlock();
                 transcript.add(thinkingText);
                 thinkingBuffer = "";
             }
             thinkingBuffer += e.text;
-            thinkingText.setText(`${theme.tokens.dim("Thinking...")}\n${thinkingBody()}`);
+            thinkingText.buffer = thinkingBuffer;
+            transcript.invalidate();
             tui.requestRender();
         }
         else if (e.type === "assistant_delta") {
             activity.setPhase("working");
             if (thinkingText) {
-                thinkingText.setText(`${theme.tokens.dim("Thinking...")}\n${thinkingBody()}\n${theme.tokens.dim("| end")}`);
+                transcript.invalidate();
                 thinkingText = null;
                 thinkingBuffer = "";
             }
@@ -1247,7 +1550,7 @@ export async function run(args) {
         else if (e.type === "assistant_text") {
             activity.setPhase("working");
             if (thinkingText) {
-                thinkingText.setText(`${theme.tokens.dim("Thinking...")}\n${thinkingBody()}\n${theme.tokens.dim("| end")}`);
+                transcript.invalidate();
                 thinkingText = null;
                 thinkingBuffer = "";
             }
@@ -1330,7 +1633,7 @@ export async function run(args) {
             }
             if (useTools) {
                 await mcpManager.syncTools();
-                runtime.setTools([...builtInTools, ...createMcpTools(mcpManager)]);
+                runtime.setTools([...builtInTools, ...extensionTools, ...createMcpTools(mcpManager)]);
             }
             appendLine(formatMcpStatus(mcpManager.status()));
             return;
@@ -1483,6 +1786,19 @@ export async function run(args) {
         writeFileSync(outPath, lines.join("\\n"), "utf8");
         appendLine(`exported session to ${outPath}`);
     }
+    async function runCompact(args) {
+        const focus = (args ?? "").trim();
+        if (session.messages.length <= 6) {
+            appendLine("nothing to compact");
+            return;
+        }
+        const summary = await runtime.compactSession(session, focus || undefined);
+        if (!summary) {
+            appendLine("nothing to compact");
+            return;
+        }
+        appendLine(`compacted: ${summary.slice(0, 200)}`);
+    }
     input.onSubmit = async (value) => {
         const trimmed = value.trim();
         input.setText("");
@@ -1491,6 +1807,24 @@ export async function run(args) {
             return;
         }
         refreshCommandRegistry();
+        if (trimmed === "/steer" || trimmed.startsWith("/steer ")) {
+            const text = trimmed.slice("/steer".length).trim();
+            if (!text) {
+                appendLine("usage: /steer <message>");
+                tui.requestRender();
+                return;
+            }
+            if (activeTurnController) {
+                steeringQueue.push(text);
+                appendLine(`steering: ${text}`, theme.tokens.dim);
+            }
+            else {
+                appendLine(`> ${text}`, theme.tokens.user);
+                await runTurn(text);
+            }
+            tui.requestRender();
+            return;
+        }
         if (trimmed.startsWith("/")) {
             const result = await commandRegistry.dispatch(trimmed, commandContext);
             if (result.exit)
@@ -1506,7 +1840,13 @@ export async function run(args) {
             await commandRegistry.dispatch(`/${bare} ${trimmed.slice(bare.length)}`, commandContext);
             return;
         }
-        appendLine(`> ${trimmed}`);
+        if (activeTurnController) {
+            messageQueue.push(trimmed);
+            appendLine(`queued: ${trimmed}`, theme.tokens.dim);
+            tui.requestRender();
+            return;
+        }
+        appendLine(`> ${trimmed}`, theme.tokens.user);
         await runTurn(trimmed);
     };
     approvals.handler = interactive
@@ -1537,8 +1877,8 @@ export async function run(args) {
         });
     });
     tui.start();
+    maybeReviewProjectTrust();
     if (mouseEnabled) {
-        mouseCapture.enable();
         process.once("exit", () => mouseCapture.disable());
         if (process.platform !== "win32") {
             process.on("SIGTSTP", () => {