@xopcai/xopc 0.0.303 → 0.0.307

package/dist/src/tui/components/tui-bottom-bar.js

@@ -1,4 +1,5 @@
 import { theme } from "../theme.js";
+import { countPendingChatInputs } from "../tui-chat-input-state.js";
 import { formatContextUsageLabel } from "../tui-context-usage.js";
 import { getGitBranchCached } from "../tui-git-branch.js";
 import { formatActiveRunStatus } from "../tui-run-status-format.js";
@@ -95,7 +96,8 @@ var TuiBottomBar = class {
 		if (ctxLabel) leftParts.push(ctxLabel);
 		if (state.isCompacting) leftParts.push("compact…");
 		else if (state.compactionQueue.length > 0) leftParts.push(`C${state.compactionQueue.length}`);
-		if (state.pendingInputCount > 0) leftParts.push(`Q${state.pendingInputCount}`);
+		const pendingInputCount = countPendingChatInputs(state.chatInputState?.inputs ?? []);
+		if (pendingInputCount > 0) leftParts.push(`Q${pendingInputCount}`);
 		let statsLeft = leftParts.join(" · ");
 		const modelId = state.sessionInfo.model ?? "unknown";
 		const prov = state.sessionInfo.modelProvider;

package/dist/src/tui/components/user-message.d.ts

@@ -1,8 +1,12 @@
 import { Container } from '@earendil-works/pi-tui';
+import type { CellRenderMode, ModeAwareCell } from './cell-render-mode.js';
 export declare function normalizeUserContent(content: string | unknown[]): string;
-export declare class UserMessageComponent extends Container {
+export declare class UserMessageComponent extends Container implements ModeAwareCell {
     private body;
+    private content;
+    private renderMode;
     constructor(text: string | unknown[]);
     setText(text: string | unknown[]): void;
+    setRenderMode(mode: CellRenderMode): void;
     render(width: number): string[];
 }

package/dist/src/tui/components/user-message.js

@@ -1,5 +1,5 @@
 import { markdownTheme, theme } from "../theme.js";
-import { Box, Container, Markdown } from "@earendil-works/pi-tui";
+import { Box, Container, Markdown, Text } from "@earendil-works/pi-tui";
 //#region src/tui/components/user-message.ts
 const OSC133_ZONE_START = "\x1B]133;A\x07";
 const OSC133_ZONE_END = "\x1B]133;B\x07";
@@ -31,17 +31,28 @@ function normalizeUserContent(content) {
 }
 var UserMessageComponent = class extends Container {
 	body;
+	content;
+	renderMode = "compact";
 	constructor(text) {
 		super();
+		this.content = text;
 		this.body = new Markdown(normalizeUserContent(text), 1, 0, markdownTheme, { color: (line) => theme.userText(line) }, { preserveOrderedListMarkers: true });
 		const box = new Box(1, 1, (line) => theme.userBg(line));
 		box.addChild(this.body);
 		this.addChild(box);
 	}
 	setText(text) {
+		this.content = text;
 		this.body.setText(normalizeUserContent(text));
 	}
+	setRenderMode(mode) {
+		this.renderMode = mode;
+	}
 	render(width) {
+		if (this.renderMode === "raw") return new Text(JSON.stringify({
+			role: "user",
+			content: this.content
+		}, null, 2), 0, 0).render(width);
 		const lines = super.render(width);
 		if (lines.length === 0) return lines;
 		lines[0] = OSC133_ZONE_START + lines[0];

package/dist/src/tui/extension-host/load-extensions.d.ts

@@ -1,4 +1,4 @@
-import type { ExtensionRegistryImpl } from '../../extensions/loader.js';
+import type { ExtensionRegistryImpl } from '../../extensions/extension-registry-impl.js';
 /** Load activated extensions for embedded TUI (shared registry with AgentService). */
 export declare function loadExtensionsForTuiLocalMode(runtime?: {
     setLabel?: (entryId: string, label: string | undefined) => void;

package/dist/src/tui/extension-host/runtime-context.js

@@ -1,5 +1,6 @@
 import { getAllModels, getApiKey, init_providers } from "../../providers/index.js";
 import { theme } from "../theme.js";
+import { countPendingChatInputs } from "../tui-chat-input-state.js";
 import { computeContextUsagePercent } from "../tui-context-usage.js";
 //#region src/tui/extension-host/runtime-context.ts
 init_providers();
@@ -85,7 +86,7 @@ function isTuiIdle(state) {
 	return state.activeRunId == null && !state.isCompacting && !BUSY_ACTIVITY_STATUSES.has(state.activityStatus);
 }
 function hasPendingTuiMessages(state) {
-	return (state.pendingInputCount ?? 0) > 0 || (state.compactionQueue?.length ?? 0) > 0;
+	return countPendingChatInputs(state.chatInputState?.inputs ?? []) > 0 || (state.compactionQueue?.length ?? 0) > 0;
 }
 function getTuiContextUsage(state) {
 	const sessionInfo = state.sessionInfo;

package/dist/src/tui/extension-host/runtime.d.ts

@@ -1,5 +1,5 @@
 import { type Component, type AutocompleteItem, type AutocompleteProvider, type KeybindingsManager, type OverlayHandle, type OverlayOptions, type TUI } from '@earendil-works/pi-tui';
-import type { ExtensionRegistryImpl } from '../../extensions/loader.js';
+import type { ExtensionRegistryImpl } from '../../extensions/extension-registry-impl.js';
 import type { TuiAutocompleteSuggestion, TuiCompactOptions, TuiCompactResult, TuiEditorFactory, TuiForkOptions, TuiModelRegistry, TuiNavigateTreeOptions, TuiNewSessionOptions, TuiReasoningLevel, TuiReplacedSessionContext, TuiReplacementResult, TuiReadonlySessionManager, TuiSlashCommandContext, TuiShortcutHandler, TuiSlashCommandHandler, TuiSwitchSessionOptions, TuiSystemPromptOptions, TuiTerminalInputHandler, TuiSetThemeResult, TuiTheme, TuiThemeInfo, TuiThinkingLevel, TuiVerboseLevel, TuiWorkingIndicatorOptions } from '../../extensions/types/tui.js';
 import type { ChatLog } from '../components/chat-log.js';
 import type { TuiHeader } from '../components/tui-header.js';

package/dist/src/tui/format-tui-hotkeys.js

@@ -2,9 +2,16 @@ import { theme } from "./theme.js";
 import { XOPC_TUI_HOTKEY_ORDER } from "./xopc-tui-keybindings.js";
 import { getTuiKeybindingsPath } from "./tui-keybindings-file.js";
 //#region src/tui/format-tui-hotkeys.ts
+const KEY_DISPLAY = {
+	up: "↑",
+	down: "↓",
+	left: "←",
+	right: "→"
+};
 function formatKeyText(key, options = {}) {
 	return key.split("/").map((part) => part.split("+").map((keyPart) => {
-		const display = process.platform === "darwin" && keyPart.toLowerCase() === "alt" ? "option" : keyPart;
+		const normalized = keyPart.toLowerCase();
+		const display = KEY_DISPLAY[normalized] ?? (process.platform === "darwin" && normalized === "alt" ? "option" : keyPart);
 		return options.capitalize ? display.charAt(0).toUpperCase() + display.slice(1) : display;
 	}).join("+")).join("/");
 }

package/dist/src/tui/tui-agent-events.js

@@ -341,6 +341,37 @@ function dispatchAgentEvent(event, data, state, chatLog, tui, setActivityStatus,
 			tui.requestRender();
 			break;
 		}
+		case "task_plan_updated": {
+			const lines = (Array.isArray(p.items) ? p.items : []).flatMap((item) => {
+				if (!item || typeof item !== "object") return [];
+				const record = item;
+				const status = typeof record.status === "string" ? record.status : "pending";
+				const title = typeof record.title === "string" ? record.title : "";
+				return title ? [`[${status}] ${title}`] : [];
+			});
+			const planId = typeof p.planId === "string" ? p.planId : `${runId}:plan`;
+			chatLog.upsertSemanticCell(planId, {
+				kind: "plan",
+				title: typeof p.explanation === "string" && p.explanation.trim() ? p.explanation : "Execution plan",
+				lines,
+				raw: p
+			});
+			tui.requestRender();
+			break;
+		}
+		case "clarify_request": {
+			const requestId = typeof p.requestId === "string" ? p.requestId : `${runId}:question`;
+			const kind = p.kind === "approval" ? "approval" : "question";
+			const choices = Array.isArray(p.choices) ? p.choices.filter((choice) => typeof choice === "string") : [];
+			chatLog.upsertSemanticCell(requestId, {
+				kind,
+				title: typeof p.question === "string" ? p.question : kind === "approval" ? "Approval required" : "Input required",
+				lines: choices.map((choice) => `• ${choice}`),
+				raw: p
+			});
+			tui.requestRender();
+			break;
+		}
 	}
 }
 const DEFAULT_STREAMING_WATCHDOG_MS = 3e4;

package/dist/src/tui/tui-backend.d.ts

@@ -3,6 +3,9 @@ import type { SessionTimelineItem } from '../session/transcript-outline.js';
 import type { ExportFormat } from '../session/types.js';
 import type { ReviewContext } from '../review/review-git.js';
 import type { SessionInfo, TuiEventSource } from './tui-types.js';
+import type { TuiChatInputDelivery, TuiChatInputState } from './tui-chat-input-state.js';
+export type { TuiChatInput, TuiChatInputDelivery, TuiChatInputState, TuiChatInputStatus } from './tui-chat-input-state.js';
+export { countPendingChatInputs } from './tui-chat-input-state.js';
 /** Options for sending a chat message. */
 export interface ChatSendOptions {
     conversationId: string;
@@ -120,15 +123,6 @@ export interface TuiStartupResources {
     workflows: string[];
     connectors: string[];
 }
-export interface TuiChatInputState {
-    conversationId: string;
-    revision: number;
-    inputs: Array<{
-        id: string;
-        status: string;
-    }>;
-}
-export declare function countPendingChatInputs(inputs: readonly unknown[]): number;
 export interface TuiWorkspaceFileSearchEntry {
     name: string;
     path: string;
@@ -224,12 +218,30 @@ export interface TuiBackend {
     submitChatInput(opts: {
         conversationId: string;
         message: string;
-        delivery: 'next' | 'steer';
+        delivery: TuiChatInputDelivery;
     }): Promise<{
         ok: boolean;
-        effectiveDelivery?: 'next' | 'steer';
+        effectiveDelivery?: TuiChatInputDelivery;
+        state?: TuiChatInputState;
     }>;
     getChatInputState(conversationId: string): Promise<TuiChatInputState>;
+    updateChatInput(opts: {
+        conversationId: string;
+        inputId: string;
+        version: number;
+        content: string;
+    }): Promise<{
+        ok: boolean;
+        state?: TuiChatInputState;
+    }>;
+    removeChatInput(opts: {
+        conversationId: string;
+        inputId: string;
+        version: number;
+    }): Promise<{
+        ok: boolean;
+        state?: TuiChatInputState;
+    }>;
     /** Start a workflow run directly, without routing through the LLM. */
     startWorkflowRun?(opts: TuiWorkflowRunStartRequest): Promise<TuiWorkflowRunStartResult>;
     /** Resolve or create the project implied by the TUI launch workspace. */

package/dist/src/tui/tui-backend.js

@@ -1,10 +1,2 @@
-//#region src/tui/tui-backend.ts
-function countPendingChatInputs(inputs) {
-	return inputs.filter((input) => {
-		if (!input || typeof input !== "object") return false;
-		const status = input.status;
-		return status === "queued" || status === "interrupted";
-	}).length;
-}
-//#endregion
+import { countPendingChatInputs } from "./tui-chat-input-state.js";
 export { countPendingChatInputs };

package/dist/src/tui/tui-chat-input-state.d.ts

@@ -0,0 +1,25 @@
+export type TuiChatInputDelivery = 'next' | 'steer';
+export type TuiChatInputStatus = 'queued' | 'running' | 'injecting' | 'completed' | 'cancelled' | 'failed' | 'interrupted' | 'suspended';
+export interface TuiChatInput {
+    id: string;
+    content: string;
+    requestedDelivery: TuiChatInputDelivery;
+    effectiveDelivery: TuiChatInputDelivery;
+    status: TuiChatInputStatus;
+    version: number;
+    position?: number;
+    error?: string;
+}
+export interface TuiChatInputState {
+    conversationId: string;
+    revision: number;
+    activeRunId?: string;
+    activeInputId?: string;
+    inputs: TuiChatInput[];
+}
+export declare function createEmptyChatInputState(conversationId: string): TuiChatInputState;
+export declare function isPendingChatInput(input: TuiChatInput): boolean;
+export declare function countPendingChatInputs(inputs: readonly TuiChatInput[]): number;
+export declare function acceptChatInputState(current: TuiChatInputState, incoming: TuiChatInputState): TuiChatInputState;
+export declare function findLastEditableChatInput(state: TuiChatInputState): TuiChatInput | undefined;
+export declare function commitDeliveredChatInput(state: TuiChatInputState, content: string): TuiChatInputState;

package/dist/src/tui/tui-chat-input-state.js

@@ -0,0 +1,36 @@
+//#region src/tui/tui-chat-input-state.ts
+function createEmptyChatInputState(conversationId) {
+	return {
+		conversationId,
+		revision: -1,
+		inputs: []
+	};
+}
+function isPendingChatInput(input) {
+	return input.status === "queued" || input.status === "injecting" || input.status === "interrupted";
+}
+function countPendingChatInputs(inputs) {
+	return inputs.filter(isPendingChatInput).length;
+}
+function acceptChatInputState(current, incoming) {
+	if (current.conversationId !== incoming.conversationId) return incoming;
+	return incoming.revision >= current.revision ? incoming : current;
+}
+function findLastEditableChatInput(state) {
+	return state.inputs.filter((input) => input.status === "queued").sort((left, right) => (left.position ?? 0) - (right.position ?? 0)).at(-1);
+}
+function commitDeliveredChatInput(state, content) {
+	const normalized = content.trim();
+	if (!normalized) return state;
+	const matches = (input, status) => input.status === status && input.content.trim() === normalized;
+	let index = state.inputs.findIndex((input) => matches(input, "injecting"));
+	if (index < 0) index = state.inputs.findIndex((input) => matches(input, "queued"));
+	if (index < 0) return state;
+	return {
+		...state,
+		revision: state.revision + 1,
+		inputs: state.inputs.filter((_, inputIndex) => inputIndex !== index)
+	};
+}
+//#endregion
+export { acceptChatInputState, commitDeliveredChatInput, countPendingChatInputs, createEmptyChatInputState, findLastEditableChatInput, isPendingChatInput };

package/dist/src/tui/tui-command-formatters.js

@@ -6,6 +6,7 @@ import { getProviderDisplayName, getSortedProviders, init_providers, providerSup
 import { createWorkflowCatalog } from "../agent/workflow/catalog.js";
 import { normalizeVerboseLevel } from "../agent/transcript/thinking-types.js";
 import "../config/index.js";
+import { countPendingChatInputs } from "./tui-chat-input-state.js";
 import { computeContextUsagePercent, formatContextUsageLabel } from "./tui-context-usage.js";
 import { formatSessionPickerDescription } from "./tui-session-format.js";
 import { formatTuiTranscriptTreeEntryDisplayText } from "./tui-transcript-tree.js";
@@ -455,7 +456,7 @@ function formatTuiSessionInfo(state, stats) {
 		`Context: ${contextLabel}`,
 		`Tools: ${state.toolsExpanded ? "expanded" : "collapsed"}`,
 		`Thinking Display: ${state.showThinking ? "on" : "off"}`,
-		`Pending Inputs: ${state.pendingInputCount}`,
+		`Pending Inputs: ${countPendingChatInputs(state.chatInputState?.inputs ?? [])}`,
 		...formatTuiSessionStatsBlock(stats)
 	].join("\n");
 }

package/dist/src/tui/tui-commands.js

@@ -272,7 +272,7 @@ function formatTuiHelpText(isLocal, keybindings, extraSlashCommands = [], skillS
 	const thinkingToggle = keyLabel(keybindings, "app.thinking.toggle", "Ctrl+T");
 	const editorExternal = keyLabel(keybindings, "app.editor.external", "Ctrl+G");
 	const suspend = keyLabel(keybindings, "app.suspend", "Ctrl+Z");
-	const followUp = keyLabel(keybindings, "app.message.followUp", "Alt+Enter");
+	const followUp = keyLabel(keybindings, "app.message.followUp", "Tab");
 	const pasteImage = keyLabel(keybindings, "app.clipboard.pasteImage", "Ctrl+V / Alt+V");
 	const clearInput = keyLabel(keybindings, "app.clear", "Ctrl+C");
 	const exit = keyLabel(keybindings, "app.exit", "Ctrl+D");

package/dist/src/tui/tui-startup-resources.js

@@ -2,10 +2,10 @@ import { resolveStateDir } from "../config/paths-state.js";
 import { resolveEffectiveAgentProfileForSession } from "../config/agent-profile.js";
 import { init_paths, resolveAgentProfileDir, resolveBundledSkillsDir } from "../config/paths.js";
 import { resolveBootstrapFilesSync } from "../agent/bootstrap/bootstrap-files.js";
+import { listConnectorInstances } from "../connectors/instances.js";
 import { createSkillConfigManager, isSkillEnabled } from "../agent/skills/config.js";
 import { loadSkills } from "../agent/skills/index.js";
 import { createWorkflowCatalog } from "../agent/workflow/catalog.js";
-import { listConnectorInstances } from "../connectors/instances.js";
 import { getWorkspacePath } from "../config/workspace-path-helpers.js";
 import "../config/index.js";
 import { basename } from "node:path";

package/dist/src/tui/tui-types.d.ts

@@ -1,4 +1,5 @@
 import type { GatewayCredential } from '../gateway/credential.js';
+import { type TuiChatInputState } from './tui-chat-input-state.js';
 /** TUI configuration options passed from CLI. */
 export interface TuiOptions {
     /** Connect to a running gateway instead of embedded mode. */
@@ -77,7 +78,7 @@ export interface TuiState {
     /** Last Ctrl+C timestamp for double-press exit (see `resolveCtrlCAction`). */
     lastCtrlCAt: number;
     exitRequested: boolean;
-    pendingInputCount: number;
+    chatInputState: TuiChatInputState;
     /** Ctrl+P cycle filter; `null` = all models from catalog. */
     scopedModelRefs: string[] | null;
     /** Last Escape timestamp for double-press actions. */

package/dist/src/tui/tui-types.js

@@ -1,3 +1,4 @@
+import { createEmptyChatInputState } from "./tui-chat-input-state.js";
 //#region src/tui/tui-types.ts
 function createInitialState(conversationId) {
 	return {
@@ -24,7 +25,7 @@ function createInitialState(conversationId) {
 		showThinking: false,
 		lastCtrlCAt: 0,
 		exitRequested: false,
-		pendingInputCount: 0,
+		chatInputState: createEmptyChatInputState(conversationId),
 		scopedModelRefs: null,
 		lastEscapeAt: 0,
 		progressMessage: null,

package/dist/src/tui/tui.js

@@ -21,7 +21,7 @@ import { copyTextToClipboard } from "./clipboard-text.js";
 import { createXopcTuiKeybindingsManager } from "./tui-keybindings-file.js";
 import { isActiveRunStreamStale, markActiveRunStalled, markRunRecovering, markRunRecoveryComplete, markRunSending } from "./tui-run-state.js";
 import { clearSeenStreamEvents, clearSeenStreamEventsForRun, dispatchAgentEvent } from "./tui-agent-events.js";
-import { countPendingChatInputs } from "./tui-backend.js";
+import { acceptChatInputState, createEmptyChatInputState, findLastEditableChatInput } from "./tui-chat-input-state.js";
 import { transcriptTreeEntryIdToRowNumber } from "./tui-transcript-tree.js";
 import { formatTuiCompactionResult, formatTuiShareResult } from "./tui-command-formatters.js";
 import { formatTuiStartupText } from "./tui-startup-text.js";
@@ -50,6 +50,8 @@ import { GatewayRealtimeBackend } from "./backends/gateway-realtime-backend.js";
 import { ChatLog } from "./components/chat-log.js";
 import { CustomEditor } from "./components/custom-editor.js";
 import { TuiBottomBar } from "./components/tui-bottom-bar.js";
+import { PendingInputPreview } from "./components/pending-input-preview.js";
+import { TranscriptOverlay } from "./components/transcript-overlay.js";
 import { TuiHeader } from "./components/tui-header.js";
 import { loadExtensionsForTuiLocalMode } from "./extension-host/load-extensions.js";
 import { createTuiExtensionRuntime } from "./extension-host/runtime.js";
@@ -263,6 +265,7 @@ async function runTui(opts) {
 	}), keybindings);
 	const statusContainer = new Container();
 	const bottomBar = new TuiBottomBar(() => state, () => opts.thinking);
+	const pendingInputPreview = new PendingInputPreview(() => state.chatInputState, keybindings);
 	const chatLog = new ChatLog(keybindings);
 	chatLog.setViewportRowsProvider(() => Math.max(8, tui.terminal.rows - 8));
 	let startupResources;
@@ -372,6 +375,7 @@ async function runTui(opts) {
 	root.addChild(header);
 	root.addChild(chatLog);
 	root.addChild(statusContainer);
+	root.addChild(pendingInputPreview);
 	root.addChild(editorContainer);
 	root.addChild(bottomBar);
 	tui.addChild(root);
@@ -1458,6 +1462,20 @@ async function runTui(opts) {
 		})();
 	};
 	const isAgentBusy = () => state.activeRunId != null || state.isCompacting || busyStates.has(state.activityStatus);
+	let editingQueuedInput;
+	const applyChatInputState = (incoming) => {
+		if (incoming.conversationId !== state.currentConversationId) return;
+		const next = acceptChatInputState(state.chatInputState, incoming);
+		if (next === state.chatInputState) return;
+		state.chatInputState = next;
+		if (editingQueuedInput) {
+			const edited = next.inputs.find((input) => input.id === editingQueuedInput?.id);
+			if (!edited || edited.version !== editingQueuedInput.version) editingQueuedInput = void 0;
+		}
+		pendingInputPreview.invalidate();
+		bottomBar.invalidate();
+		tui.requestRender();
+	};
 	const sendSteeringToActiveRun = (text) => {
 		touchStreamingActivity();
 		tui.requestRender();
@@ -1465,15 +1483,12 @@ async function runTui(opts) {
 			conversationId: state.currentConversationId,
 			message: text,
 			delivery: "steer"
-		}).then(({ ok, effectiveDelivery }) => {
+		}).then(({ ok, state: inputState }) => {
 			if (!ok) {
 				if (!editor.getText().trim()) editor.setText(text);
 				chatLog.addSystem(theme.dim(formatSteerUnavailableHint(keybindings)));
-			} else {
-				chatLog.addUser(text);
-				chatLog.addSystem(theme.dim(effectiveDelivery === "steer" ? "Added to this reply." : "Queued as the next message."));
-				refreshPendingInputCount();
-			}
+			} else if (inputState) applyChatInputState(inputState);
+			else refreshChatInputState();
 			tui.requestRender();
 		}).catch((error) => {
 			if (!editor.getText().trim()) editor.setText(text);
@@ -1831,15 +1846,10 @@ async function runTui(opts) {
 			applyComposerHistory(await client.getComposerInputHistory());
 		} catch {}
 	};
-	const refreshPendingInputCount = async (conversationId = state.currentConversationId) => {
+	const refreshChatInputState = async (conversationId = state.currentConversationId) => {
 		try {
-			const inputState = await client.getChatInputState(conversationId);
-			if (state.currentConversationId === conversationId) state.pendingInputCount = countPendingChatInputs(inputState.inputs);
-		} catch {
-			if (state.currentConversationId === conversationId) state.pendingInputCount = 0;
-		}
-		bottomBar.invalidate();
-		tui.requestRender();
+			applyChatInputState(await client.getChatInputState(conversationId));
+		} catch {}
 	};
 	const recordChatHistory = (value) => {
 		const text = value.trim();
@@ -1879,10 +1889,37 @@ async function runTui(opts) {
 		}),
 		enabled: shouldEnableWindowsGitBashPasteFallback()
 	});
-	defaultEditor.onSubmit = submitBurst;
+	const saveEditedQueuedInput = (text) => {
+		const target = editingQueuedInput;
+		if (!target) return false;
+		const content = text.trim();
+		if (!content) return true;
+		const conversationId = state.currentConversationId;
+		client.updateChatInput({
+			conversationId,
+			inputId: target.id,
+			version: target.version,
+			content
+		}).then(({ ok, state: inputState }) => {
+			if (inputState) applyChatInputState(inputState);
+			if (!ok) throw new Error("Queued input changed; refreshed latest state");
+			editingQueuedInput = void 0;
+			if (state.currentConversationId === conversationId && editor.getText().trim() === content) editor.setText("");
+			recordChatHistory(content);
+			tui.requestRender();
+		}).catch((error) => {
+			chatLog.addSystem(theme.dim(`Edit failed: ${error instanceof Error ? error.message : String(error)}`));
+			tui.requestRender();
+		});
+		return true;
+	};
+	defaultEditor.onSubmit = (text) => {
+		if (!saveEditedQueuedInput(text)) submitBurst(text);
+	};
 	const handleFollowUp = () => {
 		const text = editor.getText().trim();
 		if (!text && pendingImageAttachments.length === 0) return;
+		if (saveEditedQueuedInput(text)) return;
 		if (isAgentBusy()) {
 			if (pendingImageAttachments.length > 0) {
 				chatLog.addSystem(theme.dim("Image attachments cannot be queued while the agent is busy. Wait for this reply to finish, then send."));
@@ -1894,12 +1931,12 @@ async function runTui(opts) {
 				conversationId,
 				message: text,
 				delivery: "next"
-			}).then(async ({ ok }) => {
+			}).then(({ ok, state: inputState }) => {
 				if (!ok) throw new Error("Gateway did not accept the message");
 				recordChatHistory(text);
 				if (state.currentConversationId === conversationId && editor.getText().trim() === text) editor.setText("");
-				chatLog.addSystem(theme.dim("Queued as the next message."));
-				await refreshPendingInputCount(conversationId);
+				if (inputState) applyChatInputState(inputState);
+				else refreshChatInputState(conversationId);
 			}).catch((error) => {
 				const errorMessage = error instanceof Error ? error.message : String(error);
 				chatLog.addSystem(theme.dim(`Queue failed: ${errorMessage}`));
@@ -1911,8 +1948,9 @@ async function runTui(opts) {
 	};
 	const setConversationId = (key) => {
 		state.currentConversationId = resolveConversationId(key);
-		state.pendingInputCount = 0;
-		refreshPendingInputCount(state.currentConversationId);
+		state.chatInputState = createEmptyChatInputState(state.currentConversationId);
+		editingQueuedInput = void 0;
+		refreshChatInputState(state.currentConversationId);
 		updateAgentFromPicker(key);
 	};
 	const updateAgentFromPicker = (key) => {
@@ -2105,6 +2143,66 @@ async function runTui(opts) {
 		})();
 	};
 	defaultEditor.onAction("app.message.followUp", handleFollowUp);
+	defaultEditor.onAction("app.message.editQueued", () => {
+		if (editor.getText().length > 0) return false;
+		const target = findLastEditableChatInput(state.chatInputState);
+		if (!target) return false;
+		editingQueuedInput = {
+			id: target.id,
+			version: target.version
+		};
+		editor.setText(target.content);
+		tui.requestRender();
+		return true;
+	});
+	defaultEditor.onAction("app.message.deleteQueued", () => {
+		const target = findLastEditableChatInput(state.chatInputState);
+		if (!target) return false;
+		const conversationId = state.currentConversationId;
+		client.removeChatInput({
+			conversationId,
+			inputId: target.id,
+			version: target.version
+		}).then(({ ok, state: inputState }) => {
+			if (inputState) applyChatInputState(inputState);
+			if (!ok) throw new Error("Queued input changed; refreshed latest state");
+			if (editingQueuedInput?.id === target.id) editingQueuedInput = void 0;
+			tui.requestRender();
+		}).catch((error) => {
+			chatLog.addSystem(theme.dim(`Delete failed: ${error instanceof Error ? error.message : String(error)}`));
+			tui.requestRender();
+		});
+		return true;
+	});
+	const openTranscriptOverlay = (initialMode) => {
+		if (!client.loadHistoryWindow) {
+			chatLog.addSystem("Transcript paging is unavailable for this backend.");
+			tui.requestRender();
+			return;
+		}
+		let close = () => {};
+		const overlay = new TranscriptOverlay({
+			keybindings,
+			initialMode,
+			viewportRows: () => tui.terminal.rows,
+			onClose: () => close(),
+			onRender: () => tui.requestRender(),
+			loadWindow: (rowNumber) => client.loadHistoryWindow({
+				conversationId: state.currentConversationId,
+				rowNumber,
+				before: 120,
+				after: 0
+			})
+		});
+		close = openEditorSelector(overlay, overlay);
+		overlay.initialize().catch((error) => {
+			close();
+			chatLog.addSystem(`Transcript failed: ${error instanceof Error ? error.message : String(error)}`);
+			tui.requestRender();
+		});
+	};
+	defaultEditor.onAction("app.transcript.open", () => openTranscriptOverlay("transcript"));
+	defaultEditor.onAction("app.transcript.raw", () => openTranscriptOverlay("raw"));
 	streamWatchdogId = setInterval(() => {
 		const now = Date.now();
 		if (!isActiveRunStreamStale(state, now, 3e4)) return;
@@ -2141,11 +2239,7 @@ async function runTui(opts) {
 	client.onEvent = (evt) => {
 		const data = evt.data ?? {};
 		if (evt.event === "session.input-state") {
-			if (data.conversationId === state.currentConversationId && Array.isArray(data.inputs)) {
-				state.pendingInputCount = countPendingChatInputs(data.inputs);
-				bottomBar.invalidate();
-				tui.requestRender();
-			}
+			if (data.conversationId === state.currentConversationId && Array.isArray(data.inputs) && typeof data.revision === "number") applyChatInputState(data);
 			return;
 		}
 		if (evt.event === "composer-history.appended") {
@@ -2216,10 +2310,8 @@ async function runTui(opts) {
 			await refreshSessionInfoWithBorder();
 			persistCurrentNewSessionContext();
 			try {
-				state.pendingInputCount = countPendingChatInputs((await client.getChatInputState(state.currentConversationId)).inputs);
-			} catch {
-				state.pendingInputCount = 0;
-			}
+				applyChatInputState(await client.getChatInputState(state.currentConversationId));
+			} catch {}
 			await refreshModelChoices();
 			await loadSessionHistory({ merge: true });
 			cleanupAbandonedTuiSessions(client, state.currentConversationId).catch(() => {});