@xopcai/xopc 0.0.180 → 0.0.188

package/dist/src/tui/tui.js

@@ -2,27 +2,27 @@ import { version } from "../../package.js";
 import { resolveStateDir, resolveXopcDatabasePath } from "../config/paths-state.js";
 import { parseAgentSessionKey } from "../routing/session-key-utils.js";
 import { init_agent_session_key, normalizeAgentId } from "../routing/agent-session-key.js";
+import { resolveEffectiveAgentProfileForSession } from "../config/agent-profile.js";
 import { init_paths } from "../config/paths.js";
 import { loadConfig } from "../config/loader.js";
 import { getAllModels, getAllProviders, getApiKey, init_providers, isProviderConfiguredSync } from "../providers/index.js";
-import { resolveEffectiveAgentProfileForSession } from "../config/agent-profile.js";
-import { renderWorkflowFinalSummary, renderWorkflowPanel } from "../agent/workflow/snapshot.js";
-import { runViewToSnapshot } from "../workflows/service/run-view-to-snapshot.js";
 import { ProjectTrustStore, hasTrustRequiringProjectResources } from "../project-trust/trust-store.js";
+import { renderWorkflowFinalSummary, renderWorkflowPanel } from "../agent/workflow/snapshot.js";
 import { ensureStarterAgentsInitialized } from "../agent/starter-agents.js";
 import "../config/index.js";
 import { MAX_WEBCHAT_ATTACHMENT_FILE_BYTES } from "../gateway/chat-limits.js";
 import { isTerminalWorkflowRunStatus } from "../workflows/domain/run.js";
 import "../workflows/domain/index.js";
+import { runViewToSnapshot } from "../workflows/service/run-view-to-snapshot.js";
 import { resolveTuiSessionKey, resolveTuiStartupSessionKey } from "../routing/resolve-tui-session-key.js";
 import { applyThemeById, getBashExcludeBorderColor, getBashModeBorderColor, getCustomThemesDir, getThemeExports, getThinkingBorderColor, initTuiTheme, listAvailableThemeIds, resolveThemePalette } from "./theme-manager.js";
 import { editorTheme, theme } from "./theme.js";
 import { extensionForImageMimeType, readClipboardImage } from "./clipboard-image.js";
 import { copyTextToClipboard } from "./clipboard-text.js";
 import { createXopcTuiKeybindingsManager } from "./tui-keybindings-file.js";
-import { formatKeyIds } from "./format-tui-hotkeys.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 { transcriptTreeEntryIdToRowNumber } from "./tui-transcript-tree.js";
 import { formatTuiCompactionResult, formatTuiShareResult } from "./tui-command-formatters.js";
 import { formatTuiStartupText } from "./tui-startup-text.js";
@@ -30,7 +30,6 @@ import { createTuiCommandHandler, getSlashCommands } from "./tui-commands.js";
 import { GENERATED_TUI_SESSION_SHELL_PATCH, cleanupAbandonedTuiSessions, deleteGeneratedTuiSessionIfEmpty, hideLegacyEmptyTuiSessions, isGeneratedTuiSessionKey } from "./tui-empty-session-cleanup.js";
 import { extensionCustomMessageContentToText, extensionCustomMessageToTurnText, extensionUserMessageContentToText } from "./tui-extension-user-message.js";
 import { resolveFdPath } from "./tui-fd-path.js";
-import { drainFollowUpQueue, restoreQueuedMessages } from "./tui-follow-up-queue.js";
 import { createBackspaceDeduper, drainAndStopTuiSafely, isIgnorableTuiStopError, resolveCtrlCAction, stopTuiSafely } from "./tui-lifecycle.js";
 import { createLocalShellRunner } from "./tui-local-shell.js";
 import { filterModelsForCycle, loadScopedModelRefs, saveScopedModelRefs } from "./tui-scoped-models.js";
@@ -268,7 +267,7 @@ async function runTui(opts) {
 		showHints: tuiSettings.showStartupHints
 	}), keybindings);
 	const statusContainer = new Container();
-	const bottomBar = new TuiBottomBar(() => state, () => opts.thinking, () => formatKeyIds(keybindings, "app.message.dequeue", { capitalize: true }));
+	const bottomBar = new TuiBottomBar(() => state, () => opts.thinking);
 	const chatLog = new ChatLog(keybindings);
 	chatLog.setViewportRowsProvider(() => Math.max(8, tui.terminal.rows - 8));
 	let startupResources;
@@ -343,11 +342,20 @@ async function runTui(opts) {
 				return;
 			}
 			if (state.activeRunId) {
-				if (options?.deliverAs === "followUp") {
-					state.messageFollowUpQueue.push(controlText);
-					chatLog.addSystem(theme.dim(`Queued extension follow-up (${state.messageFollowUpQueue.length} in queue). ${tuiSettings.followUpMode === "all" ? "All queued messages send together when this reply finishes." : "Next sends when this reply finishes."}`));
-					bottomBar.invalidate();
-					tui.requestRender();
+				if (options?.deliverAs === "next") {
+					client.submitChatInput({
+						sessionKey: state.currentSessionKey,
+						message: controlText,
+						delivery: "next"
+					}).then((result) => {
+						if (!result.ok) throw new Error("Session input was rejected");
+						chatLog.addSystem(theme.dim("Queued as the next message."));
+						bottomBar.invalidate();
+						tui.requestRender();
+					}).catch((error) => {
+						chatLog.addSystem(`❌ Failed to queue: ${error instanceof Error ? error.message : String(error)}`);
+						tui.requestRender();
+					});
 					return;
 				}
 				steerMessage(turnText);
@@ -550,7 +558,7 @@ async function runTui(opts) {
 		}
 	};
 	const getAvailableProviderCount = () => getAllProviders().filter((provider) => isProviderConfiguredSync(provider)).length;
-	const getExtensionSystemPrompt = () => resolveEffectiveAgentProfileForSession(config, state.currentSessionKey).systemPromptOverride ?? "";
+	const getExtensionSystemPrompt = () => resolveEffectiveAgentProfileForSession(config, state.currentSessionKey).customInstructions ?? "";
 	const waitForTuiIdle = async () => {
 		while (state.activeRunId != null || state.isCompacting || state.activityStatus === "sending" || state.activityStatus === "waiting" || state.activityStatus === "streaming" || state.activityStatus === "running" || state.activityStatus === "compacting") await new Promise((resolveDelay) => setTimeout(resolveDelay, 50));
 	};
@@ -652,7 +660,7 @@ async function runTui(opts) {
 			sessionKey: state.currentSessionKey,
 			isProjectTrusted: isCurrentProjectTrusted,
 			isIdle: () => !state.activeRunId && !state.isCompacting,
-			hasPendingMessages: () => state.messageFollowUpQueue.length > 0 || state.steeringQueue.length > 0 || state.compactionQueue.length > 0,
+			hasPendingMessages: () => state.compactionQueue.length > 0,
 			abort: () => abortActive(),
 			shutdown: () => requestExit(),
 			compact: (options) => runCompaction(options?.customInstructions, {
@@ -1414,44 +1422,35 @@ async function runTui(opts) {
 		})();
 	};
 	const isAgentBusy = () => state.activeRunId != null || state.isCompacting || busyStates.has(state.activityStatus);
-	let steeringInFlightForRunId = null;
 	const sendSteeringToActiveRun = (text) => {
-		chatLog.addUser(text);
 		touchStreamingActivity();
 		tui.requestRender();
-		client.steerChat({
+		client.submitChatInput({
 			sessionKey: state.currentSessionKey,
-			message: text
-		}).then(({ ok }) => {
-			if (!ok) chatLog.addSystem(theme.dim(formatSteerUnavailableHint(keybindings)));
-			else chatLog.addSystem(theme.dim("Steered — message injects at the next tool boundary (pi-style)."));
+			message: text,
+			delivery: "steer"
+		}).then(({ ok, effectiveDelivery }) => {
+			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();
+			}
 			tui.requestRender();
 		}).catch((error) => {
+			if (!editor.getText().trim()) editor.setText(text);
 			const errorMessage = error instanceof Error ? error.message : String(error);
 			chatLog.addSystem(theme.dim(`Steer failed: ${errorMessage}`));
 			tui.requestRender();
 		});
 	};
-	const flushSteeringQueue = () => {
-		if (state.exitRequested) return;
-		if (state.activeRunId) return;
-		const next = drainFollowUpQueue(state.steeringQueue, tuiSettings.steeringMode);
-		if (next === void 0) return;
-		sendMessage(next);
-	};
 	const steerMessage = (text) => {
 		if (!state.activeRunId) {
 			sendMessage(text);
 			return;
 		}
-		if (steeringInFlightForRunId === state.activeRunId) {
-			state.steeringQueue.push(text);
-			chatLog.addSystem(theme.dim(`Queued steering (${state.steeringQueue.length} in queue). ${tuiSettings.steeringMode === "all" ? "All queued steering sends together after this reply." : "Next sends after this reply."}`));
-			bottomBar.invalidate();
-			tui.requestRender();
-			return;
-		}
-		steeringInFlightForRunId = state.activeRunId;
 		sendSteeringToActiveRun(text);
 	};
 	const sendMessage = (text) => {
@@ -1512,14 +1511,23 @@ async function runTui(opts) {
 			steerMessage(text);
 			return;
 		}
-		if (options?.deliverAs === "followUp") {
-			state.messageFollowUpQueue.push(text);
-			chatLog.addSystem(theme.dim(`Queued follow-up (${state.messageFollowUpQueue.length} in queue). ${tuiSettings.followUpMode === "all" ? "All queued messages send together when this reply finishes." : "Next sends when this reply finishes."}`));
-			bottomBar.invalidate();
-			tui.requestRender();
+		if (options?.deliverAs === "next") {
+			client.submitChatInput({
+				sessionKey: state.currentSessionKey,
+				message: text,
+				delivery: "next"
+			}).then((result) => {
+				if (!result.ok) throw new Error("Session input was rejected");
+				chatLog.addSystem(theme.dim("Queued as the next message."));
+				bottomBar.invalidate();
+				tui.requestRender();
+			}).catch((error) => {
+				chatLog.addSystem(`❌ Failed to queue: ${error instanceof Error ? error.message : String(error)}`);
+				tui.requestRender();
+			});
 			return;
 		}
-		throw new Error("Agent is busy. Use deliverAs: \"steer\" or \"followUp\".");
+		throw new Error("Agent is busy. Use deliverAs: \"steer\" or \"next\".");
 	};
 	const runCompaction = async (instructions, callbacks) => {
 		if (state.isCompacting) return void 0;
@@ -1781,6 +1789,16 @@ async function runTui(opts) {
 			applyComposerHistory(await client.getComposerInputHistory());
 		} catch {}
 	};
+	const refreshPendingInputCount = async (sessionKey = state.currentSessionKey) => {
+		try {
+			const inputState = await client.getChatInputState(sessionKey);
+			if (state.currentSessionKey === sessionKey) state.pendingInputCount = countPendingChatInputs(inputState.inputs);
+		} catch {
+			if (state.currentSessionKey === sessionKey) state.pendingInputCount = 0;
+		}
+		bottomBar.invalidate();
+		tui.requestRender();
+	};
 	const recordChatHistory = (value) => {
 		const text = value.trim();
 		if (!text) return;
@@ -1820,13 +1838,6 @@ async function runTui(opts) {
 		enabled: shouldEnableWindowsGitBashPasteFallback()
 	});
 	defaultEditor.onSubmit = submitBurst;
-	const flushFollowUpQueue = () => {
-		if (state.exitRequested) return;
-		if (state.activeRunId) return;
-		const next = drainFollowUpQueue(state.messageFollowUpQueue, tuiSettings.followUpMode);
-		if (next === void 0) return;
-		sendMessage(next);
-	};
 	const handleFollowUp = () => {
 		const text = editor.getText().trim();
 		if (!text && pendingImageAttachments.length === 0) return;
@@ -1836,33 +1847,30 @@ async function runTui(opts) {
 				tui.requestRender();
 				return;
 			}
-			recordChatHistory(text);
-			state.messageFollowUpQueue.push(text);
-			editor.setText("");
-			chatLog.addSystem(theme.dim(`Queued follow-up (${state.messageFollowUpQueue.length} in queue). ${tuiSettings.followUpMode === "all" ? "All queued messages send together when this reply finishes." : "Next sends when this reply finishes."}`));
-			bottomBar.invalidate();
-			tui.requestRender();
+			const sessionKey = state.currentSessionKey;
+			client.submitChatInput({
+				sessionKey,
+				message: text,
+				delivery: "next"
+			}).then(async ({ ok }) => {
+				if (!ok) throw new Error("Gateway did not accept the message");
+				recordChatHistory(text);
+				if (state.currentSessionKey === sessionKey && editor.getText().trim() === text) editor.setText("");
+				chatLog.addSystem(theme.dim("Queued as the next message."));
+				await refreshPendingInputCount(sessionKey);
+			}).catch((error) => {
+				const errorMessage = error instanceof Error ? error.message : String(error);
+				chatLog.addSystem(theme.dim(`Queue failed: ${errorMessage}`));
+				tui.requestRender();
+			});
 			return;
 		}
 		submitBurst(text);
 	};
-	const handleDequeue = () => {
-		const restored = restoreQueuedMessages({
-			steeringQueue: state.steeringQueue,
-			followUpQueue: state.messageFollowUpQueue
-		}, editor.getText());
-		if (restored.restoredCount === 0) {
-			chatLog.addStatus(theme.dim("No queued messages to restore."));
-			tui.requestRender();
-			return;
-		}
-		editor.setText(restored.text);
-		chatLog.addStatus(theme.dim(`Restored ${restored.restoredCount} queued message${restored.restoredCount > 1 ? "s" : ""} to editor.`));
-		bottomBar.invalidate();
-		tui.requestRender();
-	};
 	const setSessionKey = (key) => {
 		state.currentSessionKey = resolveSessionKey(key);
+		state.pendingInputCount = 0;
+		refreshPendingInputCount(state.currentSessionKey);
 		updateAgentFromPicker(key);
 	};
 	const updateAgentFromPicker = (key) => {
@@ -2054,7 +2062,6 @@ async function runTui(opts) {
 		})();
 	};
 	defaultEditor.onAction("app.message.followUp", handleFollowUp);
-	defaultEditor.onAction("app.message.dequeue", handleDequeue);
 	streamWatchdogId = setInterval(() => {
 		const now = Date.now();
 		if (!isActiveRunStreamStale(state, now, 3e4)) return;
@@ -2066,13 +2073,10 @@ async function runTui(opts) {
 	}, 5e3);
 	const onAgentRunEnded = () => {
 		state.progressMessage = null;
-		steeringInFlightForRunId = null;
 		refreshSessionInfoWithBorder().finally(() => {
 			updateFooter();
 			tui.requestRender();
 		});
-		flushSteeringQueue();
-		flushFollowUpQueue();
 	};
 	const handleWorkflowRunUpdated = (data) => {
 		const runId = typeof data.runId === "string" ? data.runId : "";
@@ -2093,6 +2097,14 @@ async function runTui(opts) {
 	};
 	client.onEvent = (evt) => {
 		const data = evt.data ?? {};
+		if (evt.event === "session.input-state") {
+			if (data.sessionKey === state.currentSessionKey && Array.isArray(data.inputs)) {
+				state.pendingInputCount = countPendingChatInputs(data.inputs);
+				bottomBar.invalidate();
+				tui.requestRender();
+			}
+			return;
+		}
 		if (evt.event === "composer-history.appended") {
 			const item = data;
 			if (typeof item.text === "string" && typeof item.id === "number") {
@@ -2147,6 +2159,11 @@ async function runTui(opts) {
 				chatLog.addSystem(`Project not selected: ${errorMessage}`);
 			}
 			await refreshSessionInfoWithBorder();
+			try {
+				state.pendingInputCount = countPendingChatInputs((await client.getChatInputState(state.currentSessionKey)).inputs);
+			} catch {
+				state.pendingInputCount = 0;
+			}
 			await refreshModelChoices();
 			await loadSessionHistory({ merge: true });
 			cleanupAbandonedTuiSessions(client, state.currentSessionKey).then(() => hideLegacyEmptyTuiSessions(client)).catch(() => {});

package/dist/src/tui/xopc-tui-keybindings.d.ts

@@ -1,5 +1,5 @@
 /** App-level bindings wired by xopc TUI (subset of pi coding-agent). */
-export type XopcTuiAppKeybinding = 'app.interrupt' | 'app.clear' | 'app.exit' | 'app.suspend' | 'app.thinking.cycle' | 'app.model.cycleForward' | 'app.model.cycleBackward' | 'app.model.select' | 'app.tools.expand' | 'app.thinking.toggle' | 'app.session.resume' | 'app.session.tree' | 'app.session.fork' | 'app.session.togglePath' | 'app.session.toggleSort' | 'app.session.toggleNamedFilter' | 'app.session.rename' | 'app.session.delete' | 'app.session.deleteNoninvasive' | 'app.tree.foldOrUp' | 'app.tree.unfoldOrDown' | 'app.tree.filter.default' | 'app.tree.filter.noTools' | 'app.tree.filter.userOnly' | 'app.tree.filter.labeledOnly' | 'app.tree.filter.all' | 'app.tree.filter.cycleForward' | 'app.tree.filter.cycleBackward' | 'app.tree.editLabel' | 'app.tree.toggleLabelTimestamp' | 'app.editor.external' | 'app.clipboard.pasteImage' | 'app.message.followUp' | 'app.message.dequeue' | 'app.models.save' | 'app.models.enableAll' | 'app.models.clearAll' | 'app.models.toggleProvider' | 'app.models.reorderUp' | 'app.models.reorderDown';
+export type XopcTuiAppKeybinding = 'app.interrupt' | 'app.clear' | 'app.exit' | 'app.suspend' | 'app.thinking.cycle' | 'app.model.cycleForward' | 'app.model.cycleBackward' | 'app.model.select' | 'app.tools.expand' | 'app.thinking.toggle' | 'app.session.resume' | 'app.session.tree' | 'app.session.fork' | 'app.session.togglePath' | 'app.session.toggleSort' | 'app.session.toggleNamedFilter' | 'app.session.rename' | 'app.session.delete' | 'app.session.deleteNoninvasive' | 'app.tree.foldOrUp' | 'app.tree.unfoldOrDown' | 'app.tree.filter.default' | 'app.tree.filter.noTools' | 'app.tree.filter.userOnly' | 'app.tree.filter.labeledOnly' | 'app.tree.filter.all' | 'app.tree.filter.cycleForward' | 'app.tree.filter.cycleBackward' | 'app.tree.editLabel' | 'app.tree.toggleLabelTimestamp' | 'app.editor.external' | 'app.clipboard.pasteImage' | 'app.message.followUp' | 'app.models.save' | 'app.models.enableAll' | 'app.models.clearAll' | 'app.models.toggleProvider' | 'app.models.reorderUp' | 'app.models.reorderDown';
 declare module '@earendil-works/pi-tui' {
     interface Keybindings {
         'app.interrupt': true;
@@ -35,7 +35,6 @@ declare module '@earendil-works/pi-tui' {
         'app.editor.external': true;
         'app.clipboard.pasteImage': true;
         'app.message.followUp': true;
-        'app.message.dequeue': true;
         'app.models.save': true;
         'app.models.enableAll': true;
         'app.models.clearAll': true;
@@ -177,10 +176,6 @@ export declare const XOPC_TUI_KEYBINDINGS: {
         readonly defaultKeys: "alt+enter";
         readonly description: "Queue message while busy (or submit when idle)";
     };
-    readonly 'app.message.dequeue': {
-        readonly defaultKeys: "alt+up";
-        readonly description: "Restore queued messages to editor";
-    };
     readonly 'app.models.save': {
         readonly defaultKeys: "ctrl+s";
         readonly description: "Save scoped model selection";
@@ -353,6 +348,14 @@ export declare const XOPC_TUI_KEYBINDINGS: {
         readonly defaultKeys: [];
         readonly description: "Scroll viewport down half a page";
     };
+    readonly "tui.altScreen.lineUp": {
+        readonly defaultKeys: [];
+        readonly description: "Scroll viewport up one line";
+    };
+    readonly "tui.altScreen.lineDown": {
+        readonly defaultKeys: [];
+        readonly description: "Scroll viewport down one line";
+    };
     readonly "tui.altScreen.previousPrompt": {
         readonly defaultKeys: "ctrl+shift+up";
         readonly description: "Jump to previous semantic prompt";
@@ -361,6 +364,22 @@ export declare const XOPC_TUI_KEYBINDINGS: {
         readonly defaultKeys: "ctrl+shift+down";
         readonly description: "Jump to next semantic prompt";
     };
+    readonly "tui.altScreen.search": {
+        readonly defaultKeys: "ctrl+shift+f";
+        readonly description: "Search the primary scroll view";
+    };
+    readonly "tui.altScreen.searchNext": {
+        readonly defaultKeys: ["enter", "ctrl+g"];
+        readonly description: "Select the next search match";
+    };
+    readonly "tui.altScreen.searchPrevious": {
+        readonly defaultKeys: ["shift+enter", "ctrl+shift+g"];
+        readonly description: "Select the previous search match";
+    };
+    readonly "tui.altScreen.searchClose": {
+        readonly defaultKeys: "escape";
+        readonly description: "Close transcript search";
+    };
     readonly "tui.altScreen.top": {
         readonly defaultKeys: "home";
         readonly description: "Scroll viewport to top";

package/dist/src/tui/xopc-tui-keybindings.js

@@ -134,10 +134,6 @@ const XOPC_TUI_KEYBINDINGS = {
 		defaultKeys: "alt+enter",
 		description: "Queue message while busy (or submit when idle)"
 	},
-	"app.message.dequeue": {
-		defaultKeys: "alt+up",
-		description: "Restore queued messages to editor"
-	},
 	"app.models.save": {
 		defaultKeys: "ctrl+s",
 		description: "Save scoped model selection"
@@ -198,7 +194,6 @@ const XOPC_TUI_HOTKEY_ORDER = [
 	"app.editor.external",
 	"app.clipboard.pasteImage",
 	"app.message.followUp",
-	"app.message.dequeue",
 	"app.models.save",
 	"app.models.enableAll",
 	"app.models.clearAll",

package/dist/src/tunnel/frpc-binary.js

@@ -6,8 +6,8 @@ import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { chmodSync, createWriteStream, existsSync, mkdirSync, rmSync } from "node:fs";
 import { randomBytes } from "node:crypto";
-import { pipeline } from "node:stream/promises";
 import { Readable } from "node:stream";
+import { pipeline } from "node:stream/promises";
 //#region src/tunnel/frpc-binary.ts
 init_paths();
 init_logger();

package/dist/src/tunnel/frpc-extract.js

@@ -3,8 +3,8 @@ import { init_logger } from "../utils/logger.js";
 import { dirname, join } from "node:path";
 import { existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from "node:fs";
 import { spawn } from "node:child_process";
-import { gunzipSync } from "node:zlib";
 import AdmZip from "adm-zip";
+import { gunzipSync } from "node:zlib";
 //#region src/tunnel/frpc-extract.ts
 init_logger();
 const log = createLogger("TunnelFrpcExtract");