@oh-my-pi/pi-tui 18.4.4 → 18.4.5

package/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 ## [Unreleased]
 
+## [18.4.5] - 2026-09-30
+
+### Added
+
+- Added Factory Droid base-credit badges; models without a dollar-price reference no longer appear free ([#8577](https://github.com/can1357/oh-my-pi/pull/8577) by [@will-bogusz](https://github.com/will-bogusz), continued in [#13276](https://github.com/can1357/oh-my-pi/pull/13276) by [@DusKing1](https://github.com/DusKing1)).
+
+### Fixed
+
+- Fixed home directories next to shell redirections, control operators or Markdown emphasis (`<`, `>`, `&`, `|`, `*`, `_`) leaking the full path in display-only text ([#11210](https://github.com/can1357/oh-my-pi/pull/11210) by [@DarkPhilosophy](https://github.com/DarkPhilosophy)).
+- Fixed the subagent task card showing full home paths in tool intents and arguments, while keeping search patterns literal ([#11210](https://github.com/can1357/oh-my-pi/pull/11210) by [@DarkPhilosophy](https://github.com/DarkPhilosophy)).
+- Fixed Enter doing nothing on a fully typed slash-command argument while its completion popup was open (e.g. `/mcp list`): it now submits instead of re-accepting the identical completion; subcommands that still need a required argument (e.g. `/mcp test`) keep inserting the subcommand so you can type it ([#13885](https://github.com/can1357/oh-my-pi/pull/13885) by [@H4vC](https://github.com/H4vC)).
+
 ## [18.4.4] - 2026-09-29
 
 ### Added
@@ -11,6 +23,10 @@
 - `HookEditorComponent` accepts pasted images when constructed with `acceptImages`; the ask dialog returns them as `customInputImages` / `noteImages` ([#13774](https://github.com/can1357/oh-my-pi/pull/13774) by [@DrFaustus-vic](https://github.com/DrFaustus-vic))
 - Added `formatFileMatches` and `FileMatchSection` to `tools/grouped-file-output` for rendering per-file grep/ast-grep matches in grouped or flat mode.
 
+### Fixed
+
+- The model browser shows `varies`, `included`, or `pricing unknown` for models whose catalog declares that state, instead of labeling them `free` ([#11613](https://github.com/can1357/oh-my-pi/pull/11613) by [@will-bogusz](https://github.com/will-bogusz)).
+
 ## [18.4.3] - 2026-09-28
 
 ### Added

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

@@ -46,6 +46,8 @@ export interface ModelHubCallbacks {
     onFallbackChainChange?: (role: string, chain: string[]) => void;
     /** Locked provider activation: forward to the /login flow. */
     onLoginRequest?: (providerId: string) => void;
+    /** Save the current role assignments and default thinking level as a named model preset. */
+    onSavePreset?: (name: string) => void;
     /** Persist a new quick-switch cycle order (the ctrl+p role cycle). */
     onCycleOrderChange?: (order: string[]) => void;
     onCancel: () => void;

package/dist/types/render/render-utils.d.ts

@@ -239,6 +239,11 @@ export declare function truncateDiffByHunk(diffText: string, maxHunks: number, m
 export declare function shortenPath(filePath: unknown, homeDir?: string): string;
 /** Shorten embedded home paths; normalize Windows separators unless the caller preserves native error text. */
 export declare function shortenEmbeddedPaths(text: string, homeDir?: string, preserveSeparators?: boolean): string;
+/**
+ * Shorten filesystem and command arguments without rewriting literal search patterns. A producer that
+ * names no argument key gets the general embedded-path shortening.
+ */
+export declare function shortenToolArgumentPaths(text: string, key: string | undefined, homeDir?: string): string;
 /** Sanitize warning text before showing it in TUI, including embedded home paths. */
 export declare function sanitizeDisplayWarning(text: string): string;
 /** Sanitize and bound warning text before showing it in TUI. */

package/dist/types/tools/edit.d.ts

@@ -136,6 +136,8 @@ export interface EditRenderContext {
 }
 /** Render replacement text until a computed diff preview is available. */
 export declare function renderStreamingFallback(editMode: EditMode, args: unknown, theme: Theme): string;
+/** Extract display targets using the existing parsers for supported freeform edit modes. */
+export declare function getEditInputPaths(input: string, resolvedMode?: EditMode): readonly string[];
 /** Render edit previews and completed file diffs. */
 export declare const editToolRenderer: {
     mergeCallAndResult: true;

package/dist/types/tools/task.d.ts

@@ -209,10 +209,17 @@ export interface AgentProgress {
     lastIntent?: string;
     currentTool?: string;
     currentToolArgs?: string;
+    /** Argument key selected for the display preview, when known. */
+    currentToolArgsKey?: string;
+    /** Intent the model attached to the current call; undefined when that call carried none. */
+    currentToolIntent?: string;
     currentToolStartMs?: number;
     recentTools: Array<{
         tool: string;
         args: string;
+        argsKey?: string;
+        intent?: string;
+        isError?: boolean;
         endMs: number;
     }>;
     recentOutput: string[];

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@oh-my-pi/pi-tui",
-	"version": "18.4.4",
+	"version": "18.4.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.4.4",
-		"@oh-my-pi/pi-agent-core": "18.4.4",
-		"@oh-my-pi/pi-ai": "18.4.4",
-		"@oh-my-pi/pi-catalog": "18.4.4",
-		"@oh-my-pi/pi-natives": "18.4.4",
-		"@oh-my-pi/pi-utils": "18.4.4",
-		"@oh-my-pi/pi-wire": "18.4.4",
-		"@oh-my-pi/snapcompact": "18.4.4"
+		"@oh-my-pi/omptype": "18.4.5",
+		"@oh-my-pi/pi-agent-core": "18.4.5",
+		"@oh-my-pi/pi-ai": "18.4.5",
+		"@oh-my-pi/pi-catalog": "18.4.5",
+		"@oh-my-pi/pi-natives": "18.4.5",
+		"@oh-my-pi/pi-utils": "18.4.5",
+		"@oh-my-pi/pi-wire": "18.4.5",
+		"@oh-my-pi/snapcompact": "18.4.5"
 	},
 	"devDependencies": {
 		"kitty-vt-wasm": "^0.2.0"

package/src/components/editor.ts

@@ -1949,8 +1949,14 @@ export class Editor implements Component, Focusable {
 					const currentTextBeforeCursor = currentLine.slice(0, this.#state.cursorCol);
 					// A narrowed `@` list can be empty while its refresh is pending; Enter
 					// then submits instead of waiting on the search.
-					if (!selected || !this.#autocompletePrefixMatchesCursorText(currentTextBeforeCursor, selected)) {
-						// Autocomplete is stale - cancel and fall through to normal submission
+					if (
+						!selected ||
+						!this.#autocompletePrefixMatchesCursorText(currentTextBeforeCursor, selected) ||
+						this.#selectedSlashArgumentIsAlreadyTyped(selected)
+					) {
+						// Stale, or accepting would only append whitespace to an already fully
+						// typed slash-command argument (`/mcp list` + Enter): cancel and fall
+						// through to normal submission instead of swallowing the keypress.
 						this.#cancelAutocomplete();
 					} else {
 						if (selected && this.#autocompleteProvider) {
@@ -4212,6 +4218,25 @@ export class Editor implements Component, Focusable {
 		return this.#autocompleteList?.getSelectedItem()?.value === SKILL_NAMESPACE;
 	}
 
+	/**
+	 * Whether the selected completion for a submitted slash command's argument
+	 * only restates what the user already typed (e.g. `list ` for `/mcp list`).
+	 * Accepting it would change nothing visible, so Enter should submit.
+	 *
+	 * A selection whose usage hint still names a required `<arg>` outside any
+	 * optional `[...]` group (e.g. `test` with `<name>`) keeps Enter's accept
+	 * role, so the user continues into the argument instead of submitting a
+	 * command the handler can only reject.
+	 */
+	#selectedSlashArgumentIsAlreadyTyped(selected: AutocompleteItem): boolean {
+		if (!this.#isInSubmittedSlashCommandContext()) return false;
+		const currentLine = this.#state.lines[this.#state.cursorLine] ?? "";
+		if (this.#state.cursorCol !== currentLine.length) return false;
+		if (selected.hint?.replace(/\[[^\]]*\]/g, "").includes("<")) return false;
+		const typed = this.#autocompletePrefix.trimEnd();
+		return typed.length > 0 && selected.value.trimEnd() === typed;
+	}
+
 	#isSlashCommandNameAutocompleteSelection(): boolean {
 		if (this.#autocompleteState !== "regular") {
 			return false;

package/src/overlays/model-browser.ts

@@ -10,8 +10,8 @@
 import { ThinkingLevel } from "@oh-my-pi/pi-agent-core";
 import type { Model } from "@oh-my-pi/pi-ai";
 import { buildModel } from "@oh-my-pi/pi-catalog/build";
-import { modelsAreEqual } from "@oh-my-pi/pi-catalog/models";
-import type { ModelKind } from "@oh-my-pi/pi-catalog/types";
+import { getModelPricingStatus, modelsAreEqual } from "@oh-my-pi/pi-catalog/models";
+import type { ModelKind, ModelPricingStatus } from "@oh-my-pi/pi-catalog/types";
 import type { Component } from "../tui";
 import { fuzzyRank } from "../fuzzy";
 import { Input } from "../components/input";
@@ -619,10 +619,23 @@ function roleChipSpans(role: string, assignment: RoleAssignment, settings: Model
 	return spans;
 }
 
-/** Both token legs at zero cost — the condition {@link formatCostPair} renders as `free`. */
+/**
+ * The non-rate pricing state a catalog rule declared for a zero-rate row
+ * (`pricing-status`), or `undefined` when the row publishes rates or declares
+ * nothing. Undeclared zero-rate rows keep the `free` convention below.
+ */
+function declaredPricingStatus(model: Model): Exclude<ModelPricingStatus, "fixed"> | undefined {
+	if (model.pricingStatus === undefined) return undefined;
+	const status = getModelPricingStatus(model);
+	return status === "fixed" ? undefined : status;
+}
+/** No token price and no subscription-credit charge (unless a pricing state is declared). */
 function isFreeModel(model: Model): boolean {
+	const declared = declaredPricingStatus(model);
+	if (declared !== undefined) return declared === "free";
 	const cost = model.cost;
-	return !cost || (cost.input === 0 && cost.output === 0);
+	const credits = model.factoryDroidCredits;
+	return (!cost || (cost.input === 0 && cost.output === 0)) && (credits === undefined || credits === 0);
 }
 
 /** One per-million price leg: `3`, `0.25`, `12.5`; `?` when unknown. */
@@ -635,10 +648,37 @@ function formatCostLeg(n: number): string {
 	return s.includes(".") ? s.replace(/\.?0+$/, "") : s;
 }
 
-/** `$in/out` per-million cost pair; `free` when both legs are zero. */
+/**
+ * Adds Factory Droid's `N×` base Standard Credits rate to a dollar price,
+ * replacing the price when the model has no dollar reference. Neither the
+ * reference price nor the base credit rate includes live promotions.
+ */
+function withCreditBadge(model: Model, price: string): string {
+	const credits = model.factoryDroidCredits;
+	if (credits === undefined) return price;
+	const badge = `${formatCostLeg(credits)}×`;
+	return model.cost.input !== 0 || model.cost.output !== 0 ? `${price} ${badge}` : badge;
+}
+
+const PRICING_STATUS_LABELS: Record<Exclude<ModelPricingStatus, "fixed">, { short: string; detail: string }> = {
+	free: { short: "free", detail: "free" },
+	included: { short: "included", detail: "included" },
+	variable: { short: "varies", detail: "price varies" },
+	unknown: { short: "unknown", detail: "pricing unknown" },
+};
+
+/** `$in/out` per-million cost pair with any credit badge; `free` when nothing is charged; a declared pricing state otherwise. */
 function formatCostPair(model: Model): string {
+	const declared = declaredPricingStatus(model);
+	if (declared !== undefined) return PRICING_STATUS_LABELS[declared].short;
 	if (isFreeModel(model)) return "free";
-	return `$${formatCostLeg(model.cost.input)}/${formatCostLeg(model.cost.output)}`;
+	return withCreditBadge(model, `$${formatCostLeg(model.cost.input)}/${formatCostLeg(model.cost.output)}`);
+}
+
+/** Detail-pane price fact: `$3/15 per M`, or the declared pricing state in words. */
+function formatCostDetail(model: Model): string {
+	const declared = declaredPricingStatus(model);
+	return declared !== undefined ? PRICING_STATUS_LABELS[declared].detail : `${formatCostPair(model)} per M`;
 }
 
 /** Fact columns of a model picker (Stencil `NATIVE_REDESIGN.md` §4.7); the lowest priority hides first. */
@@ -649,18 +689,22 @@ export const MODEL_PICKER_COLUMNS: readonly TspPickerColumn[] = [
 	{ id: "price", head: "$/M", format: "price", priority: 3 },
 ];
 
-/** `$3·15` price fact of a picker row (`free` at zero cost). */
+/** `$3·15` price fact of a picker row; `free` at zero cost; a declared pricing state otherwise. */
 function pickerPrice(model: Model): string {
+	const declared = declaredPricingStatus(model);
+	if (declared !== undefined) return PRICING_STATUS_LABELS[declared].short;
 	if (isFreeModel(model)) return "free";
-	return `$${formatCostLeg(model.cost.input)}·${formatCostLeg(model.cost.output)}`;
+	return withCreditBadge(model, `$${formatCostLeg(model.cost.input)}·${formatCostLeg(model.cost.output)}`);
 }
 
 /** `$2 in · $10 out · $0.2 cache` for a model preview. */
 function previewPrice(model: Model): string {
+	const declared = declaredPricingStatus(model);
+	if (declared !== undefined) return PRICING_STATUS_LABELS[declared].detail;
 	const cost = model.cost;
 	const parts = [`$${formatCostLeg(cost.input)} in`, `$${formatCostLeg(cost.output)} out`];
 	if (cost.cacheRead > 0) parts.push(`$${formatCostLeg(cost.cacheRead)} cache`);
-	return parts.join(" · ");
+	return withCreditBadge(model, parts.join(" · "));
 }
 
 /** The omp theme token of a thinking level's dot (`thinkingHigh`); none for inherit and auto. */
@@ -1301,7 +1345,7 @@ export class ModelBrowser implements Component {
 		if (model.isRecommended) facts.push("recommended");
 		if (model.contextWindow) facts.push(`${formatNumber(model.contextWindow).toLowerCase()} ctx`);
 		if (model.maxTokens) facts.push(`${formatNumber(model.maxTokens).toLowerCase()} out`);
-		facts.push(`${formatCostPair(model)} per M`);
+		facts.push(formatCostDetail(model));
 		if (model.reasoning) facts.push("reasoning");
 		if (model.input.includes("image")) facts.push("vision");
 		const intelligence = formatIntelligence(model);
@@ -1564,7 +1608,7 @@ export class ModelBrowser implements Component {
 			const facts: string[] = [];
 			if (model.contextWindow) facts.push(`${formatNumber(model.contextWindow).toLowerCase()} ctx`);
 			if (model.maxTokens) facts.push(`${formatNumber(model.maxTokens).toLowerCase()} out`);
-			facts.push(`${formatCostPair(model)} per M`);
+			facts.push(formatCostDetail(model));
 			if (model.reasoning) facts.push("reasoning");
 			if (model.input.includes("image")) facts.push("vision");
 			const intelligence = formatIntelligence(model);
@@ -1881,7 +1925,7 @@ export class ModelBrowser implements Component {
 			const facts: { k: TspText; v: TspText }[] = [];
 			if (ctx > 0) facts.push({ k: "ctx", v: formatNumber(ctx).toLowerCase() });
 			if (out > 0) facts.push({ k: "out", v: formatNumber(out).toLowerCase() });
-			facts.push({ k: "price", v: isFreeModel(model) ? "free" : `${formatCostPair(model)} per M` });
+			facts.push({ k: "price", v: isFreeModel(model) ? "free" : formatCostDetail(model) });
 			facts.push({ k: "reasoning", v: model.reasoning ? "yes" : "no" });
 			const children: NativeChild[] = [node("kv", { items: facts, layout: "inline" })];
 			const chips: NativeChild[] = [];

package/src/overlays/model-hub.ts

@@ -152,6 +152,8 @@ export interface ModelHubCallbacks {
 	onFallbackChainChange?: (role: string, chain: string[]) => void;
 	/** Locked provider activation: forward to the /login flow. */
 	onLoginRequest?: (providerId: string) => void;
+	/** Save the current role assignments and default thinking level as a named model preset. */
+	onSavePreset?: (name: string) => void;
 	/** Persist a new quick-switch cycle order (the ctrl+p role cycle). */
 	onCycleOrderChange?: (order: string[]) => void;
 	onCancel: () => void;
@@ -204,13 +206,14 @@ type StripState =
 			initialThinkingLevel?: ConfiguredThinkingLevel;
 	  })
 	| {
-			/** Footer text input naming a new custom role. */
-			kind: "roleName";
+			/** Footer text input naming a new role, or saving a model preset. */
+			kind: "name";
+			purpose: "role" | "preset";
 			input: Input;
 	  };
 
 /** A Roles-view command; keys and the picker's action bar both run {@link ModelHubComponent}'s `#runRolesAction`. */
-type RolesAction = "pick" | "clear" | "fallback" | "cycle" | "earlier" | "later" | "new" | "thinking";
+type RolesAction = "pick" | "clear" | "fallback" | "cycle" | "earlier" | "later" | "new" | "thinking" | "save";
 
 /** Printable keys of the Roles view and the command each runs. */
 const ROLES_ACTION_KEYS: Record<string, RolesAction> = {
@@ -221,6 +224,7 @@ const ROLES_ACTION_KEYS: Record<string, RolesAction> = {
 	"]": "later",
 	n: "new",
 	t: "thinking",
+	s: "save",
 };
 
 /** Picker fact columns of the Roles view. */
@@ -1429,7 +1433,7 @@ export class ModelHubComponent implements Component {
 
 	#activateStripChip(): void {
 		const strip = this.#strip;
-		if (!strip || strip.kind === "roleName") return;
+		if (!strip || strip.kind === "name") return;
 		const chip = strip.chips[strip.index];
 		if (!chip) return;
 		switch (chip.action) {
@@ -1654,15 +1658,26 @@ export class ModelHubComponent implements Component {
 		this.#refreshAfterMutation();
 	}
 
-	/** Open the footer name input that creates a new custom role. */
-	#openRoleNameStrip(): void {
-		this.#strip = { kind: "roleName", input: new Input() };
+	/** Open the footer name input: a new custom role, or saving the current setup as a model preset. */
+	#openNameStrip(purpose: "role" | "preset"): void {
+		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. */
+	#submitNameStrip(): void {
+		const strip = this.#strip;
+		if (strip?.kind !== "name") return;
+		if (strip.purpose === "preset") {
+			this.#submitPresetName();
+			return;
+		}
+		this.#submitRoleName();
 	}
 
 	/** Validate and commit the new-role name: jump straight into assigning it. */
 	#submitRoleName(): void {
 		const strip = this.#strip;
-		if (strip?.kind !== "roleName") return;
+		if (strip?.kind !== "name" || strip.purpose !== "role") return;
 		const name = strip.input.getValue().trim();
 		if (!/^[a-zA-Z][\w-]*$/.test(name)) return;
 		if (this.#visibleRoleIds().includes(name)) return;
@@ -1671,6 +1686,18 @@ export class ModelHubComponent implements Component {
 		this.#startAssign(name);
 	}
 
+	/** Validate and commit the preset name: save the current setup under it (overwrites). */
+	#submitPresetName(): void {
+		const strip = this.#strip;
+		if (strip?.kind !== "name" || strip.purpose !== "preset") return;
+		const name = strip.input.getValue().trim();
+		if (!/^[a-zA-Z][\w-]*$/.test(name)) return;
+		this.#strip = null;
+		this.#frame.chipRanges = [];
+		this.#callbacks.onSavePreset?.(name);
+		this.#refreshAfterMutation();
+	}
+
 	// ═══════════════════════════════════════════════════════════════════════
 	// Input
 	// ═══════════════════════════════════════════════════════════════════════
@@ -1841,9 +1868,9 @@ export class ModelHubComponent implements Component {
 			this.#closeStrip();
 			return;
 		}
-		if (strip.kind === "roleName") {
+		if (strip.kind === "name") {
 			if (matchesKey(data, "enter") || matchesKey(data, "return") || data === "\n") {
-				this.#submitRoleName();
+				this.#submitNameStrip();
 				return;
 			}
 			strip.input.handleInput(data);
@@ -1895,7 +1922,7 @@ export class ModelHubComponent implements Component {
 				this.#startAssignFallbackKey();
 				return;
 			case "newRole":
-				this.#openRoleNameStrip();
+				this.#openNameStrip("role");
 				return;
 			case "separator":
 				return;
@@ -2001,7 +2028,10 @@ export class ModelHubComponent implements Component {
 				return;
 			}
 			case "new":
-				this.#openRoleNameStrip();
+				this.#openNameStrip("role");
+				return;
+			case "save":
+				if (this.#callbacks.onSavePreset) this.#openNameStrip("preset");
 				return;
 			case "thinking":
 				if (role) {
@@ -2036,7 +2066,7 @@ export class ModelHubComponent implements Component {
 		// Footer strip chips (columns stay in frame coordinates).
 		if (footerColumn !== undefined && this.#strip) {
 			const strip = this.#strip;
-			if (event.leftClick && strip.kind !== "roleName" && this.#frame.selectChipAt(strip, footerColumn)) {
+			if (event.leftClick && strip.kind !== "name" && this.#frame.selectChipAt(strip, footerColumn)) {
 				this.#activateStripChip();
 			}
 			return true;
@@ -2472,7 +2502,10 @@ export class ModelHubComponent implements Component {
 		const altLeftRight = formatKeyHints(["alt+left", "alt+right"]);
 		const strip = this.#strip;
 		if (strip) {
-			if (strip.kind === "roleName") {
+			if (strip.kind === "name") {
+				if (strip.purpose === "preset") {
+					return `${enter} save preset · ${cancel} cancel`;
+				}
 				return `${enter} create + pick model · ${cancel} cancel`;
 			}
 			if (strip.kind === "role") return `${leftRight} choose · ${enter} assign/clear · ${cancel} cancel`;
@@ -2517,7 +2550,8 @@ export class ModelHubComponent implements Component {
 			// open — an assigned role whose model has thinking levels to offer.
 			const editable = row?.kind === "role" && this.#roleThinkingTarget(row.role) !== undefined;
 			const thinking = editable ? ` · ${formatKeyHint("t")} thinking` : "";
-			return `${upDown} rows · ${enter} pick · ${formatKeyHint("f")} fallback · ${formatKeyHint("x")} clear${thinking} · ${formatKeyHint("c")} cycle · [/] reorder · ${formatKeyHint("n")} new`;
+			const savePreset = this.#callbacks.onSavePreset ? ` · ${formatKeyHint("s")} save preset` : "";
+			return `${upDown} rows · ${enter} pick · ${formatKeyHint("f")} fallback · ${formatKeyHint("x")} clear${thinking} · ${formatKeyHint("c")} cycle · [/] reorder · ${formatKeyHint("n")} new${savePreset}`;
 		}
 		if (entry.kind === "provider" && entry.locked) {
 			return entry.oauth
@@ -2541,9 +2575,11 @@ export class ModelHubComponent implements Component {
 	}
 
 	#renderStrip(width: number, strip: StripState): string {
-		if (strip.kind === "roleName") {
-			const label = theme.fg("accent", "New role name:");
-			const inputWidth = Math.max(8, Math.min(32, width - visibleWidth("New role name:") - 24));
+		if (strip.kind === "name") {
+			const preset = strip.purpose === "preset";
+			const labelText = 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);
 		}
@@ -2668,7 +2704,7 @@ export class ModelHubComponent implements Component {
 					// A chip click picks and applies it, like the footer mouse path.
 					const strip = this.#strip;
 					const index = Number(event.item);
-					if (!strip || strip.kind === "roleName" || !Number.isInteger(index) || !strip.chips[index]) return;
+					if (!strip || strip.kind === "name" || !Number.isInteger(index) || !strip.chips[index]) return;
 					strip.index = index;
 					this.#activateStripChip();
 					break;
@@ -3184,8 +3220,13 @@ export class ModelHubComponent implements Component {
 		if (this.#assignmentPending) return [CLOSE_ACTION];
 		if (strip) {
 			const apply =
-				strip.kind === "roleName"
-					? pickerAction("roleName", "Create role", "enter", { primary: true })
+				strip.kind === "name"
+					? 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",
@@ -3220,6 +3261,7 @@ export class ModelHubComponent implements Component {
 						this.#roleThinkingTarget(row.role) ? roleAction("thinking", "Thinking", "t") : undefined,
 						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,
 					);
 					break;
 				}
@@ -3266,9 +3308,13 @@ 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 === "roleName") {
+		if (strip.kind === "name") {
 			return {
-				label: [span("New role name ", "muted"), span(strip.input.getValue(), "mono"), span("▏", "accent")],
+				label: [
+					span(strip.purpose === "preset" ? "Preset name " : "New role name ", "muted"),
+					span(strip.input.getValue(), "mono"),
+					span("▏", "accent"),
+				],
 				items: [],
 			};
 		}
@@ -3562,7 +3608,7 @@ export class ModelHubComponent implements Component {
 			case "strip": {
 				const strip = this.#strip;
 				const index = Number(value);
-				if (!strip || strip.kind === "roleName" || !Number.isInteger(index) || !strip.chips[index]) return;
+				if (!strip || strip.kind === "name" || !Number.isInteger(index) || !strip.chips[index]) return;
 				strip.index = index;
 				this.#activateStripChip();
 				return;
@@ -3573,6 +3619,9 @@ export class ModelHubComponent implements Component {
 			case "roleName":
 				this.#submitRoleName();
 				return;
+			case "presetName":
+				this.#submitPresetName();
+				return;
 			case "cancel":
 				if (this.#strip) this.#closeStrip();
 				return;
@@ -3622,16 +3671,17 @@ export class ModelHubComponent implements Component {
 	#describeStrip(): NativeNode | undefined {
 		const strip = this.#strip;
 		if (!strip) return undefined;
-		if (strip.kind === "roleName") {
+		if (strip.kind === "name") {
+			const preset = strip.purpose === "preset";
 			return node(
 				"row",
 				{ gap: "sm", align: "center" },
 				[
-					text([span("New role name:", "accent")]),
+					text([span(preset ? "Preset name:" : "New role name:", "accent")]),
 					col([strip.input], { grow: 1 }),
 					text([span("(letters, digits, - and _)", "dim")]),
 				],
-				"roleName",
+				preset ? "presetName" : "roleName",
 			);
 		}
 		let prefix: TspSpan[];
@@ -3674,8 +3724,10 @@ export class ModelHubComponent implements Component {
 		const strip = this.#strip;
 		if (strip) {
 			switch (strip.kind) {
-				case "roleName":
-					return [keys("create + pick model", "enter"), cancel("cancel")];
+				case "name":
+					return 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":
@@ -3741,6 +3793,7 @@ export class ModelHubComponent implements Component {
 				keys("cycle", "c"),
 				reorder,
 				keys("new", "n"),
+				this.#callbacks.onSavePreset ? keys("save preset", "s") : undefined,
 			];
 		}
 		if (entry.kind === "provider" && entry.locked) {

package/src/render/render-utils.ts

@@ -909,10 +909,16 @@ function homePatternFor(homeDir: string, windowsStyle: boolean): HomePattern {
 				})
 				.join("[\\\\/]");
 		}
+		// `*` and `_` are also identifier and glob characters (`/home/me_old`, `src/**/home/me/**`), so they
+		// bound the home directory only as Markdown emphasis: opened at start or after whitespace, and
+		// closed before end, whitespace, or punctuation.
+		const end = `[\\\\/\\s"'\\x60)\\]},;:<>&|]`;
 		pattern = {
 			leading: new RegExp(`^${escapedHome}(?=$|[\\\\/])`, windowsStyle ? "i" : ""),
 			embedded: new RegExp(
-				`[a-zA-Z][a-zA-Z0-9+.-]*://[^\\s"'<>]+|(^|[\\s"'\\x60([{=,:])(${escapedHome})(?=$|[\\\\/\\s"'\\x60)\\]},;:])`,
+				`[a-zA-Z][a-zA-Z0-9+.-]*://[^\\s"'<>]+` +
+					`|(^|[\\s"'\\x60([{=,:<>&|])(${escapedHome})(?=$|${end})` +
+					`|((?:^|\\s)[*_]{1,3})(${escapedHome})(?=$|${end}|[*_]{1,3}(?=$|[\\s.,;:!?)\\]}"'\\x60]))`,
 				windowsStyle ? "gi" : "g",
 			),
 		};
@@ -946,8 +952,13 @@ export function shortenEmbeddedPaths(text: string, homeDir?: string, preserveSep
 	const homePattern = homePatternFor(resolvedHome, windowsStyle);
 	const textWithShortenedHome = text.replace(
 		homePattern.embedded,
-		(match, boundary: string | undefined, candidate: string | undefined) =>
-			candidate === undefined ? match : `${boundary}~`,
+		(
+			match,
+			boundary: string | undefined,
+			candidate: string | undefined,
+			emphasis: string | undefined,
+			emphasized: string | undefined,
+		) => (candidate !== undefined ? `${boundary}~` : emphasized !== undefined ? `${emphasis}~` : match),
 	);
 	if (preserveSeparators) return textWithShortenedHome;
 	return textWithShortenedHome
@@ -966,6 +977,43 @@ export function shortenEmbeddedPaths(text: string, homeDir?: string, preserveSep
 		.join(" ");
 }
 
+/**
+ * Shorten filesystem and command arguments without rewriting literal search patterns. A producer that
+ * names no argument key gets the general embedded-path shortening.
+ */
+export function shortenToolArgumentPaths(text: string, key: string | undefined, homeDir?: string): string {
+	if (key === "url") {
+		try {
+			const url = new URL(text);
+			if (url.protocol === "file:") {
+				let decodedPath = url.pathname;
+				try {
+					decodedPath = decodeURIComponent(decodedPath);
+				} catch {
+					/* Retain malformed percent escapes as literal path bytes. */
+				}
+				const filePath = url.hostname
+					? `//${url.hostname}${decodedPath}`
+					: /^[A-Za-z]:$/.test(decodedPath.slice(1, 3))
+						? decodedPath.slice(1)
+						: decodedPath;
+				return shortenEmbeddedPaths(filePath, homeDir);
+			}
+		} catch {
+			// Preserve malformed and non-file URL arguments verbatim.
+		}
+		return text;
+	}
+	return key === undefined ||
+		key === "path" ||
+		key === "file_path" ||
+		key === "command" ||
+		key === "task" ||
+		key === "prompt"
+		? shortenEmbeddedPaths(text, homeDir)
+		: text;
+}
+
 /** Sanitize warning text before showing it in TUI, including embedded home paths. */
 export function sanitizeDisplayWarning(text: string): string {
 	return shortenEmbeddedPaths(

package/src/tools/edit.ts

@@ -693,6 +693,29 @@ function getHashlineInputSections(input: string): HashlineInputEntry[] {
 	return entries;
 }
 
+/** Extract display targets using the existing parsers for supported freeform edit modes. */
+export function getEditInputPaths(input: string, resolvedMode?: EditMode): readonly string[] {
+	const mode =
+		resolvedMode ??
+		(/^\*\*\* (?:Add|Update|Delete) File:/m.test(input)
+			? "apply_patch"
+			: /^[ \t]*\*{3}[ \t]+Edit[ \t]+File:/im.test(input)
+				? "sloppy"
+				: undefined);
+	try {
+		const entries =
+			mode && mode !== "hashline" ? inspectInputEntries({}, mode, input) : getHashlineInputSections(input);
+		const paths: string[] = [];
+		for (const entry of entries) {
+			if (entry.path) paths.push(entry.path);
+			if (entry.rename && entry.rename !== entry.path) paths.push(entry.rename);
+		}
+		return paths;
+	} catch {
+		return [];
+	}
+}
+
 function getHashlineInputRenderSummary(
 	args: EditRenderArgs,
 	editMode: EditMode | undefined,

package/src/tools/task.ts

@@ -33,7 +33,9 @@ import {
 	previewLine,
 	previewWindowRows,
 	replaceTabs,
+	shortenEmbeddedPaths,
 	shortenPath,
+	shortenToolArgumentPaths,
 	type ToolUIStatus,
 	TRUNCATE_LENGTHS,
 	truncateToWidth,
@@ -663,6 +665,11 @@ function renderRouteLine(route: string | undefined, continuePrefix: string, maxW
 	];
 }
 
+/** A tool call's own intent, else its argument, with home paths shortened as the subagent HUD does. */
+function toolCallDetail(intent: string | undefined, args: string | undefined, argsKey: string | undefined): string {
+	return intent ? shortenEmbeddedPaths(intent) : shortenToolArgumentPaths(args ?? "", argsKey);
+}
+
 /**
  * Render streaming progress for a single agent.
  */
@@ -723,7 +730,11 @@ function renderAgentProgress(
 	if (progress.status === "running") {
 		if (progress.currentTool) {
 			let toolLine = `${continuePrefix}${theme.tree.hook} ${theme.fg("muted", sanitizeText(progress.currentTool))}`;
-			const toolDetail = progress.lastIntent ?? progress.currentToolArgs;
+			const toolDetail = toolCallDetail(
+				progress.currentToolIntent,
+				progress.currentToolArgs,
+				progress.currentToolArgsKey,
+			);
 			if (toolDetail) {
 				toolLine += `: ${theme.fg("dim", previewLine(sanitizeText(toolDetail), 40))}`;
 			}
@@ -738,7 +749,7 @@ function renderAgentProgress(
 			// Show most recent completed tool when idle between tools
 			const recent = progress.recentTools[0];
 			let toolLine = `${continuePrefix}${theme.tree.hook} ${theme.fg("dim", sanitizeText(recent.tool))}`;
-			const toolDetail = progress.lastIntent ?? recent.args;
+			const toolDetail = toolCallDetail(recent.intent, recent.args, recent.argsKey);
 			if (toolDetail) {
 				toolLine += `: ${theme.fg("dim", previewLine(sanitizeText(toolDetail), 40))}`;
 			}
@@ -1795,7 +1806,10 @@ function describeProgressAgent(progress: AgentProgress, state: AgentDescribeStat
 		running && progress.currentTool
 			? {
 					name: plainText(progress.currentTool),
-					intent: plainText(progress.lastIntent ?? progress.currentToolArgs ?? "") || undefined,
+					intent:
+						plainText(
+							toolCallDetail(progress.currentToolIntent, progress.currentToolArgs, progress.currentToolArgsKey),
+						) || undefined,
 					age: progress.currentToolStartMs ? Math.max(0, nowMs - progress.currentToolStartMs) : undefined,
 				}
 			: null;
@@ -2252,8 +2266,19 @@ export interface AgentProgress {
 	lastIntent?: string;
 	currentTool?: string;
 	currentToolArgs?: string;
+	/** Argument key selected for the display preview, when known. */
+	currentToolArgsKey?: string;
+	/** Intent the model attached to the current call; undefined when that call carried none. */
+	currentToolIntent?: string;
 	currentToolStartMs?: number;
-	recentTools: Array<{ tool: string; args: string; endMs: number }>;
+	recentTools: Array<{
+		tool: string;
+		args: string;
+		argsKey?: string;
+		intent?: string;
+		isError?: boolean;
+		endMs: number;
+	}>;
 	recentOutput: string[];
 	toolCount: number;
 	/** Count of assistant requests (assistant message_end events) across the run. Drives the soft request budget guard. */