zidane 6.2.13 → 6.2.15

package/dist/tui.js

@@ -1,4 +1,4 @@
-import { $ as useMcpAuthState, $n as buildPlanSystem, $t as restoreChainFallbacks, A as runOAuthLogin, Bt as createDiscoverySlot, Ct as SETTINGS_CHOICES, D as formatPathForCwd, Dt as clampFps, Et as SettingsProvider, G as buildVisibleMcpRows, Gt as useConfig, Ht as useDiscovery, J as createFileMcpCredentialStore, Jt as buildRunModel, K as indexOfServerRow, Kt as resolveConfig, L as loadMcpToolsCache, M as buildMcpServers, Mt as resolveTheme, O as fetchOAuthRedirect, Ot as useSettings, P as discoverProjectMcps, Q as useMcpAuthDispatch, Qn as buildBuildSystem, Qt as providerKeySetChanged, R as mcpToolsCachePath, St as SETTINGS_CATEGORIES, T as suggestSafelistEntries, Tn as accentColor, Tt as SETTINGS_TOGGLES, U as useMcpToolToggleMap, Ut as useDiscoveryOptional, V as subscribeMcpToolsCache, Vn as useActiveTodos, Vt as DiscoveryProvider, Wt as ConfigProvider, Xt as chainsEqual, Yt as chainPositionOf, Z as McpAuthProvider, Zt as filterChainFallbacks, _ as useSafeModeQueue, _n as discoverAgentsMd, _r as toolCallPreview, _t as buildHints, a as useSurfaces, an as bootTick, at as buildResumedToolResultsTurn, b as getSafelist, br as usageByModel, bt as useEnabledToggleSet, c as useStreamBuffer, cr as lastContextSizeFromTurns, ct as makeRequestInteraction, d as discoverProjectSkills, dr as marginTopFor, dt as useInteractionsActions, er as envSection, et as getMcpAuthStatus, ft as useInteractionsQueue, g as useSafeModeActions, gn as chatAutoCompactBehavior, gt as truncateTrailing, h as SafeModeProvider, hr as sumRunCosts, ht as hintsLength, i as useSelectStyle, ir as compactSummaryEvent, it as PRESENT_PLAN_TOOL, j as supportsOAuth, jn as TODO_STATUS_GLYPHS, jt as resolveChipColor, k as oauthUsesManualCodePaste, l as buildSkillsConfig, lr as listSessionMeta, lt as pendingInteractionsFromTurns, m as writeSessionExport, mr as stripSpawnTokensLine, mt as clipHintsToWidth, n as ThemeProvider, nn as useCompletion, nr as createChatTurnsReadTool, nt as ASK_USER_TOOL, on as buildUpdateHint, or as deriveSessionTitle, ot as createInteractionTools, pr as serverToolResultSummary, pt as EMPTY_HINTS, q as parentServerName, qt as resolveStoragePaths, r as useColors, rn as tryOpenBrowser, rt as InteractionsProvider, s as useTheme, sn as useUpdateCheck, sr as eventsFromTurns, t as computeTurnAnchors, tn as toggleChainEntry, tr as chatReferenceTokensForPrompt, u as defaultSkillScanPaths, ur as loadState, vr as toolResultText, wt as SETTINGS_INPUTS, x as isOnSafelist, xt as DEFAULT_SETTINGS, y as addToSafelist, yr as updateToolEventOutcomes, yt as listProjectFiles, z as refreshMcpToolsCatalog } from "./transcript-anchors-yogJHuBW.js";
+import { $ as useMcpAuthState, $n as buildPlanSystem, $t as restoreChainFallbacks, A as runOAuthLogin, Bt as createDiscoverySlot, Ct as SETTINGS_CHOICES, D as formatPathForCwd, Dt as clampFps, Et as SettingsProvider, G as buildVisibleMcpRows, Gt as useConfig, Ht as useDiscovery, J as createFileMcpCredentialStore, Jt as buildRunModel, K as indexOfServerRow, Kt as resolveConfig, L as loadMcpToolsCache, M as buildMcpServers, Mt as resolveTheme, O as fetchOAuthRedirect, Ot as useSettings, P as discoverProjectMcps, Q as useMcpAuthDispatch, Qn as buildBuildSystem, Qt as providerKeySetChanged, R as mcpToolsCachePath, St as SETTINGS_CATEGORIES, T as suggestSafelistEntries, Tn as accentColor, Tt as SETTINGS_TOGGLES, U as useMcpToolToggleMap, Ut as useDiscoveryOptional, V as subscribeMcpToolsCache, Vn as useActiveTodos, Vt as DiscoveryProvider, Wt as ConfigProvider, Xt as chainsEqual, Yt as chainPositionOf, Z as McpAuthProvider, Zt as filterChainFallbacks, _ as useSafeModeQueue, _n as discoverAgentsMd, _r as toolCallPreview, _t as buildHints, a as useSurfaces, an as bootTick, at as buildResumedToolResultsTurn, b as getSafelist, br as usageByModel, bt as useEnabledToggleSet, c as useStreamBuffer, cr as lastContextSizeFromTurns, ct as makeRequestInteraction, d as discoverProjectSkills, dr as marginTopFor, dt as useInteractionsActions, er as envSection, et as getMcpAuthStatus, ft as useInteractionsQueue, g as useSafeModeActions, gn as chatAutoCompactBehavior, gt as truncateTrailing, h as SafeModeProvider, hr as sumRunCosts, ht as hintsLength, i as useSelectStyle, ir as compactSummaryEvent, it as PRESENT_PLAN_TOOL, j as supportsOAuth, jn as TODO_STATUS_GLYPHS, jt as resolveChipColor, k as oauthUsesManualCodePaste, l as buildSkillsConfig, lr as listSessionMeta, lt as pendingInteractionsFromTurns, m as writeSessionExport, mr as stripSpawnTokensLine, mt as clipHintsToWidth, n as ThemeProvider, nn as useCompletion, nr as createChatTurnsReadTool, nt as ASK_USER_TOOL, on as buildUpdateHint, or as deriveSessionTitle, ot as createInteractionTools, pr as serverToolResultSummary, pt as EMPTY_HINTS, q as parentServerName, qt as resolveStoragePaths, r as useColors, rn as tryOpenBrowser, rt as InteractionsProvider, s as useTheme, sn as useUpdateCheck, sr as eventsFromTurns, t as computeTurnAnchors, tn as toggleChainEntry, tr as chatReferenceTokensForPrompt, u as defaultSkillScanPaths, ur as loadState, vr as toolResultText, wt as SETTINGS_INPUTS, x as isOnSafelist, xt as DEFAULT_SETTINGS, y as addToSafelist, yr as updateToolEventOutcomes, yt as listProjectFiles, z as refreshMcpToolsCatalog } from "./transcript-anchors-DZ-8BF4p.js";
 import { $ as composeExtensionPreset, B as ExtensionInstallError, Bt as ensureKeybindingsFile, Et as createModelSearchTool, H as installExtensionFromSpec, Ht as groupBindings, J as createExtensionHud, K as removeInstalledExtension, P as summaryToTurn, St as tailTruncate, Ut as keybindingsPath, Vt as formatBindingForDisplay, Wt as matchesBinding, X as discoverAndBuildExtensionRegistry, Y as registerExtensionHostModules, Yt as resolveExtensionKeybindings, _ as buildPostCompactAttachments, c as applyCompactSummaryCutoff, dn as sanitizeExtensionConfigActionPatch, en as inlineLoadedExtension, et as disposeExtensionRegistry, f as cleanupPersistedSession, g as resolveTasksDir, h as resolvePersistDir, hn as effectiveContextWindow, ht as isSpawnTool, it as createExtensionHostRuntimeBridge, lt as basic_default, m as resolveMcpWarningsDir, mn as OUTPUT_RESERVE_TOKENS, nn as parseExtensionScanPathEnv, on as coerceExtensionConfigInput, q as updateInstalledExtension, rn as scanExtensionDirectories, rt as partitionExtensionCatalog, t as createAgent, tt as filterExtensionRegistry, un as resolveExtensionConfigValue, wt as looksBinary, x as compactConversation, y as selectFilesFromSession, z as createExtensionPromptBridge, zt as KEYBINDING_KEY_COL_WIDTH } from "./agent-DoEx_WD3.js";
 import { a as formatDuration, c as previewLine, i as fmtTokens, l as shortId, n as compactPath, o as formatTaskStatus, r as fmtCost, s as formatTaskSummary, t as ageString } from "./format-BF745pLL.js";
 import { n as appendCapped } from "./output-cap-kBUHBlnq.js";
@@ -16,10 +16,11 @@ import { a as generateStructuredData, c as shouldAutoGenerateTitle, f as command
 import { s as resolveCompletionSubmit } from "./completion-core-BRo86R_L.js";
 import { i as installSkillFromSpec, r as SkillInstallError } from "./skills-DKWqoaYH.js";
 import { i as ZIDANE_EXTENSION_SKILL_NAME, l as withZidaneExtensionSkill, o as extensionDirForCwd, r as EXTENSION_EDIT_METADATA_KEY, s as extensionScaffold, t as loginMcpServer } from "./login-Clf-R27F.js";
-import { C as restoreModelOptions, S as piIdOf, _ as modelOptionsFor, m as getContextWindow, p as enabledModelOptions, s as setProviderCredential, t as detectAuth, v as modelSupportsReasoning } from "./auth-Bb479DFB.js";
+import { C as restoreModelOptions, S as piIdOf, _ as modelOptionsFor, m as getContextWindow, p as enabledModelOptions, s as setProviderCredential, t as detectAuth, v as modelSupportsReasoning } from "./auth-BCpEbzvO.js";
 import { createDockerContext } from "./contexts/docker.js";
 import { createTuiStore } from "./session/sqlite.js";
-import { $ as buildEditOutcomesAnnotation, A as blendHsl, B as turnSelectionOwnership, C as stripHtmlCommentsOutsideCode, E as uniqueSkillNamesFromReferences, F as isTurnHighlighted, H as buildContextualDiff, I as isUserBashEvent, J as filetypeFromPath, L as isVisible, M as BASH_CALL_ID_PREFIX, N as EDIT_TOOL_NAMES, O as createFilesCompletionProvider, P as isEditErrorResult, R as promptHistoryFromEvents, S as splitMarkdownCodeBlocks, T as createSkillsCompletionProvider, U as buildUnifiedDiff, W as clipDiffForRender, Y as previewEditPayload, Z as summarizeEditPayload, _ as filterModelCatalog, a as TOOL_DISPLAY, at as stripEditOutcomesAnnotation, b as chunkMarkdownForRender, d as finalizeStreamingMarkdown, f as finalizeStreamingMarkdownForOwner, g as buildModelCatalog, h as splitPromptSegments, i as turnAsText, it as rewriteMultiEditHeader, j as buildLinearRamp, lt as createChatsCompletionProvider, m as turnContextSize, n as deleteTurnSafely, nt as parseEditOutcomesFromResult, o as displayNameFor, ot as summarizeOutcomes, q as extractEditPayload, r as truncateTurnsAt, rt as resolveApprovalForPayload, s as formatToolCall, tt as mergeApprovalAndBodyOutcomes, u as capTranscriptEvents, v as indexOfEntry, x as normalizeMarkdownCodeFences, z as selectableTurnIds } from "./turn-operations-CXjRaltC.js";
+import { $ as extractEditPayload, B as isVisible, C as chunkMarkdownForRender, E as stripHtmlCommentsOutsideCode, F as BASH_CALL_ID_PREFIX, G as streamEventSearchText, H as promptHistoryFromEvents, I as EDIT_TOOL_NAMES, J as buildContextualDiff, K as turnSelectionOwnership, L as isEditErrorResult, N as blendHsl, O as createSkillsCompletionProvider, P as buildLinearRamp, R as isTurnHighlighted, T as splitMarkdownCodeBlocks, U as selectableTurnIds, V as isVisibleDuringSearch, W as selectionAfterTurnRemoval, X as clipDiffForRender, Y as buildUnifiedDiff, _ as turnContextSize, a as TOOL_DISPLAY, at as buildEditOutcomesAnnotation, b as filterModelCatalog, ct as parseEditOutcomesFromResult, d as finalizeStreamingMarkdown, dt as stripEditOutcomesAnnotation, et as filetypeFromPath, f as finalizeStreamingMarkdownForOwner, ft as summarizeOutcomes, g as revealEarlierTranscriptEvents, h as replaceTranscriptTurnEvents, ht as createChatsCompletionProvider, i as turnAsText, j as createFilesCompletionProvider, k as uniqueSkillNamesFromReferences, lt as resolveApprovalForPayload, n as deleteTurnSafely, o as displayNameFor, p as hiddenEarlierTranscriptCount, r as truncateTurnsAt, rt as summarizeEditPayload, s as formatToolCall, st as mergeApprovalAndBodyOutcomes, tt as previewEditPayload, u as capTranscriptEvents, ut as rewriteMultiEditHeader, v as splitPromptSegments, w as normalizeMarkdownCodeFences, y as buildModelCatalog, z as isUserBashEvent } from "./turn-operations-CokV32wf.js";
+import { a as searchHighlightRanges, c as searchSessionHistoryIndexAsync, i as highlightSegments, n as buildSessionSearchIndexAsync, r as filterSessionSearchCatalog, u as searchSessionIndexAsync } from "./history-search-C4bk1Wz_.js";
 import { basename, dirname, join, relative, resolve } from "node:path";
 import { Buffer } from "node:buffer";
 import * as fs from "node:fs";
@@ -1505,15 +1506,16 @@ const BASH_RESULT_MAX_LINES = 10;
 * same-turn events read as one continuous highlighted block instead of a
 * striped list.
 */
-const EventLine = memo(({ event, previous, depthOffset = 0, selected = false, anchorId, hideChildLabel = false, settleCodeEpoch = 0, liveSpawn }) => {
+const EventLine = memo(({ event, previous, depthOffset = 0, selected = false, anchorId, hideChildLabel = false, settleCodeEpoch = 0, liveSpawn, searchQuery, searchTitleMatch = false }) => {
 	const SURFACE = useSurfaces();
 	const gap = marginTopFor(event, previous);
+	const highlighted = selected;
 	return /* @__PURE__ */ jsx$1("box", {
 		id: anchorId,
 		style: {
-			marginTop: selected ? 0 : gap,
-			paddingTop: selected ? gap : 0,
-			backgroundColor: selected ? SURFACE.selection : void 0,
+			marginTop: 0,
+			paddingTop: gap,
+			backgroundColor: highlighted ? SURFACE.selection : SURFACE.background,
 			alignSelf: "stretch",
 			flexShrink: 0,
 			flexDirection: "column"
@@ -1523,9 +1525,11 @@ const EventLine = memo(({ event, previous, depthOffset = 0, selected = false, an
 			previous,
 			depthOffset,
 			hideChildLabel,
-			selected,
+			selected: highlighted,
 			settleCodeEpoch,
-			liveSpawn
+			liveSpawn,
+			searchQuery,
+			searchTitleMatch
 		})
 	});
 });
@@ -1558,8 +1562,8 @@ function Footer({ hints, context, cost = null, status = null, compactionTokens =
 		const timer = setInterval(() => setCompactTick((t) => t + 1), 1e3);
 		return () => clearInterval(timer);
 	}, [status]);
-	const compactLabel = status === "compacting" ? compactingLabel(compactionTokens, compactionStartedAt) : "";
-	const sW = status === "compacting" ? 2 + compactLabel.length : status === "asking" ? 3 : status ? 2 : 0;
+	const statusLabel = status === "compacting" ? compactingLabel(compactionTokens, compactionStartedAt) : status === "searching" ? " Searching messages…" : "";
+	const sW = status === "compacting" || status === "searching" ? 2 + statusLabel.length : status === "asking" ? 3 : status ? 2 : 0;
 	if (hW + sW + (rightW > 0 ? rightW + 1 : 0) <= inner) return /* @__PURE__ */ jsxs("box", {
 		style: {
 			flexDirection: "row",
@@ -1571,7 +1575,7 @@ function Footer({ hints, context, cost = null, status = null, compactionTokens =
 			/* @__PURE__ */ jsx$1(HintsText, { hints }),
 			/* @__PURE__ */ jsx$1(FooterStatusIcon, {
 				status,
-				compactLabel
+				label: statusLabel
 			}),
 			/* @__PURE__ */ jsx$1("box", { style: { flexGrow: 1 } }),
 			/* @__PURE__ */ jsx$1(RightStatus, {
@@ -1594,7 +1598,7 @@ function Footer({ hints, context, cost = null, status = null, compactionTokens =
 			},
 			children: [/* @__PURE__ */ jsx$1(HintsText, { hints: stackedHints }), /* @__PURE__ */ jsx$1(FooterStatusIcon, {
 				status,
-				compactLabel
+				label: statusLabel
 			})]
 		}), rightW > 0 && /* @__PURE__ */ jsxs("box", {
 			style: {
@@ -1625,16 +1629,16 @@ function RightStatus({ cost, context }) {
 * compacting adds a short label because background compaction can otherwise
 * look like an idle spinner.
 */
-function FooterStatusIcon({ status, compactLabel = "" }) {
+function FooterStatusIcon({ status, label = "" }) {
 	const COLOR = useColors();
 	if (!status) return null;
 	const glyph = status === "asking" ? /* @__PURE__ */ jsx$1("span", { children: "❓" }) : status === "busy" ? /* @__PURE__ */ jsx$1(StatusSpinner, { color: COLOR.warn }) : /* @__PURE__ */ jsx$1(StatusSpinner, { color: COLOR.accent });
 	return /* @__PURE__ */ jsxs("text", { children: [
 		/* @__PURE__ */ jsx$1("span", { children: " " }),
 		glyph,
-		status === "compacting" && /* @__PURE__ */ jsx$1("span", {
+		label && /* @__PURE__ */ jsx$1("span", {
 			fg: COLOR.accent,
-			children: compactLabel
+			children: label
 		})
 	] });
 }
@@ -1924,9 +1928,8 @@ function StatusSpinner({ color }) {
 		children: useSpinnerFrame()
 	});
 }
-function Transcript({ events, settings, selectedTurnId = null, busy = false }) {
+function Transcript({ events, settings, selectedTurnId = null, busy = false, searchQuery, searchPending = false, onLoadEarlier }) {
 	const COLOR = useColors();
-	const items = useMemo(() => partitionTranscript(events, settings), [events, settings]);
 	const showThrobber = busy && settings.showThrobber;
 	const codeSettle = useRef({
 		wasBusy: false,
@@ -1949,8 +1952,48 @@ function Transcript({ events, settings, selectedTurnId = null, busy = false }) {
 	codeSettle.current.wasBusy = busy;
 	const throbberLabel = events.length > 0 && events[events.length - 1].kind === "thinking" ? "Thinking" : void 0;
 	const ownership = useMemo(() => turnSelectionOwnership(events), [events]);
+	const searchMatches = useMemo(() => {
+		const direct = /* @__PURE__ */ new Set();
+		const callIds = /* @__PURE__ */ new Set();
+		const childIds = /* @__PURE__ */ new Set();
+		if (!searchQuery) return {
+			direct,
+			callIds,
+			childIds
+		};
+		const stack = [];
+		for (const event of events) {
+			if (event.kind === "spawn-start") stack.push(event);
+			if (searchHighlightRanges(streamEventSearchText(event), searchQuery).length > 0) {
+				direct.add(event);
+				if (event.callId) callIds.add(event.callId);
+				if ((event.depth ?? 0) > 0) {
+					for (const parent of stack) if (parent.childId) childIds.add(parent.childId);
+				}
+			}
+			if (event.kind === "spawn-end") {
+				const index = stack.findLastIndex((parent) => parent.childId === event.childId);
+				if (index >= 0) stack.splice(index);
+			}
+		}
+		return {
+			direct,
+			callIds,
+			childIds
+		};
+	}, [events, searchQuery]);
+	const items = useMemo(() => partitionTranscript(events, settings, searchQuery ? (event) => searchMatches.direct.has(event) : void 0), [
+		events,
+		settings,
+		searchQuery,
+		searchMatches
+	]);
 	const scrollboxRef = useRef(null);
 	const rowVisibility = useRef(createRowVisibilityStore());
+	const loadEarlierRef = useRef(onLoadEarlier);
+	loadEarlierRef.current = onLoadEarlier;
+	const earlierLoad = useRef(null);
+	const earlierLoadArmed = useRef(false);
 	useEffect(() => {
 		const timer = setInterval(() => {
 			const sb = scrollboxRef.current;
@@ -1959,9 +2002,45 @@ function Transcript({ events, settings, selectedTurnId = null, busy = false }) {
 				top: sb.viewport.y,
 				height: sb.viewport.height
 			});
+			const topThreshold = Math.max(4, Math.floor(sb.viewport.height / 4));
+			if (sb.scrollTop > topThreshold) earlierLoadArmed.current = true;
+			else if (earlierLoadArmed.current && !earlierLoad.current && loadEarlierRef.current && hiddenEarlierTranscriptCount(events) > 0) {
+				earlierLoadArmed.current = false;
+				const snapshot = {
+					oldHeight: sb.scrollHeight,
+					oldTop: sb.scrollTop
+				};
+				earlierLoad.current = snapshot;
+				if (!loadEarlierRef.current()) {
+					earlierLoad.current = null;
+					earlierLoadArmed.current = true;
+				}
+			}
 		}, 200);
 		return () => clearInterval(timer);
-	}, []);
+	}, [events]);
+	useEffect(() => {
+		const pending = earlierLoad.current;
+		if (!pending) return;
+		let cancelled = false;
+		let attempts = 0;
+		const restore = () => {
+			if (cancelled) return;
+			const sb = scrollboxRef.current;
+			if (attempts < 5 && (!sb || sb.scrollHeight <= pending.oldHeight)) {
+				attempts++;
+				requestAnimationFrame(restore);
+				return;
+			}
+			if (sb) sb.scrollTop = pending.oldTop + Math.max(0, sb.scrollHeight - pending.oldHeight);
+			earlierLoad.current = null;
+		};
+		const handle = requestAnimationFrame(restore);
+		return () => {
+			cancelled = true;
+			cancelAnimationFrame(handle);
+		};
+	}, [events]);
 	const modal = useModalState();
 	useKeyboard(useCallback((key) => {
 		if (modal?.isOpen) return;
@@ -1993,36 +2072,56 @@ function Transcript({ events, settings, selectedTurnId = null, busy = false }) {
 	}, [items, events]);
 	useEffect(() => {
 		if (!selectedTurnId) return;
-		const scrollbox = scrollboxRef.current;
-		if (!scrollbox) return;
-		const handle = requestAnimationFrame(() => {
+		let handle = 0;
+		let attempts = 0;
+		const align = () => {
+			const scrollbox = scrollboxRef.current;
+			if (!scrollbox) return;
+			const id = anchors.idByTurn.get(selectedTurnId);
+			if (searchQuery && id) {
+				const child = scrollbox.content.findDescendantById(id);
+				if (child && scrollbox.scrollHeight > scrollbox.viewport.height) {
+					scrollbox.scrollTop = child.y - scrollbox.content.y;
+					return;
+				}
+				if (attempts++ < 5) handle = requestAnimationFrame(align);
+				return;
+			}
 			const ownsLast = anchors.lastTurnId !== void 0 && ownership.get(anchors.lastTurnId) === selectedTurnId;
 			if (selectedTurnId === anchors.lastTurnId || ownsLast) {
 				scrollbox.scrollTop = scrollbox.scrollHeight;
 				return;
 			}
-			const id = anchors.idByTurn.get(selectedTurnId);
 			if (id) scrollbox.scrollChildIntoView(id);
-		});
+		};
+		handle = requestAnimationFrame(align);
 		return () => cancelAnimationFrame(handle);
 	}, [
 		selectedTurnId,
 		anchors,
-		ownership
+		ownership,
+		searchQuery
 	]);
-	if (items.length === 0 && !showThrobber) return /* @__PURE__ */ jsx$1(EmptyState, {});
+	if (items.length === 0 && !showThrobber) {
+		if (searchQuery) return searchPending ? /* @__PURE__ */ jsx$1("box", { style: { flexGrow: 1 } }) : /* @__PURE__ */ jsx$1("text", {
+			fg: COLOR.mute,
+			children: `No messages match “${searchQuery.trim()}”`
+		});
+		return /* @__PURE__ */ jsx$1(EmptyState, {});
+	}
 	return /* @__PURE__ */ jsx$1(RowVisibilityContext.Provider, {
 		value: rowVisibility.current.store,
 		children: /* @__PURE__ */ jsxs("scrollbox", {
 			ref: scrollboxRef,
+			id: "transcript-scrollbox",
 			focusable: false,
 			style: {
 				flexGrow: 1,
 				paddingLeft: 1,
 				paddingRight: 1
 			},
-			stickyScroll: true,
-			stickyStart: "bottom",
+			stickyScroll: !searchQuery,
+			stickyStart: searchQuery ? void 0 : "bottom",
 			verticalScrollbarOptions: {
 				width: 1,
 				trackOptions: {
@@ -2039,7 +2138,9 @@ function Transcript({ events, settings, selectedTurnId = null, busy = false }) {
 						selected: isTurnHighlighted(item.event, selectedTurnId, ownership),
 						anchorId: anchors.ids[i][0],
 						settleCodeEpoch: codeSettle.current.targets.has(item.event) ? codeSettle.current.epoch : 0,
-						liveSpawn: live?.[0]
+						liveSpawn: live?.[0],
+						searchQuery,
+						searchTitleMatch: item.event.kind === "tool" && item.event.callId !== void 0 && searchMatches.callIds.has(item.event.callId) || (item.event.kind === "spawn-start" || item.event.kind === "spawn-end") && item.event.childId !== void 0 && searchMatches.childIds.has(item.event.childId)
 					}, i);
 				}
 				return /* @__PURE__ */ jsx$1(SubagentBlock, {
@@ -2049,7 +2150,9 @@ function Transcript({ events, settings, selectedTurnId = null, busy = false }) {
 					anchorIds: anchors.ids[i],
 					codeSettleTargets: codeSettle.current.targets,
 					codeSettleEpoch: codeSettle.current.epoch,
-					live: liveByItem.get(i)
+					live: liveByItem.get(i),
+					searchQuery,
+					searchTitleMatches: searchMatches
 				}, i);
 			}), showThrobber && /* @__PURE__ */ jsx$1("box", {
 				style: { marginTop: items.length > 0 ? 1 : 0 },
@@ -2145,8 +2248,8 @@ function collapseCompletedSpawnStarts(events) {
 	}
 	return events.filter((_, i) => keep[i]);
 }
-function partitionTranscript(events, settings) {
-	const visible = collapseCompletedSpawnStarts(events).filter((e) => isVisible(e, settings));
+function partitionTranscript(events, settings, searchReveal) {
+	const visible = collapseCompletedSpawnStarts(events).filter((event) => isVisible(event, settings) || searchReveal !== void 0 && (event.depth ?? 0) === 0 && searchReveal(event));
 	if (visible.length === 0) return [];
 	if (settings.hideSubagentOutput) return visible.map((event, i) => ({
 		kind: "event",
@@ -2192,7 +2295,7 @@ function partitionTranscript(events, settings) {
 * indented twice. Grandchildren (depth ≥ 2) still indent further, so
 * nested subagents remain visually distinct.
 */
-function SubagentBlock({ events, previous, selectedTurnId = null, anchorIds, codeSettleTargets, codeSettleEpoch = 0, live }) {
+function SubagentBlock({ events, previous, selectedTurnId = null, anchorIds, codeSettleTargets, codeSettleEpoch = 0, live, searchQuery, searchTitleMatches }) {
 	const COLOR = useColors();
 	const childIds = useMemo(() => {
 		const set = /* @__PURE__ */ new Set();
@@ -2224,7 +2327,9 @@ function SubagentBlock({ events, previous, selectedTurnId = null, anchorIds, cod
 			anchorId: anchorIds?.[i],
 			hideChildLabel,
 			settleCodeEpoch: codeSettleTargets?.has(evt) ? codeSettleEpoch : 0,
-			liveSpawn: evt.kind === "spawn-start" ? live?.find((spawn) => spawn.id === evt.childId) : void 0
+			liveSpawn: evt.kind === "spawn-start" ? live?.find((spawn) => spawn.id === evt.childId) : void 0,
+			searchQuery,
+			searchTitleMatch: evt.kind === "tool" && evt.callId !== void 0 && searchTitleMatches?.callIds.has(evt.callId) || (evt.kind === "spawn-start" || evt.kind === "spawn-end") && evt.childId !== void 0 && searchTitleMatches?.childIds.has(evt.childId)
 		}, i))
 	});
 }
@@ -2233,8 +2338,9 @@ function SubagentBlock({ events, previous, selectedTurnId = null, anchorIds, cod
 * the left lane for the whole run; only the right tail changes:
 * active `2 turns · 14s · ⠋ tool call`, done `4 turns`.
 */
-function SpawnLifecycleMarker({ row, dim, event, hideChildLabel, live }) {
+function SpawnLifecycleMarker({ row, dim, event, hideChildLabel, live, searchMatch = false }) {
 	const COLOR = useColors();
+	const matchColor = resolveChipColor(useSurfaces().chips, "default");
 	const frame = useSpinnerFrame();
 	const terminal = event.kind === "spawn-end";
 	const failed = terminal && (event.text.startsWith("error") || event.text.startsWith("aborted"));
@@ -2259,7 +2365,8 @@ function SpawnLifecycleMarker({ row, dim, event, hideChildLabel, live }) {
 						children: terminal ? failed ? "✗ " : "🌳 " : "🌱 "
 					}),
 					!hideChildLabel && /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx$1("span", {
-						fg: COLOR.brand,
+						fg: searchMatch ? matchColor.fg : COLOR.brand,
+						bg: searchMatch ? matchColor.bg : void 0,
 						children: event.childId ?? "child"
 					}), /* @__PURE__ */ jsx$1("span", {
 						fg: COLOR.mute,
@@ -2334,7 +2441,7 @@ function rowStyle(paddingLeft) {
 		alignSelf: "stretch"
 	};
 }
-function EventLineImpl({ event, previous, depthOffset = 0, hideChildLabel = false, selected = false, settleCodeEpoch = 0, liveSpawn }) {
+function EventLineImpl({ event, previous, depthOffset = 0, hideChildLabel = false, selected = false, settleCodeEpoch = 0, liveSpawn, searchQuery, searchTitleMatch = false }) {
 	const COLOR = useColors();
 	const { settings } = useSettings();
 	const cleanText = stripTerminalControlChars(event.text);
@@ -2347,7 +2454,8 @@ function EventLineImpl({ event, previous, depthOffset = 0, hideChildLabel = fals
 		case "user-prompt": return /* @__PURE__ */ jsx$1(UserPromptBlock, {
 			text: safeText,
 			refs: event.refs,
-			attachments: event.attachments
+			attachments: event.attachments,
+			searchQuery
 		});
 		case "info": return /* @__PURE__ */ jsx$1("box", {
 			style: row,
@@ -2405,7 +2513,8 @@ function EventLineImpl({ event, previous, depthOffset = 0, hideChildLabel = fals
 				children: [/* @__PURE__ */ jsx$1(ToolCallBlock, {
 					event,
 					display: settings.toolCallDisplay === "full" ? "full" : "formatted",
-					dim: child
+					dim: child,
+					searchMatch: searchTitleMatch
 				}), event.tool === "todowrite" && /* @__PURE__ */ jsx$1(TodoInProgressList, {
 					input: event.input,
 					dim: child
@@ -2417,7 +2526,8 @@ function EventLineImpl({ event, previous, depthOffset = 0, hideChildLabel = fals
 			renderDefault: () => /* @__PURE__ */ jsx$1(ToolResultBlock, {
 				text: event.text,
 				indent: row.paddingLeft,
-				maxLines: isUserBashEvent(event) ? settings.showFullShellOutput ? Number.MAX_SAFE_INTEGER : BASH_RESULT_MAX_LINES : void 0
+				maxLines: isUserBashEvent(event) ? settings.showFullShellOutput ? Number.MAX_SAFE_INTEGER : BASH_RESULT_MAX_LINES : void 0,
+				searchQuery
 			})
 		});
 		case "custom": return /* @__PURE__ */ jsx$1("box", {
@@ -2462,13 +2572,15 @@ function EventLineImpl({ event, previous, depthOffset = 0, hideChildLabel = fals
 			dim: COLOR.dim,
 			event,
 			hideChildLabel,
-			live: liveSpawn
+			live: liveSpawn,
+			searchMatch: searchTitleMatch
 		});
 		case "spawn-end": return /* @__PURE__ */ jsx$1(SpawnLifecycleMarker, {
 			row,
 			dim: COLOR.dim,
 			event,
-			hideChildLabel
+			hideChildLabel,
+			searchMatch: searchTitleMatch
 		});
 		case "compact-summary": return /* @__PURE__ */ jsx$1(CompactSummaryBlock, {
 			event,
@@ -2636,9 +2748,10 @@ function CompactSummaryBlock({ event, indent }) {
 */
 /** Prompt chevron rendered ahead of every user-prompt block. */
 const USER_PROMPT_PREFIX = "❯ ";
-function UserPromptBlock({ text, refs, attachments }) {
+function UserPromptBlock({ text, refs, attachments, searchQuery }) {
 	const COLOR = useColors();
 	const SURFACE = useSurfaces();
+	const matchColor = resolveChipColor(SURFACE.chips, "default");
 	const boxStyle = {
 		border: true,
 		borderColor: COLOR.borderActive,
@@ -2671,20 +2784,30 @@ function UserPromptBlock({ text, refs, attachments }) {
 			})] }, `att-${idx}`);
 		})
 	}) : null;
-	if (!refs || refs.length === 0) return /* @__PURE__ */ jsxs("box", {
-		style: boxStyle,
-		children: [
-			text.length > 0 && /* @__PURE__ */ jsxs("text", { children: [/* @__PURE__ */ jsx$1("span", {
-				fg: COLOR.brand,
-				children: USER_PROMPT_PREFIX
-			}), text] }),
-			!text.length && attachmentChips && /* @__PURE__ */ jsx$1("text", {
-				fg: COLOR.brand,
-				children: USER_PROMPT_PREFIX
-			}),
-			attachmentChips
-		]
-	});
+	if (!refs || refs.length === 0) {
+		const ranges = searchQuery ? searchHighlightRanges(text, searchQuery) : [];
+		return /* @__PURE__ */ jsxs("box", {
+			style: boxStyle,
+			children: [
+				text.length > 0 && /* @__PURE__ */ jsxs("text", {
+					wrapMode: "word",
+					children: [/* @__PURE__ */ jsx$1("span", {
+						fg: COLOR.brand,
+						children: USER_PROMPT_PREFIX
+					}), highlightSegments(text, ranges).map((segment, i) => /* @__PURE__ */ jsx$1("span", {
+						fg: segment.highlighted ? matchColor.fg : void 0,
+						bg: segment.highlighted ? matchColor.bg : void 0,
+						children: segment.text
+					}, i))]
+				}),
+				!text.length && attachmentChips && /* @__PURE__ */ jsx$1("text", {
+					fg: COLOR.brand,
+					children: USER_PROMPT_PREFIX
+				}),
+				attachmentChips
+			]
+		});
+	}
 	const segments = splitPromptSegments(text, refs);
 	return /* @__PURE__ */ jsxs("box", {
 		style: boxStyle,
@@ -2697,7 +2820,14 @@ function UserPromptBlock({ text, refs, attachments }) {
 				fg: COLOR.brand,
 				children: USER_PROMPT_PREFIX
 			}), segments.map((seg, i) => {
-				if (seg.kind === "plain") return /* @__PURE__ */ jsx$1("text", { children: seg.text }, i);
+				if (seg.kind === "plain") {
+					const ranges = searchQuery ? searchHighlightRanges(seg.text, searchQuery) : [];
+					return /* @__PURE__ */ jsx$1("text", { children: highlightSegments(seg.text, ranges).map((part, j) => /* @__PURE__ */ jsx$1("span", {
+						fg: part.highlighted ? matchColor.fg : void 0,
+						bg: part.highlighted ? matchColor.bg : void 0,
+						children: part.text
+					}, j)) }, i);
+				}
 				const chip = resolveChipColor(SURFACE.chips, seg.providerId);
 				return /* @__PURE__ */ jsx$1("text", {
 					fg: chip.fg,
@@ -3132,33 +3262,64 @@ function CommandDetailBlock({ label, text, indent, diff }) {
 		})]
 	});
 }
-function ToolResultBlock({ text, indent, diff, maxLines = TOOL_RESULT_MAX_LINES }) {
+function ToolResultBlock({ text, indent, diff, maxLines = TOOL_RESULT_MAX_LINES, searchQuery }) {
 	const COLOR = useColors();
-	const rawLines = stripAnsiSequences(text).split("\n");
-	let end = rawLines.length;
-	while (end > 0 && rawLines[end - 1].trim() === "") end--;
-	if (end === 0) return null;
-	const lines = rawLines.slice(0, end);
-	const visible = lines.slice(0, maxLines);
-	const omitted = Math.max(0, lines.length - maxLines);
+	const matchColor = resolveChipColor(useSurfaces().chips, "default");
+	const { lines, start } = useMemo(() => {
+		const rawLines = stripAnsiSequences(text).split("\n");
+		let end = rawLines.length;
+		while (end > 0 && rawLines[end - 1].trim() === "") end--;
+		const trimmed = rawLines.slice(0, end);
+		let windowStart = 0;
+		if (searchQuery && trimmed.length > maxLines) {
+			const matchIdx = trimmed.findIndex((line) => searchHighlightRanges(line, searchQuery).length > 0);
+			if (matchIdx >= maxLines) windowStart = Math.min(Math.max(0, matchIdx - Math.floor(maxLines / 2)), trimmed.length - maxLines);
+		}
+		return {
+			lines: trimmed,
+			start: windowStart
+		};
+	}, [
+		text,
+		searchQuery,
+		maxLines
+	]);
+	if (lines.length === 0) return null;
+	const visible = lines.slice(start, start + maxLines);
+	const omittedBefore = start;
+	const omitted = Math.max(0, lines.length - start - maxLines);
 	return /* @__PURE__ */ jsxs("box", {
 		style: {
 			paddingLeft: indent,
 			flexDirection: "column"
 		},
-		children: [visible.map((line, i) => /* @__PURE__ */ jsxs("text", {
-			fg: COLOR.mute,
-			children: [/* @__PURE__ */ jsx$1("span", {
-				fg: COLOR.borderActive,
-				children: "┃ "
-			}), diff && line ? /* @__PURE__ */ jsx$1(DiffStatLine, { line }) : line || " "]
-		}, i)), omitted > 0 && /* @__PURE__ */ jsxs("text", {
-			fg: COLOR.mute,
-			children: [/* @__PURE__ */ jsx$1("span", {
-				fg: COLOR.borderActive,
-				children: "┃ "
-			}), `… ${omitted} more line${omitted === 1 ? "" : "s"}`]
-		})]
+		children: [
+			omittedBefore > 0 && /* @__PURE__ */ jsxs("text", {
+				fg: COLOR.mute,
+				children: [/* @__PURE__ */ jsx$1("span", {
+					fg: COLOR.borderActive,
+					children: "┃ "
+				}), `… ${omittedBefore} earlier line${omittedBefore === 1 ? "" : "s"}`]
+			}),
+			visible.map((line, i) => /* @__PURE__ */ jsxs("text", {
+				fg: COLOR.mute,
+				children: [/* @__PURE__ */ jsx$1("span", {
+					fg: COLOR.borderActive,
+					children: "┃ "
+				}), diff && line ? /* @__PURE__ */ jsx$1(DiffStatLine, { line }) : highlightSegments(line || " ", searchQuery ? searchHighlightRanges(line, searchQuery) : []).map((segment, j) => /* @__PURE__ */ jsx$1("span", {
+					fg: segment.highlighted ? matchColor.fg : COLOR.mute,
+					bg: segment.highlighted ? matchColor.bg : void 0,
+					children: segment.text
+				}, j))]
+			}, i)),
+			omitted > 0 && /* @__PURE__ */ jsxs("text", {
+				fg: COLOR.mute,
+				children: [/* @__PURE__ */ jsx$1("span", {
+					fg: COLOR.borderActive,
+					children: "┃ "
+				}), `… ${omitted} more line${omitted === 1 ? "" : "s"}`]
+			})
+		]
 	});
 }
 function EditDiffBlock({ payload, dim }) {
@@ -3515,8 +3676,9 @@ function HunkBlock({ index, hunk, outcome, tool, path, filetype, mdStyle, COLOR,
 	});
 }
 const FULL_VIEW_MAX_INPUT_BYTES = 32 * 1024;
-function ToolCallBlock({ event, display, dim }) {
+function ToolCallBlock({ event, display, dim, searchMatch = false }) {
 	const COLOR = useColors();
+	const matchColor = resolveChipColor(useSurfaces().chips, "default");
 	const mdStyle = useMdStyle();
 	const name = event.tool ?? "";
 	const verb = displayNameFor(name, event.input);
@@ -3544,7 +3706,8 @@ function ToolCallBlock({ event, display, dim }) {
 					children: "↳ "
 				}),
 				/* @__PURE__ */ jsx$1("span", {
-					fg: dim ? COLOR.dim : COLOR.model,
+					fg: searchMatch ? matchColor.fg : dim ? COLOR.dim : COLOR.model,
+					bg: searchMatch ? matchColor.bg : void 0,
 					children: verb
 				}),
 				/* @__PURE__ */ jsx$1("span", {
@@ -3576,7 +3739,8 @@ function ToolCallBlock({ event, display, dim }) {
 				children: "↳ "
 			}),
 			/* @__PURE__ */ jsx$1("span", {
-				fg: dim ? COLOR.dim : COLOR.model,
+				fg: searchMatch ? matchColor.fg : dim ? COLOR.dim : COLOR.model,
+				bg: searchMatch ? matchColor.bg : void 0,
 				children: verb
 			}),
 			line?.target && /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx$1("span", {
@@ -4946,6 +5110,255 @@ async function resolveExtensionModalNode(node) {
 	return loaded;
 }
 //#endregion
+//#region src/tui/history-search-worker-client.ts
+let nextClientId = 1;
+/** Mirror of the TUI's ZIDANE_DEBUG-gated logger — silent by default. */
+const debugFallback = process.env.ZIDANE_DEBUG ? (op, error) => console.error(`[zidane/tui] history search ${op} fell back to the main thread:`, error) : () => {};
+function workerUrl() {
+	if (typeof Bun !== "undefined" && Bun.isStandaloneExecutable) return new URL("./history-search-worker.ts", import.meta.url);
+	return new URL(import.meta.url.endsWith(".ts") ? "./history-search-worker.ts" : "./history-search-worker.js", import.meta.url);
+}
+var HistorySearchWorkerClient = class {
+	createWorker;
+	worker = null;
+	constructor(createWorker = () => new Worker(workerUrl(), {
+		type: "module",
+		smol: true
+	})) {
+		this.createWorker = createWorker;
+	}
+	indexes = /* @__PURE__ */ new WeakMap();
+	registrations = /* @__PURE__ */ new Map();
+	rebuilds = /* @__PURE__ */ new Map();
+	pending = /* @__PURE__ */ new Map();
+	nextRequestId = 1;
+	unavailable = false;
+	prewarm() {
+		if (this.unavailable) return;
+		try {
+			this.ensureWorker();
+		} catch {}
+	}
+	async build(turns, signal) {
+		signal?.throwIfAborted();
+		const indexId = `search-index-${nextClientId++}`;
+		if (this.unavailable) return {
+			indexId,
+			length: turns.length,
+			turns
+		};
+		try {
+			return {
+				...await this.request({
+					type: "build",
+					indexId,
+					turns
+				}, signal),
+				turns
+			};
+		} catch (error) {
+			if (signal?.aborted) throw signal.reason;
+			debugFallback("build", error);
+			return {
+				indexId,
+				length: turns.length,
+				turns
+			};
+		}
+	}
+	async search(index, query, limit, signal) {
+		if (this.unavailable) return searchSessionIndexAsync(await this.fallbackIndex(index, signal), query, {
+			limit,
+			signal
+		});
+		try {
+			const indexId = "indexId" in index ? index.indexId : await this.register(index);
+			return await this.request({
+				type: "search",
+				indexId,
+				query,
+				limit
+			}, signal);
+		} catch (error) {
+			if (signal?.aborted) throw signal.reason;
+			if ("indexId" in index && error instanceof Error && error.message.startsWith("Unknown search index:")) {
+				await this.rebuild(index);
+				return this.request({
+					type: "search",
+					indexId: index.indexId,
+					query,
+					limit
+				}, signal);
+			}
+			debugFallback("search", error);
+			return searchSessionIndexAsync(await this.fallbackIndex(index, signal), query, {
+				limit,
+				signal
+			});
+		}
+	}
+	async history(index, query, maxExcerpts, signal) {
+		if (this.unavailable) return searchSessionHistoryIndexAsync(await this.fallbackIndex(index, signal), query, maxExcerpts, void 0, signal);
+		try {
+			const indexId = "indexId" in index ? index.indexId : await this.register(index);
+			return await this.request({
+				type: "history",
+				indexId,
+				query,
+				maxExcerpts
+			}, signal);
+		} catch (error) {
+			if (signal?.aborted) throw signal.reason;
+			if ("indexId" in index && error instanceof Error && error.message.startsWith("Unknown search index:")) {
+				await this.rebuild(index);
+				return this.request({
+					type: "history",
+					indexId: index.indexId,
+					query,
+					maxExcerpts
+				}, signal);
+			}
+			debugFallback("history", error);
+			return searchSessionHistoryIndexAsync(await this.fallbackIndex(index, signal), query, maxExcerpts, void 0, signal);
+		}
+	}
+	terminate() {
+		this.worker?.terminate();
+		this.worker = null;
+		const error = /* @__PURE__ */ new Error("History search worker terminated");
+		for (const pending of this.pending.values()) pending.reject(error);
+		this.pending.clear();
+		this.registrations.clear();
+		this.rebuilds.clear();
+	}
+	/** Re-register an evicted worker index; concurrent callers share one build. */
+	rebuild(index) {
+		const inFlight = this.rebuilds.get(index.indexId);
+		if (inFlight) return inFlight;
+		const rebuild = this.request({
+			type: "build",
+			indexId: index.indexId,
+			turns: index.turns
+		}).then(() => {}).finally(() => this.rebuilds.delete(index.indexId));
+		this.rebuilds.set(index.indexId, rebuild);
+		return rebuild;
+	}
+	fallbackIndex(index, signal) {
+		if (!("indexId" in index)) return Promise.resolve(index);
+		if (!index.fallback) index.fallback = buildSessionSearchIndexAsync(index.turns).catch((error) => {
+			index.fallback = void 0;
+			throw error;
+		});
+		signal?.throwIfAborted();
+		return index.fallback;
+	}
+	ensureWorker() {
+		if (this.worker) return this.worker;
+		let worker;
+		try {
+			worker = this.createWorker();
+		} catch (error) {
+			this.disable(error);
+			throw error;
+		}
+		worker.onmessage = (event) => this.onMessage(event.data);
+		worker.onerror = (event) => this.disable(event.error ?? new Error(event.message));
+		this.worker = worker;
+		return worker;
+	}
+	register(index) {
+		const known = this.indexes.get(index);
+		if (known) {
+			const pending = this.registrations.get(known);
+			return pending ? pending.then(() => known) : Promise.resolve(known);
+		}
+		const indexId = `search-index-${nextClientId++}`;
+		this.indexes.set(index, indexId);
+		const registration = new Promise((resolve, reject) => {
+			const worker = this.ensureWorker();
+			let onRegistered;
+			const onError = () => {
+				worker.removeEventListener("message", onRegistered);
+				this.registrations.delete(indexId);
+				reject(/* @__PURE__ */ new Error("History search worker registration failed"));
+			};
+			onRegistered = (event) => {
+				if (event.data.type !== "registered" || event.data.indexId !== indexId) return;
+				worker.removeEventListener("message", onRegistered);
+				worker.removeEventListener("error", onError);
+				this.registrations.delete(indexId);
+				resolve();
+			};
+			worker.addEventListener("message", onRegistered);
+			worker.addEventListener("error", onError, { once: true });
+			try {
+				worker.postMessage({
+					type: "register",
+					indexId,
+					index
+				});
+			} catch (error) {
+				worker.removeEventListener("message", onRegistered);
+				worker.removeEventListener("error", onError);
+				reject(error instanceof Error ? error : new Error(String(error)));
+			}
+		});
+		this.registrations.set(indexId, registration);
+		return registration.then(() => indexId);
+	}
+	request(payload, signal) {
+		signal?.throwIfAborted();
+		const requestId = this.nextRequestId++;
+		const worker = this.ensureWorker();
+		return new Promise((resolve, reject) => {
+			const abort = () => {
+				worker.postMessage({
+					type: "cancel",
+					requestId
+				});
+				this.pending.delete(requestId);
+				reject(signal?.reason ?? new DOMException("Aborted", "AbortError"));
+			};
+			signal?.addEventListener("abort", abort, { once: true });
+			this.pending.set(requestId, {
+				resolve: (value) => {
+					signal?.removeEventListener("abort", abort);
+					resolve(value);
+				},
+				reject: (error) => {
+					signal?.removeEventListener("abort", abort);
+					reject(error);
+				}
+			});
+			try {
+				worker.postMessage({
+					...payload,
+					requestId
+				});
+			} catch (error) {
+				this.pending.delete(requestId);
+				signal?.removeEventListener("abort", abort);
+				reject(error instanceof Error ? error : new Error(String(error)));
+			}
+		});
+	}
+	onMessage(response) {
+		if (response.requestId === void 0) return;
+		const pending = this.pending.get(response.requestId);
+		if (!pending) return;
+		this.pending.delete(response.requestId);
+		if (response.type === "error") pending.reject(new Error(response.message ?? "History search worker failed"));
+		else pending.resolve(response.result);
+	}
+	disable(error) {
+		this.unavailable = true;
+		const reason = error instanceof Error ? error : new Error(String(error));
+		for (const pending of this.pending.values()) pending.reject(reason);
+		this.pending.clear();
+		this.terminate();
+	}
+};
+//#endregion
 //#region src/tui/keybindings-modal.tsx
 function KeybindingsModal({ bindings, extensionRows, filePath, onEditFile, onClose }) {
 	const SURFACE = useSurfaces();
@@ -5413,6 +5826,38 @@ function OptionRow({ option, isEnabled, isFocused, highlightBg }) {
 */
 /** Visible rows in the windowed list. Keeps the modal a stable size on long catalogs. */
 const VISIBLE_ROWS = 10;
+/**
+* Promote selected entries in SELECTION order, then append every unselected
+* row in its original catalog order. Pure/non-mutating and collision-safe:
+* duplicate/missing selection keys are ignored. Call only for an empty query
+* — search results must retain `filterModelCatalog`'s relevance order.
+*/
+function selectedModelsFirst(entries, selectedKeys, keyOf) {
+	if (selectedKeys.length === 0) return [...entries];
+	const byKey = new Map(entries.map((entry) => [keyOf(entry), entry]));
+	const selected = [];
+	const promoted = /* @__PURE__ */ new Set();
+	for (const key of selectedKeys) {
+		const entry = byKey.get(key);
+		if (!entry || promoted.has(key)) continue;
+		selected.push(entry);
+		promoted.add(key);
+	}
+	return [...selected, ...entries.filter((entry) => !promoted.has(keyOf(entry)))];
+}
+function providerModelKey(providerKey, modelId) {
+	return `${providerKey}\u0000${modelId}`;
+}
+/** Move one selected entry by one priority slot; boundary/missing = identity. */
+function reorderSelectedModel(selected, key, delta, keyOf) {
+	const from = selected.findIndex((entry) => keyOf(entry) === key);
+	const to = from + delta;
+	if (from < 0 || to < 0 || to >= selected.length) return selected;
+	const next = [...selected];
+	const [entry] = next.splice(from, 1);
+	next.splice(to, 0, entry);
+	return next;
+}
 function ModelPickerModal({ providers, modelsFor, current, onPick, chain, onApplyChain }) {
 	const COLOR = useColors();
 	const SURFACE = useSurfaces();
@@ -5430,13 +5875,6 @@ function ModelPickerModal({ providers, modelsFor, current, onPick, chain, onAppl
 		modelsFor,
 		current
 	]);
-	const filtered = useMemo(() => filterModelCatalog(catalog, query), [catalog, query]);
-	const [selectedIdx, setSelectedIdx] = useState(() => Math.max(0, indexOfEntry(catalog, current)));
-	const handleQueryChange = useCallback((next) => {
-		setQuery(next);
-		setSelectedIdx(0);
-	}, []);
-	const safeIndex = filtered.length === 0 ? 0 : Math.min(selectedIdx, filtered.length - 1);
 	const chainMode = onApplyChain !== void 0;
 	const [initialChain] = useState(() => chain && chain.length > 0 ? [...chain] : [{
 		provider: current.providerKey,
@@ -5444,6 +5882,21 @@ function ModelPickerModal({ providers, modelsFor, current, onPick, chain, onAppl
 	}]);
 	const [chainState, setChainState] = useState(initialChain);
 	const modalApi = useModalState();
+	const filtered = useMemo(() => {
+		const matches = filterModelCatalog(catalog, query);
+		if (query.trim()) return matches;
+		return selectedModelsFirst(matches, chainState.map((pick) => providerModelKey(pick.provider, pick.model)), (row) => providerModelKey(row.providerKey, row.model.id));
+	}, [
+		catalog,
+		query,
+		chainState
+	]);
+	const [selectedIdx, setSelectedIdx] = useState(0);
+	const handleQueryChange = useCallback((next) => {
+		setQuery(next);
+		setSelectedIdx(0);
+	}, []);
+	const safeIndex = filtered.length === 0 ? 0 : Math.min(selectedIdx, filtered.length - 1);
 	const commit = () => {
 		const row = filtered[safeIndex];
 		if (!row) return;
@@ -5479,6 +5932,26 @@ function ModelPickerModal({ providers, modelsFor, current, onPick, chain, onAppl
 		};
 	}, [filtered, safeIndex]);
 	useKeyboard((key) => {
+		if (key.ctrl && key.shift && (key.name === "up" || key.name === "down")) {
+			if (chainMode) {
+				const row = filtered[safeIndex];
+				if (row) {
+					const keyOf = (entry) => providerModelKey(entry.provider, entry.model);
+					const selectedKey = providerModelKey(row.providerKey, row.model.id);
+					const delta = key.name === "up" ? -1 : 1;
+					const reordered = reorderSelectedModel(chainState, selectedKey, delta, keyOf);
+					if (reordered !== chainState) {
+						setChainState([...reordered]);
+						if (!query.trim()) {
+							const served = new Set(catalog.map((entry) => providerModelKey(entry.providerKey, entry.model.id)));
+							const next = reordered.filter((entry) => served.has(keyOf(entry))).findIndex((entry) => keyOf(entry) === selectedKey);
+							if (next >= 0) setSelectedIdx(next);
+						}
+					}
+				}
+			}
+			return;
+		}
 		if (key.name === "up") {
 			setSelectedIdx((i) => {
 				if (filtered.length === 0) return i;
@@ -5554,6 +6027,10 @@ function ModelPickerModal({ providers, modelsFor, current, onPick, chain, onAppl
 						children: "↵"
 					}),
 					chainMode ? " add/remove · " : " select · ",
+					chainMode && /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx$1("span", {
+						fg: COLOR.warn,
+						children: "ctrl+shift+↑↓"
+					}), " reorder · "] }),
 					/* @__PURE__ */ jsx$1("span", {
 						fg: COLOR.warn,
 						children: "esc"
@@ -5606,23 +6083,41 @@ function ModelSelectList({ catalog, multi = false, initial, onApply, onCancel, v
 			return true;
 		});
 	}, [catalog]);
-	const filtered = useMemo(() => filterModelCatalog(deduped, query), [deduped, query]);
-	const [selectedIdx, setSelectedIdx] = useState(() => {
-		const first = initial[0];
-		const idx = first ? deduped.findIndex((e) => e.model.id === first) : -1;
-		return Math.max(0, idx);
+	const [initialPicks] = useState(() => {
+		const known = new Set(deduped.map((e) => e.model.id));
+		return initial.filter((id) => known.has(id));
 	});
+	const [picks, setPicks] = useState(initialPicks);
+	const filtered = useMemo(() => {
+		const matches = filterModelCatalog(deduped, query);
+		return query.trim() ? matches : selectedModelsFirst(matches, picks, (row) => row.model.id);
+	}, [
+		deduped,
+		query,
+		picks
+	]);
+	const [selectedIdx, setSelectedIdx] = useState(0);
 	const handleQueryChange = useCallback((next) => {
 		setQuery(next);
 		setSelectedIdx(0);
 	}, []);
 	const safeIndex = filtered.length === 0 ? 0 : Math.min(selectedIdx, filtered.length - 1);
-	const [initialPicks] = useState(() => {
-		const known = new Set(deduped.map((e) => e.model.id));
-		return initial.filter((id) => known.has(id));
-	});
-	const [picks, setPicks] = useState(initialPicks);
 	useKeyboard((key) => {
+		if (key.ctrl && key.shift && (key.name === "up" || key.name === "down")) {
+			if (multi) {
+				const row = filtered[safeIndex];
+				if (row) {
+					const delta = key.name === "up" ? -1 : 1;
+					const from = picks.indexOf(row.model.id);
+					const reordered = reorderSelectedModel(picks, row.model.id, delta, (id) => id);
+					if (reordered !== picks) {
+						setPicks(reordered);
+						if (!query.trim()) setSelectedIdx(from + delta);
+					}
+				}
+			}
+			return;
+		}
 		if (key.name === "up" || key.name === "down") {
 			setSelectedIdx((i) => {
 				if (filtered.length === 0) return i;
@@ -5724,6 +6219,10 @@ function ModelSelectList({ catalog, multi = false, initial, onApply, onCancel, v
 						children: "↵"
 					}),
 					multi ? " add/remove · " : " select · ",
+					multi && /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx$1("span", {
+						fg: COLOR.warn,
+						children: "ctrl+shift+↑↓"
+					}), " reorder · "] }),
 					/* @__PURE__ */ jsx$1("span", {
 						fg: COLOR.warn,
 						children: "esc"
@@ -9294,21 +9793,27 @@ function isSessionRowId(rowId) {
 }
 /** Page-up / page-down jump size — half a typical visible window. */
 const PAGE_JUMP = 6;
-function SessionsScreen({ sessions, currentId, focusedSessionId, onPick, onCreate, onFocusChange, showAllProjects = false, onToggleScope, currentProjectRoot }) {
+function SessionsScreen({ sessions, currentId, focusedSessionId, onPick, onCreate, onFocusChange, contentMatches = /* @__PURE__ */ new Map(), contentSearching = false, contentSearchProgress = {
+	done: 0,
+	total: 0
+}, onSearchQueryChange, showAllProjects = false, onToggleScope, currentProjectRoot }) {
 	const focused = useModalAwareFocus();
 	const COLOR = useColors();
 	const inputRef = useRef(null);
-	const [query, setQuery] = useState("");
-	const filteredSessions = useMemo(() => {
-		const trimmed = query.trim().toLowerCase();
-		if (!trimmed) return sessions;
-		const terms = trimmed.split(/\s+/);
-		return sessions.filter((meta) => {
-			const projectBasename = meta.projectRoot?.split("/").pop() ?? "";
-			const corpus = `${meta.title} ${projectBasename} ${meta.projectRoot ?? ""}`.toLowerCase();
-			return terms.every((t) => corpus.includes(t));
-		});
-	}, [sessions, query]);
+	const scrollboxRef = useRef(null);
+	const [query, setQueryState] = useState("");
+	const searchChangeRef = useRef(onSearchQueryChange);
+	searchChangeRef.current = onSearchQueryChange;
+	useEffect(() => () => searchChangeRef.current?.(""), []);
+	const setQuery = useCallback((next) => {
+		setQueryState(next);
+		onSearchQueryChange?.(next);
+	}, [onSearchQueryChange]);
+	const filteredSessions = useMemo(() => filterSessionSearchCatalog(sessions, query, contentMatches), [
+		sessions,
+		query,
+		contentMatches
+	]);
 	const rows = useMemo(() => [{
 		kind: "new",
 		rowId: NEW_SESSION_ROW_ID,
@@ -9316,8 +9821,9 @@ function SessionsScreen({ sessions, currentId, focusedSessionId, onPick, onCreat
 	}, ...filteredSessions.map((meta) => ({
 		kind: "session",
 		rowId: meta.id,
-		meta
-	}))], [filteredSessions]);
+		meta,
+		...query.trim() && contentMatches.get(meta.id) ? { contentMatch: contentMatches.get(meta.id) } : {}
+	}))], [filteredSessions, contentMatches]);
 	useEffect(() => {
 		if (focused) inputRef.current?.focus();
 	}, [focused]);
@@ -9329,6 +9835,33 @@ function SessionsScreen({ sessions, currentId, focusedSessionId, onPick, onCreat
 		}
 		return rows.length > 1 ? 1 : 0;
 	}, [rows, focusedSessionId]);
+	const lastScrolledCursorRef = useRef(-1);
+	useEffect(() => {
+		if (!focused) return;
+		if (lastScrolledCursorRef.current === cursorIndex) return;
+		const scrollbox = scrollboxRef.current;
+		if (!scrollbox) return;
+		let handle = 0;
+		let attempts = 0;
+		const align = () => {
+			const child = scrollbox.content.findDescendantById(`session-row-${cursorIndex}`);
+			if (child) {
+				const childTop = child.y - scrollbox.content.y;
+				const childBottom = childTop + child.height;
+				if (childTop < scrollbox.scrollTop) scrollbox.scrollTop = childTop;
+				else if (childBottom > scrollbox.scrollTop + scrollbox.viewport.height) scrollbox.scrollTop = childBottom - scrollbox.viewport.height;
+				lastScrolledCursorRef.current = cursorIndex;
+				return;
+			}
+			if (attempts++ < 5) handle = requestAnimationFrame(align);
+		};
+		handle = requestAnimationFrame(align);
+		return () => cancelAnimationFrame(handle);
+	}, [
+		cursorIndex,
+		focused,
+		rows
+	]);
 	useEffect(() => {
 		if (!onFocusChange) return;
 		if (focusedSessionId === "__new__") return;
@@ -9449,44 +9982,66 @@ function SessionsScreen({ sessions, currentId, focusedSessionId, onPick, onCreat
 				flexDirection: "column",
 				flexGrow: 1
 			},
-			children: [/* @__PURE__ */ jsx$1("box", {
-				style: {
-					border: true,
-					borderColor: COLOR.border,
-					paddingLeft: 1,
-					paddingRight: 1,
-					height: 3,
-					flexShrink: 0,
-					marginBottom: 1
-				},
-				children: /* @__PURE__ */ jsx$1("input", {
-					ref: inputRef,
-					focused,
-					placeholder: "filter sessions — title or project…",
-					onInput: setQuery,
-					onSubmit: () => {},
-					style: { flexGrow: 1 }
-				})
-			}), /* @__PURE__ */ jsxs("scrollbox", {
-				focusable: false,
-				style: { flexGrow: 1 },
-				children: [rows.map((row, idx) => /* @__PURE__ */ jsx$1(SessionRow, {
-					row,
-					focused: idx === cursorIndex && focused,
-					isCurrent: row.kind === "session" && row.rowId === currentId,
-					showProject: showAllProjects,
-					currentProjectRoot
-				}, row.rowId)), filteredSessions.length === 0 && query.trim().length > 0 && /* @__PURE__ */ jsxs("text", {
-					wrapMode: "none",
-					children: [/* @__PURE__ */ jsx$1("span", {
-						fg: COLOR.mute,
-						children: "    no sessions match "
-					}), /* @__PURE__ */ jsx$1("span", {
-						fg: COLOR.warn,
-						children: query.trim()
+			children: [
+				/* @__PURE__ */ jsx$1("box", {
+					style: {
+						border: true,
+						borderColor: COLOR.border,
+						paddingLeft: 1,
+						paddingRight: 1,
+						height: 3,
+						flexShrink: 0,
+						marginBottom: 1
+					},
+					children: /* @__PURE__ */ jsx$1("input", {
+						id: "session-search-input",
+						ref: inputRef,
+						focused,
+						placeholder: "search sessions — title, project, or message content…",
+						onInput: setQuery,
+						onSubmit: () => {},
+						style: { flexGrow: 1 }
+					})
+				}),
+				/* @__PURE__ */ jsxs("scrollbox", {
+					ref: scrollboxRef,
+					id: "sessions-scrollbox",
+					focusable: false,
+					style: { flexGrow: 1 },
+					children: [rows.map((row, idx) => /* @__PURE__ */ jsx$1(SessionRow, {
+						anchorId: `session-row-${idx}`,
+						row,
+						separator: idx > 0,
+						focused: idx === cursorIndex && focused,
+						isCurrent: row.kind === "session" && row.rowId === currentId,
+						showProject: showAllProjects,
+						currentProjectRoot
+					}, row.rowId)), filteredSessions.length === 0 && query.trim().length > 0 && /* @__PURE__ */ jsxs("text", {
+						wrapMode: "none",
+						children: [
+							/* @__PURE__ */ jsx$1("span", {
+								fg: COLOR.mute,
+								children: contentSearching ? "    searching conversation history for " : "    no sessions match "
+							}),
+							/* @__PURE__ */ jsx$1("span", {
+								fg: COLOR.warn,
+								children: query.trim()
+							}),
+							contentSearching && /* @__PURE__ */ jsx$1("span", {
+								fg: COLOR.mute,
+								children: "…"
+							})
+						]
 					})]
-				})]
-			})]
+				}),
+				/* @__PURE__ */ jsx$1("box", {
+					style: {
+						height: 1,
+						flexShrink: 0
+					},
+					children: contentSearching && /* @__PURE__ */ jsx$1(Spinner, { label: `searching conversation history ${contentSearchProgress.done}/${contentSearchProgress.total}` })
+				})
+			]
 		}), /* @__PURE__ */ jsx$1(TitleOverlay, {
 			title: "sessions",
 			meta: titleMeta
@@ -9502,18 +10057,25 @@ function SessionsScreen({ sessions, currentId, focusedSessionId, onPick, onCreat
 * exactly the width of the focus + current markers above — so the first
 * stat (the turn count) sits flush under the title's first letter.
 */
-function SessionRow({ row, focused, isCurrent, showProject = false, currentProjectRoot }) {
+function SessionRow({ row, anchorId, focused, isCurrent, separator = false, showProject = false, currentProjectRoot }) {
 	const COLOR = useColors();
+	const SURFACE = useSurfaces();
 	const STATS_INDENT = "    ";
 	const focusMark = focused ? "▶ " : "  ";
 	const focusColor = focused ? COLOR.brand : COLOR.mute;
 	const titleColor = focused ? COLOR.brand : COLOR.dim;
+	const rowStyle = {
+		flexDirection: "column",
+		flexShrink: 0,
+		alignSelf: "stretch",
+		...separator ? {
+			border: ["top"],
+			borderColor: COLOR.border
+		} : {}
+	};
 	if (row.kind === "new") return /* @__PURE__ */ jsxs("box", {
-		style: {
-			flexDirection: "column",
-			flexShrink: 0,
-			alignSelf: "stretch"
-		},
+		id: anchorId,
+		style: rowStyle,
 		children: [/* @__PURE__ */ jsxs("text", {
 			wrapMode: "none",
 			children: [
@@ -9545,11 +10107,8 @@ function SessionRow({ row, focused, isCurrent, showProject = false, currentProje
 	const currentMark = isCurrent ? "● " : "  ";
 	const currentColor = isCurrent ? COLOR.accent : COLOR.mute;
 	return /* @__PURE__ */ jsxs("box", {
-		style: {
-			flexDirection: "column",
-			flexShrink: 0,
-			alignSelf: "stretch"
-		},
+		id: anchorId,
+		style: rowStyle,
 		children: [
 			/* @__PURE__ */ jsxs("text", {
 				wrapMode: "none",
@@ -9611,6 +10170,38 @@ function SessionRow({ row, focused, isCurrent, showProject = false, currentProje
 					fg: COLOR.mute,
 					children: STATS_INDENT
 				}), renderProjectLabel(meta.projectRoot, currentProjectRoot, COLOR)]
+			}),
+			row.contentMatch && /* @__PURE__ */ jsxs("box", {
+				style: {
+					flexDirection: "column",
+					flexShrink: 0,
+					marginTop: 1,
+					marginLeft: 4,
+					paddingLeft: 1,
+					border: ["left"],
+					borderColor: COLOR.border
+				},
+				children: [/* @__PURE__ */ jsxs("text", {
+					wrapMode: "none",
+					children: [/* @__PURE__ */ jsx$1("span", {
+						fg: COLOR.brand,
+						children: "matches"
+					}), /* @__PURE__ */ jsx$1("span", {
+						fg: COLOR.mute,
+						children: ` · ${row.contentMatch.matchedTurnIds.length} message${row.contentMatch.matchedTurnIds.length === 1 ? "" : "s"}`
+					})]
+				}), row.contentMatch.excerpts.slice(0, 3).map((excerpt, i) => /* @__PURE__ */ jsxs("text", {
+					fg: COLOR.dim,
+					wrapMode: "none",
+					children: [/* @__PURE__ */ jsx$1("span", {
+						fg: COLOR.mute,
+						children: `${excerpt.role === "user" ? "you" : excerpt.role} · `
+					}), highlightSegments(excerpt.text, excerpt.highlighted).map((segment, j) => /* @__PURE__ */ jsx$1("span", {
+						fg: segment.highlighted ? COLOR.warn : COLOR.dim,
+						...segment.highlighted ? { bg: SURFACE.selection } : {},
+						children: segment.text
+					}, j))]
+				}, `${excerpt.turnId}:${i}`))]
 			})
 		]
 	});
@@ -9708,7 +10299,10 @@ const MIME_BY_EXT = {
 * default-value reference at the prop destructure.
 */
 const EMPTY_QUEUED_MESSAGES = [];
-function ChatScreen({ cwd, events, busy, compacting = false, queuedMessages = EMPTY_QUEUED_MESSAGES, queueSelectionIndex = null, queueShortcuts, onEnterQueueFromEmptyPrompt, settings, onSubmit, session, pending, onApproval, pendingInteraction, onInteraction, completionProviders, inlineAutocompleteProviders, onCompletionTab, enterSelectsCompletion, onPopupOpenChange, selectedTurnId, promptTriggerHints, attachImageBinding, editorBinding, sessionDetailsBinding, liveSession = null }) {
+function shouldRenderTranscriptSearch(searchMode, query) {
+	return searchMode && query.trim().length > 0;
+}
+function ChatScreen({ cwd, events, busy, compacting = false, queuedMessages = EMPTY_QUEUED_MESSAGES, queueSelectionIndex = null, queueShortcuts, onEnterQueueFromEmptyPrompt, settings, onSubmit, session, pending, onApproval, pendingInteraction, onInteraction, completionProviders, inlineAutocompleteProviders, onCompletionTab, enterSelectsCompletion, onPopupOpenChange, selectedTurnId, transcriptSearchMode = false, transcriptSearchQuery = "", transcriptSearchEvents = [], transcriptSearchSearching = false, onTranscriptSearchModeChange, onTranscriptSearchQueryChange, onTranscriptSearchNavigate, onTranscriptSearchOpen, onLoadEarlierTranscript, promptTriggerHints, attachImageBinding, editorBinding, sessionDetailsBinding, liveSession = null }) {
 	const COLOR = useColors();
 	const titleText = session?.title ?? "New session";
 	const sessionShortcutKey = formatBindingForDisplay(sessionDetailsBinding);
@@ -9766,6 +10360,8 @@ function ChatScreen({ cwd, events, busy, compacting = false, queuedMessages = EM
 		hasStatusIcon
 	]);
 	const userPrompts = useMemo(() => promptHistoryFromEvents(events), [events]);
+	const transcriptSearchActive = shouldRenderTranscriptSearch(transcriptSearchMode, transcriptSearchQuery);
+	const displayedEvents = transcriptSearchActive ? transcriptSearchEvents : events;
 	const [completionPopupOpen, setCompletionPopupOpen] = useState(false);
 	const handlePopupOpenChange = useCallback((open) => {
 		setCompletionPopupOpen(open);
@@ -9793,10 +10389,13 @@ function ChatScreen({ cwd, events, busy, compacting = false, queuedMessages = EM
 					visible: !fileEditPending
 				},
 				children: /* @__PURE__ */ jsx$1(Transcript, {
-					events,
+					events: displayedEvents,
 					settings,
 					selectedTurnId: selectedTurnId ?? null,
-					busy: busy && !pending && !pendingInteraction
+					searchQuery: transcriptSearchActive ? transcriptSearchQuery : void 0,
+					searchPending: transcriptSearchSearching,
+					busy: !transcriptSearchActive && busy && !pending && !pendingInteraction,
+					onLoadEarlier: transcriptSearchActive ? void 0 : onLoadEarlierTranscript
 				})
 			}),
 			/* @__PURE__ */ jsx$1(ExtensionStatusLine, {}),
@@ -9826,7 +10425,12 @@ function ChatScreen({ cwd, events, busy, compacting = false, queuedMessages = EM
 					onCompletionTab,
 					enterSelectsCompletion,
 					onPopupOpenChange: handlePopupOpenChange,
-					selectMode: queueSelectionIndex != null ? "queue" : selectedTurnId != null ? "turn" : null,
+					searchMode: transcriptSearchMode,
+					onSearchModeChange: onTranscriptSearchModeChange,
+					onSearchQueryChange: onTranscriptSearchQueryChange,
+					onSearchNavigate: onTranscriptSearchNavigate,
+					onSearchOpen: onTranscriptSearchOpen,
+					selectMode: queueSelectionIndex != null ? "queue" : null,
 					triggerHints: promptTriggerHints,
 					busy,
 					onEnterQueueFromEmpty: onEnterQueueFromEmptyPrompt,
@@ -10152,7 +10756,10 @@ const EMPTY_INLINE_PROVIDERS = [];
 * ghost feels immediate on a pause.
 */
 const INLINE_GHOST_DEBOUNCE_MS = 120;
-function PromptBlock({ userPrompts, onSubmit, completionProviders, inlineAutocompleteProviders, onCompletionTab, enterSelectsCompletion, onPopupOpenChange, selectMode = null, triggerHints, busy = false, onEnterQueueFromEmpty, attachImageBinding, editorBinding }) {
+function isTranscriptSearchExitKey(event, cursorOffset) {
+	return event.name === "escape" || (event.name === "backspace" || event.name === "delete") && !event.ctrl && !event.meta && !event.shift && cursorOffset === 0;
+}
+function PromptBlock({ userPrompts, onSubmit, completionProviders, inlineAutocompleteProviders, onCompletionTab, enterSelectsCompletion, onPopupOpenChange, searchMode = false, onSearchModeChange, onSearchQueryChange, onSearchNavigate, onSearchOpen, selectMode = null, triggerHints, busy = false, onEnterQueueFromEmpty, attachImageBinding, editorBinding }) {
 	const focused = useModalAwareFocus();
 	const renderer = useRenderer();
 	const COLOR = useColors();
@@ -10217,7 +10824,7 @@ function PromptBlock({ userPrompts, onSubmit, completionProviders, inlineAutocom
 	* Once the user enters history (up at top), we snapshot the draft and cycle.
 	*/
 	const historyRef = useRef(null);
-	const completion = useCompletion(bufferState, completionProviders ?? EMPTY_PROVIDERS);
+	const completion = useCompletion(bufferState, searchMode ? EMPTY_PROVIDERS : completionProviders ?? EMPTY_PROVIDERS);
 	const popupOpen = completion.active != null && completion.items.length > 0;
 	useEffect(() => {
 		onPopupOpenChange?.(popupOpen);
@@ -10226,9 +10833,38 @@ function PromptBlock({ userPrompts, onSubmit, completionProviders, inlineAutocom
 	useChipHighlights(textareaRef, completion.references, chipStyle);
 	const [shellMode, setShellMode] = useState(false);
 	const shellModeRef = useRef(false);
-	shellModeRef.current = shellMode;
-	/** Last text pushed into bufferState — distinguishes "typed `!` on empty" from bulk sets. */
+	const searchModeRef = useRef(searchMode);
+	const previousSearchModeRef = useRef(searchMode);
+	const preSearchTextRef = useRef(null);
+	/** Last text pushed into bufferState — distinguishes typed sentinels from bulk sets. */
 	const lastSyncedTextRef = useRef("");
+	searchModeRef.current = searchMode;
+	shellModeRef.current = shellMode;
+	useEffect(() => {
+		const textarea = textareaRef.current;
+		if (!previousSearchModeRef.current && searchMode) {
+			if (preSearchTextRef.current === null) {
+				preSearchTextRef.current = textarea?.plainText ?? "";
+				textarea?.clear();
+				lastSyncedTextRef.current = "";
+				setBufferState({
+					text: "",
+					cursor: 0
+				});
+				onSearchQueryChange?.("");
+			}
+		} else if (previousSearchModeRef.current && !searchMode) {
+			const restored = preSearchTextRef.current ?? "";
+			textarea?.setText(restored);
+			lastSyncedTextRef.current = restored;
+			setBufferState({
+				text: restored,
+				cursor: restored.length
+			});
+			preSearchTextRef.current = null;
+		}
+		previousSearchModeRef.current = searchMode;
+	}, [searchMode, onSearchQueryChange]);
 	/**
 	* Flip shell mode with the ref mirror updated SYNCHRONOUSLY — callers
 	* that mutate the buffer and re-run `syncBuffer` in the same tick
@@ -10238,6 +10874,15 @@ function PromptBlock({ userPrompts, onSubmit, completionProviders, inlineAutocom
 		shellModeRef.current = on;
 		setShellMode(on);
 	}, []);
+	const exitSearchMode = useCallback(() => {
+		searchModeRef.current = false;
+		onSearchQueryChange?.("");
+		onSearchModeChange?.(false);
+	}, [onSearchModeChange, onSearchQueryChange]);
+	useKeyboard((key) => {
+		if (!focused) return;
+		if (searchModeRef.current && key.name === "escape") exitSearchMode();
+	});
 	const [ghost, setGhost] = useState(null);
 	const ghostRef = useRef(null);
 	ghostRef.current = ghost;
@@ -10249,11 +10894,19 @@ function PromptBlock({ userPrompts, onSubmit, completionProviders, inlineAutocom
 	const syncBuffer = useCallback(() => {
 		const ta = textareaRef.current;
 		if (!ta) return;
-		if (!shellModeRef.current && ta.plainText === "!" && lastSyncedTextRef.current === "") {
+		if (!searchModeRef.current && !shellModeRef.current && ta.plainText === "?" && lastSyncedTextRef.current === "") {
+			ta.clear();
+			preSearchTextRef.current = "";
+			searchModeRef.current = true;
+			onSearchModeChange?.(true);
+			onSearchQueryChange?.("");
+		}
+		if (!searchModeRef.current && !shellModeRef.current && ta.plainText === "!" && lastSyncedTextRef.current === "") {
 			ta.clear();
 			setShellModeNow(true);
 		}
 		lastSyncedTextRef.current = ta.plainText;
+		if (searchModeRef.current) onSearchQueryChange?.(ta.plainText);
 		setBufferState({
 			text: ta.plainText,
 			cursor: ta.cursorOffset
@@ -10266,7 +10919,7 @@ function PromptBlock({ userPrompts, onSubmit, completionProviders, inlineAutocom
 	const inlineEnabled = settings.inlineAutocomplete && inlineProviders.length > 0;
 	useEffect(() => {
 		const atWordBoundary = bufferState.cursor === bufferState.text.length || /\s/.test(bufferState.text[bufferState.cursor]);
-		if (!inlineEnabled || popupOpen || selectMode !== null || shellMode || bufferState.text.length === 0 || !atWordBoundary) {
+		if (!inlineEnabled || popupOpen || selectMode !== null || shellMode || searchMode || bufferState.text.length === 0 || !atWordBoundary) {
 			setGhost(null);
 			return;
 		}
@@ -10299,6 +10952,7 @@ function PromptBlock({ userPrompts, onSubmit, completionProviders, inlineAutocom
 		popupOpen,
 		selectMode,
 		shellMode,
+		searchMode,
 		inlineProviders
 	]);
 	/**
@@ -10334,6 +10988,7 @@ function PromptBlock({ userPrompts, onSubmit, completionProviders, inlineAutocom
 	]);
 	const submit = useCallback(() => {
 		const value = textareaRef.current?.plainText ?? "";
+		if (searchModeRef.current) return;
 		if (shellMode) {
 			if (!value.trim()) return;
 			onSubmit(`!${value}`, completion.references, attachments);
@@ -10501,6 +11156,24 @@ function PromptBlock({ userPrompts, onSubmit, completionProviders, inlineAutocom
 			openExternalEditor();
 			return;
 		}
+		if (searchModeRef.current) {
+			if (!event.ctrl && !event.meta && !event.shift && (event.name === "up" || event.name === "down")) {
+				event.preventDefault();
+				onSearchNavigate?.(event.name === "up" ? -1 : 1);
+				return;
+			}
+			if (!event.ctrl && !event.meta && !event.shift && event.name === "return") {
+				event.preventDefault();
+				onSearchOpen?.();
+				return;
+			}
+			if (isTranscriptSearchExitKey(event, textareaRef.current?.cursorOffset ?? 0)) {
+				event.preventDefault();
+				exitSearchMode();
+				return;
+			}
+			return;
+		}
 		if (event.name === "backspace" && !event.ctrl && !event.meta && !event.shift && shellModeRef.current && (textareaRef.current?.cursorOffset ?? 0) === 0) {
 			event.preventDefault();
 			setShellModeNow(false);
@@ -10611,7 +11284,10 @@ function PromptBlock({ userPrompts, onSubmit, completionProviders, inlineAutocom
 		editorBinding,
 		openExternalEditor,
 		attachments,
-		showNotice
+		showNotice,
+		onSearchNavigate,
+		onSearchOpen,
+		exitSearchMode
 	]);
 	const ghostPosition = useMemo(() => {
 		if (!ghost) return null;
@@ -10692,7 +11368,7 @@ function PromptBlock({ userPrompts, onSubmit, completionProviders, inlineAutocom
 					children: [/* @__PURE__ */ jsxs("box", {
 						style: {
 							border: true,
-							borderColor: selectMode ? COLOR.warn : shellMode ? COLOR.accent : COLOR.borderActive,
+							borderColor: selectMode ? COLOR.warn : searchMode ? COLOR.warn : shellMode ? COLOR.accent : COLOR.borderActive,
 							paddingLeft: 1,
 							paddingRight: 1,
 							height: boxHeight,
@@ -10703,7 +11379,7 @@ function PromptBlock({ userPrompts, onSubmit, completionProviders, inlineAutocom
 							focused: focused && !selectMode,
 							keyBindings: TEXTAREA_BINDINGS,
 							wrapMode: "word",
-							placeholder: selectMode === "turn" ? "— turn-select mode — press ⎋ to resume typing —" : selectMode === "queue" ? "— queue-select mode — press ⎋ to resume typing —" : shellMode ? "Run a shell command…" : "Ask zidane…",
+							placeholder: selectMode === "queue" ? "— queue-select mode — press ⎋ to resume typing —" : searchMode ? "Search this conversation…" : shellMode ? "Run a shell command…" : "Ask zidane…",
 							syntaxStyle: chipStyle,
 							style: {
 								flexGrow: 1,
@@ -10733,12 +11409,13 @@ function PromptBlock({ userPrompts, onSubmit, completionProviders, inlineAutocom
 						})]
 					}), /* @__PURE__ */ jsx$1(PromptHints, {
 						selectMode,
+						searchMode,
 						triggerHints,
 						busy
 					})]
 				})
 			]
-		}), !selectMode && /* @__PURE__ */ jsx$1("box", {
+		}), !selectMode && !searchMode && /* @__PURE__ */ jsx$1("box", {
 			style: {
 				position: "absolute",
 				bottom: "100%",
@@ -10765,6 +11442,10 @@ const PROMPT_HINTS_NORMAL = [
 		key: "↑↓",
 		label: "history"
 	},
+	{
+		key: "?",
+		label: "search"
+	},
 	{
 		key: "ctrl+s",
 		label: "messages"
@@ -10793,8 +11474,8 @@ const PROMPT_HINTS_BUSY = [
 		label: "abort"
 	}
 ];
-/** Prompt-box shortcuts in select-turn mode — only the selection actions are valid. */
-const PROMPT_HINTS_SELECT_TURN = [
+/** Conversation search is the message selector with an optional filter. */
+const PROMPT_HINTS_SEARCH = [
 	{
 		key: "↑↓",
 		label: "navigate"
@@ -10839,18 +11520,19 @@ const PROMPT_HINTS_SELECT_QUEUE = [{
 * Swaps the hint set based on `selectMode` so the user sees only the
 * shortcuts that actually do something in the active mode.
 */
-function PromptHints({ selectMode, triggerHints, busy = false }) {
+function PromptHints({ selectMode, searchMode = false, triggerHints, busy = false }) {
 	const COLOR = useColors();
 	const { settings } = useSettings();
 	const { width: termWidth } = useTerminalDimensions();
-	const minimalResting = !selectMode && !busy && settings.uiMode === "minimal";
-	const primary = selectMode === "turn" ? PROMPT_HINTS_SELECT_TURN : selectMode === "queue" ? PROMPT_HINTS_SELECT_QUEUE : busy ? PROMPT_HINTS_BUSY : minimalResting ? EMPTY_HINTS : PROMPT_HINTS_NORMAL;
+	const minimalResting = !selectMode && !searchMode && !busy && settings.uiMode === "minimal";
+	const primary = searchMode ? PROMPT_HINTS_SEARCH : selectMode === "queue" ? PROMPT_HINTS_SELECT_QUEUE : busy ? PROMPT_HINTS_BUSY : minimalResting ? EMPTY_HINTS : PROMPT_HINTS_NORMAL;
 	const hints = useMemo(() => {
 		const budget = Math.max(0, termWidth - 5);
 		const tooLongCombined = !!triggerHints && triggerHints.length > 0 && !selectMode && primary.length > 0 && hintsLength(primary) + 3 + hintsLength(triggerHints) > budget;
 		return clipHintsToWidth(selectMode || !triggerHints || triggerHints.length === 0 || tooLongCombined ? primary : [...primary, ...triggerHints], budget);
 	}, [
 		selectMode,
+		searchMode,
 		primary,
 		triggerHints,
 		termWidth
@@ -15496,7 +16178,8 @@ const PREVIEW_CHAR_MAX = 8e3;
 * the Modal's own clamp; this is the cap on wide terminals so the modal
 * keeps a comfortable shape rather than stretching to the full height.
 */
-const MAX_MODAL_HEIGHT = 28;
+const MAX_MODAL_HEIGHT = 46;
+const MAX_MODAL_WIDTH = 148;
 const EDIT_TEXTAREA_BINDINGS = (() => {
 	return [
 		...defaultTextareaKeyBindings.filter((b) => b.name !== "return" && !(b.name === "a" && b.ctrl && !b.shift && !b.meta)),
@@ -15524,12 +16207,18 @@ const EDIT_TEXTAREA_BINDINGS = (() => {
 function editableText(turn) {
 	return turn.content.filter((b) => b.type === "text").map((b) => b.text).join("\n\n");
 }
-function TurnDetailsModal({ turn, index, total, actions, keybindings }) {
+function TurnDetailsModal({ turn, toolResultTurns = [], searchQuery, index, total, actions, keybindings }) {
 	const COLOR = useColors();
+	const SURFACE = useSurfaces();
 	const modal = useModal();
-	const fullText = turnAsText(turn);
-	const preview = fullText.length > PREVIEW_CHAR_MAX ? `${fullText.slice(0, PREVIEW_CHAR_MAX)}\n\n…(${fullText.length - PREVIEW_CHAR_MAX} more chars)` : fullText;
-	const summary = blockSummary(turn);
+	const { fullText, previewEntries, summary } = useMemo(() => {
+		const previewTurns = [turn, ...toolResultTurns];
+		return {
+			fullText: previewTurns.map(turnAsText).filter(Boolean).join("\n\n"),
+			previewEntries: buildPreviewEntries(previewTurns, PREVIEW_CHAR_MAX),
+			summary: blockSummary(previewTurns)
+		};
+	}, [turn, toolResultTurns]);
 	const bottomTitle = `${index - 1} before · ${total - index} after`;
 	const [pending, setPending] = useState(null);
 	const [copyStatus, setCopyStatus] = useState("idle");
@@ -15595,6 +16284,10 @@ function TurnDetailsModal({ turn, index, total, actions, keybindings }) {
 		title: editing ? `edit turn ${index} / ${total} · ${turn.role}` : `turn ${index} / ${total} · ${turn.role}`,
 		bottomTitle: editing ? void 0 : bottomTitle,
 		maxHeight: MAX_MODAL_HEIGHT,
+		maxWidth: MAX_MODAL_WIDTH,
+		minWidth: 64,
+		horizontalMargin: 2,
+		verticalMargin: 1,
 		disableEscape: editing || pending !== null,
 		children: [
 			!editing && /* @__PURE__ */ jsxs("text", {
@@ -15674,7 +16367,8 @@ function TurnDetailsModal({ turn, index, total, actions, keybindings }) {
 				title: " preview ",
 				style: {
 					border: true,
-					borderColor: COLOR.mute,
+					borderColor: COLOR.borderActive,
+					backgroundColor: SURFACE.background,
 					paddingLeft: 1,
 					paddingRight: 1,
 					flexDirection: "column",
@@ -15682,17 +16376,38 @@ function TurnDetailsModal({ turn, index, total, actions, keybindings }) {
 					flexShrink: 1,
 					minHeight: 5
 				},
-				children: preview ? /* @__PURE__ */ jsx$1("scrollbox", {
+				children: previewEntries.length > 0 ? /* @__PURE__ */ jsx$1("scrollbox", {
 					focusable: false,
-					style: { flexGrow: 1 },
+					style: {
+						flexGrow: 1,
+						rootOptions: { backgroundColor: SURFACE.background },
+						contentOptions: { flexDirection: "column" }
+					},
 					stickyScroll: false,
-					children: /* @__PURE__ */ jsx$1("text", {
-						fg: COLOR.dim,
-						children: preview
-					})
+					children: previewEntries.map((entry, i) => /* @__PURE__ */ jsxs("box", {
+						style: {
+							flexDirection: "column",
+							marginBottom: i === previewEntries.length - 1 ? 0 : 1
+						},
+						children: [/* @__PURE__ */ jsx$1("text", {
+							fg: entry.error ? COLOR.error : entry.kind === "tool-result" ? COLOR.accent : entry.kind === "tool-call" ? COLOR.warn : COLOR.model,
+							children: /* @__PURE__ */ jsx$1(HighlightedPreviewText, {
+								text: entry.label,
+								query: searchQuery,
+								foreground: entry.error ? COLOR.error : entry.kind === "tool-result" ? COLOR.accent : entry.kind === "tool-call" ? COLOR.warn : COLOR.model
+							})
+						}), entry.text && /* @__PURE__ */ jsx$1("text", {
+							fg: entry.error ? COLOR.error : COLOR.dim,
+							children: /* @__PURE__ */ jsx$1(HighlightedPreviewText, {
+								text: entry.text,
+								query: searchQuery,
+								foreground: entry.error ? COLOR.error : COLOR.dim
+							})
+						})]
+					}, `${entry.kind}:${i}`))
 				}) : /* @__PURE__ */ jsx$1("text", {
 					fg: COLOR.mute,
-					children: "— no text content —"
+					children: "— no previewable content —"
 				})
 			}),
 			editing ? /* @__PURE__ */ jsxs("text", {
@@ -15852,14 +16567,97 @@ function ActionRow({ pending, copyStatus, canCopy, canEdit, forkKey, deleteKey,
 		]
 	});
 }
-/**
-* Human-readable per-kind block tally — e.g. `1 text · 2 tool_call`. Skips
-* zero-count kinds so the line stays scannable; uses canonical block-type
-* names so they line up with what the LLM and persistence layer see.
-*/
-function blockSummary(turn) {
+function buildPreviewEntries(turns, limit) {
+	const entries = [];
+	let remaining = limit;
+	let skipped = 0;
+	const add = (entry) => {
+		if (remaining <= 0) {
+			skipped++;
+			return;
+		}
+		const text = entry.text.length > remaining ? `${entry.text.slice(0, remaining)}\n… (${entry.text.length - remaining} more chars)` : entry.text;
+		entries.push({
+			...entry,
+			text
+		});
+		remaining -= Math.min(entry.text.length, remaining);
+	};
+	for (const turn of turns) for (const block of turn.content) if (block.type === "text") add({
+		kind: "text",
+		label: turn.role === "user" ? "you" : turn.role,
+		text: block.text
+	});
+	else if (block.type === "thinking") add({
+		kind: "thinking",
+		label: "thinking",
+		text: block.text
+	});
+	else if (block.type === "tool_call") add({
+		kind: "tool-call",
+		label: `tool call · ${block.name}`,
+		text: stringifyPreview(block.input)
+	});
+	else if (block.type === "tool_result") add({
+		kind: "tool-result",
+		label: block.isError ? "tool result · error" : "tool result",
+		text: toolResultPreview(block.output),
+		error: block.isError
+	});
+	else if (block.type === "server_tool_use") add({
+		kind: "tool-call",
+		label: `server tool call · ${block.name}`,
+		text: stringifyPreview(block.input)
+	});
+	else if (block.type === "server_tool_result") add({
+		kind: "tool-result",
+		label: `server tool result · ${block.toolName}`,
+		text: stringifyPreview(block.content)
+	});
+	else if (block.type === "compact-summary") add({
+		kind: "summary",
+		label: `compaction summary · ${block.replacesTurnIds.length} turns`,
+		text: block.summary
+	});
+	else if (block.type === "image" || block.type === "audio" || block.type === "video" || block.type === "document") add({
+		kind: "attachment",
+		label: `${block.type} attachment`,
+		text: block.name ?? block.mediaType
+	});
+	else skipped++;
+	if (skipped > 0) entries.push({
+		kind: "summary",
+		label: `… ${skipped} more block${skipped === 1 ? "" : "s"} not shown`,
+		text: ""
+	});
+	return entries;
+}
+function HighlightedPreviewText({ text, query, foreground }) {
+	const matchColor = resolveChipColor(useSurfaces().chips, "default");
+	return /* @__PURE__ */ jsx$1(Fragment, { children: highlightSegments(text, query ? searchHighlightRanges(text, query) : []).map((segment, i) => /* @__PURE__ */ jsx$1("span", {
+		fg: segment.highlighted ? matchColor.fg : foreground,
+		bg: segment.highlighted ? matchColor.bg : void 0,
+		children: segment.text
+	}, i)) });
+}
+function toolResultPreview(output) {
+	if (typeof output === "string") return output;
+	return output.map((part) => {
+		if (part.type === "text") return part.text;
+		const name = "name" in part && part.name ? `: ${part.name}` : "";
+		return `[${part.type} attachment${name}]`;
+	}).join("\n");
+}
+function stringifyPreview(value) {
+	try {
+		return JSON.stringify(value, null, 2);
+	} catch {
+		return String(value);
+	}
+}
+function blockSummary(turns) {
 	const counts = {};
-	for (const block of turn.content) counts[block.type] = (counts[block.type] ?? 0) + 1;
+	for (const turn of turns) for (const block of turn.content) counts[block.type] = (counts[block.type] ?? 0) + 1;
 	const parts = [];
 	for (const [type, n] of Object.entries(counts)) parts.push(`${n} ${type}`);
 	return parts.length === 0 ? "(empty)" : parts.join(" · ");
@@ -15915,6 +16713,8 @@ function lastLines(text, n) {
 * and lstats — cheap enough that latency, not cost, picked the number.
 */
 const EXTENSION_WATCH_POLL_MS = 3e3;
+/** LRU bound for cross-session search indexes (full lowercased text per session). */
+const SESSION_SEARCH_INDEX_CACHE_MAX = 64;
 /**
 * Surface failures that are normally silenced (teardown / save) when the
 * `ZIDANE_DEBUG` env var is set. Logging via `console.error` would otherwise
@@ -16514,6 +17314,19 @@ function AppShell() {
 	const pickedRef = useRef(picked);
 	pickedRef.current = picked;
 	const [sessions, setSessions] = useState([]);
+	const [sessionContentMatches, setSessionContentMatches] = useState(/* @__PURE__ */ new Map());
+	const [sessionContentSearching, setSessionContentSearching] = useState(false);
+	const [sessionContentSearchProgress, setSessionContentSearchProgress] = useState({
+		done: 0,
+		total: 0
+	});
+	const sessionSearchTimerRef = useRef(null);
+	const sessionSearchQueryRef = useRef("");
+	const sessionSearchGenerationRef = useRef(0);
+	const sessionSearchAbortRef = useRef(null);
+	const historySearchWorkerRef = useRef(null);
+	const sessionSearchCacheRef = useRef(/* @__PURE__ */ new Map());
+	const liveSessionSearchIndexRef = useRef(null);
 	const [currentSession, setCurrentSession] = useState(null);
 	const [chatReferenceScope, setChatReferenceScope] = useState("project");
 	const [projectChatCatalog, setProjectChatCatalog] = useState([]);
@@ -16523,6 +17336,16 @@ function AppShell() {
 	const allChatCatalogRef = useRef(allChatCatalog);
 	allChatCatalogRef.current = allChatCatalog;
 	const [events, setEvents] = useState([]);
+	const eventsRef = useRef(events);
+	eventsRef.current = events;
+	/**
+	* True while the user is browsing revealed history (`onLoadEarlierTranscript`)
+	* and no new run has started. Suspends the stream buffer's display cap so a
+	* trailing smooth-mode drain (typewriter backlog outliving `runningRef`)
+	* can't re-trim the page that was just loaded. Cleared wherever a run
+	* starts and on session switch (`stream.reset()`), where the cap resumes.
+	*/
+	const transcriptRevealHoldRef = useRef(false);
 	const [busy, setBusy] = useState(false);
 	/**
 	* The provider+model the run actually advanced to after a `model:fallback`
@@ -16766,12 +17589,17 @@ function AppShell() {
 	*/
 	const lastInputTokensRef = useRef(0);
 	/**
-	* Active turn id when the user is in "select turn" mode (ctrl+s on the
-	* chat screen). `null` means normal mode — typing is enabled, transcript
-	* has no highlight. When set, the prompt textarea is unfocused so up/down
-	* navigate the turn list, ↵ opens the details modal, ⎋ exits the mode.
+	* Active turn in conversation-search mode. The prompt remains focused for
+	* filtering while plain arrows navigate and Enter opens turn details.
 	*/
 	const [selectedTurnId, setSelectedTurnId] = useState(null);
+	const [transcriptSearchMode, setTranscriptSearchMode] = useState(false);
+	const [transcriptSearchQuery, setTranscriptSearchQuery] = useState("");
+	const [transcriptSearchResults, setTranscriptSearchResults] = useState([]);
+	const [transcriptSearchSearching, setTranscriptSearchSearching] = useState(false);
+	const transcriptSearchGenerationRef = useRef(0);
+	const transcriptSearchAbortRef = useRef(null);
+	const transcriptSearchIndexRef = useRef(null);
 	/**
 	* Highlighted entry in the type-ahead queue box. `null` means the user
 	* is in normal mode (textarea focused, queue purely informational);
@@ -17043,7 +17871,10 @@ function AppShell() {
 	* writes a title to a torn-down session.
 	*/
 	const autoTitleAbortRef = useRef(null);
-	const stream = useStreamBuffer(setEvents, { getSmooth: useCallback(() => smoothStreamingRef.current, []) });
+	const stream = useStreamBuffer(setEvents, {
+		getSmooth: useCallback(() => smoothStreamingRef.current, []),
+		maxTranscriptEvents: transcriptRevealHoldRef.current ? null : void 0
+	});
 	streamRef.current = stream;
 	const makePicked = useCallback((provider, modelId) => {
 		const descriptor = providerRegistry[provider.key];
@@ -17802,6 +18633,113 @@ function AppShell() {
 	const toggleSessionsScope = useCallback(() => {
 		setSessionsScopeAll(!sessionsShowAll);
 	}, [sessionsShowAll]);
+	/** Debounced, cached full-history search for the conversations list. */
+	const onSessionSearchQueryChange = useCallback((raw) => {
+		sessionSearchQueryRef.current = raw;
+		const query = raw.trim();
+		const generation = ++sessionSearchGenerationRef.current;
+		sessionSearchAbortRef.current?.abort();
+		const abortController = new AbortController();
+		sessionSearchAbortRef.current = abortController;
+		if (sessionSearchTimerRef.current) clearTimeout(sessionSearchTimerRef.current);
+		if (!query) {
+			setSessionContentMatches(/* @__PURE__ */ new Map());
+			setSessionContentSearching(false);
+			setSessionContentSearchProgress({
+				done: 0,
+				total: 0
+			});
+			return;
+		}
+		setSessionContentMatches(/* @__PURE__ */ new Map());
+		setSessionContentSearching(true);
+		setSessionContentSearchProgress({
+			done: 0,
+			total: sessions.length
+		});
+		sessionSearchTimerRef.current = setTimeout(() => {
+			(async () => {
+				const matches = /* @__PURE__ */ new Map();
+				let cursor = 0;
+				let done = 0;
+				const worker = async () => {
+					while (cursor < sessions.length && generation === sessionSearchGenerationRef.current) {
+						const meta = sessions[cursor++];
+						try {
+							let index;
+							const live = sessionRef.current;
+							const cached = sessionSearchCacheRef.current.get(meta.id);
+							if (live?.id === meta.id) {
+								const cachedLive = liveSessionSearchIndexRef.current;
+								if (cachedLive?.sessionId === meta.id && cachedLive.updatedAt === meta.updatedAt && cachedLive.turnCount === live.turns.length) index = cachedLive.index;
+								else {
+									index = await (historySearchWorkerRef.current ??= new HistorySearchWorkerClient()).build(live.turns, abortController.signal);
+									liveSessionSearchIndexRef.current = {
+										sessionId: meta.id,
+										updatedAt: meta.updatedAt,
+										turnCount: live.turns.length,
+										index
+									};
+								}
+							} else if (cached?.updatedAt === meta.updatedAt) {
+								index = cached.index;
+								sessionSearchCacheRef.current.delete(meta.id);
+								sessionSearchCacheRef.current.set(meta.id, cached);
+							} else {
+								const turns = await store.getTurns(meta.id);
+								index = await (historySearchWorkerRef.current ??= new HistorySearchWorkerClient()).build(turns, abortController.signal);
+								const cache = sessionSearchCacheRef.current;
+								cache.set(meta.id, {
+									updatedAt: meta.updatedAt,
+									index
+								});
+								while (cache.size > SESSION_SEARCH_INDEX_CACHE_MAX) {
+									const oldest = cache.keys().next().value;
+									if (oldest === void 0) break;
+									cache.delete(oldest);
+								}
+							}
+							if (generation !== sessionSearchGenerationRef.current) return;
+							const match = await (historySearchWorkerRef.current ??= new HistorySearchWorkerClient()).history(index, query, 3, abortController.signal);
+							if (match) matches.set(meta.id, match);
+						} catch (error) {
+							if (abortController.signal.aborted) throw abortController.signal.reason instanceof DOMException ? abortController.signal.reason : error;
+							debugLog("session content search skipped a session", error);
+						}
+						done++;
+						if (done === sessions.length || done % 4 === 0) setSessionContentSearchProgress({
+							done,
+							total: sessions.length
+						});
+					}
+				};
+				try {
+					await Promise.all(Array.from({ length: Math.min(6, sessions.length) }, worker));
+				} catch (error) {
+					if (!(error instanceof DOMException && error.name === "AbortError")) throw error;
+					return;
+				}
+				if (generation !== sessionSearchGenerationRef.current) return;
+				setSessionContentMatches(matches);
+				setSessionContentSearchProgress({
+					done: sessions.length,
+					total: sessions.length
+				});
+				setSessionContentSearching(false);
+			})().catch((error) => {
+				debugLog("session history search failed", error);
+				if (generation === sessionSearchGenerationRef.current) setSessionContentSearching(false);
+			});
+		}, 120);
+	}, [sessions, store]);
+	useEffect(() => {
+		if (sessionSearchQueryRef.current.trim()) onSessionSearchQueryChange(sessionSearchQueryRef.current);
+	}, [sessions, onSessionSearchQueryChange]);
+	useEffect(() => () => {
+		if (sessionSearchTimerRef.current) clearTimeout(sessionSearchTimerRef.current);
+		sessionSearchAbortRef.current?.abort();
+		historySearchWorkerRef.current?.terminate();
+	}, []);
 	const refreshSessions = useCallback(async () => {
 		const list = await listSessionMeta(store, sessionsShowAll ? void 0 : { projectRoot: projectDir });
 		setSessions(list);
@@ -17846,6 +18784,7 @@ function AppShell() {
 			debugLog("teardown: auto-title abort failed", err);
 		}
 		autoTitleAbortRef.current = null;
+		transcriptRevealHoldRef.current = false;
 		stream.reset();
 		await agentRef.current?.destroy().catch((err) => debugLog("agent.destroy failed", err));
 		agentRef.current = null;
@@ -17909,6 +18848,7 @@ function AppShell() {
 		await session.appendTurns([turn]);
 		setEvents(capTranscriptEvents(eventsFromTurns(session.turns, session.runs)));
 		runningRef.current = true;
+		transcriptRevealHoldRef.current = false;
 		setBusy(true);
 		setActiveFallback(null);
 		try {
@@ -18310,6 +19250,25 @@ function AppShell() {
 	const onPopupOpenChange = useCallback((open) => {
 		popupOpenRef.current = open;
 	}, []);
+	/**
+	* Reveal one persisted-history page when Transcript reaches its top marker.
+	* No full-history array is retained: materialize from Session on demand,
+	* slice, then let the temporary array go. A running stream deliberately
+	* declines — its first next append would re-cap anyway, and changing the
+	* head while buckets are draining makes scroll preservation misleading.
+	*/
+	const onLoadEarlierTranscript = useCallback(() => {
+		if (runningRef.current) return false;
+		const session = sessionRef.current;
+		const displayed = eventsRef.current;
+		if (!session || hiddenEarlierTranscriptCount(displayed) <= 0) return false;
+		const next = revealEarlierTranscriptEvents(eventsFromTurns(session.turns, session.runs), displayed);
+		if (next === displayed) return false;
+		transcriptRevealHoldRef.current = true;
+		eventsRef.current = next;
+		setEvents(next);
+		return true;
+	}, []);
 	const onAbort = useCallback(() => {
 		if (popupOpenRef.current) return;
 		commandAbortRef.current?.abort();
@@ -19249,6 +20208,7 @@ function AppShell() {
 		if (!agent || !session || !picked) return;
 		const wasRunning = runningRef.current;
 		if (!wasRunning) runningRef.current = true;
+		transcriptRevealHoldRef.current = false;
 		suppressWakeRef.current = false;
 		(async () => {
 			let effectivePrompt = prompt;
@@ -19399,6 +20359,7 @@ function AppShell() {
 		if (suppressWakeRef.current) return;
 		if (!agent.hasPendingTaskNotifications) return;
 		runningRef.current = true;
+		transcriptRevealHoldRef.current = false;
 		(async () => {
 			setBusy(true);
 			try {
@@ -19607,25 +20568,143 @@ function AppShell() {
 	}, [modal, config.paths.userDir]);
 	const hasMultipleAgents = useMemo(() => Object.keys(liveAgentRegistry).length > 1, [liveAgentRegistry]);
 	const turnIds = useMemo(() => selectableTurnIds(events, settings), [events, settings]);
+	useEffect(() => {
+		const query = transcriptSearchQuery.trim();
+		const generation = ++transcriptSearchGenerationRef.current;
+		transcriptSearchAbortRef.current?.abort();
+		if (!transcriptSearchMode || !query) {
+			setTranscriptSearchResults([]);
+			setTranscriptSearchSearching(false);
+			return;
+		}
+		const session = sessionRef.current;
+		if (!session) {
+			setTranscriptSearchResults([]);
+			setTranscriptSearchSearching(false);
+			return;
+		}
+		const turns = session.turns;
+		const abortController = new AbortController();
+		transcriptSearchAbortRef.current = abortController;
+		setTranscriptSearchSearching(true);
+		(async () => {
+			const cached = transcriptSearchIndexRef.current;
+			const index = cached?.sessionId === session.id && cached.events === events ? cached.index : await (historySearchWorkerRef.current ??= new HistorySearchWorkerClient()).build(turns, abortController.signal);
+			transcriptSearchIndexRef.current = {
+				sessionId: session.id,
+				events,
+				index
+			};
+			const matches = await (historySearchWorkerRef.current ??= new HistorySearchWorkerClient()).search(index, query, turns.length, abortController.signal);
+			if (generation !== transcriptSearchGenerationRef.current) return;
+			const order = new Map(turns.map((turn, i) => [turn.id, i]));
+			matches.sort((a, b) => (order.get(a.turn.id) ?? 0) - (order.get(b.turn.id) ?? 0));
+			setTranscriptSearchResults(matches);
+			setTranscriptSearchSearching(false);
+		})().catch((error) => {
+			if (!(error instanceof DOMException && error.name === "AbortError")) {
+				debugLog("conversation search failed", error);
+				if (generation === transcriptSearchGenerationRef.current) setTranscriptSearchSearching(false);
+			}
+		});
+		return () => abortController.abort();
+	}, [
+		transcriptSearchMode,
+		transcriptSearchQuery,
+		events
+	]);
+	const transcriptSearchOwnerIds = useMemo(() => {
+		const owners = /* @__PURE__ */ new Map();
+		if (!transcriptSearchQuery.trim() || transcriptSearchResults.length === 0) return owners;
+		const session = sessionRef.current;
+		if (!session) return owners;
+		const callOwner = /* @__PURE__ */ new Map();
+		for (const turn of session.turns) for (const block of turn.content) if (block.type === "tool_call") callOwner.set(block.id, turn.id);
+		for (const result of transcriptSearchResults) {
+			const resultOwners = [];
+			for (const block of result.turn.content) {
+				if (block.type !== "tool_result") continue;
+				const owner = callOwner.get(block.callId);
+				if (owner && owner !== result.turn.id && !resultOwners.includes(owner)) resultOwners.push(owner);
+			}
+			if (resultOwners.length > 0) owners.set(result.turn.id, resultOwners);
+		}
+		return owners;
+	}, [
+		transcriptSearchQuery,
+		transcriptSearchResults,
+		events
+	]);
+	const transcriptSearchEvents = useMemo(() => {
+		if (!transcriptSearchMode || !transcriptSearchQuery.trim()) return [];
+		const session = sessionRef.current;
+		if (!session) return [];
+		const shown = transcriptSearchResults.slice(-200);
+		const contextIds = new Set(shown.map((result) => result.turn.id));
+		for (const result of shown) for (const owner of transcriptSearchOwnerIds.get(result.turn.id) ?? []) contextIds.add(owner);
+		const searchEvents = eventsFromTurns(session.turns.filter((turn) => contextIds.has(turn.id)), session.runs);
+		const hidden = transcriptSearchResults.length - shown.length;
+		if (hidden > 0) searchEvents.unshift({
+			kind: "info",
+			text: `… ${hidden} earlier matched message${hidden === 1 ? "" : "s"} not shown — refine the query to narrow results.`
+		});
+		return searchEvents;
+	}, [
+		transcriptSearchMode,
+		transcriptSearchQuery,
+		transcriptSearchResults,
+		transcriptSearchOwnerIds,
+		events
+	]);
+	const transcriptSearchTurnIds = useMemo(() => {
+		if (!transcriptSearchQuery.trim()) return turnIds;
+		return selectableTurnIds(transcriptSearchEvents, settings, (event) => isVisibleDuringSearch(event, settings, transcriptSearchQuery));
+	}, [
+		transcriptSearchQuery,
+		transcriptSearchEvents,
+		turnIds,
+		settings
+	]);
 	/** Drop the selection if its turn disappeared (session swap, history reset). */
 	useEffect(() => {
+		if (transcriptSearchMode) return;
 		if (selectedTurnId && !turnIds.includes(selectedTurnId)) setSelectedTurnId(null);
-	}, [selectedTurnId, turnIds]);
-	const inSelectMode = selectedTurnId !== null;
-	const enterSelectMode = useCallback(() => {
-		if (turnIds.length === 0) return;
-		setSelectedTurnId(turnIds[turnIds.length - 1]);
+	}, [
+		selectedTurnId,
+		turnIds,
+		transcriptSearchMode
+	]);
+	useEffect(() => {
+		if (!transcriptSearchMode) return;
+		if (transcriptSearchTurnIds.length === 0) {
+			setSelectedTurnId(null);
+			return;
+		}
+		if (!selectedTurnId || !transcriptSearchTurnIds.includes(selectedTurnId)) setSelectedTurnId(transcriptSearchTurnIds[transcriptSearchTurnIds.length - 1] ?? null);
+	}, [
+		transcriptSearchMode,
+		transcriptSearchTurnIds,
+		selectedTurnId
+	]);
+	const onTranscriptSearchModeChange = useCallback((enabled) => {
+		setTranscriptSearchMode(enabled);
+		setTranscriptSearchQuery("");
+		if (enabled) (historySearchWorkerRef.current ??= new HistorySearchWorkerClient()).prewarm();
+		if (!enabled) setSelectedTurnId(null);
+		else if (turnIds.length > 0) setSelectedTurnId(turnIds[turnIds.length - 1] ?? null);
 	}, [turnIds]);
-	const cycleSelectedTurn = useCallback((direction) => {
+	const cycleSelectedTurn = useCallback((direction, candidates = turnIds) => {
 		setSelectedTurnId((prev) => {
-			if (!prev || turnIds.length === 0) return prev;
-			const idx = turnIds.indexOf(prev);
-			if (idx === -1) return turnIds[turnIds.length - 1];
-			const len = turnIds.length;
-			const nextIdx = ((idx + direction) % len + len) % len;
-			return turnIds[nextIdx];
+			if (!prev || candidates.length === 0) return prev;
+			const idx = candidates.indexOf(prev);
+			if (idx === -1) return candidates[candidates.length - 1];
+			const len = candidates.length;
+			return candidates[((idx + direction) % len + len) % len];
 		});
 	}, [turnIds]);
+	const onTranscriptSearchNavigate = useCallback((direction) => {
+		cycleSelectedTurn(direction, transcriptSearchTurnIds);
+	}, [cycleSelectedTurn, transcriptSearchTurnIds]);
 	const onForkTurn = useCallback(async (turnId) => {
 		const source = sessionRef.current;
 		if (!source || !picked) return;
@@ -19665,7 +20744,10 @@ function AppShell() {
 			debugLog("delete: save failed", err);
 			return;
 		}
-		setEvents(capTranscriptEvents(eventsFromTurns(session.turns, session.runs)));
+		const nextEvents = capTranscriptEvents(eventsFromTurns(session.turns, session.runs));
+		const nextIds = selectableTurnIds(nextEvents, settings);
+		setEvents(nextEvents);
+		setSelectedTurnId((prev) => prev ? selectionAfterTurnRemoval(turnIds, prev, nextIds) : prev);
 		const replayedTokens = lastContextSizeFromTurns(session.turns, session.runs);
 		setLastInputTokens(replayedTokens);
 		lastInputTokensRef.current = replayedTokens;
@@ -19676,11 +20758,7 @@ function AppShell() {
 			userMessageCount: session.turns.reduce((n, t) => t.role === "user" ? n + 1 : n, 0),
 			updatedAt: Date.now()
 		} : prev);
-		setSelectedTurnId((prev) => {
-			if (!prev) return prev;
-			return nextTurns.some((t) => t.id === prev) ? prev : null;
-		});
-	}, []);
+	}, [settings, turnIds]);
 	const onEditTurn = useCallback(async (turnId, newText) => {
 		const session = sessionRef.current;
 		if (!session) return;
@@ -19702,7 +20780,10 @@ function AppShell() {
 			debugLog("edit: save failed", err);
 			return;
 		}
-		setEvents(capTranscriptEvents(eventsFromTurns(session.turns, session.runs)));
+		const rebuilt = eventsFromTurns(session.turns, session.runs);
+		const patched = replaceTranscriptTurnEvents(eventsRef.current, rebuilt, turnId);
+		setEvents(patched ?? capTranscriptEvents(rebuilt));
+		setSelectedTurnId(turnId);
 		const replayedTokens = lastContextSizeFromTurns(session.turns, session.runs);
 		setLastInputTokens(replayedTokens);
 		lastInputTokensRef.current = replayedTokens;
@@ -20000,11 +21081,23 @@ function AppShell() {
 		if (!session) return;
 		const turn = session.turns.find((t) => t.id === id);
 		if (!turn) return;
-		const index = turnIds.indexOf(id) + 1;
+		const candidates = transcriptSearchMode ? transcriptSearchTurnIds : turnIds;
+		const index = candidates.indexOf(id) + 1;
+		const callIds = new Set(turn.content.filter((block) => block.type === "tool_call").map((block) => block.id));
+		const toolResultTurns = callIds.size === 0 ? [] : session.turns.flatMap((candidate) => {
+			if (candidate.id === turn.id) return [];
+			const content = candidate.content.filter((block) => block.type === "tool_result" && callIds.has(block.callId));
+			return content.length > 0 ? [{
+				...candidate,
+				content
+			}] : [];
+		});
 		modal.open(/* @__PURE__ */ jsx$1(TurnDetailsModal, {
 			turn,
+			toolResultTurns,
+			searchQuery: transcriptSearchMode ? transcriptSearchQuery : void 0,
 			index,
-			total: turnIds.length,
+			total: candidates.length,
 			actions: {
 				onFork: onForkTurn,
 				onDelete: onDeleteTurn,
@@ -20016,6 +21109,9 @@ function AppShell() {
 		modal,
 		selectedTurnId,
 		turnIds,
+		transcriptSearchMode,
+		transcriptSearchQuery,
+		transcriptSearchTurnIds,
 		onForkTurn,
 		onDeleteTurn,
 		onEditTurn,
@@ -20023,23 +21119,8 @@ function AppShell() {
 	]);
 	useKeyboard((key) => {
 		if (modal.isOpen) return;
-		if (inSelectMode && screen === "chat") {
-			if (key.name === "up") {
-				cycleSelectedTurn(-1);
-				return;
-			}
-			if (key.name === "down") {
-				cycleSelectedTurn(1);
-				return;
-			}
-			if (key.name === "return") {
-				openSelectedTurn();
-				return;
-			}
-			if (key.name === "escape") {
-				setSelectedTurnId(null);
-				return;
-			}
+		if (transcriptSearchMode && screen === "chat") {
+			if (key.name === "escape") onTranscriptSearchModeChange(false);
 			return;
 		}
 		if (queueSelectionIndex != null && screen === "chat") {
@@ -20204,8 +21285,8 @@ function AppShell() {
 			}));
 			return;
 		}
-		if (matchesBinding(key, keybindings.enterSelectTurnMode) && screen === "chat" && !busy && !pendingApproval && !pendingInteraction) {
-			enterSelectMode();
+		if (matchesBinding(key, keybindings.enterSelectTurnMode) && screen === "chat" && turnIds.length > 0 && !busy && !pendingApproval && !pendingInteraction) {
+			onTranscriptSearchModeChange(true);
 			return;
 		}
 		if (matchesBinding(key, keybindings.cycleAgent) && screen === "chat" && hasMultipleAgents && !busy && !pendingApproval && !pendingInteraction) {
@@ -20496,6 +21577,10 @@ function AppShell() {
 						onPick: onSwitchSession,
 						onCreate: onCreateSession,
 						onFocusChange: setFocusedSessionId,
+						contentMatches: sessionContentMatches,
+						contentSearching: sessionContentSearching,
+						contentSearchProgress: sessionContentSearchProgress,
+						onSearchQueryChange: onSessionSearchQueryChange,
 						showAllProjects: sessionsShowAll,
 						onToggleScope: toggleSessionsScope,
 						currentProjectRoot: projectDir
@@ -20527,6 +21612,15 @@ function AppShell() {
 						enterSelectsCompletion: (providerId) => providerId === "chats",
 						onPopupOpenChange,
 						selectedTurnId,
+						transcriptSearchMode,
+						transcriptSearchQuery,
+						transcriptSearchEvents,
+						transcriptSearchSearching,
+						onTranscriptSearchModeChange,
+						onTranscriptSearchQueryChange: setTranscriptSearchQuery,
+						onTranscriptSearchNavigate,
+						onTranscriptSearchOpen: openSelectedTurn,
+						onLoadEarlierTranscript,
 						promptTriggerHints,
 						attachImageBinding: keybindings.attachClipboardImage,
 						editorBinding: settings.externalEditor ? keybindings.openExternalEditor : void 0,
@@ -20538,7 +21632,7 @@ function AppShell() {
 				hints,
 				context: contextUsage,
 				cost: footerCost,
-				status: pendingInteraction?.kind === "question" ? "asking" : compacting ? "compacting" : busy ? "busy" : null,
+				status: transcriptSearchMode && transcriptSearchSearching ? "searching" : pendingInteraction?.kind === "question" ? "asking" : compacting ? "compacting" : busy ? "busy" : null,
 				compactionTokens,
 				compactionStartedAt
 			}),