@builder.io/buildercode 0.3.5 → 0.3.8

package/dist/cli.mjs

@@ -51101,7 +51101,7 @@ function parameterize(strings, ...values) {
 * @param values Expressions extracted from template string
 * @returns A `ParameterizedString` object that can be passed into `captureMessage` or Sentry.logger.X methods.
 */
-const fmt = parameterize;
+const fmt$1 = parameterize;
 //#endregion
 //#region ../../node_modules/@sentry/core/build/esm/utils/sdkMetadata.js
 /**
@@ -53095,7 +53095,7 @@ var exports_exports = /* @__PURE__ */ __exportAll({
 	debug: () => debug$3,
 	error: () => error,
 	fatal: () => fatal,
-	fmt: () => fmt,
+	fmt: () => fmt$1,
 	info: () => info,
 	trace: () => trace$1,
 	warn: () => warn
@@ -244266,7 +244266,7 @@ const LIB_CACHE = /* @__PURE__ */ new Map();
 const PENDING_LIB_CACHE = /* @__PURE__ */ new Map();
 const NODE_MODULE_CACHE = /* @__PURE__ */ new Map();
 const TSCONFIG_CACHE = /* @__PURE__ */ new Map();
-const pkgVersion = process.env.OVERRIDE_VERSION ?? "0.3.5";
+const pkgVersion = process.env.OVERRIDE_VERSION ?? "0.3.8";
 //#endregion
 //#region ../dev-tools/core/detect-frameworks.ts
 async function detectFrameworks$1(sys) {
@@ -290208,7 +290208,7 @@ function wc$1({ parent: e }) {
 		default: return !1;
 	}
 }
-function _c$16({ parent: e, grandparent: t }) {
+function _c$17({ parent: e, grandparent: t }) {
 	return t?.type === "JSXAttribute" && e.type === "JSXExpressionContainer" && t.name.type === "JSXIdentifier" && t.name.name === "css";
 }
 async function co(e, t, r) {
@@ -295224,7 +295224,7 @@ var init_estree = __esmMin((() => {
 		(e, t) => e.type === "CallExpression" && e.callee.type === "Identifier" && e.callee.name === "Component" && t === "arguments",
 		(e, t) => e.type === "Decorator" && t === "expression"
 	];
-	po$1 = (e) => Oc$1(e) || wc$1(e) || _c$16(e) || oo$2(e);
+	po$1 = (e) => Oc$1(e) || wc$1(e) || _c$17(e) || oo$2(e);
 	Es$6 = 0;
 	fo = mo.bind(void 0, "html"), yo = mo.bind(void 0, "angular");
 	jc = [
@@ -399401,7 +399401,7 @@ function xc(t, e, s = {}) {
 	let r = It(t, s.backwards ? e - 1 : e, s);
 	return r !== Gt(t, r, s);
 }
-function _c$15(t, e) {
+function _c$16(t, e) {
 	if (e === !1) return !1;
 	if (t.charAt(e) === "/" && t.charAt(e + 1) === "*") {
 		for (let s = e + 2; s < t.length; ++s) if (t.charAt(s) === "*" && t.charAt(s + 1) === "/") return s + 2;
@@ -405226,7 +405226,7 @@ https://evilmartians.com/chronicles/postcss-8-plugin-migration`));
 ` || t === "\r" || t === "\u2028" || t === "\u2029";
 	Gt = vc;
 	Yt = xc;
-	xi$1 = _c$15;
+	xi$1 = _c$16;
 	_i = bc;
 	Vt$1 = Ec;
 	De = Oc;
@@ -520772,13 +520772,7 @@ Tips:
 			...this.#lastAICommits,
 			...allCommits
 		};
-		if (!(await this.#emitGitStatus())?.currentCommit) {
-			this.#sys.Sentry?.captureException(/* @__PURE__ */ new Error(`Failed to get current commit hash after revert`), { tags: {
-				operation: "codegen-git",
-				endpoint: "revertToCommitHash"
-			} });
-			return;
-		}
+		await this.#emitGitStatus();
 		this.requestRefresh();
 		await this.#completionFinalize({ lastCommit: serializeGitSnapshot(allCommits) });
 	}
@@ -521191,6 +521185,7 @@ Tips:
 		this.#preventMessageFlush = false;
 		this.clearMessageQueue();
 		this.queueGitStatusReminder({ trigger: "session-start" });
+		this.#emitter.emit("step", this.#getSessionEvent());
 	}
 	async clearMessageQueue(emitUserMessages = false) {
 		const userMessages = [];
@@ -521531,7 +521526,7 @@ Make the necessary changes and try again.`
 			options: {
 				sys: this.#sys,
 				credentials: this.#credentials,
-				position: agent?.position ?? `${basePosition}-agent`,
+				position: agent?.position ?? `${basePosition}-${subagentType}`,
 				mode,
 				includeMemories,
 				modelOverride: agent?.inheritSessionModel && (this.#lastModelOverride ?? this.#modelOverride) ? this.#lastModelOverride ?? this.#modelOverride : resolveModelShortcut(resolvedModel) ?? this.#lastModelOverride ?? this.#modelOverride,
@@ -521576,7 +521571,10 @@ Make the necessary changes and try again.`
 			checkpointCommitHash = (await this.#emitGitStatus())?.currentCommit;
 		}
 		const subagent_type = agentConfig.subagent_type;
-		const agentSession = new CodeGenSession(agentConfig.options);
+		const agentSession = new CodeGenSession({
+			...agentConfig.options,
+			git: false
+		});
 		const subAgentId = options.sessionId ?? options.resume ?? sessionId;
 		const agentPromise = Promise.withResolvers();
 		this.#runningSubAgents.set(subAgentId, {
@@ -521625,7 +521623,7 @@ Make the necessary changes and try again.`
 					});
 				}
 				if (step.type === "tool") timeline.onToolCall(step.name, step.id, step.content);
-				if (step.type === "planning") timeline.onThinking(step.content);
+				if (step.type === "thinking") timeline.onThinking(step.content);
 				if (step.type === "tool_result") {
 					const prevFrameCount = timeline.getFrameCount();
 					timeline.onToolResult(step.result, getLastCursorPosition());
@@ -522620,11 +522618,9 @@ Make the necessary changes and try again.`
 			this.#isCheckingGitStatus--;
 		}
 	}
-	#replayTurns() {
+	#getSessionEvent() {
 		const sessionContext = this.getSessionContext();
-		const turns = sessionContext.turns;
-		const steps = [];
-		steps.push({
+		return {
 			type: "session",
 			title: sessionContext.title,
 			beforeCommit: sessionContext.beforeCommit,
@@ -522644,7 +522640,12 @@ Make the necessary changes and try again.`
 				isSkill: instruction.isSkill ?? instruction.filePath?.toLowerCase().includes("/skills/") ?? false
 			})),
 			hasPlanToApply: this.#hasPlanToApply
-		});
+		};
+	}
+	#replayTurns() {
+		const turns = this.getSessionContext().turns;
+		const steps = [];
+		steps.push(this.#getSessionEvent());
 		if (Object.keys(this.#lastMetadata).length > 0) steps.push({
 			type: "metadata",
 			...this.#lastMetadata
@@ -522709,7 +522710,7 @@ Make the necessary changes and try again.`
 						}
 					} catch {}
 				} else if (action.type === "thinking") steps.push({
-					type: "planning",
+					type: "thinking",
 					content: action.content
 				});
 				else if (action.type === "text") steps.push({
@@ -523116,6 +523117,7 @@ Make the necessary changes and try again.`
 		let includeUserMessage = true;
 		let hasChanges = false;
 		let needGitStatus = false;
+		let navigatePreviewCalled = false;
 		let userInput;
 		let validationCount = 0;
 		let healthIssueCount = 0;
@@ -523169,6 +523171,7 @@ Make the necessary changes and try again.`
 						errors = 0;
 						hasChanges ||= filesChanged;
 						needGitStatus ||= filesChanged;
+						navigatePreviewCalled ||= completionResult.navigatePreviewCalled;
 						totalCompletions += completions;
 						this.#pendingValidation ||= filesChanged;
 						this.#currentMessage = void 0;
@@ -523283,7 +523286,7 @@ failed with code ${result.code}`,
 			}
 			await this.#commitAccumulatedChanges(true);
 			const shouldRefresh = this.#fusionConfig?.refreshPreview ?? true;
-			if (hasChanges && shouldRefresh) this.requestRefresh();
+			if (hasChanges && shouldRefresh && !navigatePreviewCalled) this.requestRefresh();
 		}
 	}
 	async #generateCompletion(sessionContext, userInput, signal, onStep) {
@@ -523293,13 +523296,7 @@ failed with code ${result.code}`,
 		const url = this.getLastTurn()?.nextUrl ?? this.#initialUrl;
 		let filesChanged = false;
 		let completions = 0;
-		onStep({
-			type: "start",
-			id: "",
-			name: "thinking",
-			title: "Thinking",
-			content: ""
-		});
+		let navigatePreviewCalled = false;
 		try {
 			const artifacts = this.#onGoingArtifacts = [];
 			if (!sessionContext.beforeCommit) {
@@ -523370,6 +523367,7 @@ failed with code ${result.code}`,
 				projectId: this.#projectId,
 				branchName: this.#branchName,
 				repoHash: this.#repoHash,
+				repoBranch: this.#aiBranch,
 				pingEvents: true,
 				workingDirectory: this.#bashWorkingDirectory,
 				beforeCommit,
@@ -523458,6 +523456,7 @@ failed with code ${result.code}`,
 					const turnState = lastTurn = await this.#finalizeTurn(sessionContext, json, lastTurn, beforeCommit);
 					for (const action of json.actions ?? []) if (action.type === "tool_result") {
 						if (action.filePath === "ExitPlanMode") this.#hasPlanToApply = true;
+						if (action.filePath === "NavigatePreview") navigatePreviewCalled = true;
 						onStep({
 							type: "tool_result",
 							result: {
@@ -523520,7 +523519,7 @@ failed with code ${result.code}`,
 			};
 			const closedAction = (json) => {
 				if (json.type === "thinking") onStep({
-					type: "planning",
+					type: "thinking",
 					content: json.content
 				});
 				if (json.type === "server_tool_result") {
@@ -523606,6 +523605,7 @@ failed with code ${result.code}`,
 			return {
 				completions,
 				filesChanged,
+				navigatePreviewCalled,
 				shouldContinue: shouldContinue || lastTurn.actions.some((a) => a.type === "tool") || lastTurn.autoContinue
 			};
 		} finally {
@@ -526250,7 +526250,10 @@ ${truncateLines(plan ?? "", 500)}
 		isError: false,
 		toolResult: isDeepResearch ? `Tech spec is about to be presented to the user. Do not communicate anything else, just acknowledge that the tech spec has been presented. Do not call any other tools.` : `Plan is about to be presented to the user. Waiting for user approval to proceed with implementation. Do not communicate anything else, just acknowledge that the plan has been presented. Do not start implementing anything yet or call any other tools.`,
 		title: "Plan presented",
-		structuredResult: { sessionMode: toolContext.sessionMode }
+		structuredResult: {
+			sessionMode: toolContext.sessionMode,
+			plan
+		}
 	};
 }
 async function proposeConfig(toolContext, input) {
@@ -526810,6 +526813,11 @@ async function getRipgrepExecutable(sys) {
 			if (sys.existsSync(pkgBundledRgPath)) return pkgBundledRgPath;
 		}
 	} catch (error) {}
+	try {
+		const execDir = path$6.dirname(process.execPath);
+		const siblingRgPath = path$6.join(execDir, rgFilename);
+		if (sys.existsSync(siblingRgPath)) return siblingRgPath;
+	} catch {}
 	try {
 		const platformKey = process.platform === "win32" ? "win32-x64" : `${process.platform}-${process.arch}`;
 		const vendoredRgPath = path$6.join(__dirname$1, "..", "vendors", platformKey, rgFilename);
@@ -528439,6 +528447,7 @@ async function* completionStream(sys, credentials, body, signal, debug) {
 		const res = await safeFetch(url, {
 			method: "POST",
 			body: json,
+			keepalive: true,
 			headers: {
 				"Content-Type": "application/json",
 				Authorization: `Bearer ${credentials.builderPrivateKey}`
@@ -530378,7 +530387,9 @@ async function getFusionConfig(sys, args) {
 			"netlify *",
 			"node *",
 			"tsx *",
-			"builderio *"
+			"builderio *",
+			"builder *",
+			"open *"
 		]
 	};
 	if (args.configJson) try {
@@ -531908,341 +531919,534 @@ var ScrollView = (0, import_react.forwardRef)(({ onScroll, onViewportSizeChange,
 	});
 });
 //#endregion
-//#region ../../node_modules/ink-multiline-input/dist/index.js
-function expandTabs(text, tabSize) {
-	return text.replace(/\t/g, " ".repeat(tabSize));
+//#region src/hooks/useTextInput.ts
+const MOUSE_RE = /^\[<(\d+);\d+;\d+[Mm]/;
+function getLineStart(text, cursor) {
+	return text.slice(0, cursor).lastIndexOf("\n") + 1;
+}
+function getLineEnd(text, cursor) {
+	const next = text.slice(cursor).indexOf("\n");
+	return next === -1 ? text.length : cursor + next;
+}
+function isOnFirstLine(text, cursor) {
+	return !text.slice(0, cursor).includes("\n");
+}
+function isOnLastLine(text, cursor) {
+	return !text.slice(cursor).includes("\n");
+}
+function getPrevWordStart(text, cursor) {
+	let i = cursor - 1;
+	while (i > 0 && /\s/.test(text[i])) i--;
+	while (i > 0 && !/\s/.test(text[i - 1])) i--;
+	return Math.max(0, i);
+}
+function getNextWordEnd(text, cursor) {
+	let i = cursor;
+	const len = text.length;
+	while (i < len && /\s/.test(text[i])) i++;
+	while (i < len && !/\s/.test(text[i])) i++;
+	return i;
 }
-function normalizeLineEndings(text) {
-	if (text == null) return "";
-	return text.replace(/\r\n/g, "\n").replace(/\r/g, "\n");
+function getPrevLineIndex(text, cursor) {
+	const lines = text.split("\n");
+	let pos = 0, lineIdx = 0, col = 0;
+	for (let i = 0; i < lines.length; i++) {
+		const lineEnd = pos + lines[i].length;
+		if (cursor >= pos && cursor <= lineEnd) {
+			lineIdx = i;
+			col = cursor - pos;
+			break;
+		}
+		pos = lineEnd + 1;
+	}
+	if (lineIdx === 0) return cursor;
+	const targetLine = lines[lineIdx - 1];
+	let newIdx = 0;
+	for (let i = 0; i < lineIdx - 1; i++) newIdx += lines[i].length + 1;
+	return newIdx + Math.min(col, targetLine.length);
 }
-var MeasureBox = ({ children, onHeightChange }) => {
-	const ref = (0, import_react.useRef)(null);
-	const lastHeightRef = (0, import_react.useRef)(void 0);
-	(0, import_react.useEffect)(() => {
-		if (ref.current) {
-			const { height } = measureElement(ref.current);
-			if (lastHeightRef.current !== height) {
-				lastHeightRef.current = height;
-				onHeightChange?.(height);
-			}
+function getNextLineIndex(text, cursor) {
+	const lines = text.split("\n");
+	let pos = 0, lineIdx = 0, col = 0;
+	for (let i = 0; i < lines.length; i++) {
+		const lineEnd = pos + lines[i].length;
+		if (cursor >= pos && cursor <= lineEnd) {
+			lineIdx = i;
+			col = cursor - pos;
+			break;
 		}
-	});
-	return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Box, {
-		ref,
-		flexShrink: 0,
-		flexGrow: 0,
-		width: "100%",
-		children
-	});
-};
-var ControlledMultilineInput = ({ value, rows, maxRows, highlightStyle, textStyle, placeholder = "", mask, showCursor = true, focus = true, tabSize = 4, cursorIndex = 0, highlight, refreshKey }) => {
-	const [scrollOffset, setScrollOffset] = (0, import_react.useState)(0);
-	const [contentHeight, setContentHeight] = (0, import_react.useState)(0);
-	const [markerHeight, setMarkerHeight] = (0, import_react.useState)(0);
-	const formatText = (0, import_react.useCallback)((text, isPlaceholder = false) => {
-		const normalized = normalizeLineEndings(text);
-		if (!isPlaceholder && mask) return normalized.replace(/[^\n]/g, mask);
-		return expandTabs(normalized, tabSize);
-	}, [tabSize, mask]);
-	const { preCursor, postCursor } = (0, import_react.useMemo)(() => {
-		if (!value) {
-			if (placeholder && !focus) return {
-				preCursor: [{
-					value: formatText(placeholder, true),
-					type: "placeholder"
-				}],
-				postCursor: []
-			};
-			return {
-				preCursor: [{
-					value: " ",
-					type: "cursor"
-				}],
-				postCursor: []
-			};
+		pos = lineEnd + 1;
+	}
+	if (lineIdx >= lines.length - 1) return cursor;
+	const targetLine = lines[lineIdx + 1];
+	let newIdx = 0;
+	for (let i = 0; i <= lineIdx; i++) newIdx += lines[i].length + 1;
+	return newIdx + Math.min(col, targetLine.length);
+}
+function useTextInput(options = {}) {
+	const { onSubmit, onChange, onScrollUp, onScrollDown, onTab, isActive = true, getIsMenuActive, submitDisabled = false, disableHistory = false } = options;
+	const [value, setValueState] = (0, import_react.useState)("");
+	const [cursorIndex, setCursorIndex] = (0, import_react.useState)(0);
+	const [pasteLength, setPasteLength] = (0, import_react.useState)(0);
+	const [history, setHistory] = (0, import_react.useState)([]);
+	const [historyIndex, setHistoryIndex] = (0, import_react.useState)(-1);
+	const [historyDraft, setHistoryDraft] = (0, import_react.useState)("");
+	const valueRef = (0, import_react.useRef)(value);
+	const cursorRef = (0, import_react.useRef)(cursorIndex);
+	const historyRef = (0, import_react.useRef)(history);
+	const historyIndexRef = (0, import_react.useRef)(historyIndex);
+	const historyDraftRef = (0, import_react.useRef)(historyDraft);
+	valueRef.current = value;
+	cursorRef.current = cursorIndex;
+	historyRef.current = history;
+	historyIndexRef.current = historyIndex;
+	historyDraftRef.current = historyDraft;
+	const applyValue = (0, import_react.useCallback)((val, cursor) => {
+		const nextCursor = cursor ?? val.length;
+		setValueState(val);
+		setCursorIndex(nextCursor);
+		onChange?.(val);
+	}, [onChange]);
+	const setValue = (0, import_react.useCallback)((val_0, cursorPos) => {
+		applyValue(val_0, cursorPos);
+	}, [applyValue]);
+	const clear = (0, import_react.useCallback)(() => {
+		setValueState("");
+		setCursorIndex(0);
+		setPasteLength(0);
+		setHistoryIndex(-1);
+		setHistoryDraft("");
+		onChange?.("");
+	}, [onChange]);
+	useInput((input, key) => {
+		const val_1 = valueRef.current;
+		const cursor_0 = cursorRef.current;
+		const isMenuActive = getIsMenuActive?.() ?? false;
+		const match = input.match(MOUSE_RE);
+		if (match) {
+			const button = parseInt(match[1], 10);
+			if (button === 64) onScrollUp?.();
+			else if (button === 65) onScrollDown?.();
+			return;
 		}
-		const textBefore = value.slice(0, cursorIndex);
-		const textAfter = value.slice(cursorIndex);
-		if (!focus) return {
-			preCursor: [{ value: formatText(value) }],
-			postCursor: []
-		};
-		if (!(highlight && highlight.end > highlight.start && highlight.start >= 0 && highlight.end <= value.length)) {
-			const formattedBefore = formatText(textBefore);
-			const formattedAfter = formatText(textAfter);
-			const lineStart = formattedBefore.lastIndexOf("\n") + 1;
-			const lineEnd = formattedAfter.indexOf("\n");
-			return {
-				preCursor: [
-					{ value: formattedBefore.slice(0, lineStart) },
-					{
-						value: formattedBefore.slice(lineStart),
-						type: "highlight"
-					},
-					{
-						value: showCursor && focus ? " " : "",
-						type: "cursor"
-					}
-				],
-				postCursor: [{
-					value: formattedAfter.slice(0, lineEnd),
-					type: "highlight"
-				}, { value: formattedAfter.slice(lineEnd) }]
-			};
-		} else return {
-			preCursor: [
-				{ value: formatText(textBefore.slice(0, highlight.start)) },
-				{
-					value: formatText(textBefore.slice(highlight.start, Math.min(highlight.end, cursorIndex))),
-					type: "highlight"
-				},
-				{ value: formatText(textBefore.slice(highlight.end)) },
-				{
-					value: " ",
-					type: "cursor"
-				}
-			],
-			postCursor: [
-				{ value: formatText(textAfter.slice(0, Math.max(highlight.start - cursorIndex, 0))) },
-				{
-					value: formatText(textAfter.slice(Math.max(highlight.start - cursorIndex, 0), Math.max(highlight.end - cursorIndex, 0))),
-					type: "highlight"
-				},
-				{ value: formatText(textAfter.slice(Math.max(highlight.end - cursorIndex, 0))) }
-			]
-		};
-	}, [
-		cursorIndex,
-		showCursor,
-		focus,
-		value,
-		placeholder,
-		mask,
-		highlight,
-		formatText,
-		refreshKey
-	]);
-	const visibleRows = (0, import_react.useMemo)(() => {
-		if (contentHeight !== void 0) return Math.max(rows ?? maxRows ?? 1, Math.min(maxRows ?? rows ?? 1, contentHeight));
-		return 1;
-	}, [
-		rows,
-		maxRows,
-		contentHeight
-	]);
-	(0, import_react.useEffect)(() => {
-		if (markerHeight !== void 0 && visibleRows !== void 0) {
-			const cursorLineEnd = markerHeight;
-			setScrollOffset((prevOffset) => {
-				const viewportStart = prevOffset;
-				const viewportEnd = prevOffset + visibleRows;
-				if (cursorLineEnd <= viewportStart) return Math.max(0, cursorLineEnd - 1);
-				else if (cursorLineEnd > viewportEnd) return cursorLineEnd - visibleRows;
-				else if (contentHeight) {
-					if (contentHeight < visibleRows) return 0;
-					else if (contentHeight < viewportEnd) return contentHeight - visibleRows;
-				}
-				return prevOffset;
-			});
+		if (input.includes("[<") && /\d+;\d+;\d+[Mm]/.test(input)) return;
+		if (key.tab && key.shift) return;
+		if (key.tab && !isMenuActive) {
+			onTab?.();
+			return;
 		}
-	}, [
-		markerHeight,
-		visibleRows,
-		contentHeight
-	]);
-	const getStyle = (0, import_react.useCallback)((type) => {
-		switch (type) {
-			case "placeholder": return {
-				...textStyle,
-				dimColor: true
-			};
-			case "highlight": return highlightStyle ?? textStyle;
-			case "cursor": return {
-				...highlightStyle ?? textStyle,
-				inverse: showCursor && focus
-			};
-			default: return textStyle;
+		if (isMenuActive && (key.upArrow || key.downArrow || key.return || key.escape)) return;
+		if (key.return && !key.ctrl && !key.shift && !key.meta && !isMenuActive) {
+			if (submitDisabled) return;
+			if (val_1.trim()) setHistory((h) => [...h, val_1]);
+			setHistoryIndex(-1);
+			setHistoryDraft("");
+			onSubmit?.(val_1);
+			setValueState("");
+			setCursorIndex(0);
+			setPasteLength(0);
+			onChange?.("");
+			return;
 		}
-	}, [
-		textStyle,
-		highlightStyle,
-		showCursor,
-		focus
-	]);
-	return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Box, {
-		height: visibleRows,
-		overflow: "hidden",
-		flexDirection: "column",
-		flexGrow: 0,
-		flexShrink: 0,
-		children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box, {
-			flexDirection: "column",
-			children: [/* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box, {
-				height: visibleRows,
-				overflowY: "hidden",
-				flexShrink: 0,
-				flexDirection: "column",
-				children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Box, {
-					marginTop: -scrollOffset,
-					flexDirection: "column",
-					children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(MeasureBox, {
-						onHeightChange: setContentHeight,
-						children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, { children: [preCursor?.map((segment, idx) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
-							...getStyle(segment.type),
-							children: segment.value
-						}, idx)), postCursor?.map((segment, idx) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
-							...getStyle(segment.type),
-							children: segment.value
-						}, idx))] })
-					})
-				}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Spacer, {})]
-			}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(MeasureBox, {
-				onHeightChange: setMarkerHeight,
-				children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { children: preCursor?.map((segment, idx) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
-					...getStyle(segment.type),
-					children: segment.value
-				}, idx)) })
-			})]
-		})
-	});
-};
-var MultilineInput = ({ value, onChange, onSubmit, keyBindings, showCursor = true, highlightPastedText = false, focus = true, useCustomInput = (inputHandler, isActive) => useInput(inputHandler, { isActive }), ...controlledProps }) => {
-	const [cursorIndex, setCursorIndex] = (0, import_react.useState)(value.length);
-	const [pasteLength, setPasteLength] = (0, import_react.useState)(0);
-	(0, import_react.useEffect)(() => {
-		if (cursorIndex > value.length) setCursorIndex(value.length);
-	}, [value, cursorIndex]);
-	useCustomInput((input, key) => {
-		const submitKey = keyBindings?.submit ?? ((key2) => key2.return && key2.ctrl);
-		const newlineKey = keyBindings?.newline ?? ((key2) => key2.return);
-		if (submitKey(key)) {
-			onSubmit?.(value);
+		if (key.return && (key.ctrl || key.shift || key.meta)) {
+			const next = val_1.slice(0, cursor_0) + "\n" + val_1.slice(cursor_0);
+			setValueState(next);
+			setCursorIndex(cursor_0 + 1);
+			setPasteLength(0);
+			onChange?.(next);
+			return;
+		}
+		if (key.ctrl && input === "c") return;
+		if (key.ctrl && input === "a") {
+			setCursorIndex(getLineStart(val_1, cursor_0));
 			return;
-		} else if (newlineKey(key)) {
-			onChange(value.slice(0, cursorIndex) + "\n" + value.slice(cursorIndex));
-			setCursorIndex(cursorIndex + 1);
+		}
+		if (key.ctrl && input === "e") {
+			setCursorIndex(getLineEnd(val_1, cursor_0));
+			return;
+		}
+		if (key.home) {
+			setCursorIndex(getLineStart(val_1, cursor_0));
+			return;
+		}
+		if (key.end) {
+			setCursorIndex(getLineEnd(val_1, cursor_0));
+			return;
+		}
+		if (key.meta && key.leftArrow || key.ctrl && key.leftArrow) {
+			setCursorIndex(getPrevWordStart(val_1, cursor_0));
+			return;
+		}
+		if (key.meta && key.rightArrow || key.ctrl && key.rightArrow) {
+			setCursorIndex(getNextWordEnd(val_1, cursor_0));
+			return;
+		}
+		if (key.ctrl && input === "k") {
+			const next_0 = val_1.slice(0, cursor_0) + val_1.slice(getLineEnd(val_1, cursor_0));
+			setValueState(next_0);
+			setPasteLength(0);
+			onChange?.(next_0);
+			return;
+		}
+		if (key.ctrl && input === "u") {
+			const lineStart = getLineStart(val_1, cursor_0);
+			const next_1 = val_1.slice(0, lineStart) + val_1.slice(cursor_0);
+			setValueState(next_1);
+			setCursorIndex(lineStart);
 			setPasteLength(0);
+			onChange?.(next_1);
 			return;
 		}
-		if (key.tab || key.shift && key.tab || key.ctrl && input === "c") return;
-		if (keyBindings?.newline?.(key)) {
-			onChange(value.slice(0, cursorIndex) + "\n" + value.slice(cursorIndex));
-			setCursorIndex(cursorIndex + 1);
+		if (key.ctrl && input === "w") {
+			const wordStart = getPrevWordStart(val_1, cursor_0);
+			const next_2 = val_1.slice(0, wordStart) + val_1.slice(cursor_0);
+			setValueState(next_2);
+			setCursorIndex(wordStart);
 			setPasteLength(0);
+			onChange?.(next_2);
 			return;
 		}
-		let nextPasteLength = 0;
-		if (input.length > 1) nextPasteLength = input.length;
 		if (key.upArrow) {
-			if (showCursor) {
-				const lines = normalizeLineEndings(value).split("\n");
-				let currentLineIndex = 0;
-				let currentPos = 0;
-				let col = 0;
-				for (let i = 0; i < lines.length; i++) {
-					const line = lines[i];
-					if (line === void 0) continue;
-					const lineLen = line.length;
-					const lineEnd = currentPos + lineLen;
-					if (cursorIndex >= currentPos && cursorIndex <= lineEnd) {
-						currentLineIndex = i;
-						col = cursorIndex - currentPos;
-						break;
-					}
-					currentPos = lineEnd + 1;
-				}
-				if (currentLineIndex > 0) {
-					const targetLineIndex = currentLineIndex - 1;
-					const targetLine = lines[targetLineIndex];
-					if (targetLine !== void 0) {
-						const targetLineLen = targetLine.length;
-						const newCol = Math.min(col, targetLineLen);
-						let newIndex = 0;
-						for (let i = 0; i < targetLineIndex; i++) newIndex += lines[i].length + 1;
-						newIndex += newCol;
-						setCursorIndex(newIndex);
-						setPasteLength(0);
-					}
-				}
-			}
-		} else if (key.downArrow) {
-			if (showCursor) {
-				const lines = normalizeLineEndings(value).split("\n");
-				let currentLineIndex = 0;
-				let currentPos = 0;
-				let col = 0;
-				for (let i = 0; i < lines.length; i++) {
-					const line = lines[i];
-					if (line === void 0) continue;
-					const lineLen = line.length;
-					const lineEnd = currentPos + lineLen;
-					if (cursorIndex >= currentPos && cursorIndex <= lineEnd) {
-						currentLineIndex = i;
-						col = cursorIndex - currentPos;
-						break;
-					}
-					currentPos = lineEnd + 1;
-				}
-				if (currentLineIndex < lines.length - 1) {
-					const targetLineIndex = currentLineIndex + 1;
-					const targetLine = lines[targetLineIndex];
-					if (targetLine !== void 0) {
-						const targetLineLen = targetLine.length;
-						const newCol = Math.min(col, targetLineLen);
-						let newIndex = 0;
-						for (let i = 0; i < targetLineIndex; i++) newIndex += lines[i].length + 1;
-						newIndex += newCol;
-						setCursorIndex(newIndex);
-						setPasteLength(0);
-					}
-				}
-			}
-		} else if (key.leftArrow) {
-			if (showCursor) {
-				setCursorIndex(Math.max(0, cursorIndex - 1));
-				setPasteLength(0);
-			}
-		} else if (key.rightArrow) {
-			if (showCursor) {
-				setCursorIndex(Math.min(value.length, cursorIndex + 1));
-				setPasteLength(0);
-			}
-		} else if (key.return) {
-			onChange(value.slice(0, cursorIndex) + "\n" + value.slice(cursorIndex));
-			setCursorIndex(cursorIndex + 1);
+			const isMultiLine = val_1.includes("\n");
+			if (!disableHistory && isOnFirstLine(val_1, cursor_0) && !isMultiLine) {
+				const h_0 = historyRef.current;
+				const hi = historyIndexRef.current;
+				const nextIndex = hi + 1;
+				if (nextIndex < h_0.length) {
+					if (hi === -1) setHistoryDraft(val_1);
+					const historyValue = h_0[h_0.length - 1 - nextIndex];
+					setHistoryIndex(nextIndex);
+					setValueState(historyValue);
+					setCursorIndex(historyValue.length);
+					onChange?.(historyValue);
+				}
+			} else setCursorIndex(getPrevLineIndex(val_1, cursor_0));
+			setPasteLength(0);
+			return;
+		}
+		if (key.downArrow) {
+			const isMultiLine_0 = val_1.includes("\n");
+			if (!disableHistory && isOnLastLine(val_1, cursor_0) && !isMultiLine_0) {
+				const h_1 = historyRef.current;
+				const hi_0 = historyIndexRef.current;
+				const hd = historyDraftRef.current;
+				if (hi_0 > 0) {
+					const nextIndex_0 = hi_0 - 1;
+					const historyValue_0 = h_1[h_1.length - 1 - nextIndex_0];
+					setHistoryIndex(nextIndex_0);
+					setValueState(historyValue_0);
+					setCursorIndex(historyValue_0.length);
+					onChange?.(historyValue_0);
+				} else if (hi_0 === 0) {
+					setHistoryIndex(-1);
+					setValueState(hd);
+					setCursorIndex(hd.length);
+					onChange?.(hd);
+				}
+			} else setCursorIndex(getNextLineIndex(val_1, cursor_0));
 			setPasteLength(0);
-		} else if (key.backspace || key.delete) {
-			if (cursorIndex > 0) {
-				onChange(value.slice(0, cursorIndex - 1) + value.slice(cursorIndex));
-				setCursorIndex(cursorIndex - 1);
+			return;
+		}
+		if (key.leftArrow) {
+			setCursorIndex(Math.max(0, cursor_0 - 1));
+			setPasteLength(0);
+			return;
+		}
+		if (key.rightArrow) {
+			setCursorIndex(Math.min(val_1.length, cursor_0 + 1));
+			setPasteLength(0);
+			return;
+		}
+		if (key.backspace || key.delete) {
+			if (cursor_0 > 0) {
+				const next_3 = val_1.slice(0, cursor_0 - 1) + val_1.slice(cursor_0);
+				setValueState(next_3);
+				setCursorIndex(cursor_0 - 1);
 				setPasteLength(0);
+				onChange?.(next_3);
 			}
-		} else if (input) {
-			onChange(value.slice(0, cursorIndex) + input + value.slice(cursorIndex));
-			setCursorIndex(cursorIndex + input.length);
-			setPasteLength(nextPasteLength);
+			return;
 		}
-	}, focus);
-	const highlight = (0, import_react.useMemo)(() => {
-		if (highlightPastedText && pasteLength > 1) return {
-			start: Math.max(0, cursorIndex - pasteLength),
-			end: cursorIndex
-		};
-	}, [
-		cursorIndex,
-		pasteLength,
-		highlightPastedText
-	]);
-	return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ControlledMultilineInput, {
-		...controlledProps,
+		if (input) {
+			if (historyIndexRef.current !== -1) {
+				setHistoryIndex(-1);
+				setHistoryDraft("");
+			}
+			const next_4 = val_1.slice(0, cursor_0) + input + val_1.slice(cursor_0);
+			setValueState(next_4);
+			setCursorIndex(cursor_0 + input.length);
+			setPasteLength(input.length > 1 ? input.length : 0);
+			onChange?.(next_4);
+		}
+	}, { isActive });
+	return {
 		value,
 		cursorIndex,
-		highlight,
-		showCursor,
-		focus
-	});
-};
+		pasteLength,
+		setValue,
+		clear
+	};
+}
+//#endregion
+//#region src/components/TextInput.tsx
+/**
+* TextInput / ControlledTextInput
+*
+* Drop-in replacements for `MultilineInput` / `ControlledMultilineInput` from
+* `ink-multiline-input`.  Key improvements over the upstream library:
+*
+*   1. Cursor rendered as an *inverse* block on the character it sits on —
+*      no extra space inserted, no text displacement.
+*
+*   2. Placeholder visible whenever `value` is empty, regardless of focus.
+*
+*   3. Height and cursor-line computed directly from the text (no async
+*      MeasureBox cycle), so arrow-key navigation shows immediately.
+*
+*   4. `useTextInput` (backing `TextInput`) fixes ↑/↓ so multi-line text
+*      always navigates lines instead of history.
+*/
+const TAB_CACHE = /* @__PURE__ */ new Map();
+function getSpaces(n) {
+	if (!TAB_CACHE.has(n)) TAB_CACHE.set(n, " ".repeat(n));
+	return TAB_CACHE.get(n);
+}
+function expandTabs(text, tabSize) {
+	return text.replace(/\t/g, getSpaces(tabSize));
+}
+function normalizeLineEndings(text) {
+	if (!text) return "";
+	return text.replace(/\r\n/g, "\n").replace(/\r/g, "\n");
+}
+function fmt(text, tabSize) {
+	return expandTabs(normalizeLineEndings(text), tabSize);
+}
+function computeCursorPos(value, cursorIndex, tabSize) {
+	const beforeLines = fmt(value.slice(0, cursorIndex), tabSize).split("\n");
+	const lineIdx = beforeLines.length - 1;
+	const colIdx = beforeLines[lineIdx].length;
+	const rawCharAtCursor = value[cursorIndex];
+	const isNewline = rawCharAtCursor === "\n";
+	return {
+		lineIdx,
+		colIdx,
+		char: !rawCharAtCursor || isNewline ? " " : fmt(rawCharAtCursor, tabSize),
+		isNewline
+	};
+}
+const ControlledTextInput = (0, import_react.memo)(function ControlledTextInput(t0) {
+	const $ = (0, import_compiler_runtime.c)(44);
+	const { value, cursorIndex: t1, placeholder: t2, showCursor: t3, focus: t4, rows, maxRows: t5, tabSize: t6 } = t0;
+	const cursorIndex = t1 === void 0 ? 0 : t1;
+	const placeholder = t2 === void 0 ? "" : t2;
+	const showCursor = t3 === void 0 ? true : t3;
+	const focus = t4 === void 0 ? true : t4;
+	const maxRows = t5 === void 0 ? 10 : t5;
+	const tabSize = t6 === void 0 ? 4 : t6;
+	const minRows = rows ?? 1;
+	let t7;
+	if ($[0] !== cursorIndex || $[1] !== tabSize || $[2] !== value) {
+		t7 = value ? computeCursorPos(value, cursorIndex, tabSize) : null;
+		$[0] = cursorIndex;
+		$[1] = tabSize;
+		$[2] = value;
+		$[3] = t7;
+	} else t7 = $[3];
+	const cursorInfo = t7;
+	let t8;
+	if ($[4] !== tabSize || $[5] !== value) {
+		t8 = value ? fmt(value, tabSize).split("\n") : [];
+		$[4] = tabSize;
+		$[5] = value;
+		$[6] = t8;
+	} else t8 = $[6];
+	const allLines = t8;
+	const lineCount = allLines.length;
+	const cursorLineIdx = cursorInfo?.lineIdx ?? 0;
+	const cursorColIdx = cursorInfo?.colIdx ?? 0;
+	const cursorDisplayChar = cursorInfo?.char ?? " ";
+	const charIsNewline = cursorInfo?.isNewline ?? false;
+	const visibleRows = value ? Math.max(minRows, Math.min(maxRows, lineCount)) : minRows;
+	const scrollStart = value ? Math.max(0, Math.min(lineCount - visibleRows, cursorLineIdx - visibleRows + 1)) : 0;
+	let t9;
+	if ($[7] !== allLines || $[8] !== scrollStart || $[9] !== value || $[10] !== visibleRows) {
+		t9 = value ? allLines.slice(scrollStart, scrollStart + visibleRows) : [];
+		$[7] = allLines;
+		$[8] = scrollStart;
+		$[9] = value;
+		$[10] = visibleRows;
+		$[11] = t9;
+	} else t9 = $[11];
+	const visibleLines = t9;
+	if (!value) {
+		let t10;
+		if ($[12] !== focus || $[13] !== showCursor) {
+			t10 = showCursor && focus && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
+				inverse: true,
+				children: " "
+			});
+			$[12] = focus;
+			$[13] = showCursor;
+			$[14] = t10;
+		} else t10 = $[14];
+		let t11;
+		if ($[15] !== placeholder) {
+			t11 = placeholder ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
+				dimColor: true,
+				children: placeholder
+			}) : null;
+			$[15] = placeholder;
+			$[16] = t11;
+		} else t11 = $[16];
+		let t12;
+		if ($[17] !== t10 || $[18] !== t11) {
+			t12 = /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, { children: [t10, t11] });
+			$[17] = t10;
+			$[18] = t11;
+			$[19] = t12;
+		} else t12 = $[19];
+		let t13;
+		if ($[20] !== minRows || $[21] !== t12) {
+			t13 = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Box, {
+				height: minRows,
+				overflow: "hidden",
+				flexDirection: "column",
+				flexShrink: 0,
+				flexGrow: 0,
+				children: t12
+			});
+			$[20] = minRows;
+			$[21] = t12;
+			$[22] = t13;
+		} else t13 = $[22];
+		return t13;
+	}
+	if (!focus) {
+		let t10;
+		if ($[23] !== visibleLines) {
+			t10 = visibleLines.map(_temp$7);
+			$[23] = visibleLines;
+			$[24] = t10;
+		} else t10 = $[24];
+		let t11;
+		if ($[25] !== t10) {
+			t11 = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Box, {
+				flexDirection: "column",
+				flexShrink: 0,
+				flexGrow: 0,
+				children: t10
+			});
+			$[25] = t10;
+			$[26] = t11;
+		} else t11 = $[26];
+		return t11;
+	}
+	let t10;
+	if ($[27] !== charIsNewline || $[28] !== cursorColIdx || $[29] !== cursorDisplayChar || $[30] !== cursorLineIdx || $[31] !== scrollStart || $[32] !== showCursor || $[33] !== visibleLines) {
+		let t11;
+		if ($[35] !== charIsNewline || $[36] !== cursorColIdx || $[37] !== cursorDisplayChar || $[38] !== cursorLineIdx || $[39] !== scrollStart || $[40] !== showCursor) {
+			t11 = (line_0, i_0) => {
+				const absLine = i_0 + scrollStart;
+				if (absLine !== cursorLineIdx) return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { children: line_0 || " " }, absLine);
+				const beforeCursor = line_0.slice(0, cursorColIdx);
+				const afterCursor = charIsNewline ? "" : line_0.slice(cursorColIdx + cursorDisplayChar.length);
+				return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, { children: [
+					/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { children: beforeCursor }),
+					/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
+						inverse: showCursor,
+						children: cursorDisplayChar
+					}),
+					/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { children: afterCursor })
+				] }, absLine);
+			};
+			$[35] = charIsNewline;
+			$[36] = cursorColIdx;
+			$[37] = cursorDisplayChar;
+			$[38] = cursorLineIdx;
+			$[39] = scrollStart;
+			$[40] = showCursor;
+			$[41] = t11;
+		} else t11 = $[41];
+		t10 = visibleLines.map(t11);
+		$[27] = charIsNewline;
+		$[28] = cursorColIdx;
+		$[29] = cursorDisplayChar;
+		$[30] = cursorLineIdx;
+		$[31] = scrollStart;
+		$[32] = showCursor;
+		$[33] = visibleLines;
+		$[34] = t10;
+	} else t10 = $[34];
+	let t11;
+	if ($[42] !== t10) {
+		t11 = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Box, {
+			flexDirection: "column",
+			flexShrink: 0,
+			flexGrow: 0,
+			children: t10
+		});
+		$[42] = t10;
+		$[43] = t11;
+	} else t11 = $[43];
+	return t11;
+});
+/**
+* `TextInput` manages its own value state (via `useTextInput`) and delegates
+* rendering to `ControlledTextInput`.  Use this when you don't need external
+* control over the value.
+*/
+function TextInput(t0) {
+	const $ = (0, import_compiler_runtime.c)(17);
+	const { onSubmit, onChange, onScrollUp, onScrollDown, onTab, isActive, getIsMenuActive, submitDisabled, disableHistory, placeholder, rows, maxRows, tabSize } = t0;
+	let t1;
+	if ($[0] !== disableHistory || $[1] !== getIsMenuActive || $[2] !== isActive || $[3] !== onChange || $[4] !== onScrollDown || $[5] !== onScrollUp || $[6] !== onSubmit || $[7] !== onTab || $[8] !== submitDisabled) {
+		t1 = {
+			onSubmit,
+			onChange,
+			onScrollUp,
+			onScrollDown,
+			onTab,
+			isActive,
+			getIsMenuActive,
+			submitDisabled,
+			disableHistory
+		};
+		$[0] = disableHistory;
+		$[1] = getIsMenuActive;
+		$[2] = isActive;
+		$[3] = onChange;
+		$[4] = onScrollDown;
+		$[5] = onScrollUp;
+		$[6] = onSubmit;
+		$[7] = onTab;
+		$[8] = submitDisabled;
+		$[9] = t1;
+	} else t1 = $[9];
+	const { value, cursorIndex } = useTextInput(t1);
+	let t2;
+	if ($[10] !== cursorIndex || $[11] !== maxRows || $[12] !== placeholder || $[13] !== rows || $[14] !== tabSize || $[15] !== value) {
+		t2 = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ControlledTextInput, {
+			value,
+			cursorIndex,
+			placeholder,
+			showCursor: true,
+			rows,
+			maxRows,
+			tabSize
+		});
+		$[10] = cursorIndex;
+		$[11] = maxRows;
+		$[12] = placeholder;
+		$[13] = rows;
+		$[14] = tabSize;
+		$[15] = value;
+		$[16] = t2;
+	} else t2 = $[16];
+	return t2;
+}
+function _temp$7(line, i) {
+	return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { children: line || " " }, i);
+}
 //#endregion
 //#region ../../node_modules/jsonrepair/lib/esm/utils/JSONRepairError.js
 var JSONRepairError = class extends Error {
@@ -533524,7 +533728,7 @@ function useCodeGenStateHandler() {
 				else if (step.name === "tool") state.messages.push({
 					id: step.id ?? "unknown",
 					type: "tool",
-					state: "generating",
+					state: state.state === "generating" ? "generating" : "success",
 					toolName: step.filePath ?? "",
 					input: processToolInput(step.content),
 					content: step.content,
@@ -533535,8 +533739,13 @@ function useCodeGenStateHandler() {
 				else if (step.name === "thinking") state.messages.push({
 					id: step.name,
 					type: "thinking",
-					content: step.content ?? ""
+					content: step.content ?? "",
+					streaming: true
 				});
+				else {
+					const prevThinking = state.messages.findLast((m_0) => m_0.type === "thinking");
+					if (prevThinking) prevThinking.streaming = false;
+				}
 				break;
 			case "delta": {
 				const stepName = step.name;
@@ -533578,7 +533787,7 @@ function useCodeGenStateHandler() {
 						existingTool_0.content = toolResult.tool_input;
 						existingTool_0.input = processToolInput(existingTool_0.content);
 					}
-					toolResult.content = toolResult.content;
+					existingTool_0.toolResult = toolResult.content;
 					if (isTool(existingTool_0, "TodoWrite")) {
 						const todos = existingTool_0.structuredResult?.todos;
 						if (Array.isArray(todos)) state.todoItems = todos;
@@ -533609,16 +533818,26 @@ function useCodeGenStateHandler() {
 				}
 				break;
 			}
-			case "done":
+			case "done": {
 				state.contextWindow = step.contextWindow;
 				state.usage = step.usage;
 				state.lastCompletionId = step.id;
 				state.model = step.model;
 				state.creditsUsed = step.creditsUsed;
 				state.activeUserQuestions = void 0;
-				if (step.applyResults?.length) turnApplyResults.push(...step.applyResults);
+				const doneThinking = state.messages.findLast((m) => m.type === "thinking");
+				if (doneThinking) doneThinking.streaming = false;
+				if (step.applyResults?.length) for (const result of step.applyResults) {
+					const existing = turnApplyResults.find((r) => r.filePath === result.filePath);
+					if (existing) {
+						existing.addedLines += result.addedLines;
+						existing.removedLines += result.removedLines;
+						existing.action = result.action;
+					} else turnApplyResults.push({ ...result });
+				}
 				turnCreditsUsed += step.creditsUsed ?? 0;
 				break;
+			}
 			case "error":
 				state.lastError = step;
 				break;
@@ -533633,7 +533852,8 @@ function useCodeGenStateHandler() {
 					type: "idle",
 					applyResults: turnApplyResults,
 					creditsUsed: turnCreditsUsed,
-					durationMs: Date.now() - turnStartTime
+					durationMs: Date.now() - turnStartTime,
+					state: step.state
 				});
 				turnApplyResults = [];
 				turnCreditsUsed = 0;
@@ -533657,7 +533877,6 @@ function useCodeGenStateHandler() {
 			case "user-abort":
 			case "continue":
 			case "update_setup_value":
-			case "planning":
 			case "text": break;
 			default: break;
 		}
@@ -533830,7 +534049,7 @@ function SlashCommandMenu(t0) {
 	const [state] = useCodeGenState();
 	let t1;
 	if ($[0] !== state.customInstructions) {
-		const agents = (state.customInstructions ?? []).filter(_temp$5).map(_temp2$3);
+		const agents = (state.customInstructions ?? []).filter(_temp$6).map(_temp2$3);
 		let t2;
 		if ($[2] === Symbol.for("react.memo_cache_sentinel")) {
 			t2 = {
@@ -534044,7 +534263,7 @@ function _temp2$3(i_0) {
 		description: i_0.description
 	};
 }
-function _temp$5(i) {
+function _temp$6(i) {
 	return i.type === "agent-mode";
 }
 //#endregion
@@ -534241,9 +534460,19 @@ function FilePicker(t0) {
 }
 //#endregion
 //#region src/components/InputPrompt.tsx
-const MOUSE_RE$1 = /^\[<(\d+);\d+;\d+[Mm]/;
-function shouldSubmitPrompt({ hasText, submitDisabled }) {
-	return hasText && !submitDisabled;
+/**
+* Returns a short, provider-agnostic display name for a model ID.
+*
+* Examples:
+*   "vertexai-claude-4-6-sonnet" → "Sonnet 4.6"
+*   "claude-opus-4-6"           → "Opus 4.6"
+*   "claude-haiku-4-5-20251001" → "Haiku 4.5"
+*/
+function formatModelName(model) {
+	const stripped = model.replace(/^vertexai-/i, "").replace(/^bedrock-/i, "").replace(/^anthropic\./i, "");
+	const m = stripped.match(/claude-([a-z]+)-(\d+)-(\d+)/i);
+	if (m) return `${m[1].charAt(0).toUpperCase() + m[1].slice(1)} ${m[2]}.${m[3]}`;
+	return stripped;
 }
 function isSlashCommandInput(value) {
 	return value === "/" || value.startsWith("/") && value.length <= 10;
@@ -534255,14 +534484,46 @@ function getAtQuery(value) {
 }
 const InputPrompt = (0, import_react.memo)(({ onSubmit, onChange, onSlashCommand, onToggleSessionMode, onSlashMenuActiveChange, onScrollUp, onScrollDown, onImplementPlan, isTabActive = true }) => {
 	const [state] = useCodeGenState();
-	const [value, setValue] = (0, import_react.useState)("");
 	const [dismissedSlashValue, setDismissedSlashValue] = (0, import_react.useState)(null);
 	const [dismissedAtValue, setDismissedAtValue] = (0, import_react.useState)(null);
-	const [inputKey, setInputKey] = (0, import_react.useState)(0);
 	const hasPlan = state.hasPlanToApply && !!onImplementPlan;
-	const planIsActive = hasPlan && !value;
 	const isPlanning = state.sessionMode === "planning" || state.sessionMode === "auto-planning";
 	const hint = hasPlan ? "Type to refine the plan..." : isPlanning ? "Describe what you want to plan..." : "Describe what you want to build...";
+	const slashMenuActiveRef = (0, import_react.useRef)(false);
+	const atMenuActiveRef = (0, import_react.useRef)(false);
+	const getIsMenuActive = (0, import_react.useCallback)(() => slashMenuActiveRef.current || atMenuActiveRef.current, []);
+	const handleChange = (0, import_react.useCallback)((val) => {
+		if (dismissedSlashValue && val !== dismissedSlashValue) setDismissedSlashValue(null);
+		if (dismissedAtValue && val !== dismissedAtValue) setDismissedAtValue(null);
+		onChange?.(val);
+	}, [
+		dismissedSlashValue,
+		dismissedAtValue,
+		onChange
+	]);
+	const { value, cursorIndex, setValue, clear } = useTextInput({
+		onSubmit: (0, import_react.useCallback)((val_0) => {
+			if (hasPlan && !val_0.trim() && onImplementPlan) {
+				onImplementPlan();
+				return;
+			}
+			if (val_0.trim()) onSubmit(val_0);
+			setDismissedSlashValue(null);
+			onChange?.("");
+		}, [
+			hasPlan,
+			onChange,
+			onImplementPlan,
+			onSubmit
+		]),
+		onChange: handleChange,
+		onScrollUp,
+		onScrollDown,
+		onTab: onToggleSessionMode,
+		isActive: isTabActive,
+		getIsMenuActive,
+		submitDisabled: false
+	});
 	const slashMenuActive = (0, import_react.useMemo)(() => !!onSlashCommand && isSlashCommandInput(value) && value.trim().length > 0 && value !== dismissedSlashValue, [
 		dismissedSlashValue,
 		onSlashCommand,
@@ -534275,59 +534536,32 @@ const InputPrompt = (0, import_react.memo)(({ onSubmit, onChange, onSlashCommand
 		dismissedAtValue,
 		slashMenuActive
 	]);
+	slashMenuActiveRef.current = slashMenuActive;
+	atMenuActiveRef.current = atMenuActive;
+	const planIsActive = hasPlan && !value;
 	(0, import_react.useEffect)(() => {
 		onSlashMenuActiveChange?.(slashMenuActive);
 		return () => {
 			onSlashMenuActiveChange?.(false);
 		};
 	}, [onSlashMenuActiveChange, slashMenuActive]);
-	const handleSubmit = (0, import_react.useCallback)((val) => {
-		if (hasPlan && !val.trim() && onImplementPlan) {
-			onImplementPlan();
-			return;
-		}
-		if (shouldSubmitPrompt({
-			hasText: !!val.trim(),
-			submitDisabled: slashMenuActive
-		})) {
-			onSubmit(val);
-			setValue("");
-			setDismissedSlashValue(null);
-			onChange?.("");
-		}
-	}, [
-		hasPlan,
-		onChange,
-		onImplementPlan,
-		onSubmit,
-		slashMenuActive
-	]);
-	const handleChange = (0, import_react.useCallback)((val_0) => {
-		setValue(val_0);
-		if (dismissedSlashValue && val_0 !== dismissedSlashValue) setDismissedSlashValue(null);
-		if (dismissedAtValue && val_0 !== dismissedAtValue) setDismissedAtValue(null);
-		onChange?.(val_0);
-	}, [
-		dismissedSlashValue,
-		dismissedAtValue,
-		onChange
-	]);
 	const handleSlashSelect = (0, import_react.useCallback)((selection) => {
 		onSlashCommand?.(selection);
-		setValue("");
-		setDismissedSlashValue(null);
-		onChange?.("");
-	}, [onChange, onSlashCommand]);
+		clear();
+	}, [clear, onSlashCommand]);
 	const handleSlashCancel = (0, import_react.useCallback)(() => {
 		setDismissedSlashValue(value);
 	}, [value]);
 	const handleAtSelect = (0, import_react.useCallback)((filePath) => {
 		const newValue = value.replace(/@[^\s]*$/, `@${filePath} `);
 		setValue(newValue);
-		setInputKey((k) => k + 1);
 		setDismissedAtValue(null);
 		onChange?.(newValue);
-	}, [value, onChange]);
+	}, [
+		value,
+		onChange,
+		setValue
+	]);
 	const handleAtCancel = (0, import_react.useCallback)(() => {
 		setDismissedAtValue(value);
 	}, [value]);
@@ -534402,62 +534636,30 @@ const InputPrompt = (0, import_react.memo)(({ onSubmit, onChange, onSlashCommand
 							})
 						]
 					}) }),
-					/* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box, { children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(MultilineInput, {
+					/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Box, { children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ControlledTextInput, {
 						value,
-						onChange: handleChange,
-						onSubmit: handleSubmit,
+						cursorIndex,
 						rows: 1,
-						maxRows: 10,
-						keyBindings: {
-							submit: (key) => key.return && !key.ctrl && !slashMenuActive && !atMenuActive,
-							newline: (key_0) => key_0.return && key_0.ctrl
-						},
-						useCustomInput: (handler, isActive) => {
-							useInput((input, key_1) => {
-								const match = input.match(MOUSE_RE$1);
-								if (match) {
-									const button = parseInt(match[1], 10);
-									if (button === 64) onScrollUp?.();
-									else if (button === 65) onScrollDown?.();
-									return;
-								}
-								if (input.includes("[<") && /\d+;\d+;\d+[Mm]/.test(input)) return;
-								if (key_1.tab && key_1.shift) return;
-								if (key_1.tab && !slashMenuActive) {
-									onToggleSessionMode?.();
-									return;
-								}
-								if ((slashMenuActive || atMenuActive) && (key_1.upArrow || key_1.downArrow || key_1.return || key_1.escape)) return;
-								handler(input, key_1);
-							}, { isActive: isActive && isTabActive });
-						}
-					}, inputKey), !value && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
-						dimColor: true,
-						children: hint
-					})] }),
+						placeholder: hint,
+						showCursor: true,
+						maxRows: 10
+					}) }),
 					/* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box, {
-						gap: 1,
+						columnGap: 1,
+						flexWrap: "wrap",
 						children: [
 							/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
 								color: accentColor,
 								bold: true,
 								children: state.sessionMode === "planning" ? "Plan" : state.sessionMode === "auto-planning" ? "Auto-Plan" : "Build"
 							}),
-							/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
+							(state.modelOverride || state.model) && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
 								dimColor: true,
 								children: "·"
-							}),
-							state.model && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
-								dimColor: true,
-								children: state.model
 							}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
 								dimColor: true,
-								children: "·"
+								children: formatModelName(state.modelOverride ?? state.model)
 							})] }),
-							/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
-								dimColor: true,
-								children: "Fusion"
-							}),
 							planIsActive && !slashMenuActive && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
 								dimColor: true,
 								children: "·"
@@ -534654,7 +534856,7 @@ const AskUserQuestionDisplay = (0, import_react.memo)((t0) => {
 				else if (key.escape) {
 					setCustomMode(false);
 					setCustomText("");
-				} else if (key.backspace || key.delete) setCustomText(_temp$4);
+				} else if (key.backspace || key.delete) setCustomText(_temp$5);
 				else if (input && !key.ctrl && !key.meta) setCustomText((text_0) => text_0 + input);
 				return;
 			}
@@ -534991,7 +535193,7 @@ const AskUserQuestionDisplay = (0, import_react.memo)((t0) => {
 	} else t30 = $[86];
 	return t30;
 });
-function _temp$4(text) {
+function _temp$5(text) {
 	return text.slice(0, -1);
 }
 //#endregion
@@ -536681,7 +536883,7 @@ const WelcomeScreen = (0, import_react.memo)((t0) => {
 });
 //#endregion
 //#region src/components/StatusBar.tsx
-function ProgressBar() {
+const ProgressBar = (0, import_react.memo)(() => {
 	const $ = (0, import_compiler_runtime.c)(6);
 	const [frame, setFrame] = (0, import_react.useState)(0);
 	const frameRef = (0, import_react.useRef)(0);
@@ -536724,9 +536926,9 @@ function ProgressBar() {
 		$[5] = t3;
 	} else t3 = $[5];
 	return t3;
-}
+});
 const StatusBar = (0, import_react.memo)((t0) => {
-	const $ = (0, import_compiler_runtime.c)(8);
+	const $ = (0, import_compiler_runtime.c)(4);
 	const { ctrlCPending } = t0;
 	const [state] = useCodeGenState();
 	if (ctrlCPending) {
@@ -536744,79 +536946,62 @@ const StatusBar = (0, import_react.memo)((t0) => {
 		return t1;
 	}
 	let t1;
-	if ($[1] !== state.state) {
-		t1 = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Box, {
-			gap: 1,
-			children: state.state === "generating" ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(ProgressBar, {}), /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, {
-				dimColor: true,
-				children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
-					bold: true,
-					children: "esc"
-				}), " interrupt"]
-			})] }) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { children: " " })
-		});
-		$[1] = state.state;
-		$[2] = t1;
-	} else t1 = $[2];
+	if ($[1] === Symbol.for("react.memo_cache_sentinel")) {
+		t1 = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Spacer, {});
+		$[1] = t1;
+	} else t1 = $[1];
 	let t2;
-	if ($[3] !== state.activeUserQuestions) {
-		t2 = state.activeUserQuestions ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box, {
-			gap: 3,
-			children: [/* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, { children: [
-				/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
+	if ($[2] !== state.activeUserQuestions) {
+		t2 = /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box, {
+			justifyContent: "space-between",
+			paddingY: 0,
+			children: [t1, state.activeUserQuestions ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box, {
+				gap: 3,
+				children: [/* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, { children: [
+					/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
+						bold: true,
+						dimColor: true,
+						children: "enter"
+					}),
+					" ",
+					"or",
+					" ",
+					/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
+						bold: true,
+						dimColor: true,
+						children: "space"
+					}),
+					" ",
+					"select"
+				] }), /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, {
 					bold: true,
 					dimColor: true,
-					children: "enter"
-				}),
-				" ",
-				"or",
-				" ",
-				/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
-					bold: true,
+					children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
+						bold: true,
+						children: "esc"
+					}), " abort"]
+				})]
+			}) : /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box, {
+				gap: 3,
+				children: [process.env.TERM_PROGRAM !== "vscode" && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, {
 					dimColor: true,
-					children: "space"
-				}),
-				" ",
-				"select"
-			] }), /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, {
-				bold: true,
-				dimColor: true,
-				children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
-					bold: true,
-					children: "esc"
-				}), " abort"]
-			})]
-		}) : /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box, {
-			gap: 3,
-			children: [process.env.TERM_PROGRAM !== "vscode" && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, {
-				dimColor: true,
-				children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
-					bold: true,
-					children: "shift+click"
-				}), " select text"]
-			}), /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, {
-				dimColor: true,
-				children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
-					bold: true,
-					children: "tab"
-				}), " agents"]
+					children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
+						bold: true,
+						children: "shift+click"
+					}), " select text"]
+				}), /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, {
+					dimColor: true,
+					children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
+						bold: true,
+						children: "tab"
+					}), " agents"]
+				})]
 			})]
 		});
-		$[3] = state.activeUserQuestions;
-		$[4] = t2;
-	} else t2 = $[4];
-	let t3;
-	if ($[5] !== t1 || $[6] !== t2) {
-		t3 = /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box, {
-			justifyContent: "space-between",
-			paddingY: 0,
-			children: [t1, t2]
-		});
-		$[5] = t1;
-		$[6] = t2;
-		$[7] = t3;
-	} else t3 = $[7];
-	return t3;
+		$[2] = state.activeUserQuestions;
+		$[3] = t2;
+	} else t2 = $[3];
+	return t2;
 });
 //#endregion
 //#region src/utils/hyperlink.ts
@@ -537685,7 +537870,7 @@ const TipsSection = (0, import_react.memo)(() => {
 	bb0: {
 		let t1;
 		if ($[0] === Symbol.for("react.memo_cache_sentinel")) {
-			t1 = TIPS.filter(_temp$3);
+			t1 = TIPS.filter(_temp$4);
 			$[0] = t1;
 		} else t1 = $[0];
 		const availableTips = t1;
@@ -537887,71 +538072,95 @@ const TodoSection = (0, import_react.memo)(() => {
 	return t4;
 });
 const FooterSection = (0, import_react.memo)(() => {
-	const $ = (0, import_compiler_runtime.c)(10);
+	const $ = (0, import_compiler_runtime.c)(15);
 	const [state] = useCodeGenState();
+	const { stdout } = useStdout();
+	const [rows, setRows] = (0, import_react.useState)(stdout?.rows ?? 24);
 	let t0;
-	if ($[0] === Symbol.for("react.memo_cache_sentinel")) {
-		t0 = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(TipsSection, {});
-		$[0] = t0;
-	} else t0 = $[0];
 	let t1;
-	if ($[1] !== state.sessionId) {
-		t1 = state.sessionId && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Box, {
+	if ($[0] !== stdout) {
+		t0 = () => {
+			if (!stdout) return;
+			const onResize = () => setRows(stdout.rows ?? 24);
+			stdout.on("resize", onResize);
+			return () => {
+				stdout.off("resize", onResize);
+			};
+		};
+		t1 = [stdout];
+		$[0] = stdout;
+		$[1] = t0;
+		$[2] = t1;
+	} else {
+		t0 = $[1];
+		t1 = $[2];
+	}
+	(0, import_react.useEffect)(t0, t1);
+	let t2;
+	if ($[3] !== rows) {
+		t2 = rows >= 300 && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(TipsSection, {});
+		$[3] = rows;
+		$[4] = t2;
+	} else t2 = $[4];
+	let t3;
+	if ($[5] !== state.sessionId) {
+		t3 = state.sessionId && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Box, {
 			marginTop: 1,
 			children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, {
 				dimColor: true,
 				children: ["--resume ", state.sessionId]
 			})
 		});
-		$[1] = state.sessionId;
-		$[2] = t1;
-	} else t1 = $[2];
-	let t2;
-	if ($[3] === Symbol.for("react.memo_cache_sentinel")) {
-		t2 = process.cwd().replace(process.env.HOME ?? "", "~");
-		$[3] = t2;
-	} else t2 = $[3];
-	const t3 = state.gitState?.currentBranch;
+		$[5] = state.sessionId;
+		$[6] = t3;
+	} else t3 = $[6];
 	let t4;
-	if ($[4] !== t3) {
-		t4 = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Box, {
+	if ($[7] === Symbol.for("react.memo_cache_sentinel")) {
+		t4 = process.cwd().replace(process.env.HOME ?? "", "~");
+		$[7] = t4;
+	} else t4 = $[7];
+	const t5 = state.gitState?.currentBranch;
+	let t6;
+	if ($[8] !== t5) {
+		t6 = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Box, {
 			marginTop: 1,
 			children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, {
 				dimColor: true,
-				children: [t2, t3]
+				children: [t4, t5]
 			})
 		});
-		$[4] = t3;
-		$[5] = t4;
-	} else t4 = $[5];
-	let t5;
-	if ($[6] === Symbol.for("react.memo_cache_sentinel")) {
-		t5 = /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, {
+		$[8] = t5;
+		$[9] = t6;
+	} else t6 = $[9];
+	let t7;
+	if ($[10] === Symbol.for("react.memo_cache_sentinel")) {
+		t7 = /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, {
 			dimColor: true,
 			children: [
 				"•",
 				" Fusion ",
-				"0.3.5"
+				"0.3.8"
 			]
 		});
-		$[6] = t5;
-	} else t5 = $[6];
-	let t6;
-	if ($[7] !== t1 || $[8] !== t4) {
-		t6 = /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box, {
+		$[10] = t7;
+	} else t7 = $[10];
+	let t8;
+	if ($[11] !== t2 || $[12] !== t3 || $[13] !== t6) {
+		t8 = /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box, {
 			flexDirection: "column",
 			children: [
-				t0,
-				t1,
-				t4,
-				t5
+				t2,
+				t3,
+				t6,
+				t7
 			]
 		});
-		$[7] = t1;
-		$[8] = t4;
-		$[9] = t6;
-	} else t6 = $[9];
-	return t6;
+		$[11] = t2;
+		$[12] = t3;
+		$[13] = t6;
+		$[14] = t8;
+	} else t8 = $[14];
+	return t8;
 });
 const Sidebar = (0, import_react.memo)(() => {
 	const $ = (0, import_compiler_runtime.c)(10);
@@ -538016,7 +538225,7 @@ const Sidebar = (0, import_react.memo)(() => {
 	} else t8 = $[9];
 	return t8;
 });
-function _temp$3(item) {
+function _temp$4(item) {
 	return item.text;
 }
 function _temp2$2(t) {
@@ -597271,16 +597480,21 @@ function ToolHeader(t0) {
 	const { state } = tool;
 	const color = state === "error" ? "red" : "gray";
 	const icon = state === "error" ? "✗" : "✓";
+	const isRunning = state === "generating" || state === "running";
 	let t1;
-	if ($[0] !== color || $[1] !== icon || $[2] !== state) {
-		t1 = state === "generating" || state === "running" ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Spinner, { label: "" }) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
+	if ($[0] !== color || $[1] !== icon || $[2] !== isRunning) {
+		t1 = isRunning ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
+			bold: true,
+			color: "cyan",
+			children: "●"
+		}) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
 			color,
 			dimColor: true,
 			children: icon
 		});
 		$[0] = color;
 		$[1] = icon;
-		$[2] = state;
+		$[2] = isRunning;
 		$[3] = t1;
 	} else t1 = $[3];
 	let t2;
@@ -597296,7 +597510,8 @@ function ToolHeader(t0) {
 	let t3;
 	if ($[6] !== extra || $[7] !== t1 || $[8] !== t2) {
 		t3 = /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box, {
-			gap: 1,
+			columnGap: 1,
+			flexWrap: "wrap",
 			children: [
 				t1,
 				t2,
@@ -597324,6 +597539,7 @@ function FilePath(t0) {
 		t2 = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
 			color: "cyan",
 			dimColor: true,
+			wrap: "truncate-start",
 			children: t1
 		});
 		$[2] = t1;
@@ -597339,6 +597555,7 @@ function CmdText(t0) {
 		t1 = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
 			color: "yellow",
 			dimColor: true,
+			wrap: "truncate",
 			children: cmd
 		});
 		$[0] = cmd;
@@ -597363,7 +597580,7 @@ function OutputPreview(t0) {
 		T0 = Box;
 		t2 = "column";
 		t3 = 2;
-		t4 = lines.map(_temp$2);
+		t4 = lines.map(_temp$3);
 		$[0] = maxLines;
 		$[1] = text;
 		$[2] = T0;
@@ -597382,13 +597599,19 @@ function OutputPreview(t0) {
 	}
 	let t5;
 	if ($[8] !== allLines || $[9] !== maxLines || $[10] !== truncated) {
-		t5 = truncated && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, {
-			dimColor: true,
-			children: [
-				"... +",
-				allLines.length - maxLines,
-				" more lines"
-			]
+		t5 = truncated && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box, {
+			flexDirection: "row",
+			children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
+				dimColor: true,
+				children: " "
+			}), /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, {
+				dimColor: true,
+				children: [
+					"+",
+					allLines.length - maxLines,
+					" more lines"
+				]
+			})]
 		});
 		$[8] = allLines;
 		$[9] = maxLines;
@@ -597411,10 +597634,17 @@ function OutputPreview(t0) {
 	} else t6 = $[17];
 	return t6;
 }
-function _temp$2(line, i) {
-	return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
-		dimColor: true,
-		children: line || " "
+function _temp$3(line, i) {
+	return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box, {
+		flexDirection: "row",
+		children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
+			dimColor: true,
+			children: i === 0 ? "└ " : "  "
+		}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
+			dimColor: true,
+			wrap: "wrap",
+			children: line || " "
+		})]
 	}, i);
 }
 function buildDiffLines(oldStr, newStr) {
@@ -597480,6 +597710,7 @@ function _temp2$1(line, i) {
 	return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
 		color: line.kind === "added" ? "green" : line.kind === "removed" ? "red" : void 0,
 		dimColor: line.kind === "context",
+		wrap: "wrap",
 		children: prefix + " " + (line.text || " ")
 	}, i);
 }
@@ -597494,7 +597725,7 @@ function ToolCallRead(t0) {
 	} else t1 = $[1];
 	const { file_path, offset, limit, view_range } = t1;
 	let rangeInfo;
-	if (view_range) rangeInfo = `:${view_range[0]} ${view_range[1] - view_range[0]}L`;
+	if (view_range) rangeInfo = `:${view_range[0]} ${view_range[1] - view_range[0] + 1}L`;
 	else if (offset != null || limit != null) {
 		const t2 = `${offset != null ? `:${offset}` : ""}${limit != null ? ` ${limit}L` : ""}`;
 		let t3;
@@ -597690,7 +597921,7 @@ function ToolCallBash(t0) {
 	const displayTitle = restart ? "[restart]" : description;
 	let t2;
 	if ($[2] !== command || $[3] !== restart) {
-		t2 = !restart && command ? command.includes("\n") ? command.split("\n")[0] + " ..." : command.slice(0, 80) : void 0;
+		t2 = !restart && command ? command.includes("\n") ? command.split("\n")[0] + " ..." : command.slice(0, 90) : void 0;
 		$[2] = command;
 		$[3] = restart;
 		$[4] = t2;
@@ -597723,12 +597954,16 @@ function ToolCallBash(t0) {
 	} else t5 = $[12];
 	let t6;
 	if ($[13] !== displayCmd) {
-		t6 = displayCmd && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Box, {
-			paddingLeft: 3,
-			children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, {
+		t6 = displayCmd && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box, {
+			paddingLeft: 2,
+			flexDirection: "row",
+			children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
 				dimColor: true,
-				children: ["$ ", displayCmd]
-			})
+				children: "└ "
+			}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
+				dimColor: true,
+				children: displayCmd
+			})]
 		});
 		$[13] = displayCmd;
 		$[14] = t6;
@@ -597760,8 +597995,9 @@ function ToolCallBash(t0) {
 	} else t8 = $[20];
 	return t8;
 }
+const RESULT_PREVIEW_LINES = 5;
 function ToolCallGrep(t0) {
-	const $ = (0, import_compiler_runtime.c)(23);
+	const $ = (0, import_compiler_runtime.c)(36);
 	const { tool } = t0;
 	let t1;
 	if ($[0] !== tool.input) {
@@ -597770,93 +598006,158 @@ function ToolCallGrep(t0) {
 		$[1] = t1;
 	} else t1 = $[1];
 	const { query, include_glob, case_sensitive } = t1;
+	let T0;
+	let matchCount;
 	let t2;
-	if ($[2] !== tool.state || $[3] !== tool.toolResult) {
-		const resultText = tool.state === "success" ? getResultText(tool.toolResult) : void 0;
-		t2 = resultText ? resultText.trim().split("\n").filter(Boolean).length : void 0;
-		$[2] = tool.state;
-		$[3] = tool.toolResult;
-		$[4] = t2;
-	} else t2 = $[4];
-	const matchCount = t2;
 	let t3;
-	if ($[5] !== query) {
-		t3 = query && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(CmdText, { cmd: `"${query}"` });
-		$[5] = query;
-		$[6] = t3;
-	} else t3 = $[6];
 	let t4;
-	if ($[7] !== include_glob) {
-		t4 = include_glob && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
-			dimColor: true,
-			children: include_glob
-		});
-		$[7] = include_glob;
-		$[8] = t4;
-	} else t4 = $[8];
 	let t5;
-	if ($[9] !== case_sensitive) {
-		t5 = case_sensitive === false && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
-			dimColor: true,
-			children: "-i"
+	if ($[2] !== case_sensitive || $[3] !== include_glob || $[4] !== query || $[5] !== tool) {
+		const resultText = tool.state === "success" ? getResultText(tool.toolResult) : void 0;
+		const allFiles = resultText ? resultText.trim().split("\n").filter(Boolean) : void 0;
+		matchCount = allFiles?.length;
+		const previewFiles = allFiles?.slice(0, RESULT_PREVIEW_LINES);
+		const hiddenCount = matchCount != null && matchCount > RESULT_PREVIEW_LINES ? matchCount - RESULT_PREVIEW_LINES : 0;
+		let t6;
+		if ($[12] !== query) {
+			t6 = query ? query.length > 60 ? `"${query.slice(0, 57)}…"` : `"${query}"` : void 0;
+			$[12] = query;
+			$[13] = t6;
+		} else t6 = $[13];
+		const displayQuery = t6;
+		T0 = Box;
+		t2 = "column";
+		t3 = 1;
+		let t7;
+		if ($[14] !== displayQuery) {
+			t7 = displayQuery && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(CmdText, { cmd: displayQuery });
+			$[14] = displayQuery;
+			$[15] = t7;
+		} else t7 = $[15];
+		let t8;
+		if ($[16] !== include_glob) {
+			t8 = include_glob && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
+				dimColor: true,
+				children: include_glob
+			});
+			$[16] = include_glob;
+			$[17] = t8;
+		} else t8 = $[17];
+		let t9;
+		if ($[18] !== case_sensitive) {
+			t9 = case_sensitive === false && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
+				dimColor: true,
+				children: "-i"
+			});
+			$[18] = case_sensitive;
+			$[19] = t9;
+		} else t9 = $[19];
+		let t10;
+		if ($[20] !== t7 || $[21] !== t8 || $[22] !== t9) {
+			t10 = /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [
+				t7,
+				t8,
+				t9
+			] });
+			$[20] = t7;
+			$[21] = t8;
+			$[22] = t9;
+			$[23] = t10;
+		} else t10 = $[23];
+		if ($[24] !== t10 || $[25] !== tool) {
+			t4 = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ToolHeader, {
+				tool,
+				label: TOOL_LABELS.Grep,
+				extra: t10
+			});
+			$[24] = t10;
+			$[25] = tool;
+			$[26] = t4;
+		} else t4 = $[26];
+		t5 = previewFiles && previewFiles.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box, {
+			flexDirection: "column",
+			paddingLeft: 2,
+			children: [previewFiles.map(_temp3$1), hiddenCount > 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box, {
+				flexDirection: "row",
+				children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
+					dimColor: true,
+					children: "  "
+				}), /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, {
+					dimColor: true,
+					children: [
+						"+",
+						hiddenCount,
+						" more"
+					]
+				})]
+			})]
 		});
-		$[9] = case_sensitive;
-		$[10] = t5;
-	} else t5 = $[10];
+		$[2] = case_sensitive;
+		$[3] = include_glob;
+		$[4] = query;
+		$[5] = tool;
+		$[6] = T0;
+		$[7] = matchCount;
+		$[8] = t2;
+		$[9] = t3;
+		$[10] = t4;
+		$[11] = t5;
+	} else {
+		T0 = $[6];
+		matchCount = $[7];
+		t2 = $[8];
+		t3 = $[9];
+		t4 = $[10];
+		t5 = $[11];
+	}
 	let t6;
-	if ($[11] !== t3 || $[12] !== t4 || $[13] !== t5) {
-		t6 = /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [
-			t3,
-			t4,
-			t5
-		] });
-		$[11] = t3;
-		$[12] = t4;
-		$[13] = t5;
-		$[14] = t6;
-	} else t6 = $[14];
-	let t7;
-	if ($[15] !== t6 || $[16] !== tool) {
-		t7 = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ToolHeader, {
-			tool,
-			label: TOOL_LABELS.Grep,
-			extra: t6
-		});
-		$[15] = t6;
-		$[16] = tool;
-		$[17] = t7;
-	} else t7 = $[17];
-	let t8;
-	if ($[18] !== matchCount) {
-		t8 = matchCount != null && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Box, {
+	if ($[27] !== matchCount) {
+		t6 = matchCount === 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box, {
 			paddingLeft: 2,
-			children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, {
+			flexDirection: "row",
+			children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
 				dimColor: true,
-				children: [
-					matchCount,
-					" match",
-					matchCount !== 1 ? "es" : ""
-				]
-			})
+				children: "└ "
+			}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
+				dimColor: true,
+				children: "no matches"
+			})]
 		});
-		$[18] = matchCount;
-		$[19] = t8;
-	} else t8 = $[19];
-	let t9;
-	if ($[20] !== t7 || $[21] !== t8) {
-		t9 = /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box, {
-			flexDirection: "column",
-			paddingX: 1,
-			children: [t7, t8]
+		$[27] = matchCount;
+		$[28] = t6;
+	} else t6 = $[28];
+	let t7;
+	if ($[29] !== T0 || $[30] !== t2 || $[31] !== t3 || $[32] !== t4 || $[33] !== t5 || $[34] !== t6) {
+		t7 = /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(T0, {
+			flexDirection: t2,
+			paddingX: t3,
+			children: [
+				t4,
+				t5,
+				t6
+			]
 		});
-		$[20] = t7;
-		$[21] = t8;
-		$[22] = t9;
-	} else t9 = $[22];
-	return t9;
+		$[29] = T0;
+		$[30] = t2;
+		$[31] = t3;
+		$[32] = t4;
+		$[33] = t5;
+		$[34] = t6;
+		$[35] = t7;
+	} else t7 = $[35];
+	return t7;
+}
+function _temp3$1(file, i) {
+	return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box, {
+		flexDirection: "row",
+		children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
+			dimColor: true,
+			children: i === 0 ? "└ " : "  "
+		}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(FilePath, { path: file })]
+	}, i);
 }
 function ToolCallGlob(t0) {
-	const $ = (0, import_compiler_runtime.c)(15);
+	const $ = (0, import_compiler_runtime.c)(24);
 	const { tool } = t0;
 	let t1;
 	if ($[0] !== tool.input) {
@@ -597865,60 +598166,116 @@ function ToolCallGlob(t0) {
 		$[1] = t1;
 	} else t1 = $[1];
 	const { pattern } = t1;
+	let T0;
+	let fileCount;
 	let t2;
-	if ($[2] !== tool.state || $[3] !== tool.toolResult) {
-		const resultText = tool.state === "success" ? getResultText(tool.toolResult) : void 0;
-		t2 = resultText ? resultText.trim().split("\n").filter(Boolean).length : void 0;
-		$[2] = tool.state;
-		$[3] = tool.toolResult;
-		$[4] = t2;
-	} else t2 = $[4];
-	const fileCount = t2;
 	let t3;
-	if ($[5] !== pattern) {
-		t3 = pattern ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(CmdText, { cmd: pattern }) : void 0;
-		$[5] = pattern;
-		$[6] = t3;
-	} else t3 = $[6];
 	let t4;
-	if ($[7] !== t3 || $[8] !== tool) {
-		t4 = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ToolHeader, {
-			tool,
-			label: TOOL_LABELS.Glob,
-			extra: t3
+	let t5;
+	if ($[2] !== pattern || $[3] !== tool) {
+		const resultText = tool.state === "success" ? getResultText(tool.toolResult) : void 0;
+		const allFiles = resultText ? resultText.trim().split("\n").filter(Boolean) : void 0;
+		fileCount = allFiles?.length;
+		const previewFiles = allFiles?.slice(0, RESULT_PREVIEW_LINES);
+		const hiddenCount = fileCount != null && fileCount > RESULT_PREVIEW_LINES ? fileCount - RESULT_PREVIEW_LINES : 0;
+		T0 = Box;
+		t2 = "column";
+		t3 = 1;
+		let t6;
+		if ($[10] !== pattern) {
+			t6 = pattern ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(CmdText, { cmd: pattern }) : void 0;
+			$[10] = pattern;
+			$[11] = t6;
+		} else t6 = $[11];
+		if ($[12] !== t6 || $[13] !== tool) {
+			t4 = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ToolHeader, {
+				tool,
+				label: TOOL_LABELS.Glob,
+				extra: t6
+			});
+			$[12] = t6;
+			$[13] = tool;
+			$[14] = t4;
+		} else t4 = $[14];
+		t5 = previewFiles && previewFiles.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box, {
+			flexDirection: "column",
+			paddingLeft: 2,
+			children: [previewFiles.map(_temp4), hiddenCount > 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box, {
+				flexDirection: "row",
+				children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
+					dimColor: true,
+					children: "  "
+				}), /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, {
+					dimColor: true,
+					children: [
+						"+",
+						hiddenCount,
+						" more"
+					]
+				})]
+			})]
 		});
+		$[2] = pattern;
+		$[3] = tool;
+		$[4] = T0;
+		$[5] = fileCount;
+		$[6] = t2;
 		$[7] = t3;
-		$[8] = tool;
-		$[9] = t4;
-	} else t4 = $[9];
-	let t5;
-	if ($[10] !== fileCount) {
-		t5 = fileCount != null && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Box, {
+		$[8] = t4;
+		$[9] = t5;
+	} else {
+		T0 = $[4];
+		fileCount = $[5];
+		t2 = $[6];
+		t3 = $[7];
+		t4 = $[8];
+		t5 = $[9];
+	}
+	let t6;
+	if ($[15] !== fileCount) {
+		t6 = fileCount === 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box, {
 			paddingLeft: 2,
-			children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, {
+			flexDirection: "row",
+			children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
 				dimColor: true,
-				children: [
-					fileCount,
-					" file",
-					fileCount !== 1 ? "s" : ""
-				]
-			})
+				children: "└ "
+			}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
+				dimColor: true,
+				children: "no files found"
+			})]
 		});
-		$[10] = fileCount;
-		$[11] = t5;
-	} else t5 = $[11];
-	let t6;
-	if ($[12] !== t4 || $[13] !== t5) {
-		t6 = /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box, {
-			flexDirection: "column",
-			paddingX: 1,
-			children: [t4, t5]
+		$[15] = fileCount;
+		$[16] = t6;
+	} else t6 = $[16];
+	let t7;
+	if ($[17] !== T0 || $[18] !== t2 || $[19] !== t3 || $[20] !== t4 || $[21] !== t5 || $[22] !== t6) {
+		t7 = /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(T0, {
+			flexDirection: t2,
+			paddingX: t3,
+			children: [
+				t4,
+				t5,
+				t6
+			]
 		});
-		$[12] = t4;
-		$[13] = t5;
-		$[14] = t6;
-	} else t6 = $[14];
-	return t6;
+		$[17] = T0;
+		$[18] = t2;
+		$[19] = t3;
+		$[20] = t4;
+		$[21] = t5;
+		$[22] = t6;
+		$[23] = t7;
+	} else t7 = $[23];
+	return t7;
+}
+function _temp4(file, i) {
+	return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box, {
+		flexDirection: "row",
+		children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
+			dimColor: true,
+			children: i === 0 ? "└ " : "  "
+		}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(FilePath, { path: file })]
+	}, i);
 }
 function ToolCallReadRule(t0) {
 	const $ = (0, import_compiler_runtime.c)(7);
@@ -598085,7 +598442,7 @@ function ToolCallGetScreenshot(t0) {
 	return t5;
 }
 function ToolCallAgent(t0) {
-	const $ = (0, import_compiler_runtime.c)(16);
+	const $ = (0, import_compiler_runtime.c)(17);
 	const { tool } = t0;
 	let t1;
 	if ($[0] !== tool.input) {
@@ -598107,13 +598464,14 @@ function ToolCallAgent(t0) {
 		}
 		let t3;
 		if ($[3] !== tool.agentContext) {
-			t3 = tool.agentContext.split("\n").map(_temp3$1).filter(_temp4).slice(-8);
+			t3 = tool.agentContext.split("\n").map(_temp5).filter(_temp6).slice(-8);
 			$[3] = tool.agentContext;
 			$[4] = t3;
 		} else t3 = $[4];
 		t2 = t3;
 	}
 	const lines = t2;
+	const isRunning = tool.state === "generating" || tool.state === "running";
 	const t3 = `Agent(${subagent_type ?? "explorer"})`;
 	let t4;
 	if ($[5] !== description) {
@@ -598137,8 +598495,8 @@ function ToolCallAgent(t0) {
 		$[10] = t5;
 	} else t5 = $[10];
 	let t6;
-	if ($[11] !== lines) {
-		t6 = lines.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Box, {
+	if ($[11] !== isRunning || $[12] !== lines) {
+		t6 = isRunning && lines.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Box, {
 			flexDirection: "column",
 			marginLeft: 3,
 			paddingX: 1,
@@ -598147,36 +598505,75 @@ function ToolCallAgent(t0) {
 			borderStyle: "round",
 			borderColor: "grey",
 			borderDimColor: true,
-			children: lines.map(_temp5)
+			children: lines.map(_temp7)
 		});
-		$[11] = lines;
-		$[12] = t6;
-	} else t6 = $[12];
+		$[11] = isRunning;
+		$[12] = lines;
+		$[13] = t6;
+	} else t6 = $[13];
 	let t7;
-	if ($[13] !== t5 || $[14] !== t6) {
+	if ($[14] !== t5 || $[15] !== t6) {
 		t7 = /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box, {
 			flexDirection: "column",
 			paddingX: 1,
 			children: [t5, t6]
 		});
-		$[13] = t5;
-		$[14] = t6;
-		$[15] = t7;
-	} else t7 = $[15];
+		$[14] = t5;
+		$[15] = t6;
+		$[16] = t7;
+	} else t7 = $[16];
 	return t7;
 }
-function _temp5(line, i) {
+function _temp7(line, i) {
 	return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
 		dimColor: true,
 		children: line
 	}, i);
 }
-function _temp4(l_0) {
+function _temp6(l_0) {
 	return l_0.length > 0;
 }
-function _temp3$1(l) {
+function _temp5(l) {
 	return l.trimEnd();
 }
+function ToolCallExitPlanMode(t0) {
+	const $ = (0, import_compiler_runtime.c)(8);
+	const { tool } = t0;
+	const plan = tool.structuredResult?.plan ?? tool.input?.plan;
+	let t1;
+	if ($[0] !== tool) {
+		t1 = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ToolHeader, {
+			tool,
+			label: TOOL_LABELS.ExitPlanMode
+		});
+		$[0] = tool;
+		$[1] = t1;
+	} else t1 = $[1];
+	let t2;
+	if ($[2] !== plan || $[3] !== tool.state) {
+		t2 = plan && tool.state === "success" && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Box, {
+			flexDirection: "column",
+			paddingLeft: 2,
+			marginTop: 1,
+			children: renderMarkdownBlocks(plan)
+		});
+		$[2] = plan;
+		$[3] = tool.state;
+		$[4] = t2;
+	} else t2 = $[4];
+	let t3;
+	if ($[5] !== t1 || $[6] !== t2) {
+		t3 = /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box, {
+			flexDirection: "column",
+			paddingX: 1,
+			children: [t1, t2]
+		});
+		$[5] = t1;
+		$[6] = t2;
+		$[7] = t3;
+	} else t3 = $[7];
+	return t3;
+}
 function ToolCallGeneric(t0) {
 	const $ = (0, import_compiler_runtime.c)(11);
 	const { tool } = t0;
@@ -598223,8 +598620,9 @@ function ToolCallGeneric(t0) {
 	} else t4 = $[10];
 	return t4;
 }
+const WRITE_PREVIEW_MAX_LINES = 60;
 function ToolCallWrite(t0) {
-	const $ = (0, import_compiler_runtime.c)(14);
+	const $ = (0, import_compiler_runtime.c)(17);
 	const { tool } = t0;
 	let t1;
 	if ($[0] !== tool.input) {
@@ -598234,54 +598632,63 @@ function ToolCallWrite(t0) {
 	} else t1 = $[1];
 	const { file_path, title, content } = t1;
 	let t2;
-	if ($[2] !== title) {
-		t2 = title ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
-			dimColor: true,
-			children: title
-		}) : void 0;
-		$[2] = title;
+	if ($[2] !== file_path) {
+		t2 = file_path?.startsWith(".builder/plans/");
+		$[2] = file_path;
 		$[3] = t2;
 	} else t2 = $[3];
+	const isPlanFile = t2;
 	let t3;
-	if ($[4] !== t2 || $[5] !== tool) {
-		t3 = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ToolHeader, {
+	if ($[4] !== title) {
+		t3 = title ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
+			dimColor: true,
+			children: title
+		}) : void 0;
+		$[4] = title;
+		$[5] = t3;
+	} else t3 = $[5];
+	let t4;
+	if ($[6] !== t3 || $[7] !== tool) {
+		t4 = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ToolHeader, {
 			tool,
 			label: TOOL_LABELS.Write,
-			extra: t2
+			extra: t3
 		});
-		$[4] = t2;
-		$[5] = tool;
 		$[6] = t3;
-	} else t3 = $[6];
-	let t4;
-	if ($[7] !== content || $[8] !== file_path || $[9] !== tool.state) {
-		t4 = tool.state === "success" && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(CodePreview, {
+		$[7] = tool;
+		$[8] = t4;
+	} else t4 = $[8];
+	let t5;
+	if ($[9] !== content || $[10] !== file_path || $[11] !== isPlanFile || $[12] !== tool.state) {
+		t5 = tool.state === "success" && !isPlanFile && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(CodePreview, {
 			code: content ?? "",
 			filePath: file_path,
 			paddingLeft: 2,
-			highlight: true
+			highlight: true,
+			maxLines: WRITE_PREVIEW_MAX_LINES
 		});
-		$[7] = content;
-		$[8] = file_path;
-		$[9] = tool.state;
-		$[10] = t4;
-	} else t4 = $[10];
-	let t5;
-	if ($[11] !== t3 || $[12] !== t4) {
-		t5 = /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box, {
+		$[9] = content;
+		$[10] = file_path;
+		$[11] = isPlanFile;
+		$[12] = tool.state;
+		$[13] = t5;
+	} else t5 = $[13];
+	let t6;
+	if ($[14] !== t4 || $[15] !== t5) {
+		t6 = /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box, {
 			flexDirection: "column",
 			paddingX: 1,
-			children: [t3, t4]
+			children: [t4, t5]
 		});
-		$[11] = t3;
-		$[12] = t4;
-		$[13] = t5;
-	} else t5 = $[13];
-	return t5;
+		$[14] = t4;
+		$[15] = t5;
+		$[16] = t6;
+	} else t6 = $[16];
+	return t6;
 }
 function CodePreview(t0) {
-	const $ = (0, import_compiler_runtime.c)(18);
-	const { code, filePath, paddingLeft, highlight } = t0;
+	const $ = (0, import_compiler_runtime.c)(28);
+	const { code, filePath, paddingLeft, highlight, maxLines } = t0;
 	const theme = useTheme();
 	let t1;
 	if ($[0] !== filePath) {
@@ -598299,12 +598706,22 @@ function CodePreview(t0) {
 		$[4] = highlight;
 		$[5] = t2;
 	} else t2 = $[5];
-	const highlightedLines = t2;
-	const lineNumberWidth = String(highlightedLines.length).length;
-	const t3 = theme.inputBackground;
-	let t4;
-	if ($[6] !== filePath) {
-		t4 = filePath && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Box, {
+	const allHighlightedLines = t2;
+	const truncated = maxLines != null && allHighlightedLines.length > maxLines;
+	let t3;
+	if ($[6] !== allHighlightedLines || $[7] !== maxLines || $[8] !== truncated) {
+		t3 = truncated ? allHighlightedLines.slice(0, maxLines) : allHighlightedLines;
+		$[6] = allHighlightedLines;
+		$[7] = maxLines;
+		$[8] = truncated;
+		$[9] = t3;
+	} else t3 = $[9];
+	const highlightedLines = t3;
+	const lineNumberWidth = String(allHighlightedLines.length).length;
+	const t4 = theme.inputBackground;
+	let t5;
+	if ($[10] !== filePath) {
+		t5 = filePath && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Box, {
 			marginBottom: 1,
 			children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
 				color: "cyan",
@@ -598312,14 +598729,14 @@ function CodePreview(t0) {
 				children: fileHyperlink(filePath)
 			})
 		});
-		$[6] = filePath;
-		$[7] = t4;
-	} else t4 = $[7];
-	let t5;
-	if ($[8] !== highlightedLines || $[9] !== lineNumberWidth) {
-		let t6;
-		if ($[11] !== lineNumberWidth) {
-			t6 = (line, index) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box, { children: [
+		$[10] = filePath;
+		$[11] = t5;
+	} else t5 = $[11];
+	let t6;
+	if ($[12] !== highlightedLines || $[13] !== lineNumberWidth) {
+		let t7;
+		if ($[15] !== lineNumberWidth) {
+			t7 = (line, index) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box, { children: [
 				/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
 					dimColor: true,
 					children: String(index + 1).padStart(lineNumberWidth, " ")
@@ -598330,36 +598747,58 @@ function CodePreview(t0) {
 				}),
 				/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { children: line || " " })
 			] }, index);
-			$[11] = lineNumberWidth;
-			$[12] = t6;
-		} else t6 = $[12];
-		t5 = highlightedLines.map(t6);
-		$[8] = highlightedLines;
-		$[9] = lineNumberWidth;
-		$[10] = t5;
-	} else t5 = $[10];
-	let t6;
-	if ($[13] !== paddingLeft || $[14] !== t4 || $[15] !== t5 || $[16] !== theme.inputBackground) {
-		t6 = /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box, {
+			$[15] = lineNumberWidth;
+			$[16] = t7;
+		} else t7 = $[16];
+		t6 = highlightedLines.map(t7);
+		$[12] = highlightedLines;
+		$[13] = lineNumberWidth;
+		$[14] = t6;
+	} else t6 = $[14];
+	let t7;
+	if ($[17] !== allHighlightedLines.length || $[18] !== lineNumberWidth || $[19] !== maxLines || $[20] !== truncated) {
+		t7 = truncated && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, {
+			dimColor: true,
+			children: [
+				" ".repeat(lineNumberWidth + 3),
+				"+",
+				allHighlightedLines.length - maxLines,
+				" more lines"
+			]
+		});
+		$[17] = allHighlightedLines.length;
+		$[18] = lineNumberWidth;
+		$[19] = maxLines;
+		$[20] = truncated;
+		$[21] = t7;
+	} else t7 = $[21];
+	let t8;
+	if ($[22] !== paddingLeft || $[23] !== t5 || $[24] !== t6 || $[25] !== t7 || $[26] !== theme.inputBackground) {
+		t8 = /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box, {
 			flexDirection: "column",
 			paddingLeft,
 			marginTop: 0,
 			paddingX: 1,
 			paddingY: 1,
 			marginBottom: 1,
-			backgroundColor: t3,
-			children: [t4, t5]
+			backgroundColor: t4,
+			children: [
+				t5,
+				t6,
+				t7
+			]
 		});
-		$[13] = paddingLeft;
-		$[14] = t4;
-		$[15] = t5;
-		$[16] = theme.inputBackground;
-		$[17] = t6;
-	} else t6 = $[17];
-	return t6;
+		$[22] = paddingLeft;
+		$[23] = t5;
+		$[24] = t6;
+		$[25] = t7;
+		$[26] = theme.inputBackground;
+		$[27] = t8;
+	} else t8 = $[27];
+	return t8;
 }
 function ToolCallCompleted(t0) {
-	const $ = (0, import_compiler_runtime.c)(24);
+	const $ = (0, import_compiler_runtime.c)(26);
 	const { tool } = t0;
 	switch (tool.toolName) {
 		case "Read": {
@@ -598462,23 +598901,33 @@ function ToolCallCompleted(t0) {
 			} else t2 = $[19];
 			return t2;
 		}
-		case "Agent": {
+		case "ExitPlanMode": {
 			const t1 = tool;
 			let t2;
 			if ($[20] !== t1) {
-				t2 = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ToolCallAgent, { tool: t1 });
+				t2 = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ToolCallExitPlanMode, { tool: t1 });
 				$[20] = t1;
 				$[21] = t2;
 			} else t2 = $[21];
 			return t2;
 		}
+		case "Agent": {
+			const t1 = tool;
+			let t2;
+			if ($[22] !== t1) {
+				t2 = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ToolCallAgent, { tool: t1 });
+				$[22] = t1;
+				$[23] = t2;
+			} else t2 = $[23];
+			return t2;
+		}
 		default: {
 			let t1;
-			if ($[22] !== tool) {
+			if ($[24] !== tool) {
 				t1 = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ToolCallGeneric, { tool });
-				$[22] = tool;
-				$[23] = t1;
-			} else t1 = $[23];
+				$[24] = tool;
+				$[25] = t1;
+			} else t1 = $[25];
 			return t1;
 		}
 	}
@@ -598486,14 +598935,17 @@ function ToolCallCompleted(t0) {
 //#endregion
 //#region src/components/MessageBlockView.tsx
 const MessageBlockView = (0, import_react.memo)((props) => {
-	const $ = (0, import_compiler_runtime.c)(19);
+	const $ = (0, import_compiler_runtime.c)(20);
 	const message = useSnapshot(props.message);
 	const theme = useTheme();
 	switch (message.type) {
 		case "user": {
 			let t0;
 			if ($[0] !== message.displayPrompt) {
-				t0 = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { children: message.displayPrompt });
+				t0 = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
+					wrap: "wrap",
+					children: message.displayPrompt
+				});
 				$[0] = message.displayPrompt;
 				$[1] = t0;
 			} else t0 = $[1];
@@ -598543,32 +598995,37 @@ const MessageBlockView = (0, import_react.memo)((props) => {
 			return t1;
 		}
 		case "thinking": {
-			let t0;
-			if ($[12] !== message.content || $[13] !== message.id) {
-				t0 = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ThinkingBlock, { text: message.content }, message.id);
+			const t0 = message;
+			let t1;
+			if ($[12] !== message.content || $[13] !== message.id || $[14] !== t0.streaming) {
+				t1 = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ThinkingBlock, {
+					text: message.content,
+					streaming: t0.streaming
+				}, message.id);
 				$[12] = message.content;
 				$[13] = message.id;
-				$[14] = t0;
-			} else t0 = $[14];
-			return t0;
+				$[14] = t0.streaming;
+				$[15] = t1;
+			} else t1 = $[15];
+			return t1;
 		}
 		case "idle": {
 			const t0 = message;
 			let t1;
-			if ($[15] !== message.id || $[16] !== t0) {
+			if ($[16] !== message.id || $[17] !== t0) {
 				t1 = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(IdleBlock, { message: t0 }, message.id);
-				$[15] = message.id;
-				$[16] = t0;
-				$[17] = t1;
-			} else t1 = $[17];
+				$[16] = message.id;
+				$[17] = t0;
+				$[18] = t1;
+			} else t1 = $[18];
 			return t1;
 		}
 		default: {
 			let t0;
-			if ($[18] === Symbol.for("react.memo_cache_sentinel")) {
+			if ($[19] === Symbol.for("react.memo_cache_sentinel")) {
 				t0 = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, {});
-				$[18] = t0;
-			} else t0 = $[18];
+				$[19] = t0;
+			} else t0 = $[19];
 			return t0;
 		}
 	}
@@ -598587,7 +599044,7 @@ function CompletedTextBlock(t0) {
 		t2 = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Box, {
 			flexDirection: "column",
 			paddingX: 2,
-			marginBottom: 1,
+			marginY: 1,
 			children: t1
 		});
 		$[2] = t1;
@@ -598595,24 +599052,75 @@ function CompletedTextBlock(t0) {
 	} else t2 = $[3];
 	return t2;
 }
+const THINKING_MAX_CHARS = 400;
 function ThinkingBlock(t0) {
-	const $ = (0, import_compiler_runtime.c)(2);
-	const { text } = t0;
-	let t1;
+	const $ = (0, import_compiler_runtime.c)(12);
+	const { text, streaming: t1 } = t0;
+	const streaming = t1 === void 0 ? false : t1;
+	let t2;
 	if ($[0] !== text) {
-		t1 = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Box, {
-			flexDirection: "column",
-			paddingX: 2,
-			marginBottom: 1,
+		t2 = text.length > THINKING_MAX_CHARS ? text.slice(0, THINKING_MAX_CHARS).trimEnd() + "…" : text.trim();
+		$[0] = text;
+		$[1] = t2;
+	} else t2 = $[1];
+	const preview = t2;
+	let t3;
+	if ($[2] !== streaming) {
+		t3 = streaming ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
+			bold: true,
+			color: "cyan",
+			children: "●"
+		}) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
+			dimColor: true,
+			children: "◆"
+		});
+		$[2] = streaming;
+		$[3] = t3;
+	} else t3 = $[3];
+	let t4;
+	if ($[4] === Symbol.for("react.memo_cache_sentinel")) {
+		t4 = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
+			bold: true,
+			dimColor: true,
+			children: "Thinking"
+		});
+		$[4] = t4;
+	} else t4 = $[4];
+	let t5;
+	if ($[5] !== t3) {
+		t5 = /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box, {
+			gap: 1,
+			children: [t3, t4]
+		});
+		$[5] = t3;
+		$[6] = t5;
+	} else t5 = $[6];
+	let t6;
+	if ($[7] !== preview) {
+		t6 = preview.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Box, {
+			paddingLeft: 2,
 			children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
 				dimColor: true,
-				children: text
+				wrap: "wrap",
+				children: preview
 			})
 		});
-		$[0] = text;
-		$[1] = t1;
-	} else t1 = $[1];
-	return t1;
+		$[7] = preview;
+		$[8] = t6;
+	} else t6 = $[8];
+	let t7;
+	if ($[9] !== t5 || $[10] !== t6) {
+		t7 = /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box, {
+			flexDirection: "column",
+			paddingX: 1,
+			marginY: 1,
+			children: [t5, t6]
+		});
+		$[9] = t5;
+		$[10] = t6;
+		$[11] = t7;
+	} else t7 = $[11];
+	return t7;
 }
 function formatDuration(ms) {
 	if (ms < 1e3) return `${ms}ms`;
@@ -598667,7 +599175,7 @@ function pickVerb(seed) {
 	return IDLE_VERBS[hash % IDLE_VERBS.length];
 }
 function IdleBlock(t0) {
-	const $ = (0, import_compiler_runtime.c)(20);
+	const $ = (0, import_compiler_runtime.c)(24);
 	const { message } = t0;
 	let t1;
 	if ($[0] !== message.durationMs) {
@@ -598691,73 +599199,79 @@ function IdleBlock(t0) {
 		$[5] = t4;
 	} else t4 = $[5];
 	const credits = t4;
+	const isAbort = message.state === "abort";
+	const isError = message.state === "error";
+	const summaryIcon = isError ? "✗" : isAbort ? "◆" : "✦";
+	const summaryColor = isError ? "red" : isAbort ? "yellow" : "magenta";
+	const summaryText = isError ? `Failed after ${duration}` : isAbort ? `Interrupted after ${duration}` : `${verb} for ${duration}`;
 	let t5;
-	if ($[6] === Symbol.for("react.memo_cache_sentinel")) {
-		t5 = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
-			color: "magenta",
-			bold: true,
-			children: "✦"
-		});
-		$[6] = t5;
-	} else t5 = $[6];
+	if ($[6] !== message.applyResults) {
+		t5 = message.applyResults.map(_temp$2);
+		$[6] = message.applyResults;
+		$[7] = t5;
+	} else t5 = $[7];
 	let t6;
-	if ($[7] !== duration || $[8] !== verb) {
-		t6 = /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, {
+	if ($[8] !== summaryColor || $[9] !== summaryIcon) {
+		t6 = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
+			color: summaryColor,
 			bold: true,
-			children: [
-				verb,
-				" for ",
-				duration
-			]
+			children: summaryIcon
 		});
-		$[7] = duration;
-		$[8] = verb;
-		$[9] = t6;
-	} else t6 = $[9];
+		$[8] = summaryColor;
+		$[9] = summaryIcon;
+		$[10] = t6;
+	} else t6 = $[10];
 	let t7;
-	if ($[10] !== credits) {
-		t7 = credits && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, {
+	if ($[11] !== summaryText) {
+		t7 = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
+			bold: true,
+			children: summaryText
+		});
+		$[11] = summaryText;
+		$[12] = t7;
+	} else t7 = $[12];
+	let t8;
+	if ($[13] !== credits || $[14] !== isAbort || $[15] !== isError) {
+		t8 = credits && !isAbort && !isError && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, {
 			dimColor: true,
 			children: ["· ", credits]
 		});
-		$[10] = credits;
-		$[11] = t7;
-	} else t7 = $[11];
-	let t8;
-	if ($[12] !== t6 || $[13] !== t7) {
-		t8 = /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box, {
+		$[13] = credits;
+		$[14] = isAbort;
+		$[15] = isError;
+		$[16] = t8;
+	} else t8 = $[16];
+	let t9;
+	if ($[17] !== t6 || $[18] !== t7 || $[19] !== t8) {
+		t9 = /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box, {
 			gap: 1,
+			marginTop: 1,
 			children: [
-				t5,
 				t6,
-				t7
+				t7,
+				t8
 			]
 		});
-		$[12] = t6;
-		$[13] = t7;
-		$[14] = t8;
-	} else t8 = $[14];
-	let t9;
-	if ($[15] !== message.applyResults) {
-		t9 = message.applyResults.map(_temp$1);
-		$[15] = message.applyResults;
-		$[16] = t9;
-	} else t9 = $[16];
+		$[17] = t6;
+		$[18] = t7;
+		$[19] = t8;
+		$[20] = t9;
+	} else t9 = $[20];
 	let t10;
-	if ($[17] !== t8 || $[18] !== t9) {
+	if ($[21] !== t5 || $[22] !== t9) {
 		t10 = /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box, {
 			flexDirection: "column",
 			paddingX: 0,
 			marginY: 1,
-			children: [t8, t9]
+			children: [t5, t9]
 		});
-		$[17] = t8;
-		$[18] = t9;
-		$[19] = t10;
-	} else t10 = $[19];
+		$[21] = t5;
+		$[22] = t9;
+		$[23] = t10;
+	} else t10 = $[23];
 	return t10;
 }
-function _temp$1(result) {
+function _temp$2(result) {
 	const { green, red } = buildDots(result.addedLines, result.removedLines);
 	return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box, {
 		flexDirection: "row",
@@ -598934,14 +599448,6 @@ const CodeSession = (0, import_react.memo)(({ onExit, isTabActive = true }) => {
 			api.abort().catch(() => {});
 			return;
 		}
-		if (key.upArrow) {
-			scrollByClamped(-1);
-			return;
-		}
-		if (key.downArrow) {
-			scrollByClamped(1);
-			return;
-		}
 		if (key.pageUp) {
 			scrollByClamped(-(scrollRef.current?.getViewportHeight() || 10));
 			return;
@@ -599032,8 +599538,9 @@ const CodeSession = (0, import_react.memo)(({ onExit, isTabActive = true }) => {
 		userScrolledUp.current = false;
 		scrollRef.current?.scrollToBottom();
 	}, [api]);
-	const startIndex = Math.max(0, state.messages.length - 200);
-	const visibleMessages = state.messages.slice(startIndex);
+	const MAX_VISIBLE_MESSAGES = 200;
+	const messageCount = state.messages.length;
+	const startIndex = Math.max(0, messageCount - MAX_VISIBLE_MESSAGES);
 	const hiddenCount = startIndex;
 	const showInput = !!!state.activeUserQuestions;
 	if (!isTabActive) return null;
@@ -599079,30 +599586,58 @@ const CodeSession = (0, import_react.memo)(({ onExit, isTabActive = true }) => {
 						ref: scrollRef,
 						flexGrow: 1,
 						flexDirection: "column",
-						children: [hiddenCount > 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Box, {
-							paddingX: 2,
-							paddingY: 1,
-							children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, {
-								dimColor: true,
-								children: [
-									"─── ",
-									hiddenCount,
-									" older message",
-									hiddenCount === 1 ? "" : "s",
-									" not shown ───"
-								]
-							})
-						}), visibleMessages.map((msg, i) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ErrorBoundary, {
-							fallback: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Box, {
+						children: [
+							messageCount === 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Box, {
 								paddingX: 2,
+								paddingY: 1,
 								children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
-									color: "red",
 									dimColor: true,
-									children: "[failed to render message]"
+									children: "No messages yet. Type a prompt below to get started."
 								})
 							}),
-							children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(MessageBlockView, { message: proxy.messages[startIndex + i] }, `msg-${msg.id}-${startIndex + i}`)
-						}, `err-${msg.id}-${startIndex + i}`))]
+							hiddenCount > 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Box, {
+								paddingX: 2,
+								paddingY: 1,
+								children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, {
+									dimColor: true,
+									children: [
+										"─── ",
+										hiddenCount,
+										" older message",
+										hiddenCount === 1 ? "" : "s",
+										" not shown ───"
+									]
+								})
+							}),
+							Array.from({ length: messageCount - startIndex }, (_, i) => {
+								const idx = startIndex + i;
+								const msgProxy = proxy.messages[idx];
+								const msgId = msgProxy.id;
+								return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ErrorBoundary, {
+									fallback: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Box, {
+										paddingX: 2,
+										children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
+											color: "red",
+											dimColor: true,
+											children: "[failed to render message]"
+										})
+									}),
+									children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(MessageBlockView, { message: msgProxy }, `msg-${msgId}-${idx}`)
+								}, `err-${msgId}-${idx}`);
+							}),
+							state.state === "generating" && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box, {
+								gap: 1,
+								marginTop: 2,
+								marginBottom: 1,
+								children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(ProgressBar, {}), /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, {
+									dimColor: true,
+									children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
+										bold: true,
+										children: "esc"
+									}), " interrupt"]
+								})]
+							}, "generating-progress-bar")
+						]
 					})
 				})
 			}), /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box, {
@@ -599288,7 +599823,6 @@ function useClawSession(credentials, onNewMessages) {
 }
 //#endregion
 //#region src/components/ClawSession.tsx
-const MOUSE_RE = /^\[<(\d+);\d+;\d+[Mm]/;
 const SIDEBAR_WIDTH = 55;
 function formatMessageTime(ts) {
 	const diffMs = Date.now() - ts;
@@ -599440,259 +599974,424 @@ const ClawSidebar = (0, import_react.memo)(() => {
 	} else t2 = $[5];
 	return t2;
 });
-const ClawSession = (0, import_react.memo)(({ credentials, isActive, onNewMessages, onExit }) => {
+const ClawSession = (0, import_react.memo)((t0) => {
+	const $ = (0, import_compiler_runtime.c)(60);
+	const { credentials, isActive, onNewMessages, onExit } = t0;
 	const { stdout } = useStdout();
 	const [cols, setCols] = (0, import_react.useState)(stdout?.columns ?? 80);
 	const [rows, setRows] = (0, import_react.useState)(stdout?.rows ?? 24);
 	const theme = useTheme();
-	const [inputValue, setInputValue] = (0, import_react.useState)("");
 	const [ctrlCPending, setCtrlCPending] = (0, import_react.useState)(false);
 	const ctrlCTimer = (0, import_react.useRef)(null);
 	const scrollRef = (0, import_react.useRef)(null);
 	const userScrolledUp = (0, import_react.useRef)(false);
-	const scrollByClamped = (0, import_react.useCallback)((delta) => {
-		const scrollView = scrollRef.current;
-		if (!scrollView) return;
-		const currentOffset = scrollView.getScrollOffset();
-		const bottomOffset = Math.max(0, scrollView.getBottomOffset());
-		const nextOffset = Math.max(0, Math.min(bottomOffset, currentOffset + delta));
-		userScrolledUp.current = nextOffset < bottomOffset;
-		scrollView.scrollTo(nextOffset);
-	}, []);
+	let t1;
+	if ($[0] === Symbol.for("react.memo_cache_sentinel")) {
+		t1 = (delta) => {
+			const scrollView = scrollRef.current;
+			if (!scrollView) return;
+			const currentOffset = scrollView.getScrollOffset();
+			const bottomOffset = Math.max(0, scrollView.getBottomOffset());
+			const nextOffset = Math.max(0, Math.min(bottomOffset, currentOffset + delta));
+			userScrolledUp.current = nextOffset < bottomOffset;
+			scrollView.scrollTo(nextOffset);
+		};
+		$[0] = t1;
+	} else t1 = $[0];
+	const scrollByClamped = t1;
 	const { messages, isSending, isWaitingForReply, error, sendMessage } = useClawSession(credentials, onNewMessages);
-	(0, import_react.useEffect)(() => {
-		if (!isActive) return;
-		userScrolledUp.current = false;
-		setTimeout(() => {
-			scrollRef.current?.remeasure();
-			scrollRef.current?.scrollToBottom();
-		}, 0);
-	}, [messages.length, isWaitingForReply]);
-	(0, import_react.useEffect)(() => {
-		if (isActive) {
+	let t2;
+	if ($[1] !== isActive) {
+		t2 = () => {
+			if (!isActive) return;
 			userScrolledUp.current = false;
 			setTimeout(() => {
 				scrollRef.current?.remeasure();
 				scrollRef.current?.scrollToBottom();
 			}, 0);
-		}
-	}, [isActive]);
-	(0, import_react.useEffect)(() => {
-		return () => {
-			if (ctrlCTimer.current) clearTimeout(ctrlCTimer.current);
 		};
-	}, []);
-	(0, import_react.useEffect)(() => {
-		const handleResize = () => {
-			scrollRef.current?.remeasure();
-			setCols(stdout?.columns ?? 80);
-			setRows(stdout?.rows ?? 24);
+		$[1] = isActive;
+		$[2] = t2;
+	} else t2 = $[2];
+	let t3;
+	if ($[3] !== isWaitingForReply || $[4] !== messages.length) {
+		t3 = [messages.length, isWaitingForReply];
+		$[3] = isWaitingForReply;
+		$[4] = messages.length;
+		$[5] = t3;
+	} else t3 = $[5];
+	(0, import_react.useEffect)(t2, t3);
+	let t4;
+	let t5;
+	if ($[6] !== isActive) {
+		t4 = () => {
+			if (isActive) {
+				userScrolledUp.current = false;
+				setTimeout(() => {
+					scrollRef.current?.remeasure();
+					scrollRef.current?.scrollToBottom();
+				}, 0);
+			}
 		};
-		stdout?.on("resize", handleResize);
-		return () => {
-			stdout?.off("resize", handleResize);
+		t5 = [isActive];
+		$[6] = isActive;
+		$[7] = t4;
+		$[8] = t5;
+	} else {
+		t4 = $[7];
+		t5 = $[8];
+	}
+	(0, import_react.useEffect)(t4, t5);
+	let t6;
+	let t7;
+	if ($[9] === Symbol.for("react.memo_cache_sentinel")) {
+		t6 = () => () => {
+			if (ctrlCTimer.current) clearTimeout(ctrlCTimer.current);
 		};
-	}, [stdout]);
+		t7 = [];
+		$[9] = t6;
+		$[10] = t7;
+	} else {
+		t6 = $[9];
+		t7 = $[10];
+	}
+	(0, import_react.useEffect)(t6, t7);
+	let t8;
+	let t9;
+	if ($[11] !== stdout) {
+		t8 = () => {
+			const handleResize = () => {
+				scrollRef.current?.remeasure();
+				setCols(stdout?.columns ?? 80);
+				setRows(stdout?.rows ?? 24);
+			};
+			stdout?.on("resize", handleResize);
+			return () => {
+				stdout?.off("resize", handleResize);
+			};
+		};
+		t9 = [stdout];
+		$[11] = stdout;
+		$[12] = t8;
+		$[13] = t9;
+	} else {
+		t8 = $[12];
+		t9 = $[13];
+	}
+	(0, import_react.useEffect)(t8, t9);
 	const showSidebar = cols >= 100 && rows >= 24;
-	const handleSubmit = (0, import_react.useCallback)(async (val) => {
-		if (!val.trim() || isSending) return;
-		setInputValue("");
-		await sendMessage(val.trim());
-		userScrolledUp.current = false;
-		scrollRef.current?.scrollToBottom();
-	}, [isSending, sendMessage]);
-	useInput((input, key) => {
-		if (input === "c" && key.ctrl) {
-			if (ctrlCPending) {
-				if (ctrlCTimer.current) clearTimeout(ctrlCTimer.current);
-				onExit?.();
-			} else {
-				setCtrlCPending(true);
-				ctrlCTimer.current = setTimeout(() => {
-					setCtrlCPending(false);
-					ctrlCTimer.current = null;
-				}, 1e3);
+	let t10;
+	if ($[14] !== sendMessage) {
+		t10 = async (val) => {
+			if (!val.trim()) return;
+			await sendMessage(val.trim());
+			userScrolledUp.current = false;
+			scrollRef.current?.scrollToBottom();
+		};
+		$[14] = sendMessage;
+		$[15] = t10;
+	} else t10 = $[15];
+	const handleSubmit = t10;
+	let t11;
+	if ($[16] !== ctrlCPending || $[17] !== onExit) {
+		t11 = (input, key) => {
+			if (input === "c" && key.ctrl) {
+				if (ctrlCPending) {
+					if (ctrlCTimer.current) clearTimeout(ctrlCTimer.current);
+					onExit?.();
+				} else {
+					setCtrlCPending(true);
+					ctrlCTimer.current = setTimeout(() => {
+						setCtrlCPending(false);
+						ctrlCTimer.current = null;
+					}, 1e3);
+				}
+				return;
 			}
-			return;
-		}
-		if (key.upArrow) {
-			scrollByClamped(-1);
-			return;
-		}
-		if (key.downArrow) {
-			scrollByClamped(1);
-			return;
-		}
-		if (key.pageUp) {
-			scrollByClamped(-(scrollRef.current?.getViewportHeight() || 10));
-			return;
-		}
-		if (key.pageDown) {
-			scrollByClamped(scrollRef.current?.getViewportHeight() || 10);
-			return;
-		}
-	}, { isActive });
-	return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box, {
-		flexDirection: "row",
-		flexGrow: 1,
-		children: [/* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box, {
+			if (key.upArrow) {
+				scrollByClamped(-1);
+				return;
+			}
+			if (key.downArrow) {
+				scrollByClamped(1);
+				return;
+			}
+			if (key.pageUp) {
+				scrollByClamped(-(scrollRef.current?.getViewportHeight() || 10));
+				return;
+			}
+			if (key.pageDown) {
+				scrollByClamped(scrollRef.current?.getViewportHeight() || 10);
+				return;
+			}
+		};
+		$[16] = ctrlCPending;
+		$[17] = onExit;
+		$[18] = t11;
+	} else t11 = $[18];
+	let t12;
+	if ($[19] !== isActive) {
+		t12 = { isActive };
+		$[19] = isActive;
+		$[20] = t12;
+	} else t12 = $[20];
+	useInput(t11, t12);
+	let t13;
+	if ($[21] !== messages) {
+		t13 = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Box, {
 			flexDirection: "column",
 			flexGrow: 1,
-			paddingRight: 2,
-			children: [
-				/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Box, {
-					flexDirection: "column",
-					flexGrow: 1,
-					flexBasis: 0,
-					overflow: "hidden",
-					children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ScrollView, {
-						ref: scrollRef,
-						flexGrow: 1,
-						flexDirection: "column",
-						children: messages.length === 0 ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Box, {
-							paddingX: 2,
-							paddingY: 1,
-							children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
-								dimColor: true,
-								children: "No messages yet. Send a message to start a conversation with Claw."
-							})
-						}) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, { children: (() => {
-							const startIndex = Math.max(0, messages.length - 100);
-							const visibleMessages = messages.slice(startIndex);
-							const hiddenCount = startIndex;
-							return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [hiddenCount > 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Box, {
-								paddingX: 2,
-								paddingY: 1,
-								children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, {
-									dimColor: true,
-									children: [
-										"─── ",
-										hiddenCount,
-										" older message",
-										hiddenCount === 1 ? "" : "s",
-										" not shown ───"
-									]
-								})
-							}), visibleMessages.map((msg) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ErrorBoundary, {
-								fallback: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Box, {
-									paddingX: 2,
-									children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
-										color: "red",
-										dimColor: true,
-										children: "[failed to render message]"
-									})
-								}),
-								children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ClawMessageView, { message: msg })
-							}, msg.id))] });
-						})() })
-					})
-				}),
-				isWaitingForReply && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box, {
-					paddingX: 2,
-					paddingY: 0,
-					gap: 1,
-					children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Spinner, {}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
-						dimColor: true,
-						children: "Claw is thinking"
-					})]
-				}),
-				error && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Box, {
+			flexBasis: 0,
+			overflow: "hidden",
+			children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ScrollView, {
+				ref: scrollRef,
+				flexGrow: 1,
+				flexDirection: "column",
+				children: messages.length === 0 ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Box, {
 					paddingX: 2,
-					marginBottom: 1,
+					paddingY: 1,
 					children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
-						color: "red",
-						children: error
-					})
-				}),
-				/* @__PURE__ */ (0, import_jsx_runtime.jsx)(ErrorBoundary, {
-					fallback: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
-						color: "red",
 						dimColor: true,
-						children: "Input unavailable · Ctrl+C to exit"
-					}),
-					children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box, {
-						flexDirection: "column",
-						marginY: 1,
-						children: [/* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box, {
-							borderStyle: "bold",
-							borderColor: "blue",
-							borderLeft: true,
-							borderRight: false,
-							borderTop: false,
-							borderBottom: false,
-							flexDirection: "column",
-							paddingLeft: 2,
-							paddingRight: 2,
-							paddingY: 1,
-							marginBottom: 1,
-							backgroundColor: theme.panelBackground,
-							children: [/* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box, { children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(MultilineInput, {
-								value: inputValue,
-								onChange: setInputValue,
-								onSubmit: handleSubmit,
-								rows: 1,
-								maxRows: 10,
-								keyBindings: {
-									submit: (key_0) => key_0.return && !key_0.ctrl,
-									newline: (key_1) => key_1.return && key_1.ctrl
-								},
-								useCustomInput: (handler, active) => {
-									useInput((input_0, key_2) => {
-										const match = input_0.match(MOUSE_RE);
-										if (match) {
-											const button = parseInt(match[1], 10);
-											if (button === 64) scrollByClamped(-1);
-											else if (button === 65) scrollByClamped(1);
-											return;
-										}
-										if (input_0.includes("[<") && /\d+;\d+;\d+[Mm]/.test(input_0)) return;
-										if (key_2.tab && key_2.shift) return;
-										handler(input_0, key_2);
-									}, { isActive: active && isActive });
-								}
-							}), !inputValue && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
-								dimColor: true,
-								children: "Message Claw..."
-							})] }), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Box, { children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
-								color: "blue",
-								bold: true,
-								children: isSending ? "Sending" : "Claw"
-							}) })]
-						}), /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box, {
-							justifyContent: "space-between",
-							paddingY: 0,
-							children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Box, {
-								gap: 1,
-								children: ctrlCPending ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
-									color: "yellow",
-									children: "Press Ctrl+C again to exit"
-								}) : isSending ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
-									dimColor: true,
-									children: "waiting for response..."
-								}) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { children: " " })
-							}), /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box, {
-								gap: 3,
-								children: [/* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, {
-									dimColor: true,
-									children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
-										bold: true,
-										children: "ctrl+enter"
-									}), " newline"]
-								}), /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, {
-									dimColor: true,
-									children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
-										bold: true,
-										children: "enter"
-									}), " send"]
-								})]
-							})]
-						})]
+						children: "No messages yet. Send a message to start a conversation with Claw."
 					})
-				})
+				}) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, { children: (() => {
+					const startIndex = Math.max(0, messages.length - 100);
+					const visibleMessages = messages.slice(startIndex);
+					const hiddenCount = startIndex;
+					return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [hiddenCount > 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Box, {
+						paddingX: 2,
+						paddingY: 1,
+						children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, {
+							dimColor: true,
+							children: [
+								"─── ",
+								hiddenCount,
+								" older message",
+								hiddenCount === 1 ? "" : "s",
+								" not shown ───"
+							]
+						})
+					}), visibleMessages.map(_temp$1)] });
+				})() })
+			})
+		});
+		$[21] = messages;
+		$[22] = t13;
+	} else t13 = $[22];
+	let t14;
+	if ($[23] !== isWaitingForReply) {
+		t14 = isWaitingForReply && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box, {
+			paddingX: 2,
+			paddingY: 0,
+			gap: 1,
+			children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Spinner, {}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
+				dimColor: true,
+				children: "Claw is thinking"
+			})]
+		});
+		$[23] = isWaitingForReply;
+		$[24] = t14;
+	} else t14 = $[24];
+	let t15;
+	if ($[25] !== error) {
+		t15 = error && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Box, {
+			paddingX: 2,
+			marginBottom: 1,
+			children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
+				color: "red",
+				children: error
+			})
+		});
+		$[25] = error;
+		$[26] = t15;
+	} else t15 = $[26];
+	let t16;
+	if ($[27] === Symbol.for("react.memo_cache_sentinel")) {
+		t16 = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
+			color: "red",
+			dimColor: true,
+			children: "Input unavailable · Ctrl+C to exit"
+		});
+		$[27] = t16;
+	} else t16 = $[27];
+	let t17;
+	let t18;
+	if ($[28] === Symbol.for("react.memo_cache_sentinel")) {
+		t17 = () => scrollByClamped(-1);
+		t18 = () => scrollByClamped(1);
+		$[28] = t17;
+		$[29] = t18;
+	} else {
+		t17 = $[28];
+		t18 = $[29];
+	}
+	let t19;
+	if ($[30] !== handleSubmit || $[31] !== isActive || $[32] !== isSending) {
+		t19 = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Box, { children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(TextInput, {
+			placeholder: "Message Claw...",
+			rows: 1,
+			maxRows: 10,
+			onSubmit: handleSubmit,
+			onScrollUp: t17,
+			onScrollDown: t18,
+			isActive,
+			submitDisabled: isSending,
+			disableHistory: true
+		}) });
+		$[30] = handleSubmit;
+		$[31] = isActive;
+		$[32] = isSending;
+		$[33] = t19;
+	} else t19 = $[33];
+	const t20 = isSending ? "Sending" : "Claw";
+	let t21;
+	if ($[34] !== t20) {
+		t21 = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Box, { children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
+			color: "blue",
+			bold: true,
+			children: t20
+		}) });
+		$[34] = t20;
+		$[35] = t21;
+	} else t21 = $[35];
+	let t22;
+	if ($[36] !== t19 || $[37] !== t21 || $[38] !== theme.panelBackground) {
+		t22 = /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box, {
+			borderStyle: "bold",
+			borderColor: "blue",
+			borderLeft: true,
+			borderRight: false,
+			borderTop: false,
+			borderBottom: false,
+			flexDirection: "column",
+			paddingLeft: 2,
+			paddingRight: 2,
+			paddingY: 1,
+			marginBottom: 1,
+			backgroundColor: theme.panelBackground,
+			children: [t19, t21]
+		});
+		$[36] = t19;
+		$[37] = t21;
+		$[38] = theme.panelBackground;
+		$[39] = t22;
+	} else t22 = $[39];
+	let t23;
+	if ($[40] !== ctrlCPending || $[41] !== isSending) {
+		t23 = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Box, {
+			gap: 1,
+			children: ctrlCPending ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
+				color: "yellow",
+				children: "Press Ctrl+C again to exit"
+			}) : isSending ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
+				dimColor: true,
+				children: "waiting for response..."
+			}) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { children: " " })
+		});
+		$[40] = ctrlCPending;
+		$[41] = isSending;
+		$[42] = t23;
+	} else t23 = $[42];
+	let t24;
+	if ($[43] === Symbol.for("react.memo_cache_sentinel")) {
+		t24 = /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, {
+			dimColor: true,
+			children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
+				bold: true,
+				children: "ctrl+enter"
+			}), " newline"]
+		});
+		$[43] = t24;
+	} else t24 = $[43];
+	let t25;
+	if ($[44] === Symbol.for("react.memo_cache_sentinel")) {
+		t25 = /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box, {
+			gap: 3,
+			children: [t24, /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, {
+				dimColor: true,
+				children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
+					bold: true,
+					children: "enter"
+				}), " send"]
+			})]
+		});
+		$[44] = t25;
+	} else t25 = $[44];
+	let t26;
+	if ($[45] !== t23) {
+		t26 = /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box, {
+			justifyContent: "space-between",
+			paddingY: 0,
+			children: [t23, t25]
+		});
+		$[45] = t23;
+		$[46] = t26;
+	} else t26 = $[46];
+	let t27;
+	if ($[47] !== t22 || $[48] !== t26) {
+		t27 = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ErrorBoundary, {
+			fallback: t16,
+			children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box, {
+				flexDirection: "column",
+				marginY: 1,
+				children: [t22, t26]
+			})
+		});
+		$[47] = t22;
+		$[48] = t26;
+		$[49] = t27;
+	} else t27 = $[49];
+	let t28;
+	if ($[50] !== t13 || $[51] !== t14 || $[52] !== t15 || $[53] !== t27) {
+		t28 = /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box, {
+			flexDirection: "column",
+			flexGrow: 1,
+			paddingRight: 2,
+			children: [
+				t13,
+				t14,
+				t15,
+				t27
 			]
-		}), showSidebar && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ClawSidebar, {})]
-	});
+		});
+		$[50] = t13;
+		$[51] = t14;
+		$[52] = t15;
+		$[53] = t27;
+		$[54] = t28;
+	} else t28 = $[54];
+	let t29;
+	if ($[55] !== showSidebar) {
+		t29 = showSidebar && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ClawSidebar, {});
+		$[55] = showSidebar;
+		$[56] = t29;
+	} else t29 = $[56];
+	let t30;
+	if ($[57] !== t28 || $[58] !== t29) {
+		t30 = /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box, {
+			flexDirection: "row",
+			flexGrow: 1,
+			children: [t28, t29]
+		});
+		$[57] = t28;
+		$[58] = t29;
+		$[59] = t30;
+	} else t30 = $[59];
+	return t30;
 });
+function _temp$1(msg) {
+	return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ErrorBoundary, {
+		fallback: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Box, {
+			paddingX: 2,
+			children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
+				color: "red",
+				dimColor: true,
+				children: "[failed to render message]"
+			})
+		}),
+		children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ClawMessageView, { message: msg })
+	}, msg.id);
+}
 //#endregion
 //#region src/components/CodeCommand.tsx
 const TabBar = (0, import_react.memo)((t0) => {
@@ -600081,7 +600780,7 @@ function initSentry() {
 	init({
 		dsn: "https://1c5033d697e0271ebe53773bff826de0@o117565.ingest.us.sentry.io/4511107776905216",
 		tracesSampleRate: 0,
-		release: "0.3.5",
+		release: "0.3.8",
 		environment: process.env.NODE_ENV ?? "development",
 		enabled: false,
 		registerEsmLoaderHooks: false,
@@ -600105,7 +600804,7 @@ function isStandaloneBinary() {
 	return !path$6.basename(process.execPath, ".exe").startsWith("node");
 }
 function getCurrentVersion() {
-	return "0.3.5";
+	return "0.3.8";
 }
 async function fetchLatestVersion() {
 	return new Promise((resolve, reject) => {
@@ -600195,28 +600894,59 @@ async function selfUpdate(onProgress) {
 	const tarballUrl = `https://registry.npmjs.org/@builder.io/${pkgName}/-/${pkgName}-${latestVersion}.tgz`;
 	const tmpDir = createTempDir(path$6.dirname(process.execPath));
 	const tarballPath = path$6.join(tmpDir, "builder.tgz");
+	let activeRequest = null;
+	let activeChild = null;
+	const onSigint = () => {
+		activeRequest?.destroy();
+		activeChild?.kill();
+		try {
+			fs$20.rmSync(tmpDir, {
+				recursive: true,
+				force: true
+			});
+		} catch {}
+		onProgress("\nUpdate cancelled.");
+		process.exit(130);
+	};
+	process.on("SIGINT", onSigint);
 	try {
-		await downloadFile(tarballUrl, tarballPath);
+		await downloadFile(tarballUrl, tarballPath, (req) => {
+			activeRequest = req;
+		});
+		activeRequest = null;
 		onProgress("Installing...");
 		await new Promise((resolve, reject) => {
-			spawn("tar", [
+			const tar = spawn("tar", [
 				"-xzf",
 				tarballPath,
 				"-C",
 				tmpDir
-			], { stdio: "inherit" }).on("close", (code) => code === 0 ? resolve() : reject(/* @__PURE__ */ new Error(`tar exited with ${code}`)));
+			], { stdio: "inherit" });
+			activeChild = tar;
+			tar.on("close", (code) => {
+				activeChild = null;
+				code === 0 ? resolve() : reject(/* @__PURE__ */ new Error(`tar exited with ${code}`));
+			});
 		});
 		const binaryName = process.platform === "win32" ? "builder.exe" : "builder";
 		const extractedBinary = path$6.join(tmpDir, "package", binaryName);
 		if (!fs$20.existsSync(extractedBinary)) throw new Error(`Binary not found in tarball at ${extractedBinary}`);
 		fs$20.chmodSync(extractedBinary, 493);
 		atomicReplace(extractedBinary, process.execPath);
+		const rgName = process.platform === "win32" ? "rg.exe" : "rg";
+		const extractedRg = path$6.join(tmpDir, "package", rgName);
+		if (fs$20.existsSync(extractedRg)) {
+			const destRg = path$6.join(path$6.dirname(process.execPath), rgName);
+			fs$20.chmodSync(extractedRg, 493);
+			atomicReplace(extractedRg, destRg);
+		}
 		writeUpdateCheck({
 			checkedAt: (/* @__PURE__ */ new Date()).toISOString(),
 			latestVersion
 		});
 		onProgress(`Updated to ${latestVersion}. Restart builder to apply.`);
 	} finally {
+		process.off("SIGINT", onSigint);
 		fs$20.rmSync(tmpDir, {
 			recursive: true,
 			force: true
@@ -600245,11 +600975,11 @@ function atomicReplace(source, dest) {
 		} else throw err;
 	}
 }
-async function downloadFile(url, dest) {
+async function downloadFile(url, dest, onRequest) {
 	return new Promise((resolve, reject) => {
 		const file = fs$20.createWriteStream(dest);
 		const request = (targetUrl) => {
-			https$4.get(targetUrl, (res) => {
+			const req = https$4.get(targetUrl, (res) => {
 				if (res.statusCode === 301 || res.statusCode === 302) {
 					const location = res.headers.location;
 					if (!location) {
@@ -600259,10 +600989,11 @@ async function downloadFile(url, dest) {
 					res.resume();
 					file.close();
 					const newFile = fs$20.createWriteStream(dest);
-					https$4.get(location, (r) => {
+					const redirectReq = https$4.get(location, (r) => {
 						r.pipe(newFile);
 						newFile.on("finish", () => newFile.close(() => resolve()));
 					}).on("error", reject);
+					onRequest?.(redirectReq);
 					return;
 				}
 				if (res.statusCode !== 200) {
@@ -600275,13 +601006,14 @@ async function downloadFile(url, dest) {
 				fs$20.unlink(dest, () => {});
 				reject(err);
 			});
+			onRequest?.(req);
 		};
 		request(url);
 	});
 }
 //#endregion
 //#region src/cli.tsx
-const VERSION = "0.3.5";
+const VERSION = "0.3.8";
 async function startInk(command, options) {
 	await render(/* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, {
 		command,
@@ -600294,8 +601026,9 @@ async function startInk(command, options) {
 	}), {
 		exitOnCtrlC: false,
 		incrementalRendering: true,
-		maxFps: 15,
-		patchConsole: true
+		maxFps: 30,
+		patchConsole: true,
+		concurrent: true
 	}).waitUntilExit();
 	await flush(2e3);
 }