@slopus/rig 0.0.3 → 0.0.6

package/dist/app/CodingAssistantApp.js

@@ -4,6 +4,7 @@ import { basename, join } from "node:path";
 import { CURSOR_MARKER, Editor, matchesKey, truncateToWidth, visibleWidth, wrapTextWithAnsi, } from "@earendil-works/pi-tui";
 import { formatSkillInvocation, loadSkills, } from "../agent/index.js";
 import { parseSkillFrontmatter } from "../agent/skills/parseSkillFrontmatter.js";
+import { createCodeReviewPrompt } from "../review/index.js";
 import { createSelectionPanel } from "./createSelectionPanel.js";
 import { createSlashCommands } from "./createSlashCommands.js";
 import { describeModelChoice } from "./describeModelChoice.js";
@@ -13,9 +14,14 @@ import { formatActivityElapsedTime } from "./formatActivityElapsedTime.js";
 import { FileMentionAutocomplete } from "./FileMentionAutocomplete.js";
 import { formatFileMention } from "./formatFileMention.js";
 import { humanizeReasoningLevel } from "./humanizeReasoningLevel.js";
+import { humanizePermissionMode } from "./humanizePermissionMode.js";
+import { humanizeGoalStatus } from "./humanizeGoalStatus.js";
+import { humanizeToolName } from "./humanizeToolName.js";
 import { readClipboardImage, } from "./readClipboardImage.js";
 import { ACTIVITY_WAVE_FRAME_COUNT, renderActivityWave } from "./renderActivityWave.js";
 import { renderAgentMarkdown } from "./renderAgentMarkdown.js";
+import { sanitizeTerminalText } from "./sanitizeTerminalText.js";
+import { upsertSubagentSummary } from "./upsertSubagentSummary.js";
 const RESET = "\x1b[0m";
 const BOLD = "\x1b[1m";
 const DIM = "\x1b[2m";
@@ -48,6 +54,8 @@ const IMAGE_PASTE_RAW_KEYS = new Set(["\x16", "\x1bv"]);
 const AUTOCOMPLETE_MAX_VISIBLE = 6;
 const BRACKETED_PASTE_START = "\x1b[200~";
 const BRACKETED_PASTE_END = "\x1b[201~";
+const TERMINAL_FOCUS_IN = "\x1b[I";
+const TERMINAL_FOCUS_OUT = "\x1b[O";
 const IMAGE_PLACEHOLDER_REGEX = /\[Image #(\d+) [A-Z0-9]+\]/gu;
 const IMAGE_CHIP_BG = "\x1b[48;5;240m";
 const IMAGE_CHIP_FG = "\x1b[38;5;255m";
@@ -73,6 +81,7 @@ export class CodingAssistantApp {
     #onDefaultModelChange;
     #onSettingsChange;
     #onExit;
+    #respondUserInput;
     #processManager;
     #readClipboardImage;
     #tui;
@@ -81,6 +90,8 @@ export class CodingAssistantApp {
     #abortController;
     #abortNotified = false;
     #activeRun;
+    #activeUserInput;
+    #answeringUserInputRequestId;
     #activityAnimationFrame = 0;
     #activityStartedAtMs;
     #activityAnimationTimer;
@@ -92,7 +103,10 @@ export class CodingAssistantApp {
     #exiting = false;
     #exitResolve;
     #focused = false;
+    #terminalFocused = true;
+    #freeformUserInput;
     #pendingPrompts = [];
+    #compacting = false;
     #pastedImagesById = new Map();
     #selectionPanel;
     #dismissedSlashCommandText;
@@ -101,6 +115,7 @@ export class CodingAssistantApp {
     #showReasoning;
     #sessionBacked;
     #modelLocked;
+    #mcpServers;
     #slashCommandSelectionIndex = 0;
     #slashCommands = createSlashCommands();
     #skillCommands = [];
@@ -115,8 +130,12 @@ export class CodingAssistantApp {
     #statusText = "Idle";
     #stopped = false;
     #streamEntryId;
+    #subagents;
+    #tasks;
     #thinkingEntryIdsByContentIndex = new Map();
     #toolCallEntryIdsByContentIndex = new Map();
+    #runningToolCallIds = new Set();
+    #userInputRequests = [];
     constructor(options) {
         this.#agent = options.agent;
         this.#cwd = options.cwd;
@@ -125,11 +144,15 @@ export class CodingAssistantApp {
         this.#onDefaultModelChange = options.onDefaultModelChange;
         this.#onSettingsChange = options.onSettingsChange;
         this.#onExit = options.onExit;
+        this.#respondUserInput = options.respondUserInput;
         this.#processManager = options.processManager;
         this.#readClipboardImage = options.readClipboardImage ?? readClipboardImage;
         this.#sessionBacked = options.sessionBacked ?? false;
         this.#showReasoning = options.showReasoning ?? false;
         this.#modelLocked = options.modelLocked ?? !options.agent.canChangeModel;
+        this.#mcpServers = options.initialMcpServers ?? [];
+        this.#subagents = options.initialSubagents ?? [];
+        this.#tasks = options.initialTasks ?? [];
         this.#tui = options.tui;
         this.#version = options.version ?? "0.0.0";
         this.#editor = new Editor(this.#tui, EDITOR_THEME, { paddingX: 0 });
@@ -143,6 +166,9 @@ export class CodingAssistantApp {
         this.#editor.onSubmit = (value) => {
             this.#submit(value);
         };
+        for (const request of options.initialUserInputs ?? []) {
+            this.#enqueueUserInputRequest(request);
+        }
         for (const event of options.initialSessionEvents ?? []) {
             this.applySessionEvent(event);
         }
@@ -153,14 +179,16 @@ export class CodingAssistantApp {
     }
     set focused(value) {
         this.#focused = value;
-        this.#editor.focused = value;
+        this.#editor.focused = value && this.#terminalFocused;
         this.#cursorVisible = true;
-        if (value) {
+        if (value && this.#terminalFocused) {
             this.#cursorTyping = false;
             this.#startCursorBlink();
         }
         else {
             this.#stopCursorBlink();
+            if (!this.#terminalFocused)
+                this.#cursorVisible = false;
         }
     }
     start(options = {}) {
@@ -222,6 +250,29 @@ export class CodingAssistantApp {
             this.#applyAgentMessage(event.data.message);
             return;
         }
+        if (event.type === "user_input_requested") {
+            this.#enqueueUserInputRequest(event.data);
+            return;
+        }
+        if (event.type === "user_input_resolved") {
+            this.#removeUserInputRequest(event.data.requestId);
+            return;
+        }
+        if (event.type === "mcp_servers_changed") {
+            this.#mcpServers = event.data.servers;
+            this.#requestRender();
+            return;
+        }
+        if (event.type === "tasks_changed") {
+            this.#tasks = event.data.tasks;
+            this.#requestRender();
+            return;
+        }
+        if (event.type === "subagent_changed") {
+            this.#subagents = upsertSubagentSummary(this.#subagents, event.data.subagent);
+            this.#requestRender();
+            return;
+        }
         if (event.type === "run_finished") {
             this.#running = false;
             this.#statusText =
@@ -230,6 +281,8 @@ export class CodingAssistantApp {
             this.#streamEntryId = undefined;
             this.#thinkingEntryIdsByContentIndex.clear();
             this.#toolCallEntryIdsByContentIndex.clear();
+            this.#runningToolCallIds.clear();
+            this.#clearUserInputRequests();
             this.#requestRender();
             return;
         }
@@ -237,6 +290,8 @@ export class CodingAssistantApp {
             this.#running = false;
             this.#statusText = "Error";
             this.#stopActivityAnimation();
+            this.#runningToolCallIds.clear();
+            this.#clearUserInputRequests();
             this.#appendEntry({ role: "error", text: event.data.errorMessage });
             return;
         }
@@ -247,6 +302,8 @@ export class CodingAssistantApp {
             this.#streamEntryId = undefined;
             this.#thinkingEntryIdsByContentIndex.clear();
             this.#toolCallEntryIdsByContentIndex.clear();
+            this.#runningToolCallIds.clear();
+            this.#clearUserInputRequests();
             this.#appendEntry({
                 role: "system",
                 text: "Session reset. Started a new session.",
@@ -272,6 +329,15 @@ export class CodingAssistantApp {
             });
             return;
         }
+        if (event.type === "permission_mode_changed") {
+            this.#appendEntry({
+                role: "event",
+                title: "permissions",
+                text: `Permissions changed to ${humanizePermissionMode(event.data.permissionMode)}.`,
+            });
+            this.#requestRender();
+            return;
+        }
     }
     async waitForIdle() {
         for (;;) {
@@ -291,15 +357,41 @@ export class CodingAssistantApp {
         if (this.#stopped || this.#exiting) {
             return;
         }
+        if (data === TERMINAL_FOCUS_IN || data === TERMINAL_FOCUS_OUT) {
+            this.#setTerminalFocused(data === TERMINAL_FOCUS_IN);
+            return;
+        }
         if (this.#selectionPanel !== undefined) {
             if (matchesKey(data, "ctrl+c") || data === "\x03") {
-                void this.stop();
+                this.#selectionPanel.handleInput?.("\x1b");
+                this.#requestRender();
                 return;
             }
             this.#selectionPanel.handleInput?.(data);
             this.#requestRender();
             return;
         }
+        if (this.#freeformUserInput !== undefined) {
+            if (this.#handlePastedInput(data))
+                return;
+            if (matchesKey(data, "ctrl+c") || data === "\x03") {
+                this.#handleCtrlC();
+                return;
+            }
+            if (matchesKey(data, "ctrl+d") && this.#editor.getText().length === 0) {
+                void this.stop();
+                return;
+            }
+            if (matchesKey(data, "escape")) {
+                this.#handleEscape();
+                this.#requestRender();
+                return;
+            }
+            this.#markTypingActivity();
+            this.#editor.handleInput(data);
+            this.#requestRender();
+            return;
+        }
         if (this.#handlePastedInput(data)) {
             return;
         }
@@ -307,13 +399,18 @@ export class CodingAssistantApp {
             return;
         }
         if (matchesKey(data, "ctrl+c") || data === "\x03") {
-            void this.stop();
+            this.#handleCtrlC();
             return;
         }
         if (matchesKey(data, "ctrl+d") && this.#editor.getText().length === 0) {
             void this.stop();
             return;
         }
+        if (this.#running && matchesKey(data, "escape")) {
+            this.#handleEscape();
+            this.#requestRender();
+            return;
+        }
         const previousSlashCommandSuggestionCount = this.#slashCommandSuggestions().length;
         const previousFileMentionSuggestionCount = this.#fileMentionSnapshot()?.items.length ?? 0;
         if (this.#handleSlashCommandAutocompleteInput(data)) {
@@ -321,6 +418,12 @@ export class CodingAssistantApp {
             this.#requestRender(nextSlashCommandSuggestionCount < previousSlashCommandSuggestionCount);
             return;
         }
+        if (this.#running &&
+            matchesKey(data, "tab") &&
+            previousFileMentionSuggestionCount === 0 &&
+            this.#queueCurrentInput()) {
+            return;
+        }
         if (this.#fileMentionAutocomplete?.handleInput(data, this.#editor.getLines(), this.#editor.getCursor(), (path, context) => this.#completeFileMention(path, context)) === true) {
             const nextFileMentionSuggestionCount = this.#fileMentionSnapshot()?.items.length ?? 0;
             this.#requestRender(nextFileMentionSuggestionCount < previousFileMentionSuggestionCount);
@@ -478,6 +581,7 @@ export class CodingAssistantApp {
             ...header,
             ...this.#renderTranscript(safeWidth),
             "",
+            ...this.#renderQueuedPrompts(safeWidth),
             ...(this.#selectionPanel === undefined
                 ? input
                 : this.#selectionPanel.render(safeWidth)),
@@ -488,6 +592,10 @@ export class CodingAssistantApp {
         ];
     }
     #submit(value) {
+        if (this.#freeformUserInput !== undefined) {
+            this.#submitFreeformUserInput(value);
+            return;
+        }
         const submission = this.#submitAsync(value).catch((error) => {
             this.#appendEntry({ role: "error", text: this.#formatError(error) });
         });
@@ -500,6 +608,14 @@ export class CodingAssistantApp {
         this.#activeSubmission = trackedSubmission;
     }
     async #submitAsync(value) {
+        if (this.#compacting) {
+            this.#appendEntry({
+                role: "event",
+                title: "compact",
+                text: "Wait for conversation compaction to finish before submitting.",
+            });
+            return;
+        }
         const submission = this.#createPromptSubmission(value);
         if (submission === undefined) {
             return;
@@ -512,20 +628,27 @@ export class CodingAssistantApp {
             this.#requestRender();
             return;
         }
+        if (prompt === "/compact") {
+            await this.#compactSession();
+            this.#requestRender();
+            return;
+        }
         if (this.#handleCommand(prompt)) {
             this.#requestRender();
             return;
         }
         this.#modelLocked = true;
+        if (this.#running) {
+            await this.#agent.steer(submission.content, { displayText: submission.displayText });
+            this.#clearSubmittedImages(prompt);
+            if (!this.#sessionBacked)
+                this.#appendEntry({ role: "user", text: prompt });
+            this.#requestRender();
+            return;
+        }
         if (!this.#sessionBacked) {
             this.#appendEntry({ role: "user", text: prompt });
-        }
-        if (this.#running && !this.#sessionBacked) {
-            this.#appendEntry({
-                role: "event",
-                title: "queue",
-                text: `Queued behind the active run.`,
-            });
+            submission.transcriptAppended = true;
         }
         this.#pendingPrompts.push(submission);
         this.#startDrainQueue();
@@ -536,8 +659,7 @@ export class CodingAssistantApp {
         if (prompt.length === 0) {
             return undefined;
         }
-        const content = this.#contentFromPrompt(prompt);
-        this.#clearSubmittedImages(prompt);
+        const content = createCodeReviewPrompt(prompt) ?? this.#contentFromPrompt(prompt);
         return {
             content,
             displayText: prompt,
@@ -620,6 +742,12 @@ export class CodingAssistantApp {
         }
         const expandedPrompt = formatSkillInvocation(skill, parseSkillFrontmatter(content).body, parsed[2] ?? "");
         this.#modelLocked = true;
+        if (this.#running) {
+            await this.#agent.steer(expandedPrompt, { displayText: prompt });
+            if (!this.#sessionBacked)
+                this.#appendEntry({ role: "user", text: prompt });
+            return;
+        }
         if (!this.#sessionBacked) {
             this.#appendEntry({ role: "user", text: prompt });
         }
@@ -634,6 +762,13 @@ export class CodingAssistantApp {
         this.#startDrainQueue();
     }
     #handleCommand(prompt) {
+        if (prompt === "/goal" || prompt.startsWith("/goal ")) {
+            void this.#handleGoalCommand(prompt).catch((error) => {
+                this.#appendEntry({ role: "error", text: this.#formatError(error) });
+                this.#requestRender();
+            });
+            return true;
+        }
         if (prompt === "/model") {
             this.#openModelMenu();
             return true;
@@ -649,6 +784,22 @@ export class CodingAssistantApp {
             this.#openConfigureMenu();
             return true;
         }
+        if (prompt === "/permissions" || prompt === "/permission") {
+            this.#openPermissionsMenu();
+            return true;
+        }
+        if (prompt === "/mcp") {
+            this.#showMcpStatus();
+            return true;
+        }
+        if (prompt === "/tasks" || prompt === "/todos") {
+            this.#showTasks();
+            return true;
+        }
+        if (prompt === "/agents") {
+            this.#showSubagents();
+            return true;
+        }
         if (prompt === "/new") {
             this.#resetSession();
             return true;
@@ -677,6 +828,145 @@ export class CodingAssistantApp {
         }
         return false;
     }
+    async #handleGoalCommand(prompt) {
+        const argument = prompt.slice("/goal".length).trim();
+        const goal = this.#agent.goal;
+        if (argument.length === 0) {
+            this.#appendEntry({
+                role: "event",
+                title: "goal",
+                text: goal === undefined
+                    ? "No goal is set. Use /goal followed by an objective to start one."
+                    : `Status: ${humanizeGoalStatus(goal.status)}\nObjective: ${goal.objective}\n\nCommands: /goal pause, /goal resume, /goal clear`,
+            });
+            return;
+        }
+        if (argument === "pause" || argument === "resume") {
+            if (this.#agent.changeGoalStatus === undefined) {
+                throw new Error("Goal controls are unavailable in this session.");
+            }
+            const status = argument === "pause" ? "paused" : "active";
+            await this.#agent.changeGoalStatus(status);
+            this.#appendEntry({
+                role: "event",
+                title: "goal",
+                text: argument === "pause" ? "Goal paused." : "Goal resumed.",
+            });
+            return;
+        }
+        if (argument === "clear") {
+            if (this.#agent.clearGoal === undefined) {
+                throw new Error("Goal controls are unavailable in this session.");
+            }
+            await this.#agent.clearGoal();
+            this.#appendEntry({ role: "event", title: "goal", text: "Goal cleared." });
+            return;
+        }
+        if (this.#agent.setGoal === undefined) {
+            throw new Error("Goal controls are unavailable in this session.");
+        }
+        await this.#agent.setGoal(argument);
+        this.#appendEntry({
+            role: "event",
+            title: "goal",
+            text: `Goal started: ${argument}`,
+        });
+    }
+    #showMcpStatus() {
+        if (this.#mcpServers.length === 0) {
+            this.#appendEntry({
+                role: "event",
+                title: "MCP servers",
+                text: "No MCP servers have connected in this session.",
+            });
+            return;
+        }
+        const text = this.#mcpServers
+            .map((server) => {
+            if (server.status === "connected") {
+                return `${server.name}: connected with ${server.toolCount} tool${server.toolCount === 1 ? "" : "s"}`;
+            }
+            if (server.status === "disabled")
+                return `${server.name}: disabled`;
+            return `${server.name}: could not connect${server.errorMessage === undefined ? "" : ` — ${server.errorMessage}`}`;
+        })
+            .join("\n");
+        this.#appendEntry({ role: "event", title: "MCP servers", text });
+    }
+    #showTasks() {
+        if (this.#tasks.length === 0) {
+            this.#appendEntry({
+                role: "event",
+                title: "Tasks",
+                text: "No tasks are being tracked in this session.",
+            });
+            return;
+        }
+        const status = {
+            completed: "Completed",
+            in_progress: "In progress",
+            pending: "Pending",
+        };
+        this.#appendEntry({
+            role: "event",
+            title: "Tasks",
+            text: this.#tasks
+                .map((task) => `#${task.id} · ${status[task.status]} · ${task.subject}`)
+                .join("\n"),
+        });
+    }
+    #showSubagents() {
+        if (this.#subagents.length === 0) {
+            this.#appendEntry({
+                role: "event",
+                title: "Subagents",
+                text: "No delegated work has been started in this session.",
+            });
+            return;
+        }
+        const labels = {
+            aborted: "Stopped",
+            completed: "Completed",
+            error: "Failed",
+            idle: "Idle",
+            queued: "Queued",
+            running: "Running",
+        };
+        this.#appendEntry({
+            role: "event",
+            title: "Subagents",
+            text: this.#subagents
+                .map((subagent) => `${labels[subagent.status]} · ${subagent.description}`)
+                .join("\n"),
+        });
+    }
+    async #compactSession() {
+        if (this.#compacting || this.#running || this.#pendingPrompts.length > 0) {
+            this.#appendEntry({
+                role: "event",
+                title: "compact",
+                text: "Wait for the active response to finish before compacting.",
+            });
+            return;
+        }
+        this.#compacting = true;
+        this.#statusText = "Compacting conversation";
+        this.#requestRender();
+        try {
+            const result = await this.#agent.compact();
+            this.#appendEntry({
+                role: "event",
+                title: "compact",
+                text: result.compacted
+                    ? `Compacted ${result.compactedMessageCount} older messages. The full transcript remains visible.`
+                    : "There is not enough conversation history to compact yet.",
+            });
+        }
+        finally {
+            this.#compacting = false;
+            this.#statusText = "Idle";
+        }
+    }
     #resetSession() {
         this.#abortActiveRun({ silent: true });
         this.#runToken += 1;
@@ -688,6 +978,7 @@ export class CodingAssistantApp {
         this.#streamEntryId = undefined;
         this.#thinkingEntryIdsByContentIndex.clear();
         this.#toolCallEntryIdsByContentIndex.clear();
+        this.#runningToolCallIds.clear();
         this.#abortNotified = false;
         this.#statusText = "Idle";
         this.#agent.reset();
@@ -697,11 +988,14 @@ export class CodingAssistantApp {
         });
     }
     #startDrainQueue() {
-        if (this.#activeRun !== undefined) {
+        if (this.#activeRun !== undefined ||
+            this.#compacting ||
+            this.#pendingPrompts.length === 0) {
             return;
         }
         this.#activeRun = this.#drainQueue().finally(() => {
             this.#activeRun = undefined;
+            this.#startDrainQueue();
             this.#requestRender();
         });
     }
@@ -727,6 +1021,10 @@ export class CodingAssistantApp {
         this.#activityStartedAtMs = this.#now();
         this.#startActivityAnimation();
         this.#requestRender();
+        this.#clearSubmittedImages(prompt.displayText);
+        if (!this.#sessionBacked && prompt.transcriptAppended !== true) {
+            this.#appendEntry({ role: "user", text: prompt.displayText });
+        }
         try {
             await this.#refreshSkillCommands({ force: true });
             if (!this.#isCurrentRun(runToken)) {
@@ -783,10 +1081,19 @@ export class CodingAssistantApp {
         }
     }
     #handleEscape() {
-        if (this.#abortActiveRun()) {
+        this.#restoreQueuedPromptsToComposer();
+        this.#abortActiveRun();
+    }
+    #restoreQueuedPromptsToComposer() {
+        if (this.#pendingPrompts.length === 0)
             return;
-        }
-        void this.stop();
+        const draft = this.#editor.getText().trim();
+        const restored = this.#pendingPrompts.map((prompt) => prompt.displayText);
+        if (draft.length > 0)
+            restored.push(draft);
+        this.#pendingPrompts = [];
+        this.#editor.setText(restored.join("\n"));
+        this.#syncAutocompleteState();
     }
     #abortActiveRun(options = {}) {
         if (!this.#running || this.#abortController === undefined) {
@@ -796,12 +1103,12 @@ export class CodingAssistantApp {
         this.#runToken += 1;
         controller.abort();
         this.#abortController = undefined;
-        this.#pendingPrompts = [];
         this.#running = false;
         this.#statusText = "Idle";
         this.#streamEntryId = undefined;
         this.#thinkingEntryIdsByContentIndex.clear();
         this.#toolCallEntryIdsByContentIndex.clear();
+        this.#runningToolCallIds.clear();
         this.#stopActivityAnimation();
         void this.#processManager.killAll({ forceAfterMs: 500 }).catch((error) => {
             this.#appendEntry({ role: "error", text: this.#formatError(error) });
@@ -862,6 +1169,23 @@ export class CodingAssistantApp {
         else if (event.type === "toolcall_end") {
             this.#finishToolCall(event.contentIndex, event.toolCall);
         }
+        else if (event.type === "tool_execution_start") {
+            this.#runningToolCallIds.add(event.toolCall.id);
+            this.#statusText = `Running ${this.#runningToolCallIds.size} tool${this.#runningToolCallIds.size === 1 ? "" : "s"}`;
+        }
+        else if (event.type === "tool_execution_end") {
+            this.#runningToolCallIds.delete(event.result.toolCallId);
+            this.#finishToolResult(event.result);
+            this.#statusText =
+                this.#runningToolCallIds.size === 0
+                    ? "Working"
+                    : `Running ${this.#runningToolCallIds.size} tool${this.#runningToolCallIds.size === 1 ? "" : "s"}`;
+        }
+        else if (event.type === "tool_execution_progress") {
+            const entry = this.#entries.find((candidate) => candidate.id === event.toolCallId);
+            if (entry !== undefined)
+                entry.detail = this.#singleLine(event.display);
+        }
         else if (event.type === "done") {
             this.#statusText = event.reason === "toolUse" ? "Running tools" : "Idle";
         }
@@ -925,7 +1249,7 @@ export class CodingAssistantApp {
                 this.#appendEntry({
                     id: block.id,
                     role: "tool",
-                    title: block.name,
+                    title: this.#toolDisplayName(block.name),
                     text: this.#formatToolCall(block.name, block.arguments),
                 });
             }
@@ -999,14 +1323,14 @@ export class CodingAssistantApp {
     }
     #finishToolCall(contentIndex, toolCall) {
         this.#seenToolCallIds.add(toolCall.id);
-        this.#statusText = `Calling ${toolCall.name}`;
+        this.#statusText = `Calling ${this.#toolDisplayName(toolCall.name)}`;
         const existingId = this.#toolCallEntryIdsByContentIndex.get(contentIndex);
         const existing = existingId === undefined
             ? undefined
             : this.#entries.find((entry) => entry.id === existingId);
         if (existing !== undefined) {
             existing.id = toolCall.id;
-            existing.title = toolCall.name;
+            existing.title = this.#toolDisplayName(toolCall.name);
             existing.text = this.#formatToolCall(toolCall.name, toolCall.arguments);
             this.#toolCallEntryIdsByContentIndex.delete(contentIndex);
             return;
@@ -1015,7 +1339,7 @@ export class CodingAssistantApp {
         this.#appendEntry({
             id: toolCall.id,
             role: "tool",
-            title: toolCall.name,
+            title: this.#toolDisplayName(toolCall.name),
             text: this.#formatToolCall(toolCall.name, toolCall.arguments),
         });
     }
@@ -1124,6 +1448,9 @@ export class CodingAssistantApp {
             return this.#renderAutocomplete(width, suggestions, selectedIndex);
         }
         const parts = [`${FOOTER_MODEL_FG}${this.#modelWithReasoningDisplayName()}${RESET}`];
+        if (this.#running) {
+            parts.push(`${FOOTER_QUEUED_FG}Enter steers · Tab queues${RESET}`);
+        }
         parts.push(`${FOOTER_CWD_FG}${this.#cwdDisplayName()}${RESET}`);
         if (this.#pendingPrompts.length > 0) {
             parts.push(`${FOOTER_QUEUED_FG}queued ${this.#pendingPrompts.length}${RESET}`);
@@ -1131,6 +1458,15 @@ export class CodingAssistantApp {
         const line = `${" ".repeat(visibleWidth(INPUT_PROMPT))}${parts.join(`${DIM} • ${RESET}`)}`;
         return [this.#fitLine(line, width)];
     }
+    #renderQueuedPrompts(width) {
+        return this.#pendingPrompts.flatMap((prompt) => {
+            const prefix = `${DIM}↳ queued${RESET} `;
+            const prefixWidth = visibleWidth(prefix);
+            const wrapped = wrapTextWithAnsi(prompt.displayText, Math.max(1, width - prefixWidth)).slice(0, 3);
+            const indent = " ".repeat(prefixWidth);
+            return wrapped.map((line, index) => this.#fitLine(`${index === 0 ? prefix : indent}${DIM}${line}${RESET}`, width));
+        });
+    }
     #renderAutocomplete(width, suggestions, selectedIndex, maxVisible = AUTOCOMPLETE_MAX_VISIBLE) {
         const rowWidth = Math.max(1, width - 1);
         const visibleCount = Math.max(1, Math.min(maxVisible, AUTOCOMPLETE_MAX_VISIBLE));
@@ -1295,6 +1631,221 @@ export class CodingAssistantApp {
         });
         this.#showSelectionPanel(panel);
     }
+    #openPermissionsMenu() {
+        const panel = createSelectionPanel({
+            title: "Choose Permissions",
+            subtitle: "Applies to this session and its subagents",
+            selectedValue: this.#agent.permissionMode,
+            items: [
+                {
+                    value: "auto",
+                    label: "Auto",
+                    description: "Automatically review risky actions; ask only when needed.",
+                },
+                {
+                    value: "workspace_write",
+                    label: "Workspace write",
+                    description: "Write in the workspace; block shell network access.",
+                },
+                {
+                    value: "read_only",
+                    label: "Read only",
+                    description: "Keep project files read only; allow temporary files.",
+                },
+                {
+                    value: "full_access",
+                    label: "Full access",
+                    description: "Allow unrestricted filesystem, shell, and network access.",
+                },
+            ],
+            onSelect: (item) => {
+                const mode = item.value;
+                this.#agent.setPermissionMode(mode);
+                if (!this.#sessionBacked) {
+                    this.#appendEntry({
+                        role: "event",
+                        title: "permissions",
+                        text: `Permissions changed to ${humanizePermissionMode(mode)}.`,
+                    });
+                }
+                this.#closeSelectionPanel();
+                this.#requestRender();
+            },
+            onCancel: () => this.#closeSelectionPanel(),
+        });
+        this.#showSelectionPanel(panel);
+    }
+    #enqueueUserInputRequest(request) {
+        if (this.#userInputRequests.some((candidate) => candidate.requestId === request.requestId)) {
+            return;
+        }
+        this.#userInputRequests.push(request);
+        this.#openNextUserInputRequest();
+    }
+    #openNextUserInputRequest() {
+        if (this.#activeUserInput !== undefined ||
+            this.#answeringUserInputRequestId !== undefined ||
+            this.#freeformUserInput !== undefined) {
+            return;
+        }
+        const request = this.#userInputRequests[0];
+        if (request === undefined)
+            return;
+        this.#activeUserInput = {
+            answers: {},
+            questionIndex: 0,
+            request,
+            selected: new Set(),
+        };
+        this.#openUserInputQuestion();
+    }
+    #openUserInputQuestion() {
+        const active = this.#activeUserInput;
+        const question = active?.request.questions[active.questionIndex];
+        if (active === undefined || question === undefined)
+            return;
+        const items = question.options.map((option, index) => ({
+            value: `option:${index}`,
+            label: active.selected.has(option.label) ? `✓ ${option.label}` : option.label,
+            description: option.description,
+        }));
+        if (question.multiSelect && active.selected.size > 0) {
+            items.push({
+                value: "done",
+                label: "Done",
+                description: `Submit ${active.selected.size} selected answer${active.selected.size === 1 ? "" : "s"}.`,
+            });
+        }
+        items.push({
+            value: "other",
+            label: "Type another answer",
+            description: "Enter a response that is not listed.",
+        });
+        this.#showSelectionPanel(createSelectionPanel({
+            title: question.header,
+            subtitle: `${question.question} · ${active.questionIndex + 1} of ${active.request.questions.length}`,
+            items,
+            onSelect: (item) => {
+                if (item.value === "other") {
+                    this.#freeformUserInput = {
+                        existingAnswers: [...active.selected],
+                        questionId: question.id,
+                        requestId: active.request.requestId,
+                    };
+                    this.#closeSelectionPanel();
+                    this.#editor.setText("");
+                    this.#requestRender();
+                    return;
+                }
+                if (item.value === "done") {
+                    this.#commitUserInputAnswer([...active.selected]);
+                    return;
+                }
+                const optionIndex = Number.parseInt(item.value.slice("option:".length), 10);
+                const option = question.options[optionIndex];
+                if (option === undefined)
+                    return;
+                if (!question.multiSelect) {
+                    this.#commitUserInputAnswer([option.label]);
+                    return;
+                }
+                if (active.selected.has(option.label))
+                    active.selected.delete(option.label);
+                else
+                    active.selected.add(option.label);
+                this.#openUserInputQuestion();
+                this.#requestRender();
+            },
+            onCancel: () => {
+                this.#closeSelectionPanel();
+                this.#handleEscape();
+            },
+        }));
+        this.#requestRender();
+    }
+    #commitUserInputAnswer(answers) {
+        const active = this.#activeUserInput;
+        const question = active?.request.questions[active.questionIndex];
+        if (active === undefined || question === undefined || answers.length === 0)
+            return;
+        active.answers[question.id] = [...answers];
+        active.questionIndex += 1;
+        active.selected = new Set();
+        if (active.questionIndex < active.request.questions.length) {
+            this.#openUserInputQuestion();
+            return;
+        }
+        this.#sendUserInputResponse(active.request, { answers: active.answers });
+    }
+    #submitFreeformUserInput(value) {
+        const answer = value.trim();
+        const freeform = this.#freeformUserInput;
+        const active = this.#activeUserInput;
+        if (answer.length === 0 || freeform === undefined || active === undefined)
+            return;
+        if (active.request.requestId !== freeform.requestId)
+            return;
+        if (active.request.questions[active.questionIndex]?.id !== freeform.questionId)
+            return;
+        this.#freeformUserInput = undefined;
+        this.#editor.setText("");
+        this.#commitUserInputAnswer([...freeform.existingAnswers, answer]);
+        this.#requestRender();
+    }
+    #sendUserInputResponse(request, response) {
+        this.#activeUserInput = undefined;
+        this.#closeSelectionPanel();
+        if (this.#respondUserInput === undefined) {
+            this.#appendEntry({
+                role: "error",
+                text: "This client cannot send interactive answers.",
+            });
+            this.#removeUserInputRequest(request.requestId);
+            this.#handleEscape();
+            return;
+        }
+        this.#answeringUserInputRequestId = request.requestId;
+        void Promise.resolve(this.#respondUserInput(request.requestId, response))
+            .then(() => this.#removeUserInputRequest(request.requestId))
+            .catch((error) => {
+            this.#answeringUserInputRequestId = undefined;
+            this.#appendEntry({
+                role: "error",
+                text: `The answer could not be sent: ${this.#formatError(error)}`,
+            });
+            this.#openNextUserInputRequest();
+            this.#requestRender();
+        });
+    }
+    #removeUserInputRequest(requestId) {
+        const wasActive = this.#activeUserInput?.request.requestId === requestId;
+        const wasFreeform = this.#freeformUserInput?.requestId === requestId;
+        this.#userInputRequests = this.#userInputRequests.filter((request) => request.requestId !== requestId);
+        if (wasActive)
+            this.#activeUserInput = undefined;
+        if (wasFreeform) {
+            this.#freeformUserInput = undefined;
+            this.#editor.setText("");
+        }
+        if (this.#answeringUserInputRequestId === requestId) {
+            this.#answeringUserInputRequestId = undefined;
+        }
+        if (wasActive || wasFreeform)
+            this.#closeSelectionPanel();
+        this.#openNextUserInputRequest();
+        this.#requestRender();
+    }
+    #clearUserInputRequests() {
+        const hadVisibleRequest = this.#activeUserInput !== undefined || this.#freeformUserInput !== undefined;
+        this.#userInputRequests = [];
+        this.#activeUserInput = undefined;
+        this.#answeringUserInputRequestId = undefined;
+        if (this.#freeformUserInput !== undefined)
+            this.#editor.setText("");
+        this.#freeformUserInput = undefined;
+        if (hadVisibleRequest)
+            this.#closeSelectionPanel();
+    }
     #showSelectionPanel(component) {
         this.#selectionPanel = component;
     }
@@ -1316,6 +1867,9 @@ export class CodingAssistantApp {
         const editorWidth = Math.max(1, width - promptWidth);
         const contentLines = this.#stripSpuriousLeadingEmptyLine(this.#stripEditorChrome(this.#editor.render(editorWidth)));
         return contentLines.map((line, index) => {
+            if (this.#isEditorScrollIndicator(line)) {
+                return this.#inputSurfaceLine(`${INPUT_LINE_INDENT}${DIM}${line}${RESET}`, width);
+            }
             const prefix = index === 0 ? this.#inputPrompt() : INPUT_LINE_INDENT;
             const rendered = `${prefix}${this.#styleImagePlaceholders(line)}`;
             return this.#inputSurfaceLine(this.#cursorVisible ? rendered : this.#hideCursor(rendered), width);
@@ -1326,15 +1880,15 @@ export class CodingAssistantApp {
         const detail = this.#formatToolResult(block);
         if (existing !== undefined) {
             existing.role = block.isError ? "error" : "tool";
-            existing.title = block.toolName;
+            existing.title = this.#toolDisplayName(block.toolName);
             existing.detail = detail;
             return;
         }
         this.#appendEntry({
             id: block.toolCallId,
             role: block.isError ? "error" : "tool",
-            title: block.toolName,
-            text: block.toolName,
+            title: this.#toolDisplayName(block.toolName),
+            text: this.#toolDisplayName(block.toolName),
             detail,
         });
     }
@@ -1345,6 +1899,14 @@ export class CodingAssistantApp {
             return typeof value === "string" && value.length > 0 ? value : undefined;
         };
         const normalized = toolName.toLowerCase();
+        if (normalized === "request_user_input" || normalized === "askuserquestion") {
+            const questions = record.questions;
+            const firstQuestion = Array.isArray(questions) ? questions[0] : undefined;
+            if (this.#isRecord(firstQuestion) && typeof firstQuestion.question === "string") {
+                return this.#singleLine(firstQuestion.question);
+            }
+            return "Waiting for your answer";
+        }
         const command = stringField("cmd") ?? stringField("command");
         if (command !== undefined) {
             return this.#singleLine(command);
@@ -1367,7 +1929,43 @@ export class CodingAssistantApp {
                 ? `${todos.length} todo${todos.length === 1 ? "" : "s"}`
                 : "todos";
         }
-        return toolName;
+        if (normalized === "taskcreate") {
+            return stringField("subject") ?? "Create task";
+        }
+        if (normalized === "taskget") {
+            const taskId = stringField("taskId");
+            return taskId === undefined ? "Read task" : `Read task ${taskId}`;
+        }
+        if (normalized === "taskupdate") {
+            const taskId = stringField("taskId");
+            return taskId === undefined ? "Update task" : `Update task ${taskId}`;
+        }
+        if (normalized === "tasklist")
+            return "Current tasks";
+        if (normalized === "agent") {
+            return stringField("description") ?? "Delegated work";
+        }
+        if (normalized === "spawn_agent") {
+            const taskName = stringField("task_name");
+            return taskName === undefined
+                ? "Start delegated work"
+                : taskName
+                    .replaceAll("_", " ")
+                    .replace(/^./u, (character) => character.toUpperCase());
+        }
+        if (normalized === "followup_task" || normalized === "sendmessage") {
+            return stringField("summary") ?? "Send follow-up work";
+        }
+        if (normalized === "wait_agent")
+            return "Wait for delegated work";
+        if (normalized === "list_agents")
+            return "Show delegated work";
+        if (normalized === "interrupt_agent")
+            return "Stop delegated work";
+        return this.#toolDisplayName(toolName);
+    }
+    #toolDisplayName(toolName) {
+        return humanizeToolName(toolName);
     }
     #formatToolResult(block) {
         return this.#singleLine(block.display.length > 0 ? block.display : "(empty result)");
@@ -1454,9 +2052,7 @@ export class CodingAssistantApp {
         if (!isError &&
             entry.title === PENDING_TOOL_CALL_TITLE &&
             entry.text === PENDING_TOOL_CALL_TITLE) {
-            return [
-                this.#fitLine(`${DIM}•${RESET} ${renderActivityWave(PENDING_TOOL_CALL_TITLE, this.#activityAnimationFrame)}`, width),
-            ];
+            return [this.#fitLine(`${DIM}• ${PENDING_TOOL_CALL_TITLE}${RESET}`, width)];
         }
         const toolName = entry.title ?? "tool";
         const verb = isError ? "Failed" : this.#toolVerb(toolName);
@@ -1481,12 +2077,13 @@ export class CodingAssistantApp {
         return wrapped.map((line, index) => this.#fitLine(`${index === 0 ? prefix : indent}${line}`, width));
     }
     #emptyInputLine() {
+        const placeholder = this.#freeformUserInput === undefined ? INPUT_PLACEHOLDER : "Type another answer";
         const marker = this.#focused ? CURSOR_MARKER : "";
         if (!this.#focused || !this.#cursorVisible) {
-            return `${this.#inputPrompt()}${marker}${SURFACE_MUTED_FG}${INPUT_PLACEHOLDER}${INPUT_FG}`;
+            return `${this.#inputPrompt()}${marker}${SURFACE_MUTED_FG}${placeholder}${INPUT_FG}`;
         }
-        const firstCharacter = INPUT_PLACEHOLDER[0] ?? " ";
-        const rest = INPUT_PLACEHOLDER.slice(firstCharacter.length);
+        const firstCharacter = placeholder[0] ?? " ";
+        const rest = placeholder.slice(firstCharacter.length);
         return `${this.#inputPrompt()}${marker}${CURSOR_BG}${CURSOR_FG}${firstCharacter}${RESET}${SURFACE_MUTED_FG}${rest}${INPUT_FG}`;
     }
     #surfaceLine(line, width) {
@@ -1532,21 +2129,14 @@ export class CodingAssistantApp {
         return this.#statusText;
     }
     #shouldRenderActivityAsLastMessage() {
-        if (this.#streamEntryId !== undefined) {
-            return false;
-        }
-        const lastEntry = this.#entries.at(-1);
-        return (lastEntry === undefined ||
-            lastEntry.role === "separator" ||
-            lastEntry.role === "user" ||
-            lastEntry.role === "system" ||
-            (lastEntry.role === "thinking" && !this.#showReasoning));
+        return this.#running || this.#compacting;
     }
     #renderActivityLine(label, width) {
         const prefix = `${RIG_ORANGE}•${RESET} `;
         const frame = this.#activityAnimationFrame;
         const elapsed = this.#activityElapsedText();
-        const elapsedSuffix = elapsed === undefined ? "" : ` ${DIM}${SURFACE_MUTED_FG}(${elapsed})${RESET}`;
+        const elapsedText = elapsed ?? "0s";
+        const elapsedSuffix = ` ${DIM}${SURFACE_MUTED_FG}(${elapsedText} • Esc to interrupt)${RESET}`;
         return [
             this.#fitLine(`${prefix}${renderActivityWave(label, frame)}${elapsedSuffix}`, width),
         ];
@@ -1819,7 +2409,7 @@ export class CodingAssistantApp {
         return typeof value === "object" && value !== null && !Array.isArray(value);
     }
     #singleLine(text) {
-        return text.replace(/\s+/gu, " ").trim();
+        return sanitizeTerminalText(text).replace(/\s+/gu, " ").trim();
     }
     #markTypingActivity() {
         this.#cursorTyping = true;
@@ -1841,7 +2431,11 @@ export class CodingAssistantApp {
         while (content.length > 0 && this.#isEditorBorderLine(content[content.length - 1] ?? "")) {
             content = content.slice(0, -1);
         }
-        return content.filter((line) => !line.includes(" more ") && !this.#isEditorBorderLine(line));
+        return content.filter((line) => !this.#isEditorBorderLine(line));
+    }
+    #isEditorScrollIndicator(line) {
+        const stripped = line.replace(/\x1b\[[0-9;]*m/g, "");
+        return stripped.includes(" more ") && (stripped.includes("↑") || stripped.includes("↓"));
     }
     #isEditorBorderLine(line) {
         const stripped = line.replace(/\x1b\[[0-9;]*m/g, "");
@@ -1901,7 +2495,7 @@ export class CodingAssistantApp {
             }
             this.#activityAnimationFrame =
                 (this.#activityAnimationFrame + 1) % ACTIVITY_WAVE_FRAME_COUNT;
-            if (this.#activityText() !== undefined && this.#shouldRenderActivityAsLastMessage()) {
+            if (this.#activityText() !== undefined) {
                 this.#requestRender();
             }
         }, ACTIVITY_ANIMATION_MS);
@@ -1928,4 +2522,43 @@ export class CodingAssistantApp {
             setTimeout(resolve, 25);
         });
     }
+    #handleCtrlC() {
+        if (this.#editor.getText().length > 0) {
+            this.#editor.setText("");
+            this.#fileMentionAutocomplete?.clear();
+            this.#dismissedSlashCommandText = undefined;
+            this.#pastedImagesById.clear();
+            this.#requestRender();
+            return;
+        }
+        if (this.#abortActiveRun())
+            return;
+        void this.stop();
+    }
+    #queueCurrentInput() {
+        const submission = this.#createPromptSubmission(this.#editor.getText());
+        if (submission === undefined)
+            return false;
+        this.#editor.setText("");
+        this.#fileMentionAutocomplete?.clear();
+        this.#modelLocked = true;
+        this.#pendingPrompts.push(submission);
+        this.#requestRender();
+        return true;
+    }
+    #setTerminalFocused(focused) {
+        if (this.#terminalFocused === focused)
+            return;
+        this.#terminalFocused = focused;
+        this.#editor.focused = this.#focused && focused;
+        if (focused && this.#focused) {
+            this.#cursorVisible = true;
+            this.#startCursorBlink();
+        }
+        else {
+            this.#stopCursorBlink();
+            this.#cursorVisible = false;
+        }
+        this.#requestRender();
+    }
 }