@dougbots/avenor-pi 0.8.3 → 0.10.0

package/dist/index.js

@@ -1,15 +1,16 @@
 import { Input, Key, Text, matchesKey, truncateToWidth, visibleWidth, wrapTextWithAnsi } from "@earendil-works/pi-tui";
 import { Type } from "typebox";
-import { Supervisor, answerPermissionTool, dial, eventsTool, followUpTool, inspectTool, observeRun, resultTool, shutdownTool, socketsRoot, spawnTool, statusTool } from "@dougbots/avenor-core";
+import { Supervisor, answerPermissionTool, dial, eventsTool, extractEventText, followUpTool, inspectTool, observeRun, resultTool, shutdownTool, socketsRoot, spawnTool, statusTool, validateSpawnSelection } from "@dougbots/avenor-core";
 import * as fs from "node:fs";
 import * as path from "node:path";
+import { createHash } from "node:crypto";
 //#region src/watch.ts
 const ANSI_PATTERN = /[\u001B\u009B][[\]()#;?]*(?:(?:(?:[a-zA-Z\d]*(?:;[a-zA-Z\d]*)*)?\u0007)|(?:(?:\d{1,4}(?:;\d{0,4})*)?[\dA-PR-TZcf-nq-uy=><~]))/g;
 const TRANSCRIPT_SCROLL_STEP = 4;
 const ACTION_STATUS_CHARS = 180;
 const PREVIEW_CHARS = 240;
 const TOOL_PREVIEW_CHARS = 120;
-const FINAL_OUTPUT_CHARS = 600;
+const FINAL_OUTPUT_CHARS$1 = 600;
 const TRANSCRIPT_PADDING = 2;
 const INSPECT_ERROR_PREFIX = "error: ";
 const TERMINAL_STATUSES$1 = new Set([
@@ -90,7 +91,7 @@ function usageSummary(usage) {
 	return parts.join(" · ");
 }
 function finalOutputPreview(status, snapshot) {
-	return clipText(status?.final_output ?? snapshot?.final_output ?? snapshot?.assistant_text, FINAL_OUTPUT_CHARS);
+	return clipText(status?.final_output ?? snapshot?.final_output ?? snapshot?.assistant_text, FINAL_OUTPUT_CHARS$1);
 }
 function currentStatusWord(status, snapshot) {
 	const raw = status?.status?.toLowerCase();
@@ -702,6 +703,542 @@ function resolveAgentProfile(entries, environment = process.env) {
 	return selected;
 }
 //#endregion
+//#region src/events.ts
+/**
+* Public telemetry types and adapters for companion Pi extensions.
+*
+* The transport is Pi's shared `pi.events` bus. This module owns no event
+* handlers or singleton state, so consumers can use the surface even when
+* package dependencies are resolved from different module instances.
+*
+* Payloads select status fields and omit transcripts, final output, directories,
+* socket paths, raw status objects, and tool arguments.
+*/
+/** Emitted when the official extension completes a polling cycle. */
+const CHANNEL_POLL_COMPLETED = "avenor:poll:completed";
+/** Emitted when the extension observes a terminal run result. */
+const CHANNEL_RUN_TERMINAL = "avenor:run:terminal";
+/** Emitted when a best-effort polling operation fails. */
+const CHANNEL_POLL_ERROR = "avenor:poll:error";
+/** Maximum sanitized error text exposed to companion extensions. */
+const POLL_ERROR_TEXT_CHARS = 600;
+function sanitizeAndBoundText(value) {
+	const text = sanitizeText(String(value)).trim();
+	if (!text) return "unknown error";
+	return text.length <= POLL_ERROR_TEXT_CHARS ? text : `${text.slice(0, POLL_ERROR_TEXT_CHARS - 1)}…`;
+}
+function createSupervisorKey(supervisorId) {
+	if (!supervisorId) return "singleton";
+	return `supervisor:${createHash("sha256").update(supervisorId).digest("hex").slice(0, 16)}`;
+}
+/** Emit an Avenor event with a type-checked payload. */
+function emitAvenorEvent(bus, event, data) {
+	bus.emit(event, data);
+}
+/** Subscribe to an Avenor event and return Pi's unsubscribe function. */
+function onAvenorEvent(bus, event, handler) {
+	return bus.on(event, handler);
+}
+/**
+* Copy and freeze the selected fields exposed to companion consumers.
+* Keep this allowlist explicit so future private RunStatusEntry fields are not
+* included in the event accidentally.
+*/
+function createPollCompletedPayload(entries, timestamp, generation) {
+	const publicEntries = entries.map((entry) => Object.freeze({
+		runId: entry.runId,
+		supervisorKey: createSupervisorKey(entry.supervisorId),
+		...entry.runtimeId !== void 0 && { runtimeId: entry.runtimeId },
+		label: entry.label,
+		status: entry.status,
+		...entry.phase !== void 0 && { phase: entry.phase },
+		...entry.phaseLabel !== void 0 && { phaseLabel: entry.phaseLabel },
+		agent: entry.agent,
+		...entry.pendingPermission !== void 0 && { pendingPermission: entry.pendingPermission },
+		...entry.backend !== void 0 && { backend: entry.backend },
+		...entry.nestedCount !== void 0 && { nestedCount: entry.nestedCount }
+	}));
+	return Object.freeze({
+		entries: Object.freeze(publicEntries),
+		timestamp,
+		generation
+	});
+}
+/** Copy and freeze a terminal payload before publishing it. */
+function createRunTerminalPayload(payload) {
+	return Object.freeze({
+		runId: payload.runId,
+		supervisorKey: createSupervisorKey(payload.supervisorId),
+		...payload.runtimeId !== void 0 && { runtimeId: payload.runtimeId },
+		label: payload.label,
+		agent: payload.agent,
+		status: payload.status,
+		...payload.nestedCount !== void 0 && { nestedCount: payload.nestedCount },
+		...payload.backend !== void 0 && { backend: payload.backend }
+	});
+}
+/** Copy, bound, sanitize, and freeze a polling error before publishing it. */
+function createPollErrorPayload(payload) {
+	return Object.freeze({
+		source: payload.source,
+		...payload.runId !== void 0 && { runId: payload.runId },
+		message: sanitizeAndBoundText(payload.message),
+		error: sanitizeAndBoundText(payload.error),
+		count: payload.count,
+		timestamp: payload.timestamp
+	});
+}
+//#endregion
+//#region src/render.ts
+const FINAL_OUTPUT_CHARS = 600;
+const SCALAR_CHARS = 240;
+const EVENT_CHARS = 600;
+const PREVIEW_LINES = 12;
+const STATUS_ROWS = 12;
+const COLLECTION_ITEMS = 8;
+const INSPECT_ITEMS = 5;
+const CLEANUP_ITEMS = 8;
+function asRecord(value) {
+	return value && typeof value === "object" && !Array.isArray(value) ? value : void 0;
+}
+function stringValue(value) {
+	return typeof value === "string" && value.trim() ? value : void 0;
+}
+function numberValue(value) {
+	if (typeof value === "number" && Number.isFinite(value)) return value;
+	if (typeof value === "string" && value.trim() && Number.isFinite(Number(value))) return Number(value);
+}
+function itemMarker(count) {
+	return `… ${count} items omitted`;
+}
+function lineMarker(count) {
+	return `… ${count} lines omitted`;
+}
+function characterMarker(count) {
+	return `[preview clipped: ${count} characters omitted]`;
+}
+function cleanMultiline(value) {
+	if (typeof value !== "string") return void 0;
+	return sanitizeText(value).trim() || void 0;
+}
+function leadingClip(value, limit) {
+	if (value.length <= limit) return { text: value };
+	let prefixLength = Math.max(0, limit - characterMarker(value.length).length);
+	for (let attempt = 0; attempt < 3; attempt++) {
+		const omitted = value.length - prefixLength;
+		const nextPrefixLength = Math.max(0, limit - characterMarker(omitted).length);
+		if (nextPrefixLength === prefixLength) break;
+		prefixLength = nextPrefixLength;
+	}
+	const clipped = clipText(value, Math.max(1, prefixLength + 1)) ?? "";
+	const text = clipped.endsWith("…") ? clipped.slice(0, -1) : clipped.slice(0, prefixLength);
+	return {
+		text,
+		omitted: value.length - text.length
+	};
+}
+function scalar(value, fallback = "unknown", limit = SCALAR_CHARS) {
+	const clean = cleanMultiline(typeof value === "string" ? value : void 0);
+	if (!clean) return fallback;
+	const clipped = leadingClip(clean.replace(/[\r\n]+/g, " ").replace(/\s+/g, " ").trim(), limit);
+	return clipped.omitted === void 0 ? clipped.text : `${clipped.text}${characterMarker(clipped.omitted)}`;
+}
+function optionalScalar(value, limit = SCALAR_CHARS) {
+	const clean = cleanMultiline(typeof value === "string" ? value : void 0);
+	return clean ? scalar(clean, "unknown", limit) : void 0;
+}
+function preview(value, limit) {
+	const clean = cleanMultiline(value);
+	if (!clean) return void 0;
+	const clipped = leadingClip(clean, limit);
+	const lines = clipped.text.split("\n").slice(0, PREVIEW_LINES);
+	const omittedLines = Math.max(0, clean.split("\n").length - lines.length);
+	return [
+		...lines,
+		...clipped.omitted === void 0 ? [] : [characterMarker(clipped.omitted)],
+		...omittedLines === 0 ? [] : [lineMarker(omittedLines)]
+	];
+}
+function quoted(value) {
+	return `"${scalar(value).replaceAll("\\", "\\\\").replaceAll("\"", "\\\"")}"`;
+}
+function optionalQuoted(value) {
+	return stringValue(value) ? quoted(value) : void 0;
+}
+function optionalNumber(value) {
+	return numberValue(value) === void 0 ? void 0 : String(numberValue(value));
+}
+function selected(record, key, fallback, defaultValue = "unknown") {
+	return scalar(stringValue(record?.[key]) ?? stringValue(fallback), defaultValue);
+}
+function selectedOptional(record, key) {
+	return optionalScalar(record?.[key]);
+}
+function hasStatusIdentity(record) {
+	return !!record && !!(stringValue(record.run_id) || stringValue(record.label) || stringValue(record.status));
+}
+function linesText(lines, theme) {
+	return new Text(lines.map((line, index) => theme.fg(index === 0 ? "toolTitle" : "muted", index === 0 ? theme.bold(line) : line)).join("\n"), 0, 0);
+}
+function fallback(tool) {
+	return [`Avenor ${tool} result unavailable.`, "Retry the tool or use avenor_status/avenor_inspect."];
+}
+function partial(result) {
+	const details = asRecord(result.details);
+	const label = optionalScalar(details?.label);
+	const status = optionalScalar(details?.status);
+	if (label && status) return [`Working: ${label} — ${status}`];
+	if (status) return [`Working: ${status}`];
+	if (label) return [`Working: ${label}`];
+	const content = result.content?.[0]?.text;
+	const firstLine = typeof content === "string" ? content.split(/\r?\n/).find((line) => line.trim()) : void 0;
+	if (firstLine) {
+		const clean = scalar(firstLine, "", SCALAR_CHARS);
+		if (clean && !clean.startsWith("{") && !clean.startsWith("[")) return [`Working: ${clean}`];
+	}
+	return ["Working…"];
+}
+function isTerminal(status) {
+	return TERMINAL_STATUSES.has(status);
+}
+function permission(record) {
+	return asRecord(record?.pending_permission);
+}
+function permissionOptions(record) {
+	const options = record?.options;
+	return Array.isArray(options) ? options.map(asRecord).filter((value) => !!value) : [];
+}
+function optionRows(options) {
+	return options.slice(0, COLLECTION_ITEMS).map((option) => `${selected(option, "option_id")} (${selected(option, "label")})`).join(", ");
+}
+function optionLine(prefix, options) {
+	const rows = optionRows(options);
+	const omitted = options.length - Math.min(options.length, COLLECTION_ITEMS);
+	return `${prefix}${rows ? ` ${rows}` : ""}${omitted > 0 ? `${rows ? " " : " "}${itemMarker(omitted)}` : ""}`;
+}
+function guidance(status, pending, runId) {
+	if (status === "waiting") {
+		const options = permissionOptions(pending);
+		if (options.length > 0) return `Guidance: Call avenor_answer_permission with run_id "${runId}" and option_id "${selected(options[0], "option_id")}".`;
+		if (pending) return `Guidance: Permission input is required, but no options are available; call avenor_inspect with run_id "${runId}".`;
+		return `Guidance: Call avenor_follow_up or avenor_status with run_id "${runId}".`;
+	}
+	if (isTerminal(status)) return `Guidance: Call avenor_result or avenor_events with run_id "${runId}".`;
+	return `Guidance: Call avenor_result with run_id "${runId}".`;
+}
+function statusExpanded(status) {
+	return [
+		["Phase", "phase"],
+		["Phase label", "phase_label"],
+		["Session", "session_id"],
+		["Backend", "backend"],
+		["Agent", "agent"],
+		["Model", "model"],
+		["Latest sequence", "latest_seq"],
+		["Stop reason", "stop_reason"]
+	].flatMap(([label, key]) => {
+		const value = key === "latest_seq" ? optionalNumber(status[key]) : selectedOptional(status, key);
+		return value === void 0 ? [] : [`${label}: ${value}`];
+	});
+}
+function statusLines(details, args, expanded) {
+	if (Array.isArray(details)) {
+		const statuses = details.map(asRecord);
+		if (statuses.some((status) => !hasStatusIdentity(status))) return void 0;
+		const displayed = statuses.slice(0, STATUS_ROWS);
+		const lines = [
+			`Avenor status — ${statuses.length} runs`,
+			...displayed.map((status) => {
+				const runId = selected(status, "run_id", args.run_id);
+				return `${selected(status, "label", void 0, runId)} — ${selected(status, "status")} (run_id: ${runId})`;
+			}),
+			...statuses.length > displayed.length ? [itemMarker(statuses.length - displayed.length)] : []
+		];
+		if (!expanded) return lines;
+		for (const status of displayed) {
+			const runId = selected(status, "run_id", args.run_id);
+			lines.push(`Run: ${runId}`, `Label: ${selected(status, "label", void 0, runId)}`, `Status: ${selected(status, "status")}`, ...statusExpanded(status));
+		}
+		return lines;
+	}
+	const status = asRecord(details);
+	if (!hasStatusIdentity(status)) return void 0;
+	const runId = selected(status, "run_id", args.run_id);
+	const label = selected(status, "label", void 0, runId);
+	const state = selected(status, "status");
+	const pending = permission(status);
+	const options = permissionOptions(pending);
+	const finalPreview = preview(status.final_output, FINAL_OUTPUT_CHARS);
+	const lines = [
+		`Status: ${label} — ${state}`,
+		`Run: ${runId}`,
+		...pending ? [`Permission: ${selected(pending, "description")}`, optionLine("Options:", options)] : [],
+		...status.final_output_truncated === true ? [`Warning: final output preview is truncated; call avenor_result with run_id "${runId}".`] : [],
+		...finalPreview ? ["Final output:", ...finalPreview] : ["Final output: unavailable."],
+		guidance(state, pending, runId)
+	];
+	return expanded ? [...lines, ...statusExpanded(status)] : lines;
+}
+function resultLines(details, args, expanded) {
+	const result = asRecord(details);
+	if (!hasStatusIdentity(result)) return void 0;
+	const runId = selected(result, "run_id", args.run_id);
+	const label = selected(result, "label", void 0, runId);
+	const state = selected(result, "status");
+	const pending = permission(result);
+	const finalPreview = preview(result.output, FINAL_OUTPUT_CHARS);
+	const lines = [
+		`Result: ${label} — ${state}`,
+		`Run: ${runId}`,
+		...result.timed_out === true ? ["Warning: wait timed out; the run is still active."] : [],
+		...pending ? [`Permission: ${selected(pending, "description")}`] : [],
+		guidance(state, pending, runId),
+		...result.output_truncated === true ? [stringValue(result.output_event_path) ? `Warning: final output may be truncated; retry avenor_result or read the durable event path "${scalar(result.output_event_path)}".` : `Warning: final output may be truncated; call avenor_events with run_id "${runId}".`] : [],
+		...finalPreview ? ["Final output:", ...finalPreview] : ["Final output: unavailable."]
+	];
+	if (!expanded) return lines;
+	const session = selectedOptional(result, "session_id");
+	const stopReason = selectedOptional(result, "stop_reason");
+	return [
+		...lines,
+		...session ? [`Session: ${session}`] : [],
+		...stopReason ? [`Stop reason: ${stopReason}`] : []
+	];
+}
+function permissionLines(details, args) {
+	const result = asRecord(details);
+	if (!result || typeof result.ok !== "boolean") return void 0;
+	const runId = scalar(args.run_id);
+	return [
+		`Permission answer: ${result.ok ? "accepted" : "failed"}.`,
+		`Run: ${runId}`,
+		`Option: ${scalar(args.option_id)}`,
+		...stringValue(args.request_id) ? [`Request: ${scalar(args.request_id)}`] : [],
+		`Guidance: Call avenor_status with run_id "${runId}" to verify the permission state.`
+	];
+}
+function followUpLines(details, args) {
+	const result = asRecord(details);
+	if (!result || !stringValue(result.run_id) || !stringValue(result.label)) return void 0;
+	const runId = selected(result, "run_id", args.run_id);
+	const label = selected(result, "label", args.label, runId);
+	return [
+		`Follow-up: ${label} — dispatched.`,
+		`Source run: ${scalar(args.run_id)}`,
+		`Run: ${runId}`,
+		`Label: ${label}`,
+		`Guidance: Call avenor_status with run_id "${runId}".`
+	];
+}
+function eventSequence(value) {
+	if (typeof value === "number" && Number.isFinite(value)) return String(value);
+	return typeof value === "string" && value.trim() && Number.isFinite(Number(value)) ? value : void 0;
+}
+function eventRow(value) {
+	const name = stringValue(value.event) ?? stringValue(value.type) ?? "unknown";
+	const sequence = eventSequence(value.seq);
+	const text = extractEventText(value);
+	const previewText = text ? scalar(text, "unknown", EVENT_CHARS) : void 0;
+	return `Event ${sequence ?? "?"}: ${scalar(name)}${previewText ? ` — ${previewText}` : ""}`;
+}
+function eventsLines(details, args, expanded) {
+	const result = asRecord(details);
+	if (!result || !Array.isArray(result.events) || result.events.some((event) => !asRecord(event))) return void 0;
+	const events = result.events.map((event) => event);
+	const runId = scalar(args.run_id);
+	const types = Array.isArray(args.types) ? args.types : [];
+	const displayedTypes = types.slice(0, COLLECTION_ITEMS).map((type) => scalar(type)).join(", ");
+	const lines = [`Events: ${runId} — ${events.length} events`, ...types.length > 0 ? [`Filter: ${displayedTypes}${types.length > COLLECTION_ITEMS ? ` ${itemMarker(types.length - COLLECTION_ITEMS)}` : ""}`] : []];
+	if (events.length === 0) return [...lines, "No events."];
+	if (!expanded) {
+		lines.push(`Preview: ${eventRow(events[0])}`);
+		if (events.length > 1) lines.push(itemMarker(events.length - 1));
+		return lines;
+	}
+	const displayed = events.slice(0, STATUS_ROWS);
+	lines.push(...displayed.map(eventRow));
+	if (events.length > displayed.length) lines.push(itemMarker(events.length - displayed.length));
+	return lines;
+}
+function inspectTranscriptRow(value) {
+	const kind = stringValue(value.kind);
+	const text = optionalScalar(value.text);
+	if (!kind) return void 0;
+	if (kind === "tool") {
+		const title = selected(value, "title", stringValue(value.kind) ?? stringValue(value.key));
+		const status = optionalScalar(value.status);
+		return `${title}${status ? ` (${status})` : ""}${text ? `: ${text}` : ""}`;
+	}
+	if (!text) return void 0;
+	if ([
+		"assistant",
+		"thought",
+		"user",
+		"permission",
+		"status",
+		"session"
+	].includes(kind)) return `${kind}: ${text}`;
+}
+function inspectToolRow(prefix, value) {
+	const title = selected(value, "title", stringValue(value.kind) ?? stringValue(value.key));
+	const status = optionalScalar(value.status);
+	const text = optionalScalar(value.preview);
+	return `${prefix}: ${title}${status ? ` (${status})` : ""}${text ? `: ${text}` : ""}`;
+}
+function inspectPermissionRow(value) {
+	const description = scalar(stringValue(value.description) ?? stringValue(value.question) ?? stringValue(value.tool) ?? stringValue(value.kind));
+	const options = permissionOptions(value);
+	const rows = optionRows(options);
+	return `Permission: ${description} (request_id: ${selected(value, "request_id")}); options:${rows ? ` ${rows}` : ""}${options.length > COLLECTION_ITEMS ? ` ${itemMarker(options.length - COLLECTION_ITEMS)}` : ""}`;
+}
+function inspectGroup(title, values, row) {
+	const rows = (Array.isArray(values) ? values.map(asRecord).filter((value) => !!value) : []).map(row).filter((value) => !!value);
+	return [
+		`${title}:`,
+		...rows.slice(0, INSPECT_ITEMS),
+		...rows.length > INSPECT_ITEMS ? [itemMarker(rows.length - INSPECT_ITEMS)] : []
+	];
+}
+function inspectLines(details, args, expanded) {
+	const inspect = asRecord(details);
+	const status = asRecord(inspect?.status);
+	if (!inspect || !status || !hasStatusIdentity(inspect) && !hasStatusIdentity(status)) return void 0;
+	const runId = selected(inspect, "run_id", args.run_id);
+	const label = selected(inspect, "label", void 0, runId);
+	const state = selected(status, "status");
+	const finalPreview = preview(inspect.final_output, FINAL_OUTPUT_CHARS);
+	const transcript = Array.isArray(inspect.transcript) ? inspect.transcript : [];
+	const tools = Array.isArray(inspect.tools) ? inspect.tools : [];
+	const liveTools = Array.isArray(inspect.live_tools) ? inspect.live_tools : [];
+	const permissions = Array.isArray(inspect.permissions) ? inspect.permissions : [];
+	const lines = [
+		`Inspect: ${label} — ${state}`,
+		`Run: ${runId}`,
+		`Counts: transcript=${transcript.length}, tools=${tools.length}, live_tools=${liveTools.length}, permissions=${permissions.length}`,
+		...finalPreview ? ["Final output:", ...finalPreview] : ["Final output: unavailable."],
+		`Guidance: Call avenor_events with run_id "${runId}" for raw events.`
+	];
+	if (!expanded) return lines;
+	return [
+		...lines,
+		...inspectGroup("Transcript", transcript, inspectTranscriptRow),
+		...inspectGroup("Tools", tools, (value) => inspectToolRow("Tool", value)),
+		...inspectGroup("Live tools", liveTools, (value) => inspectToolRow("Live tool", value)),
+		...inspectGroup("Permissions", permissions, inspectPermissionRow)
+	];
+}
+function shutdownLines(details, args, expanded) {
+	const result = asRecord(details);
+	if (!result || typeof result.ok !== "boolean" || !Array.isArray(result.cleaned_up)) return void 0;
+	const paths = result.cleaned_up.filter((path) => typeof path === "string");
+	const supervisor = stringValue(args.supervisor_id) ? scalar(args.supervisor_id) : "singleton";
+	const lines = [
+		`Avenor shutdown: ${result.ok ? "succeeded" : "failed"}.`,
+		`Supervisor: ${supervisor}`,
+		`Mode: ${args.force === true ? "force" : "graceful"}`,
+		paths.length > 0 ? `Cleanup: ${paths.length} paths` : "Cleanup: none",
+		...!result.ok ? ["Warning: shutdown did not complete.", "Guidance: retry avenor_shutdown."] : []
+	];
+	if (!expanded) return lines;
+	return [
+		...lines,
+		...paths.slice(0, CLEANUP_ITEMS).map((path) => `Cleanup path: ${scalar(path)}`),
+		...paths.length > CLEANUP_ITEMS ? [itemMarker(paths.length - CLEANUP_ITEMS)] : []
+	];
+}
+function render(tool, result, options, theme, build) {
+	try {
+		return linesText(options.isPartial ? partial(result) : build() ?? fallback(tool), theme);
+	} catch {
+		return new Text(fallback(tool).join("\n"), 0, 0);
+	}
+}
+function renderStatusCall(args, theme) {
+	const pieces = stringValue(args.run_id) ? [`avenor_status run_id ${quoted(args.run_id)}`] : ["avenor_status (all runs)"];
+	const view = optionalQuoted(args.view);
+	const supervisor = optionalQuoted(args.supervisor_id);
+	if (view) pieces.push(`view ${view}`);
+	if (supervisor) pieces.push(`supervisor_id ${supervisor}`);
+	return linesText([pieces.join(" ")], theme);
+}
+function renderResultCall(args, theme) {
+	const pieces = [`avenor_result run_id ${quoted(args.run_id)}`];
+	if (args.wait !== void 0) pieces.push(`wait=${args.wait}`);
+	const timeout = optionalQuoted(args.timeout);
+	const supervisor = optionalQuoted(args.supervisor_id);
+	if (timeout) pieces.push(`timeout ${timeout}`);
+	if (supervisor) pieces.push(`supervisor_id ${supervisor}`);
+	return linesText([pieces.join(" ")], theme);
+}
+function renderInspectCall(args, theme) {
+	const pieces = [`avenor_inspect run_id ${quoted(args.run_id)}`];
+	const limit = optionalNumber(args.limit);
+	const afterSequence = optionalNumber(args.after_seq);
+	const supervisor = optionalQuoted(args.supervisor_id);
+	if (limit) pieces.push(`limit=${limit}`);
+	if (afterSequence) pieces.push(`after_seq=${afterSequence}`);
+	if (supervisor) pieces.push(`supervisor_id ${supervisor}`);
+	return linesText([pieces.join(" ")], theme);
+}
+function renderAnswerPermissionCall(args, theme) {
+	const pieces = [`avenor_answer_permission run_id ${quoted(args.run_id)}`, `option_id ${quoted(args.option_id)}`];
+	const request = optionalQuoted(args.request_id);
+	const message = optionalQuoted(args.message);
+	const supervisor = optionalQuoted(args.supervisor_id);
+	if (request) pieces.push(`request_id ${request}`);
+	if (message) pieces.push(`message ${message}`);
+	if (supervisor) pieces.push(`supervisor_id ${supervisor}`);
+	return linesText([pieces.join(" ")], theme);
+}
+function renderFollowUpCall(args, theme) {
+	const pieces = [`avenor_follow_up run_id ${quoted(args.run_id)}`, `message ${quoted(args.message)}`];
+	const label = optionalQuoted(args.label);
+	const supervisor = optionalQuoted(args.supervisor_id);
+	if (label) pieces.push(`label ${label}`);
+	if (supervisor) pieces.push(`supervisor_id ${supervisor}`);
+	return linesText([pieces.join(" ")], theme);
+}
+function renderEventsCall(args, theme) {
+	const pieces = [`avenor_events run_id ${quoted(args.run_id)}`];
+	if (Array.isArray(args.types)) {
+		const shown = args.types.slice(0, COLLECTION_ITEMS).map(quoted).join(", ");
+		pieces.push(`types=[${shown}]${args.types.length > COLLECTION_ITEMS ? ` ${itemMarker(args.types.length - COLLECTION_ITEMS)}` : ""}`);
+	}
+	const limit = optionalNumber(args.limit);
+	const supervisor = optionalQuoted(args.supervisor_id);
+	if (limit) pieces.push(`limit=${limit}`);
+	if (supervisor) pieces.push(`supervisor_id ${supervisor}`);
+	return linesText([pieces.join(" ")], theme);
+}
+function renderShutdownCall(args, theme) {
+	const pieces = ["avenor_shutdown"];
+	const supervisor = optionalQuoted(args.supervisor_id);
+	if (supervisor) pieces.push(`supervisor_id ${supervisor}`);
+	if (args.force !== void 0) pieces.push(`force=${args.force}`);
+	return linesText([pieces.join(" ")], theme);
+}
+function renderStatusResult(result, options, theme, args) {
+	return render("status", result, options, theme, () => statusLines(result.details, args, options.expanded));
+}
+function renderResultResult(result, options, theme, args) {
+	return render("result", result, options, theme, () => resultLines(result.details, args, options.expanded));
+}
+function renderInspectResult(result, options, theme, args) {
+	return render("inspect", result, options, theme, () => inspectLines(result.details, args, options.expanded));
+}
+function renderAnswerPermissionResult(result, options, theme, args) {
+	return render("answer_permission", result, options, theme, () => permissionLines(result.details, args));
+}
+function renderFollowUpResult(result, options, theme, args) {
+	return render("follow_up", result, options, theme, () => followUpLines(result.details, args));
+}
+function renderEventsResult(result, options, theme, args) {
+	return render("events", result, options, theme, () => eventsLines(result.details, args, options.expanded));
+}
+function renderShutdownResult(result, options, theme, args) {
+	return render("shutdown", result, options, theme, () => shutdownLines(result.details, args, options.expanded));
+}
+//#endregion
 //#region src/index.ts
 const POLL_INTERVAL_MS = 3e3;
 const INSPECT_LIMIT = 128;
@@ -710,6 +1247,7 @@ const INSPECT_JSON_STRING_CHARS = 600;
 const INSPECT_JSON_ARRAY_ITEMS = 24;
 const INSPECT_JSON_OBJECT_KEYS = 24;
 const INSPECT_JSON_DEPTH = 8;
+const MAX_POLL_ERRORS = 100;
 const defaultDeps = {
 	spawnTool,
 	statusTool,
@@ -726,6 +1264,19 @@ const defaultDeps = {
 function statusSupervisorId(requestedSupervisorId, spawnedSupervisorId) {
 	return requestedSupervisorId ? spawnedSupervisorId : void 0;
 }
+/** Project shared spawn identity into Pi tool metadata without resolving rosters here. */
+function spawnIdentityMetadata(params, status) {
+	const metadata = {};
+	const add = (key, value) => {
+		if (typeof value === "string" && value.length > 0) metadata[key] = value;
+	};
+	add("roster_file", status?.roster_file ?? params.roster_file);
+	add("roster_entry", status?.roster_entry ?? params.roster_entry);
+	add("effective_agent", status?.effective_agent ?? status?.agent ?? params.agent);
+	add("effective_model", status?.effective_model ?? status?.model ?? params.model);
+	add("effective_backend", status?.effective_backend ?? status?.backend ?? params.backend);
+	return metadata;
+}
 function sleep(ms) {
 	return new Promise((resolve) => setTimeout(resolve, ms));
 }
@@ -751,7 +1302,8 @@ function buildCompletionText(run, result, finalOutput) {
 }
 function buildWaitingText(run, status) {
 	const perm = status.pending_permission;
-	const lines = [`Sub-agent "${run.label}" (${run.agent}) is waiting for input.`];
+	const agent = run.agent ?? status.effective_agent ?? status.agent ?? "roster";
+	const lines = [`Sub-agent "${run.label}" (${agent}) is waiting for input.`];
 	if (perm) lines.push(`Permission request: ${perm.description}`, `To answer: call \`avenor_answer_permission\` with run_id "${run.runId}", option_id "allow_once" | "allow_always" | "deny"`);
 	else if (status.phase_label) lines.push(`Question: ${status.phase_label}`);
 	if (!perm) lines.push(`Use \`avenor_follow_up\` with run_id "${run.runId}" to respond, or \`avenor_inspect\` to review context first.`);
@@ -837,11 +1389,34 @@ function toWatchRunRef(run) {
 }
 function createExtension(deps = defaultDeps) {
 	return async function(pi) {
+		let telemetryGeneration = 0;
 		const trackedRuns = /* @__PURE__ */ new Map();
 		let pollingActive = false;
 		let pollingGeneration = 0;
 		let pollInFlight = null;
 		let sessionCtx = null;
+		let pollingErrorCount = 0;
+		const pollingErrors = [];
+		let lastStatusEntries = [];
+		function recordPollingError(source, message, error, runId) {
+			pollingErrorCount++;
+			const payload = createPollErrorPayload({
+				source,
+				runId,
+				message,
+				error,
+				count: pollingErrorCount,
+				timestamp: Date.now()
+			});
+			pollingErrors.push(payload);
+			if (pollingErrors.length > MAX_POLL_ERRORS) pollingErrors.shift();
+			emitAvenorEvent(pi.events, CHANNEL_POLL_ERROR, payload);
+		}
+		function clearPollingErrors() {
+			pollingErrorCount = 0;
+			pollingErrors.length = 0;
+			updateWidget(lastStatusEntries);
+		}
 		function upsertTrackedRun(run, status, blocking = false) {
 			const current = trackedRuns.get(run.runId);
 			trackedRuns.set(run.runId, {
@@ -872,13 +1447,14 @@ function createExtension(deps = defaultDeps) {
 			}
 		}
 		async function pollRuns() {
+			const errorCountAtPollStart = pollingErrorCount;
 			const liveMap = /* @__PURE__ */ new Map();
 			try {
 				const allLive = await deps.statusTool({});
 				const liveList = Array.isArray(allLive) ? allLive : [allLive];
 				for (const result of liveList) liveMap.set(result.run_id, result);
 			} catch (err) {
-				console.error("avenor pollRuns: failed to list singleton runs", err);
+				recordPollingError("singleton-list", "failed to list singleton runs", err);
 			}
 			const entries = [];
 			for (const run of trackedRuns.values()) {
@@ -886,13 +1462,16 @@ function createExtension(deps = defaultDeps) {
 				if (live) {
 					liveMap.delete(live.run_id);
 					run.lastStatus = live;
+					run.agent = live.agent ?? run.agent;
 					entries.push({
 						runId: run.runId,
+						supervisorId: run.supervisorId,
+						runtimeId: live.runtime_id ?? run.runtimeId,
 						label: run.label,
 						status: live.status,
 						phase: live.phase,
 						phaseLabel: live.phase_label,
-						agent: run.agent,
+						agent: run.agent ?? "unknown",
 						pendingPermission: !!live.pending_permission,
 						permissionDescription: live.pending_permission?.description,
 						pid: live.pid,
@@ -908,28 +1487,33 @@ function createExtension(deps = defaultDeps) {
 					const result = Array.isArray(raw) ? raw[0] : raw;
 					if (!result) throw new Error("status response was empty");
 					run.lastStatus = result;
+					run.agent = result.agent ?? run.agent;
 					entries.push({
 						runId: run.runId,
+						supervisorId: run.supervisorId,
+						runtimeId: result.runtime_id ?? run.runtimeId,
 						label: run.label,
 						status: result.status,
 						phase: result.phase,
 						phaseLabel: result.phase_label,
-						agent: run.agent,
+						agent: run.agent ?? "unknown",
 						pendingPermission: !!result.pending_permission,
 						permissionDescription: result.pending_permission?.description,
 						pid: result.pid,
 						backend: result.backend
 					});
 				} catch (err) {
-					console.error(`avenor pollRuns: statusTool failed for ${run.runId}`, err);
+					recordPollingError("run-status", "statusTool failed while polling a run", err, run.runId);
 					const previous = run.lastStatus;
 					entries.push({
 						runId: run.runId,
+						supervisorId: run.supervisorId,
+						runtimeId: previous?.runtime_id ?? run.runtimeId,
 						label: run.label,
 						status: previous?.status ?? "unavailable",
 						phase: previous?.phase,
 						phaseLabel: previous?.phase_label,
-						agent: run.agent,
+						agent: run.agent ?? previous?.agent ?? "unknown",
 						pendingPermission: !!previous?.pending_permission,
 						permissionDescription: previous?.pending_permission?.description,
 						pid: previous?.pid,
@@ -939,6 +1523,7 @@ function createExtension(deps = defaultDeps) {
 			}
 			for (const live of liveMap.values()) entries.push({
 				runId: live.run_id,
+				runtimeId: live.runtime_id,
 				label: live.label,
 				status: live.status,
 				phase: live.phase,
@@ -955,21 +1540,24 @@ function createExtension(deps = defaultDeps) {
 				let idx = 0;
 				for (const entry of entries) if (entry.backend === "pi" && entry.pid && !isTerminalStatus(entry.status)) entry.nestedCount = nestedCounts[idx++] ?? 0;
 			}
+			if (pollingErrorCount === errorCountAtPollStart) pollingErrorCount = 0;
 			return entries;
 		}
 		function updateWidget(entries) {
+			lastStatusEntries = entries;
 			if (!sessionCtx) return;
 			const lines = renderStatusLines(entries);
+			const errorSuffix = pollingErrorCount > 0 ? `errors:${pollingErrorCount}` : "";
 			if (lines.length > 0) {
 				sessionCtx.ui.setWidget("avenor-status", lines);
 				const statusStr = lines.map((line) => line.slice(0, 60)).join("  ");
 				const nestedTotal = entries.filter((e) => !isTerminalStatus(e.status)).reduce((sum, e) => sum + (e.nestedCount ?? 0), 0);
 				const total = lines.length + nestedTotal;
-				const statusWithTotal = nestedTotal > 0 ? `${statusStr}  total:${total}` : statusStr;
+				const statusWithTotal = [nestedTotal > 0 ? `${statusStr}  total:${total}` : statusStr, errorSuffix].filter(Boolean).join("  ");
 				sessionCtx.ui.setStatus("avenor", statusWithTotal);
 			} else {
 				sessionCtx.ui.setWidget("avenor-status", void 0);
-				sessionCtx.ui.setStatus("avenor", "");
+				sessionCtx.ui.setStatus("avenor", errorSuffix);
 			}
 		}
 		function startPolling() {
@@ -987,6 +1575,7 @@ function createExtension(deps = defaultDeps) {
 				});
 				if (!pollingActive || generation !== pollingGeneration) return;
 				updateWidget(entries);
+				emitAvenorEvent(pi.events, CHANNEL_POLL_COMPLETED, createPollCompletedPayload(entries, Date.now(), ++telemetryGeneration));
 				for (const entry of entries) {
 					const run = trackedRuns.get(entry.runId);
 					if (!run) continue;
@@ -1009,6 +1598,16 @@ function createExtension(deps = defaultDeps) {
 						} catch (err) {
 							console.error("avenor tick: sendUserMessage failed", err);
 						}
+						emitAvenorEvent(pi.events, CHANNEL_RUN_TERMINAL, createRunTerminalPayload({
+							runId: entry.runId,
+							supervisorId: entry.supervisorId,
+							runtimeId: entry.runtimeId,
+							label: entry.label,
+							agent: entry.agent,
+							status: entry.status,
+							nestedCount: entry.nestedCount,
+							backend: entry.backend
+						}));
 						trackedRuns.delete(entry.runId);
 					} else if (entry.pendingPermission && !run.blocking && !run.permissionNotified) {
 						run.permissionNotified = true;
@@ -1031,8 +1630,7 @@ function createExtension(deps = defaultDeps) {
 				}, POLL_INTERVAL_MS);
 				else {
 					pollingActive = false;
-					sessionCtx?.ui.setStatus("avenor", "");
-					sessionCtx?.ui.setWidget("avenor-status", void 0);
+					updateWidget([]);
 				}
 			};
 			tick().catch((err) => {
@@ -1044,8 +1642,10 @@ function createExtension(deps = defaultDeps) {
 			pollingActive = false;
 			pollingGeneration++;
 			await pollInFlight?.catch(() => {});
-			sessionCtx?.ui.setStatus("avenor", "");
-			sessionCtx?.ui.setWidget("avenor-status", void 0);
+			pollingErrorCount = 0;
+			pollingErrors.length = 0;
+			lastStatusEntries = [];
+			updateWidget([]);
 		}
 		function createWatchDeps() {
 			async function resolveSupervisorSocket(run) {
@@ -1230,7 +1830,7 @@ function createExtension(deps = defaultDeps) {
 						aborted: false
 					};
 				} catch (err) {
-					console.error("avenor spawn poll: statusTool failed", err);
+					recordPollingError("spawn-status", "statusTool failed while waiting for a run", err, run.runId);
 				}
 			}
 			return { aborted: true };
@@ -1242,6 +1842,9 @@ function createExtension(deps = defaultDeps) {
 		}
 		pi.on("session_start", async (_event, ctx) => {
 			sessionCtx = ctx;
+			lastStatusEntries = [];
+			pollingErrorCount = 0;
+			pollingErrors.length = 0;
 		});
 		pi.on("session_shutdown", async () => {
 			await stopPolling();
@@ -1273,7 +1876,7 @@ function createExtension(deps = defaultDeps) {
 		pi.registerTool({
 			name: "avenor_spawn",
 			label: "Avenor Spawn",
-			description: "Dispatch an agent run via avenor. Blocks by default, showing live progress. Set wait=false for fire-and-forget.",
+			description: "Dispatch an agent run via avenor. Optional thinking accepts off, minimal, low, medium, high, xhigh, or max; unsupported backends reject explicit values. Blocks by default, showing live progress. Set wait=false for fire-and-forget.",
 			promptSnippet: "Dispatch sub-agent runs via avenor (spawn, status, result, inspect, events, follow-up, shutdown)",
 			promptGuidelines: [
 				"Use avenor_spawn to delegate well-defined tasks to sub-agents.",
@@ -1285,14 +1888,25 @@ function createExtension(deps = defaultDeps) {
 				"Use avenor_shutdown when done delegating work."
 			],
 			parameters: Type.Object({
-				agent: Type.String({ description: "Agent name (required, no default)" }),
+				agent: Type.Optional(Type.String({ description: "Optional agent name; omission uses the supplied model or runtime defaults" })),
 				prompt: Type.Optional(Type.String({ description: "Prompt text" })),
 				prompt_file: Type.Optional(Type.String({ description: "Path to prompt file" })),
 				dir: Type.Optional(Type.String({ description: "Working directory (defaults to session directory)" })),
 				label: Type.Optional(Type.String({ description: "Human-readable label for the run" })),
 				timeout: Type.Optional(Type.String({ description: "Timeout duration (e.g. 3600s)" })),
 				model: Type.Optional(Type.String({ description: "Model override" })),
-				backend: Type.Optional(Type.String({ description: "Backend override (defaults to pi)" })),
+				thinking: Type.Optional(Type.Union([
+					Type.Literal("off"),
+					Type.Literal("minimal"),
+					Type.Literal("low"),
+					Type.Literal("medium"),
+					Type.Literal("high"),
+					Type.Literal("xhigh"),
+					Type.Literal("max")
+				], { description: "Thinking level; omission uses the backend default" })),
+				backend: Type.Optional(Type.String({ description: "Backend override (defaults to pi for direct mode)" })),
+				roster_file: Type.Optional(Type.String({ description: "Path to the roster map" })),
+				roster_entry: Type.Optional(Type.String({ description: "Roster entry to select" })),
 				server_url: Type.Optional(Type.String({ description: "Backend server URL" })),
 				supervisor_id: Type.Optional(Type.String({ description: "Reuse an existing supervisor by socket path" })),
 				wait: Type.Optional(Type.Boolean({ description: "Block until complete (default true)" }))
@@ -1302,24 +1916,39 @@ function createExtension(deps = defaultDeps) {
 					type: "text",
 					text: "Cancelled"
 				}] };
+				validateSpawnSelection({
+					agent: params.agent,
+					model: params.model,
+					backend: params.backend,
+					roster_file: params.roster_file,
+					roster_entry: params.roster_entry
+				});
 				const wait = params.wait ?? true;
 				const dir = params.dir ?? ctx.cwd;
-				const label = params.label ?? `${params.agent}-${Date.now()}`;
-				const backend = params.backend ?? "pi";
+				const label = params.label ?? `${params.agent ?? params.roster_entry ?? params.model ?? "avenor"}-${Date.now()}`;
+				const rosterMode = Boolean(params.roster_entry);
+				const backend = rosterMode ? params.backend : params.backend ?? "pi";
 				const entries = ctx.sessionManager?.getEntries?.();
-				const agentProfile = backend === "pi" ? resolveAgentProfile(entries) : void 0;
+				const agentProfile = rosterMode || backend === "pi" ? resolveAgentProfile(entries) : void 0;
+				const hostParams = {
+					...params,
+					backend
+				};
 				const result = await deps.spawnTool({
-					agent: params.agent,
-					prompt: params.prompt,
-					promptFile: params.prompt_file,
+					...params.agent !== void 0 ? { agent: params.agent } : {},
+					...params.prompt !== void 0 ? { prompt: params.prompt } : {},
+					...params.prompt_file !== void 0 ? { promptFile: params.prompt_file } : {},
 					label,
 					dir,
-					timeout: params.timeout,
-					model: params.model,
-					backend,
-					agentProfile,
-					serverUrl: params.server_url,
-					supervisorId: params.supervisor_id
+					...params.timeout !== void 0 ? { timeout: params.timeout } : {},
+					...params.model !== void 0 ? { model: params.model } : {},
+					...params.thinking !== void 0 ? { thinking: params.thinking } : {},
+					...backend !== void 0 ? { backend } : {},
+					...params.roster_file !== void 0 ? { rosterFile: params.roster_file } : {},
+					...params.roster_entry !== void 0 ? { rosterEntry: params.roster_entry } : {},
+					...agentProfile !== void 0 ? { agentProfile } : {},
+					...params.server_url !== void 0 ? { serverUrl: params.server_url } : {},
+					...params.supervisor_id !== void 0 ? { supervisorId: params.supervisor_id } : {}
 				});
 				const supervisorId = statusSupervisorId(params.supervisor_id, result.supervisor_id);
 				const runRef = {
@@ -1338,7 +1967,8 @@ function createExtension(deps = defaultDeps) {
 					}],
 					details: {
 						run_id: result.run_id,
-						label
+						label,
+						...spawnIdentityMetadata(hostParams)
 					}
 				};
 				onUpdate?.({
@@ -1359,7 +1989,10 @@ function createExtension(deps = defaultDeps) {
 							type: "text",
 							text: `Monitoring of "${label}" (run_id: ${result.run_id}) was interrupted. Use avenor_status or avenor_inspect to check.`
 						}],
-						details: { run_id: result.run_id }
+						details: {
+							run_id: result.run_id,
+							...spawnIdentityMetadata(hostParams)
+						}
 					};
 				}
 				const status = waitResult.status;
@@ -1370,7 +2003,8 @@ function createExtension(deps = defaultDeps) {
 					}],
 					details: {
 						status: "running",
-						run_id: result.run_id
+						run_id: result.run_id,
+						...spawnIdentityMetadata(hostParams)
 					}
 				};
 				upsertTrackedRun(runRef, status, wait);
@@ -1390,7 +2024,8 @@ function createExtension(deps = defaultDeps) {
 							status: "waiting",
 							run_id: result.run_id,
 							session_id: status.session_id,
-							...status.pending_permission && { pending_permission: status.pending_permission }
+							...status.pending_permission && { pending_permission: status.pending_permission },
+							...spawnIdentityMetadata(hostParams, status)
 						}
 					};
 				}
@@ -1399,6 +2034,15 @@ function createExtension(deps = defaultDeps) {
 						runId: result.run_id,
 						supervisorId
 					}, status);
+					emitAvenorEvent(pi.events, CHANNEL_RUN_TERMINAL, createRunTerminalPayload({
+						runId: result.run_id,
+						supervisorId,
+						runtimeId: status.runtime_id ?? runRef.runtimeId,
+						label,
+						agent: params.agent,
+						status: status.status,
+						backend: status.backend
+					}));
 					trackedRuns.delete(result.run_id);
 					return {
 						content: [{
@@ -1412,7 +2056,8 @@ function createExtension(deps = defaultDeps) {
 							status: status.status,
 							run_id: result.run_id,
 							session_id: status.session_id,
-							final_output: finalOutput
+							final_output: finalOutput,
+							...spawnIdentityMetadata(hostParams, status)
 						}
 					};
 				}
@@ -1423,13 +2068,14 @@ function createExtension(deps = defaultDeps) {
 					}],
 					details: {
 						status: status.status,
-						run_id: result.run_id
+						run_id: result.run_id,
+						...spawnIdentityMetadata(hostParams, status)
 					}
 				};
 			},
 			renderCall(args, theme) {
 				const agent = theme.fg("toolTitle", theme.bold("avenor_spawn "));
-				const agentName = theme.fg("accent", args.agent);
+				const agentName = theme.fg("accent", args.agent ?? args.roster_entry ?? args.model ?? "roster");
 				const label = args.label ? theme.fg("dim", ` "${args.label}"`) : "";
 				const wait = args.wait === false ? theme.fg("warning", " [async]") : "";
 				return new Text(agent + agentName + label + wait, 0, 0);
@@ -1474,6 +2120,15 @@ function createExtension(deps = defaultDeps) {
 					}],
 					details: result
 				};
+			},
+			renderCall(args, theme, context) {
+				return renderStatusCall(context.args, theme);
+			},
+			renderResult(result, { expanded, isPartial }, theme, context) {
+				return renderStatusResult(result, {
+					expanded,
+					isPartial
+				}, theme, context.args);
 			}
 		});
 		pi.registerTool({
@@ -1500,8 +2155,17 @@ function createExtension(deps = defaultDeps) {
 						signal
 					});
 					completed = result.ready;
-					if (completed) trackedRuns.delete(params.run_id);
-					else if (tracked && result.status === "waiting") tracked.permissionNotified = true;
+					if (completed) {
+						emitAvenorEvent(pi.events, CHANNEL_RUN_TERMINAL, createRunTerminalPayload({
+							runId: params.run_id,
+							supervisorId: tracked?.supervisorId ?? params.supervisor_id,
+							runtimeId: tracked?.runtimeId ?? result.runtime_id,
+							label: tracked?.label ?? result.label ?? params.run_id,
+							agent: tracked?.agent ?? "unknown",
+							status: result.status ?? "done"
+						}));
+						trackedRuns.delete(params.run_id);
+					} else if (tracked && result.status === "waiting") tracked.permissionNotified = true;
 					return {
 						content: [{
 							type: "text",
@@ -1512,6 +2176,15 @@ function createExtension(deps = defaultDeps) {
 				} finally {
 					if (!completed && tracked && trackedRuns.get(params.run_id) === tracked) tracked.blocking = previousBlocking ?? false;
 				}
+			},
+			renderCall(args, theme, context) {
+				return renderResultCall(context.args, theme);
+			},
+			renderResult(result, { expanded, isPartial }, theme, context) {
+				return renderResultResult(result, {
+					expanded,
+					isPartial
+				}, theme, context.args);
 			}
 		});
 		pi.registerTool({
@@ -1538,6 +2211,15 @@ function createExtension(deps = defaultDeps) {
 					}],
 					details: payload
 				};
+			},
+			renderCall(args, theme, context) {
+				return renderInspectCall(context.args, theme);
+			},
+			renderResult(result, { expanded, isPartial }, theme, context) {
+				return renderInspectResult(result, {
+					expanded,
+					isPartial
+				}, theme, context.args);
 			}
 		});
 		pi.registerTool({
@@ -1566,6 +2248,15 @@ function createExtension(deps = defaultDeps) {
 					}],
 					details: result
 				};
+			},
+			renderCall(args, theme, context) {
+				return renderAnswerPermissionCall(context.args, theme);
+			},
+			renderResult(result, { expanded, isPartial }, theme, context) {
+				return renderAnswerPermissionResult(result, {
+					expanded,
+					isPartial
+				}, theme, context.args);
 			}
 		});
 		pi.registerTool({
@@ -1613,6 +2304,15 @@ function createExtension(deps = defaultDeps) {
 					}],
 					details: result
 				};
+			},
+			renderCall(args, theme, context) {
+				return renderFollowUpCall(context.args, theme);
+			},
+			renderResult(result, { expanded, isPartial }, theme, context) {
+				return renderFollowUpResult(result, {
+					expanded,
+					isPartial
+				}, theme, context.args);
 			}
 		});
 		pi.registerTool({
@@ -1639,6 +2339,15 @@ function createExtension(deps = defaultDeps) {
 					}],
 					details: result
 				};
+			},
+			renderCall(args, theme, context) {
+				return renderEventsCall(context.args, theme);
+			},
+			renderResult(result, { expanded, isPartial }, theme, context) {
+				return renderEventsResult(result, {
+					expanded,
+					isPartial
+				}, theme, context.args);
 			}
 		});
 		pi.registerTool({
@@ -1663,12 +2372,22 @@ function createExtension(deps = defaultDeps) {
 					}],
 					details: result
 				};
+			},
+			renderCall(args, theme, context) {
+				return renderShutdownCall(context.args, theme);
+			},
+			renderResult(result, { expanded, isPartial }, theme, context) {
+				return renderShutdownResult(result, {
+					expanded,
+					isPartial
+				}, theme, context.args);
 			}
 		});
 		pi.registerCommand("avenor-status", {
 			description: "Show status of all avenor runs",
 			handler: async (_args, ctx) => {
 				const entries = await pollRuns();
+				updateWidget(entries);
 				if (entries.length === 0) {
 					ctx.ui.notify("No active avenor runs", "info");
 					return;
@@ -1676,12 +2395,28 @@ function createExtension(deps = defaultDeps) {
 				ctx.ui.setWidget("avenor-status-detail", entries.map((entry) => formatRunLine(entry)));
 			}
 		});
+		pi.registerCommand("avenor-errors", {
+			description: "Show and clear recent Avenor polling errors",
+			handler: async (_args, ctx) => {
+				if (pollingErrors.length === 0) {
+					ctx.ui.setWidget("avenor-errors", void 0);
+					ctx.ui.notify("No recorded avenor polling errors", "info");
+					return;
+				}
+				const errorLines = pollingErrors.map((error) => {
+					const run = error.runId ? ` [${error.runId}]` : "";
+					return `${new Date(error.timestamp).toLocaleTimeString()} ${error.message}${run}: ${error.error}`;
+				});
+				ctx.ui.setWidget("avenor-errors", errorLines);
+				clearPollingErrors();
+			}
+		});
 		pi.registerCommand("avenor-watch", {
 			description: "Open a live run inspector by run ID, label, or agent name",
 			getArgumentCompletions: (prefix) => {
-				const items = Array.from(trackedRuns.values()).filter((run) => run.label.startsWith(prefix) || run.agent.startsWith(prefix) || run.runId.startsWith(prefix)).map((run) => ({
+				const items = Array.from(trackedRuns.values()).filter((run) => run.label.startsWith(prefix) || run.agent?.startsWith(prefix) || run.runId.startsWith(prefix)).map((run) => ({
 					value: run.runId,
-					label: `${sanitizeText(run.label)} (${sanitizeText(run.agent)}, ${sanitizeText(run.runId).slice(0, 8)})`
+					label: `${sanitizeText(run.label)} (${sanitizeText(run.agent ?? "roster")}, ${sanitizeText(run.runId).slice(0, 8)})`
 				}));
 				return items.length > 0 ? items : null;
 			},
@@ -1703,9 +2438,9 @@ function createExtension(deps = defaultDeps) {
 		pi.registerCommand("avenor-cancel", {
 			description: "Cancel a running avenor sub-agent",
 			getArgumentCompletions: (prefix) => {
-				const items = Array.from(trackedRuns.values()).filter((run) => run.label.startsWith(prefix) || run.agent.startsWith(prefix) || run.runId.startsWith(prefix)).map((run) => ({
+				const items = Array.from(trackedRuns.values()).filter((run) => run.label.startsWith(prefix) || run.agent?.startsWith(prefix) || run.runId.startsWith(prefix)).map((run) => ({
 					value: run.runId,
-					label: `${sanitizeText(run.label)} (${sanitizeText(run.agent)}, ${sanitizeText(run.runId).slice(0, 8)})`
+					label: `${sanitizeText(run.label)} (${sanitizeText(run.agent ?? "roster")}, ${sanitizeText(run.runId).slice(0, 8)})`
 				}));
 				return items.length > 0 ? items : null;
 			},
@@ -1740,4 +2475,4 @@ function createExtension(deps = defaultDeps) {
 }
 var src_default = createExtension();
 //#endregion
-export { buildCompletionText, buildInspectPayload, compactWhitespace, createExtension, src_default as default, isTerminalStatus, renderStatusLines, statusSupervisorId };
+export { CHANNEL_POLL_COMPLETED, CHANNEL_POLL_ERROR, CHANNEL_RUN_TERMINAL, buildCompletionText, buildInspectPayload, compactWhitespace, createExtension, createPollCompletedPayload, createPollErrorPayload, createRunTerminalPayload, src_default as default, emitAvenorEvent, isTerminalStatus, onAvenorEvent, renderStatusLines, spawnIdentityMetadata, statusSupervisorId };