@bastani/atomic 0.9.12 → 0.9.13-alpha.2

package/dist/builtin/workflows/src/tui/overlay-adapter.ts

@@ -27,7 +27,6 @@ import type {
 	PiKeybindings,
 	PiOverlayHandle,
 	PiOverlayOptions,
-	PiRemoteTerminalControl,
 	PiTheme,
 } from "../extension/wiring.js";
 import type { StageControlRegistry } from "../runs/foreground/stage-control-registry.js";
@@ -38,7 +37,7 @@ import { readGraphStoreSnapshot, subscribeStoreInvalidation } from "../shared/st
 import type { StoreSnapshot } from "../shared/store-types.js";
 import { deriveGraphThemeFromPiTheme } from "./graph-theme.js";
 import type { OverlayTerminalOutput } from "./overlay-terminal-modes.js";
-import { remoteTerminalControlFrom, setMouseScrollTracking, setTerminalAutowrap } from "./overlay-terminal-modes.js";
+import { remoteTerminalControlFrom, setTerminalAutowrap } from "./overlay-terminal-modes.js";
 import { WorkflowAttachPane } from "./workflow-attach-pane.js";
 import type { PostMortemHandleResolution } from "./workflow-attach-pane-types.js";
 import { WORKFLOW_STATUS_KEY } from "./workflow-status.js";
@@ -81,24 +80,8 @@ export interface GraphOverlayPort {
 }
 
 /**
- * Aspirational full-screen overlay geometry. In a future host that
- * forwards `overlayOptions` to pi-tui's `resolveOverlayLayout`,
- * `width`/`maxHeight` would expand against terminal dimensions so the
- * popup fills the entire frame, with `margin: 0` removing the breathing
- * room a centered popup needs.
- *
- * Current pi interactive `ExtensionUiController.custom` ignores
- * this object: it always mounts overlays with `{ anchor:
- * "bottom-center", width: "100%", maxHeight: "100%", margin: 0 }`. The
- * value is retained for `onHandle`-based toggle support and forward
- * compatibility — see `PiCustomOverlayOptions` for the host-compat
- * note.
- *
- * Note: percent geometry is necessary but not sufficient for a true
- * full-screen overlay — pi-tui positions the popup based on the
- * rendered overlay line count, so the mounted component must also
- * emit `terminal.rows` lines per frame. That row count is threaded
- * through `WorkflowAttachPane.getViewportRows` below.
+ * Full-screen overlay geometry. The host TUI owns terminal dimensions and
+ * the graph layout consumes them while rendering its ScrollView frame.
  */
 const FULLSCREEN_OVERLAY_OPTIONS: PiOverlayOptions = {
 	anchor: "center",
@@ -147,14 +130,12 @@ export function buildGraphOverlayAdapter(
 			process.stdout.write(data);
 		},
 	};
-	// Isolated interactive mode exposes a remote terminal-control capability;
-	// prefer it so the real host TTY (not the child's non-TTY JSONL stdout) gets
-	// the modes. Otherwise fall back to the local process.stdout seam.
-	let remoteTerminalControl: PiRemoteTerminalControl | null = null;
-	const updateMouseScrollTracking = (enabled: boolean): void => {
-		if (remoteTerminalControl) remoteTerminalControl.setMouseScrollTracking(enabled);
-		else setMouseScrollTracking(enabled, terminalOutput);
-	};
+	// Isolated interactive mode exposes a remote autowrap capability; prefer it
+	// so the real host TTY (not the child's non-TTY JSONL stdout) gets the mode.
+	// Otherwise fall back to the local process.stdout seam, except when the
+	// host's fullscreen renderer already owns autowrap.
+	let remoteTerminalControl: { setAutowrap(enabled: boolean): void } | null = null;
+	let localTerminalModesSuppressed = false;
 	let currentView: WorkflowAttachPane | null = null;
 	// pi-tui returns an OverlayHandle via `options.onHandle`. We hold onto
 	// it so toggle() can flip `setHidden` rather than remounting the
@@ -180,7 +161,7 @@ export function buildGraphOverlayAdapter(
 			if (terminalOutput.platform === "win32") remoteTerminalControl.setAutowrap(!visible);
 			return;
 		}
-		setTerminalAutowrap(!visible, terminalOutput);
+		if (!localTerminalModesSuppressed) setTerminalAutowrap(!visible, terminalOutput);
 	}
 
 	function readHostCustomUiActive(ui: OverlayUISurface | undefined = observedUi): boolean {
@@ -218,7 +199,6 @@ export function buildGraphOverlayAdapter(
 	}
 
 	function close(): void {
-		updateMouseScrollTracking(false);
 		currentHandle?.hide();
 		updateTerminalAutowrap(false);
 		finishMounted?.();
@@ -229,6 +209,7 @@ export function buildGraphOverlayAdapter(
 		currentView = null;
 		mounted = false;
 		remoteTerminalControl = null;
+		localTerminalModesSuppressed = false;
 		requestMountedRender = null;
 		clearHostCustomUiObservation();
 	}
@@ -249,7 +230,6 @@ export function buildGraphOverlayAdapter(
 	 * same mounted overlay can be reopened later.
 	 */
 	function hideMounted(): void {
-		updateMouseScrollTracking(false);
 		observedUi?.setStatus?.(MAIN_CHAT_INPUT_STATUS_KEY, undefined);
 		if (currentHandle) {
 			currentView?.setVisible(false);
@@ -290,14 +270,14 @@ export function buildGraphOverlayAdapter(
 		const unsubscribe = subscribeStoreInvalidation(store, onStoreUpdate);
 		return {
 			render: (width: number) => view.render(width),
-			handleInput: (data: string) => {
+			handleInput: (data: string): boolean => {
 				const consumed = view.handleInput(data);
 				if (consumed) tui.requestRender?.();
+				return consumed === true;
 			},
 			invalidate: () => tui.requestRender?.(),
 			dispose: () => {
 				updateTerminalAutowrap(false);
-				updateMouseScrollTracking(false);
 				remoteTerminalControl = null;
 				requestMountedRender = null;
 				unsubscribe();
@@ -315,7 +295,6 @@ export function buildGraphOverlayAdapter(
 			currentView?.retarget(runId, stageId, stageRunId);
 			currentView?.setVisible(true);
 			updateTerminalAutowrap(true);
-			updateMouseScrollTracking(currentView?.wantsMouseScrollTracking() ?? true);
 			currentHandle.setHidden(false);
 			currentHandle.focus();
 			requestMountedRender?.();
@@ -324,7 +303,6 @@ export function buildGraphOverlayAdapter(
 		if (mounted) {
 			currentView?.retarget(runId, stageId, stageRunId);
 			updateTerminalAutowrap(true);
-			updateMouseScrollTracking(currentView?.wantsMouseScrollTracking() ?? true);
 			// Restore keyboard focus to the visible overlay after retargeting.
 			// pi-tui dispatches key events only to the focused component, so a
 			// mounted-but-visible overlay that is retargeted (e.g. to a stage-scoped
@@ -345,13 +323,15 @@ export function buildGraphOverlayAdapter(
 			keybindings: PiKeybindings,
 			done: (result: undefined) => void,
 		): PiCustomComponent => {
-			// Prefer the host's remote terminal-control capability (isolated mode);
+			// Prefer the host's remote autowrap capability (isolated mode);
 			// stays null for non-isolated hosts, keeping the local process.stdout seam.
+			// In a fullscreen host, pi-tui already enabled and owns autowrap; the
+			// local fallback must not turn it off on overlay close.
+			localTerminalModesSuppressed = tui.mode === "fullscreen";
 			remoteTerminalControl = remoteTerminalControlFrom(tui);
 			const finish = (): void => {
 				if (settled) return;
 				settled = true;
-				updateMouseScrollTracking(false);
 				observedUi?.setStatus?.(MAIN_CHAT_INPUT_STATUS_KEY, undefined);
 				currentView?.dispose();
 				currentView = null;
@@ -365,6 +345,7 @@ export function buildGraphOverlayAdapter(
 				} finally {
 					updateTerminalAutowrap(false);
 					remoteTerminalControl = null;
+					localTerminalModesSuppressed = false;
 				}
 			};
 			const view = new WorkflowAttachPane({
@@ -386,12 +367,6 @@ export function buildGraphOverlayAdapter(
 				getToolsExpanded: ui?.getToolsExpanded,
 				setToolsExpanded: ui?.setToolsExpanded,
 				footerData: ui?.getFooterDataProvider?.(),
-				// Pi-tui owns terminal dimensions; thread its row count down
-				// so the overlay frame fills the actual viewport rather than
-				// a hard-coded 32-row rectangle. Returning `undefined` keeps
-				// the existing fallback for hosts that don't expose
-				// `tui.terminal`.
-				getViewportRows: () => tui.terminal?.rows,
 				// Drive the graph-view animation tick. Short-circuit when the
 				// overlay is hidden so a `setHidden(true)`-ed overlay does
 				// not waste CPU on render passes the user can't see. The
@@ -416,7 +391,6 @@ export function buildGraphOverlayAdapter(
 					if (currentHandle?.isFocused() === true) return;
 					currentHandle?.focus();
 				},
-				setMouseScrollTracking: updateMouseScrollTracking,
 				now: buildOpts.now,
 			} as ConstructorParameters<typeof WorkflowAttachPane>[0] & {
 				piTui?: PiCustomOverlayFactoryTui;
@@ -427,7 +401,6 @@ export function buildGraphOverlayAdapter(
 			finishMounted = finish;
 			mounted = true;
 			updateTerminalAutowrap(true);
-			updateMouseScrollTracking(view.wantsMouseScrollTracking());
 			updateMainChatInputHint(readHostCustomUiActive(ui));
 			return makeComponent(view, tui);
 		};
@@ -456,7 +429,6 @@ export function buildGraphOverlayAdapter(
 			const nowHidden = !currentHandle.isHidden();
 			currentView?.setVisible(!nowHidden);
 			if (!nowHidden) updateTerminalAutowrap(true);
-			updateMouseScrollTracking(nowHidden ? false : (currentView?.wantsMouseScrollTracking() ?? true));
 			currentHandle.setHidden(nowHidden);
 			if (nowHidden) updateTerminalAutowrap(false);
 			else {

package/dist/builtin/workflows/src/tui/overlay-terminal-modes.ts

@@ -1,15 +1,16 @@
 /**
- * Terminal-mode seams for the workflow graph overlay: raw mouse-scroll
- * reporting and autowrap (DECAWM) escape sequences for the local TTY, plus
- * extraction of the isolated host's remote terminal-control capability.
+ * Terminal-mode seams for the workflow graph overlay: autowrap (DECAWM)
+ * escape sequences for the local TTY, plus extraction of the isolated host's
+ * remote autowrap capability.
+ *
+ * Fullscreen pi-tui owns mouse reporting and application selection; workflow
+ * overlays do not toggle that terminal mode.
  *
  * cross-ref: src/tui/overlay-adapter.ts (sole consumer)
  */
 
-import type { PiCustomOverlayFactoryTui, PiRemoteTerminalControl } from "../extension/wiring.js";
+import type { PiCustomOverlayFactoryTui } from "../extension/wiring.js";
 
-const MOUSE_SCROLL_TRACKING_ON = "\x1b[?1000h\x1b[?1002h\x1b[?1006h";
-const MOUSE_SCROLL_TRACKING_OFF = "\x1b[?1006l\x1b[?1002l\x1b[?1000l";
 const TERMINAL_AUTOWRAP_ON = "\x1b[?7h";
 const TERMINAL_AUTOWRAP_OFF = "\x1b[?7l";
 
@@ -19,32 +20,20 @@ export interface OverlayTerminalOutput {
 	write(data: string): void;
 }
 
-export function setMouseScrollTracking(enabled: boolean, output: OverlayTerminalOutput): void {
-	if (!output.isTTY) return;
-	output.write(enabled ? MOUSE_SCROLL_TRACKING_ON : MOUSE_SCROLL_TRACKING_OFF);
-}
-
 export function setTerminalAutowrap(enabled: boolean, output: OverlayTerminalOutput): void {
 	if (output.platform !== "win32" || !output.isTTY) return;
 	output.write(enabled ? TERMINAL_AUTOWRAP_ON : TERMINAL_AUTOWRAP_OFF);
 }
 
 /**
- * Extract the host's remote terminal-control capability from the factory TUI —
- * present in isolated interactive mode (drives the real host TTY over the
- * allowlisted engine protocol); `null` for non-isolated hosts and test seams.
+ * Extract the host's remote autowrap capability from the factory TUI — present
+ * in isolated interactive mode (drives the real host TTY over the allowlisted
+ * engine protocol); `null` for non-isolated hosts and test seams.
  */
-export function remoteTerminalControlFrom(tui: PiCustomOverlayFactoryTui): PiRemoteTerminalControl | null {
+export function remoteTerminalControlFrom(
+	tui: PiCustomOverlayFactoryTui,
+): { setAutowrap(enabled: boolean): void } | null {
 	const terminal = tui.terminal;
-	if (
-		terminal === undefined ||
-		typeof terminal.setMouseScrollTracking !== "function" ||
-		typeof terminal.setAutowrap !== "function"
-	) {
-		return null;
-	}
-	return {
-		setMouseScrollTracking: terminal.setMouseScrollTracking.bind(terminal),
-		setAutowrap: terminal.setAutowrap.bind(terminal),
-	};
+	if (terminal === undefined || typeof terminal.setAutowrap !== "function") return null;
+	return { setAutowrap: terminal.setAutowrap.bind(terminal) };
 }

package/dist/builtin/workflows/src/tui/session-list.ts

@@ -34,5 +34,5 @@ export function renderSessionList(runs: readonly RunSnapshot[], opts: SessionLis
 			toolNodes: graph.tools.map((tool) => structuredClone(tool)),
 		};
 	});
-	return renderStatusList(filtered, { theme: opts.theme, now });
+	return renderStatusList(filtered, { theme: opts.theme, now, allRuns: runs });
 }

package/dist/builtin/workflows/src/tui/session-overlays.ts

@@ -25,12 +25,13 @@
 
 import type { PiCustomComponent, PiCustomOverlayFactoryTui, PiCustomOverlayFunction } from "../extension/wiring.js";
 import type { Store } from "../shared/store.js";
-import { readGraphStoreSnapshot, subscribeStoreInvalidation } from "../shared/store-observation.js";
+import { subscribeStoreInvalidation } from "../shared/store-observation.js";
 import type { GraphTheme } from "./graph-theme.js";
 import {
 	createSessionPickerResumeCandidateCache,
 	createSessionPickerState,
 	handleSessionPickerInput,
+	isSessionPickerKey,
 	renderSessionPicker,
 	selectRunsForPicker,
 } from "./session-picker.js";
@@ -81,6 +82,7 @@ export function openSessionPicker(
 		const state = createSessionPickerState();
 		let settled = false;
 		let unsubscribe: (() => void) | null = null;
+		let pickerRevision = 0;
 
 		const resumeCandidateCache = createSessionPickerResumeCandidateCache();
 
@@ -100,16 +102,16 @@ export function openSessionPicker(
 			};
 			// Re-render on store changes so newly-started runs appear and
 			// status icons refresh without the user having to press a key.
-			// Read one memoized payload-free projection per render rather than
-			// caching a snapshot from the subscription callback: the
-			// invalidation channel carries no snapshot, so a cached one would
-			// go stale and newly-started runs would never appear.
+			// The picker only needs live run references for rendering; a small local
+			// revision keeps resume-probe caching coherent without cloning the store.
 			const selectRows = (): ReturnType<typeof selectRunsForPicker> => {
-				const snapshot = readGraphStoreSnapshot(store);
+				const liveRuns = store.runs();
 				const resumeCandidateLookup =
-					intent === "resume" ? resumeCandidateCache({ ...snapshot, runs: store.runs() }) : undefined;
+					intent === "resume"
+						? resumeCandidateCache({ runs: liveRuns, notices: store.notices(), version: pickerRevision })
+						: undefined;
 				return selectRunsForPicker(
-					snapshot.runs,
+					liveRuns,
 					state.query,
 					state.includeAll,
 					Date.now(),
@@ -117,22 +119,27 @@ export function openSessionPicker(
 					resumeCandidateLookup,
 				);
 			};
-			unsubscribe = subscribeStoreInvalidation(store, () => tui.requestRender?.());
+			unsubscribe = subscribeStoreInvalidation(store, () => {
+				pickerRevision++;
+				tui.requestRender?.();
+			});
 			return {
 				render: (width: number) => {
 					const rows = selectRows();
-					return renderSessionPicker({ width, theme, rows, state });
+					return renderSessionPicker({ width, theme, rows, state, allRuns: store.runs() });
 				},
-				handleInput: (data: string) => {
+				handleInput: (data: string): boolean => {
 					const rows = selectRows();
+					const consumed = isSessionPickerKey(data, state, rows);
 					const action = handleSessionPickerInput(data, state, rows);
 					if (action.kind === "noop") {
 						tui.requestRender?.();
-						return;
+						return consumed;
 					}
 					if (action.kind === "close") finish({ kind: "close" });
 					else if (action.kind === "connect") finish(toResult(action));
 					else finish(toResult(action));
+					return true;
 				},
 				invalidate: () => tui.requestRender?.(),
 				dispose: () => {

package/dist/builtin/workflows/src/tui/session-picker.ts

@@ -20,6 +20,7 @@
 
 import { keyText } from "@bastani/atomic";
 import { isWorkflowRunResumable, type WorkflowRunResumeCandidate } from "../durable/resume-eligibility.js";
+import { runIndicatorStatus } from "../shared/run-indicator-status.js";
 import { isTopLevelWorkflowRun } from "../shared/run-visibility.js";
 import type { RunSnapshot, StoreSnapshot } from "../shared/store-types.js";
 import { elapsedRunMs } from "../shared/timing.js";
@@ -31,6 +32,10 @@ import { fmtDuration, statusColor, statusIcon } from "./status-helpers.js";
 import { Key, matchesKey, truncateToWidth, visibleWidth } from "./text-helpers.js";
 
 const ESCAPE_CODE = 0x1b;
+
+function isQuitRun(run: RunSnapshot): boolean {
+	return run.endedAt === undefined && run.status === "paused" && run.exitReason === "quit";
+}
 const DOUBLE_ESCAPE_SEQUENCE = String.fromCharCode(ESCAPE_CODE, ESCAPE_CODE);
 
 // ---------------------------------------------------------------------------
@@ -146,6 +151,8 @@ export interface SessionPickerRenderOpts {
 	state: SessionPickerState;
 	/** Optional: now override for deterministic tests. */
 	now?: number;
+	/** Point-in-time/live run collection used to attribute hidden child prompts. */
+	allRuns?: readonly RunSnapshot[];
 }
 
 /** Pad a visible string (any embedded ANSI is OK; we measure visibly). */
@@ -257,12 +264,20 @@ function stageProgress(run: RunSnapshot): string {
 	return `${done}/${total} stages`;
 }
 
-function renderRunRow(row: PickerRow, isSelected: boolean, inner: number, theme: GraphTheme, now: number): string[] {
+function renderRunRow(
+	row: PickerRow,
+	isSelected: boolean,
+	inner: number,
+	theme: GraphTheme,
+	now: number,
+	allRuns: readonly RunSnapshot[],
+): string[] {
 	const border = hexToAnsi(theme.border);
 	const panelBg = hexBg(theme.bg);
 	const run = row.run;
-	const icon = statusIcon(run.status);
-	const iconColor = hexToAnsi(statusColor(run.status, theme));
+	const indicatorStatus = isQuitRun(run) ? run.status : runIndicatorStatus(run, allRuns);
+	const icon = statusIcon(indicatorStatus);
+	const iconColor = hexToAnsi(statusColor(indicatorStatus, theme));
 	const dim = hexToAnsi(theme.dim);
 	const text = hexToAnsi(theme.text);
 	const muted = hexToAnsi(theme.textMuted);
@@ -349,6 +364,7 @@ export function renderSessionPicker(opts: SessionPickerRenderOpts): string[] {
 	const visible = rows.slice(Math.max(0, start), Math.max(0, start) + VIEWPORT);
 
 	let prevBucket: PickerRow["bucket"] | null = null;
+	const allRuns = opts.allRuns ?? rows.map(({ run }) => run);
 	for (let i = 0; i < visible.length; i++) {
 		const row = visible[i]!;
 		if (row.bucket !== prevBucket) {
@@ -356,7 +372,7 @@ export function renderSessionPicker(opts: SessionPickerRenderOpts): string[] {
 			prevBucket = row.bucket;
 		}
 		const absIndex = Math.max(0, start) + i;
-		lines.push(...renderRunRow(row, absIndex === sel, inner, theme, now));
+		lines.push(...renderRunRow(row, absIndex === sel, inner, theme, now, allRuns));
 	}
 	lines.push(renderBlankRow(inner, theme));
 	lines.push(renderBottomBorder(width, theme));
@@ -370,6 +386,33 @@ export function renderSessionPicker(opts: SessionPickerRenderOpts): string[] {
 
 export type SessionPickerAction = { kind: "noop" } | { kind: "close" } | { kind: "connect"; runId: string };
 
+export function isSessionPickerKey(data: string, state: SessionPickerState, rows: readonly PickerRow[]): boolean {
+	if (state.filterFocused) {
+		return (
+			matchesKey(data, Key.escape) ||
+			data === DOUBLE_ESCAPE_SEQUENCE ||
+			matchesKey(data, Key.enter) ||
+			matchesKey(data, Key.backspace) ||
+			(data.length === 1 && data >= " " && data <= "~")
+		);
+	}
+	if (
+		matchesKey(data, "/") ||
+		matchesKey(data, Key.escape) ||
+		matchesKey(data, "q") ||
+		matchesKey(data, Key.shift("q")) ||
+		matchesKey(data, "a") ||
+		matchesKey(data, Key.shift("a")) ||
+		matchesKey(data, Key.down) ||
+		matchesKey(data, "j") ||
+		matchesKey(data, Key.up) ||
+		matchesKey(data, "k")
+	) {
+		return true;
+	}
+	return matchesKey(data, Key.enter) && rows[state.selectedIndex] !== undefined;
+}
+
 /**
  * Pure key handler — never mutates anything outside `state`. Returns an
  * action describing what the host should do next (for example, mount the GraphView).

package/dist/builtin/workflows/src/tui/stage-chat-view-footer-status.ts

@@ -12,7 +12,7 @@ import {
 	trailingWidgetBorderChar,
 	widgetHintTargetLineIndex,
 } from "./stage-chat-view-render-helpers.js";
-import { STAGE_CHAT_MOUSE_SCROLL_TOGGLE_LABEL, type StageChatViewContext } from "./stage-chat-view-types.js";
+import type { StageChatViewContext } from "./stage-chat-view-types.js";
 import { truncateToWidth, visibleWidth } from "./text-helpers.js";
 
 export function renderHeader(ctx: StageChatViewContext, width: number, stage: StageSnapshot | undefined): string[] {
@@ -136,22 +136,13 @@ function mergeOrchestratorReturnHintIntoLine(
 		minimumPrefixWidth?: number;
 	} = {},
 ): string {
-	const copyModeState = ctx.mouseScrollCaptureEnabled ? "off" : "on";
 	const fullHint = {
-		plain: `ctrl+x return to graph · ${STAGE_CHAT_MOUSE_SCROLL_TOGGLE_LABEL} copy mode ${copyModeState}`,
-		styled:
-			paint("ctrl+x", ctx.theme.text, { bold: true }) +
-			paint(" return to graph · ", ctx.theme.textMuted) +
-			paint(STAGE_CHAT_MOUSE_SCROLL_TOGGLE_LABEL, ctx.theme.text, { bold: true }) +
-			paint(` copy mode ${copyModeState}`, ctx.theme.textMuted),
+		plain: "ctrl+x return to graph",
+		styled: paint("ctrl+x", ctx.theme.text, { bold: true }) + paint(" return to graph", ctx.theme.textMuted),
 	};
 	const compactHint = {
-		plain: `ctrl+x graph · ${STAGE_CHAT_MOUSE_SCROLL_TOGGLE_LABEL} ${copyModeState}`,
-		styled:
-			paint("ctrl+x", ctx.theme.text, { bold: true }) +
-			paint(" graph · ", ctx.theme.textMuted) +
-			paint(STAGE_CHAT_MOUSE_SCROLL_TOGGLE_LABEL, ctx.theme.text, { bold: true }) +
-			paint(` ${copyModeState}`, ctx.theme.textMuted),
+		plain: "ctrl+x graph",
+		styled: paint("ctrl+x", ctx.theme.text, { bold: true }) + paint(" graph", ctx.theme.textMuted),
 	};
 	const trailingBorder = options.preserveTrailingBorder === true ? trailingWidgetBorderChar(line) : "";
 	const suffixWidth = visibleWidth(trailingBorder);

package/dist/builtin/workflows/src/tui/stage-chat-view-input.ts

@@ -18,6 +18,12 @@ import { PROMPT_SCROLL_STEP_ROWS, type StageChatViewContext } from "./stage-chat
 import { Key, matchesKey } from "./text-helpers.js";
 
 export function handleStageChatInput(ctx: StageChatViewContext, data: string): boolean {
+	const keybindings = isKeybindingsLike(ctx.piKeybindings) ? ctx.piKeybindings : undefined;
+	// Only the default physical Ctrl+T belongs to the host thinking action. A
+	// user remap may reuse an editor key, so let that key reach the composer.
+	if (matchesKey(data, Key.ctrl("t")) && matchesAction(keybindings, data, APP_ACTION.thinkingToggle)) {
+		return false;
+	}
 	if (matchesKey(data, Key.ctrl("x"))) {
 		if (ctx.mountedCustomUi) releaseMountedCustomUi(ctx);
 		else {
@@ -28,11 +34,6 @@ export function handleStageChatInput(ctx: StageChatViewContext, data: string): b
 		ctx.onDetach();
 		return true;
 	}
-	if (matchesKey(data, Key.ctrl("t"))) {
-		ctx.mouseScrollCaptureEnabled = !ctx.mouseScrollCaptureEnabled;
-		ctx.requestRender?.();
-		return true;
-	}
 	if (ctx.mountedCustomUi) {
 		return handleMountedCustomUiInput(ctx, data);
 	}
@@ -112,9 +113,9 @@ function handleMountedCustomUiInput(ctx: StageChatViewContext, data: string): bo
 
 	const component = mounted.component;
 	setComponentFocused(component, ctx.focused);
-	component.handleInput?.(data);
+	const handled = component.handleInput?.(data) === true;
 	ctx.requestRender?.();
-	return true;
+	return handled;
 }
 
 function handlePromptInput(ctx: StageChatViewContext, data: string): void {

package/dist/builtin/workflows/src/tui/stage-chat-view-state.ts

@@ -49,7 +49,6 @@ export function initializeStageChatView(ctx: StageChatViewContext, opts: StageCh
 	ctx.requestRender = opts.requestRender;
 	ctx.requestFocus = opts.requestFocus;
 	ctx.focusHoldTimer = undefined;
-	ctx.getViewportRows = opts.getViewportRows;
 	ctx.piTui = opts.piTui;
 	ctx.piTheme = opts.piTheme;
 	ctx.piKeybindings = opts.piKeybindings;
@@ -69,7 +68,6 @@ export function initializeStageChatView(ctx: StageChatViewContext, opts: StageCh
 	ctx.promptMaxScroll = 0;
 	ctx.promptVisibleRows = 0;
 	ctx.localPaused = false;
-	ctx.mouseScrollCaptureEnabled = true;
 	ctx.lastObservedStageStatus = undefined;
 	ctx.lastObservedRunStatus = undefined;
 	ctx.seenNoticeIds = new Set<string>();
@@ -315,10 +313,21 @@ function handleStoreUpdate(ctx: StageChatViewContext): void {
 	if (changed || hadAnimationTick !== ctx.chatHost.hasAnimationTick()) ctx.requestRender?.();
 }
 
+/**
+ * Snapshot the transcript a freshly mounted chat has to start from.
+ *
+ * The handle reports settled messages; an assistant message still streaming is
+ * not one of them until its turn ends. `message_update` carries only the next
+ * delta, so a chat opened part-way through a stage's turn would otherwise show
+ * nothing until that turn finished — a stage held mid-turn shows nothing at
+ * all. The session's in-flight message closes that window, and the live
+ * subscription installed after this continues it delta by delta.
+ */
 function snapshotMessagesFromHandle(ctx: StageChatViewContext): void {
 	const handle = liveHandle(ctx);
 	if (!handle) return;
 	ctx.chatHost.appendMessages(handle.messages);
+	ctx.chatHost.hydrateStreamingAssistantMessage(handle.agentSession?.agent?.state.streamingMessage);
 }
 
 function snapshotMessagesFromSessionFile(ctx: StageChatViewContext, stage: StageSnapshot | undefined): void {
@@ -460,7 +469,7 @@ export function resolvePromptResponse(
 }
 
 export function viewLineCount(ctx: StageChatViewContext): number {
-	const reported = ctx.getViewportRows?.();
+	const reported = ctx.piTui?.terminal?.rows;
 	if (typeof reported !== "number" || !Number.isFinite(reported)) {
 		return VIEW_LINE_COUNT;
 	}

package/dist/builtin/workflows/src/tui/stage-chat-view-types.ts

@@ -13,12 +13,12 @@ import type { RunStatus, StageNotice, StageStatus } from "../shared/store-types.
 import type { GraphTheme } from "./graph-theme.js";
 import type { PromptCardState } from "./prompt-card.js";
 
+/** Unhosted fallback frame height used when no host terminal supplies rows. */
 export const VIEW_LINE_COUNT = 32;
 export const PROMPT_SCROLL_STEP_ROWS = 4;
 /** Header rows reserved by prompt paging for the normal UUID continuation shape. */
 export const HEADER_ROWS = 2;
 export const SEP_ROWS = 1;
-export const STAGE_CHAT_MOUSE_SCROLL_TOGGLE_LABEL = "ctrl+t";
 
 export function isReadOnlyArchiveStatus(status: StageStatus): boolean {
 	return status === "completed" || status === "failed" || status === "skipped";
@@ -66,14 +66,6 @@ export interface StageChatViewOpts {
 	setToolsExpanded?: (expanded: boolean) => void;
 	/** Parent footer data provider inherited from the host UI for core footer/usage rendering. */
 	footerData?: ReadonlyFooterDataProvider;
-	/**
-	 * Optional accessor returning the current terminal row count. The chat
-	 * surface expands its body band to roughly `viewportRows` minus the fixed
-	 * header / loader / editor / footer rows so the popup fills the
-	 * terminal under pi-tui's `width: "100%" / maxHeight: "100%"` geometry.
-	 * Returning `undefined` falls back to the constant 32-row frame.
-	 */
-	getViewportRows?: () => number | undefined;
 	/** Broker that routes stage-local custom UI, such as ask_user_question, into this node. */
 	stageUiBroker?: StageUiBroker;
 	/**
@@ -130,7 +122,6 @@ export interface StageChatViewContext {
 	requestRender: (() => void) | undefined;
 	requestFocus: (() => void) | undefined;
 	focusHoldTimer: ReturnType<typeof setInterval> | undefined;
-	getViewportRows: (() => number | undefined) | undefined;
 	piTui: TUI | undefined;
 	piTheme: unknown;
 	piKeybindings: unknown;
@@ -151,7 +142,6 @@ export interface StageChatViewContext {
 	promptMaxScroll: number;
 	promptVisibleRows: number;
 	localPaused: boolean;
-	mouseScrollCaptureEnabled: boolean;
 	lastObservedStageStatus: StageStatus | undefined;
 	lastObservedRunStatus: RunStatus | undefined;
 	seenNoticeIds: Set<string>;

package/dist/builtin/workflows/src/tui/stage-chat-view.ts

@@ -79,7 +79,6 @@ export class StageChatView implements Component, Focusable {
 	private requestRender!: StageChatViewContext["requestRender"];
 	private requestFocus!: StageChatViewContext["requestFocus"];
 	private focusHoldTimer!: StageChatViewContext["focusHoldTimer"];
-	private getViewportRows!: StageChatViewContext["getViewportRows"];
 	private piTui!: StageChatViewContext["piTui"];
 	private piTheme!: StageChatViewContext["piTheme"];
 	private piKeybindings!: StageChatViewContext["piKeybindings"];
@@ -100,7 +99,6 @@ export class StageChatView implements Component, Focusable {
 	private promptMaxScroll!: StageChatViewContext["promptMaxScroll"];
 	private promptVisibleRows!: StageChatViewContext["promptVisibleRows"];
 	private localPaused!: StageChatViewContext["localPaused"];
-	private mouseScrollCaptureEnabled!: StageChatViewContext["mouseScrollCaptureEnabled"];
 	private seenNoticeIds!: StageChatViewContext["seenNoticeIds"];
 	private _unsubscribeStore!: StageChatViewContext["_unsubscribeStore"];
 	private _unsubscribeHandle!: StageChatViewContext["_unsubscribeHandle"];
@@ -186,10 +184,6 @@ export class StageChatView implements Component, Focusable {
 		return fitStageChatFrame(lines, totalRows, blankLine(w));
 	}
 
-	wantsMouseScrollTracking(): boolean {
-		return this.mouseScrollCaptureEnabled;
-	}
-
 	handleInput(data: string): boolean {
 		return handleStageChatInput(this._ctx(), data);
 	}
@@ -218,7 +212,6 @@ export class StageChatView implements Component, Focusable {
 		void this.requestRender;
 		void this.requestFocus;
 		void this.focusHoldTimer;
-		void this.getViewportRows;
 		void this.piTui;
 		void this.piTheme;
 		void this.piKeybindings;
@@ -235,7 +228,6 @@ export class StageChatView implements Component, Focusable {
 		void this.promptScrollOffset;
 		void this.promptMaxScroll;
 		void this.promptVisibleRows;
-		void this.mouseScrollCaptureEnabled;
 		void this.seenNoticeIds;
 		void this._unsubscribeStore;
 		void this._unsubscribeHandle;