@xopcai/xopc 0.0.180 → 0.0.188

package/dist/src/tui/backends/gateway-sse-backend.js

@@ -7,6 +7,7 @@ import { gatewayCredentialAuthorization } from "../../gateway/credential.js";
 import { consumeSSEStream, parseSSEData } from "../sse-consumer.js";
 import { buildTuiTranscriptTree, transcriptTreeEntryIdToRowNumber } from "../tui-transcript-tree.js";
 import { computeTuiSessionStats } from "../tui-session-stats.js";
+import crypto from "node:crypto";
 //#region src/tui/backends/gateway-sse-backend.ts
 init_logger();
 const log = createLogger("TUI:GatewaySSE");
@@ -47,7 +48,7 @@ async function gatewayFetch(baseUrl, path, credential, init) {
 /**
 * TUI backend that communicates with a running xopc gateway via HTTP + SSE.
 *
-* - Agent streaming: `POST /api/agent` with `Accept: text/event-stream`
+* - Agent input: durable session input REST plus resumable run SSE
 * - Broadcast events: `GET /api/events` via long-lived SSE
 * - REST calls for sessions, models, etc.
 */
@@ -97,127 +98,27 @@ var GatewaySseBackend = class {
 		this.chatAbort?.abort();
 		this.chatAbort = new AbortController();
 		const signal = this.chatAbort.signal;
-		const runId = crypto.randomUUID();
-		(async () => {
-			try {
-				const res = await gatewayFetch(this.baseUrl, "/api/agent", this.credential, {
-					method: "POST",
-					headers: { Accept: "text/event-stream" },
-					body: JSON.stringify({
-						message: opts.message.trimStart().startsWith("/") ? opts.message : prependEnvelopeTimestamp(opts.message),
-						channel: "webchat",
-						sessionKey: opts.sessionKey,
-						attachments: opts.attachments,
-						thinking: opts.thinking
-					}),
-					signal
-				});
-				if (!res.ok) {
-					const body = await res.json().catch(() => ({}));
-					this.onEvent?.({
-						event: "error",
-						data: {
-							type: "error",
-							runId,
-							sessionKey: opts.sessionKey,
-							timestamp: Date.now(),
-							payload: {
-								code: "GATEWAY_ERROR",
-								message: body.error?.message ?? `Gateway error: ${res.status}`
-							}
-						},
-						source: "agent-response"
-					});
-					return;
-				}
-				if ((res.headers.get("Content-Type") ?? "").includes("text/event-stream") && res.body) await consumeSSEStream(res.body, (sseEvent) => {
-					if (signal.aborted) return;
-					const data = parseSSEData(sseEvent.data);
-					if (!data) return;
-					this.onEvent?.({
-						event: sseEvent.event,
-						data,
-						source: "agent-response"
-					});
-				}, signal);
-				else {
-					const json = await res.json();
-					if (json.ok && json.payload?.content) {
-						const messageId = `msg_${runId}_1`;
-						const base = {
-							runId,
-							sessionKey: opts.sessionKey,
-							timestamp: Date.now()
-						};
-						this.onEvent?.({
-							event: "run_start",
-							data: {
-								...base,
-								type: "run_start",
-								payload: { channel: "webchat" }
-							},
-							source: "agent-response"
-						});
-						this.onEvent?.({
-							event: "assistant_message_start",
-							data: {
-								...base,
-								type: "assistant_message_start",
-								payload: { messageId }
-							},
-							source: "agent-response"
-						});
-						this.onEvent?.({
-							event: "assistant_delta",
-							data: {
-								...base,
-								type: "assistant_delta",
-								payload: {
-									messageId,
-									delta: json.payload.content
-								}
-							},
-							source: "agent-response"
-						});
-						this.onEvent?.({
-							event: "assistant_message_end",
-							data: {
-								...base,
-								type: "assistant_message_end",
-								payload: { messageId }
-							},
-							source: "agent-response"
-						});
-						this.onEvent?.({
-							event: "run_end",
-							data: {
-								...base,
-								type: "run_end",
-								payload: { status: "success" }
-							},
-							source: "agent-response"
-						});
-					}
-				}
-			} catch (error) {
-				if (signal.aborted) return;
-				const errorMessage = error instanceof Error ? error.message : String(error);
-				this.onEvent?.({
-					event: "error",
-					data: {
-						type: "error",
-						runId,
-						sessionKey: opts.sessionKey,
-						timestamp: Date.now(),
-						payload: {
-							code: "NETWORK_ERROR",
-							message: errorMessage
-						}
-					},
-					source: "agent-response"
-				});
-			}
-		})();
+		const clientMessageId = crypto.randomUUID();
+		const res = await gatewayFetch(this.baseUrl, `/api/sessions/${encodeURIComponent(opts.sessionKey)}/inputs`, this.credential, {
+			method: "POST",
+			body: JSON.stringify({
+				clientMessageId,
+				delivery: "next",
+				content: opts.message.trimStart().startsWith("/") ? opts.message : prependEnvelopeTimestamp(opts.message),
+				attachments: opts.attachments,
+				thinking: opts.thinking
+			}),
+			signal
+		});
+		const json = await res.json().catch(() => null);
+		if (!res.ok) throw new Error(json?.error?.message ?? `Gateway error: ${res.status}`);
+		const state = json?.payload?.state;
+		const own = state?.inputs?.find((input) => input.clientMessageId === clientMessageId);
+		const runId = state?.activeRunId ?? crypto.randomUUID();
+		if (state?.activeRunId && own?.id === state.activeInputId) this.resumeChat({
+			sessionKey: opts.sessionKey,
+			runId
+		});
 		return { runId };
 	}
 	async searchWorkspaceFiles(sessionKey, query, options) {
@@ -372,21 +273,31 @@ var GatewaySseBackend = class {
 			return { ok: false };
 		}
 	}
-	async steerChat(opts) {
+	async submitChatInput(opts) {
 		try {
-			const res = await gatewayFetch(this.baseUrl, "/api/agent/steer", this.credential, {
+			const res = await gatewayFetch(this.baseUrl, `/api/sessions/${encodeURIComponent(opts.sessionKey)}/inputs`, this.credential, {
 				method: "POST",
 				body: JSON.stringify({
-					sessionKey: opts.sessionKey,
-					message: opts.message
+					clientMessageId: crypto.randomUUID(),
+					delivery: opts.delivery,
+					content: opts.message
 				})
 			});
 			if (!res.ok) return { ok: false };
-			return { ok: (await res.json()).ok === true };
+			const json = await res.json();
+			return {
+				ok: json.ok === true,
+				effectiveDelivery: json.payload?.effectiveDelivery
+			};
 		} catch {
 			return { ok: false };
 		}
 	}
+	async getChatInputState(sessionKey) {
+		const res = await gatewayFetch(this.baseUrl, `/api/sessions/${encodeURIComponent(sessionKey)}/input-state`, this.credential);
+		if (!res.ok) throw new Error(`Input state failed (${res.status})`);
+		return (await res.json()).payload;
+	}
 	async getStartupResources(sessionKey) {
 		const empty = {
 			context: [],

package/dist/src/tui/components/settings-selector.js

@@ -110,20 +110,6 @@ var SettingsSelector = class {
 					"fork"
 				]
 			},
-			{
-				id: "follow-up-mode",
-				label: "Follow-up mode",
-				description: "Delivery for queued follow-ups after a response ends",
-				currentValue: this.state.followUpMode,
-				values: ["one-at-a-time", "all"]
-			},
-			{
-				id: "steering-mode",
-				label: "Steering mode",
-				description: "Delivery for queued Enter-while-busy steering messages",
-				currentValue: this.state.steeringMode,
-				values: ["one-at-a-time", "all"]
-			},
 			{
 				id: "tree-filter-mode",
 				label: "Tree filter",
@@ -211,12 +197,6 @@ var SettingsSelector = class {
 				case "double-escape":
 					this.state.doubleEscapeAction = newValue;
 					break;
-				case "follow-up-mode":
-					this.state.followUpMode = newValue;
-					break;
-				case "steering-mode":
-					this.state.steeringMode = newValue;
-					break;
 				case "tree-filter-mode":
 					this.state.treeFilterMode = newValue;
 					break;

package/dist/src/tui/components/tui-bottom-bar.d.ts

@@ -3,7 +3,7 @@ import type { TuiState } from '../tui-types.js';
 /** Compact token counts (aligned with pi coding-agent footer). */
 export declare function formatTokens(count: number): string;
 export declare function sanitizeStatusText(text: string): string;
-export declare function formatQueuedMessageLines(state: TuiState, width: number, dequeueHint: string): string[];
+export declare function formatQueuedMessageLines(state: TuiState, width: number): string[];
 export declare function formatCwdForFooter(cwd: string, home: string | undefined): string;
 /**
  * Multi-line footer below the input editor (pi coding-agent style):
@@ -12,12 +12,11 @@ export declare function formatCwdForFooter(cwd: string, home: string | undefined
 export declare class TuiBottomBar implements Component {
     private readonly getState;
     private readonly getThinkingDefault;
-    private readonly getDequeueHint;
     private extensionLines;
     private extensionComponents;
     private extensionStatusParts;
     private customComponent;
-    constructor(getState: () => TuiState, getThinkingDefault: () => string | undefined, getDequeueHint?: () => string);
+    constructor(getState: () => TuiState, getThinkingDefault: () => string | undefined);
     setExtensionLines(lines: string[]): void;
     setExtensionComponents(components: Component[]): void;
     setExtensionStatusParts(parts: string[]): void;

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

@@ -26,17 +26,14 @@ function formatTokens(count) {
 function sanitizeStatusText(text) {
 	return text.replace(/[\r\n\t]/g, " ").replace(/ +/g, " ").trim();
 }
-function formatQueuedMessageLines(state, width, dequeueHint) {
+function formatQueuedMessageLines(state, width) {
 	const lines = [];
 	const add = (label, text) => {
 		const sanitized = sanitizeStatusText(text);
 		if (!sanitized) return;
 		lines.push(truncateToWidth(theme.dim(`${label}: ${sanitized}`), width, theme.dim("…")));
 	};
-	for (const message of state.steeringQueue) add("Steering", message);
-	for (const message of state.messageFollowUpQueue) add("Follow-up", message);
 	for (const message of state.compactionQueue) add("Queued", message);
-	if (lines.length > 0) lines.push(truncateToWidth(theme.dim(`↳ ${dequeueHint} to edit all queued messages`), width, theme.dim("…")));
 	return lines;
 }
 function formatCwdForFooter(cwd, home) {
@@ -60,10 +57,9 @@ var TuiBottomBar = class {
 	extensionComponents = [];
 	extensionStatusParts = [];
 	customComponent;
-	constructor(getState, getThinkingDefault, getDequeueHint = () => "Alt+Up") {
+	constructor(getState, getThinkingDefault) {
 		this.getState = getState;
 		this.getThinkingDefault = getThinkingDefault;
-		this.getDequeueHint = getDequeueHint;
 	}
 	setExtensionLines(lines) {
 		this.extensionLines = lines;
@@ -99,8 +95,7 @@ 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.messageFollowUpQueue.length > 0) leftParts.push(`Q${state.messageFollowUpQueue.length}`);
-		if (state.steeringQueue.length > 0) leftParts.push(`S${state.steeringQueue.length}`);
+		if (state.pendingInputCount > 0) leftParts.push(`Q${state.pendingInputCount}`);
 		let statsLeft = leftParts.join(" · ");
 		const modelId = state.sessionInfo.model ?? "unknown";
 		const prov = state.sessionInfo.modelProvider;
@@ -133,7 +128,7 @@ var TuiBottomBar = class {
 			const statusLine = this.extensionStatusParts.map((part) => sanitizeStatusText(part)).filter(Boolean).join(" ");
 			if (statusLine) lines.push(truncateToWidth(theme.dim(statusLine), width, theme.dim("…")));
 		}
-		lines.push(...formatQueuedMessageLines(state, width, this.getDequeueHint()));
+		lines.push(...formatQueuedMessageLines(state, width));
 		for (const extLine of this.extensionLines) lines.push(truncateToWidth(theme.dim(sanitizeStatusText(extLine)), width, theme.dim("…")));
 		for (const component of this.extensionComponents) for (const line of component.render(width)) lines.push(truncateToWidth(line, width, theme.dim("…")));
 		return lines;

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

@@ -85,7 +85,7 @@ function isTuiIdle(state) {
 	return state.activeRunId == null && !state.isCompacting && !BUSY_ACTIVITY_STATUSES.has(state.activityStatus);
 }
 function hasPendingTuiMessages(state) {
-	return (state.messageFollowUpQueue?.length ?? 0) > 0 || (state.steeringQueue?.length ?? 0) > 0 || (state.compactionQueue?.length ?? 0) > 0;
+	return (state.pendingInputCount ?? 0) > 0 || (state.compactionQueue?.length ?? 0) > 0;
 }
 function getTuiContextUsage(state) {
 	const sessionInfo = state.sessionInfo;

package/dist/src/tui/tool-summary.d.ts

@@ -1,5 +1,5 @@
 import type { TuiToolContentBlock } from './tui-tool-result.js';
-export type ToolSummaryKind = 'read' | 'search' | 'exec' | 'mcp' | 'generic';
+export type ToolSummaryKind = 'read' | 'search' | 'exec' | 'generic';
 export interface ToolSummaryContext {
     toolName: string;
     args: unknown;
@@ -14,7 +14,6 @@ export declare function getToolSummaryKind(toolName: string): ToolSummaryKind;
 export declare function isReadStyleTool(toolName: string): boolean;
 export declare function isSearchStyleTool(toolName: string): boolean;
 export declare function isExecStyleTool(toolName: string): boolean;
-export declare function isMcpStyleTool(toolName: string): boolean;
 export declare function displayToolName(toolName: string): string;
 export declare function compactPath(path: string, maxLength?: number): string;
 export declare function formatCollapsedToolSummary(ctx: ToolSummaryContext): string;

package/dist/src/tui/tool-summary.js

@@ -20,7 +20,6 @@ function getToolSummaryKind(toolName) {
 	if (isReadStyleTool(toolName)) return "read";
 	if (isSearchStyleTool(toolName)) return "search";
 	if (isExecStyleTool(toolName)) return "exec";
-	if (isMcpStyleTool(toolName)) return "mcp";
 	return "generic";
 }
 function isReadStyleTool(toolName) {
@@ -60,12 +59,7 @@ function isExecStyleTool(toolName) {
 		"terminal"
 	].includes(base);
 }
-function isMcpStyleTool(toolName) {
-	return toolName.includes("__");
-}
 function displayToolName(toolName) {
-	const parts = toolName.split("__");
-	if (parts.length === 2 && parts[0] && parts[1]) return `${parts[0]}.${parts[1]}`;
 	return toolName;
 }
 function compactPath(path, maxLength = MAX_PATH_LABEL_LENGTH) {
@@ -89,7 +83,6 @@ function formatCollapsedToolSummary(ctx) {
 		}
 		case "search": return formatSearchSummary(ctx.output, ctx.expandKey);
 		case "exec": return formatExecSummary(ctx.output, ctx.details, ctx.isError, ctx.expandKey);
-		case "mcp": return formatMcpSummary(ctx.output, ctx.content, ctx.expandKey);
 		case "generic": return "";
 	}
 }
@@ -132,7 +125,7 @@ function commandFromArgs(args) {
 	return null;
 }
 function baseToolName(toolName) {
-	return toolName.split(/__|\./).pop()?.toLowerCase() ?? toolName.toLowerCase();
+	return toolName.split(".").pop()?.toLowerCase() ?? toolName.toLowerCase();
 }
 function firstFiniteNumber(...values) {
 	for (const value of values) {
@@ -176,15 +169,6 @@ function formatExecSummary(output, details, isError, expandKey) {
 	const rows = nonBlankLines([parsed.stdout, parsed.stderr].filter(Boolean).join("\n") || output).length;
 	return `${parsed.exitCode === void 0 ? isError ? "failed" : "completed" : `exit ${parsed.exitCode}`}; ${rows === 1 ? "1 output line" : `${rows} output lines`}; ${expandKey} to expand`;
 }
-function formatMcpSummary(output, content, expandKey) {
-	if (content?.length) {
-		const counts = /* @__PURE__ */ new Map();
-		for (const block of content) counts.set(block.type, (counts.get(block.type) ?? 0) + 1);
-		return `${[...counts.entries()].map(([type, count]) => `${count} ${type}`).join(", ")}; ${expandKey} to expand`;
-	}
-	const rows = nonBlankLines(output).length;
-	return `${rows === 1 ? "1 result line" : `${rows} result lines`}; ${expandKey} to expand`;
-}
 function parseExecDetails(details) {
 	if (!details || typeof details !== "object") return {};
 	const record = details;
@@ -213,4 +197,4 @@ function extractResultPath(line) {
 	return null;
 }
 //#endregion
-export { compactPath, displayToolName, extractExitCode, formatArgsSummary, formatCollapsedToolSummary, formatExecExpandedOutput, getToolSummaryKind, isExecStyleTool, isMcpStyleTool, isReadStyleTool, isSearchStyleTool };
+export { compactPath, displayToolName, extractExitCode, formatArgsSummary, formatCollapsedToolSummary, formatExecExpandedOutput, getToolSummaryKind, isExecStyleTool, isReadStyleTool, isSearchStyleTool };

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

@@ -117,6 +117,15 @@ export interface TuiStartupResources {
     workflows: string[];
     connectors: string[];
 }
+export interface TuiChatInputState {
+    sessionKey: string;
+    revision: number;
+    inputs: Array<{
+        id: string;
+        status: string;
+    }>;
+}
+export declare function countPendingChatInputs(inputs: readonly unknown[]): number;
 export interface TuiWorkspaceFileSearchEntry {
     name: string;
     path: string;
@@ -209,12 +218,15 @@ export interface TuiBackend {
         ok: boolean;
     }>;
     /** Inject steering text into an active run (tool-boundary delivery). */
-    steerChat(opts: {
+    submitChatInput(opts: {
         sessionKey: string;
         message: string;
+        delivery: 'next' | 'steer';
     }): Promise<{
         ok: boolean;
+        effectiveDelivery?: 'next' | 'steer';
     }>;
+    getChatInputState(sessionKey: string): Promise<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 +1,10 @@
-export {};
+//#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
+export { countPendingChatInputs };

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

@@ -463,8 +463,7 @@ function formatTuiSessionInfo(state, stats) {
 		`Context: ${contextLabel}`,
 		`Tools: ${state.toolsExpanded ? "expanded" : "collapsed"}`,
 		`Thinking Display: ${state.showThinking ? "on" : "off"}`,
-		`Queue: ${state.messageFollowUpQueue.length}`,
-		`Steering Queue: ${state.steeringQueue.length}`,
+		`Pending Inputs: ${state.pendingInputCount}`,
 		...formatTuiSessionStatsBlock(stats)
 	].join("\n");
 }

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

@@ -6,12 +6,12 @@ import "../storage/sqlite/index.js";
 import { resolveConfigPath } from "../config/paths.js";
 import { loadConfig } from "../config/loader.js";
 import { init_providers, providerSupportsOAuth } from "../providers/index.js";
-import { GoalService } from "../goals/goal-service.js";
-import "../goals/index.js";
+import { TaskRepository } from "../tasks/task-repository.js";
 import { ProjectService } from "../projects/project-service.js";
 import { isValidProjectAgentId, normalizeProjectAgentId } from "../projects/project-agent.js";
 import { inferSuggestedProjectDefaultAgentId } from "../projects/project-agent-suggestion.js";
 import "../projects/index.js";
+import "../tasks/index.js";
 import { createWorkflowCatalog } from "../agent/workflow/catalog.js";
 import { normalizeReasoningLevel, normalizeThinkLevel, normalizeVerboseLevel } from "../agent/transcript/thinking-types.js";
 import { provenanceTracker } from "../extensions/security.js";
@@ -274,7 +274,6 @@ function formatTuiHelpText(isLocal, keybindings, extraSlashCommands = [], skillS
 	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 dequeue = keyLabel(keybindings, "app.message.dequeue", "Alt+Up");
 	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");
@@ -310,7 +309,6 @@ function formatTuiHelpText(isLocal, keybindings, extraSlashCommands = [], skillS
 	lines.push(`  ${editorExternal} — Edit draft in $EDITOR`);
 	lines.push(`  ${suspend} — Suspend to shell (Unix)`);
 	lines.push(`  ${followUp} — Queue follow-up while busy (sends when this reply finishes)`);
-	lines.push(`  ${dequeue} — Restore queued messages to editor`);
 	lines.push("  Enter (while busy) — Steer: inject at next tool boundary");
 	lines.push(`  ${pasteImage} — Paste image from clipboard`);
 	lines.push("  /settings — Theme, thinking display, terminal progress, …");
@@ -543,7 +541,7 @@ function formatTuiProject(project) {
 		`Default agent: ${project.defaultAgentId ?? "global default"}`,
 		project.workspaceRoot ? `Workspace: ${project.workspaceRoot}` : void 0,
 		project.sessionCount != null ? `Sessions: ${project.sessionCount}` : void 0,
-		project.goalCount != null ? `Goals: ${project.goalCount} (${project.activeGoalCount ?? 0} active)` : void 0,
+		project.taskCount != null ? `Tasks: ${project.taskCount} (${project.activeTaskCount ?? 0} active)` : void 0,
 		project.brief ? `Brief: ${project.brief}` : void 0
 	].filter(Boolean).join("\n");
 }
@@ -631,17 +629,14 @@ function runTuiProjectCommand(state, args) {
 			if (!keys.length) return `No sessions in ${project.name}.`;
 			return [`Sessions in ${project.name}:`, ...keys.map((key) => `- ${key}`)].join("\n");
 		}
-		if (subcommand === "goals") {
+		if (subcommand === "tasks") {
 			const ref = parts[1];
 			const currentProjectId = getSessionMetadata(state.currentSessionKey)?.projectId;
 			const project = ref ? resolveTuiProject(projects, ref) : currentProjectId ? projects.get(currentProjectId) : null;
 			if (!project) return ref ? `Project not found: ${ref}` : "No current project.";
-			const goals = new GoalService().list({
-				projectId: project.id,
-				limit: 20
-			});
-			if (!goals.length) return `No goals in ${project.name}.`;
-			return [`Goals in ${project.name}:`, ...goals.map((goal) => `- ${goal.id} [${goal.status}] ${goal.title}`)].join("\n");
+			const tasks = new TaskRepository().listByProject(project.id, 20);
+			if (!tasks.length) return `No tasks in ${project.name}.`;
+			return [`Tasks in ${project.name}:`, ...tasks.map((task) => `- ${task.id} [${task.phase}] ${task.title}`)].join("\n");
 		}
 		return [
 			"Usage:",
@@ -654,7 +649,7 @@ function runTuiProjectCommand(state, args) {
 			"  /project set-agent <agent-id>",
 			"  /project clear-agent",
 			"  /project sessions [id-or-slug]",
-			"  /project goals [id-or-slug]",
+			"  /project tasks [id-or-slug]",
 			"  /project archive <id-or-slug>"
 		].join("\n");
 	});
@@ -668,8 +663,6 @@ function createTuiCommandHandler(deps) {
 			chatLog.addSystem(`session ${state.currentSessionKey} reset`);
 		} else {
 			chatLog.clearAll();
-			state.messageFollowUpQueue.length = 0;
-			state.steeringQueue.length = 0;
 			chatLog.addSystem("Session cleared (reset not available in this mode).");
 		}
 		tui.requestRender();
@@ -1273,8 +1266,6 @@ function createTuiCommandHandler(deps) {
 							chatLog.addSystem(`new session: ${state.currentSessionKey}`);
 						} else {
 							chatLog.clearAll();
-							state.messageFollowUpQueue.length = 0;
-							state.steeringQueue.length = 0;
 							chatLog.addSystem("New session requires gateway or local session support.");
 						}
 						tui.requestRender();
@@ -1305,8 +1296,6 @@ function createTuiCommandHandler(deps) {
 				return;
 			case "clear":
 				chatLog.clearAll();
-				state.messageFollowUpQueue.length = 0;
-				state.steeringQueue.length = 0;
 				chatLog.addSystem("TUI view cleared. Session transcript was not reset.");
 				tui.requestRender();
 				return;

package/dist/src/tui/tui-session-actions.js

@@ -32,8 +32,6 @@ function createSessionActions(context) {
 		lastHistoryKeys = [];
 		resetRunStatus(state);
 		state.historyLoaded = false;
-		state.messageFollowUpQueue.length = 0;
-		state.steeringQueue.length = 0;
 	};
 	const loadHistory = async (opts) => {
 		try {

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

@@ -1,7 +1,5 @@
 export type TuiThemeId = 'auto' | 'dark' | 'light' | (string & {});
 export type DoubleEscapeAction = 'none' | 'tree' | 'fork';
-export type FollowUpMode = 'one-at-a-time' | 'all';
-export type SteeringMode = 'one-at-a-time' | 'all';
 export type TreeFilterMode = 'default' | 'no-tools' | 'user-only' | 'labeled-only' | 'all';
 export interface TuiSettings {
     /** `auto` follows terminal background detection; `dark`/`light` or custom theme name. */
@@ -24,10 +22,6 @@ export interface TuiSettings {
     autocompleteMaxVisible: number;
     /** Clear empty terminal rows when rendered content shrinks. */
     clearOnShrink: boolean;
-    /** How queued follow-up messages are delivered after an agent run ends. */
-    followUpMode: FollowUpMode;
-    /** How queued steering messages are delivered across active runs. */
-    steeringMode: SteeringMode;
     /** Default transcript filter when opening `/tree`. */
     treeFilterMode: TreeFilterMode;
 }

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

@@ -17,20 +17,12 @@ const DEFAULT_TUI_SETTINGS = {
 	editorPaddingX: 0,
 	autocompleteMaxVisible: 5,
 	clearOnShrink: false,
-	followUpMode: "one-at-a-time",
-	steeringMode: "one-at-a-time",
 	treeFilterMode: "default"
 };
 const SETTINGS_PATH = join(resolveStateDir(), "tui-settings.json");
 function isDoubleEscapeAction(value) {
 	return value === "none" || value === "tree" || value === "fork";
 }
-function isFollowUpMode(value) {
-	return value === "one-at-a-time" || value === "all";
-}
-function isSteeringMode(value) {
-	return value === "one-at-a-time" || value === "all";
-}
 function isTreeFilterMode(value) {
 	return value === "default" || value === "no-tools" || value === "user-only" || value === "labeled-only" || value === "all";
 }
@@ -50,8 +42,6 @@ function normalizeSettings(raw) {
 	if (typeof obj.editorPaddingX === "number" && Number.isFinite(obj.editorPaddingX)) base.editorPaddingX = Math.max(0, Math.min(3, Math.floor(obj.editorPaddingX)));
 	if (typeof obj.autocompleteMaxVisible === "number" && Number.isFinite(obj.autocompleteMaxVisible)) base.autocompleteMaxVisible = Math.max(3, Math.min(20, Math.floor(obj.autocompleteMaxVisible)));
 	if (typeof obj.clearOnShrink === "boolean") base.clearOnShrink = obj.clearOnShrink;
-	if (isFollowUpMode(obj.followUpMode)) base.followUpMode = obj.followUpMode;
-	if (isSteeringMode(obj.steeringMode)) base.steeringMode = obj.steeringMode;
 	if (isTreeFilterMode(obj.treeFilterMode)) base.treeFilterMode = obj.treeFilterMode;
 	return base;
 }

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

@@ -1,6 +1,6 @@
 import { resolveStateDir } from "../config/paths-state.js";
-import { init_paths, resolveAgentProfileDir, resolveBundledSkillsDir, resolveUserProfilePath } from "../config/paths.js";
 import { resolveEffectiveAgentProfileForSession } from "../config/agent-profile.js";
+import { init_paths, resolveAgentProfileDir, resolveBundledSkillsDir, resolveUserProfilePath } from "../config/paths.js";
 import { resolveBootstrapFilesSync } from "../agent/bootstrap/bootstrap-files.js";
 import { createSkillConfigManager, isSkillEnabled } from "../agent/skills/config.js";
 import { loadSkills } from "../agent/skills/index.js";

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

@@ -81,10 +81,7 @@ export interface TuiState {
     /** Last Ctrl+C timestamp for double-press exit (see `resolveCtrlCAction`). */
     lastCtrlCAt: number;
     exitRequested: boolean;
-    /** Queued via Alt+Enter while a run is active; flushed FIFO when the run ends. */
-    messageFollowUpQueue: string[];
-    /** Queued Enter-while-busy steering messages after the first in-flight steer. */
-    steeringQueue: string[];
+    pendingInputCount: number;
     /** 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

@@ -25,8 +25,7 @@ function createInitialState(sessionKey) {
 		showThinking: false,
 		lastCtrlCAt: 0,
 		exitRequested: false,
-		messageFollowUpQueue: [],
-		steeringQueue: [],
+		pendingInputCount: 0,
 		scopedModelRefs: null,
 		lastEscapeAt: 0,
 		progressMessage: null,