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

package/CHANGELOG.md

@@ -2,6 +2,17 @@
 
 ## [Unreleased]
 
+## [18.8.5] - 2026-10-08
+
+### Added
+
+- Added a **Compacts at** fact to the model hub preview and a Roles-view **Compaction limit** action (`k`) that edits the selected row's model limit through the new `ModelBrowserSource.compactionPointFor` and `ModelHubCallbacks.onCompactionPointChange` hooks ([#14952](https://github.com/can1357/oh-my-pi/pull/14952) by [@H4vC](https://github.com/H4vC))
+
+### Fixed
+
+- Fixed `/usage` dashboard cards reordering their limit rows by usage; rows now keep the provider's window order (e.g. 5 hour → weekly → monthly) ([#14953](https://github.com/can1357/oh-my-pi/pull/14953) by [@H4vC](https://github.com/H4vC))
+- Fixed Cmd+A, Cmd+C, Cmd+X and Shift+arrow selection doing nothing in the Tern prompt while Vim mode is in Insert mode ([#14954](https://github.com/can1357/oh-my-pi/pull/14954) by [@H4vC](https://github.com/H4vC))
+
 ## [18.8.4] - 2026-10-08
 
 ### Changed

package/dist/types/chat/user-message.d.ts

@@ -4,7 +4,7 @@ import type { ReactionTarget } from "./reaction.js";
 import { type DescribeContext, type NativeNode, type NativeUiEvent } from "../native/node.js";
 /** How a user bubble styles its prose and chips (see {@link userBubbleColor}). */
 export interface UserBubbleOptions {
-    /** Materialized `file://` targets per attached image, indexed by chip number. */
+    /** Filesystem paths for attached image chips, indexed by chip number. */
     imageLinks?: readonly (string | undefined)[];
     /** The message's attached images in chip order (`#1` first); a native bubble shows them. */
     images?: readonly ImageContent[];

package/dist/types/overlays/model-browser.d.ts

@@ -37,6 +37,17 @@ export interface ResolvedModelRoleValue {
     explicitThinkingLevel: boolean;
     warning?: string;
 }
+/** Where auto-compaction triggers for one model, as the model hub's preview shows it (edited from the Roles view). */
+export interface ModelCompactionPoint {
+    /** Context tokens that trigger auto-compaction; undefined when auto-compaction is off or the window is unknown. */
+    tokens: number | undefined;
+    /** The configured percentage of the window, when the trigger is percent-based. */
+    percent?: number;
+    /** What sets it: the matching `compaction.modelThresholds` key, `global`, or `default`. */
+    source: string;
+    /** The model's own exact entry as editable text (`90k`, `80%`); absent when it has none. */
+    draft?: string;
+}
 /** Host-provided preferences and model-role resolution for the browser. */
 export interface ModelBrowserSource extends ModelRoleLookup {
     /**
@@ -58,6 +69,8 @@ export interface ModelBrowserSource extends ModelRoleLookup {
     getRoleInfo(role: string): ModelBrowserRoleInfo;
     defaultRoleChain(role: string): string[];
     resolveRoleValue(value: string | undefined, models: Model[], roleLookup?: ModelRoleLookup): ResolvedModelRoleValue;
+    /** Auto-compaction point for `model`; absent hosts show no compaction row in the preview. */
+    compactionPointFor?(model: Model): ModelCompactionPoint | undefined;
 }
 /** Read-only catalog surface consumed by model browsers. */
 export interface ModelBrowserRegistry {

package/dist/types/overlays/model-hub.d.ts

@@ -64,6 +64,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;
 }
 export interface ModelHubOptions {

package/dist/types/overlays/usage-dashboard.d.ts

@@ -33,7 +33,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;
@@ -52,8 +52,10 @@ export interface ProviderCard {
  * 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 declare function buildProviderCards(reports: UsageReport[], nowMs: number, unavailableAccounts?: readonly UnavailableUsageAccount[]): ProviderCard[];
 /** GitHub-style week-per-column heatmap grid derived from daily activity. */

package/dist/types/prompt/custom-editor.d.ts

@@ -118,8 +118,8 @@ export declare class CustomEditor extends Editor {
      *  Numbered by a per-draft monotonic counter so a deleted chip never recycles its number
      *  (labels key the atom table). */
     pendingTexts: TextAttachment[];
-    /** 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>;
     /**
      * The host {@link TUI}, captured when a plugin constructs this editor through

package/dist/types/prompt/image-source.d.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";
 /** How an image attachment's backing file entered the session. */

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@oh-my-pi/pi-tui",
-	"version": "18.8.4",
+	"version": "18.8.5",
 	"description": "Terminal User Interface library with differential rendering for efficient text-based applications",
 	"homepage": "https://omp.sh",
 	"author": {
@@ -41,14 +41,14 @@
 		"gen:glyphs": "bun scripts/gen-glyphs.ts"
 	},
 	"dependencies": {
-		"@oh-my-pi/omptype": "18.8.4",
-		"@oh-my-pi/pi-agent-core": "18.8.4",
-		"@oh-my-pi/pi-ai": "18.8.4",
-		"@oh-my-pi/pi-catalog": "18.8.4",
-		"@oh-my-pi/pi-natives": "18.8.4",
-		"@oh-my-pi/pi-utils": "18.8.4",
-		"@oh-my-pi/pi-wire": "18.8.4",
-		"@oh-my-pi/snapcompact": "18.8.4"
+		"@oh-my-pi/omptype": "18.8.5",
+		"@oh-my-pi/pi-agent-core": "18.8.5",
+		"@oh-my-pi/pi-ai": "18.8.5",
+		"@oh-my-pi/pi-catalog": "18.8.5",
+		"@oh-my-pi/pi-natives": "18.8.5",
+		"@oh-my-pi/pi-utils": "18.8.5",
+		"@oh-my-pi/pi-wire": "18.8.5",
+		"@oh-my-pi/snapcompact": "18.8.5"
 	},
 	"devDependencies": {
 		"kitty-vt-wasm": "^0.2.0"

package/src/chat/user-message.ts

@@ -57,7 +57,7 @@ const OSC133_ZONE_CLOSE = OSC133_ZONE_END + OSC133_COMMAND_START + OSC133_COMMAN
 
 /** How a user bubble styles its prose and chips (see {@link userBubbleColor}). */
 export interface UserBubbleOptions {
-	/** Materialized `file://` targets per attached image, indexed by chip number. */
+	/** Filesystem paths for attached image chips, indexed by chip number. */
 	imageLinks?: readonly (string | undefined)[];
 	/** The message's attached images in chip order (`#1` first); a native bubble shows them. */
 	images?: readonly ImageContent[];

package/src/components/editor.ts

@@ -74,9 +74,12 @@ export interface NativeEditorLayout {
 	readonly caret: string;
 }
 
-/** Vim mode as the TSP `editor.mode` label. */
-const VIM_MODE_LABELS: Record<VimMode, string> = {
-	insert: "INSERT",
+/**
+ * Vim mode as the TSP `editor.mode` label. Insert carries none: Insert edits like a plain field,
+ * and a host such as Tern stops native editing (selection, ⌘A/⌘C/⌘X) for any labelled mode.
+ */
+const VIM_MODE_LABELS: Record<VimMode, string | undefined> = {
+	insert: undefined,
 	normal: "NORMAL",
 	visual: "VISUAL",
 	"visual-line": "VISUAL",

package/src/overlays/model-browser.ts

@@ -122,6 +122,18 @@ export interface ResolvedModelRoleValue {
 	warning?: string;
 }
 
+/** Where auto-compaction triggers for one model, as the model hub's preview shows it (edited from the Roles view). */
+export interface ModelCompactionPoint {
+	/** Context tokens that trigger auto-compaction; undefined when auto-compaction is off or the window is unknown. */
+	tokens: number | undefined;
+	/** The configured percentage of the window, when the trigger is percent-based. */
+	percent?: number;
+	/** What sets it: the matching `compaction.modelThresholds` key, `global`, or `default`. */
+	source: string;
+	/** The model's own exact entry as editable text (`90k`, `80%`); absent when it has none. */
+	draft?: string;
+}
+
 /** Host-provided preferences and model-role resolution for the browser. */
 export interface ModelBrowserSource extends ModelRoleLookup {
 	/**
@@ -143,6 +155,8 @@ export interface ModelBrowserSource extends ModelRoleLookup {
 	getRoleInfo(role: string): ModelBrowserRoleInfo;
 	defaultRoleChain(role: string): string[];
 	resolveRoleValue(value: string | undefined, models: Model[], roleLookup?: ModelRoleLookup): ResolvedModelRoleValue;
+	/** Auto-compaction point for `model`; absent hosts show no compaction row in the preview. */
+	compactionPointFor?(model: Model): ModelCompactionPoint | undefined;
 }
 
 /** Read-only catalog surface consumed by model browsers. */
@@ -2061,7 +2075,7 @@ export class ModelBrowser implements Component {
 	pickerPreview(mode: "full" | "compact", current?: string): readonly NativeChild[] {
 		const selected = this.getSelected();
 		const item = selected && !this.#isDisabled(selected) ? selected : undefined;
-		const key = `${mode}\0${current ?? ""}`;
+		const key = `${mode}\0${current ?? ""}\0${this.#settings.revision}`;
 		const memo = this.#pickerPreview;
 		if (
 			memo !== undefined &&
@@ -2155,6 +2169,17 @@ export class ModelBrowser implements Component {
 			if (v) facts.push({ k: [span(k, "muted")], v: [span(v, "mono")] });
 		};
 		fact("Context", ctx > 0 ? ctx.toLocaleString("en-US") : undefined);
+		const compaction = this.#settings.compactionPointFor?.(model);
+		if (compaction) {
+			const value =
+				compaction.tokens === undefined
+					? "off"
+					: `${compaction.tokens.toLocaleString("en-US")}${compaction.percent !== undefined ? ` · ${compaction.percent}%` : ""}`;
+			facts.push({
+				k: [span("Compacts at", "muted")],
+				v: [span(value, "mono"), span(` · ${compaction.source}`, "dim")],
+			});
+		}
 		fact("Max output", out > 0 ? out.toLocaleString("en-US") : undefined);
 		fact("Price", isFreeModel(model) ? "free" : `${previewPrice(model)} per M`);
 		fact("Speed", speed.length > 0 ? speed.join(" · ") : undefined);

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;
@@ -2020,6 +2068,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 +2232,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);
@@ -2658,6 +2710,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`;
 				}
@@ -2689,13 +2742,17 @@ export class ModelHubComponent implements Component {
 				return `${upDown} providers · ${enterRight} roles · ${altLeftRight} tabs${presets} · ${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 +2766,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 +2791,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 =
@@ -3390,12 +3457,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",
@@ -3420,6 +3489,10 @@ export class ModelHubComponent implements Component {
 			const roleAction = (action: RolesAction, label: string, key: string, primary = false) =>
 				pickerAction(`roles:${action}`, label, 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 +3501,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 +3517,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 +3554,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 +3706,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 +3787,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 +3887,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 +3940,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 +4005,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":
@@ -3931,6 +4043,8 @@ export class ModelHubComponent implements Component {
 				];
 			}
 			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 +4054,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 +4077,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/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";