@oh-my-pi/pi-coding-agent 15.10.12 → 15.11.1

package/src/tools/irc.ts

@@ -1,62 +1,94 @@
 /**
- * IRC tool — agent-to-agent messaging.
+ * IRC tool — agent-to-agent messaging over the process-global IrcBus.
  *
- * Lets any live agent send a short prose message to any other live agent in
- * this process and (optionally) get a prose reply.
- *
- * Routing happens via the global AgentRegistry. Replies are produced by an
- * ephemeral side-channel call (`AgentSession.respondAsBackground`) that
- * mirrors `/btw`: the recipient's current model, system prompt, and message
- * history are used to compute a reply without persisting it through the
- * normal stream path. After the reply is generated, both the incoming
- * message and the auto-reply are queued for injection into the recipient's
- * persisted history (deferred until the recipient is idle), so the model
- * sees the exchange on its next turn.
- *
- * This avoids the deadlock that arises when the recipient is blocked on a
- * long-running tool call: the side-channel call does not depend on the
- * recipient's main agent loop being free.
+ * `send` is fire-and-forget: the bus routes the message to the recipient
+ * (waking idle agents with a real turn, reviving parked ones via the
+ * lifecycle manager, injecting a non-interrupting aside into busy ones) and
+ * returns delivery receipts immediately. Replies are real turns by the
+ * recipient, observed with `wait` (or the `await: true` send sugar). `inbox`
+ * drains pending messages; `list` shows every addressable peer.
  */
 
 import type { AgentTool, AgentToolContext, AgentToolResult, AgentToolUpdateCallback } from "@oh-my-pi/pi-agent-core";
-import { prompt } from "@oh-my-pi/pi-utils";
+import { type Component, Text } from "@oh-my-pi/pi-tui";
+import { formatAge, formatDuration, prompt } from "@oh-my-pi/pi-utils";
 import * as z from "zod/v4";
+import type { Settings } from "../config/settings";
+import type { RenderResultOptions } from "../extensibility/custom-tools/types";
+import { IrcBus, type IrcDeliveryReceipt, type IrcMessage } from "../irc/bus";
+import type { Theme } from "../modes/theme/theme";
 import ircDescription from "../prompts/tools/irc.md" with { type: "text" };
-import type { AgentRef, AgentRegistry } from "../registry/agent-registry";
+import type { AgentRegistry } from "../registry/agent-registry";
+import { Ellipsis, renderStatusLine, renderTreeList, truncateToWidth } from "../tui";
 import type { ToolSession } from ".";
+import {
+	createCachedComponent,
+	formatBadge,
+	formatErrorDetail,
+	getPreviewLines,
+	PREVIEW_LIMITS,
+	replaceTabs,
+	type ToolUIColor,
+} from "./render-utils";
 
 const DEFAULT_IRC_TIMEOUT_MS = 120_000;
+
+/**
+ * IRC availability: there must be someone to chat with. True for every
+ * subagent (it always has a parent, and possibly siblings) and for any
+ * session that can still spawn subagents through the task tool. Only a
+ * top-level session with task spawning unavailable has no peers — no irc.
+ */
+export function isIrcEnabled(settings: Settings, taskDepth: number): boolean {
+	if (taskDepth > 0) return true;
+	const maxDepth = settings.get("task.maxRecursionDepth") ?? 2;
+	return maxDepth < 0 || taskDepth < maxDepth;
+}
+
 const ircSchema = z.object({
-	op: z.enum(["send", "list"]).describe("irc operation"),
-	to: z.string().optional().describe('recipient agent id or "all"'),
-	message: z.string().optional().describe("message body"),
-	awaitReply: z.boolean().optional().describe("wait for prose reply"),
+	op: z.enum(["send", "wait", "inbox", "list"]).describe("irc operation"),
+	to: z.string().optional().describe('send: recipient agent id or "all"'),
+	message: z.string().optional().describe("send: message body"),
+	replyTo: z.string().optional().describe("send: message id being answered"),
+	await: z.boolean().optional().describe('send: wait for the recipient\'s reply (invalid with to:"all")'),
+	from: z.string().optional().describe("wait: only accept a message from this agent id"),
+	timeoutMs: z.number().optional().describe("wait: timeout in milliseconds (0 waits indefinitely)"),
+	peek: z.boolean().optional().describe("inbox: list messages without consuming them"),
 });
 
 type IrcParams = z.infer<typeof ircSchema>;
 
-interface IrcReply {
-	from: string;
-	text: string;
+interface IrcPeerInfo {
+	id: string;
+	displayName: string;
+	kind: string;
+	status: string;
+	parentId?: string;
+	unread: number;
+	lastActivity: number;
 }
 
 export interface IrcDetails {
-	op: "send" | "list";
+	op: "send" | "wait" | "inbox" | "list";
 	from?: string;
 	to?: string;
-	delivered?: string[];
-	replies?: IrcReply[];
-	failed?: Array<{ id: string; error: string }>;
-	notFound?: string[];
-	peers?: Array<{ id: string; displayName: string; kind: string; status: string; parentId?: string }>;
-	channels?: string[];
+	receipts?: IrcDeliveryReceipt[];
+	/** Message consumed by `wait` / `send await:true`; null when the wait timed out. */
+	waited?: IrcMessage | null;
+	inbox?: IrcMessage[];
+	peers?: IrcPeerInfo[];
+}
+
+function formatIncoming(msg: IrcMessage): string {
+	const replyTag = msg.replyTo ? ` (reply to ${msg.replyTo})` : "";
+	return `[${msg.id}] ${msg.from}${replyTag}: ${msg.body}`;
 }
 
 export class IrcTool implements AgentTool<typeof ircSchema, IrcDetails> {
 	readonly name = "irc";
 	readonly approval = "read" as const;
 	readonly label = "IRC";
-	readonly summary = "Send and receive messages between agents over IRC-like channels";
+	readonly summary = "Send and receive messages between agents";
 	readonly description: string;
 	readonly parameters = ircSchema;
 	readonly strict = true;
@@ -66,7 +98,7 @@ export class IrcTool implements AgentTool<typeof ircSchema, IrcDetails> {
 	}
 
 	static createIf(session: ToolSession): IrcTool | null {
-		if (!session.settings.get("irc.enabled")) return null;
+		if (!isIrcEnabled(session.settings, session.taskDepth ?? 0)) return null;
 		if (!session.agentRegistry || !session.getAgentId) return null;
 		return new IrcTool(session);
 	}
@@ -87,41 +119,55 @@ export class IrcTool implements AgentTool<typeof ircSchema, IrcDetails> {
 			return errorResult("IRC is unavailable: caller has no agent id.", { op: params.op });
 		}
 
-		if (params.op === "list") {
-			return this.#executeList(registry, senderId);
-		}
-		if (params.op === "send") {
-			return this.#executeSend(registry, senderId, params, signal);
+		switch (params.op) {
+			case "list":
+				return this.#executeList(registry, senderId);
+			case "send":
+				return this.#executeSend(registry, senderId, params, signal);
+			case "wait":
+				return this.#executeWait(senderId, params, signal);
+			case "inbox":
+				return this.#executeInbox(senderId, params);
+			default:
+				return errorResult("Unknown irc op.", { op: params.op });
 		}
-		return errorResult("Unknown irc op.", { op: params.op as "send" | "list" });
 	}
 
 	#executeList(registry: AgentRegistry, senderId: string): AgentToolResult<IrcDetails> {
-		const peers = registry.listVisibleTo(senderId);
+		const bus = IrcBus.global();
+		const peers = registry
+			.list()
+			.filter(ref => ref.id !== senderId && ref.status !== "aborted")
+			.map(ref => ({
+				id: ref.id,
+				displayName: ref.displayName,
+				kind: ref.kind,
+				status: ref.status,
+				parentId: ref.parentId,
+				unread: bus.unreadCount(ref.id),
+				lastActivity: ref.lastActivity,
+			}));
 		const lines: string[] = [];
 		if (peers.length === 0) {
-			lines.push("No other live agents.");
+			lines.push("No other agents.");
 		} else {
 			lines.push(`${peers.length} peer(s):`);
 			for (const peer of peers) {
-				lines.push(`- ${peer.id} [${peer.displayName} · ${peer.kind} · ${peer.status}]`);
+				const extras = [
+					peer.unread > 0 ? `unread ${peer.unread}` : undefined,
+					peer.parentId ? `parent ${peer.parentId}` : undefined,
+					`active ${formatDuration(Date.now() - peer.lastActivity)} ago`,
+				].filter(Boolean);
+				lines.push(`- ${peer.id} [${peer.displayName} · ${peer.kind} · ${peer.status}] — ${extras.join(", ")}`);
+			}
+			if (peers.some(peer => peer.status === "parked")) {
+				lines.push("");
+				lines.push("Parked agents are revived automatically when you message them.");
 			}
 		}
-		const channels = ["all", ...peers.map(p => p.id)];
 		return {
 			content: [{ type: "text", text: lines.join("\n") }],
-			details: {
-				op: "list",
-				from: senderId,
-				peers: peers.map(p => ({
-					id: p.id,
-					displayName: p.displayName,
-					kind: p.kind,
-					status: p.status,
-					parentId: p.parentId,
-				})),
-				channels,
-			},
+			details: { op: "list", from: senderId, peers },
 		};
 	}
 
@@ -139,105 +185,153 @@ export class IrcTool implements AgentTool<typeof ircSchema, IrcDetails> {
 		if (!message) {
 			return errorResult('`message` is required for op="send".', { op: "send", from: senderId });
 		}
-
-		// Resolve target peers.
-		let targets: AgentRef[];
-		const notFound: string[] = [];
+		if (to === senderId) {
+			return errorResult("Cannot send an IRC message to yourself.", { op: "send", from: senderId, to });
+		}
 		const isBroadcast = to === "all";
-		if (isBroadcast) {
-			targets = registry.listVisibleTo(senderId);
-		} else {
-			const ref = registry.get(to);
-			if (!ref || ref.id === senderId) {
-				notFound.push(to);
-				targets = [];
-			} else if (ref.status !== "running" && ref.status !== "idle") {
-				notFound.push(to);
-				targets = [];
+		if (isBroadcast && params.await) {
+			return errorResult('`await` is invalid with to:"all" — broadcasts have no single replier.', {
+				op: "send",
+				from: senderId,
+				to,
+			});
+		}
+
+		const bus = IrcBus.global();
+		let waited: IrcMessage | null | undefined;
+		const timeoutMs = params.await ? this.#resolveTimeoutMs(params) : undefined;
+		const awaitAbort = params.await ? new AbortController() : undefined;
+		const awaitCancelled = new Error("IRC await cancelled");
+		let removeAwaitAbortListener: (() => void) | undefined;
+		const waiting = params.await
+			? bus
+					.wait(senderId, { from: to }, timeoutMs ?? DEFAULT_IRC_TIMEOUT_MS, awaitAbort?.signal, {
+						drainPending: false,
+					})
+					.then(
+						message => ({ message, error: null as Error | null }),
+						error => ({
+							message: null,
+							error: error === awaitCancelled ? null : error instanceof Error ? error : new Error(String(error)),
+						}),
+					)
+			: undefined;
+		if (params.await && signal && awaitAbort) {
+			if (signal.aborted) {
+				awaitAbort.abort(signal.reason instanceof Error ? signal.reason : new Error("IRC wait aborted"));
 			} else {
-				targets = [ref];
+				const onAbort = (): void => {
+					awaitAbort.abort(signal.reason instanceof Error ? signal.reason : new Error("IRC wait aborted"));
+				};
+				signal.addEventListener("abort", onAbort, { once: true });
+				removeAwaitAbortListener = () => signal.removeEventListener("abort", onAbort);
 			}
 		}
 
-		const awaitReply = params.awaitReply ?? !isBroadcast;
-
-		const timeoutMs = normalizeIrcTimeoutMs(this.session.settings.get("irc.timeoutMs"));
-		const delivered: string[] = [];
-		const replies: IrcReply[] = [];
-		const failed: Array<{ id: string; error: string }> = [];
-
-		// Dispatch to each target in parallel via the recipient's ephemeral
-		// side-channel. Independent calls so a slow recipient cannot stall the
-		// others. The recipient's main loop never has to be unblocked: the
-		// side-channel runs alongside any in-flight tool call.
-		const dispatches = targets.map(async target => {
-			const targetSession = target.session;
-			if (!targetSession) {
-				notFound.push(target.id);
-				return;
+		try {
+			// Broadcasts fan out to live peers only (running | idle); reviving every
+			// parked agent on a broadcast would be a stampede. Direct sends go
+			// through the bus unfiltered so parked recipients are revived.
+			const targets = isBroadcast ? registry.listVisibleTo(senderId).map(ref => ref.id) : [to];
+			const receipts = await Promise.all(
+				targets.map(target => bus.send({ from: senderId, to: target, body: message, replyTo: params.replyTo })),
+			);
+
+			const lines: string[] = [];
+			const delivered = receipts.filter(receipt => receipt.outcome !== "failed");
+			if (targets.length === 0) {
+				lines.push("No live peers to broadcast to.");
+			} else if (delivered.length === 0) {
+				lines.push("No recipients received the message.");
+			} else {
+				lines.push(`Delivered to ${delivered.length} peer(s):`);
 			}
-			try {
-				const result = await runIrcDispatchWithTimeout(
-					timeoutMs,
-					signal,
-					timeoutSignal =>
-						targetSession.respondAsBackground({
-							from: senderId,
-							message,
-							awaitReply,
-							signal: timeoutSignal,
-						}),
-					target.id,
+			for (const receipt of receipts) {
+				lines.push(
+					receipt.outcome === "failed"
+						? `- ${receipt.to}: failed — ${receipt.error ?? "unknown error"}`
+						: `- ${receipt.to}: ${receipt.outcome}`,
 				);
-				delivered.push(target.id);
-				if (awaitReply && result.replyText) {
-					replies.push({ from: target.id, text: result.replyText });
-				}
-			} catch (err) {
-				failed.push({ id: target.id, error: err instanceof Error ? err.message : String(err) });
 			}
-		});
-		await Promise.all(dispatches);
 
-		const lines: string[] = [];
-		if (delivered.length === 0) {
-			lines.push("No recipients received the message.");
-		} else {
-			lines.push(`Delivered to ${delivered.length} peer(s): ${delivered.join(", ")}`);
-		}
-		if (replies.length > 0) {
-			lines.push("");
-			lines.push("## Replies");
-			for (const reply of replies) {
-				lines.push(`### ${reply.from}`);
-				lines.push(reply.text);
-			}
-		}
-		if (failed.length > 0) {
-			lines.push("");
-			lines.push("## Failed");
-			for (const f of failed) {
-				lines.push(`- ${f.id}: ${f.error}`);
+			if (params.await && waiting && timeoutMs !== undefined) {
+				lines.push("");
+				if (delivered.length > 0) {
+					const reply = await waiting;
+					if (reply.error) throw reply.error;
+					waited = reply.message;
+					if (waited) {
+						lines.push(`Reply from ${waited.from}:`);
+						lines.push(waited.body);
+					} else {
+						lines.push(
+							`No reply from ${to} within ${formatDuration(timeoutMs)}. ` +
+								"They may answer later — check `inbox` or `wait` again.",
+						);
+					}
+				} else {
+					awaitAbort?.abort(awaitCancelled);
+					const reply = await waiting;
+					if (reply.error) throw reply.error;
+				}
 			}
+
+			return {
+				content: [{ type: "text", text: lines.join("\n") }],
+				details: {
+					op: "send",
+					from: senderId,
+					to,
+					receipts,
+					...(waited !== undefined ? { waited } : {}),
+				},
+				isError: delivered.length === 0 && targets.length > 0,
+			};
+		} finally {
+			awaitAbort?.abort(awaitCancelled);
+			removeAwaitAbortListener?.();
 		}
-		if (notFound.length > 0) {
-			lines.push("");
-			lines.push(`Unknown / unavailable peers: ${notFound.join(", ")}`);
+	}
+
+	async #executeWait(senderId: string, params: IrcParams, signal?: AbortSignal): Promise<AgentToolResult<IrcDetails>> {
+		const from = params.from?.trim() || undefined;
+		const timeoutMs = this.#resolveTimeoutMs(params);
+		const waited = await IrcBus.global().wait(senderId, { from }, timeoutMs, signal);
+		if (!waited) {
+			const filterNote = from ? ` from ${from}` : "";
+			return {
+				content: [{ type: "text", text: `No message${filterNote} within ${formatDuration(timeoutMs)}.` }],
+				details: { op: "wait", from: senderId, waited: null },
+			};
 		}
+		return {
+			content: [{ type: "text", text: formatIncoming(waited) }],
+			details: { op: "wait", from: senderId, waited },
+		};
+	}
 
+	#executeInbox(senderId: string, params: IrcParams): AgentToolResult<IrcDetails> {
+		const messages = IrcBus.global().inbox(senderId, { peek: params.peek });
+		if (messages.length === 0) {
+			return {
+				content: [{ type: "text", text: "Inbox empty." }],
+				details: { op: "inbox", from: senderId, inbox: [] },
+			};
+		}
+		const header = params.peek ? `${messages.length} unread message(s):` : `${messages.length} message(s):`;
+		const lines = [header, ...messages.map(msg => `- ${formatIncoming(msg)}`)];
 		return {
 			content: [{ type: "text", text: lines.join("\n") }],
-			details: {
-				op: "send",
-				from: senderId,
-				to,
-				delivered,
-				...(replies.length > 0 ? { replies } : {}),
-				...(failed.length > 0 ? { failed } : {}),
-				...(notFound.length > 0 ? { notFound } : {}),
-			},
+			details: { op: "inbox", from: senderId, inbox: messages },
 		};
 	}
+
+	#resolveTimeoutMs(params: IrcParams): number {
+		if (params.timeoutMs !== undefined) {
+			return normalizeIrcTimeoutMs(params.timeoutMs);
+		}
+		return normalizeIrcTimeoutMs(this.session.settings.get("irc.timeoutMs"));
+	}
 }
 
 function errorResult(text: string, details: IrcDetails): AgentToolResult<IrcDetails> {
@@ -256,43 +350,374 @@ function normalizeIrcTimeoutMs(value: number): number {
 	return Math.max(1, Math.trunc(value));
 }
 
-async function runIrcDispatchWithTimeout<T>(
-	timeoutMs: number,
-	parentSignal: AbortSignal | undefined,
-	run: (signal?: AbortSignal) => Promise<T>,
-	targetId: string,
-): Promise<T> {
-	if (timeoutMs <= 0) {
-		return await run(parentSignal);
+// =============================================================================
+// TUI Renderer
+// =============================================================================
+
+type IrcRenderArgs = Partial<IrcParams>;
+
+const BODY_LINES_COLLAPSED = 2;
+const BODY_LINES_EXPANDED = 12;
+const BODY_LINE_WIDTH = 100;
+
+const PEER_STATUS_ORDER: Record<string, number> = { running: 0, idle: 1, parked: 2 };
+
+function ircGlyph(theme: Theme): string {
+	return theme.styledSymbol("tool.irc", "accent");
+}
+
+function outcomeColor(outcome: IrcDeliveryReceipt["outcome"]): ToolUIColor {
+	switch (outcome) {
+		case "woken":
+			return "success";
+		case "revived":
+			return "warning";
+		case "injected":
+			return "accent";
+		case "failed":
+			return "error";
 	}
+}
 
-	const controller = new AbortController();
-	const timeoutError = new Error(`IRC timed out waiting for ${targetId} after ${timeoutMs} ms`);
-	let timeout: NodeJS.Timeout | undefined;
-	let parentAbortListener: (() => void) | undefined;
+/** Glyph + status word, matching the agent-hub status conventions. */
+function peerStatusBadge(status: string, theme: Theme): string {
+	switch (status) {
+		case "running":
+			return theme.fg("accent", `${theme.status.running} running`);
+		case "idle":
+			return theme.fg("success", `${theme.status.enabled} idle`);
+		case "parked":
+			return theme.fg("muted", `${theme.status.shadowed} parked`);
+		default:
+			return theme.fg("error", `${theme.status.aborted} ${status}`);
+	}
+}
 
-	const timeoutDeferred = Promise.withResolvers<never>();
-	if (parentSignal) {
-		if (parentSignal.aborted) {
-			throw parentSignal.reason instanceof Error ? parentSignal.reason : new Error("IRC aborted");
-		}
-		parentAbortListener = () => {
-			controller.abort(parentSignal.reason);
-			timeoutDeferred.reject(parentSignal.reason instanceof Error ? parentSignal.reason : new Error("IRC aborted"));
-		};
-		parentSignal.addEventListener("abort", parentAbortListener, { once: true });
+function messageAge(ts: number | undefined): string {
+	if (!ts) return "";
+	return formatAge(Math.max(1, Math.round((Date.now() - ts) / 1000)));
+}
+
+function textContent(result: { content: Array<{ type: string; text?: string }> }): string {
+	return result.content.find(part => part.type === "text")?.text?.trim() ?? "";
+}
+
+/**
+ * Quote-bordered message body preview. `tone` separates outbound text (dim)
+ * from received text (toolOutput); a trailing dim counter marks elided lines.
+ */
+function bodyLines(
+	body: string,
+	expanded: boolean,
+	theme: Theme,
+	options: { indent?: string; tone?: "dim" | "toolOutput"; collapsedLines?: number } = {},
+): string[] {
+	const indent = options.indent ?? "";
+	const tone = options.tone ?? "toolOutput";
+	const max = expanded ? BODY_LINES_EXPANDED : (options.collapsedLines ?? BODY_LINES_COLLAPSED);
+	const total = body.split("\n").filter(line => line.trim()).length;
+	const quote = theme.fg("dim", theme.md.quoteBorder);
+	const lines = getPreviewLines(body, max, BODY_LINE_WIDTH, Ellipsis.Unicode).map(
+		line => `${indent}${quote} ${theme.fg(tone, replaceTabs(line))}`,
+	);
+	const hidden = total - Math.min(total, max);
+	if (hidden > 0) {
+		lines.push(`${indent}${quote} ${theme.fg("dim", `… +${hidden} more ${hidden === 1 ? "line" : "lines"}`)}`);
+	}
+	return lines;
+}
+
+/** Header title carrying the op direction: `IRC ➤ peer` out, `IRC ⟵ peer` in. */
+function callTitle(args: IrcRenderArgs | undefined, theme: Theme): string {
+	switch (args?.op) {
+		case "send":
+			return `IRC ${theme.nav.selected} ${args.to?.trim() || "…"}`;
+		case "wait":
+			return `IRC ${theme.nav.back} ${args.from?.trim() || "anyone"}`;
+		case "inbox":
+			return "IRC inbox";
+		case "list":
+			return "IRC peers";
+		default:
+			return "IRC";
+	}
+}
+
+function callMeta(args: IrcRenderArgs | undefined): string[] {
+	const meta: string[] = [];
+	if (args?.op === "send") {
+		if (args.to === "all") meta.push("broadcast");
+		if (args.await) meta.push("await reply");
+		if (args.replyTo) meta.push("reply");
+	}
+	if (args?.op === "wait" && args.timeoutMs) meta.push(`timeout ${formatDuration(args.timeoutMs)}`);
+	if (args?.op === "inbox" && args.peek) meta.push("peek");
+	return meta;
+}
+
+/**
+ * Display-only transcript card for live IRC traffic: `irc:incoming` DMs
+ * delivered to this session and `irc:relay` observations of agent↔agent
+ * traffic. Shares the tool renderer's glyph + quote-border conventions so
+ * cards and `irc` tool output look identical in the transcript.
+ */
+export function createIrcMessageCard(
+	card: {
+		kind: "incoming" | "relay";
+		from?: string;
+		to?: string;
+		body?: string;
+		replyTo?: string;
+		timestamp?: number;
+	},
+	getExpanded: () => boolean,
+	uiTheme: Theme,
+): Component {
+	const from = card.from?.trim() || "?";
+	const title =
+		card.kind === "incoming"
+			? `IRC ${uiTheme.nav.back} ${from}`
+			: `IRC ${from} ${uiTheme.nav.selected} ${card.to?.trim() || "?"}`;
+	const body = card.body ?? "";
+	const meta: string[] = [];
+	if (card.replyTo) meta.push("reply");
+	const age = messageAge(card.timestamp);
+	if (age) meta.push(age);
+	return createCachedComponent(
+		getExpanded,
+		(width, expanded) => {
+			const lines = [renderStatusLine({ iconOverride: ircGlyph(uiTheme), title, meta }, uiTheme)];
+			if (body.trim()) {
+				lines.push(...bodyLines(body, expanded, uiTheme, { indent: "  ", collapsedLines: 3 }));
+			}
+			return lines.map(line => truncateToWidth(line, width, Ellipsis.Unicode));
+		},
+		{ paddingX: 1 },
+	);
+}
+
+function renderSendResult(
+	result: { content: Array<{ type: string; text?: string }>; isError?: boolean },
+	details: Partial<IrcDetails>,
+	args: IrcRenderArgs | undefined,
+	expanded: boolean,
+	theme: Theme,
+): string[] {
+	const receipts = details.receipts ?? [];
+	const to = details.to ?? args?.to?.trim() ?? "?";
+	const title = `IRC ${theme.nav.selected} ${to}`;
+
+	// Pre-delivery failures (validation) and empty broadcasts carry no receipts.
+	if (receipts.length === 0) {
+		const text = textContent(result) || (result.isError ? "Send failed." : "Nothing to deliver.");
+		return [
+			renderStatusLine({ icon: result.isError ? "error" : "warning", title }, theme),
+			result.isError ? formatErrorDetail(text, theme) : `  ${theme.fg("muted", replaceTabs(text))}`,
+		];
 	}
 
-	timeout = setTimeout(() => {
-		controller.abort(timeoutError);
-		timeoutDeferred.reject(timeoutError);
-	}, timeoutMs);
-	timeout.unref?.();
-
-	try {
-		return await Promise.race([run(controller.signal), timeoutDeferred.promise]);
-	} finally {
-		if (timeout) clearTimeout(timeout);
-		if (parentSignal && parentAbortListener) parentSignal.removeEventListener("abort", parentAbortListener);
+	const delivered = receipts.filter(receipt => receipt.outcome !== "failed");
+	const failedCount = receipts.length - delivered.length;
+	const waited = details.waited;
+	const timedOut = waited === null;
+
+	const meta: string[] = [];
+	if (to === "all") meta.push("broadcast");
+	if (receipts.length === 1) {
+		const receipt = receipts[0]!;
+		meta.push(theme.fg(outcomeColor(receipt.outcome), receipt.outcome));
+	} else {
+		if (delivered.length > 0) meta.push(theme.fg("success", `${delivered.length} delivered`));
+		if (failedCount > 0) meta.push(theme.fg("error", `${failedCount} failed`));
+	}
+	if (timedOut) meta.push(theme.fg("warning", "no reply"));
+
+	const icon = result.isError
+		? { icon: "error" as const }
+		: timedOut
+			? { icon: "warning" as const }
+			: { iconOverride: ircGlyph(theme) };
+	const lines = [renderStatusLine({ ...icon, title, meta }, theme)];
+
+	const sent = args?.message?.trim();
+	if (sent) lines.push(...bodyLines(sent, expanded, theme, { indent: "  ", tone: "dim" }));
+
+	if (receipts.length > 1 || failedCount > 0) {
+		lines.push(
+			...renderTreeList<IrcDeliveryReceipt>(
+				{
+					items: receipts,
+					expanded,
+					maxCollapsed: PREVIEW_LIMITS.COLLAPSED_ITEMS,
+					itemType: "recipient",
+					renderItem: receipt => {
+						const badge = formatBadge(receipt.outcome, outcomeColor(receipt.outcome), theme);
+						const error =
+							receipt.outcome === "failed" && receipt.error
+								? ` ${theme.fg("error", `${theme.format.dash} ${receipt.error}`)}`
+								: "";
+						return `${theme.fg("toolOutput", receipt.to)} ${badge}${error}`;
+					},
+				},
+				theme,
+			),
+		);
+	}
+
+	if (waited) {
+		const age = messageAge(waited.ts);
+		lines.push(
+			`  ${theme.fg("dim", theme.nav.back)} ${theme.fg("accent", waited.from)}${age ? ` ${theme.fg("dim", age)}` : ""}`,
+		);
+		lines.push(...bodyLines(waited.body, expanded, theme, { indent: "  " }));
+	} else if (timedOut) {
+		lines.push(`  ${theme.fg("warning", "No reply yet — they may answer later; check inbox or wait again.")}`);
+	}
+	return lines;
+}
+
+function renderWaitResult(
+	result: { content: Array<{ type: string; text?: string }>; isError?: boolean },
+	details: Partial<IrcDetails>,
+	args: IrcRenderArgs | undefined,
+	expanded: boolean,
+	theme: Theme,
+): string[] {
+	const waited = details.waited;
+	if (!waited) {
+		const text = textContent(result) || "No message arrived.";
+		return [
+			renderStatusLine(
+				{ icon: "warning", title: `IRC ${theme.nav.back} ${args?.from?.trim() || "anyone"}`, meta: ["timed out"] },
+				theme,
+			),
+			`  ${theme.fg("muted", replaceTabs(text))}`,
+		];
+	}
+	const meta = [messageAge(waited.ts)];
+	if (waited.replyTo) meta.push("reply");
+	return [
+		renderStatusLine({ iconOverride: ircGlyph(theme), title: `IRC ${theme.nav.back} ${waited.from}`, meta }, theme),
+		...bodyLines(waited.body, expanded, theme, { indent: "  " }),
+	];
+}
+
+function renderInboxResult(
+	details: Partial<IrcDetails>,
+	args: IrcRenderArgs | undefined,
+	expanded: boolean,
+	theme: Theme,
+): string[] {
+	const messages = details.inbox ?? [];
+	if (messages.length === 0) {
+		return [renderStatusLine({ iconOverride: ircGlyph(theme), title: "IRC inbox", meta: ["empty"] }, theme)];
 	}
+	const meta = [`${messages.length} ${messages.length === 1 ? "message" : "messages"}`];
+	if (args?.peek) meta.push("peek");
+	const header = renderStatusLine({ iconOverride: ircGlyph(theme), title: "IRC inbox", meta }, theme);
+	const items = renderTreeList<IrcMessage>(
+		{
+			items: messages,
+			expanded,
+			maxCollapsed: PREVIEW_LIMITS.COLLAPSED_ITEMS,
+			itemType: "message",
+			renderItem: msg => {
+				const age = messageAge(msg.ts);
+				const replyBadge = msg.replyTo ? ` ${formatBadge("reply", "muted", theme)}` : "";
+				const head = `${theme.fg("accent", msg.from)}${age ? ` ${theme.fg("dim", age)}` : ""}${replyBadge}`;
+				return [head, ...bodyLines(msg.body, expanded, theme, { collapsedLines: 1 })];
+			},
+		},
+		theme,
+	);
+	return [header, ...items];
 }
+
+function renderListResult(details: Partial<IrcDetails>, expanded: boolean, theme: Theme): string[] {
+	const peers = [...(details.peers ?? [])].sort(
+		(a, b) =>
+			(PEER_STATUS_ORDER[a.status] ?? 9) - (PEER_STATUS_ORDER[b.status] ?? 9) || b.lastActivity - a.lastActivity,
+	);
+	if (peers.length === 0) {
+		return [renderStatusLine({ icon: "info", title: "IRC peers", meta: ["no other agents"] }, theme)];
+	}
+	const counts = new Map<string, number>();
+	for (const peer of peers) counts.set(peer.status, (counts.get(peer.status) ?? 0) + 1);
+	const meta = [...counts].map(([status, count]) => `${count} ${status}`);
+	const unreadTotal = peers.reduce((sum, peer) => sum + peer.unread, 0);
+	if (unreadTotal > 0) meta.push(theme.fg("warning", `${unreadTotal} unread`));
+	const header = renderStatusLine({ iconOverride: ircGlyph(theme), title: "IRC peers", meta }, theme);
+	const items = renderTreeList(
+		{
+			items: peers,
+			expanded,
+			maxCollapsed: PREVIEW_LIMITS.COLLAPSED_ITEMS,
+			itemType: "peer",
+			renderItem: peer => {
+				const kindText = peer.parentId ? `${peer.kind}${theme.sep.dot}of ${peer.parentId}` : peer.kind;
+				const unread = peer.unread > 0 ? ` ${formatBadge(`${peer.unread} unread`, "warning", theme)}` : "";
+				const age = messageAge(peer.lastActivity);
+				return `${peerStatusBadge(peer.status, theme)} ${theme.bold(replaceTabs(peer.id))} ${theme.fg("dim", kindText)}${unread}${age ? ` ${theme.fg("dim", age)}` : ""}`;
+			},
+		},
+		theme,
+	);
+	return [header, ...items];
+}
+
+function buildResultLines(
+	result: { content: Array<{ type: string; text?: string }>; isError?: boolean },
+	details: Partial<IrcDetails>,
+	args: IrcRenderArgs | undefined,
+	expanded: boolean,
+	theme: Theme,
+): string[] {
+	switch (details.op ?? args?.op) {
+		case "send":
+			return renderSendResult(result, details, args, expanded, theme);
+		case "wait":
+			return renderWaitResult(result, details, args, expanded, theme);
+		case "inbox":
+			return renderInboxResult(details, args, expanded, theme);
+		case "list":
+			return renderListResult(details, expanded, theme);
+		default: {
+			const text = textContent(result) || (result.isError ? "IRC call failed." : "Done.");
+			return [
+				renderStatusLine({ icon: result.isError ? "error" : "success", title: callTitle(args, theme) }, theme),
+				result.isError ? formatErrorDetail(text, theme) : `  ${theme.fg("muted", replaceTabs(text))}`,
+			];
+		}
+	}
+}
+
+export const ircToolRenderer = {
+	inline: true,
+	mergeCallAndResult: true,
+
+	renderCall(args: IrcRenderArgs, _options: RenderResultOptions, uiTheme: Theme): Component {
+		const lines = [
+			renderStatusLine({ icon: "pending", title: callTitle(args, uiTheme), meta: callMeta(args) }, uiTheme),
+		];
+		if (args?.op === "send" && args.message?.trim()) {
+			lines.push(...bodyLines(args.message, false, uiTheme, { indent: "  ", tone: "dim", collapsedLines: 1 }));
+		}
+		return new Text(lines.join("\n"), 0, 0);
+	},
+
+	renderResult(
+		result: { content: Array<{ type: string; text?: string }>; details?: IrcDetails; isError?: boolean },
+		options: RenderResultOptions,
+		uiTheme: Theme,
+		args?: IrcRenderArgs,
+	): Component {
+		const details: Partial<IrcDetails> = result.details ?? {};
+		return createCachedComponent(
+			() => options.expanded,
+			(width, expanded) =>
+				buildResultLines(result, details, args, expanded, uiTheme).map(line =>
+					truncateToWidth(line, width, Ellipsis.Unicode),
+				),
+		);
+	},
+};