@dougbots/avenor-pi 0.9.0 → 0.10.0

package/README.md

@@ -112,7 +112,7 @@ Available tools for LLM sub-agent management:
 
 | Tool | Description |
 |---|---|
-| `avenor_spawn` | Dispatch an agent run (blocking or fire-and-forget). Uses the `pi` backend by default; accepts `agent`, `model`, `prompt`, and `dir`. |
+| `avenor_spawn` | Dispatch an agent run (blocking or fire-and-forget). Uses the `pi` backend by default in direct mode; accepts optional `agent`, `model`, `prompt`, `dir`, `roster_file`, and `roster_entry`. |
 | `avenor_status` | Get status of a run or all runs; use `view="lifecycle"` for compact progress and permission checks |
 | `avenor_result` | Wait for a run and return its complete final output without transcript details |
 | `avenor_inspect` | Review a bounded transcript, tool activity, permissions, and final output |
@@ -121,17 +121,33 @@ Available tools for LLM sub-agent management:
 | `avenor_events` | Read events from a run |
 | `avenor_shutdown` | Shut down the avenor supervisor |
 
+### Direct and roster spawns
+
+Direct mode permits `agent`, `model`, and `backend` to be omitted independently, including a backend-only request; omitted values use runtime defaults. Pi supplies `backend: "pi"` for direct tool calls when no backend is given. Roster mode uses both `roster_file` and `roster_entry`, and leaves backend selection to the roster entry instead of applying Pi's direct default:
+
+```json
+{
+  "prompt": "Review the repository",
+  "roster_file": "/repo/roster.json",
+  "roster_entry": "reviewer"
+}
+```
+
+Each roster entry must contain `backend` and at least one of `agent` or `model`. Do not combine roster mode with direct `agent`, `model`, or `backend` overrides. Roster entries currently do not support `system` or `thinking`; `thinking` remains a run-level option and is validated against the effective backend. A resumed session must stay on its original backend. Use an absolute `roster_file` path when the Pi process and target project have different working directories.
+
 ### Pi-specific features
 
 Beyond the tools, the extension integrates with Pi's TUI and event system:
 
 - **Status widget** — persistent widget showing all active runs with status, phase, and permission state
-- **Footer status** — active runs shown in the Pi footer bar
+- **Footer status** — active runs and polling error counts shown in the Pi footer bar
+- **Polling diagnostics** — bounded polling errors are emitted on `avenor:poll:error` for companion extensions
 - **Live progress** — blocking `avenor_spawn` calls stream progress updates via `onUpdate`
 - **Context enrichment** — active sub-agents are automatically surfaced in the system prompt via `before_agent_start`
 - **Custom rendering** — The Pi extension renders all Avenor tool calls and results as themed, bounded summaries. Results have collapsed and expanded views.
 - **Commands** — interactive commands for run management:
   - `/avenor-status` — show status of all runs
+  - `/avenor-errors` — show and clear recent polling errors
   - `/avenor-watch <run_id>` — open a live event feed overlay
   - `/avenor-cancel <run_id>` — cancel a running sub-agent
 

package/dist/index.d.ts

@@ -28,6 +28,31 @@ interface RunStatusEntry {
 declare const CHANNEL_POLL_COMPLETED: "avenor:poll:completed";
 /** Emitted when the extension observes a terminal run result. */
 declare const CHANNEL_RUN_TERMINAL: "avenor:run:terminal";
+/** Emitted when a best-effort polling operation fails. */
+declare const CHANNEL_POLL_ERROR: "avenor:poll:error";
+type PollErrorSource = 'singleton-list' | 'run-status' | 'spawn-status';
+interface PollErrorPayload {
+  /** Polling operation that failed. */
+  readonly source: PollErrorSource;
+  /** Run associated with the failure, when the operation was run-specific. */
+  readonly runId?: string;
+  /** Human-readable operation description. */
+  readonly message: string;
+  /** Bounded, sanitized error text suitable for debug consumers. */
+  readonly error: string;
+  /** Number of polling errors observed by this extension instance. */
+  readonly count: number;
+  /** Wall-clock timestamp in epoch milliseconds. */
+  readonly timestamp: number;
+}
+interface PollErrorPayloadInput {
+  readonly source: PollErrorSource;
+  readonly runId?: string;
+  readonly message: string;
+  readonly error: unknown;
+  readonly count: number;
+  readonly timestamp: number;
+}
 type AvenorRunStatus = Readonly<Omit<RunStatusEntry, 'supervisorId' | 'pid' | 'permissionDescription'> & {
   supervisorKey: string;
 }>;
@@ -65,6 +90,7 @@ interface RunTerminalPayloadInput {
 interface AvenorEventMap {
   [CHANNEL_POLL_COMPLETED]: PollCompletedPayload;
   [CHANNEL_RUN_TERMINAL]: RunTerminalPayload;
+  [CHANNEL_POLL_ERROR]: PollErrorPayload;
 }
 type AvenorEventChannel = keyof AvenorEventMap;
 type AvenorEventBus = Pick<EventBus, 'emit' | 'on'>;
@@ -80,6 +106,8 @@ declare function onAvenorEvent<K extends AvenorEventChannel>(bus: Pick<EventBus,
 declare function createPollCompletedPayload(entries: readonly RunStatusEntry[], timestamp: number, generation: number): PollCompletedPayload;
 /** Copy and freeze a terminal payload before publishing it. */
 declare function createRunTerminalPayload(payload: RunTerminalPayloadInput): RunTerminalPayload;
+/** Copy, bound, sanitize, and freeze a polling error before publishing it. */
+declare function createPollErrorPayload(payload: PollErrorPayloadInput): PollErrorPayload;
 //#endregion
 //#region src/index.d.ts
 interface ExtensionDeps {
@@ -96,6 +124,15 @@ interface ExtensionDeps {
   Supervisor: typeof Supervisor;
 }
 declare function statusSupervisorId(requestedSupervisorId: string | undefined, spawnedSupervisorId: string): string | undefined;
+type SpawnHostParams = {
+  agent?: string;
+  model?: string;
+  backend?: string;
+  roster_file?: string;
+  roster_entry?: string;
+};
+/** Project shared spawn identity into Pi tool metadata without resolving rosters here. */
+declare function spawnIdentityMetadata(params: SpawnHostParams, status?: Pick<StatusResult, 'roster_file' | 'roster_entry' | 'agent' | 'model' | 'backend' | 'effective_agent' | 'effective_model' | 'effective_backend'>): Record<string, unknown>;
 declare function buildCompletionText(run: {
   runId: string;
   label: string;
@@ -107,4 +144,4 @@ declare function buildInspectPayload(result: InspectResult): Record<string, unkn
 declare function createExtension(deps?: ExtensionDeps): (pi: ExtensionAPI) => Promise<void>;
 declare const _default: (pi: ExtensionAPI) => Promise<void>;
 //#endregion
-export { type AvenorEventBus, type AvenorEventChannel, type AvenorEventMap, type AvenorRunStatus, CHANNEL_POLL_COMPLETED, CHANNEL_RUN_TERMINAL, ExtensionDeps, type PollCompletedPayload, type RunTerminalPayload, type RunTerminalPayloadInput, buildCompletionText, buildInspectPayload, compactWhitespace, createExtension, createPollCompletedPayload, createRunTerminalPayload, _default as default, emitAvenorEvent, isTerminalStatus, onAvenorEvent, renderStatusLines, statusSupervisorId };
+export { type AvenorEventBus, type AvenorEventChannel, type AvenorEventMap, type AvenorRunStatus, CHANNEL_POLL_COMPLETED, CHANNEL_POLL_ERROR, CHANNEL_RUN_TERMINAL, ExtensionDeps, type PollCompletedPayload, type PollErrorPayload, type PollErrorPayloadInput, type PollErrorSource, type RunTerminalPayload, type RunTerminalPayloadInput, buildCompletionText, buildInspectPayload, compactWhitespace, createExtension, createPollCompletedPayload, createPollErrorPayload, createRunTerminalPayload, _default as default, emitAvenorEvent, isTerminalStatus, onAvenorEvent, renderStatusLines, spawnIdentityMetadata, statusSupervisorId };

package/dist/index.js

@@ -1,6 +1,6 @@
 import { Input, Key, Text, matchesKey, truncateToWidth, visibleWidth, wrapTextWithAnsi } from "@earendil-works/pi-tui";
 import { Type } from "typebox";
-import { Supervisor, answerPermissionTool, dial, eventsTool, extractEventText, 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";
@@ -718,7 +718,15 @@ function resolveAgentProfile(entries, environment = process.env) {
 const CHANNEL_POLL_COMPLETED = "avenor:poll:completed";
 /** Emitted when the extension observes a terminal run result. */
 const CHANNEL_RUN_TERMINAL = "avenor:run:terminal";
-/** Derive a stable non-connectable scope from a local supervisor socket. */
+/** 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)}`;
@@ -769,6 +777,17 @@ function createRunTerminalPayload(payload) {
 		...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;
@@ -1031,9 +1050,11 @@ function eventsLines(details, args, expanded) {
 	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."];
-	lines.push(`Preview: ${eventRow(events[0])}`);
-	if (events.length > 1) lines.push(itemMarker(events.length - 1));
-	if (!expanded) return lines;
+	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));
@@ -1226,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,
@@ -1242,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));
 }
@@ -1267,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.`);
@@ -1359,18 +1395,27 @@ function createExtension(deps = defaultDeps) {
 		let pollingGeneration = 0;
 		let pollInFlight = null;
 		let sessionCtx = null;
-		const reportedPollingFailures = /* @__PURE__ */ new Set();
-		function reportPollingFailure(key, message, error) {
-			if (reportedPollingFailures.has(key)) return;
-			reportedPollingFailures.add(key);
-			console.error(message, error);
-		}
-		function clearPollingFailure(key) {
-			reportedPollingFailures.delete(key);
+		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 clearRunPollingFailures(run) {
-			clearPollingFailure(`run-status:${run.supervisorId ?? "singleton"}:${run.runId}`);
-			clearPollingFailure(`spawn-status:${run.supervisorId ?? "singleton"}:${run.runId}`);
+		function clearPollingErrors() {
+			pollingErrorCount = 0;
+			pollingErrors.length = 0;
+			updateWidget(lastStatusEntries);
 		}
 		function upsertTrackedRun(run, status, blocking = false) {
 			const current = trackedRuns.get(run.runId);
@@ -1402,22 +1447,22 @@ 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);
-				clearPollingFailure("singleton-list");
 			} catch (err) {
-				reportPollingFailure("singleton-list", "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()) {
 				const live = findLiveStatusForTrackedRun(run, liveMap.values());
 				if (live) {
 					liveMap.delete(live.run_id);
-					clearPollingFailure(`run-status:${run.supervisorId ?? "singleton"}:${run.runId}`);
 					run.lastStatus = live;
+					run.agent = live.agent ?? run.agent;
 					entries.push({
 						runId: run.runId,
 						supervisorId: run.supervisorId,
@@ -1426,7 +1471,7 @@ function createExtension(deps = defaultDeps) {
 						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,
@@ -1441,8 +1486,8 @@ function createExtension(deps = defaultDeps) {
 					});
 					const result = Array.isArray(raw) ? raw[0] : raw;
 					if (!result) throw new Error("status response was empty");
-					clearPollingFailure(`run-status:${run.supervisorId ?? "singleton"}:${run.runId}`);
 					run.lastStatus = result;
+					run.agent = result.agent ?? run.agent;
 					entries.push({
 						runId: run.runId,
 						supervisorId: run.supervisorId,
@@ -1451,14 +1496,14 @@ function createExtension(deps = defaultDeps) {
 						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) {
-					reportPollingFailure(`run-status:${run.supervisorId ?? "singleton"}:${run.runId}`, `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,
@@ -1468,7 +1513,7 @@ function createExtension(deps = defaultDeps) {
 						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,
@@ -1495,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() {
@@ -1560,7 +1608,6 @@ function createExtension(deps = defaultDeps) {
 							nestedCount: entry.nestedCount,
 							backend: entry.backend
 						}));
-						clearRunPollingFailures(run);
 						trackedRuns.delete(entry.runId);
 					} else if (entry.pendingPermission && !run.blocking && !run.permissionNotified) {
 						run.permissionNotified = true;
@@ -1583,9 +1630,7 @@ function createExtension(deps = defaultDeps) {
 				}, POLL_INTERVAL_MS);
 				else {
 					pollingActive = false;
-					reportedPollingFailures.clear();
-					sessionCtx?.ui.setStatus("avenor", "");
-					sessionCtx?.ui.setWidget("avenor-status", void 0);
+					updateWidget([]);
 				}
 			};
 			tick().catch((err) => {
@@ -1596,10 +1641,11 @@ function createExtension(deps = defaultDeps) {
 		async function stopPolling() {
 			pollingActive = false;
 			pollingGeneration++;
-			reportedPollingFailures.clear();
 			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) {
@@ -1769,7 +1815,6 @@ function createExtension(deps = defaultDeps) {
 					const status = Array.isArray(raw) ? raw[0] : raw;
 					if (!status) continue;
 					const text = status.pending_permission ? `[blocked] ${run.label ?? run.runId} — permission: ${status.pending_permission.description}` : `${run.label ?? run.runId}${status.phase_label ? ` (${status.phase_label})` : ""}`;
-					clearPollingFailure(`spawn-status:${run.supervisorId ?? "singleton"}:${run.runId}`);
 					onUpdate?.({
 						content: [{
 							type: "text",
@@ -1785,7 +1830,7 @@ function createExtension(deps = defaultDeps) {
 						aborted: false
 					};
 				} catch (err) {
-					reportPollingFailure(`spawn-status:${run.supervisorId ?? "singleton"}:${run.runId}`, "avenor spawn poll: statusTool failed", err);
+					recordPollingError("spawn-status", "statusTool failed while waiting for a run", err, run.runId);
 				}
 			}
 			return { aborted: true };
@@ -1797,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();
@@ -1840,7 +1888,7 @@ 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)" })),
@@ -1856,7 +1904,9 @@ function createExtension(deps = defaultDeps) {
 					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)" })),
+				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)" }))
@@ -1866,25 +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,
-					thinking: params.thinking,
-					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 = {
@@ -1903,7 +1967,8 @@ function createExtension(deps = defaultDeps) {
 					}],
 					details: {
 						run_id: result.run_id,
-						label
+						label,
+						...spawnIdentityMetadata(hostParams)
 					}
 				};
 				onUpdate?.({
@@ -1918,14 +1983,16 @@ function createExtension(deps = defaultDeps) {
 				});
 				const waitResult = await waitForRun(runRef, signal, onUpdate);
 				if (waitResult.aborted) {
-					clearRunPollingFailures(runRef);
 					trackedRuns.delete(result.run_id);
 					return {
 						content: [{
 							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;
@@ -1936,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);
@@ -1956,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)
 						}
 					};
 				}
@@ -1974,7 +2043,6 @@ function createExtension(deps = defaultDeps) {
 						status: status.status,
 						backend: status.backend
 					}));
-					clearRunPollingFailures(runRef);
 					trackedRuns.delete(result.run_id);
 					return {
 						content: [{
@@ -1988,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)
 						}
 					};
 				}
@@ -1999,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);
@@ -2094,10 +2164,6 @@ function createExtension(deps = defaultDeps) {
 							agent: tracked?.agent ?? "unknown",
 							status: result.status ?? "done"
 						}));
-						clearRunPollingFailures({
-							runId: params.run_id,
-							supervisorId: tracked?.supervisorId ?? params.supervisor_id
-						});
 						trackedRuns.delete(params.run_id);
 					} else if (tracked && result.status === "waiting") tracked.permissionNotified = true;
 					return {
@@ -2321,6 +2387,7 @@ function createExtension(deps = defaultDeps) {
 			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;
@@ -2328,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;
 			},
@@ -2355,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;
 			},
@@ -2392,4 +2475,4 @@ function createExtension(deps = defaultDeps) {
 }
 var src_default = createExtension();
 //#endregion
-export { CHANNEL_POLL_COMPLETED, CHANNEL_RUN_TERMINAL, buildCompletionText, buildInspectPayload, compactWhitespace, createExtension, createPollCompletedPayload, createRunTerminalPayload, src_default as default, emitAvenorEvent, isTerminalStatus, onAvenorEvent, 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 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dougbots/avenor-pi",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "type": "module",
   "keywords": [
     "pi-package"
@@ -35,7 +35,7 @@
     "dev": "tsdown --watch"
   },
   "dependencies": {
-    "@dougbots/avenor-core": "^0.9.0"
+    "@dougbots/avenor-core": "^0.10.0"
   },
   "peerDependencies": {
     "@earendil-works/pi-coding-agent": ">=0.74.0",