@oh-my-pi/pi-coding-agent 8.0.16 → 8.1.0

package/src/session/agent-storage.ts

@@ -116,8 +116,6 @@ export class AgentStorage {
 	private static instances = new Map<string, AgentStorage>();
 
 	private listSettingsStmt: Statement;
-	private insertSettingStmt: Statement;
-	private deleteSettingsStmt: Statement;
 	private getCacheStmt: Statement;
 	private upsertCacheStmt: Statement;
 	private deleteExpiredCacheStmt: Statement;
@@ -137,10 +135,6 @@ export class AgentStorage {
 		this.hardenPermissions(dbPath);
 
 		this.listSettingsStmt = this.db.prepare("SELECT key, value FROM settings");
-		this.insertSettingStmt = this.db.prepare(
-			"INSERT INTO settings (key, value, updated_at) VALUES (?, ?, unixepoch())",
-		);
-		this.deleteSettingsStmt = this.db.prepare("DELETE FROM settings");
 
 		this.getCacheStmt = this.db.prepare("SELECT value FROM cache WHERE key = ? AND expires_at > unixepoch()");
 		this.upsertCacheStmt = this.db.prepare(
@@ -264,20 +258,43 @@ CREATE TABLE settings (
 
 	/**
 	 * Returns singleton instance for the given database path, creating if needed.
+	 * Retries on SQLITE_BUSY with exponential backoff.
 	 * @param dbPath - Path to the SQLite database file (defaults to config path)
 	 * @returns AgentStorage instance for the given path
 	 */
-	static open(dbPath: string = getAgentDbPath()): AgentStorage {
+	static async open(dbPath: string = getAgentDbPath()): Promise<AgentStorage> {
 		const existing = AgentStorage.instances.get(dbPath);
 		if (existing) return existing;
-		const storage = new AgentStorage(dbPath);
-		AgentStorage.instances.set(dbPath, storage);
-		return storage;
+
+		const maxRetries = 3;
+		const baseDelayMs = 100;
+		let lastError: Error | undefined;
+
+		for (let attempt = 0; attempt < maxRetries; attempt++) {
+			try {
+				const storage = new AgentStorage(dbPath);
+				AgentStorage.instances.set(dbPath, storage);
+				return storage;
+			} catch (err) {
+				const isSqliteBusy = err && typeof err === "object" && (err as { code?: string }).code === "SQLITE_BUSY";
+				if (!isSqliteBusy) {
+					throw err;
+				}
+				lastError = err as Error;
+				const delayMs = baseDelayMs * 2 ** attempt;
+				await Bun.sleep(delayMs);
+			}
+		}
+
+		throw lastError ?? new Error("Failed to open database after retries");
 	}
 
 	/**
-	 * Retrieves all settings from storage.
+	 * Retrieves all settings from storage (legacy, for migration only).
+	 * Settings are now stored in config.yml. This method is only used
+	 * during migration from agent.db to config.yml.
 	 * @returns Settings object, or null if no settings are stored
+	 * @deprecated Use config.yml instead. This is only for migration.
 	 */
 	getSettings(): Settings | null {
 		const rows = (this.listSettingsStmt.all() as SettingsRow[]) ?? [];
@@ -297,26 +314,13 @@ CREATE TABLE settings (
 	}
 
 	/**
-	 * Atomically replaces all settings in storage.
-	 * Uses delete-then-insert within a transaction for consistency.
-	 * @param settings - Settings object to persist
+	 * @deprecated Settings are now stored in config.yml, not agent.db.
+	 * This method is kept for backward compatibility but does nothing.
 	 */
 	saveSettings(settings: Settings): void {
-		const entries = Object.entries(settings).filter(([, value]) => value !== undefined);
-		const replace = this.db.transaction((rows: Array<[string, unknown]>) => {
-			this.deleteSettingsStmt.run();
-			for (const [key, value] of rows) {
-				const serialized = JSON.stringify(value);
-				if (serialized === undefined) continue;
-				this.insertSettingStmt.run(key, serialized);
-			}
+		logger.warn("AgentStorage.saveSettings is deprecated - settings are now stored in config.yml", {
+			keys: Object.keys(settings),
 		});
-
-		try {
-			replace(entries);
-		} catch (error) {
-			logger.error("AgentStorage failed to save settings", { error: String(error) });
-		}
 	}
 
 	/**

package/src/session/artifacts.ts

@@ -18,6 +18,7 @@ export class ArtifactManager {
 	#nextId = 0;
 	readonly #dir: string;
 	#dirCreated = false;
+	#initialized = false;
 
 	/**
 	 * @param sessionFile Path to the session .jsonl file
@@ -40,6 +41,28 @@ export class ArtifactManager {
 			await mkdir(this.#dir, { recursive: true });
 			this.#dirCreated = true;
 		}
+		if (!this.#initialized) {
+			await this.#scanExistingIds();
+			this.#initialized = true;
+		}
+	}
+
+	/**
+	 * Scan existing artifact files to find the next available ID.
+	 * This ensures we don't overwrite artifacts when resuming a session.
+	 */
+	async #scanExistingIds(): Promise<void> {
+		const files = await this.listFiles();
+		let maxId = -1;
+		for (const file of files) {
+			// Files are named: {id}.{toolType}.log
+			const match = file.match(/^(\d+)\..*\.log$/);
+			if (match) {
+				const id = parseInt(match[1], 10);
+				if (id > maxId) maxId = id;
+			}
+		}
+		this.#nextId = maxId + 1;
 	}
 
 	/**
@@ -58,7 +81,7 @@ export class ArtifactManager {
 	async allocatePath(toolType: string): Promise<{ id: string; path: string }> {
 		await this.#ensureDir();
 		const id = String(this.allocateId());
-		const filename = `${id}.${toolType}.txt`;
+		const filename = `${id}.${toolType}.log`;
 		return { id, path: join(this.#dir, filename) };
 	}
 

package/src/session/auth-storage.ts

@@ -162,17 +162,14 @@ export class AuthStorage {
 	private usageLogger?: UsageLogger;
 	private fallbackResolver?: (provider: string) => string | undefined;
 
-	/**
-	 * @param authPath - Legacy auth.json path used for migration and locating agent.db
-	 * @param fallbackPaths - Additional auth.json paths to migrate (legacy support)
-	 */
-	constructor(
+	private constructor(
 		private authPath: string,
 		private fallbackPaths: string[] = [],
+		storage: AgentStorage,
 		options: AuthStorageOptions = {},
 	) {
 		this.dbPath = AuthStorage.resolveDbPath(authPath);
-		this.storage = AgentStorage.open(this.dbPath);
+		this.storage = storage;
 		this.usageProviderResolver = options.usageProviderResolver ?? resolveDefaultUsageProvider;
 		this.usageCache = options.usageCache ?? new AuthStorageUsageCache(this.storage);
 		this.usageFetch = options.usageFetch ?? fetch;
@@ -185,17 +182,35 @@ export class AuthStorage {
 			} satisfies UsageLogger);
 	}
 
+	/**
+	 * Create an AuthStorage instance.
+	 * @param authPath - Legacy auth.json path used for migration and locating agent.db
+	 * @param fallbackPaths - Additional auth.json paths to migrate (legacy support)
+	 */
+	static async create(
+		authPath: string,
+		fallbackPaths: string[] = [],
+		options: AuthStorageOptions = {},
+	): Promise<AuthStorage> {
+		const dbPath = AuthStorage.resolveDbPath(authPath);
+		const storage = await AgentStorage.open(dbPath);
+		return new AuthStorage(authPath, fallbackPaths, storage, options);
+	}
+
 	/**
 	 * Create an in-memory AuthStorage instance from serialized data.
 	 * Used by subagent workers to bypass discovery and use parent's credentials.
 	 */
-	static fromSerialized(data: SerializedAuthStorage, options: AuthStorageOptions = {}): AuthStorage {
-		const instance = Object.create(AuthStorage.prototype) as AuthStorage;
+	static async fromSerialized(data: SerializedAuthStorage, options: AuthStorageOptions = {}): Promise<AuthStorage> {
 		const authPath = data.authPath ?? data.dbPath ?? getAuthPath();
+		const dbPath = data.dbPath ?? AuthStorage.resolveDbPath(authPath);
+		const storage = await AgentStorage.open(dbPath);
+
+		const instance = Object.create(AuthStorage.prototype) as AuthStorage;
 		instance.authPath = authPath;
 		instance.fallbackPaths = [];
-		instance.dbPath = data.dbPath ?? AuthStorage.resolveDbPath(authPath);
-		instance.storage = AgentStorage.open(instance.dbPath);
+		instance.dbPath = dbPath;
+		instance.storage = storage;
 		instance.data = new Map();
 		instance.runtimeOverrides = new Map();
 		instance.providerRoundRobinIndex = new Map();

package/src/session/storage-migration.ts

@@ -1,11 +1,13 @@
 /**
- * Migrates legacy JSON storage (settings.json, auth.json) to SQLite-based agent.db.
- * Settings migrate only when the DB has no settings; auth merges per-provider when missing.
+ * Migrates legacy auth.json to SQLite-based agent.db.
+ * Auth credentials merge per-provider when missing.
  * Original JSON files are backed up to .bak and removed after successful migration.
+ *
+ * NOTE: Settings migration is now handled by SettingsManager.migrateToYaml(),
+ * which migrates from both settings.json and agent.db to config.yaml.
  */
 
 import { getAgentDbPath } from "@oh-my-pi/pi-coding-agent/config";
-import type { Settings } from "@oh-my-pi/pi-coding-agent/config/settings-manager";
 import { logger } from "@oh-my-pi/pi-utils";
 import { AgentStorage } from "./agent-storage";
 import type { AuthCredential, AuthCredentialEntry, AuthStorageData } from "./auth-storage";
@@ -14,7 +16,7 @@ import type { AuthCredential, AuthCredentialEntry, AuthStorageData } from "./aut
 type MigrationPaths = {
 	/** Directory containing agent.db */
 	agentDir: string;
-	/** Path to legacy settings.json file */
+	/** Path to legacy settings.json file (kept for API compatibility, no longer used) */
 	settingsPath: string;
 	/** Candidate paths to search for auth.json (checked in order) */
 	authPaths: string[];
@@ -22,7 +24,7 @@ type MigrationPaths = {
 
 /** Result of the JSON-to-SQLite storage migration. */
 export interface StorageMigrationResult {
-	/** Whether settings.json was migrated to agent.db */
+	/** Whether settings.json was migrated (always false - settings migration is handled elsewhere) */
 	migratedSettings: boolean;
 	/** Whether auth.json was migrated to agent.db */
 	migratedAuth: boolean;
@@ -39,20 +41,6 @@ function isRecord(value: unknown): value is Record<string, unknown> {
 	return !!value && typeof value === "object" && !Array.isArray(value);
 }
 
-/**
- * Transforms legacy settings to current schema (e.g., queueMode -> steeringMode).
- * @param settings - Settings object potentially containing deprecated keys
- * @returns Settings with deprecated keys renamed to current equivalents
- */
-function migrateLegacySettings(settings: Settings): Settings {
-	const migrated = { ...settings } as Record<string, unknown>;
-	if ("queueMode" in migrated && !("steeringMode" in migrated)) {
-		migrated.steeringMode = migrated.queueMode;
-		delete migrated.queueMode;
-	}
-	return migrated as Settings;
-}
-
 /**
  * Normalizes credential entries to array format (legacy stored single credentials).
  * @param entry - Single credential or array of credentials
@@ -99,32 +87,6 @@ async function backupJson(path: string): Promise<void> {
 	}
 }
 
-/**
- * Migrates settings.json to SQLite storage if DB is empty.
- * @param storage - AgentStorage instance to migrate into
- * @param settingsPath - Path to legacy settings.json
- * @param warnings - Array to collect non-fatal warnings
- * @returns True if migration was performed
- */
-async function migrateSettings(storage: AgentStorage, settingsPath: string, warnings: string[]): Promise<boolean> {
-	const settingsFile = Bun.file(settingsPath);
-	const settingsExists = await settingsFile.exists();
-	const hasDbSettings = storage.getSettings() !== null;
-
-	if (!settingsExists) return false;
-	if (hasDbSettings) {
-		warnings.push(`settings.json exists but agent.db is authoritative: ${settingsPath}`);
-		return false;
-	}
-
-	const settingsJson = await readJsonFile<Settings>(settingsPath);
-	if (!settingsJson) return false;
-
-	storage.saveSettings(migrateLegacySettings(settingsJson));
-	await backupJson(settingsPath);
-	return true;
-}
-
 /**
  * Finds the first valid auth.json from candidate paths (checked in priority order).
  * @param authPaths - Candidate paths to search (e.g., project-local before global)
@@ -191,19 +153,16 @@ async function migrateAuth(storage: AgentStorage, authPaths: string[], warnings:
 }
 
 /**
- * Migrates legacy JSON files (settings.json, auth.json) to SQLite-based agent.db.
- * Settings migrate only when the DB has no settings; auth merges per-provider when missing.
+ * Migrates legacy auth.json to SQLite-based agent.db.
+ * Settings migration is handled separately by SettingsManager.migrateToYaml().
  * @param paths - Configuration specifying locations of legacy files and target DB
  * @returns Result indicating what was migrated and any warnings encountered
  */
 export async function migrateJsonStorage(paths: MigrationPaths): Promise<StorageMigrationResult> {
-	const storage = AgentStorage.open(getAgentDbPath(paths.agentDir));
+	const storage = await AgentStorage.open(getAgentDbPath(paths.agentDir));
 	const warnings: string[] = [];
 
-	const [migratedSettings, migratedAuth] = await Promise.all([
-		migrateSettings(storage, paths.settingsPath, warnings),
-		migrateAuth(storage, paths.authPaths, warnings),
-	]);
+	const migratedAuth = await migrateAuth(storage, paths.authPaths, warnings);
 
 	if (warnings.length > 0) {
 		for (const warning of warnings) {
@@ -211,5 +170,5 @@ export async function migrateJsonStorage(paths: MigrationPaths): Promise<Storage
 		}
 	}
 
-	return { migratedSettings, migratedAuth, warnings };
+	return { migratedSettings: false, migratedAuth, warnings };
 }

package/src/system-prompt.ts

@@ -13,7 +13,7 @@ import {
 	type ContextFile,
 	loadCapability,
 	type SystemPrompt as SystemPromptFile,
-} from "@oh-my-pi/pi-coding-agent/discovery/index";
+} from "@oh-my-pi/pi-coding-agent/discovery";
 import { loadSkills, type Skill } from "@oh-my-pi/pi-coding-agent/extensibility/skills";
 import customSystemPromptTemplate from "@oh-my-pi/pi-coding-agent/prompts/system/custom-system-prompt.md" with {
 	type: "text",
@@ -21,7 +21,7 @@ import customSystemPromptTemplate from "@oh-my-pi/pi-coding-agent/prompts/system
 import systemPromptTemplate from "@oh-my-pi/pi-coding-agent/prompts/system/system-prompt.md" with { type: "text" };
 import { $ } from "bun";
 import chalk from "chalk";
-import type { ToolName } from "./tools/index";
+import type { ToolName } from "./tools";
 
 interface GitContext {
 	isRepo: boolean;

package/src/task/executor.ts

@@ -9,7 +9,7 @@ import type { AgentEvent, ThinkingLevel } from "@oh-my-pi/pi-agent-core";
 import type { ModelRegistry } from "@oh-my-pi/pi-coding-agent/config/model-registry";
 import { formatModelString, parseModelPattern } from "@oh-my-pi/pi-coding-agent/config/model-resolver";
 import { checkPythonKernelAvailability } from "@oh-my-pi/pi-coding-agent/ipy/kernel";
-import { LspTool } from "@oh-my-pi/pi-coding-agent/lsp/index";
+import { LspTool } from "@oh-my-pi/pi-coding-agent/lsp";
 import type { LspParams } from "@oh-my-pi/pi-coding-agent/lsp/types";
 import { callTool } from "@oh-my-pi/pi-coding-agent/mcp/client";
 import type { MCPManager } from "@oh-my-pi/pi-coding-agent/mcp/manager";

package/src/task/index.ts

@@ -21,6 +21,7 @@ import type { Usage } from "@oh-my-pi/pi-ai";
 import { renderPromptTemplate } from "@oh-my-pi/pi-coding-agent/config/prompt-templates";
 import type { Theme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
 import taskDescriptionTemplate from "@oh-my-pi/pi-coding-agent/prompts/tools/task.md" with { type: "text" };
+import { AgentOutputManager } from "@oh-my-pi/pi-coding-agent/task/output-manager";
 import { formatDuration } from "@oh-my-pi/pi-coding-agent/tools/render-utils";
 import { $ } from "bun";
 import { nanoid } from "nanoid";
@@ -101,6 +102,7 @@ function addUsageTotals(target: Usage, usage: Partial<Usage>): void {
 export { loadBundledAgents as BUNDLED_AGENTS } from "./agents";
 export { discoverCommands, expandCommand, getCommand } from "./commands";
 export { discoverAgents, getAgent } from "./discovery";
+export { AgentOutputManager } from "./output-manager";
 export type { AgentDefinition, AgentProgress, SingleResult, TaskParams, TaskToolDetails } from "./types";
 export { taskSchema } from "./types";
 
@@ -367,7 +369,14 @@ export class TaskTool implements AgentTool<typeof taskSchema, TaskToolDetails, T
 			}
 
 			// Build full prompts with context prepended
-			const tasksWithContext = tasks.map((t) => renderTemplate(context, t));
+			// Allocate unique IDs across the session to prevent artifact collisions
+			const outputManager =
+				this.session.agentOutputManager ?? new AgentOutputManager(this.session.getArtifactsDir ?? (() => null));
+			const uniqueIds = await outputManager.allocateBatch(tasks.map((t) => t.id));
+			const tasksWithUniqueIds = tasks.map((t, i) => ({ ...t, id: uniqueIds[i] }));
+
+			// Build full prompts with context prepended
+			const tasksWithContext = tasksWithUniqueIds.map((t) => renderTemplate(context, t));
 
 			// Initialize progress for all tasks
 			for (let i = 0; i < tasksWithContext.length; i++) {

package/src/task/output-manager.ts

@@ -0,0 +1,94 @@
+/**
+ * Session-scoped manager for agent output IDs.
+ *
+ * Ensures unique output IDs across task tool invocations within a session.
+ * Prefixes each ID with a sequential number (e.g., "0-AuthProvider", "1-AuthApi").
+ *
+ * This enables reliable agent:// URL resolution and prevents artifact collisions.
+ */
+
+import { readdir } from "node:fs/promises";
+
+/**
+ * Manages agent output ID allocation to ensure uniqueness.
+ *
+ * Each allocated ID gets a numeric prefix based on allocation order.
+ * On resume, scans existing files to find the next available index.
+ */
+export class AgentOutputManager {
+	#nextId = 0;
+	#initialized = false;
+	readonly #getArtifactsDir: () => string | null;
+
+	constructor(getArtifactsDir: () => string | null) {
+		this.#getArtifactsDir = getArtifactsDir;
+	}
+
+	/**
+	 * Scan existing agent output files to find the next available ID.
+	 * This ensures we don't overwrite outputs when resuming a session.
+	 */
+	async #ensureInitialized(): Promise<void> {
+		if (this.#initialized) return;
+		this.#initialized = true;
+
+		const dir = this.#getArtifactsDir();
+		if (!dir) return;
+
+		let files: string[];
+		try {
+			files = await readdir(dir);
+		} catch {
+			return; // Directory doesn't exist yet
+		}
+
+		let maxId = -1;
+		for (const file of files) {
+			// Agent outputs are named: {index}-{id}.md (e.g., "0-AuthProvider.md")
+			const match = file.match(/^(\d+)-.*\.md$/);
+			if (match) {
+				const id = parseInt(match[1], 10);
+				if (id > maxId) maxId = id;
+			}
+		}
+		this.#nextId = maxId + 1;
+	}
+
+	/**
+	 * Allocate a unique ID with numeric prefix.
+	 *
+	 * @param id Requested ID (e.g., "AuthProvider")
+	 * @returns Unique ID with prefix (e.g., "0-AuthProvider")
+	 */
+	async allocate(id: string): Promise<string> {
+		await this.#ensureInitialized();
+		return `${this.#nextId++}-${id}`;
+	}
+
+	/**
+	 * Allocate unique IDs for a batch of tasks.
+	 *
+	 * @param ids Array of requested IDs
+	 * @returns Array of unique IDs in same order
+	 */
+	async allocateBatch(ids: string[]): Promise<string[]> {
+		await this.#ensureInitialized();
+		return ids.map((id) => `${this.#nextId++}-${id}`);
+	}
+
+	/**
+	 * Get the next ID that would be allocated (without allocating).
+	 */
+	async peekNextIndex(): Promise<number> {
+		await this.#ensureInitialized();
+		return this.#nextId;
+	}
+
+	/**
+	 * Reset state (primarily for testing).
+	 */
+	reset(): void {
+		this.#nextId = 0;
+		this.#initialized = false;
+	}
+}

package/src/task/render.ts

@@ -23,6 +23,7 @@ import {
 	type ReportFindingDetails,
 	type SubmitReviewDetails,
 } from "@oh-my-pi/pi-coding-agent/tools/review";
+import { renderStatusLine } from "@oh-my-pi/pi-coding-agent/tui";
 import type { Component } from "@oh-my-pi/pi-tui";
 import { Container, Text } from "@oh-my-pi/pi-tui";
 import { subprocessToolRegistry } from "./subprocess-tool-registry";
@@ -229,7 +230,7 @@ function renderOutputSection(
 	maxExpanded = 10,
 ): string[] {
 	const lines: string[] = [];
-	const trimmedOutput = output.trim();
+	const trimmedOutput = output.trimEnd();
 	if (!trimmedOutput) return lines;
 
 	if (trimmedOutput.startsWith("{") || trimmedOutput.startsWith("[")) {
@@ -261,7 +262,7 @@ function renderOutputSection(
 
 	lines.push(`${continuePrefix}${theme.fg("dim", "Output")}`);
 
-	const outputLines = output.split("\n").filter((line) => line.trim());
+	const outputLines = output.trimEnd().split("\n");
 	const previewCount = expanded ? maxExpanded : maxCollapsed;
 	for (const line of outputLines.slice(0, previewCount)) {
 		lines.push(`${continuePrefix}  ${theme.fg("dim", truncate(line, 70, theme.format.ellipsis))}`);
@@ -395,13 +396,8 @@ function renderArgsSection(
  * Render the tool call arguments.
  */
 export function renderCall(args: TaskParams, theme: Theme): Component {
-	const label = theme.fg("toolTitle", theme.bold("Task"));
-	const agentTag = theme.italic(
-		theme.fg("dim", `${theme.format.bracketLeft}${args.agent}${theme.format.bracketRight}`),
-	);
-
 	const lines: string[] = [];
-	lines.push(`${label} ${agentTag}`);
+	lines.push(renderStatusLine({ icon: "pending", title: "Task", description: args.agent }, theme));
 
 	const contextTemplate = args.context ?? "";
 	const context = contextTemplate.trim();
@@ -734,13 +730,12 @@ function renderAgentResult(result: SingleResult, isLast: boolean, expanded: bool
 			if (handler?.renderFinal && (dataArray as unknown[]).length > 0) {
 				hasCustomRendering = true;
 				const component = handler.renderFinal(dataArray as unknown[], theme, expanded);
+				lines.push(`${continuePrefix}${theme.fg("dim", `Tool: ${toolName}`)}`);
 				if (component instanceof Text) {
 					// Prefix each line with continuePrefix
 					const text = component.getText();
 					for (const line of text.split("\n")) {
-						if (line.trim()) {
-							lines.push(`${continuePrefix}${line}`);
-						}
+						lines.push(`${continuePrefix}${line}`);
 					}
 				} else if (component instanceof Container) {
 					// For containers, render each child
@@ -845,7 +840,7 @@ export function renderResult(
 		}
 	}
 
-	const indented = lines.map((line) => (line.trim() ? `   ${line}` : ""));
+	const indented = lines.map((line) => (line.length > 0 ? `   ${line}` : ""));
 	return new Text(indented.join("\n"), 0, 0);
 }
 

package/src/task/worker.ts

@@ -552,7 +552,7 @@ async function runTask(runState: RunState, payload: SubagentWorkerStartPayload):
 		let modelRegistry: ModelRegistry;
 
 		if (payload.serializedAuth && payload.serializedModels) {
-			authStorage = AuthStorage.fromSerialized(payload.serializedAuth);
+			authStorage = await AuthStorage.fromSerialized(payload.serializedAuth);
 			modelRegistry = ModelRegistry.fromSerialized(payload.serializedModels, authStorage);
 		} else {
 			authStorage = await discoverAuthStorage();

package/src/tools/ask.ts

@@ -20,10 +20,11 @@ import { renderPromptTemplate } from "@oh-my-pi/pi-coding-agent/config/prompt-te
 import type { RenderResultOptions } from "@oh-my-pi/pi-coding-agent/extensibility/custom-tools/types";
 import { type Theme, theme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
 import askDescription from "@oh-my-pi/pi-coding-agent/prompts/tools/ask.md" with { type: "text" };
+import { renderStatusLine } from "@oh-my-pi/pi-coding-agent/tui";
 import type { Component } from "@oh-my-pi/pi-tui";
 import { Text } from "@oh-my-pi/pi-tui";
 import { Type } from "@sinclair/typebox";
-import type { ToolSession } from "./index";
+import type { ToolSession } from ".";
 import { ToolUIKit } from "./render-utils";
 
 // =============================================================================
@@ -381,36 +382,56 @@ export const askToolRenderer = {
 		const { details } = result;
 		if (!details) {
 			const txt = result.content[0];
-			return new Text(txt?.type === "text" && txt.text ? txt.text : "", 0, 0);
+			const fallback = txt?.type === "text" && txt.text ? txt.text : "";
+			const header = renderStatusLine({ icon: "warning", title: "Ask" }, uiTheme);
+			return new Text([header, uiTheme.fg("dim", fallback)].join("\n"), 0, 0);
 		}
 
 		// Multi-part results
 		if (details.results && details.results.length > 0) {
 			const lines: string[] = [];
-
-			for (const r of details.results) {
+			const hasAnySelection = details.results.some(
+				(r) => r.customInput || (r.selectedOptions && r.selectedOptions.length > 0),
+			);
+			const header = renderStatusLine(
+				{
+					icon: hasAnySelection ? "success" : "warning",
+					title: "Ask",
+					meta: [`${details.results.length} questions`],
+				},
+				uiTheme,
+			);
+			lines.push(header);
+
+			for (let i = 0; i < details.results.length; i++) {
+				const r = details.results[i];
+				const isLastQuestion = i === details.results.length - 1;
+				const branch = isLastQuestion ? uiTheme.tree.last : uiTheme.tree.branch;
+				const continuation = isLastQuestion ? "   " : `${uiTheme.fg("dim", uiTheme.tree.vertical)}  `;
 				const hasSelection = r.customInput || r.selectedOptions.length > 0;
 				const statusIcon = hasSelection
 					? uiTheme.styledSymbol("status.success", "success")
 					: uiTheme.styledSymbol("status.warning", "warning");
 
-				lines.push(`${statusIcon} ${uiTheme.fg("dim", `[${r.id}]`)} ${uiTheme.fg("accent", r.question)}`);
+				lines.push(
+					` ${uiTheme.fg("dim", branch)} ${statusIcon} ${uiTheme.fg("dim", `[${r.id}]`)} ${uiTheme.fg("accent", r.question)}`,
+				);
 
 				if (r.customInput) {
 					lines.push(
-						` ${uiTheme.fg("dim", uiTheme.tree.last)} ${uiTheme.styledSymbol("status.success", "success")} ${uiTheme.fg("toolOutput", r.customInput)}`,
+						`${continuation}${uiTheme.fg("dim", uiTheme.tree.last)} ${uiTheme.styledSymbol("status.success", "success")} ${uiTheme.fg("toolOutput", r.customInput)}`,
 					);
 				} else if (r.selectedOptions.length > 0) {
 					for (let j = 0; j < r.selectedOptions.length; j++) {
 						const isLast = j === r.selectedOptions.length - 1;
-						const branch = isLast ? uiTheme.tree.last : uiTheme.tree.branch;
+						const optBranch = isLast ? uiTheme.tree.last : uiTheme.tree.branch;
 						lines.push(
-							` ${uiTheme.fg("dim", branch)} ${uiTheme.fg("success", uiTheme.checkbox.checked)} ${uiTheme.fg("toolOutput", r.selectedOptions[j])}`,
+							`${continuation}${uiTheme.fg("dim", optBranch)} ${uiTheme.fg("success", uiTheme.checkbox.checked)} ${uiTheme.fg("toolOutput", r.selectedOptions[j])}`,
 						);
 					}
 				} else {
 					lines.push(
-						` ${uiTheme.fg("dim", uiTheme.tree.last)} ${uiTheme.styledSymbol("status.warning", "warning")} ${uiTheme.fg("warning", "Cancelled")}`,
+						`${continuation}${uiTheme.fg("dim", uiTheme.tree.last)} ${uiTheme.styledSymbol("status.warning", "warning")} ${uiTheme.fg("warning", "Cancelled")}`,
 					);
 				}
 			}
@@ -425,11 +446,12 @@ export const askToolRenderer = {
 		}
 
 		const hasSelection = details.customInput || (details.selectedOptions && details.selectedOptions.length > 0);
-		const statusIcon = hasSelection
-			? uiTheme.styledSymbol("status.success", "success")
-			: uiTheme.styledSymbol("status.warning", "warning");
+		const header = renderStatusLine(
+			{ icon: hasSelection ? "success" : "warning", title: "Ask", description: details.question },
+			uiTheme,
+		);
 
-		let text = `${statusIcon} ${uiTheme.fg("accent", details.question)}`;
+		let text = header;
 
 		if (details.customInput) {
 			text += `\n ${uiTheme.fg("dim", uiTheme.tree.last)} ${uiTheme.styledSymbol("status.success", "success")} ${uiTheme.fg("toolOutput", details.customInput)}`;