@oh-my-pi/pi-tui 18.11.2 → 18.12.0

package/src/overlays/approval-dialog.ts

@@ -1,15 +1,19 @@
 /**
  * Tool-approval prompt in the composer's place, presented like the ask
- * dialog: the approval title and its details over an action bar. Approving
- * takes a deliberate chord (`app.approval.approve`, Ctrl+Enter by default),
- * so an Enter typed for the composer as the prompt appears never approves a
- * call, and the chord itself only arms {@link APPROVE_ARM_MS} after mount: it
- * is also the follow-up key, pressed mid-run exactly when prompts appear.
- * Esc denies. With an {@link ApprovalDialogDraft}, every other key edits the
- * composer mounted beneath the dialog, so a message can steer the turn while
- * the call waits; an empty composer ignores Enter and arrows scroll the details.
- * The prompt stays a few rows so the composer keeps its room; with a full
- * prompt, the expand key (`app.tools.expand`) swaps it in, wrapped.
+ * dialog: the approval title and its details over a list of choices —
+ * Approve, an optional "approve for this session", and Deny — and an action
+ * bar. The arrows move between the choices and Enter takes the highlighted
+ * one; `app.approval.approve` (Ctrl+Enter by default) approves this call
+ * outright and Esc denies. Enter and the approve chord only arm
+ * {@link APPROVE_ARM_MS} after mount, so a key meant for the composer (Enter,
+ * or the follow-up chord pressed mid-run) as the prompt appears never answers
+ * it. With an {@link ApprovalDialogDraft}, every other key edits the composer
+ * mounted beneath the dialog, so a message can deny the call and steer the
+ * turn instead: while the composer holds a draft, the arrows and Enter edit and
+ * send it, and the highlight sits on Deny, relabeled to say Enter sends.
+ * The prompt stays a few rows so the composer keeps its room; Page Up/Down
+ * scroll the details, and with a full prompt the expand key
+ * (`app.tools.expand`) swaps it in, wrapped.
  */
 import { type Component, Ellipsis, ScrollView, type TUI, truncateToWidth, wrapTextWithAnsi } from "../index";
 import { formatKeyHints, formatTooltipKey } from "../app-keybindings";
@@ -27,8 +31,8 @@ import {
 	matchesSelectPageUp,
 	matchesSelectUp,
 } from "../keybinding-matchers";
-import { col, node } from "../native/describe";
-import type { NativeNode, NativeUiEvent } from "../native/node";
+import { col, item, node } from "../native/describe";
+import { leafKey, type NativeNode, type NativeUiEvent } from "../native/node";
 import { actionBar, actionButton } from "../native/overlay";
 import { PREVIEW_LIMITS, sanitizeDisplayLines } from "../render/render-utils";
 import { theme } from "../theme/theme";
@@ -36,8 +40,17 @@ import { CountdownTimer } from "../chrome/countdown-timer";
 
 /** Detail rows shown before the rest scrolls, so the composer beneath keeps its room. */
 const MAX_DETAIL_ROWS: number = PREVIEW_LIMITS.COLLAPSED_ITEMS;
-/** The approve key is ignored this long after mount, so a follow-up sent as the prompt appears cannot approve it. */
+/** Enter and the approve key are ignored this long after mount, so a key sent as the prompt appears cannot answer it. */
 export const APPROVE_ARM_MS = 500;
+/** The Deny row while a composer draft holds Enter: sending it denies the call and steers the turn. */
+const DENY_AND_SEND_LABEL = "Deny and send message";
+
+type ApprovalAnswer = "once" | "session" | "deny";
+
+interface ApprovalChoice {
+	readonly label: string;
+	readonly answer: ApprovalAnswer;
+}
 
 interface ApprovalDialogCallbacks {
 	onApprove(): void;
@@ -65,6 +78,8 @@ interface ApprovalDialogOptions {
 	onTimeoutReset?: () => void;
 	/** Route typing to the composer instead of dropping it. */
 	draft?: ApprovalDialogDraft;
+	/** Offer to approve this and later like calls for the rest of the session, as the row between Approve and Deny. */
+	session?: { label: string; onApprove(): void };
 }
 
 /** A prompt's detail rows: every line after the title, trailing blanks dropped. */
@@ -81,11 +96,17 @@ export class ApprovalDialogComponent implements Component {
 	#expanded = false;
 	readonly #panel: OverlayPanel;
 	readonly #body = new PanelRows();
+	readonly #choiceRows = new PanelRows();
 	readonly #footer = new PanelRows();
 	#scrollOffset = 0;
 	#bodyRows = MAX_DETAIL_ROWS;
+	/** In list order; the first (Approve) is highlighted on mount and Deny is last. */
+	readonly #choices: readonly ApprovalChoice[];
+	#choice = 0;
 	#closed = false;
 	#native: NativeNode | undefined;
+	/** Whether a draft held the keys when {@link #native} was described: it moves the highlight. */
+	#nativeDrafting = false;
 	readonly #armedAt = performance.now() + APPROVE_ARM_MS;
 	readonly #countdown: CountdownTimer | undefined;
 
@@ -101,9 +122,15 @@ export class ApprovalDialogComponent implements Component {
 		this.#summary = promptDetails(lines);
 		this.#full =
 			options.fullPrompt === undefined ? undefined : promptDetails(sanitizeDisplayLines(options.fullPrompt));
+		this.#choices = [
+			{ label: "Approve", answer: "once" },
+			...(options.session ? [{ label: options.session.label, answer: "session" as const }] : []),
+			{ label: "Deny", answer: "deny" },
+		];
 		this.#panel = new OverlayPanel(title, "omp.overlay.approval");
 		this.#footer.setHeight(1);
 		this.#panel.addChild(this.#body);
+		this.#panel.addChild(this.#choiceRows);
 		this.#panel.addChild(new PanelDivider());
 		this.#panel.addChild(this.#footer);
 		if (options.timeout && options.timeout > 0) {
@@ -116,7 +143,7 @@ export class ApprovalDialogComponent implements Component {
 				},
 				() => {
 					options.onTimeout?.();
-					this.#finish(false);
+					this.#finish("deny");
 				},
 			);
 		}
@@ -137,7 +164,7 @@ export class ApprovalDialogComponent implements Component {
 		if (this.#closed) return;
 		this.#restartCountdown();
 		if (matchesAppApprove(keyData)) {
-			if (performance.now() >= this.#armedAt) this.#finish(true);
+			if (performance.now() >= this.#armedAt) this.#finish("once");
 			return;
 		}
 		if (this.#full && matchesAppToolsExpand(keyData)) {
@@ -151,7 +178,7 @@ export class ApprovalDialogComponent implements Component {
 			return;
 		}
 		if (matchesSelectCancel(keyData)) {
-			this.#finish(false);
+			this.#finish("deny");
 			return;
 		}
 		if (draft?.hasDraft()) {
@@ -159,14 +186,24 @@ export class ApprovalDialogComponent implements Component {
 			return;
 		}
 		const page = Math.max(1, this.#bodyRows - 1);
-		if (matchesSelectUp(keyData)) this.#scroll(-1);
-		else if (matchesSelectDown(keyData)) this.#scroll(1);
+		if (matchesSelectUp(keyData)) this.#moveChoice(-1);
+		else if (matchesSelectDown(keyData)) this.#moveChoice(1);
 		else if (matchesSelectPageUp(keyData)) this.#scroll(-page);
 		else if (matchesSelectPageDown(keyData)) this.#scroll(page);
-		// An empty composer swallows Enter: it would otherwise submit nothing, or interrupt the run.
+		else if (getKeybindings().matches(keyData, "tui.select.confirm")) {
+			if (performance.now() >= this.#armedAt) this.#finish(this.#choices[this.#choice]!.answer);
+		}
+		// Enter never reaches an empty composer: it would submit nothing, or interrupt the run.
 		else if (draft && !getKeybindings().matches(keyData, "tui.input.submit")) this.#editDraft(draft, keyData);
 	}
 
+	#moveChoice(delta: number): void {
+		const count = this.#choices.length;
+		this.#choice = (this.#choice + delta + count) % count;
+		this.#native = undefined;
+		this.options.tui?.requestRender();
+	}
+
 	#editDraft(draft: ApprovalDialogDraft, keyData: string): void {
 		draft.handleInput(keyData);
 		this.options.tui?.requestRender();
@@ -225,18 +262,32 @@ export class ApprovalDialogComponent implements Component {
 			this.#body.setLines(lines);
 		}
 		this.#body.setHeight(rows);
-		this.#footer.setLines([theme.fg("dim", this.#footerHint(overflows))]);
+		const drafting = this.options.draft?.hasDraft() ?? false;
+		// While a draft holds Enter the highlight sits on Deny (sending the draft denies), else on the arrows' choice.
+		const shown = drafting ? this.#choices.length - 1 : this.#choice;
+		this.#choiceRows.setLines(
+			this.#choices.map((choice, index) => {
+				const label = drafting && choice.answer === "deny" ? DENY_AND_SEND_LABEL : choice.label;
+				if (index !== shown) return truncateToWidth(`  ${label}`, innerWidth, Ellipsis.Unicode);
+				const color = choice.answer === "deny" ? "error" : "accent";
+				const row = truncateToWidth(`${theme.nav.cursor} ${label}`, innerWidth, Ellipsis.Unicode);
+				return theme.bold(theme.fg(color, row));
+			}),
+		);
+		this.#footer.setLines([theme.fg("dim", this.#footerHint(overflows, drafting))]);
 		return this.#panel.render(width);
 	}
 
 	/**
 	 * In the dock, in the composer's place and framed as the composer is (an
 	 * `omp.editor.*` root role), like the ask dialog, rather than a card over
-	 * the transcript: the title, the details, then Details (with a full prompt),
-	 * Deny, and the primary Approve, whose keys show in their tooltips.
+	 * the transcript: the title, the details, the choices with the keyboard's
+	 * highlight (a click takes one), then Details (with a full prompt), Deny,
+	 * and the primary Approve, whose keys show in their tooltips.
 	 */
 	describe(): NativeNode {
-		if (this.#native) return this.#native;
+		const drafting = this.options.draft?.hasDraft() ?? false;
+		if (this.#native && this.#nativeDrafting === drafting) return this.#native;
 		const cancelKey = getKeybindings().getKeys("tui.select.cancel")[0];
 		const approveKey = appApproveKeys()[0];
 		const deny = actionButton("Deny", "deny", {
@@ -268,6 +319,15 @@ export class ApprovalDialogComponent implements Component {
 			);
 			children.push(node("col", { role: "omp.approval.details" }, rows, "details"));
 		}
+		const choices = this.#choices.map(choice =>
+			item(choice.answer, {
+				label: choice.label,
+				role: "omp.approval.choice",
+				tone: choice.answer === "deny" ? "error" : "accent",
+			}),
+		);
+		const selected = drafting ? "deny" : this.#choices[this.#choice]!.answer;
+		children.push(node("list", { selected, role: "omp.approval.choices" }, choices, "choices"));
 		// The countdown, when one runs, leads the bar like the ask dialog's.
 		children.push(
 			actionBar([...(this.#countdown ? [this.#countdown.describe()] : []), null, ...expand, deny, approve]),
@@ -275,15 +335,22 @@ export class ApprovalDialogComponent implements Component {
 		// Under the `omp.editor.ask` prefix: Tern's console layout sizes an ask's rows to the
 		// composer column by that prefix, where a bare `omp.editor.*` role spans the whole dock.
 		this.#native = col(children, { role: "omp.editor.ask.approval", gap: "md" });
+		this.#nativeDrafting = drafting;
 		return this.#native;
 	}
 
-	/** Deny, Approve, and Details run exactly what Esc, the approve key, and the expand key run. */
+	/** Deny, Approve, and Details run exactly what Esc, the approve key, and the expand key run; a click on a choice takes it. */
 	handleNativeEvent(event: NativeUiEvent): void {
-		if (this.#closed || event.type !== "action") return;
-		if (event.act === "approve") this.#finish(true);
-		else if (event.act === "deny") this.#finish(false);
-		else if (event.act === "expand") this.toggleDetails();
+		if (this.#closed) return;
+		if (event.type === "action") {
+			if (event.act === "approve") this.#finish("once");
+			else if (event.act === "deny") this.#finish("deny");
+			else if (event.act === "expand") this.toggleDetails();
+			return;
+		}
+		if ((event.type !== "select" && event.type !== "activate") || leafKey(event.key) !== "choices") return;
+		const choice = this.#choices.find(candidate => candidate.answer === event.item);
+		if (choice) this.#finish(choice.answer);
 	}
 
 	/** Detail rows at `width`: one clipped row per detail, or wrapped rows once expanded. */
@@ -294,16 +361,16 @@ export class ApprovalDialogComponent implements Component {
 		return this.#details.flatMap(line => (line === "" ? [""] : wrapTextWithAnsi(theme.fg("accent", line), width)));
 	}
 
-	#footerHint(overflows: boolean): string {
+	#footerHint(overflows: boolean, drafting: boolean): string {
 		const approve = formatKeyHints(appApproveKeys());
 		const expand = this.#full
 			? ` · ${formatKeyHints([appToolsExpandKey()])} ${this.#expanded ? "less" : "details"}`
 			: "";
-		const hint = `${approve} approve · ${editorKey("tui.select.cancel")} deny${expand}`;
-		const draft = this.options.draft;
-		if (draft?.hasDraft()) return `${hint} · ${editorKey("tui.input.submit")} deny and send`;
-		const scroll = overflows ? ` · ${editorKeys("tui.select.up", "tui.select.down")} scroll` : "";
-		return `${hint}${scroll}${draft ? " · type to steer instead" : ""}`;
+		const keys = `${approve} approve · ${editorKey("tui.select.cancel")} deny${expand}`;
+		if (drafting) return `${editorKey("tui.input.submit")} deny and send · ${keys}`;
+		const choose = `${editorKeys("tui.select.up", "tui.select.down")} choose · ${editorKey("tui.select.confirm")} select`;
+		const scroll = overflows ? ` · ${editorKeys("tui.select.pageUp", "tui.select.pageDown")} scroll` : "";
+		return `${choose} · ${keys}${scroll}${this.options.draft ? " · type to deny and steer" : ""}`;
 	}
 
 	#scroll(delta: number): void {
@@ -311,11 +378,12 @@ export class ApprovalDialogComponent implements Component {
 		this.options.tui?.requestRender();
 	}
 
-	#finish(approved: boolean): void {
+	#finish(answer: ApprovalAnswer): void {
 		if (this.#closed) return;
 		this.#closed = true;
 		this.#countdown?.dispose();
-		if (approved) this.callbacks.onApprove();
+		if (answer === "once") this.callbacks.onApprove();
+		else if (answer === "session") this.options.session?.onApprove();
 		else this.callbacks.onDeny();
 	}
 }

package/src/overlays/model-picker.ts

@@ -76,6 +76,8 @@ export interface ModelPickerOptions {
 	taskModeKeys?: readonly KeyId[];
 	/** `provider/id` highlighted and preselected in task mode (current Task subagent model). */
 	taskSelector?: string;
+	/** Present selection-only chrome; consumers handle the chosen selector without mutating a session. */
+	selectOnly?: boolean;
 }
 
 /** Fixed chrome rows: top border, status row, footer, bottom border. */
@@ -90,9 +92,10 @@ const HEIGHT_FRACTION = 0.4;
 const STATUS_HINT = "Session-only switch — role models stay unchanged";
 const QUICK_ROLE_STATUS_HINT = "Quick role switch — applies its model and thinking for this session";
 const TASK_STATUS_HINT = "Task subagent switch — spawned task agents use this model (session-only)";
+const SELECT_ONLY_STATUS_HINT = "Selection only — does not change the session model";
 
 /** Footer hint for the active mode; keys resolve at render time so theme/keybinding changes apply. */
-function footerHint(mode: "session" | "role" | "task"): string {
+function footerHint(mode: "session" | "role" | "task" | "selection"): string {
 	const upDown = editorKeys("tui.select.up", "tui.select.down");
 	const enter = formatKeyHint("enter");
 	const close = `${editorKey("tui.select.cancel")} close`;
@@ -101,6 +104,8 @@ function footerHint(mode: "session" | "role" | "task"): string {
 			return `${upDown} roles · ${enter} apply role model · type to search · ${close}`;
 		case "task":
 			return `${upDown} models · ${enter} use for Task subagents · type to search · ${close}`;
+		case "selection":
+			return `${upDown} models · ${enter} select model · type to search · ${close}`;
 		default:
 			return `${upDown} models · ${enter} use for this session · type to search · @ quick roles · ${close}`;
 	}
@@ -128,6 +133,7 @@ export class ModelPickerComponent implements Component {
 	#taskMatchKeys = new Set<string>();
 	#taskModeKey: KeyId | undefined;
 	#taskSelector: string | undefined;
+	#selectOnly: boolean;
 	#nativeRoot: { memo: string; node: NativeNode } | undefined;
 	#pickerRoot:
 		| {
@@ -151,10 +157,11 @@ export class ModelPickerComponent implements Component {
 		this.#settings = settings;
 		this.#registry = registry;
 		this.#scopedModels = scopedModels;
+		this.#selectOnly = options.selectOnly ?? false;
 		this.#currentSelector = options.currentSelector;
 		this.#currentQuickRoleSelector = options.currentQuickRole ? `@${options.currentQuickRole}` : undefined;
 		this.#taskSelector = options.taskSelector;
-		if (callbacks.onPickTask) {
+		if (!this.#selectOnly && callbacks.onPickTask) {
 			this.#taskModeKey = options.taskModeKeys?.[0];
 			for (const key of options.taskModeKeys ?? []) addKeyAliases(this.#taskMatchKeys, key);
 		}
@@ -165,7 +172,7 @@ export class ModelPickerComponent implements Component {
 
 		this.#browser = new ModelBrowser(settings, {
 			currentContextTokens: options.currentContextTokens,
-			markOverContext: true,
+			markOverContext: !this.#selectOnly,
 			emptyText: () =>
 				this.#roleMode
 					? `  No quick roles in the ${editorKey("app.model.cycleForward") || formatKeyHint("ctrl+p")} cycle`
@@ -250,13 +257,13 @@ export class ModelPickerComponent implements Component {
 
 	/** Switch browser content only when a leading `@` changes the search mode. */
 	#syncItemsForQuery(query: string, refresh = false): void {
-		const roleMode = query.startsWith("@") && !this.#taskMode;
+		const roleMode = !this.#selectOnly && query.startsWith("@") && !this.#taskMode;
 		const modeChanged = roleMode !== this.#roleMode;
 		if (!modeChanged && !refresh) return;
 
 		this.#roleMode = roleMode;
 		this.#browser.setShowProvider(!roleMode);
-		this.#browser.setMarkOverContext(!roleMode && !this.#taskMode);
+		this.#browser.setMarkOverContext(!this.#selectOnly && !roleMode && !this.#taskMode);
 		this.#browser.setPreserveQueryOrder(roleMode);
 		const currentSelector = roleMode
 			? this.#currentQuickRoleSelector
@@ -299,20 +306,32 @@ export class ModelPickerComponent implements Component {
 		this.#browser.setMaxVisible(Math.max(MIN_VISIBLE, listBudget));
 
 		const inner = Math.max(1, width - 4);
+		const selectionOnly = this.#selectOnly;
 		const status = this.#configError
 			? theme.fg("error", ` ${this.#configError}`)
 			: this.#taskMode
 				? theme.fg("error", ` ${TASK_STATUS_HINT}`)
-				: theme.fg("muted", ` ${this.#roleMode ? QUICK_ROLE_STATUS_HINT : STATUS_HINT}`);
+				: theme.fg(
+						"muted",
+						` ${selectionOnly ? SELECT_ONLY_STATUS_HINT : this.#roleMode ? QUICK_ROLE_STATUS_HINT : STATUS_HINT}`,
+					);
 
 		const borderColor: ThemeColor | undefined = this.#taskMode ? "error" : undefined;
-		let footer = footerHint(this.#taskMode ? "task" : this.#roleMode ? "role" : "session");
+		let footer = footerHint(
+			this.#taskMode ? "task" : this.#roleMode ? "role" : selectionOnly ? "selection" : "session",
+		);
 		if (this.#taskModeKey !== undefined && !this.#roleMode) {
 			footer += ` · ${formatKeyHint(this.#taskModeKey)} ${this.#taskMode ? "session model" : "task model"}`;
 		}
 
 		const out: string[] = [];
-		out.push(topBorder(width, this.#taskMode ? "Switch Task Model" : "Switch Model", borderColor));
+		out.push(
+			topBorder(
+				width,
+				this.#taskMode ? "Switch Task Model" : selectionOnly ? "Select Model" : "Switch Model",
+				borderColor,
+			),
+		);
 		out.push(row(status, width, borderColor));
 		for (const line of this.#browser.render(inner)) {
 			out.push(row(line, width, borderColor));
@@ -359,7 +378,7 @@ export class ModelPickerComponent implements Component {
 	}
 
 	#describePicker(): NativeNode {
-		const mode = this.#taskMode ? "task" : this.#roleMode ? "role" : "session";
+		const mode = this.#selectOnly ? "selection" : this.#taskMode ? "task" : this.#roleMode ? "role" : "session";
 		const query = this.#browser.query;
 		const view = this.#browser.pickerOrder({
 			providers: false,
@@ -390,13 +409,15 @@ export class ModelPickerComponent implements Component {
 			? [span(this.#configError, "error")]
 			: mode === "task"
 				? [span(TASK_STATUS_HINT, "warning")]
-				: mode === "role"
-					? QUICK_ROLE_STATUS_HINT
-					: STATUS_HINT;
+				: mode === "selection"
+					? SELECT_ONLY_STATUS_HINT
+					: mode === "role"
+						? QUICK_ROLE_STATUS_HINT
+						: STATUS_HINT;
 		const cycleKey = editorKey("app.model.cycleForward") || formatKeyHint("ctrl+p");
 		const node = picker(
 			{
-				title: mode === "task" ? "Switch task model" : "Switch model",
+				title: mode === "task" ? "Switch task model" : mode === "selection" ? "Select model" : "Switch model",
 				subtitle,
 				icon: "cpu",
 				noun: mode === "role" ? "roles" : "models",
@@ -405,7 +426,8 @@ export class ModelPickerComponent implements Component {
 				preview: "below",
 				query,
 				cursor,
-				placeholder: mode === "task" ? "Search models…" : "Search models, @ for quick roles…",
+				placeholder:
+					mode === "task" || mode === "selection" ? "Search models…" : "Search models, @ for quick roles…",
 				columns: MODEL_PICKER_COLUMNS,
 				...catalogue,
 				order: view.order,
@@ -417,11 +439,17 @@ export class ModelPickerComponent implements Component {
 				actions: compact([
 					pickerAction(
 						"use",
-						mode === "role" ? "Apply role" : mode === "task" ? "Use for Task subagents" : "Use for session",
+						mode === "role"
+							? "Apply role"
+							: mode === "task"
+								? "Use for Task subagents"
+								: mode === "selection"
+									? "Select model"
+									: "Use for session",
 						"enter",
 						{ primary: true },
 					),
-					this.#taskModeKey !== undefined && mode !== "role"
+					this.#taskModeKey !== undefined && mode !== "role" && mode !== "selection"
 						? pickerAction("task", "Task model", this.#taskModeKey, { on: mode === "task" })
 						: undefined,
 					query.length > 0 ? { ...CLOSE_ACTION, label: "Clear search" } : CLOSE_ACTION,
@@ -435,7 +463,7 @@ export class ModelPickerComponent implements Component {
 
 	/** Root card over the status line, the embedded browser, and the mode's key hints. */
 	#describeCard(): NativeNode {
-		const mode = this.#taskMode ? "task" : this.#roleMode ? "role" : "session";
+		const mode = this.#selectOnly ? "selection" : this.#taskMode ? "task" : this.#roleMode ? "role" : "session";
 		const memo = `${mode}\0${this.#configError ?? ""}\0${this.#taskModeKey ?? ""}`;
 		if (this.#nativeRoot?.memo === memo) return this.#nativeRoot.node;
 
@@ -443,7 +471,14 @@ export class ModelPickerComponent implements Component {
 			? span(this.#configError, "error")
 			: this.#taskMode
 				? span(TASK_STATUS_HINT, "error")
-				: span(this.#roleMode ? QUICK_ROLE_STATUS_HINT : STATUS_HINT, "muted");
+				: span(
+						mode === "selection"
+							? SELECT_ONLY_STATUS_HINT
+							: this.#roleMode
+								? QUICK_ROLE_STATUS_HINT
+								: STATUS_HINT,
+						"muted",
+					);
 		const hints: (NativeHint | undefined)[] = [
 			actionHint(["tui.select.up", "tui.select.down"], mode === "role" ? "roles" : "models"),
 			{
@@ -453,20 +488,22 @@ export class ModelPickerComponent implements Component {
 						? "apply role model"
 						: mode === "task"
 							? "use for Task subagents"
-							: "use for this session",
+							: mode === "selection"
+								? "select model"
+								: "use for this session",
 			},
 			{ keys: [], label: "type to search" },
 		];
 		if (mode === "session") hints.push({ keys: ["@"], label: "quick roles" });
 		hints.push(actionHint("tui.select.cancel", "close"));
-		if (this.#taskModeKey !== undefined && !this.#roleMode) {
+		if (this.#taskModeKey !== undefined && !this.#roleMode && mode !== "selection") {
 			hints.push({ keys: [this.#taskModeKey], label: this.#taskMode ? "session model" : "task model" });
 		}
 		// `card` directly: the task-mode tone is a common prop `overlayCard` doesn't take.
 		const node = card(
 			{
 				role: "omp.overlay.model-picker",
-				head: this.#taskMode ? "Switch Task Model" : "Switch Model",
+				head: mode === "task" ? "Switch Task Model" : mode === "selection" ? "Select Model" : "Switch Model",
 				tone: this.#taskMode ? "error" : undefined,
 			},
 			[text([status], { wrap: "word" }), this.#browser, hintsRow(hints)],

package/src/overlays/session-selector.ts

@@ -1338,6 +1338,8 @@ export interface SessionSelectorOptions<T extends SessionSelectorEntry = Session
 	allSessions?: T[];
 	/** Picker heading; defaults to "Resume Session". */
 	title?: string;
+	/** Primary action label; defaults to "Resume" (ANSI footer defaults to "select"). */
+	actionLabel?: string;
 	/** Fixed scope label, or false to omit the scope suffix. */
 	scopeLabel?: string | false;
 	/**
@@ -1405,6 +1407,7 @@ export class SessionSelectorComponent<T extends SessionSelectorEntry = SessionSe
 	readonly #getTerminalRows: () => number;
 	readonly #fillHeight: boolean;
 	readonly #title: string;
+	readonly #actionLabel: string;
 	readonly #scopeLabel: string | false | undefined;
 	/** What `#messageContainer` shows, for the native description. */
 	#message: SessionPickerMessage | undefined;
@@ -1462,6 +1465,7 @@ export class SessionSelectorComponent<T extends SessionSelectorEntry = SessionSe
 		this.#getTerminalRows = options.getTerminalRows ?? (() => 24);
 		this.#fillHeight = options.fillHeight ?? false;
 		this.#title = options.title ?? "Resume Session";
+		this.#actionLabel = options.actionLabel ?? "Resume";
 		this.#pickerTitle = options.title;
 		this.#standalone = options.standalone ?? false;
 		this.#scopeLabel = options.scopeLabel;
@@ -1496,9 +1500,11 @@ export class SessionSelectorComponent<T extends SessionSelectorEntry = SessionSe
 			onExit();
 		};
 		this.#sessionList.onRequestRender = () => this.#onRequestRender?.();
-		this.#sessionList.onDeleteRequest = (session: T) => {
-			this.#showDeleteConfirmation(session);
-		};
+		if (this.#onDelete) {
+			this.#sessionList.onDeleteRequest = (session: T) => {
+				this.#showDeleteConfirmation(session);
+			};
+		}
 		if (this.#loadAllSessions || this.#globalSessions) {
 			this.#sessionList.onToggleScope = () => {
 				void this.#toggleScope();
@@ -1676,7 +1682,7 @@ export class SessionSelectorComponent<T extends SessionSelectorEntry = SessionSe
 		const cancel = interruptKey();
 		const hint = theme.fg(
 			"muted",
-			`[${formatKeyHints(["delete", "backspace"])} delete · ${formatKeyHint("enter")} select · ${formatKeyHint("tab")} ${scopeHint} · ${cancel} cancel]`,
+			`[${this.#onDelete ? `${formatKeyHints(["delete", "backspace"])} delete · ` : ""}${formatKeyHint("enter")} select · ${formatKeyHint("tab")} ${scopeHint} · ${cancel} cancel]`,
 		);
 		return [row("", width), row(hint, width), row("", width), bottomBorder(width)];
 	}
@@ -1724,10 +1730,9 @@ export class SessionSelectorComponent<T extends SessionSelectorEntry = SessionSe
 		} else {
 			children.push(this.#sessionList.searchInput, list);
 		}
-		const hints: (NativeHint | undefined)[] = [
-			{ keys: ["delete", "backspace"], label: "delete" },
-			{ keys: ["enter"], label: "select" },
-		];
+		const hints: (NativeHint | undefined)[] = [];
+		if (this.#onDelete) hints.push({ keys: ["delete", "backspace"], label: "delete" });
+		hints.push({ keys: ["enter"], label: "select" });
 		if (this.#sessionList.onToggleScope) {
 			hints.push({ keys: ["tab"], label: this.#scope === "all" ? "current folder" : "all projects" });
 		}
@@ -1774,7 +1779,7 @@ export class SessionSelectorComponent<T extends SessionSelectorEntry = SessionSe
 		}
 		const loading = message?.kind === "loading";
 		const toggle = list.onToggleScope !== undefined;
-		const actions = [pickerAction("resume", "Resume", "enter", { primary: true })];
+		const actions = [pickerAction("resume", this.#actionLabel, "enter", { primary: true })];
 		if (this.#onDelete) actions.push(pickerAction("delete", "Delete", "backspace"));
 		if (toggle) {
 			actions.push(pickerAction("scope", this.#scope === "all" ? "This folder" : "All projects", "tab"));

package/src/prompt/internal-url-autocomplete.ts

@@ -76,6 +76,7 @@ export interface InternalUrlCallerContext {
 	cwd?: string;
 	sessionFile?: string;
 	sessionId?: string;
+	seanceSourceArtifactsDir?: string;
 }
 
 /**

package/src/render/hanging-wrap.ts

@@ -17,7 +17,7 @@ export function wrapTreeLine(line: string, width: number, theme: Theme): string[
 		const index = line.indexOf(marker);
 		if (index < 0) continue;
 		const before = line.slice(0, index);
-		if (!/^[ │]*$/.test(Bun.stripANSI(before))) continue;
+		if (!/^ *$/.test(Bun.stripANSI(before).replaceAll(theme.tree.vertical, ""))) continue;
 		const end = index + marker.length + 1;
 		if (line[end - 1] !== " ") continue;
 		const connectorWidth = visibleWidth(connector);
@@ -29,3 +29,30 @@ export function wrapTreeLine(line: string, width: number, theme: Theme): string[
 	}
 	return undefined;
 }
+
+const SGR = /\x1b\[[0-9;]*m/y;
+
+/** End of the leading run of spaces, `vertical` guides and SGR escapes that a tree detail row hangs beneath. */
+function guideRunEnd(line: string, vertical: string): number {
+	let index = 0;
+	while (index < line.length) {
+		if (line[index] === " ") {
+			index++;
+		} else if (vertical && line.startsWith(vertical, index)) {
+			index += vertical.length;
+		} else {
+			SGR.lastIndex = index;
+			if (!SGR.test(line)) break;
+			index = SGR.lastIndex;
+		}
+	}
+	return index;
+}
+
+/** Hang a tree row beneath its connector, or a connector-less detail row beneath its guide rails. */
+export function wrapGuidedLine(line: string, width: number, theme: Theme): string[] {
+	const tree = wrapTreeLine(line, width, theme);
+	if (tree) return tree;
+	const prefix = line.slice(0, guideRunEnd(line, theme.tree.vertical));
+	return wrapPrefixedLine(prefix, prefix, line.slice(prefix.length), width);
+}

package/src/render/render-utils.ts

@@ -233,15 +233,29 @@ export function getPreviewLines(text: string, maxLines: number, maxLineLen: numb
 	return lines.slice(0, maxLines).map(l => truncateToWidth(l.trim(), maxLineLen, ellipsis));
 }
 
+/** Collapse a possibly multi-line string into one line; whitespace runs (tabs included) become one space. */
+export function flattenLine(text: string): string {
+	return text.replace(/\s+/g, " ").trim();
+}
+
 /**
  * Collapse a possibly multi-line string into a single line, then truncate it to
  * `maxWidth` display cells. {@link truncateToWidth} alone caps width but
  * newlines are zero-width, so multi-line content (markdown briefs, tool args,
  * provider errors) would otherwise spill a single status row across several
- * visual lines. Whitespace runs collapse to one space, so tabs are handled too.
+ * visual lines.
  */
 export function previewLine(text: string, maxWidth: number, ellipsis?: Ellipsis): string {
-	return truncateToWidth(text.replace(/\s+/g, " ").trim(), maxWidth, ellipsis);
+	return truncateToWidth(flattenLine(text), maxWidth, ellipsis);
+}
+
+/**
+ * Clip a result row to `maxWidth` only while collapsed. Expanded rows stay whole
+ * so the frame wraps them: the expand key ({@link formatExpandHint}) must reveal
+ * text, not re-clip it.
+ */
+export function clipCollapsed(text: string, maxWidth: number, expanded: boolean | undefined): string {
+	return expanded ? text : truncateToWidth(text, maxWidth);
 }
 
 // =============================================================================

package/src/status-line/component.ts

@@ -1977,6 +1977,7 @@ export class StatusLineComponent<TSession extends StatusLineSession = StatusLine
 	 * cadence while a late successful fetch can still refresh the cached segment.
 	 */
 	refreshUsageInBackground(): void {
+		if (this.#disposed) return;
 		const now = Date.now();
 		const session = this.session;
 		const usageContextKey = this.#getUsageContextKey(session);