@vanillagreen/pi-qol 2.2.0 → 2.3.2

package/extensions/qol/session-search/component.ts

@@ -29,6 +29,7 @@ import type {
 	QolSessionMessagesState,
 	QolSessionPaletteAction,
 	QolSessionSearchHit,
+	QolSessionSearchLoad,
 	QolSessionSearchResult,
 	QolSessionSearchScope,
 	QolSessionSearchSession,
@@ -108,7 +109,8 @@ export class QolSessionSearchComponent {
 	private readonly done: (action: QolSessionPaletteAction) => void;
 	private readonly tui: { requestRender(): void; terminal?: { rows?: number } };
 	private readonly theme: Theme;
-	private readonly sessions: QolSessionSearchSession[];
+	/** The index, while it loads, once loaded, or the load's failure. */
+	private sessions: QolSessionSearchLoad;
 	private readonly cwd: string;
 	private readonly currentModel: QolModelInfo | undefined;
 	private screen: "search" | "messages" | "actions" | "confirmContext" | "confirmFork" | "confirmModel" = "search";
@@ -125,7 +127,7 @@ export class QolSessionSearchComponent {
 		done: (action: QolSessionPaletteAction) => void,
 		tui: { requestRender(): void; terminal?: { rows?: number } },
 		theme: Theme,
-		sessions: QolSessionSearchSession[],
+		sessions: QolSessionSearchLoad,
 		cwd: string,
 		initialQuery = "",
 		currentModel: QolModelInfo | undefined = undefined,
@@ -151,6 +153,13 @@ export class QolSessionSearchComponent {
 
 	invalidate(): void {}
 
+	/** Show the index once its load settles; the overlay opens before that. */
+	setSessions(sessions: QolSessionSearchLoad): void {
+		this.sessions = sessions;
+		this.updateResults(false);
+		this.tui.requestRender();
+	}
+
 	private maxOverlayRows(): number {
 		const terminalRows = Number(this.tui.terminal?.rows ?? process.stdout.rows ?? 30);
 		const safeRows = Number.isFinite(terminalRows) && terminalRows > 0 ? terminalRows : 30;
@@ -213,8 +222,9 @@ export class QolSessionSearchComponent {
 	}
 
 	private sessionsForScope(scope = this.searchState.scope): QolSessionSearchSession[] {
-		if (scope === "all") return this.sessions;
-		return this.sessions.filter((session) => sameSessionSearchProject(session.cwd, this.cwd));
+		if (this.sessions.status !== "ready") return [];
+		if (scope === "all") return this.sessions.sessions;
+		return this.sessions.sessions.filter((session) => sameSessionSearchProject(session.cwd, this.cwd));
 	}
 
 	private updateResults(resetSelection = true): void {
@@ -614,7 +624,11 @@ export class QolSessionSearchComponent {
 		if (!compact) lines.push(row(dim(`tokens · re:<pattern> regex · "phrase" exact`)));
 		lines.push(divider());
 
-		if (state.results.length === 0) {
+		if (this.sessions.status === "loading") {
+			lines.push(row(muted("Loading sessions…")));
+		} else if (this.sessions.status === "failed") {
+			lines.push(row(muted(`Could not load sessions: ${this.sessions.error.split("\n")[0]}`)));
+		} else if (state.results.length === 0) {
 			lines.push(row(muted(state.query.trim() ? "No prompts match your search" : "No prompts found")));
 		} else {
 			lines.push(...this.renderSearchHitPane(inner, row, dim, muted, accent));

package/extensions/qol/session-search/index.ts

@@ -5,9 +5,8 @@ import { settingNumber } from "../settings.js";
 import { stringifyError } from "../util.js";
 import {
 	getPendingSessionSearchMessage,
-	nextSessionSearchPendingActionId,
 	pinSessionModel,
-	qolSessionSearchPendingActions,
+	queueSessionSearchPendingAction,
 	refreshQolSessionSearchCache,
 	sessionDisplayName,
 	setPendingSessionSearchMessage,
@@ -17,12 +16,14 @@ import {
 	buildSessionSearchContextMessageWithLoader,
 	injectSessionSearchContext,
 } from "./context.js";
-import type { QolSessionPaletteAction, QolSessionSearchResult } from "./types.js";
+import type { QolSessionPaletteAction, QolSessionSearchLoad, QolSessionSearchResult } from "./types.js";
 
 export {
-	qolSessionSearchPendingActions,
+	clearSessionSearchPendingAction,
 	refreshQolSessionSearchCache,
+	releaseQolSessionSearchCache,
 	sessionSearchShortcut,
+	takeSessionSearchPendingAction,
 } from "./cache.js";
 export { renderSessionSearchContextMessage } from "./context.js";
 
@@ -31,8 +32,7 @@ function asCommandContext(ctx: ExtensionContext): (ExtensionContext & Partial<Ex
 }
 
 function queueSessionSearchCommandAction(ctx: ExtensionContext, action: QolSessionPaletteAction): void {
-	const id = nextSessionSearchPendingActionId();
-	qolSessionSearchPendingActions.set(id, action);
+	const id = queueSessionSearchPendingAction(action);
 	ctx.ui.setEditorText(`/search:resume-pending ${id}`);
 	ctx.ui.notify(`${sessionDisplayName(action.result!)} — press enter to ${action.type === "fork" ? "fork" : "resume"}`, "info");
 }
@@ -121,13 +121,21 @@ export async function openQolSessionSearch(pi: ExtensionAPI, ctx: ExtensionConte
 		ctx.ui.notify("Session search requires interactive UI", "warning");
 		return;
 	}
-	const sessions = await refreshQolSessionSearchCache(ctx);
+	// The overlay opens at once and fills in when the index is loaded: a
+	// released index takes a full read of every session file to load again.
+	const loading: Promise<QolSessionSearchLoad> = refreshQolSessionSearchCache(ctx).then(
+		(sessions) => ({ status: "ready", sessions }),
+		(error) => ({ status: "failed", error: stringifyError(error) }),
+	);
 	const releaseModalLock = acquirekendexModalLock();
 	let action: QolSessionPaletteAction | undefined;
 	try {
 		const currentModel = ctx.model ? { provider: ctx.model.provider, id: ctx.model.id } : undefined;
-		action = await ctx.ui.custom<QolSessionPaletteAction>((tui, theme, _keybindings, done) =>
-			new QolSessionSearchComponent(done, tui, theme, sessions, ctx.cwd, initialQuery, currentModel), {
+		action = await ctx.ui.custom<QolSessionPaletteAction>((tui, theme, _keybindings, done) => {
+			const component = new QolSessionSearchComponent(done, tui, theme, { status: "loading" }, ctx.cwd, initialQuery, currentModel);
+			void loading.then((load) => component.setSessions(load));
+			return component;
+		}, {
 			overlay: true,
 			overlayOptions: {
 				anchor: "center",

package/extensions/qol/session-search/types.ts

@@ -13,6 +13,13 @@ export interface QolSessionSearchSession {
 	path: string;
 }
 
+/** The session-search index as the overlay sees it: still loading, loaded,
+ *  or failed with the load's error. */
+export type QolSessionSearchLoad =
+	| { status: "loading" }
+	| { status: "ready"; sessions: QolSessionSearchSession[] }
+	| { status: "failed"; error: string };
+
 export interface QolSessionSearchResult extends QolSessionSearchSession {
 	rank: number;
 	snippets: string[];

package/extensions/qol/settings.ts

@@ -1,113 +1,18 @@
-import { existsSync, readFileSync } from "node:fs";
-import { homedir } from "node:os";
-import { dirname, join, resolve } from "node:path";
 import { CONFIG_ID } from "./constants.js";
+import { piSettingsPaths, readPackageConfig, readSettingsFiles } from "./package-config.js";
 
 export type kendexConfig = Record<string, unknown>;
 
-export function expandHome(input: string): string {
-	if (input === "~") return homedir();
-	if (input.startsWith("~/")) return join(homedir(), input.slice(2));
-	return input;
-}
-
-export function projectSettingsPath(cwd: string): string {
-	let current = resolve(cwd);
-	while (true) {
-		const candidate = join(current, ".pi", "settings.json");
-		if (existsSync(candidate)) return candidate;
-		if (existsSync(join(current, ".pi")) || existsSync(join(current, ".git")) || existsSync(join(current, ".kendex-lock.json"))) return candidate;
-		const parent = dirname(current);
-		if (parent === current) return join(resolve(cwd), ".pi", "settings.json");
-		current = parent;
-	}
-}
-
-const PROJECT_TRUST_SYMBOL = Symbol.for("kendex.pi.project-trust");
-
-interface ProjectTrustRegistry {
-	projectSettings?: Map<string, boolean>;
-}
-
-function projectTrustRegistry(): ProjectTrustRegistry {
-	const host = globalThis as unknown as Record<PropertyKey, ProjectTrustRegistry | undefined>;
-	const existing = host[PROJECT_TRUST_SYMBOL];
-	if (existing) return existing;
-	const created: ProjectTrustRegistry = {};
-	host[PROJECT_TRUST_SYMBOL] = created;
-	return created;
-}
-
-export function recordProjectTrust(ctx: { cwd?: string; isProjectTrusted?: () => boolean }): void {
-	if (!ctx.cwd) return;
-	let trusted = true;
-	try {
-		trusted = ctx.isProjectTrusted?.() === true;
-	} catch {
-		trusted = false;
-	}
-	const registry = projectTrustRegistry();
-	if (!registry.projectSettings) registry.projectSettings = new Map();
-	registry.projectSettings.set(projectSettingsPath(ctx.cwd), trusted);
-}
-
-function projectSettingsTrusted(settingsPath: string): boolean {
-	return projectTrustRegistry().projectSettings?.get(settingsPath) === true;
-}
-
-/** Root-anchored as `crates/core/src/harness/pi.rs::pi_root_is_absolute_for`
- * means it, which `isAbsolute` is not: it calls a driveless `\root` absolute
- * where the renderer does not, putting the two on different roots. Hoisted, so
- * a circular import cannot reach it inside a temporal dead zone. */
-function rootAnchored(path: string, windows: boolean): boolean { return windows ? /^(?:[A-Za-z]:[\\/]|[\\/]{2}[^\\/]+[\\/][^\\/]+)/.test(path) : path.startsWith("/"); }
-
-export function piSettingsPaths(cwd = process.cwd()): string[] {
-	const override = expandHome(process.env.PI_CODING_AGENT_DIR?.trim() || "");
-	const userDir = resolve(rootAnchored(override, process.platform === "win32") ? override : expandHome("~/.pi/agent"));
-	const user = join(userDir, "settings.json");
-	const project = projectSettingsPath(cwd);
-	return projectSettingsTrusted(project) ? [user, project] : [user];
-}
-
-function isRecord(value: unknown): value is Record<string, unknown> {
-	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
-}
-
-/** Each settings file `piSettingsPaths` names that exists and parses, later
- * files overriding earlier ones. A malformed file is skipped, as Pi's own
- * settings load treats one as empty. */
-function readPiSettingsFiles(cwd?: string): Record<string, any>[] {
-	const files: Record<string, any>[] = [];
-	for (const settingsPath of piSettingsPaths(cwd)) {
-		if (!existsSync(settingsPath)) continue;
-		try {
-			const parsed = JSON.parse(readFileSync(settingsPath, "utf8"));
-			if (isRecord(parsed)) files.push(parsed);
-		} catch {
-			// Ignore a malformed settings file.
-		}
-	}
-	return files;
-}
-
-export function readPackageConfig(packageId: string, cwd?: string): Record<string, unknown> {
-	const merged: Record<string, unknown> = {};
-	for (const settings of readPiSettingsFiles(cwd)) {
-		const config = settings.kendex?.extensionManager?.config?.[packageId];
-		if (isRecord(config)) Object.assign(merged, config);
-	}
-	return merged;
-}
-
 /** Pi core's `compaction.enabled` over the files QOL reads its own config
  * from, resolved as Pi's `SettingsManager.getCompactionEnabled` resolves it:
  * the last file that sets the key decides, a key no file sets is Pi's default,
  * true, and any falsy value turns compaction off. */
 export function piCompactionEnabled(cwd?: string): boolean {
 	let enabled: unknown;
-	for (const settings of readPiSettingsFiles(cwd)) {
-		const compaction = settings.compaction;
-		if (isRecord(compaction) && compaction.enabled !== undefined) enabled = compaction.enabled;
+	for (const file of readSettingsFiles(piSettingsPaths(cwd))) {
+		if (file.kind !== "parsed") continue;
+		const compaction = file.settings.compaction as { enabled?: unknown } | null | undefined;
+		if (compaction && typeof compaction === "object" && !Array.isArray(compaction) && compaction.enabled !== undefined) enabled = compaction.enabled;
 	}
 	return Boolean(enabled ?? true);
 }

package/extensions/qol.ts

@@ -1,4 +1,6 @@
 import type { ExtensionAPI, ExtensionCommandContext, ExtensionContext } from "@earendil-works/pi-coding-agent";
+import { join } from "node:path";
+import { pruneLanes } from "../scripts/lane-retention.js";
 import { truncateToWidth, type TUI } from "@earendil-works/pi-tui";
 import { criticalInfo, lastAssistantTextFromAgentEnd, needsDirection, taskStats } from "./qol/agent-end.js";
 import { getQuestionService, readCavemanBridge, type QuestionOpenedEventLike } from "./qol/bridges.js";
@@ -16,6 +18,7 @@ import {
 	DEFAULT_IDLE_COMPACTION_SECONDS,
 	DEFAULT_INPUT_BOTTOM_PADDING_LINES,
 	INSTALL_SYMBOL,
+	QOL_BUDGET_HANDOFF_FOLDER,
 	QOL_NOTIFICATION_SERVICE_SYMBOL,
 	QUESTION_OPENED_EVENT,
 	SESSION_MANAGER_STATUS_KEY,
@@ -23,6 +26,7 @@ import {
 	SESSION_SEARCH_STATUS_KEY,
 	SESSION_TITLE_SYNC_INTERVAL_MS,
 	STATUS_KEY,
+	THINKING_TIMER_MAX_DURATIONS,
 	THINKING_TIMER_STORE_SYMBOL,
 	TMUX_SESSION_TITLE_BORDER_FORMAT,
 } from "./qol/constants.js";
@@ -39,6 +43,7 @@ import { imageContentForPath, resolveSubmittedImagePaths } from "./qol/images.js
 import {
 	clearTmuxWindowMark,
 	notifyQuestionOpened,
+	resetQolNotificationCooldowns,
 	sendQolNotification,
 	type QolNotificationService,
 } from "./qol/notifications.js";
@@ -46,6 +51,7 @@ import {
 	installPendingQueueThemePatch,
 	installStatusTextAlignmentPatch,
 	restorePendingQueueThemePatch,
+	restoreStatusTextAlignmentPatch,
 } from "./qol/pending-queue.js";
 import { permissionGateMatch, permissionGatePrompt } from "./qol/permission-gate.js";
 import { createRateLimitAutoResumeController, RATE_LIMIT_AUTO_RESUME_EVENT } from "./qol/rate-limit-auto-resume.js";
@@ -60,15 +66,18 @@ import {
 } from "./qol/session-rename.js";
 import { createScheduleController, getScheduleArgumentCompletions } from "./qol/schedule.js";
 import {
+	clearSessionSearchPendingAction,
 	consumePendingSessionSearchContext,
 	openQolSessionSearch,
-	qolSessionSearchPendingActions,
 	refreshQolSessionSearchCache,
+	releaseQolSessionSearchCache,
 	renderSessionSearchContextMessage,
 	runSessionSearchResumeOrFork,
 	sessionSearchShortcut,
+	takeSessionSearchPendingAction,
 } from "./qol/session-search/index.js";
-import { recordProjectTrust, settingBoolean, settingNumber, settingString } from "./qol/settings.js";
+import { installSettingsCacheRefresh, piUserDir, recordProjectTrust } from "./qol/package-config.js";
+import { settingBoolean, settingNumber, settingString } from "./qol/settings.js";
 import { statusMessage } from "./qol/status-message.js";
 import {
 	formatTmuxSessionTitle,
@@ -102,7 +111,6 @@ export default function qol(pi: ExtensionAPI): void {
 	if (!settingBoolean("enabled", true)) return;
 
 	installThinkingTimerPatch();
-	installStatusTextAlignmentPatch();
 	const thinkingTimerStore: ThinkingTimerStore = {
 		enabled: false,
 		starts: new Map(),
@@ -248,11 +256,24 @@ export default function qol(pi: ExtensionAPI): void {
 		const duration = Math.max(0, endTimeMs - start);
 		thinkingTimerStore.starts.delete(key);
 		thinkingTimerStore.durations.set(key, duration);
+		for (const oldest of thinkingTimerStore.durations.keys()) {
+			if (thinkingTimerStore.durations.size <= THINKING_TIMER_MAX_DURATIONS) break;
+			thinkingTimerStore.durations.delete(oldest);
+		}
 		const label = thinkingTimerStore.labels.get(key);
 		if (label) label.setText(thinkingTimerLabel(thinkingTimerStore.theme, duration, thinkingTimerStore.cwd));
 		if (thinkingTimerStore.starts.size === 0) stopThinkingTimerTicker();
 	};
 
+	// A label is held only to tick it while its block runs. A finished block's
+	// label already shows its final time, and a redraw of that message labels
+	// it again from `durations`.
+	const releaseFinishedThinkingLabels = () => {
+		for (const key of thinkingTimerStore.labels.keys()) {
+			if (!thinkingTimerStore.starts.has(key)) thinkingTimerStore.labels.delete(key);
+		}
+	};
+
 	const clearIdleCompactionTimer = () => {
 		if (idleCompactionTimer) clearTimeout(idleCompactionTimer);
 		idleCompactionTimer = undefined;
@@ -381,7 +402,7 @@ export default function qol(pi: ExtensionAPI): void {
 		if (!service) return false;
 		questionUnsubscribe = service.subscribe((event: any) => {
 			if (event?.action !== "opened") return;
-			notifyQuestionOpened(ctx, { requestId: event.requestId, request: event.request, source: event.source }, "question");
+			notifyQuestionOpened(pi, ctx, { requestId: event.requestId, request: event.request, source: event.source }, "question");
 		});
 		return true;
 	};
@@ -570,7 +591,7 @@ export default function qol(pi: ExtensionAPI): void {
 	};
 	const notificationService: QolNotificationService = {
 		notifyQuestionOpened(ctx, event) {
-			notifyQuestionOpened(ctx ?? currentCtx, event, "question");
+			notifyQuestionOpened(pi, ctx ?? currentCtx, event, "question");
 			return true;
 		},
 	};
@@ -579,15 +600,20 @@ export default function qol(pi: ExtensionAPI): void {
 	pi.events.on(QUESTION_OPENED_EVENT, (data: unknown) => {
 		if (!data || typeof data !== "object") return;
 		const event = data as QuestionOpenedEventLike;
-		notifyQuestionOpened(currentCtx, event, "question");
+		notifyQuestionOpened(pi, currentCtx, event, "question");
 	});
 	pi.events.on(RATE_LIMIT_AUTO_RESUME_EVENT, (payload: unknown) => {
 		if (!currentCtx) return;
 		rateLimitAutoResumeController.noteExternalRateLimitEvent(payload, currentCtx);
 	});
 
+	installSettingsCacheRefresh(pi);
 	pi.on("session_start", (event, ctx) => {
 		recordProjectTrust(ctx);
+		const pruned = pruneLanes(join(piUserDir(), "kendex", "sessions"), QOL_BUDGET_HANDOFF_FOLDER.split("/"));
+		for (const failure of pruned.failed) {
+			console.warn(`handoff-prune-error: ${failure.path}\n${failure.error}`);
+		}
 		currentCtx = ctx;
 		subscribeCavemanBridge();
 		latestSystemPromptOptions = undefined;
@@ -601,6 +627,7 @@ export default function qol(pi: ExtensionAPI): void {
 		void consumePendingSessionSearchContext(pi, ctx, event.reason);
 		installAutocompleteHintStyling(ctx);
 		installPendingQueueThemePatch(ctx);
+		installStatusTextAlignmentPatch(ctx);
 		if (ctx.hasUI) {
 			ctx.ui.setHiddenThinkingLabel(hiddenThinkingLabel(ctx.ui.theme, ctx.cwd));
 			applyWorkingIndicatorMode(ctx);
@@ -647,7 +674,8 @@ export default function qol(pi: ExtensionAPI): void {
 		}
 		startQuestionSubscription(ctx);
 		void attemptAutoRename(ctx);
-		if (settingBoolean("sessionSearch.enabled", true, ctx.cwd)) {
+		// A headless session has no search overlay to open, so it loads no index.
+		if (ctx.hasUI && settingBoolean("sessionSearch.enabled", true, ctx.cwd)) {
 			if (sessionSearchWarmupTimer) clearTimeout(sessionSearchWarmupTimer);
 			sessionSearchWarmupTimer = setTimeout(() => {
 				sessionSearchWarmupTimer = undefined;
@@ -672,8 +700,11 @@ export default function qol(pi: ExtensionAPI): void {
 		clearQuestionSubscribeTimer();
 		if (sessionSearchWarmupTimer) clearTimeout(sessionSearchWarmupTimer);
 		sessionSearchWarmupTimer = undefined;
+		releaseQolSessionSearchCache();
+		clearSessionSearchPendingAction();
 		resetThinkingTimer(undefined);
-		clearTmuxWindowMark();
+		clearTmuxWindowMark(pi);
+		resetQolNotificationCooldowns();
 		questionUnsubscribe?.();
 		questionUnsubscribe = undefined;
 		currentCtx = undefined;
@@ -683,6 +714,7 @@ export default function qol(pi: ExtensionAPI): void {
 		ctx.ui.setStatus(SESSION_SEARCH_STATUS_KEY, undefined);
 		ctx.ui.setStatus("qol-budget-guard", undefined);
 		restorePendingQueueThemePatch(ctx);
+		restoreStatusTextAlignmentPatch();
 		resetStatuslineUi(ctx);
 		ctx.ui.setEditorComponent(undefined);
 	});
@@ -704,7 +736,7 @@ export default function qol(pi: ExtensionAPI): void {
 	});
 	pi.on("agent_start", (_event, ctx) => {
 		clearIdleCompactionTimer();
-		clearTmuxWindowMark();
+		clearTmuxWindowMark(pi);
 		rateLimitAutoResumeController.noteAgentStart(ctx);
 		if (ctx.hasUI) {
 			void refreshStatusline(ctx);
@@ -742,6 +774,7 @@ export default function qol(pi: ExtensionAPI): void {
 		}
 	});
 	pi.on("agent_end", (event, ctx) => {
+		releaseFinishedThinkingLabels();
 		if (ctx.hasUI) {
 			void refreshStatusline(ctx);
 			requestRender();
@@ -754,21 +787,21 @@ export default function qol(pi: ExtensionAPI): void {
 		const critical = criticalInfo(text);
 		if (critical) {
 			pendingTaskCompleteNotification = undefined;
-			sendQolNotification(ctx, "critical", `Critical: ${critical}`, "error", `critical:${critical.slice(0, 80)}`);
+			void sendQolNotification(pi, ctx, "critical", `Critical: ${critical}`, "error", `critical:${critical.slice(0, 80)}`);
 			return;
 		}
 		if (pendingTaskCompleteNotification) {
 			const body = pendingTaskCompleteNotification;
 			pendingTaskCompleteNotification = undefined;
-			sendQolNotification(ctx, "task-complete", body, "info", "task-complete");
+			void sendQolNotification(pi, ctx, "task-complete", body, "info", "task-complete");
 			return;
 		}
 		if (ctx.hasPendingMessages?.()) return;
 		if (needsDirection(text)) {
-			sendQolNotification(ctx, "direction", "Pi is awaiting your direction.", "warning", "direction");
+			void sendQolNotification(pi, ctx, "direction", "Pi is awaiting your direction.", "warning", "direction");
 			return;
 		}
-		sendQolNotification(ctx, "ready", settingString("notification.readyMessage", "Ready for input", ctx.cwd), "info", "ready");
+		void sendQolNotification(pi, ctx, "ready", settingString("notification.readyMessage", "Ready for input", ctx.cwd), "info", "ready");
 	});
 	pi.on("agent_settled", async (_event, ctx) => {
 		await fireStagedBudgetGuard(ctx);
@@ -796,7 +829,7 @@ export default function qol(pi: ExtensionAPI): void {
 	pi.on("session_before_tree", (event, ctx) => handleQolBranchSummary(event, ctx));
 	pi.on("tool_call", async (event: any, ctx) => {
 		if (event?.toolName === "question") {
-			notifyQuestionOpened(ctx, { requestId: event.input?.id ?? event.toolCallId, request: event.input, source: "tool_call" }, "question");
+			notifyQuestionOpened(pi, ctx, { requestId: event.input?.id ?? event.toolCallId, request: event.input, source: "tool_call" }, "question");
 			return undefined;
 		}
 		if (!settingBoolean("permissionGate.enabled", false, ctx.cwd)) return undefined;
@@ -815,7 +848,7 @@ export default function qol(pi: ExtensionAPI): void {
 	});
 
 	pi.on("input", async (event) => {
-		clearTmuxWindowMark();
+		clearTmuxWindowMark(pi);
 		if (event.source === "extension") return { action: "continue" };
 		const text = event.text ?? "";
 		const paths = currentCtx?.cwd ? resolveSubmittedImagePaths(text, currentCtx.cwd) : [];
@@ -901,13 +934,11 @@ export default function qol(pi: ExtensionAPI): void {
 		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);
+				const action = takeSessionSearchPendingAction(args.trim());
 				if (!action) {
 					ctx.ui.notify("No pending session-search resume/fork action found.", "warning");
 					return;
 				}
-				qolSessionSearchPendingActions.delete(id);
 				if (!(await runSessionSearchResumeOrFork(pi, ctx, action))) ctx.ui.notify("Session resume/fork is unavailable in this context.", "error");
 			},
 		});
@@ -952,7 +983,7 @@ export default function qol(pi: ExtensionAPI): void {
 			return;
 		}
 		if (sub === "notify-test") {
-			sendQolNotification(ctx, "test", "QOL notification test", "info", `test:${Date.now()}`);
+			void sendQolNotification(pi, ctx, "test", "QOL notification test", "info", `test:${Date.now()}`);
 			ctx.ui.notify("Sent QOL notification test.", "info");
 			return;
 		}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vanillagreen/pi-qol",
-  "version": "2.2.0",
+  "version": "2.3.2",
   "description": "Pi quality-of-life extension: compact statusline/π prompt, reliable multiline input, styled pasted-image chips, session naming/search/context import, scheduled prompts, handoff, permission prompts, notifications, custom compaction, and a collapsed-thinking timer.",
   "license": "MIT",
   "keywords": [
@@ -504,9 +504,9 @@
         {
           "key": "sessionSearch.cacheTtlSeconds",
           "label": "Session cache TTL",
-          "description": "Seconds before the in-memory session list is refreshed. Default 0 keeps the cache until you explicitly run /search refresh.",
+          "description": "Seconds a loaded session index is kept in memory before it is released; the next search opens at once and reloads it. 0 keeps the index until the session ends.",
           "type": "number",
-          "default": 0,
+          "default": 300,
           "category": "Session Search",
           "apply": "live"
         },
@@ -988,6 +988,7 @@
   },
   "files": [
     "extensions/",
+    "scripts/",
     "assets/",
     "README.md",
     "package.json"