@vanillagreen/pi-qol 1.0.4 → 1.1.1

package/extensions/qol.ts

@@ -1,10 +1,10 @@
-import type { AgentMessage } from "@mariozechner/pi-agent-core";
-import { complete, type Message } from "@mariozechner/pi-ai";
-import { AssistantMessageComponent, BorderedLoader, convertToLlm, CustomEditor, serializeConversation, SessionManager, Theme, type ExtensionAPI, type ExtensionCommandContext, type ExtensionContext, type KeybindingsManager, type SessionEntry } from "@mariozechner/pi-coding-agent";
-import type { AutocompleteItem, AutocompleteSuggestions, EditorTheme, TUI } from "@mariozechner/pi-tui";
-import { matchesKey, Text, truncateToWidth, visibleWidth, wrapTextWithAnsi } from "@mariozechner/pi-tui";
+import type { AgentMessage } from "@earendil-works/pi-agent-core";
+import { complete, type Message } from "@earendil-works/pi-ai";
+import { AssistantMessageComponent, BorderedLoader, convertToLlm, CustomEditor, serializeConversation, SessionManager, Theme, type ExtensionAPI, type ExtensionCommandContext, type ExtensionContext, type KeybindingsManager, type SessionEntry } from "@earendil-works/pi-coding-agent";
+import type { AutocompleteItem, AutocompleteSuggestions, EditorTheme, TUI } from "@earendil-works/pi-tui";
+import { matchesKey, Text, truncateToWidth, visibleWidth, wrapTextWithAnsi } from "@earendil-works/pi-tui";
 import { execFile, execFileSync } from "node:child_process";
-import { existsSync, readFileSync, writeFileSync } from "node:fs";
+import { existsSync, readFileSync, realpathSync, writeFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { basename, dirname, isAbsolute, join, resolve } from "node:path";
 
@@ -21,9 +21,26 @@ const QUESTION_SERVICE_SYMBOL = Symbol.for("vstack.pi-questions.service");
 const QOL_NOTIFICATION_SERVICE_SYMBOL = Symbol.for("vstack.pi-qol.notification-service");
 const VSTACK_MODAL_LOCK_SYMBOL = Symbol.for("vstack.pi.modal-lock");
 const CAVEMAN_BRIDGE_SYMBOL = Symbol.for("vstack.pi.caveman");
+const PI_AGENTS_STATUSLINE_SYMBOL = Symbol.for("vstack.pi-agents-tmux.statusline");
 const CAVEMAN_ICON_ACTIVE = "\uee9a";
 const CAVEMAN_ICON_INACTIVE = "\u{f19e0}";
 
+type AgentAsciiColor = "red" | "green" | "yellow" | "blue" | "magenta" | "cyan";
+
+interface PiAgentsStatuslineBridge {
+	getCurrentSubagent(cwd?: string): { name: string; color?: string } | undefined;
+}
+
+const AGENT_ASCII_COLOR_SEQUENCE: AgentAsciiColor[] = ["magenta", "green", "blue", "cyan", "yellow", "red"];
+const AGENT_ASCII_BG: Record<AgentAsciiColor, number> = {
+	red: 41,
+	green: 42,
+	yellow: 43,
+	blue: 44,
+	magenta: 45,
+	cyan: 46,
+};
+
 interface CavemanBridge {
 	isActive(): boolean;
 	getMode(): string;
@@ -41,6 +58,52 @@ function readCavemanBridge(): CavemanBridge | undefined {
 	const value = host[CAVEMAN_BRIDGE_SYMBOL];
 	return value && typeof value === "object" ? (value as CavemanBridge) : undefined;
 }
+
+function readPiAgentsStatuslineBridge(): PiAgentsStatuslineBridge | undefined {
+	const host = globalThis as unknown as Record<PropertyKey, unknown>;
+	const value = host[PI_AGENTS_STATUSLINE_SYMBOL];
+	return value && typeof value === "object" && typeof (value as PiAgentsStatuslineBridge).getCurrentSubagent === "function"
+		? (value as PiAgentsStatuslineBridge)
+		: undefined;
+}
+
+function normalizeAgentAsciiColor(value: string | undefined): AgentAsciiColor | undefined {
+	const normalized = value?.trim().toLowerCase().replace(/[^a-z]/g, "");
+	switch (normalized) {
+		case "red": return "red";
+		case "green": return "green";
+		case "yellow":
+		case "orange": return "yellow";
+		case "blue": return "blue";
+		case "magenta":
+		case "purple":
+		case "violet": return "magenta";
+		case "cyan":
+		case "teal": return "cyan";
+		default: return undefined;
+	}
+}
+
+function fallbackAgentAsciiColor(name: string): AgentAsciiColor {
+	let hash = 0;
+	for (const char of name) hash = ((hash * 31) + char.charCodeAt(0)) >>> 0;
+	return AGENT_ASCII_COLOR_SEQUENCE[hash % AGENT_ASCII_COLOR_SEQUENCE.length] ?? "magenta";
+}
+
+function ansiAgentBg(color: AgentAsciiColor, text: string): string {
+	return `\x1b[30;${AGENT_ASCII_BG[color]}m${text}\x1b[39;49m`;
+}
+
+function subagentStatuslineMarker(cwd: string, maxInnerWidth = 24): { plain: string; styled: string } | undefined {
+	const bridgeInfo = readPiAgentsStatuslineBridge()?.getCurrentSubagent(cwd);
+	const envName = process.env.PI_SUBAGENT_CHILD_AGENT?.trim();
+	const rawName = bridgeInfo?.name?.trim() || envName;
+	if (!rawName) return undefined;
+	const color = normalizeAgentAsciiColor(bridgeInfo?.color) ?? normalizeAgentAsciiColor(process.env.PI_SUBAGENT_CHILD_COLOR) ?? fallbackAgentAsciiColor(rawName);
+	const inner = truncateToWidth(rawName, Math.max(1, maxInnerWidth), "…");
+	const plain = ` ${inner} `;
+	return { plain, styled: ansiAgentBg(color, plain) };
+}
 const THINKING_TIMER_STORE_SYMBOL = Symbol.for("vstack.pi-qol.thinking-timer.store");
 const THINKING_TIMER_PATCH_SYMBOL = Symbol.for("vstack.pi-qol.thinking-timer.patch");
 const SESSION_SEARCH_PENDING_SYMBOL = Symbol.for("vstack.pi-qol.session-search.pending-context");
@@ -62,7 +125,7 @@ const DEFAULT_PERMISSION_GATE_PREVIEW_CHARS = 1200;
 const DEFAULT_PERMISSION_GATE_PREVIEW_LINE_WIDTH = 120;
 const DEFAULT_SESSION_SEARCH_LIMIT = 40;
 const DEFAULT_SESSION_SEARCH_PREVIEW_SNIPPETS = 6;
-const DEFAULT_SESSION_SEARCH_SHORTCUT = "f3";
+const DEFAULT_SESSION_SEARCH_SHORTCUT = "f2";
 const DEFAULT_SESSION_SEARCH_SUMMARY_INPUT_CHARS = 180_000;
 const DEFAULT_SESSION_SEARCH_SUMMARY_MAX_TOKENS = 4096;
 const DEFAULT_SESSION_SEARCH_CACHE_TTL_SECONDS = 0;
@@ -1257,25 +1320,29 @@ function cavemanIconTone(mode: string, active: boolean): "muted" | "text" | "suc
 
 function renderStatusLine(width: number, ctx: ExtensionContext, git: GitState, pi: ExtensionAPI, theme: Pick<Theme, "fg">): string {
 	const { label: contextLabel, percent } = statuslineContextInfo(ctx);
-	const projectChunk = `${git.projectName}${gitBadge(git, settingBoolean("showDirtyMarker", true, ctx.cwd))} ${formatModelName(ctx)} / `;
+	const projectChunk = `${git.projectName}${gitBadge(git, settingBoolean("showDirtyMarker", true, ctx.cwd))} ${formatModelName(ctx)}`;
+	const statusSeparator = " / ";
 	const thinkingLevel = normalizeThinkingLevel(pi.getThinkingLevel());
 	const thinkingChunk = thinkingLevel;
-	const contextChunk = ` (${contextLabel})`;
+	const contextChunk = ` ${contextLabel}`;
 	const cavemanBridge = readCavemanBridge();
 	const cavemanVisible = !!cavemanBridge && (cavemanBridge.isStatusBadgeEnabled?.(ctx.cwd) ?? true);
 	const caveman = cavemanVisible ? cavemanBridge : undefined;
 	const cavemanActive = caveman?.isActive() ?? false;
 	const cavemanGlyph = caveman ? (cavemanActive ? CAVEMAN_ICON_ACTIVE : CAVEMAN_ICON_INACTIVE) : "";
 	const cavemanTone = cavemanIconTone(caveman?.getMode() ?? "off", cavemanActive);
-	const cavemanSegment = caveman ? ` / ${cavemanGlyph}` : "";
-	const contextSeparator = caveman ? "  / " : "";
-	const leftPlain = `${projectChunk}${thinkingChunk}${cavemanSegment}${contextSeparator}${contextChunk.trimStart()}`;
-	const rightPlain = percent === null ? "…%" : `${percent}%`;
+	const cavemanSegment = caveman ? `${statusSeparator}${cavemanGlyph}` : "";
+	const contextSeparator = caveman ? ` ${statusSeparator}` : "";
+	const leftPlain = `${projectChunk}${statusSeparator}${thinkingChunk}${cavemanSegment}${contextSeparator}${contextChunk.trimStart()}`;
+	const percentPlain = percent === null ? "…%" : `${percent}%`;
+	const subagentMarker = subagentStatuslineMarker(ctx.cwd);
+	const rightPlain = subagentMarker ? `${percentPlain} ${subagentMarker.plain}` : percentPlain;
 	const percentColor = percent === null ? "muted" : percent <= 15 ? "error" : percent <= 30 ? "warning" : "success";
+	const separatorColored = theme.fg("muted", statusSeparator);
 	const leftColored = caveman
-		? `${theme.fg("accent", projectChunk)}${theme.fg(THINKING_TOKEN[thinkingLevel], thinkingChunk)}${theme.fg("accent", " / ")}${theme.fg(cavemanTone, cavemanGlyph)}${theme.fg("accent", `${contextSeparator}${contextChunk.trimStart()}`)}`
-		: `${theme.fg("accent", projectChunk)}${theme.fg(THINKING_TOKEN[thinkingLevel], thinkingChunk)}${theme.fg("accent", contextChunk)}`;
-	const right = theme.fg(percentColor, rightPlain);
+		? `${theme.fg("accent", projectChunk)}${separatorColored}${theme.fg(THINKING_TOKEN[thinkingLevel], thinkingChunk)}${separatorColored}${theme.fg(cavemanTone, cavemanGlyph)}${theme.fg("muted", contextSeparator)}${theme.fg("accent", contextChunk.trimStart())}`
+		: `${theme.fg("accent", projectChunk)}${separatorColored}${theme.fg(THINKING_TOKEN[thinkingLevel], thinkingChunk)}${theme.fg("accent", contextChunk)}`;
+	const right = subagentMarker ? `${theme.fg(percentColor, percentPlain)} ${subagentMarker.styled}` : theme.fg(percentColor, percentPlain);
 	const minimumGap = 1;
 	const gapWidth = Math.max(minimumGap, width - visibleWidth(leftPlain) - visibleWidth(rightPlain) - 2);
 	const filled = percent === null ? 0 : Math.round(gapWidth * (percent / 100));
@@ -2205,7 +2272,7 @@ function statusMessage(ctx: ExtensionContext): string {
 	return [
 		"Pi QOL status",
 		`Statusline: ${settingBoolean("replaceFooter", true, ctx.cwd) ? "replaces footer" : "footer preserved"}; prompt=${settingBoolean("compactPrompt", true, ctx.cwd) ? "π compact" : "default chrome"}`,
-		`Shift+Enter newline: ${settingBoolean("newlineOnShiftEnter", true, ctx.cwd) ? "enabled" : "disabled"}`,
+		`shift+enter newline: ${settingBoolean("newlineOnShiftEnter", true, ctx.cwd) ? "enabled" : "disabled"}`,
 		`Fallback newline key: ${newlineFallbackKey(ctx.cwd)}`,
 		`Pending queue preview: ${settingBoolean("pendingQueue.asciiGreen", true, ctx.cwd) ? "ANSI green" : "Pi default"}`,
 		`Image chips: ${settingBoolean("showImageChips", true, ctx.cwd) ? "filled (placeholders and existing image paths)" : "off"}`,
@@ -2221,23 +2288,12 @@ function statusMessage(ctx: ExtensionContext): string {
 		`Notifications: ${settingBoolean("notification.enabled", true, ctx.cwd) ? `enabled (bell=${settingBoolean("notification.bell", true, ctx.cwd)}, native=${settingBoolean("notification.native", true, ctx.cwd)}, tmuxClientTty=${settingBoolean("notification.tmuxNativeClientTty", true, ctx.cwd)}, tmuxMessage=${settingBoolean("notification.tmux", false, ctx.cwd)})` : "disabled"}`,
 		`Permission gate: ${settingBoolean("permissionGate.enabled", false, ctx.cwd) ? `enabled (${permissionGateCommands(ctx.cwd).join(", ") || "none configured"}; preview ${boundedSettingNumber("permissionGate.previewLines", DEFAULT_PERMISSION_GATE_PREVIEW_LINES, 4, 40, ctx.cwd)} lines/${boundedSettingNumber("permissionGate.previewChars", DEFAULT_PERMISSION_GATE_PREVIEW_CHARS, 200, 5000, ctx.cwd)} chars)` : "disabled"}`,
 		`Thinking timer: ${settingBoolean("thinkingTimer.enabled", true, ctx.cwd) ? "enabled" : "disabled"}`,
-		"If Shift+Enter still submits, configure your terminal/tmux to send a distinct Shift+Enter sequence or use the fallback key.",
+		"If shift+enter still submits, configure your terminal/tmux to send a distinct shift+enter sequence or use the fallback key.",
 	].join("\n");
 }
 
 
-type QolSessionSortMode = "recent" | "relevance";
-
-type QolSessionAction = "resume" | "copy" | "summarize" | "newSession" | "back";
-
-const QOL_SESSION_ACTIONS: QolSessionAction[] = ["resume", "copy", "summarize", "newSession", "back"];
-const QOL_SESSION_ACTION_LABELS: Record<QolSessionAction, string> = {
-	resume: "Resume Session From Here",
-	copy: "Copy Prompt",
-	summarize: "Inject Context",
-	newSession: "New Session + Context",
-	back: "Back",
-};
+type QolSessionSearchScope = "current" | "all";
 
 interface QolSessionSearchSession {
 	allMessagesText: string;
@@ -2257,6 +2313,13 @@ interface QolSessionSearchResult extends QolSessionSearchSession {
 	snippets: string[];
 }
 
+interface QolSessionSearchHit {
+	message: QolSessionUserMessage;
+	rank: number;
+	result: QolSessionSearchResult;
+	snippet: string;
+}
+
 interface QolParsedSessionQuery {
 	mode: "tokens" | "regex";
 	tokens: Array<{ kind: "fuzzy" | "phrase"; value: string }>;
@@ -2267,8 +2330,9 @@ interface QolParsedSessionQuery {
 interface QolSessionSearchState {
 	cursor: number;
 	query: string;
-	results: QolSessionSearchResult[];
+	results: QolSessionSearchHit[];
 	selected: number;
+	scope: QolSessionSearchScope;
 	total: number;
 }
 
@@ -2287,26 +2351,31 @@ interface QolSessionMessagesState {
 }
 
 interface QolSessionActionState {
-	actionIndex: number;
 	message: QolSessionUserMessage;
 	result: QolSessionSearchResult;
 }
 
-interface QolSessionFocusState {
-	cursor: number;
+interface QolSessionContextConfirmState {
 	message: QolSessionUserMessage;
-	prompt: string;
 	result: QolSessionSearchResult;
+	returnScreen: "search" | "messages" | "actions";
 	type: "summarize" | "newSession";
 }
 
+interface QolSessionForkConfirmState {
+	messages: QolSessionUserMessage[];
+	result: QolSessionSearchResult;
+	returnScreen: "search" | "messages" | "actions";
+	selected: number;
+}
+
 interface QolSessionSearchPendingMessage {
 	content: string;
 	details: Record<string, unknown>;
 }
 
 interface QolSessionPaletteAction {
-	type: "cancel" | "resume" | "copy" | "summarize" | "newSession";
+	type: "cancel" | "resume" | "fork" | "copy" | "summarize" | "newSession";
 	customPrompt?: string;
 	message?: QolSessionUserMessage;
 	result?: QolSessionSearchResult;
@@ -2316,6 +2385,8 @@ let qolSessionSearchCache: QolSessionSearchSession[] = [];
 let qolSessionSearchLoadedAt = 0;
 let qolSessionSearchLoading: Promise<QolSessionSearchSession[]> | undefined;
 const qolSessionUserMessagesCache = new Map<string, QolSessionUserMessage[]>();
+const qolSessionSearchPendingActions = new Map<string, QolSessionPaletteAction>();
+let qolSessionSearchPendingActionCounter = 0;
 
 function getPendingSessionSearchMessage(): QolSessionSearchPendingMessage | undefined {
 	return (globalThis as unknown as Record<PropertyKey, unknown>)[SESSION_SEARCH_PENDING_SYMBOL] as QolSessionSearchPendingMessage | undefined;
@@ -2355,11 +2426,12 @@ function resolveSettingsRelativePath(value: string, settingsPath: string): strin
 }
 
 function sessionSearchShortcut(cwd?: string): string | undefined {
-	// Legacy escape hatch from the original Ctrl+F setting. If users disabled it,
+	// Legacy escape hatch from the original ctrl+f setting. If users disabled it,
 	// keep shortcuts disabled even though the default shortcut is now conflict-free.
 	if (!settingBoolean("sessionSearch.ctrlFShortcut", true, cwd)) return undefined;
 	const shortcut = settingStringAllowEmpty("sessionSearch.shortcutKey", DEFAULT_SESSION_SEARCH_SHORTCUT, cwd).trim().toLowerCase();
 	if (!shortcut || shortcut === "none" || shortcut === "off" || shortcut === "false") return undefined;
+	if (shortcut === "f3") return DEFAULT_SESSION_SEARCH_SHORTCUT;
 	return shortcut;
 }
 
@@ -2381,6 +2453,23 @@ function configuredSessionDir(cwd: string): string | undefined {
 	return configured;
 }
 
+function canonicalPathForSessionSearch(path: string | undefined): string | undefined {
+	if (!path) return undefined;
+	try {
+		return realpathSync.native(path);
+	} catch {
+		return resolve(path);
+	}
+}
+
+function sameSessionSearchProject(sessionCwd: string | undefined, cwd: string): boolean {
+	return canonicalPathForSessionSearch(sessionCwd) === canonicalPathForSessionSearch(cwd);
+}
+
+function defaultSessionSearchScope(cwd?: string): QolSessionSearchScope {
+	return settingString("sessionSearch.defaultScope", "current", cwd).toLowerCase() === "all" ? "all" : "current";
+}
+
 async function loadQolSessionSearchSessions(ctx: ExtensionContext, onProgress?: (loaded: number, total: number) => void): Promise<QolSessionSearchSession[]> {
 	const customSessionDir = configuredSessionDir(ctx.cwd);
 	const infos = customSessionDir
@@ -2456,8 +2545,8 @@ function isPendingQueueHintText(text: string): boolean {
 	return plain.startsWith("↳ ") && plain.includes("queued messages");
 }
 
-function pendingQueueLine(text: string): string {
-	return ansiGreen(`| ${text}`);
+function pendingQueuePreviewLine(text: string): string {
+	return ansiGreen(`┃ ${text}`);
 }
 
 function isQueuedMessageStatusText(text: string): boolean {
@@ -2500,7 +2589,8 @@ function installPendingQueueThemePatch(ctx: ExtensionContext): void {
 	proto[PENDING_QUEUE_THEME_PATCH_SYMBOL] = patch;
 	proto.fg = function patchedQolFg(this: Theme, token: string, text: string): string {
 		if (token === "dim" && typeof text === "string" && settingBoolean("pendingQueue.asciiGreen", true, patch.cwd)) {
-			if (isPendingQueuePreviewText(text) || isPendingQueueHintText(text)) return pendingQueueLine(text);
+			if (isPendingQueuePreviewText(text)) return pendingQueuePreviewLine(text);
+			if (isPendingQueueHintText(text)) return (patch.originalFg as (this: Theme, token: string, text: string) => string).call(this, token, `  ${text}`);
 		}
 		return (patch.originalFg as (this: Theme, token: string, text: string) => string).call(this, token, text);
 	};
@@ -2864,6 +2954,16 @@ function messageContentText(content: unknown): string {
 	}).filter(Boolean).join(" ");
 }
 
+function sessionMessageTimestamp(entry: any, message: any): number | undefined {
+	if (typeof message?.timestamp === "number" && Number.isFinite(message.timestamp)) return message.timestamp;
+	if (typeof entry?.timestamp === "number" && Number.isFinite(entry.timestamp)) return entry.timestamp;
+	if (typeof entry?.timestamp === "string") {
+		const parsed = new Date(entry.timestamp).getTime();
+		if (!Number.isNaN(parsed)) return parsed;
+	}
+	return undefined;
+}
+
 function sessionUserMessages(sessionPath: string): QolSessionUserMessage[] {
 	const cached = qolSessionUserMessagesCache.get(sessionPath);
 	if (cached) return cached;
@@ -2883,7 +2983,7 @@ function sessionUserMessages(sessionPath: string): QolSessionUserMessage[] {
 				index: messages.length + 1,
 				parentId: typeof entry.parentId === "string" || entry.parentId === null ? entry.parentId : undefined,
 				text,
-				timestamp: typeof message.timestamp === "number" ? message.timestamp : undefined,
+				timestamp: sessionMessageTimestamp(entry, message),
 			});
 		}
 	} catch {
@@ -2974,21 +3074,28 @@ function parseSessionSearchQuery(query: string): QolParsedSessionQuery {
 	return { mode: "tokens", tokens };
 }
 
-function simpleFuzzyScore(needle: string, haystack: string): number | undefined {
-	const query = needle.toLowerCase();
-	const text = haystack.toLowerCase();
+function searchWordLengthPenalty(word: string, query: string): number {
+	return Math.max(0, word.length - query.length);
+}
+
+function searchStringScore(needle: string, haystack: string): number | undefined {
+	const query = normalizeSearchText(needle);
+	const text = normalizeSearchText(haystack);
 	if (!query) return 0;
-	const direct = text.indexOf(query);
-	if (direct >= 0) return direct * 0.1;
-	let pos = 0;
-	let score = 0;
-	for (const char of query) {
-		const found = text.indexOf(char, pos);
-		if (found < 0) return undefined;
-		score += found - pos + 1;
-		pos = found + 1;
+	let best: number | undefined;
+	const record = (score: number) => {
+		best = best === undefined ? score : Math.min(best, score);
+	};
+	if (/^[a-z0-9_]+$/i.test(query)) {
+		for (const match of text.matchAll(/[a-z0-9_]+/gi)) {
+			const word = match[0].toLowerCase();
+			if (word === query) record(0);
+			else if (word.startsWith(query)) record(10 + searchWordLengthPenalty(word, query));
+			else if (word.includes(query)) record(100 + searchWordLengthPenalty(word, query));
+		}
+		return best;
 	}
-	return score + 1000;
+	return text.includes(query) ? 0 : undefined;
 }
 
 function matchSessionSearch(session: QolSessionSearchSession, parsed: QolParsedSessionQuery): { matches: boolean; score: number } {
@@ -2996,21 +3103,12 @@ function matchSessionSearch(session: QolSessionSearchSession, parsed: QolParsedS
 	if (parsed.mode === "regex") {
 		if (!parsed.regex) return { matches: false, score: 0 };
 		const index = text.search(parsed.regex);
-		return index < 0 ? { matches: false, score: 0 } : { matches: true, score: index * 0.1 };
+		return index < 0 ? { matches: false, score: 0 } : { matches: true, score: 0 };
 	}
 	if (parsed.tokens.length === 0) return { matches: true, score: 0 };
 	let score = 0;
-	let normalized: string | undefined;
 	for (const token of parsed.tokens) {
-		if (token.kind === "phrase") {
-			normalized ??= normalizeSearchText(text);
-			const phrase = normalizeSearchText(token.value);
-			const index = normalized.indexOf(phrase);
-			if (index < 0) return { matches: false, score: 0 };
-			score += index * 0.1;
-			continue;
-		}
-		const tokenScore = simpleFuzzyScore(token.value, text);
+		const tokenScore = searchStringScore(token.value, text);
 		if (tokenScore === undefined) return { matches: false, score: 0 };
 		score += tokenScore;
 	}
@@ -3025,9 +3123,10 @@ function sessionSnippetSource(session: QolSessionSearchSession): string {
 	return (session.allMessagesText || session.firstMessage || "").replace(/\s+/g, " ").trim();
 }
 
-function snippetAround(text: string, start: number, length: number, width: number): string {
-	const safeStart = Math.max(0, start - Math.floor(width / 3));
-	const safeEnd = Math.min(text.length, start + length + Math.floor((width * 2) / 3));
+function snippetAround(text: string, start: number, length: number, width: number, lead = Math.floor(width / 3)): string {
+	const safeLead = Math.max(0, Math.min(width, lead));
+	const safeStart = Math.max(0, start - safeLead);
+	const safeEnd = Math.min(text.length, Math.max(start + length, safeStart + width));
 	const prefix = safeStart > 0 ? "…" : "";
 	const suffix = safeEnd < text.length ? "…" : "";
 	return `${prefix}${text.slice(safeStart, safeEnd)}${suffix}`;
@@ -3079,11 +3178,107 @@ function searchQolSessions(sessions: QolSessionSearchSession[], query: string, c
 		if (!match.matches) continue;
 		results.push({ ...session, rank: match.score, snippets: buildSessionSnippets(session, parsed, snippetLimit) });
 	}
-	const sortMode = settingString("sessionSearch.sortMode", "relevance", cwd) === "recent" ? "recent" : "relevance" as QolSessionSortMode;
-	results.sort((a, b) => sortMode === "recent" ? b.modified.getTime() - a.modified.getTime() : a.rank - b.rank || b.modified.getTime() - a.modified.getTime());
+	results.sort((a, b) => a.rank - b.rank || b.modified.getTime() - a.modified.getTime());
 	return results.slice(0, limit);
 }
 
+function resultFromSession(session: QolSessionSearchSession, rank = 0, snippets: string[] = []): QolSessionSearchResult {
+	return { ...session, rank, snippets };
+}
+
+function matchTextSearch(text: string, parsed: QolParsedSessionQuery): { matches: boolean; score: number } {
+	if (parsed.mode === "regex") {
+		if (!parsed.regex) return { matches: false, score: 0 };
+		const index = text.search(parsed.regex);
+		return index < 0 ? { matches: false, score: 0 } : { matches: true, score: 0 };
+	}
+	if (parsed.tokens.length === 0) return { matches: true, score: 0 };
+	let score = 0;
+	for (const token of parsed.tokens) {
+		const tokenScore = searchStringScore(token.value, text);
+		if (tokenScore === undefined) return { matches: false, score: 0 };
+		score += tokenScore;
+	}
+	return { matches: true, score };
+}
+
+function sessionTitleSearchText(session: QolSessionSearchSession): string {
+	return [session.name ?? "", sessionResumeTitle(session), sessionDisplayName(session)].join("\n");
+}
+
+function matchPromptSearch(_session: QolSessionSearchSession, message: QolSessionUserMessage, parsed: QolParsedSessionQuery): { matches: boolean; score: number } {
+	return matchTextSearch(message.text, parsed);
+}
+
+function buildPromptSnippet(message: QolSessionUserMessage, parsed: QolParsedSessionQuery): string {
+	const source = message.text.replace(/\s+/g, " ").trim();
+	if (!source) return "";
+	if (parsed.mode === "regex" && parsed.regex) {
+		parsed.regex.lastIndex = 0;
+		const match = parsed.regex.exec(source);
+		return match ? snippetAround(source, match.index, match[0].length, 160, 24) : source.slice(0, 160);
+	}
+	if (parsed.tokens.length === 0) return source.slice(0, 160);
+	const lower = source.toLowerCase();
+	for (const token of parsed.tokens) {
+		const value = normalizeSearchText(token.value);
+		if (!value) continue;
+		const index = lower.indexOf(value.toLowerCase());
+		if (index >= 0) return snippetAround(source, index, value.length, 160, 24);
+	}
+	return source.slice(0, 160);
+}
+
+function promptRecencyTime(hit: QolSessionSearchHit): number {
+	if (typeof hit.message.timestamp === "number" && Number.isFinite(hit.message.timestamp)) return hit.message.timestamp;
+	return hit.result.modified.getTime();
+}
+
+function compareSessionSearchHitsRecent(a: QolSessionSearchHit, b: QolSessionSearchHit): number {
+	return promptRecencyTime(b) - promptRecencyTime(a)
+		|| b.result.modified.getTime() - a.result.modified.getTime()
+		|| b.message.index - a.message.index;
+}
+
+function searchQolSessionHits(sessions: QolSessionSearchSession[], query: string, cwd: string): QolSessionSearchHit[] {
+	const limit = Math.max(1, Math.floor(settingNumber("sessionSearch.resultLimit", DEFAULT_SESSION_SEARCH_LIMIT, cwd)));
+	const parsed = parseSessionSearchQuery(query);
+	if (parsed.error) return [];
+	const hits: QolSessionSearchHit[] = [];
+	if (!query.trim()) {
+		for (const session of sessions) {
+			const result = resultFromSession(session);
+			for (const message of userMessagesForResult(result)) {
+				const snippet = buildPromptSnippet(message, parsed);
+				hits.push({ message, rank: 0, result: resultFromSession(session, 0, [snippet]), snippet });
+			}
+		}
+		hits.sort(compareSessionSearchHitsRecent);
+		return hits.slice(0, limit);
+	}
+	for (const session of sessions) {
+		let addedPromptHit = false;
+		for (const message of userMessagesForResult(resultFromSession(session))) {
+			const match = matchPromptSearch(session, message, parsed);
+			if (!match.matches) continue;
+			const snippet = buildPromptSnippet(message, parsed);
+			hits.push({ message, rank: match.score, result: resultFromSession(session, match.score, [snippet]), snippet });
+			addedPromptHit = true;
+		}
+		if (!addedPromptHit) {
+			const titleMatch = matchTextSearch(sessionTitleSearchText(session), parsed);
+			if (!titleMatch.matches) continue;
+			const messages = userMessagesForResult(resultFromSession(session));
+			const message = messages[messages.length - 1];
+			if (!message) continue;
+			const snippet = buildPromptSnippet(message, { mode: "tokens", tokens: [] });
+			hits.push({ message, rank: titleMatch.score, result: resultFromSession(session, titleMatch.score, [snippet]), snippet });
+		}
+	}
+	hits.sort((a, b) => a.rank - b.rank || compareSessionSearchHitsRecent(a, b));
+	return hits.slice(0, limit);
+}
+
 function styleSessionSnippet(snippet: string, query: string, theme: Theme): string {
 	let styled = snippet;
 	const parsed = parseSessionSearchQuery(query);
@@ -3143,11 +3338,14 @@ function isPrintableInput(data: string): boolean {
 }
 
 class QolSessionSearchComponent {
-	private screen: "search" | "messages" | "actions" | "focus" = "search";
+	private screen: "search" | "messages" | "actions" | "confirmContext" | "confirmFork" = "search";
 	private searchState: QolSessionSearchState;
 	private messagesState: QolSessionMessagesState | undefined;
 	private actionState: QolSessionActionState | undefined;
-	private focusState: QolSessionFocusState | undefined;
+	private actionReturnScreen: "search" | "messages" = "messages";
+	private contextConfirmState: QolSessionContextConfirmState | undefined;
+	private forkConfirmState: QolSessionForkConfirmState | undefined;
+
 
 	constructor(
 		private readonly done: (action: QolSessionPaletteAction) => void,
@@ -3158,12 +3356,15 @@ class QolSessionSearchComponent {
 		initialQuery = "",
 	) {
 		const query = initialQuery.trim();
+		const scope = defaultSessionSearchScope(cwd);
+		const scopedSessions = this.sessionsForScope(scope);
 		this.searchState = {
 			cursor: query.length,
 			query,
-			results: searchQolSessions(sessions, query, cwd),
+			results: searchQolSessionHits(scopedSessions, query, cwd),
 			selected: 0,
-			total: sessions.length,
+			scope,
+			total: scopedSessions.length,
 		};
 	}
 
@@ -3172,16 +3373,19 @@ class QolSessionSearchComponent {
 	private maxOverlayRows(): number {
 		const terminalRows = Number(this.tui.terminal?.rows ?? process.stdout.rows ?? 30);
 		const safeRows = Number.isFinite(terminalRows) && terminalRows > 0 ? terminalRows : 30;
-		return Math.max(8, Math.floor(safeRows * SESSION_SEARCH_OVERLAY_HEIGHT_RATIO));
+		return Math.max(9, Math.floor(safeRows * SESSION_SEARCH_OVERLAY_HEIGHT_RATIO));
+	}
+
+	private compactSearchLayout(): boolean {
+		return this.maxOverlayRows() < 18;
 	}
 
 	private searchMaxVisibleRows(): number {
 		const configured = Math.max(1, Math.floor(settingNumber("sessionSearch.maxVisible", 8, this.cwd)));
-		// Search results render as 3 content rows plus a divider between rows.
-		// The remaining chrome is title, search box, help text, scroll status,
-		// footer, and frame. Keep the rendered line count within overlay maxHeight
-		// so Pi does not clip the bottom of the popup on short terminals.
-		const responsive = Math.max(1, Math.floor((this.maxOverlayRows() - 12) / 4));
+		// Each hit is two rows plus a separator between hits. Chrome is aggressively
+		// reduced on short terminals so the popup can shrink to one visible hit.
+		const chromeRows = this.compactSearchLayout() ? 7 : 11;
+		const responsive = Math.max(1, Math.floor((this.maxOverlayRows() - chromeRows) / 3));
 		return Math.max(1, Math.min(configured, responsive));
 	}
 
@@ -3193,20 +3397,31 @@ class QolSessionSearchComponent {
 		return Math.max(1, Math.min(configured, responsive));
 	}
 
+	private forkConfirmMaxVisibleRows(): number {
+		const configured = Math.max(1, Math.floor(settingNumber("sessionSearch.messageMaxVisible", 12, this.cwd)));
+		const responsive = Math.max(1, this.maxOverlayRows() - 13);
+		return Math.max(1, Math.min(configured, responsive));
+	}
+
 	render(width: number): string[] {
 		const configured = Math.max(70, Math.floor(settingNumber("sessionSearch.overlayWidth", 104, this.cwd)));
 		const renderWidth = Math.min(Math.max(48, width), configured);
 		if (this.screen === "messages" && this.messagesState) return this.renderMessages(renderWidth, this.messagesState);
 		if (this.screen === "actions" && this.actionState) return this.renderActions(renderWidth, this.actionState);
-		if (this.screen === "focus" && this.focusState) return this.renderFocus(renderWidth, this.focusState);
+		if (this.screen === "confirmContext" && this.contextConfirmState) return this.renderContextConfirm(renderWidth, this.contextConfirmState);
+		if (this.screen === "confirmFork" && this.forkConfirmState) return this.renderForkConfirm(renderWidth, this.forkConfirmState);
 		return this.renderSearch(renderWidth);
 	}
 
 	handleInput(data: string): void {
-		if (this.screen === "messages") this.handleMessagesInput(data);
-		else if (this.screen === "actions") this.handleActionInput(data);
-		else if (this.screen === "focus") this.handleFocusInput(data);
-		else this.handleSearchInput(data);
+		if (this.screen === "messages" && this.messagesState) this.handleMessagesInput(data);
+		else if (this.screen === "actions" && this.actionState) this.handleActionInput(data);
+		else if (this.screen === "confirmContext" && this.contextConfirmState) this.handleContextConfirmInput(data);
+		else if (this.screen === "confirmFork" && this.forkConfirmState) this.handleForkConfirmInput(data);
+		else {
+			this.screen = "search";
+			this.handleSearchInput(data);
+		}
 		this.tui.requestRender();
 	}
 
@@ -3214,12 +3429,29 @@ class QolSessionSearchComponent {
 		this.searchState.selected = Math.max(0, Math.min(this.searchState.selected, Math.max(0, this.searchState.results.length - 1)));
 	}
 
+	private sessionsForScope(scope = this.searchState.scope): QolSessionSearchSession[] {
+		if (scope === "all") return this.sessions;
+		return this.sessions.filter((session) => sameSessionSearchProject(session.cwd, this.cwd));
+	}
+
+	private updateResults(resetSelection = true): void {
+		const state = this.searchState;
+		const scopedSessions = this.sessionsForScope(state.scope);
+		state.results = searchQolSessionHits(scopedSessions, state.query, this.cwd);
+		state.total = scopedSessions.length;
+		if (resetSelection) state.selected = 0;
+		this.clampSelection();
+	}
+
+	private toggleScope(): void {
+		this.searchState.scope = this.searchState.scope === "current" ? "all" : "current";
+		this.updateResults(true);
+	}
+
 	private updateQuery(query: string, cursor: number): void {
 		this.searchState.query = query;
 		this.searchState.cursor = Math.max(0, Math.min(cursor, query.length));
-		this.searchState.results = searchQolSessions(this.sessions, query, this.cwd);
-		this.searchState.selected = 0;
-		this.clampSelection();
+		this.updateResults(true);
 	}
 
 	private selectedMessageIndex(messages: QolSessionUserMessage[], query: string): number {
@@ -3234,12 +3466,15 @@ class QolSessionSearchComponent {
 		return Math.max(0, messages.length - 1);
 	}
 
-	private openMessages(result: QolSessionSearchResult): void {
+	private openMessages(result: QolSessionSearchResult, preferredMessage?: QolSessionUserMessage): void {
 		const messages = userMessagesForResult(result);
+		const preferredIndex = preferredMessage
+			? messages.findIndex((message) => message.index === preferredMessage.index || (message.entryId && message.entryId === preferredMessage.entryId))
+			: -1;
 		this.messagesState = {
 			messages,
 			result,
-			selected: this.selectedMessageIndex(messages, this.searchState.query),
+			selected: preferredIndex >= 0 ? preferredIndex : this.selectedMessageIndex(messages, this.searchState.query),
 		};
 		this.screen = "messages";
 	}
@@ -3248,16 +3483,101 @@ class QolSessionSearchComponent {
 		return `Focus on prompt #${message.index}: ${message.text}`;
 	}
 
+	private openContextConfirm(type: "summarize" | "newSession", result: QolSessionSearchResult, message: QolSessionUserMessage, returnScreen: "search" | "messages" | "actions"): void {
+		this.contextConfirmState = { message, result, returnScreen, type };
+		this.screen = "confirmContext";
+	}
+
+	private returnFromContextConfirm(state: QolSessionContextConfirmState): void {
+		this.contextConfirmState = undefined;
+		if (state.returnScreen === "actions" && this.actionState) this.screen = "actions";
+		else if (state.returnScreen === "messages" && this.messagesState) this.screen = "messages";
+		else this.screen = "search";
+	}
+
+	private confirmContextAction(state: QolSessionContextConfirmState): void {
+		this.done({ customPrompt: this.selectedFocusText(state.message), message: state.message, result: state.result, type: state.type });
+	}
+
+	private openForkConfirm(result: QolSessionSearchResult, message: QolSessionUserMessage, returnScreen: "search" | "messages" | "actions"): void {
+		const messages = userMessagesForResult(result);
+		const preferredIndex = messages.findIndex((candidate) => candidate.index === message.index || (message.entryId && candidate.entryId === message.entryId));
+		this.forkConfirmState = {
+			messages,
+			result,
+			returnScreen,
+			selected: preferredIndex >= 0 ? preferredIndex : 0,
+		};
+		this.screen = "confirmFork";
+	}
+
+	private returnFromForkConfirm(state: QolSessionForkConfirmState): void {
+		this.forkConfirmState = undefined;
+		if (state.returnScreen === "actions" && this.actionState) this.screen = "actions";
+		else if (state.returnScreen === "messages" && this.messagesState) this.screen = "messages";
+		else this.screen = "search";
+	}
+
+	private confirmForkAction(state: QolSessionForkConfirmState): void {
+		const message = state.messages[state.selected];
+		if (!message) return;
+		this.done({ message, result: state.result, type: "fork" });
+	}
+
+	private returnFromActions(): void {
+		this.actionState = undefined;
+		if (this.actionReturnScreen === "messages" && this.messagesState) this.screen = "messages";
+		else this.screen = "search";
+	}
+
 	private handleSearchInput(data: string): void {
 		const state = this.searchState;
 		if (matchesKey(data, "escape")) {
 			this.done({ type: "cancel" });
 			return;
 		}
+		if (matchesKey(data, "tab")) {
+			this.toggleScope();
+			return;
+		}
 		if (matchesKey(data, "return") || matchesKey(data, "enter")) {
-			const result = state.results[state.selected];
-			if (!result) return;
-			this.openMessages(result);
+			const hit = state.results[state.selected];
+			if (!hit) return;
+			this.openMessages(hit.result, hit.message);
+			return;
+		}
+		if (matchesKey(data, "alt+c")) {
+			const hit = state.results[state.selected];
+			if (hit) this.done({ message: hit.message, result: hit.result, type: "copy" });
+			return;
+		}
+		if (matchesKey(data, "alt+f")) {
+			const hit = state.results[state.selected];
+			if (hit) this.openForkConfirm(hit.result, hit.message, "search");
+			return;
+		}
+		if (matchesKey(data, "alt+r")) {
+			const hit = state.results[state.selected];
+			if (hit) this.done({ result: hit.result, type: "resume" });
+			return;
+		}
+		if (matchesKey(data, "alt+i")) {
+			const hit = state.results[state.selected];
+			if (hit) this.openContextConfirm("summarize", hit.result, hit.message, "search");
+			return;
+		}
+		if (matchesKey(data, "alt+n")) {
+			const hit = state.results[state.selected];
+			if (hit) this.openContextConfirm("newSession", hit.result, hit.message, "search");
+			return;
+		}
+		if (matchesKey(data, "alt+a")) {
+			const hit = state.results[state.selected];
+			if (hit) {
+				this.actionState = { message: hit.message, result: hit.result };
+				this.actionReturnScreen = "search";
+				this.screen = "actions";
+			}
 			return;
 		}
 		if (matchesKey(data, "up")) {
@@ -3265,7 +3585,7 @@ class QolSessionSearchComponent {
 			return;
 		}
 		if (matchesKey(data, "down")) {
-			state.selected = Math.min(state.results.length - 1, state.selected + 1);
+			state.selected = Math.min(Math.max(0, state.results.length - 1), state.selected + 1);
 			return;
 		}
 		if (matchesKey(data, "-") || matchesKey(data, "pageup")) {
@@ -3273,7 +3593,7 @@ class QolSessionSearchComponent {
 			return;
 		}
 		if (matchesKey(data, "=") || matchesKey(data, "pagedown")) {
-			state.selected = Math.min(state.results.length - 1, state.selected + this.searchMaxVisibleRows());
+			state.selected = Math.min(Math.max(0, state.results.length - 1), state.selected + this.searchMaxVisibleRows());
 			return;
 		}
 		if (matchesKey(data, "left")) {
@@ -3326,14 +3646,35 @@ class QolSessionSearchComponent {
 		if (matchesKey(data, "return") || matchesKey(data, "enter")) {
 			const message = state.messages[state.selected];
 			if (!message) return;
-			this.actionState = { actionIndex: 0, message, result: state.result };
+			this.actionState = { message, result: state.result };
+			this.actionReturnScreen = "messages";
 			this.screen = "actions";
 			return;
 		}
-		if (data.toLowerCase() === "r") {
+		if (matchesKey(data, "alt+r")) {
 			this.done({ result: state.result, type: "resume" });
 			return;
 		}
+		if (matchesKey(data, "alt+c")) {
+			const message = state.messages[state.selected];
+			if (message) this.done({ message, result: state.result, type: "copy" });
+			return;
+		}
+		if (matchesKey(data, "alt+f")) {
+			const message = state.messages[state.selected];
+			if (message) this.openForkConfirm(state.result, message, "messages");
+			return;
+		}
+		if (matchesKey(data, "alt+i")) {
+			const message = state.messages[state.selected];
+			if (message) this.openContextConfirm("summarize", state.result, message, "messages");
+			return;
+		}
+		if (matchesKey(data, "alt+n")) {
+			const message = state.messages[state.selected];
+			if (message) this.openContextConfirm("newSession", state.result, message, "messages");
+			return;
+		}
 		if (matchesKey(data, "up")) {
 			state.selected = Math.max(0, state.selected - 1);
 			return;
@@ -3363,146 +3704,198 @@ class QolSessionSearchComponent {
 		const state = this.actionState;
 		if (!state) return;
 		if (matchesKey(data, "escape") || matchesKey(data, "backspace")) {
-			this.screen = "messages";
+			this.returnFromActions();
 			return;
 		}
-		if (matchesKey(data, "tab") || matchesKey(data, "right")) {
-			state.actionIndex = (state.actionIndex + 1) % QOL_SESSION_ACTIONS.length;
+		if (matchesKey(data, "alt+c")) {
+			this.done({ message: state.message, result: state.result, type: "copy" });
 			return;
 		}
-		if (matchesKey(data, "shift+tab") || matchesKey(data, "left")) {
-			state.actionIndex = (state.actionIndex - 1 + QOL_SESSION_ACTIONS.length) % QOL_SESSION_ACTIONS.length;
+		if (matchesKey(data, "alt+f")) {
+			this.openForkConfirm(state.result, state.message, "actions");
 			return;
 		}
-		if (matchesKey(data, "return") || matchesKey(data, "enter")) {
-			const action = QOL_SESSION_ACTIONS[state.actionIndex];
-			if (action === "back") {
-				this.screen = "messages";
-				return;
-			}
-			if (action === "resume" || action === "copy") {
-				this.done({ message: state.message, result: state.result, type: action });
-				return;
-			}
-			this.focusState = { cursor: 0, message: state.message, prompt: "", result: state.result, type: action };
-			this.screen = "focus";
+		if (matchesKey(data, "alt+r")) {
+			this.done({ result: state.result, type: "resume" });
+			return;
+		}
+		if (matchesKey(data, "alt+i")) {
+			this.openContextConfirm("summarize", state.result, state.message, "actions");
+			return;
+		}
+		if (matchesKey(data, "alt+n")) {
+			this.openContextConfirm("newSession", state.result, state.message, "actions");
+			return;
 		}
 	}
 
-	private handleFocusInput(data: string): void {
-		const state = this.focusState;
+	private handleContextConfirmInput(data: string): void {
+		const state = this.contextConfirmState;
 		if (!state) return;
-		if (matchesKey(data, "escape")) {
-			this.screen = "actions";
+		if (matchesKey(data, "escape") || matchesKey(data, "backspace")) {
+			this.returnFromContextConfirm(state);
 			return;
 		}
 		if (matchesKey(data, "return") || matchesKey(data, "enter")) {
-			this.done({ customPrompt: state.prompt.trim() || this.selectedFocusText(state.message), message: state.message, result: state.result, type: state.type });
-			return;
-		}
-		if (matchesKey(data, "left")) {
-			state.cursor = Math.max(0, state.cursor - 1);
-			return;
+			this.confirmContextAction(state);
 		}
-		if (matchesKey(data, "right")) {
-			state.cursor = Math.min(state.prompt.length, state.cursor + 1);
+	}
+
+	private handleForkConfirmInput(data: string): void {
+		const state = this.forkConfirmState;
+		if (!state) return;
+		if (matchesKey(data, "escape") || matchesKey(data, "backspace")) {
+			this.returnFromForkConfirm(state);
 			return;
 		}
-		if (matchesKey(data, "home") || matchesKey(data, "ctrl+a")) {
-			state.cursor = 0;
+		if (matchesKey(data, "return") || matchesKey(data, "enter")) {
+			this.confirmForkAction(state);
 			return;
 		}
-		if (matchesKey(data, "end") || matchesKey(data, "ctrl+e")) {
-			state.cursor = state.prompt.length;
+		if (matchesKey(data, "up")) {
+			state.selected = Math.max(0, state.selected - 1);
 			return;
 		}
-		if (matchesKey(data, "ctrl+u")) {
-			state.prompt = "";
-			state.cursor = 0;
+		if (matchesKey(data, "down")) {
+			state.selected = Math.min(Math.max(0, state.messages.length - 1), state.selected + 1);
 			return;
 		}
-		if (matchesKey(data, "ctrl+w") || matchesKey(data, "alt+backspace")) {
-			const before = state.prompt.slice(0, state.cursor);
-			const after = state.prompt.slice(state.cursor);
-			let i = before.length;
-			while (i > 0 && /\s/.test(before[i - 1]!)) i -= 1;
-			while (i > 0 && !/\s/.test(before[i - 1]!)) i -= 1;
-			state.prompt = `${before.slice(0, i)}${after}`;
-			state.cursor = i;
+		if (matchesKey(data, "-") || matchesKey(data, "pageup")) {
+			state.selected = Math.max(0, state.selected - this.forkConfirmMaxVisibleRows());
 			return;
 		}
-		if (matchesKey(data, "backspace")) {
-			if (state.cursor > 0) {
-				state.prompt = `${state.prompt.slice(0, state.cursor - 1)}${state.prompt.slice(state.cursor)}`;
-				state.cursor -= 1;
-			}
+		if (matchesKey(data, "=") || matchesKey(data, "pagedown")) {
+			state.selected = Math.min(Math.max(0, state.messages.length - 1), state.selected + this.forkConfirmMaxVisibleRows());
 			return;
 		}
-		if (matchesKey(data, "delete")) {
-			if (state.cursor < state.prompt.length) state.prompt = `${state.prompt.slice(0, state.cursor)}${state.prompt.slice(state.cursor + 1)}`;
+		if (matchesKey(data, "home") || matchesKey(data, "ctrl+a")) {
+			state.selected = 0;
 			return;
 		}
-		if (isPrintableInput(data)) {
-			state.prompt = `${state.prompt.slice(0, state.cursor)}${data}${state.prompt.slice(state.cursor)}`;
-			state.cursor += data.length;
+		if (matchesKey(data, "end") || matchesKey(data, "ctrl+e")) {
+			state.selected = Math.max(0, state.messages.length - 1);
 		}
 	}
 
 	private renderSearch(width: number): string[] {
-		const { bottom, divider, empty, filledRow, inner, row, selectedRow, top } = boxParts(width, this.theme);
+		const { bottom, divider, empty, filledRow, inner, row, top } = boxParts(width, this.theme);
 		const state = this.searchState;
-		const lines: string[] = [top("Session Search", `${state.results.length}/${state.total} shown`), empty()];
+		const compact = this.compactSearchLayout();
+		const lines: string[] = [top("Session Search", `${state.results.length} hits`), empty()];
 		const accent = (s: string) => this.theme.fg("accent", s);
 		const dim = (s: string) => this.theme.fg("dim", s);
 		const muted = (s: string) => this.theme.fg("muted", s);
-		const pair = (left: string, right: string) => {
-			const leftWidth = Math.max(1, inner - visibleWidth(right) - 1);
-			const clippedLeft = truncateToWidth(left, leftWidth, "…");
-			const gap = Math.max(1, inner - visibleWidth(clippedLeft) - visibleWidth(right));
-			return `${clippedLeft}${" ".repeat(gap)}${right}`;
-		};
 		const cursorChar = state.query[state.cursor] ?? " ";
 		const queryDisplay = `${state.query.slice(0, state.cursor)}${this.theme.inverse(cursorChar)}${state.query.slice(state.cursor + (state.cursor < state.query.length ? 1 : 0))}`;
+		lines.push(row(this.renderScopeTabs(inner)));
+		if (!compact) lines.push(empty());
 		lines.push(filledRow(` > ${queryDisplay}`));
-		lines.push(row(dim(`${state.total} sessions · re:<pattern> regex · "phrase" exact`)));
-		lines.push(empty(), divider(), empty());
+		if (!compact) lines.push(row(dim(`tokens · re:<pattern> regex · "phrase" exact`)));
+		lines.push(divider());
+
 		if (state.results.length === 0) {
-			lines.push(row(muted(state.query.trim() ? "No sessions match your search" : "No sessions found")), empty());
+			lines.push(row(muted(state.query.trim() ? "No prompts match your search" : "No prompts found")));
 		} else {
-			const maxVisible = this.searchMaxVisibleRows();
-			const start = Math.max(0, Math.min(state.selected - Math.floor(maxVisible / 2), state.results.length - maxVisible));
-			const end = Math.min(start + maxVisible, state.results.length);
-			const rowBudget = Math.max(10, inner);
-			for (let i = start; i < end; i++) {
-				const result = state.results[i]!;
-				const selected = i === state.selected;
-				const title = sessionResumeTitle(result);
-				const rightPlain = `${promptCountLabel(sessionUserPromptCount(result))} · ${formatSessionSearchDate(result.modified)}`;
-				const right = selected ? this.theme.fg("text", rightPlain) : dim(rightPlain);
-				const titleBudget = Math.max(12, rowBudget - visibleWidth(right) - 1);
-				const titleText = truncateToWidth(title, titleBudget, "…");
-				const left = selected ? this.theme.bold(accent(titleText)) : this.theme.bold(titleText);
-				const titleRow = pair(left, right);
-				lines.push(selected ? selectedRow(titleRow) : row(titleRow));
-
-				const folder = shortPathForUi(result.cwd || dirname(result.path));
-				const project = sessionDisplayName(result);
-				lines.push(row(muted(truncateToWidth(`${project} · ${folder}`, inner, "…"))));
-
-				const snippet = state.query.trim() ? (result.snippets[0] || lastUserMessageSnippet(result)) : lastUserMessageSnippet(result);
-				const label = state.query.trim() ? "match" : "last";
-				const snippetPrefix = `${dim(`${label}:`)} `;
-				lines.push(row(`${snippetPrefix}${truncateToWidth(styleSessionSnippet(snippet, state.query, this.theme), inner - visibleWidth(snippetPrefix), "…")}`));
-				if (i < end - 1) lines.push(row(this.theme.fg("borderMuted", "─".repeat(Math.max(8, inner)))));
-			}
-			if (state.results.length > maxVisible) lines.push(empty(), row(dim(`${state.selected + 1}/${state.results.length} ${state.query.trim() ? "matches" : "recent sessions"}`)));
+			lines.push(...this.renderSearchHitPane(inner, row, dim, muted, accent));
+		}
+
+		lines.push(divider());
+		if (compact) {
+			lines.push(row(`${ansiYellow("alt+c/f/r/i/n/a")} ${dim("actions")}  ${ansiYellow("tab")} ${dim("scope")}`));
+		} else {
+			lines.push(row(`${ansiYellow("-/=")} ${dim("page")}  ${ansiYellow("alt+c")} ${dim("copy")}  ${ansiYellow("alt+f")} ${dim("fork")}  ${ansiYellow("alt+r")} ${dim("resume")}`));
+			lines.push(row(`${ansiYellow("alt+i")} ${dim("inject+ctx")}  ${ansiYellow("alt+n")} ${dim("new+ctx")}  ${ansiYellow("alt+a")} ${dim("actions")}  ${ansiYellow("tab")} ${dim("scope")}`));
 		}
-		lines.push(divider(), empty());
-		lines.push(row(`${ansiYellow("-/=")} ${dim("page")}  ${ansiYellow("enter")} ${dim("prompts")}  ${ansiYellow("ctrl+u")} ${dim("clear")}  ${ansiYellow("esc")} ${dim("close")}`));
 		lines.push(bottom());
 		return lines;
 	}
 
+	private renderSearchHitPane(
+		inner: number,
+		row: (content?: string) => string,
+		dim: (s: string) => string,
+		muted: (s: string) => string,
+		accent: (s: string) => string,
+	): string[] {
+		const state = this.searchState;
+		const compact = this.compactSearchLayout();
+		const maxVisible = this.searchMaxVisibleRows();
+		const start = Math.max(0, Math.min(state.selected - Math.floor(maxVisible / 2), state.results.length - maxVisible));
+		const end = Math.min(start + maxVisible, state.results.length);
+		const gap = ` ${dim("│")} `;
+		const twoPane = inner >= 72;
+		const rightWidth = twoPane ? Math.max(24, Math.floor(inner * 0.43)) : 0;
+		const leftWidth = twoPane ? Math.max(24, inner - rightWidth - visibleWidth(gap)) : inner;
+		const paneRows = Math.max(1, (end - start) * 3 - 1);
+		const selectedHit = state.results[state.selected];
+		const rightLines = twoPane ? this.renderPromptPreviewLines(selectedHit, rightWidth, paneRows, dim, muted, accent) : [];
+		const fixed = (content: string, colWidth: number, selected = false): string => {
+			const safe = content.replace(/[\r\n\t]+/g, " ");
+			const clipped = truncateToWidth(safe, colWidth, "");
+			const padded = clipped + " ".repeat(Math.max(0, colWidth - visibleWidth(clipped)));
+			return selected ? this.theme.bg("selectedBg", padded) : padded;
+		};
+		const leftLines: string[] = [];
+		for (let i = start; i < end; i++) {
+			const hit = state.results[i]!;
+			const selected = i === state.selected;
+			const promptDate = new Date(promptRecencyTime(hit));
+			const metadata = dim(`#${hit.message.index} · ${formatSessionSearchDate(promptDate)}`);
+			const titleText = truncateToWidth(sessionResumeTitle(hit.result), Math.max(8, leftWidth - visibleWidth(metadata) - 1), "…");
+			const title = accent(titleText);
+			const snippet = styleSessionSnippet(hit.snippet || hit.message.text, state.query, this.theme);
+			leftLines.push(fixed(selected ? this.theme.bold(snippet) : snippet, leftWidth, selected));
+			leftLines.push(fixed(`${title} ${metadata}`, leftWidth, selected));
+			if (i < end - 1) leftLines.push(fixed(dim("─".repeat(Math.max(8, leftWidth))), leftWidth));
+		}
+		const output: string[] = [];
+		for (let i = 0; i < leftLines.length; i++) {
+			if (twoPane) output.push(row(`${leftLines[i] ?? ""}${gap}${rightLines[i] ?? " ".repeat(rightWidth)}`));
+			else output.push(row(leftLines[i] ?? ""));
+		}
+		if (!twoPane && selectedHit) {
+			output.push(row(dim("─".repeat(Math.max(8, inner)))));
+			for (const line of this.renderPromptPreviewLines(selectedHit, inner, Math.min(5, paneRows), dim, muted, accent)) output.push(row(line));
+		}
+		if (!compact && state.results.length > maxVisible) output.push(row(dim(`${state.selected + 1}/${state.results.length} ${state.query.trim() ? "matches" : "recent prompts"}`)));
+		return output;
+	}
+
+	private renderPromptPreviewLines(
+		hit: QolSessionSearchHit | undefined,
+		width: number,
+		maxLines: number,
+		dim: (s: string) => string,
+		muted: (s: string) => string,
+		accent: (s: string) => string,
+	): string[] {
+		const fixed = (content: string): string => {
+			const clipped = truncateToWidth(content.replace(/[\r\n\t]+/g, " "), width, "…");
+			return clipped + " ".repeat(Math.max(0, width - visibleWidth(clipped)));
+		};
+		if (!hit) return Array.from({ length: maxLines }, () => fixed(""));
+		const title = accent("Prompt preview");
+		const cwd = muted(truncateToWidth(shortPathForUi(hit.result.cwd || hit.result.path), width, "…"));
+		const bodyBudget = Math.max(1, maxLines - 3);
+		const body = wrapVisible(styleSessionSnippet(hit.message.text, this.searchState.query, this.theme), width, bodyBudget);
+		const lines = [fixed(title), fixed(cwd), fixed(dim("─".repeat(Math.max(8, width)))), ...body.map(fixed)];
+		while (lines.length < maxLines) lines.push(fixed(""));
+		return lines.slice(0, maxLines);
+	}
+
+	private renderScopeTabs(inner: number): string {
+		const tabs: { id: QolSessionSearchScope; label: string }[] = [
+			{ id: "current", label: "Project" },
+			{ id: "all", label: "All" },
+		];
+		const parts = tabs.map((tab) => {
+			const label = ` ${truncateToWidth(tab.label, 18, "…")} `;
+			if (tab.id === this.searchState.scope) return this.theme.fg("accent", this.theme.inverse(this.theme.bold(label)));
+			return this.theme.bg("selectedBg", this.theme.fg("accent", label));
+		});
+		return truncateToWidth(parts.join(" "), inner, "");
+	}
+
 	private renderMessages(width: number, state: QolSessionMessagesState): string[] {
 		const { bottom, divider, empty, inner, row, selectedRow, top } = boxParts(width, this.theme);
 		const accent = (s: string) => this.theme.fg("accent", s);
@@ -3516,11 +3909,10 @@ class QolSessionSearchComponent {
 			const gap = Math.max(1, inner - visibleWidth(clippedLeft) - visibleWidth(right));
 			return `${clippedLeft}${" ".repeat(gap)}${right}`;
 		};
-		const right = dim(`${promptCountLabel(state.messages.length)} · ${formatSessionSearchDate(result.modified)}`);
+		const right = dim(formatSessionSearchDate(result.modified));
 		const title = truncateToWidth(sessionResumeTitle(result), Math.max(12, inner - visibleWidth(right) - 1), "…");
 		lines.push(row(pair(this.theme.bold(accent(title)), right)));
 		lines.push(row(muted(truncateToWidth(shortPathForUi(result.cwd || result.path), inner, "…"))));
-		lines.push(row(dim(`${state.messages.length} user prompt${state.messages.length === 1 ? "" : "s"} · enter opens prompt actions · r resumes latest session state`)));
 		lines.push(empty(), divider(), empty());
 
 		const maxVisible = this.messageMaxVisibleRows();
@@ -3536,9 +3928,9 @@ class QolSessionSearchComponent {
 			const messageRow = `${number} ${selected ? this.theme.bold(accent(text)) : text}`;
 			lines.push(selected ? selectedRow(messageRow) : row(messageRow));
 		}
-		if (state.messages.length > maxVisible) lines.push(empty(), row(dim(`${state.selected + 1}/${state.messages.length} user prompts`)));
 		lines.push(divider(), empty());
-		lines.push(row(`${ansiYellow("-/=")} ${dim("page")}  ${ansiYellow("enter")} ${dim("prompt actions")}  ${ansiYellow("r")} ${dim("resume session")}  ${ansiYellow("esc")} ${dim("sessions")}`));
+		lines.push(row(`${ansiYellow("-/=")} ${dim("page")}  ${ansiYellow("alt+c")} ${dim("copy")}  ${ansiYellow("alt+f")} ${dim("fork")}  ${ansiYellow("alt+r")} ${dim("resume")}`));
+		lines.push(row(`${ansiYellow("alt+i")} ${dim("inject+ctx")}  ${ansiYellow("alt+n")} ${dim("new+ctx")}`));
 		lines.push(bottom());
 		return lines;
 	}
@@ -3556,46 +3948,85 @@ class QolSessionSearchComponent {
 		lines.push(row(dim("Selected prompt")));
 		const wrapped = wrapVisible(state.message.text, inner, 4);
 		for (const line of wrapped) lines.push(row(line));
-		lines.push(empty());
-		lines.push(row(dim("Resume Session From Here restores this prompt in the selected session.")));
-		lines.push(row(dim("Inject Context adds a summary here; New Session + Context imports it into a new session.")));
 		lines.push(empty(), divider(), empty());
-		const actions = QOL_SESSION_ACTIONS.map((action, index) => {
-			const label = QOL_SESSION_ACTION_LABELS[action];
-			return index === state.actionIndex ? this.theme.bold(accent(`[${label}]`)) : dim(`[${label}]`);
-		});
-		for (const line of wrapVisible(actions.join(" "), inner, 2)) lines.push(row(line));
+		const helpLines = [
+			"Fork session from here opens the source session at the point before this prompt and places the prompt in the editor; submit to branch from there.",
+			"Copy Prompt copies this prompt into your current editor.",
+			"Inject + Context summarizes the source session into the current session, focused on this prompt.",
+			"New + Context creates a fresh session and imports that focused summary there.",
+		];
+		for (const help of helpLines) {
+			for (const line of wrapVisible(dim(help), inner, 2)) lines.push(row(line));
+		}
+		lines.push(empty(), divider(), empty());
+		lines.push(row(`${ansiYellow("alt+c")} ${dim("copy")}  ${ansiYellow("alt+f")} ${dim("fork")}  ${ansiYellow("alt+r")} ${dim("resume")}`));
+		lines.push(row(`${ansiYellow("alt+i")} ${dim("inject+ctx")}  ${ansiYellow("alt+n")} ${dim("new+ctx")}`));
+		lines.push(bottom());
+		return lines;
+	}
+
+	private renderForkConfirm(width: number, state: QolSessionForkConfirmState): string[] {
+		const { bottom, divider, empty, inner, row, selectedRow, top } = boxParts(width, this.theme);
+		const accent = (s: string) => this.theme.fg("accent", s);
+		const dim = (s: string) => this.theme.fg("dim", s);
+		const muted = (s: string) => this.theme.fg("muted", s);
+		const lines: string[] = [top("Fork Session", `${state.selected + 1}/${state.messages.length}`), empty()];
+		const title = truncateToWidth(sessionResumeTitle(state.result), inner, "…");
+		lines.push(row(this.theme.bold(accent(title))));
+		lines.push(row(muted(truncateToWidth(shortPathForUi(state.result.cwd || state.result.path), inner, "…"))));
+		lines.push(empty(), divider(), empty());
+		for (const line of wrapVisible(dim("Choose the prompt to fork from. Pi will open the source session before that prompt and place the prompt in the editor."), inner, 2)) {
+			lines.push(row(line));
+		}
 		lines.push(empty());
-		lines.push(row(`${ansiYellow("tab")}/${ansiYellow("←→")} ${dim("cycle")}  ${ansiYellow("enter")} ${dim("choose")}  ${ansiYellow("esc")} ${dim("prompts")}`));
+
+		const maxVisible = this.forkConfirmMaxVisibleRows();
+		const start = Math.max(0, Math.min(state.selected - Math.floor(maxVisible / 2), state.messages.length - maxVisible));
+		const end = Math.min(start + maxVisible, state.messages.length);
+		for (let i = start; i < end; i++) {
+			const message = state.messages[i]!;
+			const selected = i === state.selected;
+			const numberPlain = `#${message.index}`;
+			const number = selected ? this.theme.fg("text", numberPlain) : dim(numberPlain);
+			const textWidth = Math.max(12, inner - visibleWidth(number) - 1);
+			const text = truncateToWidth(message.text, textWidth, "…");
+			const messageRow = `${number} ${selected ? this.theme.bold(accent(text)) : text}`;
+			lines.push(selected ? selectedRow(messageRow) : row(messageRow));
+		}
+		if (state.messages.length > maxVisible) lines.push(row(dim(`${state.selected + 1}/${state.messages.length} prompts`)));
+		lines.push(divider(), empty());
+		lines.push(row(`${ansiYellow("backspace")} ${dim("back")}`));
 		lines.push(bottom());
 		return lines;
 	}
 
-	private renderFocus(width: number, state: QolSessionFocusState): string[] {
-		const { bottom, divider, empty, filledRow, inner, row, top } = boxParts(width, this.theme);
+	private renderContextConfirm(width: number, state: QolSessionContextConfirmState): string[] {
+		const { bottom, divider, empty, inner, row, top } = boxParts(width, this.theme);
 		const accent = (s: string) => this.theme.fg("accent", s);
 		const dim = (s: string) => this.theme.fg("dim", s);
 		const muted = (s: string) => this.theme.fg("muted", s);
-		const action = state.type === "newSession" ? "New Session + Context" : "Inject Context";
-		const lines: string[] = [top("Context Focus", action), empty()];
-		lines.push(row(`${accent(sessionResumeTitle(state.result))}  ${dim(`-> ${action}`)}`));
-		lines.push(row(muted(truncateToWidth(`Default focus: #${state.message.index} ${state.message.text}`, inner, "…"))));
+		const action = state.type === "newSession" ? "New + Context" : "Inject + Context";
+		const verb = state.type === "newSession" ? "create new session with context" : "inject context";
+		const lines: string[] = [top(action), empty()];
+		lines.push(row(`${accent(sessionResumeTitle(state.result))}  ${dim(`#${state.message.index}`)}`));
+		lines.push(row(muted(truncateToWidth(shortPathForUi(state.result.cwd || state.result.path), inner, "…"))));
 		lines.push(empty(), divider(), empty());
-		const prefix = "> ";
-		const textWidth = Math.max(10, inner - visibleWidth(prefix));
-		if (!state.prompt) {
-			lines.push(filledRow(`${prefix}${this.theme.inverse(" ")}${muted(" optional focus override; Enter uses the selected prompt")}`));
-		} else {
-			const cursorChar = state.prompt[state.cursor] ?? " ";
-			const text = `${state.prompt.slice(0, state.cursor)}${this.theme.inverse(cursorChar)}${state.prompt.slice(state.cursor + (state.cursor < state.prompt.length ? 1 : 0))}`;
-			const wrapped = wrapVisible(text, textWidth, 5);
-			for (let i = 0; i < wrapped.length; i++) lines.push(filledRow(`${i === 0 ? prefix : " ".repeat(visibleWidth(prefix))}${wrapped[i]}`));
+		const details = [
+			"This summarizes the entire source session, including messages after this prompt.",
+			"The selected prompt is used as the focus for the summary, not as a cutoff point.",
+			state.type === "newSession"
+				? "New + Context creates a fresh session and imports that focused summary there."
+				: "Inject + Context adds that focused summary to your current session.",
+		];
+		for (const detail of details) {
+			for (const line of wrapVisible(dim(detail), inner, 2)) lines.push(row(line));
 		}
 		lines.push(empty(), divider(), empty());
-		lines.push(row(`${ansiYellow("enter")} ${dim(action === "Inject Context" ? "inject context" : "create session with context")}  ${ansiYellow("esc")} ${dim("actions")}`));
+		lines.push(row(`${ansiYellow("backspace")} ${dim("back")}`));
 		lines.push(bottom());
 		return lines;
 	}
+
 }
 
 function wrapVisible(text: string, width: number, maxLines: number): string[] {
@@ -3660,7 +4091,6 @@ class QolSessionSearchLoadingComponent {
 			empty(),
 			divider(),
 			empty(),
-			row(`${ansiYellow("esc")} ${dim("cancel")}  ${ansiYellow("ctrl+c")} ${dim("cancel")}`),
 			bottom(),
 		];
 	}
@@ -3783,7 +4213,7 @@ async function buildSessionSearchContextMessageWithLoader(ctx: ExtensionContext,
 
 async function injectSessionSearchContext(pi: ExtensionAPI, ctx: ExtensionContext, result: QolSessionSearchResult, customPrompt?: string): Promise<void> {
 	const title = sessionDisplayName(result);
-	const message = await buildSessionSearchContextMessageWithLoader(ctx, result, customPrompt, "Inject Context");
+	const message = await buildSessionSearchContextMessageWithLoader(ctx, result, customPrompt, "Inject + Context");
 	pi.sendMessage({ customType: SESSION_SEARCH_CONTEXT_TYPE, content: message.content, details: message.details, display: true }, { deliverAs: "followUp", triggerTurn: false });
 	ctx.ui.notify(`Session context injected: ${title}`, "info");
 }
@@ -3792,9 +4222,48 @@ function asCommandContext(ctx: ExtensionContext): (ExtensionContext & Partial<Ex
 	return ctx as ExtensionContext & Partial<ExtensionCommandContext>;
 }
 
+function queueSessionSearchCommandAction(ctx: ExtensionContext, action: QolSessionPaletteAction): void {
+	const id = `ss-${Date.now().toString(36)}-${(++qolSessionSearchPendingActionCounter).toString(36)}`;
+	qolSessionSearchPendingActions.set(id, action);
+	ctx.ui.setEditorText(`/search:resume-pending ${id}`);
+	ctx.ui.notify(`${sessionDisplayName(action.result!)} — press Enter to ${action.type === "fork" ? "fork" : "resume"}`, "info");
+}
+
+async function runSessionSearchResumeOrFork(ctx: ExtensionContext, action: QolSessionPaletteAction): Promise<boolean> {
+	if (!action.result || (action.type !== "resume" && action.type !== "fork")) return true;
+	const commandCtx = asCommandContext(ctx);
+	if (typeof commandCtx.switchSession !== "function") return false;
+	const targetTitle = sessionDisplayName(action.result);
+	const selectedMessage = action.type === "fork" ? action.message : undefined;
+	let replacementStarted = false;
+	try {
+		const result = await commandCtx.switchSession(action.result.path, {
+			withSession: async (replacementCtx: any) => {
+				replacementStarted = true;
+				if (selectedMessage) {
+					const manager = replacementCtx.sessionManager as any;
+					if (selectedMessage.entryId && selectedMessage.parentId && typeof manager?.branch === "function") manager.branch(selectedMessage.parentId);
+					else if (selectedMessage.entryId && selectedMessage.parentId === null && typeof manager?.resetLeaf === "function") manager.resetLeaf();
+					replacementCtx.ui.setEditorText(selectedMessage.text);
+					const timer = setTimeout(() => {
+						replacementCtx.ui.notify(`Forked session: ${targetTitle} at prompt #${selectedMessage.index}. Submit to branch from here.`, "info");
+					}, 0);
+					timer.unref?.();
+					return;
+				}
+				replacementCtx.ui.notify(`Resumed session: ${targetTitle}`, "info");
+			},
+		});
+		if (result.cancelled) ctx.ui.notify(selectedMessage ? "Fork cancelled" : "Resume cancelled", "info");
+	} catch (error) {
+		if (!replacementStarted) ctx.ui.notify(`${selectedMessage ? "Fork" : "Resume"} failed: ${stringifyError(error)}`, "error");
+	}
+	return true;
+}
+
 async function createNewSessionWithSearchContext(pi: ExtensionAPI, ctx: ExtensionContext, result: QolSessionSearchResult, customPrompt?: string): Promise<void> {
 	const title = sessionDisplayName(result);
-	const message = await buildSessionSearchContextMessageWithLoader(ctx, result, customPrompt, "New Session + Context");
+	const message = await buildSessionSearchContextMessageWithLoader(ctx, result, customPrompt, "New + Context");
 
 	const commandCtx = asCommandContext(ctx);
 	if (typeof commandCtx.newSession === "function") {
@@ -3823,7 +4292,7 @@ async function createNewSessionWithSearchContext(pi: ExtensionAPI, ctx: Extensio
 	}
 	setPendingSessionSearchMessage(message);
 	ctx.ui.setEditorText("/new");
-	ctx.ui.notify(`${title} — press Enter to create a new session with this context`, "info");
+	ctx.ui.notify(`${title} — press enter to create a new session with this context`, "info");
 }
 
 async function consumePendingSessionSearchContext(pi: ExtensionAPI, ctx: ExtensionContext, reason: unknown): Promise<void> {
@@ -3857,35 +4326,8 @@ async function openQolSessionSearch(pi: ExtensionAPI, ctx: ExtensionContext, ini
 		releaseModalLock();
 	}
 	if (!action || action.type === "cancel" || !action.result) return;
-	if (action.type === "resume") {
-		const commandCtx = asCommandContext(ctx);
-		if (typeof commandCtx.switchSession === "function") {
-			const targetTitle = sessionDisplayName(action.result);
-			const selectedMessage = action.message;
-			let replacementStarted = false;
-			try {
-				const result = await commandCtx.switchSession(action.result.path, {
-					withSession: async (replacementCtx: any) => {
-						replacementStarted = true;
-						if (selectedMessage?.entryId) {
-							const manager = replacementCtx.sessionManager as any;
-							if (selectedMessage.parentId && typeof manager?.branch === "function") manager.branch(selectedMessage.parentId);
-							else if (selectedMessage.parentId === null && typeof manager?.resetLeaf === "function") manager.resetLeaf();
-							replacementCtx.ui.setEditorText(selectedMessage.text);
-							replacementCtx.ui.notify(`Resumed ${targetTitle} from prompt #${selectedMessage.index}. Submit to branch from here.`, "info");
-							return;
-						}
-						replacementCtx.ui.notify(`Resumed session: ${targetTitle}`, "info");
-					},
-				});
-				if (result.cancelled) ctx.ui.notify("Resume cancelled", "info");
-			} catch (error) {
-				if (!replacementStarted) ctx.ui.notify(`Resume failed: ${stringifyError(error)}`, "error");
-			}
-			return;
-		}
-		ctx.ui.setEditorText(`/resume ${quoteSessionSearchArg(action.result.path)}`);
-		ctx.ui.notify(`${sessionDisplayName(action.result)} — press Enter to resume`, "info");
+	if (action.type === "resume" || action.type === "fork") {
+		if (!(await runSessionSearchResumeOrFork(ctx, action))) queueSessionSearchCommandAction(ctx, action);
 		return;
 	}
 	if (action.type === "copy") {
@@ -3899,7 +4341,7 @@ async function openQolSessionSearch(pi: ExtensionAPI, ctx: ExtensionContext, ini
 			await injectSessionSearchContext(pi, ctx, action.result, action.customPrompt);
 		} catch (error) {
 			const message = stringifyError(error);
-			ctx.ui.notify(/cancelled/i.test(message) ? "Inject context cancelled" : `Inject context failed: ${message}`, /cancelled/i.test(message) ? "info" : "error");
+			ctx.ui.notify(/cancelled/i.test(message) ? "Inject + Context cancelled" : `Inject + Context failed: ${message}`, /cancelled/i.test(message) ? "info" : "error");
 			ctx.ui.setStatus(SESSION_SEARCH_STATUS_KEY, undefined);
 		}
 		return;
@@ -3909,16 +4351,12 @@ async function openQolSessionSearch(pi: ExtensionAPI, ctx: ExtensionContext, ini
 			await createNewSessionWithSearchContext(pi, ctx, action.result, action.customPrompt);
 		} catch (error) {
 			const message = stringifyError(error);
-			ctx.ui.notify(/cancelled/i.test(message) ? "New Session + Context cancelled" : `New Session + Context failed: ${message}`, /cancelled/i.test(message) ? "info" : "error");
+			ctx.ui.notify(/cancelled/i.test(message) ? "New + Context cancelled" : `New + Context failed: ${message}`, /cancelled/i.test(message) ? "info" : "error");
 			ctx.ui.setStatus(SESSION_SEARCH_STATUS_KEY, undefined);
 		}
 	}
 }
 
-function quoteSessionSearchArg(value: string): string {
-	return `"${value.replace(/\\/g, "\\\\").replace(/"/g, '\\"')}"`;
-}
-
 function renderSessionSearchContextMessage(message: any, options: any, theme: Theme): Text {
 	const raw = typeof message.content === "string"
 		? message.content
@@ -4505,6 +4943,19 @@ export default function qol(pi: ExtensionAPI): void {
 			description: "Refresh the session search index",
 			handler: async (_args, ctx) => handleSearchCommand("refresh", ctx),
 		});
+		pi.registerCommand("search:resume-pending", {
+			description: "Run a pending session-search resume or fork action",
+			handler: async (args, ctx) => {
+				const id = args.trim();
+				const action = qolSessionSearchPendingActions.get(id);
+				if (!action) {
+					ctx.ui.notify("No pending session-search resume/fork action found.", "warning");
+					return;
+				}
+				qolSessionSearchPendingActions.delete(id);
+				if (!(await runSessionSearchResumeOrFork(ctx, action))) ctx.ui.notify("Session resume/fork is unavailable in this context.", "error");
+			},
+		});
 		const shortcut = sessionSearchShortcut();
 		if (shortcut) {
 			pi.registerShortcut(shortcut, {