@oh-my-pi/pi-coding-agent 16.1.15 → 16.1.17

package/src/cli/gallery-fixtures/shell.ts

@@ -59,31 +59,23 @@ export const shellFixtures: Record<string, GalleryFixture> = {
 	eval: {
 		label: "Eval",
 		streamingArgs: {
-			cells: [
-				{
-					language: "py",
-					code: 'import json\nfrom pathlib import Path\n\ndata = json.loads(Path("package.js',
-					title: "load config",
-				},
-			],
+			language: "py",
+			code: 'import json\nfrom pathlib import Path\n\ndata = json.loads(Path("package.js',
+			title: "load config",
 		},
 		args: {
-			cells: [
-				{
-					language: "py",
-					title: "load config",
-					code: [
-						"import json",
-						"from pathlib import Path",
-						"",
-						'data = json.loads(Path("package.json").read_text())',
-						'deps = data.get("dependencies", {})',
-						'print(f"{data[\\"name\\"]} v{data[\\"version\\"]}")',
-						'print(f"{len(deps)} dependencies")',
-						"display(sorted(deps)[:3])",
-					].join("\n"),
-				},
-			],
+			language: "py",
+			title: "load config",
+			code: [
+				"import json",
+				"from pathlib import Path",
+				"",
+				'data = json.loads(Path("package.json").read_text())',
+				'deps = data.get("dependencies", {})',
+				'print(f"{data[\\"name\\"]} v{data[\\"version\\"]}")',
+				'print(f"{len(deps)} dependencies")',
+				"display(sorted(deps)[:3])",
+			].join("\n"),
 		},
 		result: {
 			content: [

package/src/cli/profile-alias.ts

@@ -198,37 +198,68 @@ export function resolveProfileAliasCommandFromProcess(
 	if (!runtime || !script || !/\.[cm]?[jt]s$/.test(script)) return DEFAULT_ALIAS_COMMAND;
 
 	const scriptPath = path.resolve(cwd, script);
-	const posix = `${quoteForShell(runtime)} ${quoteForShell(scriptPath)}`;
+	// Normalize to forward slashes for POSIX shell fields — bash/zsh/fish
+	// can't resolve backslash-separated paths, even on Windows (Git Bash, WSL).
+	const posixScriptPath = scriptPath.replace(/\\/g, "/");
+	const posixRuntime = runtime.replace(/\\/g, "/");
+	const posix = `${quoteForShell(posixRuntime)} ${quoteForShell(posixScriptPath)}`;
 	return {
-		display: `${runtime} ${scriptPath}`,
+		display: `${posixRuntime} ${posixScriptPath}`,
 		posix,
 		fish: posix,
 		powerShell: `${quoteForPowerShell(runtime)} ${quoteForPowerShell(scriptPath)}`,
 	};
 }
 
+/** Normalize backslashes to forward slashes for POSIX-shell paths.
+ *  path.posix.join only adds / separators — it preserves existing backslashes
+ *  in input segments like homeDir ("C:\Users\me"), producing mixed paths.
+ *  Windows UNC paths (\\server\share) become //server/share — path.posix.join
+ *  would collapse the leading // to /, so we restore it after joining. */
+function toPosix(p: string): string {
+	return p.replace(/\\/g, "/");
+}
+
+/** Like path.posix.join, but preserves leading // (UNC roots) which
+ *  path.posix.join collapses to a single /. */
+function posixJoinUnc(...segments: string[]): string {
+	const joined = path.posix.join(...segments);
+	// path.posix.join normalizes // at the start to /, breaking UNC roots.
+	// Restore it if any input segment started with // (a toPosix'd UNC path).
+	if (segments.some(s => s.startsWith("//") && !s.startsWith("///"))) {
+		return `/${joined}`;
+	}
+	return joined;
+}
+
 function resolveShellConfigPath(
 	shell: ProfileAliasShell,
 	homeDir: string,
 	platform: NodeJS.Platform,
 	env: NodeJS.ProcessEnv,
 ): string {
+	// POSIX shells (bash/zsh/fish) always need forward-slash config paths,
+	// even on Windows. path.posix.join adds / separators but preserves existing
+	// backslashes in input segments, so we normalize each component with toPosix.
+	// PowerShell profiles use the platform-native path.join (backslashes on
+	// Windows, forward slashes elsewhere).
+	const posixHome = toPosix(homeDir);
 	switch (shell) {
 		case "zsh":
-			return path.join(env.ZDOTDIR || homeDir, ".zshrc");
+			return posixJoinUnc(env.ZDOTDIR ? toPosix(env.ZDOTDIR) : posixHome, ".zshrc");
 		case "bash":
-			return platform === "darwin" ? path.join(homeDir, ".bash_profile") : path.join(homeDir, ".bashrc");
+			return platform === "darwin" ? posixJoinUnc(posixHome, ".bash_profile") : posixJoinUnc(posixHome, ".bashrc");
 		case "fish": {
 			// fish sources conf.d from $XDG_CONFIG_HOME/fish (default ~/.config/fish);
 			// a hard-coded ~/.config would be silently ignored when the user relocates
 			// their XDG config root, leaving the alias unsourced after a restart.
-			const configHome = env.XDG_CONFIG_HOME || path.join(homeDir, ".config");
-			return path.join(configHome, "fish", "conf.d", "omp-profiles.fish");
+			const configHome = env.XDG_CONFIG_HOME ? toPosix(env.XDG_CONFIG_HOME) : posixJoinUnc(posixHome, ".config");
+			return posixJoinUnc(configHome, "fish", "conf.d", "omp-profiles.fish");
 		}
 		case "pwsh":
 			return platform === "win32"
 				? path.join(homeDir, "Documents", "PowerShell", "Microsoft.PowerShell_profile.ps1")
-				: path.join(homeDir, ".config", "powershell", "Microsoft.PowerShell_profile.ps1");
+				: posixJoinUnc(posixHome, ".config", "powershell", "Microsoft.PowerShell_profile.ps1");
 		case "powershell":
 			return path.join(homeDir, "Documents", "WindowsPowerShell", "Microsoft.PowerShell_profile.ps1");
 	}

package/src/cli/session-picker.ts

@@ -8,8 +8,10 @@ import { FileSessionStorage } from "../session/session-storage";
 
 /**
  * Show the TUI session selector and return the selected session, or null if
- * cancelled. Tab toggles between current-folder and all-projects scope; the
- * all-projects list is loaded lazily via `SessionManager.listAll`.
+ * cancelled. Rendered as a fullscreen overlay on the terminal's alternate
+ * screen, so the list scrolls and rows are clickable with the mouse. Tab
+ * toggles between current-folder and all-projects scope; the all-projects list
+ * is loaded lazily via `SessionManager.listAll`.
  */
 export async function selectSession(
 	sessions: SessionInfo[],
@@ -65,6 +67,7 @@ export async function selectSession(
 				loadAllSessions: () => SessionManager.listAll(storage),
 				allSessions: options?.allSessions,
 				getTerminalRows: () => ui.terminal.rows,
+				fillHeight: true,
 			},
 		);
 		return selector;
@@ -72,7 +75,18 @@ export async function selectSession(
 
 	const selector = showSelector();
 	selector.setOnRequestRender(() => ui.requestRender());
-	ui.addChild(selector);
+	// Present as a fullscreen overlay so the picker borrows the terminal's
+	// alternate screen buffer (vim/less idiom): the list scrolls and rows are
+	// clickable via the mouse tracking the overlay enables for its lifetime.
+	// Anchored top-left at full size so a mouse row maps directly to a rendered
+	// line (the overlay paints from screen row 0).
+	ui.showOverlay(selector, {
+		anchor: "top-left",
+		width: "100%",
+		maxHeight: "100%",
+		margin: 0,
+		fullscreen: true,
+	});
 	ui.setFocus(selector);
 	ui.start();
 	return promise;

package/src/cli/usage-cli.ts

@@ -15,7 +15,7 @@ import {
 	type UsageReport,
 	type UsageUnit,
 } from "@oh-my-pi/pi-ai";
-import { formatDuration, formatNumber } from "@oh-my-pi/pi-utils";
+import { formatDuration, formatNumber, sanitizeText } from "@oh-my-pi/pi-utils";
 import chalk from "chalk";
 import { ModelRegistry } from "../config/model-registry";
 import { discoverAuthStorage } from "../sdk";
@@ -450,6 +450,10 @@ export function formatUsageBreakdown(
 		lines.push(
 			`${chalk.bold.cyan(formatProviderName(provider))} ${chalk.dim(`— ${accountCount} ${accountCount === 1 ? "account" : "accounts"}`)}`,
 		);
+		// Provider-wide disclaimers render once per provider, not per limit.
+		const providerNotes = [...new Set(providerReports.flatMap(report => report.notes ?? []))];
+		for (const note of providerNotes)
+			lines.push(`  ${chalk.dim(sanitizeText(note.replace(/[\r\n]+/g, " ").replace(/\t/g, "  ")))}`);
 
 		const labelWidth = providerReports
 			.flatMap(report => report.limits)

package/src/commands/launch.ts

@@ -2,12 +2,12 @@
  * Root command for the coding agent CLI.
  */
 
-import { THINKING_EFFORTS } from "@oh-my-pi/pi-catalog/effort";
 import { APP_NAME } from "@oh-my-pi/pi-utils";
 import { Args, Command, Flags } from "@oh-my-pi/pi-utils/cli";
 import { parseArgs } from "../cli/args";
 import { runRootCommand } from "../main";
 import { prepareAcpTerminalAuthArgs } from "../modes/acp/terminal-auth";
+import { CLI_THINKING_LEVELS } from "../thinking";
 
 export default class Index extends Command {
 	static description = "AI coding assistant";
@@ -100,8 +100,8 @@ export default class Index extends Command {
 			description: "Comma-separated list of tools to enable (default: all)",
 		}),
 		thinking: Flags.string({
-			description: `Set thinking level: ${THINKING_EFFORTS.join(", ")}`,
-			options: [...THINKING_EFFORTS],
+			description: `Set thinking level: ${CLI_THINKING_LEVELS.join(", ")}`,
+			options: [...CLI_THINKING_LEVELS],
 		}),
 		"hide-thinking": Flags.boolean({
 			description: "Hide thinking blocks in TUI output (display only, does not disable model thinking)",

package/src/config/model-discovery.ts

@@ -117,6 +117,11 @@ type LlamaCppDiscoveredServerMetadata = {
 	input?: ("text" | "image")[];
 };
 
+type LlamaCppModelListEntry = {
+	id: string;
+	contextWindow?: number;
+};
+
 function toPositiveNumberOrUndefined(value: unknown): number | undefined {
 	if (typeof value === "number" && Number.isFinite(value) && value > 0) {
 		return value;
@@ -162,6 +167,26 @@ function extractLlamaCppContextWindow(payload: Record<string, unknown>): number
 	return toPositiveNumberOrUndefined(payload.n_ctx);
 }
 
+function extractLlamaCppModelContextWindow(item: Record<string, unknown>): number | undefined {
+	const meta = item.meta;
+	if (!isRecord(meta)) {
+		return undefined;
+	}
+	return toPositiveNumberOrUndefined(meta.n_ctx) ?? toPositiveNumberOrUndefined(meta.n_ctx_train);
+}
+
+function parseLlamaCppModelList(payload: unknown): LlamaCppModelListEntry[] {
+	if (!isRecord(payload) || !Array.isArray(payload.data)) {
+		return [];
+	}
+	return payload.data.flatMap(item => {
+		if (!isRecord(item) || typeof item.id !== "string" || !item.id) {
+			return [];
+		}
+		return [{ id: item.id, contextWindow: extractLlamaCppModelContextWindow(item) }];
+	});
+}
+
 function extractLlamaCppInputCapabilities(payload: Record<string, unknown>): ("text" | "image")[] | undefined {
 	const modalities = payload.modalities;
 	if (!isRecord(modalities)) {
@@ -338,12 +363,13 @@ export async function discoverLlamaCppModels(
 	const [response, serverMetadata] = apiKey
 		? await withAuth(apiKey, key => attempt({ ...baseHeaders, Authorization: `Bearer ${key}` }))
 		: await attempt(baseHeaders);
-	const payload = (await response.json()) as { data?: Array<{ id: string }> };
-	const models = payload.data ?? [];
+	const payload = (await response.json()) as unknown;
+	const models = parseLlamaCppModelList(payload);
 	const discovered: Model<Api>[] = [];
 	for (const item of models) {
-		const id = item.id;
+		const { id } = item;
 		if (!id) continue;
+		const contextWindow = item.contextWindow ?? serverMetadata?.contextWindow ?? 128000;
 		discovered.push(
 			buildModel({
 				id,
@@ -355,11 +381,8 @@ export async function discoverLlamaCppModels(
 				input: serverMetadata?.input ?? ["text"],
 				imageInputDecoder: "stb",
 				cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
-				contextWindow: serverMetadata?.contextWindow ?? 128000,
-				maxTokens: Math.min(
-					serverMetadata?.contextWindow ?? Number.POSITIVE_INFINITY,
-					DISCOVERY_DEFAULT_MAX_TOKENS,
-				),
+				contextWindow,
+				maxTokens: Math.min(contextWindow, DISCOVERY_DEFAULT_MAX_TOKENS),
 				headers,
 				compat: {
 					supportsStore: false,
@@ -372,6 +395,34 @@ export async function discoverLlamaCppModels(
 	return discovered;
 }
 
+export async function discoverLlamaCppModelContextWindow(
+	model: Pick<Model<Api>, "provider" | "id" | "baseUrl" | "headers">,
+	ctx: DiscoveryContext,
+): Promise<number | undefined> {
+	const baseUrl = normalizeLlamaCppBaseUrl(model.baseUrl);
+	const modelsUrl = `${baseUrl}/models`;
+	const baseHeaders: Record<string, string> = { ...(model.headers ?? {}) };
+	const attempt = async (headers: Record<string, string>) => {
+		const response = await ctx.fetch(modelsUrl, {
+			headers,
+			signal: AbortSignal.timeout(250),
+		});
+		if (!response.ok) {
+			return undefined;
+		}
+		const entries = parseLlamaCppModelList(await response.json());
+		return entries.find(entry => entry.id === model.id)?.contextWindow;
+	};
+	try {
+		const apiKey = await ctx.getBearerApiKeyResolver(model.provider);
+		return apiKey
+			? await withAuth(apiKey, key => attempt({ ...baseHeaders, Authorization: `Bearer ${key}` }))
+			: await attempt(baseHeaders);
+	} catch {
+		return undefined;
+	}
+}
+
 export async function discoverOpenAIModelsList(
 	providerConfig: DiscoveryProviderConfig,
 	ctx: DiscoveryContext,

package/src/config/model-registry.ts

@@ -67,6 +67,7 @@ import {
 	DISCOVERY_DEFAULT_MAX_TOKENS,
 	type DiscoveryContext,
 	type DiscoveryProviderConfig,
+	discoverLlamaCppModelContextWindow,
 	discoverModelsByProviderType,
 	getImplicitOllamaBaseUrl,
 	getOllamaContextLengthOverride,
@@ -759,6 +760,50 @@ export class ModelRegistry {
 		}
 	}
 
+	/**
+	 * Refresh dynamic metadata that can appear only after a local model loads.
+	 */
+	async refreshSelectedModelMetadata(model: Model<Api>): Promise<Model<Api>> {
+		const isLlamaCppDiscovery = this.#discoverableProviders.some(
+			providerConfig => providerConfig.provider === model.provider && providerConfig.discovery.type === "llama.cpp",
+		);
+		if (!isLlamaCppDiscovery) {
+			return model;
+		}
+		const contextWindow = await discoverLlamaCppModelContextWindow(model, this.#nonResolvingDiscoveryContext());
+		if (contextWindow === undefined) {
+			return this.find(model.provider, model.id) ?? model;
+		}
+		const current = this.find(model.provider, model.id) ?? model;
+		const override = this.#resolveLiveModelOverride(current);
+		const customModel = this.#resolveLiveCustomModelOverlay(current);
+		const patch: ModelPatch = {};
+		if (
+			override?.contextWindow === undefined &&
+			customModel?.contextWindow === undefined &&
+			current.contextWindow !== contextWindow
+		) {
+			patch.contextWindow = contextWindow;
+		}
+		const maxTokens = Math.min(contextWindow, DISCOVERY_DEFAULT_MAX_TOKENS);
+		if (
+			override?.maxTokens === undefined &&
+			customModel?.maxTokens === undefined &&
+			current.maxTokens !== maxTokens
+		) {
+			patch.maxTokens = maxTokens;
+		}
+		if (patch.contextWindow === undefined && patch.maxTokens === undefined) {
+			return current;
+		}
+		const patched = applyModelPatch(current, patch, "merge");
+		this.#models = this.#models.map(candidate =>
+			candidate.provider === current.provider && candidate.id === current.id ? patched : candidate,
+		);
+		this.#rebuildCanonicalIndex();
+		return patched;
+	}
+
 	/**
 	 * Discover models for providers registered at runtime via `fetchDynamicModels`
 	 * (extension providers). Merges the discovered catalog into the existing model
@@ -1008,7 +1053,7 @@ export class ModelRegistry {
 				provider: providerConfig.provider,
 				status: "cached",
 				optional: providerConfig.optional ?? false,
-				stale: !cache.fresh || !cache.authoritative || configStale,
+				stale: providerConfig.discovery.type === "llama.cpp" || !cache.fresh || !cache.authoritative || configStale,
 				fetchedAt: cache.updatedAt,
 				models: models.map(model => model.id),
 			});
@@ -1272,7 +1317,9 @@ export class ModelRegistry {
 		const cacheProviderId = this.#configuredDiscoveryCacheProviderId(providerConfig);
 		const cached = readModelCache<Api>(cacheProviderId, 24 * 60 * 60 * 1000, Date.now, this.#cacheDbPath);
 		const cacheOlderThanConfig = cached !== null && this.#isDiscoveryCacheOlderThanModelsConfig(cached.updatedAt);
-		const effectiveStrategy = strategy === "online-if-uncached" && cacheOlderThanConfig ? "online" : strategy;
+		const bypassFreshCache = providerConfig.discovery.type === "llama.cpp" && strategy === "online-if-uncached";
+		const effectiveStrategy =
+			strategy === "online-if-uncached" && (cacheOlderThanConfig || bypassFreshCache) ? "online" : strategy;
 		const requiresAuth = !this.#keylessProviders.has(providerConfig.provider);
 		if (requiresAuth) {
 			const apiKey = await this.#peekApiKeyForProvider(providerConfig.provider);
@@ -1335,7 +1382,7 @@ export class ModelRegistry {
 			provider: providerId,
 			status,
 			optional: providerConfig.optional ?? false,
-			stale: result.stale || status === "cached" || (cacheOlderThanConfig && status !== "ok"),
+			stale: result.stale || status === "cached" || ((cacheOlderThanConfig || bypassFreshCache) && status !== "ok"),
 			fetchedAt: discoveryError ? cached?.updatedAt : Date.now(),
 			models: result.models.map(model => model.id),
 			error: discoveryError,
@@ -1365,6 +1412,13 @@ export class ModelRegistry {
 		};
 	}
 
+	#nonResolvingDiscoveryContext(): DiscoveryContext {
+		return {
+			fetch: this.#fetch,
+			getBearerApiKeyResolver: async () => undefined,
+		};
+	}
+
 	#warnProviderDiscoveryFailure(providerConfig: DiscoveryProviderConfig, error: string): void {
 		const previous = this.#lastDiscoveryWarnings.get(providerConfig.provider);
 		if (previous === error) {
@@ -1574,6 +1628,23 @@ export class ModelRegistry {
 			return this.#applyProviderTransportOverride(model, override);
 		});
 	}
+	#resolveLiveModelOverride(model: Model<Api>): ModelOverride | undefined {
+		const providerOverrides = this.#modelOverrides.get(model.provider);
+		if (!providerOverrides) return undefined;
+		return resolveModelOverrideWithAliases(
+			providerOverrides,
+			model,
+			(provider, id) => this.find(provider, id) !== undefined,
+		);
+	}
+
+	#resolveLiveCustomModelOverlay(model: Model<Api>): CustomModelOverlay | undefined {
+		return (
+			this.#customModelOverlays.find(overlay => overlay.provider === model.provider && overlay.id === model.id) ??
+			this.#runtimeModelOverlays.find(overlay => overlay.provider === model.provider && overlay.id === model.id)
+		);
+	}
+
 	#applyModelOverrides(models: Model<Api>[], overrides: Map<string, Map<string, ModelOverride>>): Model<Api>[] {
 		if (overrides.size === 0) return models;
 		let liveKeys: Set<string> | null = null;

package/src/config/settings-schema.ts

@@ -3572,7 +3572,7 @@ export const SETTINGS_SCHEMA = {
 			group: "Discovery & MCP",
 			label: "Essential Tools Override",
 			description:
-				"Override the always-loaded built-in tools (default: read, bash, edit). Leave empty to use defaults.",
+				"Override the always-loaded built-in tools (default: read, bash, edit, write, find, eval). Leave empty to use defaults.",
 		},
 	},
 
@@ -4479,6 +4479,17 @@ export const SETTINGS_SCHEMA = {
 		},
 	},
 
+	"exa.searchDelayMs": {
+		type: "number",
+		default: 1_000,
+		ui: {
+			tab: "providers",
+			group: "Services",
+			label: "Exa Search Delay",
+			description: "Minimum delay between Exa web search requests in milliseconds; set 0 to disable pacing",
+		},
+	},
+
 	"exa.enableResearcher": {
 		type: "boolean",
 		default: false,
@@ -4785,6 +4796,7 @@ export interface TtsrSettings {
 export interface ExaSettings {
 	enabled: boolean;
 	enableSearch: boolean;
+	searchDelayMs: number;
 	enableResearcher: boolean;
 	enableWebsets: boolean;
 }

package/src/discovery/omp-extension-roots.ts

@@ -180,9 +180,7 @@ export async function listOmpExtensionRoots(ctx: LoadContext): Promise<OmpExtens
 async function listInstalledPluginRoots(ctx: LoadContext): Promise<InjectedRoot[]> {
 	try {
 		const plugins = await getEnabledPlugins(ctx.cwd, { home: ctx.home });
-		// Installed plugins are always user-scope; project disablement is already
-		// honored by `getEnabledPlugins` via `loadProjectOverrides`.
-		return plugins.map(({ path: p }) => ({ path: p, level: "user" }));
+		return plugins.map(({ path: p, scope }) => ({ path: p, level: scope }));
 	} catch (err) {
 		logger.debug("listInstalledPluginRoots: enumeration failed", { error: String(err) });
 		return [];

package/src/edit/renderer.ts

@@ -22,6 +22,7 @@ import {
 	invalidateRenderedStringCache,
 	type LspBatchRequest,
 	PREVIEW_LIMITS,
+	previewWindowRows,
 	type RenderedStringCache,
 	replaceTabs,
 	shortenPath,
@@ -340,6 +341,7 @@ function renderPlainTextPreview(text: string, uiTheme: Theme, _filePath?: string
 function formatStreamingDiff(
 	diff: string,
 	rawPath: string,
+	width: number,
 	uiTheme: Theme,
 	expanded: boolean,
 	label = "streaming",
@@ -347,15 +349,32 @@ function formatStreamingDiff(
 	cache?: RenderedStringCache,
 ): string {
 	if (!diff) return "";
-	let text = cachedRenderedString(cache, uiTheme, expanded, rawPath, diff, () => {
-		// Collapsed uses a "Cursor" tail window: pin the last
-		// EDIT_STREAMING_PREVIEW_LINES rows to the bottom so freshly streamed changes
-		// stay on screen. The whole-file diff is recomputed on every streamed chunk
-		// and its Myers alignment is not monotonic in payload length, so a hunk-aware
-		// window stutters as rows move between hunks. Expanded deliberately lifts that
-		// cap for the approval-time full view.
+	// Clamp the collapsed tail to the viewport so a tall or fast-growing diff
+	// cannot outgrow the live window. Otherwise its mutating tail scrolls above
+	// the native-scrollback commit boundary and the engine re-commits a fresh
+	// snapshot every streamed frame, stacking duplicate "… more lines above"
+	// previews in history. The budget is VISUAL rows (a long wrapped line counts
+	// for more than one) at the framed block's inner width (border only —
+	// contentPaddingLeft is 0); only the visible suffix is syntax-colored, so the
+	// cheap raw-line wrap walk keeps the per-chunk cost bounded. innerWidth/budget
+	// are in the cache salt so a resize re-slices.
+	const innerWidth = Math.max(1, width - 2);
+	const budget = expanded ? Number.POSITIVE_INFINITY : Math.min(EDIT_STREAMING_PREVIEW_LINES, previewWindowRows());
+	let text = cachedRenderedString(cache, uiTheme, expanded, `${rawPath}:${innerWidth}:${budget}`, diff, () => {
+		// "Cursor" tail window: pin the last rows to the bottom so freshly streamed
+		// changes stay on screen. The whole-file diff is recomputed every chunk and
+		// its Myers alignment is not monotonic in payload length, so a hunk-aware
+		// window stutters as rows move between hunks. Expanded lifts the cap.
 		const allLines = diff.replace(/\n+$/u, "").split("\n");
-		const hiddenLines = expanded ? 0 : Math.max(0, allLines.length - EDIT_STREAMING_PREVIEW_LINES);
+		let visualUsed = 0;
+		let cut = allLines.length;
+		for (let i = allLines.length - 1; i >= 0; i--) {
+			const lineRows = Math.max(1, wrapTextWithAnsi(replaceTabs(allLines[i]!), innerWidth).length);
+			if (visualUsed + lineRows > budget && visualUsed > 0) break;
+			visualUsed += lineRows;
+			cut = i;
+		}
+		const hiddenLines = cut;
 		const visible = hiddenLines > 0 ? allLines.slice(hiddenLines) : allLines;
 		let rendered = "\n\n";
 		if (hiddenLines > 0) {
@@ -384,6 +403,7 @@ function formatStreamingDiff(
 
 function formatMultiFileStreamingDiff(
 	previews: PerFileDiffPreview[],
+	width: number,
 	uiTheme: Theme,
 	expanded: boolean,
 	spinnerFrame?: number,
@@ -405,7 +425,7 @@ function formatMultiFileStreamingDiff(
 			const isLast = index === previews.length - 1;
 			const cache = previewCacheAt(caches, index);
 			parts.push(
-				`${header}${formatStreamingDiff(preview.diff, preview.path, uiTheme, expanded, "preview", isLast ? spinnerFrame : undefined, cache)}`,
+				`${header}${formatStreamingDiff(preview.diff, preview.path, width, uiTheme, expanded, "preview", isLast ? spinnerFrame : undefined, cache)}`,
 			);
 		}
 	}
@@ -415,6 +435,7 @@ function formatMultiFileStreamingDiff(
 function getCallPreview(
 	args: EditRenderArgs,
 	rawPath: string,
+	width: number,
 	uiTheme: Theme,
 	renderContext: EditRenderContext | undefined,
 	expanded: boolean,
@@ -423,14 +444,14 @@ function getCallPreview(
 ): string {
 	const multi = renderContext?.perFileDiffPreview;
 	if (multi && multi.length > 1 && multi.some(p => p.diff || p.error)) {
-		return formatMultiFileStreamingDiff(multi, uiTheme, expanded, spinnerFrame, caches);
+		return formatMultiFileStreamingDiff(multi, width, uiTheme, expanded, spinnerFrame, caches);
 	}
 	const cache = previewCacheAt(caches, 0);
 	if (args.previewDiff) {
-		return formatStreamingDiff(args.previewDiff, rawPath, uiTheme, expanded, "preview", spinnerFrame, cache);
+		return formatStreamingDiff(args.previewDiff, rawPath, width, uiTheme, expanded, "preview", spinnerFrame, cache);
 	}
 	if (args.diff && args.op) {
-		return formatStreamingDiff(args.diff, rawPath, uiTheme, expanded, "streaming", spinnerFrame, cache);
+		return formatStreamingDiff(args.diff, rawPath, width, uiTheme, expanded, "streaming", spinnerFrame, cache);
 	}
 	if (args.diff) {
 		return renderPlainTextPreview(args.diff, uiTheme, rawPath);
@@ -628,6 +649,7 @@ export const editToolRenderer = {
 			let body = getCallPreview(
 				editArgs,
 				rawPath,
+				width,
 				uiTheme,
 				renderContext,
 				options.expanded,