@oh-my-pi/pi-coding-agent 16.0.2 → 16.0.3

package/src/modes/theme/theme.ts

@@ -2761,6 +2761,18 @@ export function getMarkdownTheme(): MarkdownTheme {
 	if (cachedMarkdownTheme !== undefined && cachedMarkdownThemeRef === theme) {
 		return cachedMarkdownTheme;
 	}
+	// Mermaid ASCII diagrams render with the active palette so they read as
+	// content rather than raw monochrome. Roles mirror the SVG renderer's
+	// mapping; `text`/`muted`/`border`/`borderMuted`/`accent` exist in every theme.
+	const mermaidColorMode = theme.getColorMode() === "truecolor" ? "truecolor" : "ansi256";
+	const mermaidTheme = {
+		fg: theme.getColorHex("text"),
+		border: theme.getColorHex("border"),
+		line: theme.getColorHex("muted"),
+		arrow: theme.getColorHex("accent"),
+		corner: theme.getColorHex("muted"),
+		junction: theme.getColorHex("borderMuted"),
+	};
 	const markdownTheme: MarkdownTheme = {
 		heading: (text: string) => theme.fg("mdHeading", text),
 		link: (text: string) => theme.fg("mdLink", text),
@@ -2777,7 +2789,8 @@ export function getMarkdownTheme(): MarkdownTheme {
 		underline: (text: string) => theme.underline(text),
 		strikethrough: (text: string) => chalk.strikethrough(text),
 		symbols: getSymbolTheme(),
-		resolveMermaidAscii,
+		resolveMermaidAscii: (source, maxWidth) =>
+			resolveMermaidAscii(source, { maxWidth, theme: mermaidTheme, colorMode: mermaidColorMode }),
 		highlightCode: (code: string, lang?: string): string[] => {
 			const validLang = lang && nativeSupportsLanguage(lang) ? lang : undefined;
 			const highlighted = highlightCached(code, validLang, theme);

package/src/modes/types.ts

@@ -282,7 +282,7 @@ export interface InteractiveModeContext {
 	handleHotkeysCommand(): void;
 	handleToolsCommand(): void;
 	handleContextCommand(): void;
-	handleDumpCommand(isRaw?: boolean): void;
+	handleDumpCommand(): void;
 	handleAdvisorDumpCommand(isRaw?: boolean): void;
 	handleDebugTranscriptCommand(): Promise<void>;
 	handleClearCommand(): Promise<void>;

package/src/prompts/system/system-prompt.md

@@ -13,6 +13,8 @@ You are a helpful assistant the team trusts with load-bearing changes, operating
 - You have agency and taste: you delete code that isn't pulling its weight, refuse abstractions that are unnecessary, and prefer boring when it's called for; but when you design thoroughly, you do so elegantly and efficiently.
 - Consider what code compiles to. NEVER allocate even a simple string when avoidable. No copies, no expensive computations unless absolutely necessary.
 - You are not alone in this repository. You SHOULD treat unexpected changes as the user's work and adapt.
+- In user-visible terminal prose and final chat, you MAY use LaTeX math delimiters (such as $ or $$) and LaTeX math commands (such as \text, \times) to format equations, as well as  (`\textcolor`, `\colorbox`, `\fcolorbox`) to colorize the output.
+- To show the user a diagram (flowchart, sequence, state, ER, etc.), you MAY emit a fenced ` ```mermaid ` code block in your final chat — the terminal renders Mermaid source as an ASCII diagram. Keep it for genuine structure/flow; prefer prose for trivial points.
 
 TOOLS
 ===================================
@@ -29,7 +31,6 @@ Use tools whenever they materially improve correctness, completeness, or groundi
 {{#if intentTracing}}- Most tools have a `{{intentField}}` parameter. Fill it with a concise intent in present participle form, 2-6 words, no period, capitalized.{{/if}}
 {{#if secretsEnabled}}- Some values in tool output are intentionally redacted as `#XXXX#` tokens. Treat them as opaque strings.{{/if}}
 {{#has tools "inspect_image"}}- For image understanding tasks you SHOULD use `{{toolRefs.inspect_image}}` over `{{toolRefs.read}}` to avoid overloading session context.{{/has}}
-- In user-visible terminal prose and final chat, avoid LaTeX math delimiters (such as $ or $$) and LaTeX math commands (such as \text, \times) — the terminal cannot render them. Write equations in plain text / Unicode instead (e.g. BMR = 370 + (21.6 × 63.87) = 1,750 kcal). This does NOT apply to tool output or LaTeX/Markdown/KaTeX content you are asked to write to files.
 
 # Tool Priority
 You MUST use the specialized tool over its shell equivalent:

package/src/registry/agent-lifecycle.ts

@@ -12,10 +12,19 @@
 
 import { logger } from "@oh-my-pi/pi-utils";
 import type { AgentSession } from "../session/agent-session";
-import { AgentRegistry, MAIN_AGENT_ID, type RegistryEvent } from "./agent-registry";
+import { type AgentRef, AgentRegistry, MAIN_AGENT_ID, type RegistryEvent } from "./agent-registry";
 
 export type AgentReviver = () => Promise<AgentSession>;
 
+/**
+ * Builds a reviver for a `parked` ref restored from disk (Agent Hub scan,
+ * collab mirror, resumed process) that carries a sessionFile but no in-memory
+ * adoption. Returns undefined when the ref cannot be faithfully rebuilt (no
+ * persisted session contract, or its workspace is gone). Injected from the
+ * top-level session so this manager stays free of sdk/SessionManager imports.
+ */
+export type PersistedSubagentReviverFactory = (ref: AgentRef) => Promise<AgentReviver | undefined>;
+
 export interface AdoptOptions {
 	/** TTL before an idle agent is parked. <= 0 disables parking. */
 	idleTtlMs: number;
@@ -51,6 +60,7 @@ export class AgentLifecycleManager {
 			current.#adopted.clear();
 			current.#revivals.clear();
 			current.#parking.clear();
+			current.#persistedReviverFactory = undefined;
 		}
 		AgentLifecycleManager.#global = undefined;
 	}
@@ -62,12 +72,26 @@ export class AgentLifecycleManager {
 	/** In-flight revives, so concurrent {@link ensureLive} calls coalesce. */
 	readonly #revivals = new Map<string, Promise<AgentSession>>();
 	#unsubscribe: (() => void) | undefined;
+	#persistedReviverFactory: PersistedSubagentReviverFactory | undefined;
+	/** TTL applied when a cold-revived ref is adopted on demand. */
+	#persistedReviveTtlMs = 0;
 
 	constructor(registry: AgentRegistry = AgentRegistry.global()) {
 		this.#registry = registry;
 		this.#unsubscribe = registry.onChange(event => this.#onRegistryEvent(event));
 	}
 
+	/**
+	 * Install the factory used to cold-revive `parked` refs restored from disk
+	 * (Agent Hub scan, collab mirror, resumed process) — they carry a sessionFile
+	 * but no adoption. Set by the top-level session, which owns the ambient deps
+	 * (auth, models, MCP, artifacts) the factory needs at revive time.
+	 */
+	setPersistedSubagentReviverFactory(factory: PersistedSubagentReviverFactory, idleTtlMs: number): void {
+		this.#persistedReviverFactory = factory;
+		this.#persistedReviveTtlMs = idleTtlMs;
+	}
+
 	/**
 	 * Take ownership of a finished subagent. Caller has already set registry
 	 * status to "idle". Arms the TTL timer (idleTtlMs <= 0 adopts without one).
@@ -137,13 +161,7 @@ export class AgentLifecycleManager {
 		if (ref.session) return ref.session;
 		const inflight = this.#revivals.get(id);
 		if (inflight) return inflight;
-		const adopted = this.#adopted.get(id);
-		if (ref.status !== "parked" || !adopted?.revive) {
-			throw new Error(
-				`Agent "${id}" is ${ref.status} and cannot be revived${adopted?.revive ? "" : " (no reviver registered)"}. Its transcript remains readable at history://${id}.`,
-			);
-		}
-		const revival = this.#revive(id, adopted.revive, ref.sessionFile);
+		const revival = this.#resolveAndRevive(id, ref);
 		this.#revivals.set(id, revival);
 		try {
 			return await revival;
@@ -152,6 +170,39 @@ export class AgentLifecycleManager {
 		}
 	}
 
+	/**
+	 * Resolve a reviver and bring the agent back to a live session. A ref
+	 * restored from disk is `parked` with a sessionFile but no in-memory
+	 * adoption; build a reviver via the injected persisted-subagent factory and
+	 * adopt it so the agent rejoins the normal idle↔parked lifecycle. Throws
+	 * when the agent is not revivable or no reviver can be produced.
+	 */
+	async #resolveAndRevive(id: string, ref: AgentRef): Promise<AgentSession> {
+		let revive = this.#adopted.get(id)?.revive;
+		let coldAdopted = false;
+		if (!revive && ref.status === "parked" && ref.sessionFile && this.#persistedReviverFactory) {
+			revive = await this.#persistedReviverFactory(ref);
+			if (revive) {
+				this.#adopted.set(id, { idleTtlMs: this.#persistedReviveTtlMs, revive });
+				coldAdopted = true;
+			}
+		}
+		if (ref.status !== "parked" || !revive) {
+			throw new Error(
+				`Agent "${id}" is ${ref.status} and cannot be revived${revive ? "" : " (no reviver registered)"}. Its transcript remains readable at history://${id}.`,
+			);
+		}
+		try {
+			return await this.#revive(id, revive, ref.sessionFile);
+		} catch (error) {
+			// A failed cold revive (stale ctx, missing cwd, bad MCP) must not leave a
+			// poisoned reviver stuck in #adopted — drop it so a later ensureLive
+			// rebuilds via the factory (which may have fresher context by then).
+			if (coldAdopted) this.#adopted.delete(id);
+			throw error;
+		}
+	}
+
 	/** Hard removal: dispose if live, unregister from registry, drop timers. */
 	async release(id: string): Promise<void> {
 		const adopted = this.#adopted.get(id);
@@ -176,6 +227,7 @@ export class AgentLifecycleManager {
 		await Promise.all(ids.map(id => this.release(id)));
 		this.#revivals.clear();
 		this.#parking.clear();
+		this.#persistedReviverFactory = undefined;
 	}
 
 	async #revive(id: string, revive: AgentReviver, sessionFile: string | null): Promise<AgentSession> {

package/src/sdk.ts

@@ -21,7 +21,6 @@ import {
 	getOpenAICodexTransportDetails,
 	prewarmOpenAICodexResponses,
 } from "@oh-my-pi/pi-ai/providers/openai-codex-responses";
-import { DEFAULT_MODEL_PER_PROVIDER } from "@oh-my-pi/pi-catalog/provider-models";
 import type { Component } from "@oh-my-pi/pi-tui";
 import {
 	$env,
@@ -49,6 +48,7 @@ import {
 	getModelMatchPreferences,
 	parseModelPattern,
 	parseModelString,
+	pickDefaultAvailableModel,
 	resolveAllowedModels,
 	resolveModelRoleValue,
 } from "./config/model-resolver";
@@ -507,6 +507,14 @@ export interface CreateAgentSessionOptions {
 	agentRegistry?: AgentRegistry;
 	/** Parent task ID prefix for nested artifact naming (e.g., "Extensions") */
 	parentTaskPrefix?: string;
+	/**
+	 * Registry id of the spawning agent, recorded as this subagent's parent in
+	 * the agent registry. Distinct from `parentTaskPrefix`, which is this agent's
+	 * own artifact/output-id prefix (the executor passes the child's own id
+	 * there, so it must never double as the parent link). Undefined for the
+	 * top-level "Main" session, which has no parent.
+	 */
+	parentAgentId?: string;
 	/** Inherited eval executor session id for subagents sharing parent eval state. */
 	parentEvalSessionId?: string;
 
@@ -1928,29 +1936,9 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 			// Re-resolve the allowed set: extension factories above may have
 			// registered providers/models that weren't visible at startup.
 			const fallbackCandidates = await resolveAllowedModels(modelRegistry, settings, modelMatchPreferences);
-			// Prefer each provider's configured default model
-			// (DEFAULT_MODEL_PER_PROVIDER) over raw catalog order. Without this the
-			// first-run fallback picks whatever model sorts first in models.json for
-			// the winning provider (e.g. anthropic's claude-3-5-sonnet-20240620)
-			// instead of the intended provider default (claude-sonnet-4-6). Mirrors
-			// findInitialModel's precedence.
-			for (const [provider, defaultId] of Object.entries(DEFAULT_MODEL_PER_PROVIDER)) {
-				const preferred = fallbackCandidates.find(
-					candidate => candidate.provider === provider && candidate.id === defaultId,
-				);
-				if (preferred && hasModelAuth(preferred)) {
-					model = preferred;
-					break;
-				}
-			}
-			// Otherwise, first available model with a valid API key.
-			if (!model) {
-				for (const candidate of fallbackCandidates) {
-					if (hasModelAuth(candidate)) {
-						model = candidate;
-						break;
-					}
-				}
+			const defaultModel = pickDefaultAvailableModel(fallbackCandidates.filter(hasModelAuth));
+			if (defaultModel) {
+				model = defaultModel;
 			}
 			if (model) {
 				if (modelFallbackMessage) {
@@ -2020,7 +2008,13 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 				return { definition, extensionPath: "<sdk>" };
 			}) ?? []),
 		];
-		const wrappedExtensionTools: Tool[] = wrapRegisteredTools(allCustomTools, extensionRunner);
+		// `wrapToolWithMetaNotice` runs the centralized large-output → artifact spill.
+		// Built-in tools get it in `createTools`; extension, SDK-custom, image-gen,
+		// TTS, and startup (non-deferred) MCP tools all funnel through here, so apply
+		// it once at this adapter boundary (idempotent — a no-op if already wrapped).
+		const wrappedExtensionTools: Tool[] = wrapRegisteredTools(allCustomTools, extensionRunner).map(
+			wrapToolWithMetaNotice,
+		);
 
 		// All built-in tools are active (conditional tools like git/ask return null from factory if disabled)
 		const toolRegistry = new Map<string, Tool>();
@@ -2338,7 +2332,7 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 			id: resolvedAgentId,
 			displayName: resolvedAgentDisplayName,
 			kind: agentKind,
-			parentId: options.parentTaskPrefix,
+			parentId: options.parentAgentId,
 			session: null,
 			sessionFile: sessionManager.getSessionFile() ?? null,
 			status: "running",