@oh-my-pi/pi-coding-agent 16.4.8 → 16.5.0

package/src/modes/components/agent-hub.ts

@@ -15,8 +15,8 @@
  */
 import * as fs from "node:fs";
 import * as path from "node:path";
-import type { AgentTool } from "@oh-my-pi/pi-agent-core";
-import { Container, Ellipsis, matchesKey, type OverlayHandle, type TUI } from "@oh-my-pi/pi-tui";
+import { type AgentTool, ThinkingLevel } from "@oh-my-pi/pi-agent-core";
+import { Container, Ellipsis, matchesKey, type OverlayHandle, padding, type TUI, visibleWidth } from "@oh-my-pi/pi-tui";
 import { formatAge, getProjectDir, logger } from "@oh-my-pi/pi-utils";
 import { ADVISOR_TRANSCRIPT_FILENAME, isAdvisorTranscriptName } from "../../advisor";
 import type { KeyId } from "../../config/keybindings";
@@ -25,6 +25,7 @@ import { IrcBus } from "../../irc/bus";
 import { AgentLifecycleManager } from "../../registry/agent-lifecycle";
 import { type AgentRef, AgentRegistry, type AgentStatus, MAIN_AGENT_ID } from "../../registry/agent-registry";
 import { USER_INTERRUPT_LABEL } from "../../session/messages";
+import { parseThinkingLevel } from "../../thinking";
 import { replaceTabs, TRUNCATE_LENGTHS, truncateToWidth } from "../../tools/render-utils";
 import type { ObservableSession, SessionObserverRegistry } from "../session-observer-registry";
 import { theme } from "../theme/theme";
@@ -55,20 +56,50 @@ function clampHubLine(line: string, width: number): string {
 
 const STATUS_ORDER: Record<AgentStatus, number> = { running: 0, idle: 1, parked: 2, aborted: 3 };
 
-/** Glyph + status word, colored per theme status conventions. */
-function statusBadge(status: AgentStatus): string {
+/** Status glyph, colored per theme status conventions. The title-line counts spell out the words. */
+function statusGlyph(status: AgentStatus): string {
 	switch (status) {
 		case "running":
-			return theme.fg("accent", `${theme.status.running} running`);
+			return theme.fg("accent", theme.status.running);
 		case "idle":
-			return theme.fg("success", `${theme.status.enabled} idle`);
+			return theme.fg("success", theme.status.enabled);
 		case "parked":
-			return theme.fg("muted", `${theme.status.shadowed} parked`);
+			return theme.fg("muted", theme.status.shadowed);
 		case "aborted":
-			return theme.fg("error", `${theme.status.aborted} aborted`);
+			return theme.fg("error", theme.status.aborted);
 	}
 }
 
+/** Model id + thinking level (`sonnet-4-6 ◒ high`), level colored per theme. */
+function formatModelBadge(modelId: string, level: ThinkingLevel | undefined): string {
+	const model = theme.fg("muted", replaceTabs(modelId));
+	if (!level || level === ThinkingLevel.Off || level === ThinkingLevel.Inherit) return model;
+	const display = theme.thinking[level as keyof typeof theme.thinking] ?? level;
+	return `${model} ${theme.getThinkingBorderColor(level)(display)}`;
+}
+
+/**
+ * Active model + reasoning level for a hub row: live session state when the
+ * agent is attached, else the executor-reported `resolvedModel` selector
+ * (`provider/id`, optionally `:<level>`). Undefined when neither is known
+ * (e.g. a parked historical agent restored from disk).
+ */
+function modelBadge(ref: AgentRef, observed: ObservableSession | undefined): string | undefined {
+	const model = ref.session?.model;
+	if (model) {
+		const level = model.thinking ? ref.session?.thinkingLevel : undefined;
+		return formatModelBadge(model.id, level);
+	}
+	const resolved = observed?.progress?.resolvedModel;
+	if (!resolved) return undefined;
+	// Model ids may themselves contain colons (`qwen3:14b`), so only treat the
+	// suffix as a thinking level when it parses as one.
+	const colon = resolved.lastIndexOf(":");
+	const level = colon >= 0 ? parseThinkingLevel(resolved.slice(colon + 1)) : undefined;
+	const selector = level !== undefined ? resolved.slice(0, colon) : resolved;
+	return formatModelBadge(selector.slice(selector.indexOf("/") + 1), level);
+}
+
 async function registerPersistedSubagents(
 	registry: AgentRegistry,
 	sessionFile: string | null | undefined,
@@ -427,17 +458,31 @@ export class AgentHubOverlayComponent extends Container {
 		} else {
 			const termHeight = process.stdout.rows || 40;
 			// Chrome: 2 borders + title + notice? + blank + hints + border
-			const maxVisible = Math.max(3, termHeight - 7 - (this.#notice ? 1 : 0));
-			let start = 0;
-			if (this.#rows.length > maxVisible) {
-				start = Math.min(
-					Math.max(0, this.#selectedRow - Math.floor(maxVisible / 2)),
-					this.#rows.length - maxVisible,
-				);
+			const budget = Math.max(4, termHeight - 7 - (this.#notice ? 1 : 0));
+			const entries = this.#rows.map((ref, i) => this.#renderEntry(ref, i === this.#selectedRow, width));
+			// Entries are 1-2 lines tall; grow a window around the selection until
+			// the line budget is spent, so the selected entry stays centered.
+			let start = this.#selectedRow;
+			let end = this.#selectedRow + 1;
+			let used = entries[start]?.length ?? 0;
+			for (let grew = true; grew; ) {
+				grew = false;
+				if (end < entries.length && used + entries[end].length <= budget) {
+					used += entries[end].length;
+					end++;
+					grew = true;
+				}
+				if (start > 0 && used + entries[start - 1].length <= budget) {
+					start--;
+					used += entries[start].length;
+					grew = true;
+				}
+			}
+			if (start > 0) {
+				lines.push(` ${theme.fg("dim", `… ${start} more`)}`);
 			}
-			const end = Math.min(start + maxVisible, this.#rows.length);
 			for (let i = start; i < end; i++) {
-				lines.push(this.#renderRow(this.#rows[i], i === this.#selectedRow, width));
+				lines.push(...entries[i]);
 			}
 			if (end < this.#rows.length) {
 				lines.push(` ${theme.fg("dim", `… ${this.#rows.length - end} more`)}`);
@@ -466,26 +511,51 @@ export class AgentHubOverlayComponent extends Container {
 		return parts.join(theme.sep.dot);
 	}
 
-	#renderRow(ref: AgentRef, selected: boolean, width: number): string {
+	/**
+	 * One agent entry, 1-2 lines:
+	 * `❯ ⟳ Name  type  ↳ parent  ⧉ 2 ········ model ◒ level · age` — identity
+	 * left, metadata right-aligned (inlined when the terminal is too narrow) —
+	 * plus an indented dim task line when the agent's work is known.
+	 */
+	#renderEntry(ref: AgentRef, selected: boolean, width: number): string[] {
+		const max = Math.max(1, width - 2);
 		const cursor = selected ? theme.fg("accent", theme.nav.cursor) : " ";
-		const parts: string[] = [statusBadge(ref.status), theme.bold(replaceTabs(ref.id))];
-		parts.push(theme.fg("dim", replaceTabs(ref.displayName)));
-		parts.push(theme.fg("dim", ref.parentId ? `${ref.kind} · of ${ref.parentId}` : ref.kind));
-		if (ref.kind === "advisor") {
-			parts.push(theme.fg("warning", "read-only"));
+		const fields: string[] = [`${cursor} ${statusGlyph(ref.status)} ${theme.bold(replaceTabs(ref.id))}`];
+		if (ref.displayName && ref.displayName !== ref.id) {
+			fields.push(theme.fg("dim", replaceTabs(ref.displayName)));
 		}
-		const observed = this.#observableFor(ref.id);
-		const task = observed?.description ?? observed?.progress?.task;
-		if (task) {
-			parts.push(theme.fg("muted", sanitizeLine(task, TRUNCATE_LENGTHS.TITLE)));
+		if (ref.parentId && ref.parentId !== MAIN_AGENT_ID) {
+			fields.push(theme.fg("dim", `↳ ${replaceTabs(ref.parentId)}`));
+		}
+		if (ref.kind === "advisor") {
+			fields.push(theme.fg("warning", "read-only"));
 		}
 		const unread = this.#irc.unreadCount(ref.id);
 		if (unread > 0) {
-			parts.push(theme.fg("warning", `⧉ ${unread}`));
+			fields.push(theme.fg("warning", `⧉ ${unread}`));
+		}
+		const left = ` ${fields.join("  ")}`;
+
+		const observed = this.#observableFor(ref.id);
+		const meta: string[] = [];
+		const badge = modelBadge(ref, observed);
+		if (badge) meta.push(badge);
+		meta.push(theme.fg("dim", formatAge(Math.max(1, Math.round((Date.now() - ref.lastActivity) / 1000)))));
+		const right = meta.join(theme.sep.dot);
+
+		const leftWidth = visibleWidth(left);
+		const rightWidth = visibleWidth(right);
+		const line =
+			leftWidth + 2 + rightWidth <= max
+				? left + padding(max - leftWidth - rightWidth) + right
+				: truncateToWidth(`${left}  ${right}`.replace(/[\r\n]+/g, " "), max);
+		const entry = [line];
+
+		const task = observed?.description ?? observed?.progress?.task ?? ref.activity;
+		if (task) {
+			entry.push(`     ${theme.fg("muted", sanitizeLine(task, Math.max(10, max - 5)))}`);
 		}
-		parts.push(theme.fg("dim", formatAge(Math.max(1, Math.round((Date.now() - ref.lastActivity) / 1000)))));
-		const rawLine = ` ${cursor} ${parts.join(theme.sep.dot)}`;
-		return truncateToWidth(rawLine.replace(/[\r\n]+/g, " "), Math.max(1, width - 1));
+		return entry;
 	}
 
 	#handleTableInput(keyData: string): void {

package/src/modes/components/compaction-summary-message.ts

@@ -87,7 +87,12 @@ export class CompactionSummaryMessageComponent implements Component {
 
 	constructor(private readonly message: CompactionSummaryMessage) {
 		this.#divider = new SummaryDividerComponent({
-			label: () => `${theme.icon.camera} compacted`,
+			// A dead-end warning stamped by the progress guard badges the bar;
+			// the full text lives in the ctrl+o detail block below.
+			label: () =>
+				this.message.warning
+					? `${theme.icon.camera} compacted ${theme.fg("warning", theme.icon.warning)}`
+					: `${theme.icon.camera} compacted`,
 			detailMarkdown: () => this.#detailMarkdown(),
 		});
 	}
@@ -109,7 +114,8 @@ export class CompactionSummaryMessageComponent implements Component {
 		const frameCount = this.message.images?.length ?? 0;
 		const frameNote =
 			frameCount > 0 ? `\n\n_${frameCount} snapcompact frame${frameCount === 1 ? "" : "s"} attached_` : "";
-		return `**Compacted from ${tokenStr} tokens**\n\n${this.message.summary}${frameNote}`;
+		const warningNote = this.message.warning ? `\n\n${theme.icon.warning} **Warning:** ${this.message.warning}` : "";
+		return `**Compacted from ${tokenStr} tokens**${warningNote}\n\n${this.message.summary}${frameNote}`;
 	}
 }
 

package/src/modes/components/index.ts

@@ -20,6 +20,7 @@ export * from "./login-dialog";
 export * from "./logout-account-selector";
 export * from "./model-browser";
 export * from "./model-hub";
+export * from "./model-picker";
 export * from "./oauth-selector";
 export * from "./queue-mode-selector";
 export * from "./read-tool-group";

package/src/modes/components/model-browser.ts

@@ -22,11 +22,12 @@ import {
 	visibleWidth,
 } from "@oh-my-pi/pi-tui";
 import { formatNumber } from "@oh-my-pi/pi-utils";
-import { getRoleInfo, MODEL_ROLE_IDS } from "../../config/model-roles";
+import { getModelMatchPreferences, resolveModelRoleValue } from "../../config/model-resolver";
+import { getKnownRoleIds, getRoleInfo, MODEL_ROLE_IDS } from "../../config/model-roles";
 import type { Settings } from "../../config/settings";
 import type { ModelPerfStats } from "../../session/agent-storage";
-import { AUTO_THINKING, type ConfiguredThinkingLevel } from "../../thinking";
-import { theme } from "../theme/theme";
+import { AUTO_THINKING, type ConfiguredThinkingLevel, parseConfiguredThinkingLevel } from "../../thinking";
+import { type ThemeColor, theme } from "../theme/theme";
 import {
 	matchesSelectCancel,
 	matchesSelectDown,
@@ -35,12 +36,14 @@ import {
 	matchesSelectUp,
 } from "../utils/keybinding-matchers";
 
-/** One selectable model row. `selector` is the canonical `provider/id` key. */
+/** One selectable row. `selector` is a canonical model key or host-specific virtual key. */
 export interface ModelBrowserItem {
 	provider: string;
 	id: string;
 	model: Model;
 	selector: string;
+	/** Optional foreground color for the row label. */
+	labelColor?: ThemeColor;
 }
 
 /** Resolved role assignment as displayed by the browser and the hub. */
@@ -54,6 +57,67 @@ export interface RoleAssignment {
 /** Map of role id to its resolved assignment (absent roles are unresolved). */
 export type RoleAssignments = Record<string, RoleAssignment | undefined>;
 
+/**
+ * Resolve every known role to its display assignment: configured role values
+ * resolve against `allModels`; unconfigured roles fall back to auto-selection
+ * over `autoCandidates` (skipped when empty). Shared by the /models hub and
+ * the alt+p session picker.
+ */
+export function resolveRoleAssignments(
+	settings: Settings,
+	allModels: ReadonlyArray<Model>,
+	autoCandidates: ReadonlyArray<Model>,
+): RoleAssignments {
+	const resolvedThinkingLevel = (
+		role: string,
+		resolved: { explicitThinkingLevel: boolean; thinkingLevel?: ConfiguredThinkingLevel },
+	): ConfiguredThinkingLevel => {
+		if (resolved.explicitThinkingLevel && resolved.thinkingLevel !== undefined) {
+			return resolved.thinkingLevel;
+		}
+		if (role === "default") {
+			return parseConfiguredThinkingLevel(settings.get("defaultThinkingLevel")) ?? ThinkingLevel.Inherit;
+		}
+		return ThinkingLevel.Inherit;
+	};
+
+	const roles: RoleAssignments = {};
+	const matchPreferences = getModelMatchPreferences(settings);
+	const knownRoles = getKnownRoleIds(settings);
+	const configuredRoles = new Set<string>();
+	const catalog = [...allModels];
+
+	for (const role of knownRoles) {
+		const roleValue = settings.getModelRole(role);
+		if (!roleValue) continue;
+		configuredRoles.add(role);
+		const resolved = resolveModelRoleValue(roleValue, catalog, { settings, matchPreferences });
+		if (resolved.model) {
+			roles[role] = {
+				model: resolved.model,
+				thinkingLevel: resolvedThinkingLevel(role, resolved),
+				autoSelected: false,
+			};
+		}
+	}
+
+	if (autoCandidates.length > 0) {
+		const candidates = [...autoCandidates];
+		for (const role of knownRoles) {
+			if (configuredRoles.has(role)) continue;
+			const resolved = resolveModelRoleValue(`pi/${role}`, candidates, { settings, matchPreferences });
+			if (!resolved.model) continue;
+			roles[role] = {
+				model: resolved.model,
+				thinkingLevel: resolvedThinkingLevel(role, resolved),
+				autoSelected: true,
+			};
+		}
+	}
+
+	return roles;
+}
+
 /** Wrap raw models into browser items. */
 export function buildBrowserItems(models: ReadonlyArray<Model>): ModelBrowserItem[] {
 	return models.map(model => ({
@@ -256,7 +320,6 @@ export interface ModelBrowserOptions {
 	disableOverContext?: boolean;
 	/** Host-provided empty-state text (e.g. provider discovery status). */
 	emptyText?: () => string | undefined;
-	initialQuery?: string;
 }
 
 /** Rendered rows before the list window: search row + blank. */
@@ -290,11 +353,15 @@ export class ModelBrowser implements Component {
 	#currentContextTokens: number;
 	#disableOverContext: boolean;
 	#emptyText?: () => string | undefined;
+	/** Keep role-like virtual rows in their host-defined order during search. */
+	#preserveQueryOrder = false;
 	/** First visible list row; panned by the wheel, snapped to the selection on keyboard navigation. */
 	#windowStart = 0;
 	#windowCount = 0;
 	/** Whether the host pane owns arrow keys; drives cursor strength and the selected-row band. */
 	#focused = true;
+	/** `provider/id` of the session's active model; marked in rows and detail. */
+	#currentSelector: string | undefined;
 
 	/** Enter or click-on-selected. */
 	onActivate?: (item: ModelBrowserItem) => void;
@@ -310,9 +377,11 @@ export class ModelBrowser implements Component {
 		this.#currentContextTokens = Number.isFinite(tokens) && tokens > 0 ? Math.floor(tokens) : 0;
 		this.#disableOverContext = options.disableOverContext ?? false;
 		this.#emptyText = options.emptyText;
-		if (options.initialQuery) {
-			this.#searchInput.setValue(options.initialQuery);
-		}
+	}
+
+	/** Mark `selector` as the session's active model (undefined clears the mark). */
+	setCurrentSelector(selector: string | undefined): void {
+		this.#currentSelector = selector;
 	}
 
 	/** Replace the scope's base items; the live query re-applies and selection is pinned by selector. */
@@ -347,6 +416,14 @@ export class ModelBrowser implements Component {
 	setShowProvider(show: boolean): void {
 		this.#showProvider = show;
 	}
+	/** Keep the source order after fuzzy filtering instead of applying model-specific ranking. */
+	setPreserveQueryOrder(preserve: boolean): void {
+		this.#preserveQueryOrder = preserve;
+	}
+	/** Allow hosts to toggle context-window eligibility between browser modes. */
+	setDisableOverContext(disable: boolean): void {
+		this.#disableOverContext = disable;
+	}
 	/** Focused: accent cursor + selected-row background band. Unfocused: dim cursor, no band. */
 	setFocused(focused: boolean): void {
 		this.#focused = focused;
@@ -495,17 +572,21 @@ export class ModelBrowser implements Component {
 			// queries all flow through the same fuzzy matcher.
 			const ranked = fuzzyRank(this.#baseItems, query, ({ provider, id }) => `${provider}/${id}`);
 			const matches = ranked.map(result => result.item);
-			// Match quality is the primary key while searching: an exact
-			// "gpt-5.5" must beat the MRU (or role-assigned) "gpt-5.6", so
-			// role rank is skipped and MRU only breaks ties. Scores are
-			// bucketed so sub-point position noise (provider-name length)
-			// can't split equally good matches; within a bucket the stable
-			// sort keeps sortModelItems' MRU/version order.
-			sortModelItems(matches, { roles: this.#roles, mruOrder: this.#mruOrder, skipRoleRank: true });
-			const buckets = new Map<ModelBrowserItem, number>();
-			for (const result of ranked) buckets.set(result.item, Math.round(result.score / 10));
-			matches.sort((a, b) => (buckets.get(a) ?? 0) - (buckets.get(b) ?? 0));
-			items = matches;
+			if (this.#preserveQueryOrder) {
+				items = matches;
+			} else {
+				// Match quality is the primary key while searching: an exact
+				// "gpt-5.5" must beat the MRU (or role-assigned) "gpt-5.6", so
+				// role rank is skipped and MRU only breaks ties. Scores are
+				// bucketed so sub-point position noise (provider-name length)
+				// can't split equally good matches; within a bucket the stable
+				// sort keeps sortModelItems' MRU/version order.
+				sortModelItems(matches, { roles: this.#roles, mruOrder: this.#mruOrder, skipRoleRank: true });
+				const buckets = new Map<ModelBrowserItem, number>();
+				for (const result of ranked) buckets.set(result.item, Math.round(result.score / 10));
+				matches.sort((a, b) => (buckets.get(a) ?? 0) - (buckets.get(b) ?? 0));
+				items = matches;
+			}
 		} else {
 			items = this.#baseItems;
 		}
@@ -640,11 +721,17 @@ export class ModelBrowser implements Component {
 		const disabled = this.#isDisabled(item);
 		const prefix = selected && this.#focused ? `${theme.fg("accent", theme.nav.cursor)} ` : "  ";
 		const providerPrefix = this.#showProvider ? theme.fg("dim", `${item.provider}/`) : "";
-		const name = selected ? theme.fg("accent", item.id) : item.id;
+		const name = item.labelColor
+			? theme.fg(item.labelColor, item.id)
+			: selected
+				? theme.fg("accent", item.id)
+				: item.id;
+		const currentMark =
+			item.selector === this.#currentSelector ? ` ${theme.fg("success", theme.status.enabled)}` : "";
 		const overLimit = disabled
 			? ` ${theme.status.disabled} context>${formatNumber(item.model.contextWindow ?? 0).toLowerCase()}`
 			: "";
-		let left = `${prefix}${providerPrefix}${name}${overLimit}`;
+		let left = `${prefix}${providerPrefix}${name}${currentMark}${overLimit}`;
 
 		// Perf column collapses entirely when no visible row has measurements.
 		const perfCol =
@@ -691,6 +778,9 @@ export class ModelBrowser implements Component {
 		}
 
 		const chips: string[] = [];
+		if (selected.selector === this.#currentSelector) {
+			chips.push(theme.fg("success", `${theme.status.enabled} current`));
+		}
 		const seen = new Set<string>();
 		const pushRole = (role: string) => {
 			if (seen.has(role)) return;