@oh-my-pi/pi-tui 18.3.1 → 18.3.3

package/src/theme/symbols.ts

@@ -99,7 +99,6 @@ export type SymbolKey =
 	| "icon.advisorClosed"
 	| "icon.time"
 	| "icon.omp"
-	| "icon.esc"
 	| "icon.ghost"
 	| "icon.agents"
 	| "icon.job"
@@ -285,7 +284,28 @@ export type SymbolKey =
 	| "tool.goal"
 	| "tool.irc"
 	| "tool.delete"
-	| "tool.move";
+	| "tool.move"
+	// Keyboard keys (rendered by formatKeyHint). `*Mac` variants replace the
+	// generic modifier on macOS, whose keycaps are labelled with ⌃ ⌥ ⌘.
+	| "key.ctrl"
+	| "key.ctrlMac"
+	| "key.shift"
+	| "key.alt"
+	| "key.altMac"
+	| "key.super"
+	| "key.superMac"
+	// Gap after a glyph modifier (`⌃⇧C`); nerd icons render too small to abut
+	| "key.joiner"
+	| "key.enter"
+	| "key.esc"
+	| "key.tab"
+	| "key.backspace"
+	| "key.delete"
+	| "key.space"
+	| "key.up"
+	| "key.down"
+	| "key.left"
+	| "key.right";
 
 export type SymbolMap = Record<SymbolKey, string>;
 /**
@@ -459,7 +479,6 @@ const UNICODE_SYMBOLS: SymbolMap = {
 	"icon.advisorClosed": "🙈",
 	"icon.time": "⏱",
 	"icon.omp": "π",
-	"icon.esc": "⎋",
 	"icon.ghost": "👻",
 	"icon.agents": "👥",
 	"icon.job": "⚙",
@@ -646,6 +665,25 @@ const UNICODE_SYMBOLS: SymbolMap = {
 	"tool.irc": "✉",
 	"tool.delete": "🗑",
 	"tool.move": "➜",
+	// Keys: word modifiers off macOS (⌃/⌥/⌘ name no key on a PC keyboard)
+	"key.ctrl": "Ctrl",
+	"key.ctrlMac": "⌃",
+	"key.shift": "⇧",
+	"key.alt": "Alt",
+	"key.altMac": "⌥",
+	"key.super": "Super",
+	"key.superMac": "⌘",
+	"key.joiner": "",
+	"key.enter": "⏎",
+	"key.esc": "⎋",
+	"key.tab": "⇥",
+	"key.backspace": "⌫",
+	"key.delete": "⌦",
+	"key.space": "␣",
+	"key.up": "↑",
+	"key.down": "↓",
+	"key.left": "←",
+	"key.right": "→",
 };
 
 const NERD_SYMBOLS: SymbolMap = {
@@ -822,8 +860,6 @@ const NERD_SYMBOLS: SymbolMap = {
 	// U+F03FF before (2ec52b8bdd) and reverted because it renders the wrong glyph;
 	// do not swap it again.
 	"icon.omp": "\u{f0d57}",
-	// pick: 󱊷 (nf-md-keyboard_esc) | alt: ⎋
-	"icon.esc": "\u{f12b7}",
 	// pick: 󰊠 (nf-md-ghost) | alt: 👻
 	"icon.ghost": "\u{f02a0}",
 	// pick:  | alt: 
@@ -1098,6 +1134,35 @@ const NERD_SYMBOLS: SymbolMap = {
 	"tool.irc": "\uF086",
 	"tool.delete": "\uf12d",
 	"tool.move": "\uf061",
+	// Keys: word modifiers off macOS; arrows stay Unicode (nerd arrows add nothing)
+	"key.ctrl": "Ctrl",
+	// pick: 󰘴 (nf-md-apple_keyboard_control) | alt: ⌃
+	"key.ctrlMac": "\u{f0634}",
+	// pick: 󰘶 (nf-md-apple_keyboard_shift) | alt: ⇧
+	"key.shift": "\u{f0636}",
+	"key.alt": "Alt",
+	// pick: 󰘵 (nf-md-apple_keyboard_option) | alt: ⌥
+	"key.altMac": "\u{f0635}",
+	"key.super": "Super",
+	// pick: 󰘳 (nf-md-apple_keyboard_command) | alt: ⌘
+	"key.superMac": "\u{f0633}",
+	"key.joiner": " ",
+	// pick: 󰌑 (nf-md-keyboard_return) | alt: ⏎
+	"key.enter": "\u{f0311}",
+	// pick: 󱊷 (nf-md-keyboard_esc) | alt: ⎋
+	"key.esc": "\u{f12b7}",
+	// pick: 󰌒 (nf-md-keyboard_tab) | alt: ⇥
+	"key.tab": "\u{f0312}",
+	// pick: 󰁮 (nf-md-backspace) | alt: ⌫
+	"key.backspace": "\u{f006e}",
+	// pick: 󰹾 (nf-md-backspace_reverse) | alt: ⌦
+	"key.delete": "\u{f0e7e}",
+	// pick: 󱁐 (nf-md-keyboard_space) | alt: ␣
+	"key.space": "\u{f1050}",
+	"key.up": "↑",
+	"key.down": "↓",
+	"key.left": "←",
+	"key.right": "→",
 };
 
 const ASCII_SYMBOLS: SymbolMap = {
@@ -1192,7 +1257,6 @@ const ASCII_SYMBOLS: SymbolMap = {
 	"icon.advisorClosed": "(adv)",
 	"icon.time": "t:",
 	"icon.omp": "pi",
-	"icon.esc": "esc",
 	"icon.ghost": "@",
 	"icon.agents": "AG",
 	"icon.job": "bg",
@@ -1374,6 +1438,24 @@ const ASCII_SYMBOLS: SymbolMap = {
 	"tool.irc": "#",
 	"tool.delete": "rm",
 	"tool.move": "mv",
+	"key.ctrl": "Ctrl",
+	"key.ctrlMac": "Ctrl",
+	"key.shift": "Shift",
+	"key.alt": "Alt",
+	"key.altMac": "Option",
+	"key.super": "Super",
+	"key.superMac": "Cmd",
+	"key.joiner": "+",
+	"key.enter": "Enter",
+	"key.esc": "Esc",
+	"key.tab": "Tab",
+	"key.backspace": "Backspace",
+	"key.delete": "Delete",
+	"key.space": "Space",
+	"key.up": "Up",
+	"key.down": "Down",
+	"key.left": "Left",
+	"key.right": "Right",
 };
 
 export const SYMBOL_PRESETS: Record<SymbolPreset, SymbolMap> = {

package/src/theme/theme-class.ts

@@ -592,7 +592,6 @@ export class Theme {
 			advisorClosed: this.#symbols["icon.advisorClosed"],
 			time: this.#symbols["icon.time"],
 			omp: this.#symbols["icon.omp"],
-			esc: this.#symbols["icon.esc"],
 			ghost: this.#symbols["icon.ghost"],
 			agents: this.#symbols["icon.agents"],
 			job: this.#symbols["icon.job"],

package/src/theme/theme.ts

@@ -5,6 +5,7 @@ import type { Terminal, TerminalAppearance } from "../terminal";
 import { colorLuma } from "@oh-my-pi/pi-utils/color";
 import { getCustomThemesDir } from "@oh-my-pi/pi-utils/dirs";
 import * as logger from "@oh-my-pi/pi-utils/logger";
+import { setActiveSymbolTheme } from "./active-symbols";
 import { ansi256ToHex, resolveThemeColors, resolveVarRefs } from "./color";
 import { type CreateThemeOptions, getBuiltinThemes, loadTheme, loadThemeJson, loadThemeSync } from "./loader";
 import type { ThemeColor, ThemeJson } from "./schema";
@@ -99,6 +100,7 @@ export function bindTheme(binding: ThemeBinding): () => void {
 
 function assignTheme(value: Theme): void {
 	theme = value;
+	setActiveSymbolTheme(value);
 	if (themeBindings) {
 		for (const binding of themeBindings) binding(value);
 	}

package/src/tools/bash-interactive.ts

@@ -4,6 +4,7 @@ import type { Component } from "../tui";
 import { extractPrintableText, matchesKey, parseKey, parseKittySequence } from "../keys";
 import { padding, truncateToWidth, visibleWidth } from "../utils";
 import type { Theme } from "../theme/theme";
+import { formatKeyHint } from "../app-keybindings";
 import { formatStatusIcon, replaceTabs } from "../render/render-utils";
 import { readTerminalRows, styleTerminalRow } from "./terminal-output";
 
@@ -267,7 +268,7 @@ export class BashInteractiveOverlayComponent implements Component {
 		const footer =
 			this.#state === "running"
 				? truncateToWidth(
-						`${this.#uiTheme.fg("warning", "esc")} ${this.#uiTheme.fg("dim", "force-kill")} ${this.#uiTheme.fg("dim", "· input forwarded to PTY")}`,
+						`${this.#uiTheme.fg("warning", formatKeyHint("escape"))} ${this.#uiTheme.fg("dim", "force-kill")} ${this.#uiTheme.fg("dim", "· input forwarded to PTY")}`,
 						innerWidth,
 					)
 				: truncateToWidth(this.#uiTheme.fg("dim", "session finished"), innerWidth);

package/src/tools/eval.ts

@@ -30,7 +30,7 @@ import {
 } from "../render/render-utils";
 import type { ImageContent } from "@oh-my-pi/pi-ai";
 import type { OutputMeta } from "./output-meta";
-import type { ConfiguredThinkingLevel } from "../render/render-utils";
+import { type ConfiguredThinkingLevel, expandKeyHint } from "../render/render-utils";
 
 /** Runtime backend that an eval cell dispatches to. */
 export type EvalLanguage = "python" | "js";
@@ -677,7 +677,7 @@ export const evalToolRenderer = {
 						const outputLines = [...outputContent.lines];
 						if (!expanded && outputContent.hiddenCount > 0) {
 							outputLines.push(
-								uiTheme.fg("dim", `… ${outputContent.hiddenCount} more lines (ctrl+o to expand)`),
+								uiTheme.fg("dim", `… ${outputContent.hiddenCount} more lines (${expandKeyHint()} to expand)`),
 							);
 						}
 						if (statusLines.length > 0) {
@@ -811,7 +811,7 @@ export const evalToolRenderer = {
 					outputLines.push("");
 					const skippedLine = uiTheme.fg(
 						"dim",
-						`… (${cachedSkipped} earlier lines, showing ${cachedLines.length} of ${cachedSkipped + cachedLines.length}) (ctrl+o to expand)`,
+						`… (${cachedSkipped} earlier lines, showing ${cachedLines.length} of ${cachedSkipped + cachedLines.length}) (${expandKeyHint()} to expand)`,
 					);
 					outputLines.push(truncateToWidth(skippedLine, width));
 				}

package/src/tools/mcp.ts

@@ -266,7 +266,7 @@ export interface MCPResourceContent {
 /** Supported MCP result content blocks retained in display metadata. */
 export type MCPContent = MCPTextContent | MCPImageContent | MCPResourceContent;
 
-/** Details included in MCP tool results for rendering */
+/** MCP result details shared by renderers and programmatic tool consumers. */
 export interface MCPToolDetails {
 	/** Server name */
 	serverName: string;
@@ -276,6 +276,8 @@ export interface MCPToolDetails {
 	isError?: boolean;
 	/** Raw content from MCP response */
 	rawContent?: MCPContent[];
+	/** Server-supplied structured data, independent of the model-facing text rendering. */
+	structuredContent?: Record<string, unknown>;
 	/** Structured metadata from the MCP response */
 	mcpMeta?: Record<string, unknown>;
 	/** Provider ID (e.g., "claude", "mcp-json") */

package/src/tools/task-yield-assembly.ts

@@ -1,4 +1,13 @@
 import type { YieldItem } from "./task";
+
+/**
+ * Output-schema shape of each declared top-level property, keyed by incremental yield label.
+ * `array` sections accumulate into a list (even a lone yield); `scalar` sections keep the
+ * latest yield, since the schema admits exactly one value. Undeclared labels accumulate
+ * into a list only once repeated.
+ */
+export type YieldSectionShapes = ReadonlyMap<string, "array" | "scalar">;
+
 /** Outcome of folding a run's yield calls into one payload, with provenance flags. */
 interface AssembledYieldResult {
 	data: unknown;
@@ -52,12 +61,14 @@ function appendYieldSection(
 	sectionCounts: Map<string, number>,
 	label: string,
 	value: unknown,
-	forceArray: boolean,
+	shape: "array" | "scalar" | undefined,
 ): void {
 	const count = sectionCounts.get(label) ?? 0;
 	const existing = sections[label];
-	if (count === 0) {
-		sections[label] = forceArray ? [value] : value;
+	if (shape === "scalar") {
+		sections[label] = value;
+	} else if (count === 0) {
+		sections[label] = shape === "array" ? [value] : value;
 	} else if (Array.isArray(existing)) {
 		existing.push(value);
 	} else {
@@ -74,12 +85,13 @@ function appendYieldSection(
  * assistant turn the raw terminal result. Other string-typed yields contribute
  * the terminal labelled section. Untyped terminal yields keep the historical
  * "last yield wins" behavior unless no terminal yield exists, in which case
- * accumulated typed sections finalize on idle.
+ * accumulated typed sections finalize on idle. Repeated sections merge per
+ * `sectionShapes` (see {@link YieldSectionShapes}).
  */
 export function assembleYieldResult(
 	yieldItems: YieldItem[],
 	lastAssistantText?: string,
-	arrayLabels?: ReadonlySet<string>,
+	sectionShapes?: YieldSectionShapes,
 ): AssembledYieldResult | undefined {
 	if (yieldItems.length === 0) return undefined;
 
@@ -101,18 +113,27 @@ export function assembleYieldResult(
 	// level deep and made output-schema validation report every field missing.
 	const sections: Record<string, unknown> = {};
 	const sectionCounts = new Map<string, number>();
+	const overriddenScalars = new Set<string>();
 	let schemaOverridden = false;
 	let missingData = false;
 	let hasSections = false;
 	for (const item of yieldItems) {
 		if (item.status === "aborted") continue;
 		if (!isIncrementalYieldType(item.type)) continue;
-		schemaOverridden ||= item.schemaOverridden === true;
+		const overridden = item.schemaOverridden === true;
 		const labels = getYieldLabels(item.type);
 		const resolved = resolveYieldPayload(item, lastAssistantText, labels);
 		missingData ||= resolved.missingData;
+		if (labels.length === 0) schemaOverridden ||= overridden;
 		for (const label of labels) {
-			appendYieldSection(sections, sectionCounts, label, resolved.value, arrayLabels?.has(label) ?? false);
+			const shape = sectionShapes?.get(label);
+			appendYieldSection(sections, sectionCounts, label, resolved.value, shape);
+			if (shape === "scalar") {
+				if (overridden) overriddenScalars.add(label);
+				else overriddenScalars.delete(label);
+			} else {
+				schemaOverridden ||= overridden;
+			}
 			hasSections = true;
 		}
 	}
@@ -133,7 +154,12 @@ export function assembleYieldResult(
 	// A data-less terminal finalize keeps accumulated sections; only when none
 	// exist does the last assistant turn become the raw result.
 	if (hasSections) {
-		return { data: sections, schemaOverridden, rawText: false, missingData };
+		return {
+			data: sections,
+			schemaOverridden: schemaOverridden || overriddenScalars.size > 0,
+			rawText: false,
+			missingData,
+		};
 	}
 
 	if (!terminalItem) return undefined;

package/src/tools/task.ts

@@ -42,7 +42,7 @@ import { framedToolCard } from "../render/tool-card";
 import { formatOutputInline, renderJsonTreeLines } from "./json-tree";
 import { repairDoubleEncodedJsonString } from "./task-repair-args";
 import { getSubprocessToolRenderer } from "./subprocess";
-import { assembleYieldResult } from "./task-yield-assembly";
+import { assembleYieldResult, type YieldSectionShapes } from "./task-yield-assembly";
 
 /** Render context threaded in from `ToolExecutionComponent.#buildRenderContext`. */
 interface TaskRenderContext {
@@ -98,8 +98,13 @@ function normalizeFindings(value: unknown): FindingDetails[] {
 	return findings;
 }
 
-/** Reviewer output declares `findings` as an array, so a lone finding section still assembles as a list. */
-const REVIEWER_ARRAY_LABELS: ReadonlySet<string> = new Set(["findings"]);
+/** Reviewer output shapes: `findings` is an array (a lone finding still assembles as a list); the verdict fields are scalars. */
+const REVIEWER_SECTION_SHAPES: YieldSectionShapes = new Map([
+	["findings", "array"],
+	["overall_correctness", "scalar"],
+	["explanation", "scalar"],
+	["confidence", "scalar"],
+]);
 
 function extractIncrementalReviewResult(
 	items: RenderYieldItem[],
@@ -110,7 +115,7 @@ function extractIncrementalReviewResult(
 		status: item.status === "aborted" ? "aborted" : item.status === "success" ? "success" : undefined,
 		useLastTurn: item.useLastTurn,
 	}));
-	const assembled = assembleYieldResult(yieldItems, undefined, REVIEWER_ARRAY_LABELS);
+	const assembled = assembleYieldResult(yieldItems, undefined, REVIEWER_SECTION_SHAPES);
 	const data = assembled?.data;
 	if (!data || typeof data !== "object" || Array.isArray(data)) return undefined;
 	const record = data as Record<string, unknown>;
@@ -553,7 +558,7 @@ function createAssignmentSectionRenderer(
 }
 
 /**
- * Build the shared-context section (the `# Goal / # Constraints` background a
+ * Build the shared-context section (the `# Goal / # Contract` background a
  * batch call hands every subagent). Rendered like the assignment brief so the
  * shared background stays visible for the whole task lifecycle.
  */
@@ -1726,6 +1731,8 @@ export interface TaskItem {
 	agent?: string;
 	/** The work; required by the schema. */
 	task?: string;
+	/** Caller's terse rationale for why the work is simple or complex; required by the schema and fed to the child's `auto` thinking classifier. */
+	complexity?: string;
 	/** Per-spawn thinking effort: lowest/middle/highest level the resolved model supports. Overrides the agent's default selector (e.g. `auto`). */
 	effort?: "lo" | "med" | "hi";
 	/** Caller-provided output schema; its presence overrides the selected agent's schema. */
@@ -1751,6 +1758,8 @@ export interface TaskParams {
 	agent?: string;
 	/** The work (flat form). */
 	task?: string;
+	/** Caller's difficulty rationale (flat form); see {@link TaskItem.complexity}. */
+	complexity?: string;
 	/** Per-spawn thinking effort (flat form): lowest/middle/highest level the resolved model supports. */
 	effort?: "lo" | "med" | "hi";
 	/** Caller-provided output schema; its presence overrides the selected agent's schema. */

package/dist/types/overlays/tiny-title-download-progress.d.ts

@@ -1,21 +0,0 @@
-import { type Component } from "../index.js";
-/** Download progress fields consumed by the status display. */
-export interface TinyTitleDownloadProgress {
-    status: "initiate" | "download" | "progress" | "progress_total" | "done" | "ready" | "error";
-    file?: string;
-    progress?: number;
-    loaded?: number;
-    total?: number;
-    files?: Record<string, {
-        loaded: number;
-        total: number;
-    }>;
-}
-export declare class TinyTitleDownloadProgressComponent implements Component {
-    #private;
-    constructor(modelLabel: string);
-    update(event: TinyTitleDownloadProgress): void;
-    isComplete(): boolean;
-    invalidate(): void;
-    render(width: number): readonly string[];
-}

package/src/overlays/tiny-title-download-progress.ts

@@ -1,102 +0,0 @@
-import { type Component, truncateToWidth, visibleWidth } from "../index";
-import { formatBytes } from "@oh-my-pi/pi-utils";
-import { ProgressBar } from "../components/progress-bar";
-/** Download progress fields consumed by the status display. */
-export interface TinyTitleDownloadProgress {
-	status: "initiate" | "download" | "progress" | "progress_total" | "done" | "ready" | "error";
-	file?: string;
-	progress?: number;
-	loaded?: number;
-	total?: number;
-	files?: Record<string, { loaded: number; total: number }>;
-}
-import { theme } from "../theme/theme";
-
-const DEFAULT_BAR_WIDTH = 24;
-
-function padLine(line: string, width: number): string {
-	const visible = visibleWidth(line);
-	return visible >= width ? truncateToWidth(line, width) : `${line}${" ".repeat(width - visible)}`;
-}
-
-function currentFile(event: TinyTitleDownloadProgress | undefined): string | undefined {
-	if (!event) return undefined;
-	if (event.file) return event.file.split("/").at(-1) ?? event.file;
-	if (event.files) {
-		let largestFile: string | undefined;
-		let largestLoaded = -1;
-		for (const file in event.files) {
-			const state = event.files[file];
-			if (state.loaded <= largestLoaded || state.loaded >= state.total) continue;
-			largestFile = file;
-			largestLoaded = state.loaded;
-		}
-		return largestFile?.split("/").at(-1) ?? largestFile;
-	}
-	return undefined;
-}
-
-function statusLabel(event: TinyTitleDownloadProgress | undefined): string {
-	if (!event) return "Preparing";
-	if (event.status === "error") return "Failed";
-	if (event.status === "ready") return "Ready";
-	if (event.status === "done") return "Downloaded";
-	if (event.status === "download") return "Downloading";
-	if (event.status === "progress" || event.status === "progress_total") return "Downloading";
-	return "Preparing";
-}
-
-function byteLabel(event: TinyTitleDownloadProgress | undefined): string | undefined {
-	if (!event?.loaded || !event.total) return undefined;
-	return `${formatBytes(event.loaded)} / ${formatBytes(event.total)}`;
-}
-
-export class TinyTitleDownloadProgressComponent implements Component {
-	#modelLabel: string;
-	#event: TinyTitleDownloadProgress | undefined;
-	#bar = new ProgressBar(undefined, {
-		min: 0,
-		max: 100,
-		minWidth: 8,
-		maxWidth: DEFAULT_BAR_WIDTH,
-		style: {
-			filled: "█",
-			empty: "░",
-			styleFilled: text => theme.fg("accent", text),
-			styleEmpty: text => theme.fg("muted", text),
-			styleIndeterminate: text => theme.fg("muted", text),
-		},
-	});
-
-	constructor(modelLabel: string) {
-		this.#modelLabel = modelLabel;
-	}
-
-	update(event: TinyTitleDownloadProgress): void {
-		this.#event = event;
-		this.#bar.setValue(event.progress);
-	}
-
-	isComplete(): boolean {
-		return this.#event?.status === "ready" || this.#event?.status === "error";
-	}
-
-	invalidate(): void {
-		this.#bar.invalidate();
-	}
-
-	render(width: number): readonly string[] {
-		width = Math.max(1, width);
-		const border = theme.fg("border", theme.boxRound.horizontal.repeat(width));
-		const status = statusLabel(this.#event);
-		const file = currentFile(this.#event);
-		const pct =
-			this.#event?.progress === undefined ? "" : `${Math.floor(this.#event.progress).toString().padStart(3, " ")}%`;
-		const bytes = byteLabel(this.#event);
-		const title = `${theme.fg("accent", "Tiny model")} ${theme.fg("muted", status)} ${this.#modelLabel}`;
-		const bar = this.#bar.render(Math.max(8, width - 36))[0] ?? "";
-		const details = [bar, pct, bytes, file].filter((part): part is string => Boolean(part)).join(" ");
-
-		return [border, padLine(` ${title}`, width), padLine(` ${details}`, width), border];
-	}
-}