@dougbots/avenor-pi 0.7.0 → 0.8.0

package/dist/index.d.ts

@@ -11,6 +11,12 @@ interface RunStatusEntry {
   agent: string;
   pendingPermission?: boolean;
   permissionDescription?: string;
+  /** OS PID of the spawned pi process (pi backend only), for discovering child supervisors. */
+  pid?: number;
+  /** Backend type, used to determine whether to look for child supervisors. */
+  backend?: string;
+  /** Count of active (non-terminal) runs on this run's child supervisor, if discovered. */
+  nestedCount?: number;
 }
 //#endregion
 //#region src/index.d.ts

package/dist/index.js

@@ -1,6 +1,7 @@
 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, spawnTool, statusTool } from "@dougbots/avenor-core";
+import * as path from "node:path";
+import { Supervisor, answerPermissionTool, dial, eventsTool, followUpTool, inspectTool, observeRun, resultTool, shutdownTool, socketsRoot, spawnTool, statusTool } from "@dougbots/avenor-core";
 //#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;
@@ -552,6 +553,19 @@ function formatRunLine(entry) {
 	const phase = entry.phaseLabel ? ` (${entry.phaseLabel})` : "";
 	return `${emoji} ${entry.label} (${entry.agent}) — ${entry.status}${phase}${perm}`;
 }
+/**
+* decideCompletion determines whether to skip, defer, or send the completion
+* steering message for a tracked run that has reached terminal status.
+*
+* The deferral prevents duplication when avenor_result consumes the result
+* in the same turn: if the agent calls avenor_result between the defer and
+* the next tick, the run is deleted from tracking and the send never fires.
+*/
+function decideCompletion(run) {
+	if (run.blocking) return "skip";
+	if (!run.completionPending) return "defer";
+	return "send";
+}
 //#endregion
 //#region src/agent-profile.ts
 const PROFILE_ENTRY_TYPE = "pi-agents:profile";
@@ -640,7 +654,8 @@ function renderStatusLines(entries) {
 		const emoji = statusEmoji(e.status);
 		const perm = e.pendingPermission ? " 🔒" : "";
 		const phase = e.phaseLabel ? ` [${e.phaseLabel}]` : "";
-		return `${emoji} ${e.label} — ${e.status}${phase}${perm}`;
+		const nested = e.nestedCount ? ` +${e.nestedCount}` : "";
+		return `${emoji} ${e.label} — ${e.status}${phase}${perm}${nested}`;
 	});
 }
 function compactWhitespace(text, limit = 100) {
@@ -725,7 +740,8 @@ function createExtension(deps = defaultDeps) {
 				startTime: current?.startTime ?? Date.now(),
 				lastStatus: status ?? current?.lastStatus,
 				blocking: current?.blocking ?? blocking,
-				permissionNotified: current?.permissionNotified
+				permissionNotified: current?.permissionNotified,
+				completionPending: current?.completionPending
 			});
 		}
 		async function resolveFinalOutput(run, status) {
@@ -742,6 +758,29 @@ function createExtension(deps = defaultDeps) {
 				return;
 			}
 		}
+		/**
+		* Count active (non-terminal) runs on a child supervisor discovered via
+		* the spawned pi process's PID. The child pi process creates its own
+		* avenor supervisor at `avenor-mcp-<pid>.sock`; we dial it briefly to
+		* list runs and count those still active. Returns 0 on any failure
+		* (socket not yet ready, supervisor idle-shut-down, etc.).
+		*/
+		async function countNestedRuns(pid) {
+			if (!pid) return 0;
+			const socketPath = path.join(socketsRoot(), `avenor-mcp-${pid}.sock`);
+			let client;
+			try {
+				client = await Promise.race([deps.dial(socketPath, { callTimeoutMs: 2e3 }), new Promise((_, reject) => setTimeout(() => reject(/* @__PURE__ */ new Error("dial timeout")), 2e3))]);
+				return (await client.list()).filter((r) => {
+					const status = String(r.status ?? "running").toLowerCase();
+					return status === "running" || status === "idle";
+				}).length;
+			} catch {
+				return 0;
+			} finally {
+				client?.close();
+			}
+		}
 		async function pollRuns() {
 			const liveMap = /* @__PURE__ */ new Map();
 			try {
@@ -765,7 +804,9 @@ function createExtension(deps = defaultDeps) {
 						phaseLabel: live.phase_label,
 						agent: run.agent,
 						pendingPermission: !!live.pending_permission,
-						permissionDescription: live.pending_permission?.description
+						permissionDescription: live.pending_permission?.description,
+						pid: live.pid,
+						backend: live.backend
 					});
 					continue;
 				}
@@ -785,7 +826,9 @@ function createExtension(deps = defaultDeps) {
 						phaseLabel: result.phase_label,
 						agent: run.agent,
 						pendingPermission: !!result.pending_permission,
-						permissionDescription: result.pending_permission?.description
+						permissionDescription: result.pending_permission?.description,
+						pid: result.pid,
+						backend: result.backend
 					});
 				} catch (err) {
 					console.error(`avenor pollRuns: statusTool failed for ${run.runId}`, err);
@@ -798,7 +841,9 @@ function createExtension(deps = defaultDeps) {
 						phaseLabel: previous?.phase_label,
 						agent: run.agent,
 						pendingPermission: !!previous?.pending_permission,
-						permissionDescription: previous?.pending_permission?.description
+						permissionDescription: previous?.pending_permission?.description,
+						pid: previous?.pid,
+						backend: previous?.backend
 					});
 				}
 			}
@@ -810,8 +855,16 @@ function createExtension(deps = defaultDeps) {
 				phaseLabel: live.phase_label,
 				agent: live.agent ?? "unknown",
 				pendingPermission: !!live.pending_permission,
-				permissionDescription: live.pending_permission?.description
+				permissionDescription: live.pending_permission?.description,
+				pid: live.pid,
+				backend: live.backend
 			});
+			const nestedPids = entries.filter((e) => e.backend === "pi" && e.pid && !isTerminalStatus(e.status)).map((e) => e.pid);
+			if (nestedPids.length > 0) {
+				const nestedCounts = await Promise.all(nestedPids.map((pid) => countNestedRuns(pid)));
+				let idx = 0;
+				for (const entry of entries) if (entry.backend === "pi" && entry.pid && !isTerminalStatus(entry.status)) entry.nestedCount = nestedCounts[idx++] ?? 0;
+			}
 			return entries;
 		}
 		function updateWidget(entries) {
@@ -819,7 +872,11 @@ function createExtension(deps = defaultDeps) {
 			const lines = renderStatusLines(entries);
 			if (lines.length > 0) {
 				sessionCtx.ui.setWidget("avenor-status", lines);
-				sessionCtx.ui.setStatus("avenor", lines.map((line) => line.slice(0, 60)).join("  "));
+				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;
+				sessionCtx.ui.setStatus("avenor", statusWithTotal);
 			} else {
 				sessionCtx.ui.setWidget("avenor-status", void 0);
 				sessionCtx.ui.setStatus("avenor", "");
@@ -845,19 +902,22 @@ function createExtension(deps = defaultDeps) {
 					if (!run) continue;
 					if (isTerminalStatus(entry.status)) {
 						const prevStatus = prevStatuses.get(entry.runId);
-						if (!prevStatus || !isTerminalStatus(prevStatus)) {
-							sessionCtx?.ui.notify(`Sub-agent "${entry.label}" finished: ${entry.status}`, entry.status === "done" ? "info" : "warning");
-							if (!run.blocking && run.lastStatus) {
-								const finalOutput = await resolveFinalOutput(run, run.lastStatus);
-								try {
-									pi.sendUserMessage(buildCompletionText({
-										runId: run.runId,
-										label: run.label
-									}, run.lastStatus, finalOutput), { deliverAs: "followUp" });
-								} catch (err) {
-									console.error("avenor tick: sendUserMessage failed", err);
-								}
-							}
+						if (!(prevStatus && isTerminalStatus(prevStatus))) sessionCtx?.ui.notify(`Sub-agent "${entry.label}" finished: ${entry.status}`, entry.status === "done" ? "info" : "warning");
+						if (run.blocking) continue;
+						const action = decideCompletion(run);
+						if (action === "defer") {
+							run.completionPending = true;
+							continue;
+						}
+						if (action === "skip") continue;
+						const finalOutput = await resolveFinalOutput(run, run.lastStatus);
+						try {
+							pi.sendUserMessage(buildCompletionText({
+								runId: run.runId,
+								label: run.label
+							}, run.lastStatus, finalOutput), { deliverAs: "followUp" });
+						} catch (err) {
+							console.error("avenor tick: sendUserMessage failed", err);
 						}
 						trackedRuns.delete(entry.runId);
 					} else if (entry.pendingPermission && !run.blocking && !run.permissionNotified) {
@@ -1398,14 +1458,16 @@ function createExtension(deps = defaultDeps) {
 				run_id: Type.String({ description: "Run ID with the pending permission" }),
 				option_id: Type.String({ description: "allow_once | allow_always | deny" }),
 				request_id: Type.Optional(Type.String({ description: "Permission request ID (auto-discovered if omitted)" })),
-				supervisor_id: Type.Optional(Type.String({ description: "Reuse an existing supervisor by socket path" }))
+				supervisor_id: Type.Optional(Type.String({ description: "Reuse an existing supervisor by socket path" })),
+				message: Type.Optional(Type.String({ description: "Optional write-in response text. Required only when the selected option declares requiresMessage: true." }))
 			}),
 			async execute(_toolCallId, params) {
 				const result = await deps.answerPermissionTool({
 					runId: params.run_id,
 					optionId: params.option_id,
 					requestId: params.request_id,
-					supervisorId: params.supervisor_id
+					supervisorId: params.supervisor_id,
+					message: params.message
 				});
 				return {
 					content: [{

package/package.json

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