@oh-my-pi/pi-tui 18.8.4 → 18.8.6

package/src/overlays/model-hub.ts

@@ -170,6 +170,12 @@ export interface ModelHubCallbacks {
 	onSwitchPreset?: (name: string) => void | Promise<void>;
 	/** Persist a new quick-switch cycle order (the ctrl+p role cycle). */
 	onCycleOrderChange?: (order: string[]) => void;
+	/**
+	 * Persist typed text as `model`'s own compaction point: a token count (`90000`,
+	 * `90k`, `1M`), a percentage (`80%`), or empty to reset. Returns an error
+	 * message for input it rejects, which keeps the field open.
+	 */
+	onCompactionPointChange?: (model: Model, input: string) => string | undefined;
 	onCancel: () => void;
 }
 
@@ -224,6 +230,14 @@ type StripState =
 			kind: "name";
 			purpose: "role" | "preset";
 			input: Input;
+	  }
+	| {
+			/** Footer text input setting `model`'s compaction point; `error` is the last rejection. */
+			kind: "name";
+			purpose: "compaction";
+			model: Model;
+			input: Input;
+			error?: string;
 	  };
 
 /** A Roles-view command; keys and the picker's action bar both run {@link ModelHubComponent}'s `#runRolesAction`. */
@@ -236,6 +250,7 @@ type RolesAction =
 	| "later"
 	| "new"
 	| "thinking"
+	| "compaction"
 	| "save"
 	| "nextPreset"
 	| "prevPreset";
@@ -249,6 +264,7 @@ const ROLES_ACTION_KEYS: Record<string, RolesAction> = {
 	"]": "later",
 	n: "new",
 	t: "thinking",
+	k: "compaction",
 	s: "save",
 	// Letter twins of ctrl+←/→, which macOS reserves for switching Spaces.
 	p: "nextPreset",
@@ -286,6 +302,8 @@ function providerInitials(providerId: string): string {
 
 const PROVIDER_REFRESH_DEBOUNCE_MS = 120;
 const RECENT_LIMIT = 15;
+/** Accepted compaction point input, shown beside the field. */
+const COMPACTION_INPUT_HINT = "90000 · 90k · 1m · 80% · empty resets";
 const MODEL_KIND_TABS: ReadonlyArray<"all" | ModelKind> = ["all", ...MODEL_KINDS];
 const ROLE_TABS = ["all", "chat", "kind"] as const;
 type RoleTab = (typeof ROLE_TABS)[number];
@@ -436,6 +454,7 @@ export class ModelHubComponent implements Component {
 				row: RolesRow | undefined;
 				roles: RoleAssignments;
 				rows: readonly RolesRow[];
+				revision: number;
 				children: readonly NativeChild[];
 		  }
 		| undefined;
@@ -1758,10 +1777,39 @@ export class ModelHubComponent implements Component {
 		this.#strip = { kind: "name", purpose, input: new Input() };
 	}
 
-	/** Validate and commit the name strip: a new role jumps into assigning it, a preset name saves it. */
+	/** The model a Roles row resolves to (assigned role or resolvable fallback), whose compaction point `k` edits. */
+	#roleRowModel(): Model | undefined {
+		const row = this.#rolesRows[this.#roleIndex];
+		if (row?.kind === "role") return this.#roles[row.role]?.model;
+		if (row?.kind === "fallback") return this.#resolveFallbackEntry(row.role, row.chainIndex)?.item.model;
+		return undefined;
+	}
+
+	/** Open the footer input for the Roles row's model compaction point, prefilled with its own entry. */
+	#openCompactionStrip(): void {
+		if (!this.#callbacks.onCompactionPointChange) return;
+		const model = this.#roleRowModel();
+		if (!model) return;
+		const input = new Input();
+		input.setValue(this.#settings.compactionPointFor?.(model)?.draft ?? "");
+		this.#strip = { kind: "name", purpose: "compaction", model, input };
+	}
+
+	/** Validate and commit the name strip: a new role, a preset name, or a compaction point. */
 	#submitNameStrip(): void {
 		const strip = this.#strip;
 		if (strip?.kind !== "name") return;
+		if (strip.purpose === "compaction") {
+			const error = this.#callbacks.onCompactionPointChange?.(strip.model, strip.input.getValue());
+			if (error !== undefined) {
+				strip.error = error;
+				return;
+			}
+			this.#strip = null;
+			this.#frame.chipRanges = [];
+			this.#refreshAfterMutation();
+			return;
+		}
 		if (strip.purpose === "preset") {
 			this.#submitPresetName();
 			return;
@@ -1943,7 +1991,13 @@ export class ModelHubComponent implements Component {
 
 		if (rolesView) {
 			const printable = extractPrintableText(data);
-			if (this.#focus === "scope" && printable !== undefined && printable.trim().length > 0) {
+			// Typing searches the catalog from the sidebar, and from the rows
+			// while a query is live (the picker shows its search field only
+			// then); otherwise the rows' letter commands own printable keys.
+			const typed = printable !== undefined && printable.trim().length > 0;
+			const editsQuery =
+				this.#browser.query.length > 0 && (printable !== undefined || matchesKey(data, "backspace"));
+			if ((this.#focus === "scope" && typed) || editsQuery) {
 				this.#setActiveEntry("all");
 				this.#focus = "list";
 				this.#browser.handleInput(data);
@@ -2020,6 +2074,7 @@ export class ModelHubComponent implements Component {
 				return;
 			}
 			strip.input.handleInput(data);
+			if (strip.purpose === "compaction") strip.error = undefined;
 			return;
 		}
 		if (moveStripSelection(strip, data)) return;
@@ -2183,6 +2238,9 @@ export class ModelHubComponent implements Component {
 			case "prevPreset":
 				this.#switchPreset(action === "nextPreset" ? 1 : -1);
 				return;
+			case "compaction":
+				this.#openCompactionStrip();
+				return;
 			case "thinking":
 				if (role) {
 					const target = this.#roleThinkingTarget(role);
@@ -2382,9 +2440,14 @@ export class ModelHubComponent implements Component {
 			Math.max(0, active),
 		);
 		const { names, active: activePreset } = this.#presets();
+		// p/P type into a live query instead of switching presets.
+		const presetKeys =
+			this.#browser.query.length > 0
+				? formatKeyHints(["ctrl+left", "ctrl+right"])
+				: `${formatKeyHints(["ctrl+left", "ctrl+right"])} · ${formatKeyHints(["p", "shift+p"])}`;
 		const preset =
 			names.length > 0
-				? `   ${theme.fg("dim", "Preset:")} ${activePreset ? theme.fg("accent", activePreset) : theme.fg("muted", "custom")}  ${theme.fg("dim", `${formatKeyHints(["ctrl+left", "ctrl+right"])} · ${formatKeyHints(["p", "shift+p"])}`)}`
+				? `   ${theme.fg("dim", "Preset:")} ${activePreset ? theme.fg("accent", activePreset) : theme.fg("muted", "custom")}  ${theme.fg("dim", presetKeys)}`
 				: "";
 		return truncateToWidth(
 			` ${theme.fg("dim", "Roles:")} ${track}  ${theme.fg("dim", formatKeyHints(["alt+left", "alt+right"]))}${preset}`,
@@ -2658,6 +2721,7 @@ export class ModelHubComponent implements Component {
 		const strip = this.#strip;
 		if (strip) {
 			if (strip.kind === "name") {
+				if (strip.purpose === "compaction") return `${enter} set compaction point · ${cancel} cancel`;
 				if (strip.purpose === "preset") {
 					return `${enter} save preset · ${cancel} cancel`;
 				}
@@ -2688,14 +2752,22 @@ export class ModelHubComponent implements Component {
 					this.#presets().names.length > 0 ? ` · ${formatKeyHints(["ctrl+left", "ctrl+right"])} preset` : "";
 				return `${upDown} providers · ${enterRight} roles · ${altLeftRight} tabs${presets} · ${cancel} close`;
 			}
+			// A live query takes printable keys and backspace, so the letter commands rest.
+			if (this.#browser.query.length > 0) {
+				return `${upDown} rows · ${enter} pick · type to search · ${left} providers · ${cancel} close`;
+			}
 			const row = this.#rolesRows[this.#roleIndex];
+			const compaction =
+				this.#callbacks.onCompactionPointChange && this.#roleRowModel()
+					? ` · ${formatKeyHint("k")} compaction limit`
+					: "";
 			if (row?.kind === "fallback") {
 				// Advertise `t` only when the entry resolves: wildcards always
 				// inherit and unknown models have no ladder to offer, so the
 				// action would be inert there.
 				const editable = this.#resolveFallbackEntry(row.role, row.chainIndex) !== undefined;
 				const thinking = editable ? ` · ${formatKeyHint("t")} thinking` : "";
-				return `${upDown} rows · ${enter} replace · ${formatKeyHint("f")} add another · ${formatKeyHint("x")} remove${thinking} · [/] reorder · ${left} providers`;
+				return `${upDown} rows · ${enter} replace · ${formatKeyHint("f")} add another · ${formatKeyHint("x")} remove${thinking}${compaction} · [/] reorder · ${left} providers`;
 			}
 			if (row?.kind === "chainKey") {
 				return `${upDown} rows · ${formatKeyHints(["enter", "f"])} add fallback · ${formatKeyHint("x")} clear chain · ${left} providers`;
@@ -2709,7 +2781,7 @@ export class ModelHubComponent implements Component {
 			const thinking = editable ? ` · ${formatKeyHint("t")} thinking` : "";
 			const savePreset = this.#callbacks.onSavePreset ? ` · ${formatKeyHint("s")} save preset` : "";
 			const switchPreset = this.#presets().names.length > 0 ? ` · ${formatKeyHints(["p", "shift+p"])} preset` : "";
-			return `${upDown} rows · ${enter} pick · ${formatKeyHint("f")} fallback · ${formatKeyHint("x")} clear${thinking} · ${formatKeyHint("c")} cycle · [/] reorder · ${formatKeyHint("n")} new${savePreset}${switchPreset}`;
+			return `${upDown} rows · ${enter} pick · ${formatKeyHint("f")} fallback · ${formatKeyHint("x")} clear${thinking}${compaction} · ${formatKeyHint("c")} cycle · [/] reorder · ${formatKeyHint("n")} new${savePreset}${switchPreset}`;
 		}
 		if (entry.kind === "provider" && entry.locked) {
 			return entry.oauth
@@ -2734,12 +2806,22 @@ export class ModelHubComponent implements Component {
 
 	#renderStrip(width: number, strip: StripState): string {
 		if (strip.kind === "name") {
-			const preset = strip.purpose === "preset";
-			const labelText = preset ? "Preset name:" : "New role name:";
+			const labelText =
+				strip.purpose === "compaction"
+					? `Compact ${strip.model.id} at:`
+					: strip.purpose === "preset"
+						? "Preset name:"
+						: "New role name:";
 			const label = theme.fg("accent", labelText);
 			const inputWidth = Math.max(8, Math.min(32, width - visibleWidth(labelText) - 24));
 			const inputLine = strip.input.render(inputWidth)[0] ?? "";
-			return truncateToWidth(`${label} ${inputLine} ${theme.fg("dim", "(letters, digits, - and _)")}`, width);
+			const hint =
+				strip.purpose !== "compaction"
+					? theme.fg("dim", "(letters, digits, - and _)")
+					: strip.error
+						? theme.fg("error", strip.error)
+						: theme.fg("dim", COMPACTION_INPUT_HINT);
+			return truncateToWidth(`${label} ${inputLine} ${hint}`, width);
 		}
 
 		const prefix =
@@ -3161,7 +3243,9 @@ export class ModelHubComponent implements Component {
 			size: "lg",
 			layout: "rows",
 			preview: "side",
-			query: this.#browser.query,
+			// The Roles rows' letter commands own printable keys until a query
+			// is live, so the sheet offers no search field to type into.
+			query: rolesView && this.#browser.query.length === 0 ? null : this.#browser.query,
 			cursor: this.#browser.cursor,
 			placeholder: "Search models…",
 			scopes: this.#pickerScopes(),
@@ -3390,12 +3474,14 @@ export class ModelHubComponent implements Component {
 		if (strip) {
 			const apply =
 				strip.kind === "name"
-					? pickerAction(
-							strip.purpose === "preset" ? "presetName" : "roleName",
-							strip.purpose === "preset" ? "Save preset" : "Create role",
-							"enter",
-							{ primary: true },
-						)
+					? strip.purpose === "compaction"
+						? pickerAction("compactionPoint", "Set compaction point", "enter", { primary: true })
+						: pickerAction(
+								strip.purpose === "preset" ? "presetName" : "roleName",
+								strip.purpose === "preset" ? "Save preset" : "Create role",
+								"enter",
+								{ primary: true },
+							)
 					: pickerAction(
 							"stripApply",
 							strip.kind === "thinking" ? "Apply" : strip.kind === "scope" ? "Save to scope" : "Assign / clear",
@@ -3417,9 +3503,20 @@ export class ModelHubComponent implements Component {
 		}
 		if (rolesView) {
 			const row = this.#rolesRows[this.#roleIndex];
+			// A live query takes the letter keys: those buttons keep working but lose their keycaps.
+			const searching = this.#browser.query.length > 0;
 			const roleAction = (action: RolesAction, label: string, key: string, primary = false) =>
-				pickerAction(`roles:${action}`, label, key, primary ? { primary: true } : undefined);
+				pickerAction(
+					`roles:${action}`,
+					label,
+					searching && key !== "enter" ? undefined : key,
+					primary ? { primary: true } : undefined,
+				);
 			const actions: (TspPickerAction | undefined)[] = [];
+			const compaction =
+				this.#callbacks.onCompactionPointChange && this.#roleRowModel()
+					? roleAction("compaction", "Compaction limit", "k")
+					: undefined;
 			switch (row?.kind) {
 				case "role": {
 					const assigned = this.#roles[row.role];
@@ -3428,6 +3525,7 @@ export class ModelHubComponent implements Component {
 						roleAction("fallback", "Add fallback", "f"),
 						assigned && !assigned.autoSelected ? roleAction("clear", "Clear", "x") : undefined,
 						this.#roleThinkingTarget(row.role) ? roleAction("thinking", "Thinking", "t") : undefined,
+						compaction,
 						roleAction("cycle", this.#cycleOrder().includes(row.role) ? "Leave cycle" : "Add to cycle", "c"),
 						roleAction("new", "New role", "n"),
 						this.#callbacks.onSavePreset ? roleAction("save", "Save preset", "s") : undefined,
@@ -3443,6 +3541,7 @@ export class ModelHubComponent implements Component {
 						this.#resolveFallbackEntry(row.role, row.chainIndex)
 							? roleAction("thinking", "Thinking", "t")
 							: undefined,
+						compaction,
 						roleAction("earlier", "Earlier", "["),
 						roleAction("later", "Later", "]"),
 					);
@@ -3479,6 +3578,19 @@ export class ModelHubComponent implements Component {
 	/** The open strip as the picker's chip strip (role assignment, save scope, thinking level, new role name). */
 	#pickerStrip(strip: StripState): NonNullable<TspPickerProps["strip"]> {
 		if (strip.kind === "name") {
+			if (strip.purpose === "compaction") {
+				return {
+					label: [
+						span("Compact ", "muted"),
+						span(strip.model.id, "mono"),
+						span(" at ", "muted"),
+						span(strip.input.getValue(), "mono"),
+						span("▏", "accent"),
+						span(`  ${strip.error ?? COMPACTION_INPUT_HINT}`, strip.error ? "error" : "dim"),
+					],
+					items: [],
+				};
+			}
 			return {
 				label: [
 					span(strip.purpose === "preset" ? "Preset name " : "New role name ", "muted"),
@@ -3618,7 +3730,14 @@ export class ModelHubComponent implements Component {
 	/** The selected Roles-view row's preview: its model's facts and its fallback chain. */
 	#rolePreview(row: RolesRow | undefined): readonly NativeChild[] {
 		const memo = this.#pickerRolePreview;
-		if (memo !== undefined && memo.row === row && memo.roles === this.#roles && memo.rows === this.#rolesRows) {
+		const revision = this.#settings.revision;
+		if (
+			memo !== undefined &&
+			memo.row === row &&
+			memo.roles === this.#roles &&
+			memo.rows === this.#rolesRows &&
+			memo.revision === revision
+		) {
 			return memo.children;
 		}
 		const children: NativeChild[] = [];
@@ -3692,7 +3811,7 @@ export class ModelHubComponent implements Component {
 				);
 				break;
 		}
-		this.#pickerRolePreview = { row, roles: this.#roles, rows: this.#rolesRows, children };
+		this.#pickerRolePreview = { row, roles: this.#roles, rows: this.#rolesRows, revision, children };
 		return children;
 	}
 
@@ -3792,6 +3911,9 @@ export class ModelHubComponent implements Component {
 			case "presetName":
 				this.#submitPresetName();
 				return;
+			case "compactionPoint":
+				this.#submitNameStrip();
+				return;
 			case "cancel":
 				if (this.#strip) this.#closeStrip();
 				return;
@@ -3842,6 +3964,18 @@ export class ModelHubComponent implements Component {
 		const strip = this.#strip;
 		if (!strip) return undefined;
 		if (strip.kind === "name") {
+			if (strip.purpose === "compaction") {
+				return node(
+					"row",
+					{ gap: "sm", align: "center" },
+					[
+						text([span(`Compact ${strip.model.id} at:`, "accent")]),
+						col([strip.input], { grow: 1 }),
+						text([span(strip.error ?? COMPACTION_INPUT_HINT, strip.error ? "error" : "dim")]),
+					],
+					"compactionPoint",
+				);
+			}
 			const preset = strip.purpose === "preset";
 			return node(
 				"row",
@@ -3895,9 +4029,11 @@ export class ModelHubComponent implements Component {
 		if (strip) {
 			switch (strip.kind) {
 				case "name":
-					return strip.purpose === "preset"
-						? [keys("save preset", "enter"), cancel("cancel")]
-						: [keys("create + pick model", "enter"), cancel("cancel")];
+					return strip.purpose === "compaction"
+						? [keys("set compaction point", "enter"), cancel("cancel")]
+						: strip.purpose === "preset"
+							? [keys("save preset", "enter"), cancel("cancel")]
+							: [keys("create + pick model", "enter"), cancel("cancel")];
 				case "role":
 					return [keys("choose", "left", "right"), keys("assign/clear", "enter"), cancel("cancel")];
 				case "scope":
@@ -3930,7 +4066,20 @@ export class ModelHubComponent implements Component {
 					cancel("close"),
 				];
 			}
+			// A live query takes printable keys and backspace, so the letter commands rest.
+			if (this.#browser.query.length > 0) {
+				return [
+					upDown("rows"),
+					keys("pick", "enter"),
+					search,
+					keys("providers", "left"),
+					presetHint,
+					cancel("close"),
+				];
+			}
 			const row = this.#rolesRows[this.#roleIndex];
+			const compaction =
+				this.#callbacks.onCompactionPointChange && this.#roleRowModel() ? keys("compaction limit", "k") : undefined;
 			if (row?.kind === "fallback") {
 				// Advertise `t` only where a strip would open, as the ANSI footer does.
 				const editable = this.#resolveFallbackEntry(row.role, row.chainIndex) !== undefined;
@@ -3940,6 +4089,7 @@ export class ModelHubComponent implements Component {
 					keys("add another", "f"),
 					keys("remove", "x"),
 					editable ? keys("thinking", "t") : undefined,
+					compaction,
 					reorder,
 					keys("providers", "left"),
 				];
@@ -3962,6 +4112,7 @@ export class ModelHubComponent implements Component {
 				keys("fallback", "f"),
 				keys("clear", "x"),
 				editable ? keys("thinking", "t") : undefined,
+				compaction,
 				keys("cycle", "c"),
 				reorder,
 				keys("new", "n"),

package/src/overlays/session-selector.ts

@@ -1330,7 +1330,11 @@ export interface SessionSelectorOptions<T extends SessionSelectorEntry = Session
 	title?: string;
 	/** Fixed scope label, or false to omit the scope suffix. */
 	scopeLabel?: string | false;
-	/** Show each session's working directory in the list. */
+	/**
+	 * Show each session's working directory in the list. Defaults to on when
+	 * the session files live in more than one directory (e.g. the folder scope
+	 * merging a repository's worktrees).
+	 */
 	showCwd?: boolean;
 	/**
 	 * Reads the live terminal height so the visible window fits the viewport.
@@ -1374,6 +1378,7 @@ export class SessionSelectorComponent<T extends SessionSelectorEntry = SessionSe
 	#onRequestRender?: () => void;
 	readonly #loadAllSessions?: () => Promise<T[]>;
 	#folderSessions: T[];
+	readonly #folderShowCwd: boolean;
 	#globalSessions: T[] | null = null;
 	#scope: "folder" | "all" = "folder";
 	#toggling = false;
@@ -1440,6 +1445,9 @@ export class SessionSelectorComponent<T extends SessionSelectorEntry = SessionSe
 		this.#onDelete = options.onDelete;
 		this.#loadAllSessions = options.loadAllSessions;
 		this.#folderSessions = sessions;
+		// Storage directory, not recorded cwd: one folder's sessions may record
+		// symlink aliases of the same path, which must not turn the column on.
+		this.#folderShowCwd = options.showCwd ?? new Set(sessions.map(session => path.dirname(session.path))).size > 1;
 		this.#globalSessions = options.allSessions ?? null;
 		this.#getTerminalRows = options.getTerminalRows ?? (() => 24);
 		this.#fillHeight = options.fillHeight ?? false;
@@ -1457,7 +1465,7 @@ export class SessionSelectorComponent<T extends SessionSelectorEntry = SessionSe
 		// projects' history (issue #3099).
 		this.#sessionList = new SessionList(
 			sessions,
-			options.showCwd ?? false,
+			this.#folderShowCwd,
 			options.historyMatcher,
 			options.getTerminalRows,
 			options.pinnedIds,
@@ -1530,7 +1538,7 @@ export class SessionSelectorComponent<T extends SessionSelectorEntry = SessionSe
 			this.#sessionList.setSessions(global, true);
 		} else {
 			this.#scope = "folder";
-			this.#sessionList.setSessions(this.#folderSessions, false);
+			this.#sessionList.setSessions(this.#folderSessions, this.#folderShowCwd);
 		}
 		this.title = this.#headerLabel();
 		this.#onRequestRender?.();

package/src/overlays/usage-dashboard.ts

@@ -84,7 +84,7 @@ export interface ProviderCard {
 	/** Number of represented accounts, including unavailable usage lookups. */
 	accounts: number;
 	unavailableAccounts: string[];
-	/** Window rows sorted most-pressing first. */
+	/** Window rows in provider-declared order (e.g. 5h → weekly → monthly); the fullest CARD_MAX_WINDOWS lead. */
 	windows: CardWindowRow[];
 	/** True when every account reports no limits (e.g. enterprise plans). */
 	unlimited: boolean;
@@ -146,8 +146,10 @@ function compactWindowTag(window: NonNullable<UsageLimit["window"]>): string {
  * Collapse usage reports into one compact card per provider: limits grouped by
  * quota bucket (label + window), each bucket showing the mean used fraction
  * across accounts (matching the classic report's aggregate "% free") with the
- * most-used account's reset countdown. Cards sort most-pressing first so
- * what's burning is on top-left; fully idle providers collapse into a tick.
+ * most-used account's reset countdown. Rows keep the provider's declared window
+ * order so 5h → week → month reads the same every time; cards sort by their
+ * fullest window so what's burning is on top-left; fully idle providers
+ * collapse into a tick.
  */
 export function buildProviderCards(
 	reports: UsageReport[],
@@ -181,7 +183,7 @@ export function buildProviderCards(
 			}
 		}
 
-		const windows: CardWindowRow[] = [...buckets.values()].map(bucket => {
+		const declared: CardWindowRow[] = [...buckets.values()].map(bucket => {
 			const fractions = bucket.limits
 				.map(limit => resolveUsedFraction(limit))
 				.filter((value): value is number => value !== undefined);
@@ -200,7 +202,13 @@ export function buildProviderCards(
 				usedText: fraction === undefined ? formatAbsoluteOnlyAmount(bucket.limits) : undefined,
 			};
 		});
-		windows.sort((a, b) => (b.fraction ?? -1) - (a.fraction ?? -1));
+		// Cards render at most CARD_MAX_WINDOWS rows; when a provider declares
+		// more, keep the fullest ones visible (still in declared order) so an
+		// exhausted bucket never hides behind "+N more".
+		const visible = new Set(
+			[...declared].sort((a, b) => (b.fraction ?? -1) - (a.fraction ?? -1)).slice(0, CARD_MAX_WINDOWS),
+		);
+		const windows = [...declared.filter(row => visible.has(row)), ...declared.filter(row => !visible.has(row))];
 		// The window tag earns its columns only when sibling rows would otherwise
 		// be indistinguishable (e.g. Antigravity's daily vs weekly "Usage (Google)").
 		for (const window of windows) {
@@ -264,9 +272,12 @@ export function buildProviderCards(
 		});
 	}
 
+	const worstFraction = new Map(
+		cards.map(card => [card, card.windows.reduce((max, window) => Math.max(max, window.fraction ?? -1), -1)]),
+	);
 	cards.sort((a, b) => {
-		const aWorst = a.windows[0]?.fraction ?? -1;
-		const bWorst = b.windows[0]?.fraction ?? -1;
+		const aWorst = worstFraction.get(a)!;
+		const bWorst = worstFraction.get(b)!;
 		if (aWorst !== bWorst) return bWorst - aWorst;
 		return a.name.localeCompare(b.name);
 	});

package/src/prompt/custom-editor.ts

@@ -20,7 +20,6 @@ import type { DescribeContext, NativeNode, NativeUiEvent } from "../native/node"
 import type { ComposerFacts, ComposerFactsSource } from "../status-line/types";
 import { allowsModelMentions, allowsSkillTokens, SKILL_TOKEN_RE } from "./skill-tokens";
 import { expandModelMentionTags, MODEL_MENTION_RE, modelMentionToken } from "./model-mention-syntax";
-import { imageAttachmentSource } from "./image-source";
 import { isVideoPath } from "./video";
 import {
 	attachmentSgr,
@@ -480,8 +479,8 @@ export class CustomEditor extends Editor {
 				chips: ComposerChipDescriptor[];
 		  }
 		| undefined;
-	/** Host-wired producer of per-image `file://` links (session blob store); drives clickable
-	 *  chip tokens for restored drafts (esc-esc, `/tree`, branch). */
+	/** Host-wired producer of per-image chip targets (a file on disk, or a session blob copy);
+	 *  drives clickable chip tokens for restored drafts (esc-esc, `/tree`, branch). */
 	draftImageLinkMaterializer?: (images: readonly ImageContent[]) => Promise<(string | undefined)[] | undefined>;
 
 	/**
@@ -791,7 +790,7 @@ export class CustomEditor extends Editor {
 		if (!materialize || images.length === 0) return;
 		const links = await materialize(images);
 		if (!links || this.pendingImages !== images) return;
-		this.pendingImageLinks = images.map((image, index) => imageAttachmentSource(image)?.path ?? links[index]);
+		this.pendingImageLinks = links;
 		this.imageLinks = this.pendingImageLinks;
 		this.#requestShimmerRepaint?.();
 	}

package/src/prompt/image-source.ts

@@ -4,7 +4,8 @@
  * to the session's `local://` root, and generated video contact-sheet previews.
  * Symbol metadata stays out of serialized/model-bound image data while traveling
  * with the draft object, until AgentSession creates the hidden companion message
- * that tells the model the path (and link materialization prefers it over a blob copy).
+ * that tells the model the path. The model keeps `local://` references across
+ * `/move`; chips for internal URLs instead use a stable blob copy.
  */
 import type { ImageContent } from "@oh-my-pi/pi-ai";
 import { isRecord } from "@oh-my-pi/pi-utils";

package/src/prompt/tips.txt

@@ -30,4 +30,5 @@ Turn on `/advisor` to attach a second model that reviews every turn and quietly
 Try starting your prompt with a ->, and writing a list (1. Do X, 2. Do Y)
 Press {key:shift+tab} to cycle through reasoning effort levels
 omp can reconfigure and extend itself — ask any questions you have!
-Lint/type errors piling up? `omp cleanse` (or /cleanse right here) hunts project diagnostics and fixes them with parallel subagents — {key:escape} cancels
+Lint/type errors piling up? `omp cleanse` (or /cleanse right here) hunts project diagnostics and fixes them with parallel subagents — {key:escape} cancels
+[NO-TERN] Psst, omp has a natural habitat 🐦 [tern](https://scl.so/tern)