@selesai/code 0.3.0 → 0.3.1

package/dist/extensions/pi-subagents/src/slash/prompt-workflows.ts

@@ -0,0 +1,330 @@
+import * as fs from "node:fs";
+import * as path from "node:path";
+import { fileURLToPath } from "node:url";
+import type { ExtensionAPI, ExtensionContext } from "@selesai/code";
+import { parseFrontmatter } from "../agents/frontmatter.ts";
+import type { SubagentParamsLike } from "../runs/foreground/subagent-executor.ts";
+import type { ChainStep } from "../shared/settings.ts";
+import { getAgentDir, getProjectConfigDir } from "../shared/utils.ts";
+
+interface PromptWorkflow {
+	name: string;
+	description: string;
+	body: string;
+	filePath: string;
+	agent: string;
+	context?: "fresh" | "fork";
+	model?: string;
+	skill?: string | string[] | false;
+	cwd?: string;
+	worktree?: boolean;
+	chain?: string;
+}
+
+type PromptWorkflowRunner = (params: SubagentParamsLike, ctx: ExtensionContext) => Promise<void>;
+
+const RESERVED_COMMAND_NAMES = new Set([
+	"chain-prompts",
+	"prompt-workflow",
+	"run",
+	"chain",
+	"parallel",
+	"run-chain",
+	"subagents-doctor",
+	"subagents-models",
+]);
+
+function packagePromptsDir(): string {
+	return path.resolve(path.dirname(fileURLToPath(import.meta.url)), "..", "..", "prompts");
+}
+
+function promptDirs(cwd: string): string[] {
+	return [
+		packagePromptsDir(),
+		path.join(getAgentDir(), "prompts"),
+		path.join(getProjectConfigDir(cwd), "prompts"),
+	];
+}
+
+function readPromptFiles(cwd: string): string[] {
+	const files: string[] = [];
+	for (const dir of promptDirs(cwd)) {
+		let entries: fs.Dirent[];
+		try {
+			entries = fs.readdirSync(dir, { withFileTypes: true });
+		} catch {
+			continue;
+		}
+		for (const entry of entries) {
+			if (entry.isFile() && entry.name.endsWith(".md")) files.push(path.join(dir, entry.name));
+		}
+	}
+	return files;
+}
+
+function firstNonEmptyLine(value: string): string {
+	return value.split(/\r?\n/).map((line) => line.trim()).find(Boolean) ?? "Prompt workflow";
+}
+
+function stringField(frontmatter: Record<string, string>, key: string): string | undefined {
+	const value = frontmatter[key]?.trim();
+	return value ? value : undefined;
+}
+
+function booleanField(frontmatter: Record<string, string>, key: string): boolean | undefined {
+	const value = frontmatter[key]?.trim().toLowerCase();
+	if (value === "true" || value === "yes" || value === "1") return true;
+	if (value === "false" || value === "no" || value === "0") return false;
+	return undefined;
+}
+
+function parseSkill(value: string | undefined): string | string[] | false | undefined {
+	if (!value) return undefined;
+	if (value === "false") return false;
+	const parts = value.split(",").map((part) => part.trim()).filter(Boolean);
+	return parts.length > 1 ? parts : parts[0];
+}
+
+function parseAgent(frontmatter: Record<string, string>): string {
+	const subagent = stringField(frontmatter, "subagent");
+	if (!subagent || subagent === "true") return "delegate";
+	return subagent;
+}
+
+function loadPromptWorkflow(filePath: string): PromptWorkflow | undefined {
+	const content = fs.readFileSync(filePath, "utf-8");
+	const { frontmatter, body } = parseFrontmatter(content);
+	const name = path.basename(filePath, ".md");
+	if (!name || RESERVED_COMMAND_NAMES.has(name)) return undefined;
+	const model = stringField(frontmatter, "model");
+	const skill = parseSkill(stringField(frontmatter, "skill"));
+	const cwd = stringField(frontmatter, "cwd");
+	const chain = stringField(frontmatter, "chain");
+	return {
+		name,
+		description: stringField(frontmatter, "description") ?? firstNonEmptyLine(body),
+		body,
+		filePath,
+		agent: parseAgent(frontmatter),
+		...(booleanField(frontmatter, "inheritContext") === true || booleanField(frontmatter, "fork") === true ? { context: "fork" as const } : {}),
+		...(booleanField(frontmatter, "fresh") === true ? { context: "fresh" as const } : {}),
+		...(model ? { model } : {}),
+		...(skill !== undefined ? { skill } : {}),
+		...(cwd ? { cwd } : {}),
+		...(booleanField(frontmatter, "worktree") === true ? { worktree: true } : {}),
+		...(chain ? { chain } : {}),
+	};
+}
+
+export function discoverPromptWorkflows(cwd: string): PromptWorkflow[] {
+	const workflows = new Map<string, PromptWorkflow>();
+	for (const file of readPromptFiles(cwd)) {
+		const workflow = loadPromptWorkflow(file);
+		if (workflow) workflows.set(workflow.name, workflow);
+	}
+	return [...workflows.values()].sort((a, b) => a.name.localeCompare(b.name));
+}
+
+function shellWords(input: string): string[] {
+	const words: string[] = [];
+	let current = "";
+	let quote: "'" | '"' | undefined;
+	let escaped = false;
+	for (const ch of input) {
+		if (escaped) {
+			current += ch;
+			escaped = false;
+			continue;
+		}
+		if (ch === "\\") {
+			escaped = true;
+			continue;
+		}
+		if (quote) {
+			if (ch === quote) quote = undefined;
+			else current += ch;
+			continue;
+		}
+		if (ch === "'" || ch === '"') {
+			quote = ch;
+			continue;
+		}
+		if (/\s/.test(ch)) {
+			if (current) {
+				words.push(current);
+				current = "";
+			}
+			continue;
+		}
+		current += ch;
+	}
+	if (current) words.push(current);
+	return words;
+}
+
+function substituteArgs(template: string, args: string[]): string {
+	const all = args.join(" ");
+	return template
+		.replace(/\$ARGUMENTS/g, all)
+		.replace(/\$@/g, all)
+		.replace(/\$\{(\d+):-([^}]*)\}/g, (_match, index: string, fallback: string) => args[Number(index) - 1] || fallback)
+		.replace(/\$(\d+)/g, (_match, index: string) => args[Number(index) - 1] ?? "");
+}
+
+function parseRuntimeOptions(words: string[]): { args: string[]; agentOverride?: string; fork?: boolean; fresh?: boolean; worktree?: boolean; bg?: boolean } {
+	const args: string[] = [];
+	let agentOverride: string | undefined;
+	let fork = false;
+	let fresh = false;
+	let worktree = false;
+	let bg = false;
+	for (let i = 0; i < words.length; i++) {
+		const word = words[i]!;
+		if (word === "--fork") {
+			fork = true;
+			continue;
+		}
+		if (word === "--fresh") {
+			fresh = true;
+			continue;
+		}
+		if (word === "--worktree") {
+			worktree = true;
+			continue;
+		}
+		if (word === "--bg" || word === "--async") {
+			bg = true;
+			continue;
+		}
+		if (word === "--subagent") {
+			agentOverride = words[++i];
+			continue;
+		}
+		const eq = word.match(/^--subagent(?:=|:)(.+)$/);
+		if (eq) {
+			agentOverride = eq[1];
+			continue;
+		}
+		args.push(word);
+	}
+	return { args, agentOverride, fork, fresh, worktree, bg };
+}
+
+function splitChainDeclaration(input: string): { declaration: string; argsText: string } {
+	const delimiter = input.indexOf(" -- ");
+	if (delimiter === -1) return { declaration: input.trim(), argsText: "" };
+	return { declaration: input.slice(0, delimiter).trim(), argsText: input.slice(delimiter + 4).trim() };
+}
+
+function splitPromptChain(input: string): string[] {
+	return input.split(" -> ").map((part) => part.trim()).filter(Boolean);
+}
+
+function workflowParams(workflow: PromptWorkflow, args: string[], runtime: ReturnType<typeof parseRuntimeOptions>): SubagentParamsLike {
+	const task = substituteArgs(workflow.body, args).trim();
+	const context = runtime.fork ? "fork" : runtime.fresh ? "fresh" : workflow.context;
+	return {
+		agent: runtime.agentOverride ?? workflow.agent,
+		task,
+		clarify: false,
+		agentScope: "both",
+		...(context ? { context } : {}),
+		...(workflow.model ? { model: workflow.model } : {}),
+		...(workflow.skill !== undefined ? { skill: workflow.skill } : {}),
+		...(workflow.cwd ? { cwd: workflow.cwd } : {}),
+		...(runtime.worktree || workflow.worktree ? { worktree: true } : {}),
+		...(runtime.bg ? { async: true } : {}),
+	};
+}
+
+function workflowChainStep(workflow: PromptWorkflow, args: string[], runtime: ReturnType<typeof parseRuntimeOptions>): ChainStep {
+	const params = workflowParams(workflow, args, runtime);
+	return {
+		agent: params.agent ?? "delegate",
+		task: params.task,
+		...(params.model ? { model: params.model } : {}),
+		...(params.skill !== undefined ? { skill: params.skill } : {}),
+		...(params.cwd ? { cwd: params.cwd } : {}),
+	};
+}
+
+function findWorkflow(workflows: PromptWorkflow[], name: string): PromptWorkflow | undefined {
+	return workflows.find((workflow) => workflow.name === name);
+}
+
+function formatWorkflowList(workflows: PromptWorkflow[]): string {
+	if (workflows.length === 0) return "No prompt workflows found in package, user, or project prompts.";
+	return [
+		"Prompt workflows:",
+		...workflows.map((workflow) => `- ${workflow.name}: ${workflow.description} (${workflow.filePath})`),
+	].join("\n");
+}
+
+export function registerPromptWorkflowCommands(input: {
+	pi: ExtensionAPI;
+	run: PromptWorkflowRunner;
+}): void {
+	const { pi, run } = input;
+
+	pi.registerCommand("prompt-workflow", {
+		description: "Run a prompt template through native pi-subagents: /prompt-workflow <name> [args]",
+		handler: async (rawArgs, ctx) => {
+			const words = shellWords(rawArgs);
+			const name = words.shift();
+			const workflows = discoverPromptWorkflows(ctx.cwd);
+			if (!name || name === "list") {
+				pi.sendMessage({ content: formatWorkflowList(workflows), display: true });
+				return;
+			}
+			const workflow = findWorkflow(workflows, name);
+			if (!workflow) {
+				ctx.ui.notify(`Unknown prompt workflow: ${name}`, "error");
+				return;
+			}
+			const runtime = parseRuntimeOptions(words);
+			try {
+				if (workflow.chain) {
+					const chainNames = splitPromptChain(workflow.chain);
+					const chain = chainNames.map((stepName) => {
+						const step = findWorkflow(workflows, stepName);
+						if (!step) throw new Error(`Unknown prompt workflow in chain '${workflow.name}': ${stepName}`);
+						return workflowChainStep(step, runtime.args, runtime);
+					});
+					await run({ chain, task: runtime.args.join(" "), clarify: false, agentScope: "both", ...(runtime.bg ? { async: true } : {}) }, ctx);
+					return;
+				}
+				await run(workflowParams(workflow, runtime.args, runtime), ctx);
+			} catch (error) {
+				ctx.ui.notify(error instanceof Error ? error.message : String(error), "error");
+			}
+		},
+	});
+
+	pi.registerCommand("chain-prompts", {
+		description: "Run prompt templates as a native subagent chain: /chain-prompts analyze -> fix -- args",
+		handler: async (rawArgs, ctx) => {
+			const { declaration, argsText } = splitChainDeclaration(rawArgs);
+			const workflows = discoverPromptWorkflows(ctx.cwd);
+			if (!declaration || declaration === "list") {
+				pi.sendMessage({ content: formatWorkflowList(workflows), display: true });
+				return;
+			}
+			const runtime = parseRuntimeOptions(shellWords(argsText));
+			const names = splitPromptChain(declaration);
+			if (names.length === 0) {
+				ctx.ui.notify("Usage: /chain-prompts prompt-a -> prompt-b -- args", "error");
+				return;
+			}
+			try {
+				const chain = names.map((name) => {
+					const workflow = findWorkflow(workflows, name);
+					if (!workflow) throw new Error(`Unknown prompt workflow: ${name}`);
+					return workflowChainStep(workflow, runtime.args, runtime);
+				});
+				await run({ chain, task: runtime.args.join(" "), clarify: false, agentScope: "both", ...(runtime.bg ? { async: true } : {}) }, ctx);
+			} catch (error) {
+				ctx.ui.notify(error instanceof Error ? error.message : String(error), "error");
+			}
+		},
+	});
+}

package/dist/extensions/pi-subagents/src/slash/slash-commands.ts

@@ -1,7 +1,7 @@
 import { randomUUID } from "node:crypto";
 import * as fs from "node:fs";
 import * as path from "node:path";
-import type { ExtensionAPI, ExtensionContext } from "@selesai/code";
+import { keyText, type ExtensionAPI, type ExtensionContext } from "@selesai/code";
 import { Key, matchesKey } from "@earendil-works/pi-tui";
 import { BUILTIN_AGENT_NAMES, discoverAgents, discoverAgentsAll, type ChainConfig } from "../agents/agents.ts";
 import {
@@ -16,14 +16,17 @@ import {
 import type { SubagentParamsLike } from "../runs/foreground/subagent-executor.ts";
 import { isDynamicParallelStep, isParallelStep, type ChainStep } from "../shared/settings.ts";
 import { findModelInfo, toModelInfo } from "../shared/model-info.ts";
+import { formatTokens } from "../shared/formatters.ts";
 import { assertJsonSchemaObject } from "../runs/shared/structured-output.ts";
 import { validateAcceptanceInput } from "../runs/shared/acceptance.ts";
 import type { SlashSubagentResponse, SlashSubagentUpdate } from "./slash-bridge.ts";
+import { registerPromptWorkflowCommands } from "./prompt-workflows.ts";
 import {
 	applySlashUpdate,
 	buildSlashInitialResult,
 	failSlashResult,
 	finalizeSlashResult,
+	resolveSlashMessageDetails,
 } from "./slash-live-state.ts";
 import {
 	SLASH_RESULT_TYPE,
@@ -33,9 +36,11 @@ import {
 	SLASH_SUBAGENT_RESPONSE_EVENT,
 	SLASH_SUBAGENT_STARTED_EVENT,
 	SLASH_SUBAGENT_UPDATE_EVENT,
+	type Details,
 	type JsonSchemaObject,
 	type SingleResult,
 	type SubagentState,
+	type Usage,
 } from "../shared/types.ts";
 
 interface InlineConfig {
@@ -216,6 +221,113 @@ async function withSlashStatus<T>(
 	}
 }
 
+function emptyUsage(): Usage {
+	return { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, cost: 0, turns: 0 };
+}
+
+function addUsage(target: Usage, source: Usage): void {
+	target.input += source.input;
+	target.output += source.output;
+	target.cacheRead += source.cacheRead;
+	target.cacheWrite += source.cacheWrite;
+	target.cost += source.cost;
+	target.turns += source.turns;
+}
+
+function usageHasValue(usage: Usage): boolean {
+	return usage.input !== 0 || usage.output !== 0 || usage.cacheRead !== 0 || usage.cacheWrite !== 0 || usage.cost !== 0 || usage.turns !== 0;
+}
+
+function assistantUsageFromMessage(message: unknown): Usage | undefined {
+	if (!message || typeof message !== "object") return undefined;
+	const msg = message as { role?: unknown; usage?: unknown };
+	if (msg.role !== "assistant" || !msg.usage || typeof msg.usage !== "object") return undefined;
+	const usage = msg.usage as {
+		input?: unknown;
+		output?: unknown;
+		cacheRead?: unknown;
+		cacheWrite?: unknown;
+		cost?: { total?: unknown };
+	};
+	return {
+		input: typeof usage.input === "number" ? usage.input : 0,
+		output: typeof usage.output === "number" ? usage.output : 0,
+		cacheRead: typeof usage.cacheRead === "number" ? usage.cacheRead : 0,
+		cacheWrite: typeof usage.cacheWrite === "number" ? usage.cacheWrite : 0,
+		cost: typeof usage.cost?.total === "number" ? usage.cost.total : 0,
+		turns: 1,
+	};
+}
+
+function isSubagentDetails(value: unknown): value is Details {
+	if (!value || typeof value !== "object") return false;
+	const details = value as { mode?: unknown; results?: unknown };
+	return typeof details.mode === "string" && Array.isArray(details.results);
+}
+
+function detailsFromSessionEntry(entry: unknown): Details | undefined {
+	if (!entry || typeof entry !== "object") return undefined;
+	const record = entry as { type?: unknown; customType?: unknown; details?: unknown; message?: unknown };
+	if (record.type === "custom_message" && record.customType === SLASH_RESULT_TYPE) {
+		const details = resolveSlashMessageDetails(record.details)?.result.details;
+		return isSubagentDetails(details) ? details : undefined;
+	}
+	if (record.type !== "message" || !record.message || typeof record.message !== "object") return undefined;
+	const message = record.message as { role?: unknown; toolName?: unknown; details?: unknown };
+	if (message.role !== "toolResult" || message.toolName !== "subagent") return undefined;
+	return isSubagentDetails(message.details) ? message.details : undefined;
+}
+
+function formatCostUsage(label: string, usage: Usage): string {
+	const extras = [
+		usage.cacheRead ? `cache read ${formatTokens(usage.cacheRead)}` : "",
+		usage.cacheWrite ? `cache write ${formatTokens(usage.cacheWrite)}` : "",
+		usage.turns ? `${usage.turns} turn${usage.turns === 1 ? "" : "s"}` : "",
+	].filter(Boolean);
+	return `${label}: ↑${formatTokens(usage.input)} ↓${formatTokens(usage.output)} $${usage.cost.toFixed(4)}${extras.length ? ` (${extras.join(", ")})` : ""}`;
+}
+
+function buildSubagentCostReport(ctx: ExtensionContext): string {
+	const parent = emptyUsage();
+	const childTotal = emptyUsage();
+	const total = emptyUsage();
+	const children: Array<{ label: string; usage: Usage; sessionFile?: string }> = [];
+	for (const entry of ctx.sessionManager.getBranch()) {
+		const message = entry.type === "message" ? (entry as { message?: unknown }).message : undefined;
+		const parentUsage = assistantUsageFromMessage(message);
+		if (parentUsage) addUsage(parent, parentUsage);
+		const details = detailsFromSessionEntry(entry);
+		if (!details) continue;
+		for (const result of details.results) {
+			if (!usageHasValue(result.usage)) continue;
+			const usage = { ...result.usage };
+			children.push({
+				label: `Child ${children.length + 1} (${result.agent})`,
+				usage,
+				...(result.sessionFile ? { sessionFile: result.sessionFile } : {}),
+			});
+			addUsage(childTotal, usage);
+		}
+	}
+	addUsage(total, parent);
+	addUsage(total, childTotal);
+	const lines = [
+		"Subagent cost",
+		"",
+		formatCostUsage("Parent", parent),
+	];
+	if (children.length === 0) {
+		lines.push("No subagent child usage found in this session.");
+	} else {
+		for (const child of children) {
+			lines.push(formatCostUsage(child.label, child.usage));
+			if (child.sessionFile) lines.push(`  Session: ${child.sessionFile}`);
+		}
+	}
+	lines.push("────────────────────────────", formatCostUsage("Children", childTotal), formatCostUsage("Total", total));
+	return lines.join("\n");
+}
+
 function parseSingleRequiredArg(args: string, usage: string): { ok: true; value: string } | { ok: false; message: string } {
 	const parts = args.trim().split(/\s+/).filter(Boolean);
 	if (parts.length !== 1) return { ok: false, message: usage };
@@ -321,7 +433,8 @@ async function requestSlashRun(
 			if (!ctx.hasUI) return;
 			const tool = update.currentTool ? ` ${update.currentTool}` : "";
 			const count = update.toolCount ?? 0;
-			ctx.ui.setStatus("subagent-slash", `${count} tools${tool} | Ctrl+O live detail`);
+			const liveDetailKey = keyText("app.tools.expand");
+			ctx.ui.setStatus("subagent-slash", `${count} tools${tool} | ${liveDetailKey} live detail`);
 		};
 
 		const onTerminalInput = ctx.hasUI
@@ -962,6 +1075,12 @@ export function registerSlashCommands(
 		},
 	});
 
+	pi.registerCommand("subagent-cost", {
+		description: "Show parent and subagent child usage cost for this session",
+		handler: async (_args, ctx) => {
+			sendSlashText(pi, buildSubagentCostReport(ctx));
+		},
+	});
 
 	pi.registerCommand("subagents-doctor", {
 		description: "Show subagent diagnostics",
@@ -970,6 +1089,18 @@ export function registerSlashCommands(
 		},
 	});
 
+	pi.registerCommand("subagents-fleet", {
+		description: "Show active subagent fleet status and transcript commands",
+		handler: async (_args, ctx) => {
+			await runSlashSubagent(pi, ctx, { action: "status", view: "fleet" });
+		},
+	});
+
+	registerPromptWorkflowCommands({
+		pi,
+		run: (params, ctx) => runSlashSubagent(pi, ctx, params),
+	});
+
 	pi.registerCommand("subagents-models", {
 		description: "Show runtime-loaded builtin subagent models",
 		getArgumentCompletions: makeBuiltinAgentNameCompletions(),
@@ -998,7 +1129,7 @@ export function registerSlashCommands(
 		handler: async (_args, _ctx) => {
 			const profiles = listSubagentProfiles();
 			if (profiles.length === 0) {
-				sendSlashText(pi, "Subagent profiles\n\nNo subagent profiles found in ~/.pi/agent/profiles/pi-subagents/");
+				sendSlashText(pi, "Subagent profiles\n\nNo subagent profiles found in ~/.selesai/agent/profiles/pi-subagents/");
 				return;
 			}
 			sendSlashText(pi, `Subagent profiles\n\n${profiles.join("\n")}`);
@@ -1006,7 +1137,7 @@ export function registerSlashCommands(
 	});
 
 	pi.registerCommand("subagents-load-profile", {
-		description: "Load a subagent profile into ~/.pi/agent/settings.json",
+		description: "Load a subagent profile into ~/.selesai/agent/settings.json",
 		getArgumentCompletions: (prefix) => {
 			if (prefix.includes(" ")) return null;
 			return listSubagentProfiles()

package/dist/extensions/pi-subagents/src/tui/render.ts

@@ -4,7 +4,7 @@
 
 import * as path from "node:path";
 import type { AgentToolResult } from "@earendil-works/pi-agent-core";
-import { getMarkdownTheme, type ExtensionContext } from "@selesai/code";
+import { getMarkdownTheme, keyText, type ExtensionContext } from "@selesai/code";
 import { Container, Markdown, Spacer, Text, visibleWidth, type Component } from "@earendil-works/pi-tui";
 import {
 	type AgentProgress,
@@ -26,6 +26,14 @@ import { aggregateStepStatus, formatActivityLabel, formatAgentRunningLabel, form
 
 type Theme = ExtensionContext["ui"]["theme"];
 
+function liveDetailKeyText(): string {
+	return keyText("app.tools.expand");
+}
+
+function liveDetailHintText(): string {
+	return `Press ${liveDetailKeyText()} for live detail`;
+}
+
 function getTermWidth(): number {
 	return process.stdout.columns || 120;
 }
@@ -236,6 +244,15 @@ function formatToolUseStat(count: number): string {
 	return `${count} tool use${count === 1 ? "" : "s"}`;
 }
 
+function formatTotalCostStat(totalCost: Details["totalCost"] | undefined): string {
+	if (!totalCost || (totalCost.inputTokens === 0 && totalCost.outputTokens === 0 && totalCost.costUsd === 0)) return "";
+	const parts: string[] = [];
+	if (totalCost.inputTokens) parts.push(`in:${formatTokens(totalCost.inputTokens)}`);
+	if (totalCost.outputTokens) parts.push(`out:${formatTokens(totalCost.outputTokens)}`);
+	if (totalCost.costUsd) parts.push(`$${totalCost.costUsd.toFixed(4)}`);
+	return parts.join(" ");
+}
+
 function formatProgressStats(theme: Theme, progress: Pick<AgentProgress, "toolCount" | "tokens" | "durationMs"> | undefined, includeDuration = true): string {
 	if (!progress) return "";
 	const parts: string[] = [];
@@ -858,7 +875,7 @@ function foregroundStyleWidgetStepLines(
 		lines.push(`    ${nestedLine}`);
 	}
 	if (step.status === "running") {
-		if (!expanded) lines.push(`    ${theme.fg("accent", "Press Ctrl+O for live detail")}`);
+		if (!expanded) lines.push(`    ${theme.fg("accent", liveDetailHintText())}`);
 		const output = widgetOutputPath(job, step);
 		if (output) lines.push(`    ${theme.fg("dim", `output: ${shortenPath(output)}`)}`);
 		if (expanded) {
@@ -925,7 +942,7 @@ function compactSingleWidgetLines(job: AsyncJobState, theme: Theme, width: numbe
 		lines.push(`  ${widgetStepGlyph(step.status, theme, widgetStepRunningSeed(step, index))} ${itemTitle} ${index + 1}/${total}: ${themeBold(theme, step.agent)} ${theme.fg("dim", "·")} ${status}${modelDisplay}${activitySuffix}${stepStats ? ` ${theme.fg("dim", "·")} ${stepStats}` : ""}`);
 		for (const nestedLine of formatNestedWidgetLines(step.children, theme, width, false, job.updatedAt)) lines.push(`    ${nestedLine}`);
 	}
-	if (job.steps.some((step) => step.status === "running")) lines.push(theme.fg("accent", "  Press Ctrl+O for live detail"));
+	if (job.steps.some((step) => step.status === "running")) lines.push(theme.fg("accent", `  ${liveDetailHintText()}`));
 	return lines.map((line) => truncLine(line, width));
 }
 
@@ -1117,7 +1134,7 @@ function fitWidgetLineBudget(lines: string[], theme: Theme, width: number, expan
 	const hiddenCount = lines.length - visibleLines;
 	const hint = expanded
 		? `… ${hiddenCount} live-detail lines hidden`
-		: `… ${hiddenCount} lines hidden · Ctrl+O expands`;
+		: `… ${hiddenCount} lines hidden · ${liveDetailKeyText()} expands`;
 	return [...lines.slice(0, visibleLines), truncLine(theme.fg("dim", hint), width)];
 }
 
@@ -1275,7 +1292,7 @@ function renderSingleCompact(d: Details, r: Details["results"][number], theme: T
 		c.addChild(new Text(truncLine(theme.fg("dim", `  ⎿  ${activity}`), width), 0, 0));
 		const liveStatus = buildLiveStatusLine(r.progress, progressSnapshotNow);
 		if (liveStatus && liveStatus !== activity) c.addChild(new Text(truncLine(theme.fg("dim", `     ${liveStatus}`), width), 0, 0));
-		c.addChild(new Text(truncLine(theme.fg("accent", "  Press Ctrl+O for live detail"), width), 0, 0));
+		c.addChild(new Text(truncLine(theme.fg("accent", `  ${liveDetailHintText()}`), width), 0, 0));
 		if (r.artifactPaths) c.addChild(new Text(truncLine(theme.fg("dim", `  output: ${shortenPath(r.artifactPaths.outputPath)}`), width), 0, 0));
 		return c;
 	}
@@ -1315,7 +1332,7 @@ function renderMultiCompact(d: Details, theme: Theme, frame?: number): Component
 	}
 	const multiLabel = buildMultiProgressLabel(d, hasRunning);
 	const itemTitle = multiLabel.itemTitle;
-	const stats = statJoin(theme, [multiLabel.headerLabel, formatProgressStats(theme, totalSummary)]);
+	const stats = statJoin(theme, [multiLabel.headerLabel, formatProgressStats(theme, totalSummary), formatTotalCostStat(d.totalCost)]);
 	const glyph = hasRunning
 		? theme.fg("accent", runningGlyph(frame !== undefined ? (runningSeed(progressRunningSeed(totalSummary), d.currentStepIndex) ?? 0) + frame : runningSeed(progressRunningSeed(totalSummary), d.currentStepIndex)))
 		: failed
@@ -1371,7 +1388,7 @@ function renderMultiCompact(d: Details, theme: Theme, frame?: number): Component
 		if (rRunning && rProg && "status" in rProg) {
 			const activity = compactCurrentActivity(rProg);
 			c.addChild(new Text(truncLine(theme.fg("dim", `    ⎿  ${activity}`), width), 0, 0));
-			c.addChild(new Text(truncLine(theme.fg("accent", "    Press Ctrl+O for live detail"), width), 0, 0));
+			c.addChild(new Text(truncLine(theme.fg("accent", `    ${liveDetailHintText()}`), width), 0, 0));
 		} else if (!rPending && (r.exitCode !== 0 || r.interrupted || r.detached || hasEmptyTextOutputWithoutOutputTarget(r.task, output))) {
 			c.addChild(new Text(truncLine(theme.fg(r.exitCode !== 0 ? "error" : "dim", `    ⎿  ${resultStatusLine(r, output)}`), width), 0, 0));
 		}
@@ -1453,7 +1470,7 @@ export function renderSubagentResult(
 			if (liveStatusLine) {
 				c.addChild(new Text(fit(theme.fg("accent", liveStatusLine)), 0, 0));
 			}
-			c.addChild(new Text(fit(theme.fg("accent", "Press Ctrl+O for live detail")), 0, 0));
+			c.addChild(new Text(fit(theme.fg("accent", liveDetailHintText())), 0, 0));
 			if (r.artifactPaths) {
 				c.addChild(new Text(fit(theme.fg("dim", `Artifacts: ${shortenPath(r.artifactPaths.outputPath)}`)), 0, 0));
 			}
@@ -1547,10 +1564,13 @@ export function renderSubagentResult(
 			{ toolCount: 0, tokens: 0, durationMs: 0 },
 		);
 
-	const summaryStr =
+	const summaryParts = [
 		totalSummary.toolCount || totalSummary.tokens
-			? ` | ${totalSummary.toolCount} tools, ${formatTokens(totalSummary.tokens)} tok, ${formatDuration(totalSummary.durationMs)}`
-			: "";
+			? `${totalSummary.toolCount} tools, ${formatTokens(totalSummary.tokens)} tok, ${formatDuration(totalSummary.durationMs)}`
+			: "",
+		formatTotalCostStat(d.totalCost),
+	].filter(Boolean);
+	const summaryStr = summaryParts.length ? ` | ${summaryParts.join(", ")}` : "";
 
 	const modeLabel = d.mode;
 	const contextBadge = d.context === "fork" ? theme.fg("warning", " [fork]") : "";
@@ -1687,7 +1707,7 @@ export function renderSubagentResult(
 			if (liveStatusLine) {
 				c.addChild(new Text(fit(theme.fg("accent", `    ${liveStatusLine}`)), 0, 0));
 			}
-			c.addChild(new Text(fit(theme.fg("accent", "    Press Ctrl+O for live detail")), 0, 0));
+			c.addChild(new Text(fit(theme.fg("accent", `    ${liveDetailHintText()}`)), 0, 0));
 			if (r.artifactPaths) {
 				c.addChild(new Text(fit(theme.fg("dim", `    artifacts: ${shortenPath(r.artifactPaths.outputPath)}`)), 0, 0));
 			}