@oh-my-pi/pi-coding-agent 15.9.3 → 15.9.67

package/src/tool-discovery/mode.ts

@@ -0,0 +1,24 @@
+import type { Settings } from "../config/settings";
+import type { SettingValue } from "../config/settings-schema";
+
+export const TOOL_DISCOVERY_AUTO_THRESHOLD = 40;
+export const TOOL_DISCOVERY_SEARCH_TOOL_NAME = "search_tool_bm25";
+
+export type ToolDiscoveryModeSetting = SettingValue<"tools.discoveryMode">;
+export type EffectiveToolDiscoveryMode = Exclude<ToolDiscoveryModeSetting, "auto">;
+
+export function countToolsForAutoDiscovery(toolNames: Iterable<string>): number {
+	let count = 0;
+	for (const name of toolNames) {
+		if (name !== TOOL_DISCOVERY_SEARCH_TOOL_NAME) count++;
+	}
+	return count;
+}
+
+export function resolveEffectiveToolDiscoveryMode(settings: Settings, toolCount: number): EffectiveToolDiscoveryMode {
+	const configuredMode = settings.get("tools.discoveryMode");
+	if (configuredMode === "all" || configuredMode === "mcp-only") return configuredMode;
+	if (settings.get("mcp.discoveryMode")) return "mcp-only";
+	if (configuredMode === "auto" && toolCount > TOOL_DISCOVERY_AUTO_THRESHOLD) return "mcp-only";
+	return "off";
+}

package/src/tools/archive-reader.ts

@@ -1,10 +1,6 @@
-import { ToolError } from "./tool-errors";
+import { inflateSync, strFromU8 } from "fflate";
 
-let fflateModulePromise: Promise<typeof import("fflate")> | undefined;
-async function loadFflate(): Promise<typeof import("fflate")> {
-	if (!fflateModulePromise) fflateModulePromise = import("fflate");
-	return fflateModulePromise;
-}
+import { ToolError } from "./tool-errors";
 
 export type ArchiveFormat = "zip" | "tar" | "tar.gz";
 
@@ -35,7 +31,11 @@ interface TarStorage {
 
 interface ZipStorage {
 	type: "zip";
-	bytes: Uint8Array;
+	archivePath: string;
+	compressedSize: number;
+	compression: number;
+	flags: number;
+	localHeaderOffset: number;
 }
 
 type EntryStorage = TarStorage | ZipStorage;
@@ -123,6 +123,321 @@ function getArchiveFormatFromPath(filePath: string): ArchiveFormat | undefined {
 	return undefined;
 }
 
+const ZIP_LOCAL_FILE_HEADER_SIGNATURE = 0x04034b50;
+const ZIP_CENTRAL_DIRECTORY_HEADER_SIGNATURE = 0x02014b50;
+const ZIP64_EOCD_SIGNATURE = 0x06064b50;
+const ZIP64_EOCD_LOCATOR_SIGNATURE = 0x07064b50;
+const ZIP_EOCD_SIGNATURE = 0x06054b50;
+const ZIP_EOCD_MIN_LENGTH = 22;
+const ZIP_EOCD_MAX_COMMENT_LENGTH = 0xffff;
+const ZIP64_EOCD_LOCATOR_LENGTH = 20;
+const ZIP_STORED_COMPRESSION = 0;
+const ZIP_DEFLATE_COMPRESSION = 8;
+const ZIP_UTF8_FLAG = 0x0800;
+const ZIP_ENCRYPTED_FLAG = 0x0001;
+const ZIP_UINT16_MAX = 0xffff;
+const ZIP_UINT32_MAX = 0xffffffff;
+const ZIP_UINT32_RANGE = 0x100000000;
+
+interface ZipCentralDirectoryInfo {
+	entries: number;
+	offset: number;
+	size: number;
+}
+
+interface Zip64EntryValues {
+	compressedSize: number;
+	uncompressedSize: number;
+	localHeaderOffset: number;
+	diskStart: number;
+}
+
+interface Zip64EntryPlaceholders {
+	compressedSize: boolean;
+	uncompressedSize: boolean;
+	localHeaderOffset: boolean;
+	diskStart: boolean;
+}
+
+function readUInt16LE(bytes: Uint8Array, offset: number): number {
+	return bytes[offset]! | (bytes[offset + 1]! << 8);
+}
+
+function readUInt32LE(bytes: Uint8Array, offset: number): number {
+	return (bytes[offset]! | (bytes[offset + 1]! << 8) | (bytes[offset + 2]! << 16) | (bytes[offset + 3]! << 24)) >>> 0;
+}
+
+function readUInt64LEAsNumber(bytes: Uint8Array, offset: number): number {
+	const value = readUInt32LE(bytes, offset) + readUInt32LE(bytes, offset + 4) * ZIP_UINT32_RANGE;
+	if (!Number.isSafeInteger(value)) {
+		throw new ToolError("ZIP archive uses offsets or sizes too large to read safely");
+	}
+	return value;
+}
+
+async function readZipRange(filePath: string, start: number, end: number): Promise<Uint8Array> {
+	if (!Number.isSafeInteger(start) || !Number.isSafeInteger(end) || start < 0 || end < start) {
+		throw new ToolError("Invalid ZIP archive range");
+	}
+
+	const bytes = await Bun.file(filePath).slice(start, end).bytes();
+	if (bytes.byteLength !== end - start) {
+		throw new ToolError("Invalid ZIP archive: truncated data");
+	}
+	return bytes;
+}
+
+function findEndOfCentralDirectory(tail: Uint8Array): number {
+	for (let offset = tail.byteLength - ZIP_EOCD_MIN_LENGTH; offset >= 0; offset--) {
+		if (readUInt32LE(tail, offset) !== ZIP_EOCD_SIGNATURE) continue;
+		const commentLength = readUInt16LE(tail, offset + 20);
+		if (offset + ZIP_EOCD_MIN_LENGTH + commentLength === tail.byteLength) return offset;
+	}
+
+	throw new ToolError("Invalid ZIP archive: missing end of central directory");
+}
+
+async function readZip64CentralDirectoryInfo(
+	filePath: string,
+	tail: Uint8Array,
+	tailStart: number,
+	eocdOffset: number,
+): Promise<ZipCentralDirectoryInfo | undefined> {
+	const locatorOffset = eocdOffset - ZIP64_EOCD_LOCATOR_LENGTH;
+	if (locatorOffset < 0) return undefined;
+
+	const locator =
+		locatorOffset >= tailStart
+			? tail.subarray(locatorOffset - tailStart, locatorOffset - tailStart + ZIP64_EOCD_LOCATOR_LENGTH)
+			: await readZipRange(filePath, locatorOffset, eocdOffset);
+	if (readUInt32LE(locator, 0) !== ZIP64_EOCD_LOCATOR_SIGNATURE) return undefined;
+
+	const zip64EocdDisk = readUInt32LE(locator, 4);
+	const zip64EocdOffset = readUInt64LEAsNumber(locator, 8);
+	const totalDisks = readUInt32LE(locator, 16);
+	if (zip64EocdDisk !== 0 || totalDisks > 1) {
+		throw new ToolError("Multi-disk ZIP archives are not supported");
+	}
+
+	const record = await readZipRange(filePath, zip64EocdOffset, zip64EocdOffset + 56);
+	if (readUInt32LE(record, 0) !== ZIP64_EOCD_SIGNATURE) {
+		throw new ToolError("Invalid ZIP archive: missing ZIP64 end of central directory");
+	}
+	if (readUInt32LE(record, 16) !== 0 || readUInt32LE(record, 20) !== 0) {
+		throw new ToolError("Multi-disk ZIP archives are not supported");
+	}
+
+	return {
+		entries: readUInt64LEAsNumber(record, 32),
+		size: readUInt64LEAsNumber(record, 40),
+		offset: readUInt64LEAsNumber(record, 48),
+	};
+}
+
+async function readZipCentralDirectoryInfo(filePath: string, fileSize: number): Promise<ZipCentralDirectoryInfo> {
+	if (fileSize < ZIP_EOCD_MIN_LENGTH) {
+		throw new ToolError("Invalid ZIP archive: missing end of central directory");
+	}
+
+	const tailLength = Math.min(fileSize, ZIP_EOCD_MIN_LENGTH + ZIP_EOCD_MAX_COMMENT_LENGTH);
+	const tailStart = fileSize - tailLength;
+	const tail = await readZipRange(filePath, tailStart, fileSize);
+	const eocdIndex = findEndOfCentralDirectory(tail);
+	const eocdOffset = tailStart + eocdIndex;
+
+	if (readUInt16LE(tail, eocdIndex + 4) !== 0 || readUInt16LE(tail, eocdIndex + 6) !== 0) {
+		throw new ToolError("Multi-disk ZIP archives are not supported");
+	}
+
+	let entries = readUInt16LE(tail, eocdIndex + 10);
+	let size = readUInt32LE(tail, eocdIndex + 12);
+	let offset = readUInt32LE(tail, eocdIndex + 16);
+	const needsZip64 = entries === ZIP_UINT16_MAX || size === ZIP_UINT32_MAX || offset === ZIP_UINT32_MAX;
+	const zip64Info = await readZip64CentralDirectoryInfo(filePath, tail, tailStart, eocdOffset);
+	if (zip64Info) {
+		({ entries, size, offset } = zip64Info);
+	} else if (needsZip64) {
+		throw new ToolError("Invalid ZIP archive: missing ZIP64 central directory metadata");
+	}
+
+	if (offset + size > fileSize) {
+		throw new ToolError("Invalid ZIP archive: central directory exceeds file size");
+	}
+
+	return { entries, offset, size };
+}
+
+function readZip64EntryValues(
+	extra: Uint8Array,
+	placeholders: Zip64EntryPlaceholders,
+	current: Zip64EntryValues,
+): Zip64EntryValues {
+	if (
+		!placeholders.compressedSize &&
+		!placeholders.uncompressedSize &&
+		!placeholders.localHeaderOffset &&
+		!placeholders.diskStart
+	) {
+		return current;
+	}
+
+	let offset = 0;
+	while (offset + 4 <= extra.byteLength) {
+		const headerId = readUInt16LE(extra, offset);
+		const dataSize = readUInt16LE(extra, offset + 2);
+		const dataStart = offset + 4;
+		const dataEnd = dataStart + dataSize;
+		if (dataEnd > extra.byteLength) {
+			throw new ToolError("Invalid ZIP archive: malformed extra field");
+		}
+
+		if (headerId === 0x0001) {
+			let cursor = dataStart;
+			let uncompressedSize = current.uncompressedSize;
+			let compressedSize = current.compressedSize;
+			let localHeaderOffset = current.localHeaderOffset;
+			let diskStart = current.diskStart;
+
+			if (placeholders.uncompressedSize) {
+				if (cursor + 8 > dataEnd) throw new ToolError("Invalid ZIP archive: malformed ZIP64 extra field");
+				uncompressedSize = readUInt64LEAsNumber(extra, cursor);
+				cursor += 8;
+			}
+			if (placeholders.compressedSize) {
+				if (cursor + 8 > dataEnd) throw new ToolError("Invalid ZIP archive: malformed ZIP64 extra field");
+				compressedSize = readUInt64LEAsNumber(extra, cursor);
+				cursor += 8;
+			}
+			if (placeholders.localHeaderOffset) {
+				if (cursor + 8 > dataEnd) throw new ToolError("Invalid ZIP archive: malformed ZIP64 extra field");
+				localHeaderOffset = readUInt64LEAsNumber(extra, cursor);
+				cursor += 8;
+			}
+			if (placeholders.diskStart) {
+				if (cursor + 4 > dataEnd) throw new ToolError("Invalid ZIP archive: malformed ZIP64 extra field");
+				diskStart = readUInt32LE(extra, cursor);
+			}
+
+			return { compressedSize, uncompressedSize, localHeaderOffset, diskStart };
+		}
+
+		offset = dataEnd;
+	}
+
+	throw new ToolError("Invalid ZIP archive: missing ZIP64 extra field");
+}
+
+function parseZipCentralDirectory(
+	filePath: string,
+	centralDirectory: Uint8Array,
+	expectedEntries: number,
+): ArchiveIndexEntry[] {
+	const entries: ArchiveIndexEntry[] = [];
+	let offset = 0;
+
+	for (let index = 0; index < expectedEntries; index++) {
+		if (offset + 46 > centralDirectory.byteLength) {
+			throw new ToolError("Invalid ZIP archive: truncated central directory");
+		}
+		if (readUInt32LE(centralDirectory, offset) !== ZIP_CENTRAL_DIRECTORY_HEADER_SIGNATURE) {
+			throw new ToolError("Invalid ZIP archive: malformed central directory");
+		}
+
+		const flags = readUInt16LE(centralDirectory, offset + 8);
+		const compression = readUInt16LE(centralDirectory, offset + 10);
+		const compressedSizeRaw = readUInt32LE(centralDirectory, offset + 20);
+		const uncompressedSizeRaw = readUInt32LE(centralDirectory, offset + 24);
+		const fileNameLength = readUInt16LE(centralDirectory, offset + 28);
+		const extraLength = readUInt16LE(centralDirectory, offset + 30);
+		const commentLength = readUInt16LE(centralDirectory, offset + 32);
+		const diskStartRaw = readUInt16LE(centralDirectory, offset + 34);
+		const localHeaderOffsetRaw = readUInt32LE(centralDirectory, offset + 42);
+		const nameStart = offset + 46;
+		const extraStart = nameStart + fileNameLength;
+		const entryEnd = extraStart + extraLength + commentLength;
+		if (entryEnd > centralDirectory.byteLength) {
+			throw new ToolError("Invalid ZIP archive: truncated central directory entry");
+		}
+
+		const rawPath = strFromU8(centralDirectory.subarray(nameStart, extraStart), (flags & ZIP_UTF8_FLAG) === 0);
+		const normalizedPath = normalizeArchiveEntryPath(rawPath);
+		if (normalizedPath) {
+			const values = readZip64EntryValues(
+				centralDirectory.subarray(extraStart, extraStart + extraLength),
+				{
+					compressedSize: compressedSizeRaw === ZIP_UINT32_MAX,
+					uncompressedSize: uncompressedSizeRaw === ZIP_UINT32_MAX,
+					localHeaderOffset: localHeaderOffsetRaw === ZIP_UINT32_MAX,
+					diskStart: diskStartRaw === ZIP_UINT16_MAX,
+				},
+				{
+					compressedSize: compressedSizeRaw,
+					uncompressedSize: uncompressedSizeRaw,
+					localHeaderOffset: localHeaderOffsetRaw,
+					diskStart: diskStartRaw,
+				},
+			);
+			if (values.diskStart !== 0) {
+				throw new ToolError("Multi-disk ZIP archives are not supported");
+			}
+
+			const isDirectory = isArchiveDirectoryName(rawPath);
+			entries.push({
+				path: normalizedPath,
+				isDirectory,
+				size: isDirectory ? 0 : values.uncompressedSize,
+				storage: isDirectory
+					? undefined
+					: {
+							type: "zip",
+							archivePath: filePath,
+							compressedSize: values.compressedSize,
+							compression,
+							flags,
+							localHeaderOffset: values.localHeaderOffset,
+						},
+			});
+		}
+
+		offset = entryEnd;
+	}
+
+	return entries;
+}
+
+async function readZipFileBytes(storage: ZipStorage, uncompressedSize: number): Promise<Uint8Array> {
+	if ((storage.flags & ZIP_ENCRYPTED_FLAG) !== 0) {
+		throw new ToolError("Encrypted ZIP entries are not supported");
+	}
+
+	const localHeader = await readZipRange(
+		storage.archivePath,
+		storage.localHeaderOffset,
+		storage.localHeaderOffset + 30,
+	);
+	if (readUInt32LE(localHeader, 0) !== ZIP_LOCAL_FILE_HEADER_SIGNATURE) {
+		throw new ToolError("Invalid ZIP archive: malformed local file header");
+	}
+
+	const fileNameLength = readUInt16LE(localHeader, 26);
+	const extraLength = readUInt16LE(localHeader, 28);
+	const dataStart = storage.localHeaderOffset + 30 + fileNameLength + extraLength;
+	const compressedBytes = await readZipRange(storage.archivePath, dataStart, dataStart + storage.compressedSize);
+
+	if (storage.compression === ZIP_STORED_COMPRESSION) {
+		return compressedBytes;
+	}
+	if (storage.compression !== ZIP_DEFLATE_COMPRESSION) {
+		throw new ToolError(`Unsupported ZIP compression method: ${storage.compression}`);
+	}
+
+	try {
+		return inflateSync(compressedBytes, { out: new Uint8Array(uncompressedSize) });
+	} catch (error) {
+		throw new ToolError(error instanceof Error ? error.message : String(error));
+	}
+}
+
 async function readTarEntries(bytes: Uint8Array): Promise<ArchiveIndexEntry[]> {
 	let archive: Bun.Archive;
 	try {
@@ -155,29 +470,19 @@ async function readTarEntries(bytes: Uint8Array): Promise<ArchiveIndexEntry[]> {
 	return entries;
 }
 
-async function readZipEntries(bytes: Uint8Array): Promise<ArchiveIndexEntry[]> {
-	const { unzipSync } = await loadFflate();
-	let files: Record<string, Uint8Array>;
-	try {
-		files = unzipSync(bytes);
-	} catch (error) {
-		throw new ToolError(error instanceof Error ? error.message : String(error));
+async function readZipEntries(filePath: string): Promise<ArchiveIndexEntry[]> {
+	const fileSize = Bun.file(filePath).size;
+	if (!Number.isSafeInteger(fileSize)) {
+		throw new ToolError("ZIP archive is too large to read safely");
 	}
 
-	const entries: ArchiveIndexEntry[] = [];
-	for (const [rawPath, fileBytes] of Object.entries(files)) {
-		const normalizedPath = normalizeArchiveEntryPath(rawPath);
-		if (!normalizedPath) continue;
-		const isDirectory = isArchiveDirectoryName(rawPath);
-		entries.push({
-			path: normalizedPath,
-			isDirectory,
-			size: isDirectory ? 0 : fileBytes.byteLength,
-			storage: isDirectory ? undefined : { type: "zip", bytes: fileBytes },
-		});
-	}
-
-	return entries;
+	const directoryInfo = await readZipCentralDirectoryInfo(filePath, fileSize);
+	const centralDirectory = await readZipRange(
+		filePath,
+		directoryInfo.offset,
+		directoryInfo.offset + directoryInfo.size,
+	);
+	return parseZipCentralDirectory(filePath, centralDirectory, directoryInfo.entries);
 }
 
 export function parseArchivePathCandidates(filePath: string): ArchivePathCandidate[] {
@@ -297,7 +602,10 @@ export class ArchiveReader {
 			throw new ToolError(`Archive file '${normalizedPath}' has no readable storage`);
 		}
 
-		const bytes = entry.storage.type === "tar" ? await entry.storage.file.bytes() : entry.storage.bytes;
+		const bytes =
+			entry.storage.type === "tar"
+				? await entry.storage.file.bytes()
+				: await readZipFileBytes(entry.storage, entry.size);
 
 		return {
 			path: entry.path,
@@ -315,7 +623,7 @@ export async function openArchive(filePath: string): Promise<ArchiveReader> {
 		throw new ToolError(`Unsupported archive format: ${filePath}`);
 	}
 
-	const bytes = await Bun.file(filePath).bytes();
-	const entries = format === "zip" ? await readZipEntries(bytes) : await readTarEntries(bytes);
+	const entries =
+		format === "zip" ? await readZipEntries(filePath) : await readTarEntries(await Bun.file(filePath).bytes());
 	return new ArchiveReader(format, entries);
 }

package/src/tools/bash.ts

@@ -20,7 +20,7 @@ import bashDescription from "../prompts/tools/bash.md" with { type: "text" };
 import type { ClientBridgeTerminalExitStatus, ClientBridgeTerminalOutput } from "../session/client-bridge";
 import { DEFAULT_MAX_BYTES, streamTailUpdates, TailBuffer } from "../session/streaming-output";
 import { renderStatusLine } from "../tui";
-import { CachedOutputBlock } from "../tui/output-block";
+import { CachedOutputBlock, markFramedBlockComponent } from "../tui/output-block";
 import { getSixelLineMask } from "../utils/sixel";
 import type { ToolSession } from ".";
 import { truncateForPrompt } from "./approval";
@@ -31,7 +31,7 @@ import { canUseInteractiveBashPty } from "./bash-pty-selection";
 import { expandInternalUrls, type InternalUrlExpansionOptions } from "./bash-skill-urls";
 import { formatStyledTruncationWarning, type OutputMeta, stripOutputNotice } from "./output-meta";
 import { resolveToCwd } from "./path-utils";
-import { formatToolWorkingDirectory, replaceTabs } from "./render-utils";
+import { capPreviewLines, formatToolWorkingDirectory, replaceTabs } from "./render-utils";
 import { ToolAbortError, ToolError } from "./tool-errors";
 import { toolResult } from "./tool-result";
 import { clampTimeout, TOOL_TIMEOUTS } from "./tool-timeouts";
@@ -1083,16 +1083,22 @@ export function createShellRenderer<TArgs>(config: ShellRendererConfig<TArgs>) {
 			const cmdLines = formatBashCommandLines(renderArgs, uiTheme);
 			const header = renderStatusLine({ icon: "pending", title }, uiTheme);
 			const outputBlock = new CachedOutputBlock();
-			return {
+			return markFramedBlockComponent({
 				render: (width: number): string[] =>
 					outputBlock.render(
-						{ header, state: "pending", sections: [{ lines: cmdLines }], width, animate: true },
+						{
+							header,
+							state: "pending",
+							sections: [{ lines: capPreviewLines(cmdLines, uiTheme, { expanded: options.expanded }) }],
+							width,
+							animate: true,
+						},
 						uiTheme,
 					),
 				invalidate: () => {
 					outputBlock.invalidate();
 				},
-			};
+			});
 		},
 
 		renderResult(
@@ -1114,7 +1120,7 @@ export function createShellRenderer<TArgs>(config: ShellRendererConfig<TArgs>) {
 			const details = result.details;
 			const outputBlock = new CachedOutputBlock();
 
-			return {
+			return markFramedBlockComponent({
 				render: (width: number): string[] => {
 					// REACTIVE: read mutable options at render time
 					const { renderContext } = options;
@@ -1201,7 +1207,11 @@ export function createShellRenderer<TArgs>(config: ShellRendererConfig<TArgs>) {
 							header,
 							state: options.isPartial ? "pending" : isError ? "error" : "success",
 							sections: [
-								{ lines: cmdLines ?? [] },
+								{
+									lines: options.isPartial
+										? capPreviewLines(cmdLines ?? [], uiTheme, { expanded })
+										: (cmdLines ?? []),
+								},
 								{ label: uiTheme.fg("toolTitle", "Output"), lines: outputLines },
 							],
 							width,
@@ -1213,7 +1223,7 @@ export function createShellRenderer<TArgs>(config: ShellRendererConfig<TArgs>) {
 				invalidate: () => {
 					outputBlock.invalidate();
 				},
-			};
+			});
 		},
 		mergeCallAndResult: true,
 		inline: true,

package/src/tools/browser/render.ts

@@ -9,7 +9,7 @@ import type { Component } from "@oh-my-pi/pi-tui";
 import { Text } from "@oh-my-pi/pi-tui";
 import type { RenderResultOptions } from "../../extensibility/custom-tools/types";
 import type { Theme } from "../../modes/theme/theme";
-import { Hasher, renderCodeCell, renderStatusLine } from "../../tui";
+import { Hasher, isFramedBlockComponent, markFramedBlockComponent, renderCodeCell, renderStatusLine } from "../../tui";
 import type { BrowserToolDetails } from "../browser";
 import { formatStyledTruncationWarning, stripOutputNotice } from "../output-meta";
 import { replaceTabs, shortenPath } from "../render-utils";
@@ -65,13 +65,14 @@ function dropTrailingBlankLines(text: string): string {
 
 function appendLine(component: Component, line: string | undefined): Component {
 	if (!line) return component;
-	return {
+	const wrapped = {
 		render: (width: number): string[] => {
 			const base = component.render(width);
 			return [...base, line];
 		},
 		invalidate: () => component.invalidate?.(),
 	};
+	return isFramedBlockComponent(component) ? markFramedBlockComponent(wrapped) : wrapped;
 }
 
 function renderRunCell(
@@ -93,7 +94,7 @@ function renderRunCell(
 	const title = titleParts.join(" · ");
 
 	let cached: { key: bigint; width: number; lines: string[] } | undefined;
-	return {
+	return markFramedBlockComponent({
 		render: (width: number): string[] => {
 			const expanded = options.renderContext?.expanded ?? options.expanded;
 			const previewLines = options.renderContext?.previewLines ?? BROWSER_DEFAULT_PREVIEW_LINES;
@@ -131,7 +132,7 @@ function renderRunCell(
 		invalidate: () => {
 			cached = undefined;
 		},
-	};
+	});
 }
 
 function renderOpenOrCloseLine(

package/src/tools/debug.ts

@@ -36,7 +36,7 @@ import {
 import type { Theme } from "../modes/theme/theme";
 import debugDescription from "../prompts/tools/debug.md" with { type: "text" };
 import { renderStatusLine } from "../tui";
-import { CachedOutputBlock } from "../tui/output-block";
+import { CachedOutputBlock, markFramedBlockComponent } from "../tui/output-block";
 import type { ToolSession } from ".";
 import { truncateForPrompt } from "./approval";
 import type { OutputMeta } from "./output-meta";
@@ -581,7 +581,7 @@ export const debugToolRenderer = {
 		args?: DebugRenderArgs,
 	): Component {
 		const outputBlock = new CachedOutputBlock();
-		return {
+		return markFramedBlockComponent({
 			render(width: number): string[] {
 				const action = (args?.action ?? result.details?.action ?? "debug").replaceAll("_", " ");
 				const status = options.isPartial ? "running" : result.isError ? "error" : "success";
@@ -620,7 +620,7 @@ export const debugToolRenderer = {
 			invalidate() {
 				outputBlock.invalidate();
 			},
-		};
+		});
 	},
 	mergeCallAndResult: true,
 	inline: true,

package/src/tools/eval-render.ts

@@ -18,7 +18,7 @@ import { formatContextUsage } from "../modes/components/status-line/context-thre
 import { truncateToVisualLines } from "../modes/components/visual-truncate";
 import { shimmerEnabled } from "../modes/theme/shimmer";
 import { getMarkdownTheme, type Theme } from "../modes/theme/theme";
-import { borderShimmerTick, renderCodeCell } from "../tui";
+import { borderShimmerTick, markFramedBlockComponent, renderCodeCell } from "../tui";
 import {
 	JSON_TREE_MAX_DEPTH_COLLAPSED,
 	JSON_TREE_MAX_DEPTH_EXPANDED,
@@ -39,8 +39,15 @@ import {
 	truncateToWidth,
 	wrapBrackets,
 } from "./render-utils";
-
 export const EVAL_DEFAULT_PREVIEW_LINES = 10;
+/**
+ * Rows of source kept in the *pending* eval preview. The window follows the
+ * streaming edge (newest lines pinned to the bottom) so you can watch the code
+ * being written, while staying bounded — a volatile tool block taller than the
+ * viewport would otherwise strand its scrolled-off head out of native scrollback
+ * on ED3-risk terminals. Matches the streaming windows used by edit/write.
+ */
+export const EVAL_STREAMING_PREVIEW_LINES = 12;
 
 function languageForHighlighter(language: EvalLanguage | undefined): "python" | "javascript" {
 	return language === "js" ? "javascript" : "python";
@@ -490,10 +497,10 @@ export const evalToolRenderer = {
 
 		let cached: { key: string; width: number; result: string[] } | undefined;
 
-		return {
+		return markFramedBlockComponent({
 			render: (width: number): string[] => {
 				const animate = options.isPartial && shimmerEnabled();
-				const key = `${animate ? borderShimmerTick() : 0}|${cells.map(c => `${c.language}:${c.title ?? ""}:${c.code.length}`).join("|")}`;
+				const key = `${animate ? borderShimmerTick() : 0}|${options.expanded ? 1 : 0}|${cells.map(c => `${c.language}:${c.title ?? ""}:${c.code.length}`).join("|")}`;
 				if (cached && cached.key === key && cached.width === width) {
 					return cached.result;
 				}
@@ -510,8 +517,16 @@ export const evalToolRenderer = {
 							title: cell.title,
 							status: "pending",
 							width,
-							codeMaxLines: EVAL_DEFAULT_PREVIEW_LINES,
-							expanded: true,
+							codeMaxLines: EVAL_STREAMING_PREVIEW_LINES,
+							// Follow the streaming edge with a bounded tail window so the
+							// newest source stays visible as it is written, instead of
+							// rendering every line of a >100-line `code` — which would
+							// overflow the viewport and, because a tool block is volatile
+							// (it collapses to a capped result), strand its scrolled-off head
+							// out of native scrollback, cutting the box top. `Ctrl+O` lifts
+							// the window via `expanded` for a deliberate full view.
+							codeTail: true,
+							expanded: options.expanded,
 							animate,
 						},
 						uiTheme,
@@ -527,7 +542,7 @@ export const evalToolRenderer = {
 			invalidate: () => {
 				cached = undefined;
 			},
-		};
+		});
 	},
 
 	renderResult(
@@ -571,7 +586,7 @@ export const evalToolRenderer = {
 		if (cellResults && cellResults.length > 0) {
 			let cached: { key: string; width: number; result: string[] } | undefined;
 
-			return {
+			return markFramedBlockComponent({
 				render: (width: number): string[] => {
 					const expanded = options.renderContext?.expanded ?? options.expanded;
 					const previewLines = options.renderContext?.previewLines ?? EVAL_DEFAULT_PREVIEW_LINES;
@@ -649,7 +664,7 @@ export const evalToolRenderer = {
 				invalidate: () => {
 					cached = undefined;
 				},
-			};
+			});
 		}
 
 		const displayOutput = output;