@oh-my-pi/pi-coding-agent 15.11.0 → 15.11.2

package/dist/types/tools/browser/attach.d.ts

@@ -1,4 +1,4 @@
-import type { Browser, Page } from "puppeteer-core";
+import { type Browser, type Page } from "puppeteer-core";
 /**
  * Allocate an unused TCP port on 127.0.0.1 by binding to port 0 and reading
  * back the kernel-assigned port. There's a small race between close and the
@@ -17,9 +17,9 @@ export declare function findReusableCdp(exe: string, signal?: AbortSignal): Prom
     pid: number;
 } | null>;
 /**
- * Pick the best page target on an attached browser. Without a matcher, prefer
- * a page that doesn't look like a helper window (devtools, request handler,
- * background pages); with a matcher, return the first url+title substring hit.
+ * Pick the best page target on an attached browser. Prefer discoverable page
+ * targets first so Chromium/Edge attach flows that hide pages from
+ * `browser.pages()` can still return a usable tab.
  */
 export declare function pickElectronTarget(browser: Browser, matcher?: string): Promise<Page>;
 /**

package/dist/types/tools/browser/registry.d.ts

@@ -36,6 +36,7 @@ export interface AcquireBrowserOptions {
     signal?: AbortSignal;
 }
 export declare function acquireBrowser(kind: BrowserKind, opts: AcquireBrowserOptions): Promise<BrowserHandle>;
+export declare function normalizeConnectedCdpUrl(rawCdpUrl: string): string;
 export declare function holdBrowser(handle: BrowserHandle): void;
 export declare function releaseBrowser(handle: BrowserHandle, opts: {
     kill: boolean;

package/dist/types/tools/irc.d.ts

@@ -90,12 +90,13 @@ export declare class IrcTool implements AgentTool<typeof ircSchema, IrcDetails>
 type IrcRenderArgs = Partial<IrcParams>;
 /**
  * Display-only transcript card for live IRC traffic: `irc:incoming` DMs
- * delivered to this session and `irc:relay` observations of agent↔agent
+ * delivered to this session, `irc:autoreply` side-channel replies sent on
+ * this session's behalf, and `irc:relay` observations of agent↔agent
  * traffic. Shares the tool renderer's glyph + quote-border conventions so
  * cards and `irc` tool output look identical in the transcript.
  */
 export declare function createIrcMessageCard(card: {
-    kind: "incoming" | "relay";
+    kind: "incoming" | "autoreply" | "relay";
     from?: string;
     to?: string;
     body?: string;

package/dist/types/tools/path-utils.d.ts

@@ -124,10 +124,6 @@ export interface ResolvedMultiFindPattern {
     targets: ResolvedFindTarget[];
     scopePath: string;
 }
-/**
- * Split a user path into a base path + glob pattern for tools that delegate to
- * APIs accepting separate `path` and `glob` arguments.
- */
 export declare function parseSearchPath(filePath: string): ParsedSearchPath;
 /**
  * Async sibling of {@link parseSearchPath} that prefers literal interpretation

package/dist/types/tools/render-utils.d.ts

@@ -173,6 +173,28 @@ export declare function capParseErrors(errors: string[] | undefined, limit?: num
 export declare function createCachedComponent(getExpanded: () => boolean, compute: (width: number, expanded: boolean) => string[], options?: {
     paddingX?: number;
 }): Component;
+/**
+ * Single-slot memo for an expensive rendered string (syntax highlighting, diff
+ * coloring) keyed by the exact inputs that shape the bytes: theme instance,
+ * expanded state, a caller-chosen salt (path/language), and the source content.
+ * Field-wise comparison instead of a concatenated key string: a cache hit costs
+ * one string value-compare (engines short-circuit on length) and a miss never
+ * allocates a key. Comparing the {@link Theme} by reference is sound because
+ * theme switches replace the instance wholesale (`setTheme`/`previewTheme`/
+ * `setSymbolPreset` in modes/theme/theme.ts) — themes are never mutated in
+ * place.
+ */
+export interface RenderedStringCache {
+    theme: Theme | null;
+    expanded: boolean;
+    salt: string;
+    content: string;
+    value: string;
+}
+export declare function createRenderedStringCache(): RenderedStringCache;
+/** Drop the memo so the next lookup re-renders (e.g. the render function identity changed). */
+export declare function invalidateRenderedStringCache(cache: RenderedStringCache): void;
+export declare function cachedRenderedString(cache: RenderedStringCache | undefined, theme: Theme, expanded: boolean, salt: string, content: string, render: () => string): string;
 /**
  * Append the indented bullet list of parse errors (capped at
  * {@link PARSE_ERRORS_LIMIT}) to `lines`, with an overflow summary line if the

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@oh-my-pi/pi-coding-agent",
-	"version": "15.11.0",
+	"version": "15.11.2",
 	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
 	"homepage": "https://omp.sh",
 	"author": "Can Boluk",
@@ -47,16 +47,16 @@
 		"@agentclientprotocol/sdk": "0.22.1",
 		"@babel/parser": "^7.29.7",
 		"@mozilla/readability": "^0.6.0",
-		"@oh-my-pi/hashline": "15.11.0",
-		"@oh-my-pi/omp-stats": "15.11.0",
-		"@oh-my-pi/pi-agent-core": "15.11.0",
-		"@oh-my-pi/pi-ai": "15.11.0",
-		"@oh-my-pi/pi-catalog": "15.11.0",
-		"@oh-my-pi/pi-mnemopi": "15.11.0",
-		"@oh-my-pi/pi-natives": "15.11.0",
-		"@oh-my-pi/pi-tui": "15.11.0",
-		"@oh-my-pi/pi-utils": "15.11.0",
-		"@oh-my-pi/snapcompact": "15.11.0",
+		"@oh-my-pi/hashline": "15.11.2",
+		"@oh-my-pi/omp-stats": "15.11.2",
+		"@oh-my-pi/pi-agent-core": "15.11.2",
+		"@oh-my-pi/pi-ai": "15.11.2",
+		"@oh-my-pi/pi-catalog": "15.11.2",
+		"@oh-my-pi/pi-mnemopi": "15.11.2",
+		"@oh-my-pi/pi-natives": "15.11.2",
+		"@oh-my-pi/pi-tui": "15.11.2",
+		"@oh-my-pi/pi-utils": "15.11.2",
+		"@oh-my-pi/snapcompact": "15.11.2",
 		"@opentelemetry/api": "^1.9.1",
 		"@opentelemetry/context-async-hooks": "^2.7.1",
 		"@opentelemetry/exporter-trace-otlp-proto": "^0.218.0",

package/src/capability/mcp.ts

@@ -36,6 +36,7 @@ export interface MCPServer {
 		tokenUrl?: string;
 		clientId?: string;
 		clientSecret?: string;
+		resource?: string;
 	};
 	/** OAuth configuration (clientId, clientSecret, redirectUri, callbackPort, callbackPath) for servers requiring explicit client credentials */
 	oauth?: {

package/src/cli/gallery-cli.ts

@@ -111,10 +111,11 @@ export async function renderGalleryState(
 
 	const tool = fakeToolFor(name, fixture);
 	const streamingArgs = state === "streaming" ? (fixture.streamingArgs ?? fixture.args) : fixture.args;
-	// The component only calls `requestRender` during a static render;
-	// `imageBudget` is consulted solely when images render, which the gallery
-	// disables. A cast avoids constructing a real terminal.
-	const ui = { requestRender() {} } as unknown as TUI;
+	// The component only calls `requestRender`/`requestComponentRender` (via
+	// its loader) during a static render; `imageBudget` is consulted solely
+	// when images render, which the gallery disables. A cast avoids
+	// constructing a real terminal.
+	const ui = { requestRender() {}, requestComponentRender() {} } as unknown as TUI;
 	const component = new ToolExecutionComponent(name, streamingArgs, { showImages: false }, tool, ui, getProjectDir());
 	component.setExpanded(expanded);
 

package/src/config/mcp-schema.json

@@ -62,6 +62,10 @@
         "clientSecret": {
           "type": "string",
           "description": "OAuth client secret persisted for refresh."
+        },
+        "resource": {
+          "type": "string",
+          "description": "MCP resource URI persisted for OAuth resource indicators."
         }
       }
     },

package/src/config/settings-schema.ts

@@ -452,6 +452,17 @@ export const SETTINGS_SCHEMA = {
 			description: "Use the session name color for the editor border and status line gap",
 		},
 	},
+
+	"statusLine.transparent": {
+		type: "boolean",
+		default: false,
+		ui: {
+			tab: "appearance",
+			label: "Transparent Status Line",
+			description:
+				"Use the terminal's default background for the status line instead of the theme's `statusLineBg`. Powerline end caps are dropped because they need a contrasting fill to bridge into the surrounding terminal.",
+		},
+	},
 	"tools.artifactSpillThreshold": {
 		type: "number",
 		default: 50,
@@ -668,7 +679,7 @@ export const SETTINGS_SCHEMA = {
 		ui: {
 			tab: "appearance",
 			label: "Smooth Streaming",
-			description: "Reveal assistant text smoothly while streamed chunks arrive",
+			description: "Reveal assistant text and streamed tool input smoothly while chunks arrive",
 		},
 	},
 
@@ -1082,6 +1093,46 @@ export const SETTINGS_SCHEMA = {
 		ui: { tab: "interaction", label: "Collapse Changelog", description: "Show condensed changelog after updates" },
 	},
 
+	"magicKeywords.enabled": {
+		type: "boolean",
+		default: true,
+		ui: {
+			tab: "interaction",
+			label: "Magic Keywords",
+			description: "Enable hidden notices for standalone ultrathink, orchestrate, and workflowz keywords",
+		},
+	},
+
+	"magicKeywords.ultrathink": {
+		type: "boolean",
+		default: true,
+		ui: {
+			tab: "interaction",
+			label: "Ultrathink Keyword",
+			description: "Let standalone ultrathink request maximum automatic thinking and append its hidden notice",
+		},
+	},
+
+	"magicKeywords.orchestrate": {
+		type: "boolean",
+		default: true,
+		ui: {
+			tab: "interaction",
+			label: "Orchestrate Keyword",
+			description: "Let standalone orchestrate append its hidden multi-agent orchestration notice",
+		},
+	},
+
+	"magicKeywords.workflow": {
+		type: "boolean",
+		default: true,
+		ui: {
+			tab: "interaction",
+			label: "Workflow Keyword",
+			description: "Let standalone workflowz append its hidden eval workflow notice",
+		},
+	},
+
 	// Notifications
 	"completion.notify": {
 		type: "enum",
@@ -2501,11 +2552,11 @@ export const SETTINGS_SCHEMA = {
 	// Async jobs
 	"async.enabled": {
 		type: "boolean",
-		default: false,
+		default: true,
 		ui: {
 			tab: "tools",
 			label: "Async Execution",
-			description: "Enable async bash commands",
+			description: "Enable async bash commands and background task execution",
 		},
 	},
 
@@ -2758,7 +2809,7 @@ export const SETTINGS_SCHEMA = {
 			tab: "tasks",
 			label: "Batch Task Calls",
 			description:
-				"Switch the task tool to its batch shape: one call carries { agent, context, tasks[] } — one subagent per item (with per-item isolation) and a required shared context prepended to every assignment. Each spawn still runs as an independent background agent with the normal idle/parked lifecycle. Disable to restore the flat single-spawn schema.",
+				"Switch the task tool to its batch shape: one call carries { agent, context, tasks[] } — one subagent per item (with per-item isolation) and a required shared context prepended to every assignment. With async.enabled=true, each spawn runs as an independent background agent with the normal idle/parked lifecycle; otherwise the call blocks for merged results. Disable to restore the flat single-spawn schema.",
 		},
 	},
 

package/src/edit/renderer.ts

@@ -12,13 +12,17 @@ import { renderDiff as renderDiffColored } from "../modes/components/diff";
 import { getLanguageFromPath, type Theme } from "../modes/theme/theme";
 import type { OutputMeta } from "../tools/output-meta";
 import {
+	cachedRenderedString,
+	createRenderedStringCache,
 	formatDiagnostics,
 	formatExpandHint,
 	formatStatusIcon,
 	getDiffStats,
 	getLspBatchRequest,
+	invalidateRenderedStringCache,
 	type LspBatchRequest,
 	PREVIEW_LIMITS,
+	type RenderedStringCache,
 	replaceTabs,
 	shortenPath,
 	truncateDiffByHunk,
@@ -138,6 +142,26 @@ export interface EditRenderContext {
 }
 
 const EDIT_STREAMING_PREVIEW_LINES = 12;
+
+function plainDiffRender(diffText: string): string {
+	return diffText;
+}
+
+/**
+ * Lazily grown per-file preview cache slots: the file count of a streaming
+ * multi-file patch is discovered mid-stream, so a fixed-size array would
+ * silently bypass caching for late files.
+ */
+function previewCacheAt(caches: RenderedStringCache[] | undefined, index: number): RenderedStringCache | undefined {
+	if (!caches) return undefined;
+	let cache = caches[index];
+	if (cache === undefined) {
+		cache = createRenderedStringCache();
+		caches[index] = cache;
+	}
+	return cache;
+}
+
 const CALL_TEXT_PREVIEW_LINES = 6;
 const CALL_TEXT_PREVIEW_WIDTH = 80;
 
@@ -313,7 +337,6 @@ function renderPlainTextPreview(text: string, uiTheme: Theme, filePath?: string)
 	}
 	return preview.trimEnd();
 }
-
 function formatStreamingDiff(
 	diff: string,
 	rawPath: string,
@@ -321,26 +344,30 @@ function formatStreamingDiff(
 	expanded: boolean,
 	label = "streaming",
 	spinnerFrame?: number,
+	cache?: RenderedStringCache,
 ): string {
 	if (!diff) return "";
-	// 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.
-	const allLines = diff.replace(/\n+$/u, "").split("\n");
-	const hiddenLines = expanded ? 0 : Math.max(0, allLines.length - EDIT_STREAMING_PREVIEW_LINES);
-	const visible = hiddenLines > 0 ? allLines.slice(hiddenLines) : allLines;
-	let text = "\n\n";
-	if (hiddenLines > 0) {
-		const hiddenHunks = getDiffStats(allLines.slice(0, hiddenLines).join("\n")).hunks;
-		const remainder: string[] = [];
-		if (hiddenHunks > 0) remainder.push(`${hiddenHunks} more hunks`);
-		remainder.push(`${hiddenLines} more lines`);
-		text += `${uiTheme.fg("dim", `… (${remainder.join(", ")} above)`)}\n`;
-	}
-	text += renderDiffColored(visible.join("\n"), { filePath: rawPath });
+	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.
+		const allLines = diff.replace(/\n+$/u, "").split("\n");
+		const hiddenLines = expanded ? 0 : Math.max(0, allLines.length - EDIT_STREAMING_PREVIEW_LINES);
+		const visible = hiddenLines > 0 ? allLines.slice(hiddenLines) : allLines;
+		let rendered = "\n\n";
+		if (hiddenLines > 0) {
+			const hiddenHunks = getDiffStats(allLines.slice(0, hiddenLines).join("\n")).hunks;
+			const remainder: string[] = [];
+			if (hiddenHunks > 0) remainder.push(`${hiddenHunks} more hunks`);
+			remainder.push(`${hiddenLines} more lines`);
+			rendered += `${uiTheme.fg("dim", `… (${remainder.join(", ")} above)`)}\n`;
+		}
+		rendered += renderDiffColored(visible.join("\n"), { filePath: rawPath });
+		return rendered;
+	});
 	// The animated glyph rides this trailing line — inside the transcript's
 	// volatile-tail holdback — never the block header: an animating head row
 	// pins the native-scrollback commit boundary at the top of the block, so a
@@ -360,9 +387,11 @@ function formatMultiFileStreamingDiff(
 	uiTheme: Theme,
 	expanded: boolean,
 	spinnerFrame?: number,
+	caches?: RenderedStringCache[],
 ): string {
 	const parts: string[] = [];
-	for (const preview of previews) {
+	for (let index = 0; index < previews.length; index++) {
+		const preview = previews[index]!;
 		if (!preview.diff && !preview.error) continue;
 		const header = uiTheme.fg("dim", `\n\n── ${shortenPath(preview.path)} ──`);
 		if (preview.error) {
@@ -373,9 +402,10 @@ function formatMultiFileStreamingDiff(
 			// Only the last file's preview carries the animated streaming glyph;
 			// earlier files have settled and must stay byte-stable so their rows
 			// can commit to native scrollback mid-stream.
-			const isLast = preview === previews[previews.length - 1];
+			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)}`,
+				`${header}${formatStreamingDiff(preview.diff, preview.path, uiTheme, expanded, "preview", isLast ? spinnerFrame : undefined, cache)}`,
 			);
 		}
 	}
@@ -389,16 +419,18 @@ function getCallPreview(
 	renderContext: EditRenderContext | undefined,
 	expanded: boolean,
 	spinnerFrame?: number,
+	caches?: RenderedStringCache[],
 ): string {
 	const multi = renderContext?.perFileDiffPreview;
 	if (multi && multi.length > 1 && multi.some(p => p.diff || p.error)) {
-		return formatMultiFileStreamingDiff(multi, uiTheme, expanded, spinnerFrame);
+		return formatMultiFileStreamingDiff(multi, uiTheme, expanded, spinnerFrame, caches);
 	}
+	const cache = previewCacheAt(caches, 0);
 	if (args.previewDiff) {
-		return formatStreamingDiff(args.previewDiff, rawPath, uiTheme, expanded, "preview", spinnerFrame);
+		return formatStreamingDiff(args.previewDiff, rawPath, uiTheme, expanded, "preview", spinnerFrame, cache);
 	}
 	if (args.diff && args.op) {
-		return formatStreamingDiff(args.diff, rawPath, uiTheme, expanded, "streaming", spinnerFrame);
+		return formatStreamingDiff(args.diff, rawPath, uiTheme, expanded, "streaming", spinnerFrame, cache);
 	}
 	if (args.diff) {
 		return renderPlainTextPreview(args.diff, uiTheme, rawPath);
@@ -492,30 +524,32 @@ function formatDiffStatsSuffix(diff: string, uiTheme: Theme): string {
 	].filter(value => value !== undefined);
 	return ` ${uiTheme.fg("dim", uiTheme.format.bracketLeft)}${stats.join(uiTheme.fg("dim", "/"))}${uiTheme.fg("dim", uiTheme.format.bracketRight)}`;
 }
-
 function renderDiffSection(
 	diff: string,
 	rawPath: string,
 	expanded: boolean,
 	uiTheme: Theme,
 	renderDiffFn: (t: string, o?: { filePath?: string }) => string,
+	cache?: RenderedStringCache,
 ): string {
-	const {
-		text: truncatedDiff,
-		hiddenHunks,
-		hiddenLines,
-	} = expanded
-		? { text: diff, hiddenHunks: 0, hiddenLines: 0 }
-		: truncateDiffByHunk(diff, PREVIEW_LIMITS.DIFF_COLLAPSED_HUNKS, PREVIEW_LIMITS.DIFF_COLLAPSED_LINES);
-
-	let text = `\n${renderDiffFn(truncatedDiff, { filePath: rawPath })}`;
-	if (!expanded && (hiddenHunks > 0 || hiddenLines > 0)) {
-		const remainder: string[] = [];
-		if (hiddenHunks > 0) remainder.push(`${hiddenHunks} more hunks`);
-		if (hiddenLines > 0) remainder.push(`${hiddenLines} more lines`);
-		text += uiTheme.fg("toolOutput", `\n… (${remainder.join(", ")}) ${formatExpandHint(uiTheme)}`);
-	}
-	return text;
+	return cachedRenderedString(cache, uiTheme, expanded, rawPath, diff, () => {
+		const {
+			text: truncatedDiff,
+			hiddenHunks,
+			hiddenLines,
+		} = expanded
+			? { text: diff, hiddenHunks: 0, hiddenLines: 0 }
+			: truncateDiffByHunk(diff, PREVIEW_LIMITS.DIFF_COLLAPSED_HUNKS, PREVIEW_LIMITS.DIFF_COLLAPSED_LINES);
+
+		let text = `\n${renderDiffFn(truncatedDiff, { filePath: rawPath })}`;
+		if (!expanded && (hiddenHunks > 0 || hiddenLines > 0)) {
+			const remainder: string[] = [];
+			if (hiddenHunks > 0) remainder.push(`${hiddenHunks} more hunks`);
+			if (hiddenLines > 0) remainder.push(`${hiddenLines} more lines`);
+			text += uiTheme.fg("toolOutput", `\n… (${remainder.join(", ")}) ${formatExpandHint(uiTheme)}`);
+		}
+		return text;
+	});
 }
 
 function wrapEditRendererLine(line: string, width: number): string[] {
@@ -574,6 +608,7 @@ export const editToolRenderer = {
 		if (Array.isArray(editArgs.edits)) {
 			fileCount = countEditFiles(editArgs.edits);
 		}
+		const callPreviewCaches: RenderedStringCache[] = [];
 		return framedBlock(uiTheme, width => {
 			// Static pending icon, never the animated glyph: the header is the
 			// head row of the framed block, and native-scrollback commits are
@@ -588,7 +623,15 @@ export const editToolRenderer = {
 				rename,
 				extraSuffix: fileCount > 1 ? uiTheme.fg("dim", ` (+${fileCount - 1} more)`) : undefined,
 			});
-			let body = getCallPreview(editArgs, rawPath, uiTheme, renderContext, options.expanded, options?.spinnerFrame);
+			let body = getCallPreview(
+				editArgs,
+				rawPath,
+				uiTheme,
+				renderContext,
+				options.expanded,
+				options?.spinnerFrame,
+				callPreviewCaches,
+			);
 			if (applyPatchSummary?.error) {
 				body += `\n${uiTheme.fg("error", truncateToWidth(replaceTabs(applyPatchSummary.error, rawPath), Math.max(1, width - 2)))}`;
 			}
@@ -652,11 +695,18 @@ function renderSingleFileResult(
 			(result.content?.find(c => c.type === "text")?.text ?? "")
 		: "";
 
+	let diffSectionRenderDiffFn: ((t: string, o?: { filePath?: string }) => string) | undefined;
+	const diffSectionCache = createRenderedStringCache();
+
 	return framedBlock(uiTheme, width => {
 		const { expanded, renderContext } = options;
 		const editDiffPreview = renderContext?.editDiffPreview;
-		const renderDiffFn = renderContext?.renderDiff ?? ((t: string) => t);
+		const renderDiffFn = renderContext?.renderDiff ?? plainDiffRender;
 
+		if (diffSectionRenderDiffFn !== renderDiffFn) {
+			diffSectionRenderDiffFn = renderDiffFn;
+			invalidateRenderedStringCache(diffSectionCache);
+		}
 		const firstChangedLine =
 			(editDiffPreview && "firstChangedLine" in editDiffPreview ? editDiffPreview.firstChangedLine : undefined) ||
 			(details && !isError ? details.firstChangedLine : undefined);
@@ -681,11 +731,11 @@ function renderSingleFileResult(
 		if (isError) {
 			if (errorText) body = uiTheme.fg("error", replaceTabs(errorText, rawPath));
 		} else if (details?.diff) {
-			body = renderDiffSection(details.diff, rawPath, expanded, uiTheme, renderDiffFn);
+			body = renderDiffSection(details.diff, rawPath, expanded, uiTheme, renderDiffFn, diffSectionCache);
 		} else if (editDiffPreview) {
 			if ("error" in editDiffPreview) body = uiTheme.fg("error", replaceTabs(editDiffPreview.error, rawPath));
 			else if (editDiffPreview.diff)
-				body = renderDiffSection(editDiffPreview.diff, rawPath, expanded, uiTheme, renderDiffFn);
+				body = renderDiffSection(editDiffPreview.diff, rawPath, expanded, uiTheme, renderDiffFn, diffSectionCache);
 		}
 		if (details?.diagnostics) {
 			body += formatDiagnostics(details.diagnostics, expanded, uiTheme, (fp: string) =>

package/src/exec/bash-executor.ts

@@ -56,6 +56,8 @@ export interface BashResult {
 const shellSessions = new Map<string, Shell>();
 const brokenShellSessions = new Set<string>();
 const shellSessionQuarantines = new Map<string, Promise<unknown>>();
+/** Session keys with a command currently in flight on the persistent Shell. */
+const shellSessionsInUse = new Set<string>();
 
 function quarantineShellSession(
 	sessionKey: string,
@@ -223,8 +225,14 @@ export async function executeBash(command: string, options?: BashExecutorOptions
 		shellSessions.delete(sessionKey);
 	}
 
-	let shellSession = persistentSessionBroken ? undefined : shellSessions.get(sessionKey);
-	if (!shellSession && !persistentSessionBroken) {
+	// A persistent Shell runs one command at a time (the native session is a
+	// mutex-guarded queue and `abort()` kills every in-flight run on it). When
+	// parallel bash calls overlap on the same key, the first one owns the
+	// persistent session; the rest degrade to isolated one-shot shells — the
+	// same path quarantined sessions take.
+	const sessionBusy = shellSessionsInUse.has(sessionKey);
+	let shellSession = persistentSessionBroken || sessionBusy ? undefined : shellSessions.get(sessionKey);
+	if (!shellSession && !persistentSessionBroken && !sessionBusy) {
 		shellSession = new Shell({
 			sessionEnv: shellEnv,
 			snapshotPath: snapshotPath ?? undefined,
@@ -232,6 +240,10 @@ export async function executeBash(command: string, options?: BashExecutorOptions
 		});
 		shellSessions.set(sessionKey, shellSession);
 	}
+	const ownsPersistentSession = shellSession !== undefined;
+	if (ownsPersistentSession) {
+		shellSessionsInUse.add(sessionKey);
+	}
 	const userSignal = options?.signal;
 	const runAbortController = new AbortController();
 	let abortCleanupPromise: Promise<void> | undefined;
@@ -393,10 +405,13 @@ export async function executeBash(command: string, options?: BashExecutorOptions
 		if (userSignal) {
 			userSignal.removeEventListener("abort", abortHandler);
 		}
-		if (resetSession || options?.sessionKey?.includes(":async:")) {
-			// `:async:` keys are per-job (jobId is unique), so the Shell would
-			// otherwise stay in the process-global map forever after completion.
-			shellSessions.delete(sessionKey);
+		if (ownsPersistentSession) {
+			shellSessionsInUse.delete(sessionKey);
+			if (resetSession || options?.sessionKey?.includes(":async:")) {
+				// `:async:` keys are per-job (jobId is unique), so the Shell would
+				// otherwise stay in the process-global map forever after completion.
+				shellSessions.delete(sessionKey);
+			}
 		}
 	}
 }