@dougbots/avenor-opencode 0.2.1 → 0.3.1

package/dist/index.js

@@ -1,5 +1,6 @@
 import { tool } from "@opencode-ai/plugin";
 import { z } from "zod";
+import * as crypto from "node:crypto";
 import { answerPermissionTool, eventsTool, followUpTool, shutdownTool, spawnTool, statusTool } from "@dougbots/avenor-core";
 //#region src/plugin.ts
 const TERMINAL_STATUSES = new Set([
@@ -26,15 +27,44 @@ function summarizeEvent(evt) {
 	if (type.startsWith("permission.")) return `permission requested`;
 	return type;
 }
+const CHANNEL_RE = /<channel\s+source="([^"]*)"(?:\s+from_run_id="([^"]*)")?(?:\s+from_role="([^"]*)")?[^>]*>([\s\S]*?)<\/channel>/g;
+function formatAgentMessage(source, fromRunId, fromRole, content) {
+	return [
+		`📨 ${source.replace(/^agent-/, "") || source} (${fromRunId ? fromRunId.slice(0, 8) : ""})`,
+		"",
+		...content.trim().split("\n").map((l) => `  ${l}`)
+	].join("\n") + "\n";
+}
+function renderChannelMessage(match, source, fromRunId, fromRole, content) {
+	return formatAgentMessage(source, fromRunId, fromRole, content);
+}
+function formatChannelBlocks(text) {
+	CHANNEL_RE.lastIndex = 0;
+	return text.replace(CHANNEL_RE, (...args) => {
+		return renderChannelMessage(args[0], args[1], args[2], args[3], args[4]);
+	});
+}
 const AvenorPlugin = async (ctx) => {
 	const trackedRuns = /* @__PURE__ */ new Map();
 	const sessionIdToRunId = /* @__PURE__ */ new Map();
-	function registerSessionId(sessionId, runId) {
+	const runtimeIdToRunId = /* @__PURE__ */ new Map();
+	let parentRunId = "";
+	let parentToken = "";
+	let brokerUrl = "";
+	let channelPolling = false;
+	function ensureParentRunId() {
+		if (!parentRunId) parentRunId = crypto.randomUUID();
+		return parentRunId;
+	}
+	function registerSessionId(sessionId, runtimeId, runId) {
 		if (sessionId && !sessionIdToRunId.has(sessionId)) sessionIdToRunId.set(sessionId, runId);
+		if (runtimeId && !runtimeIdToRunId.has(runtimeId)) runtimeIdToRunId.set(runtimeId, runId);
 	}
 	async function monitorRun(run) {
+		let firstPoll = true;
 		while (true) {
-			await sleep(POLL_INTERVAL_MS);
+			if (!firstPoll) await sleep(POLL_INTERVAL_MS);
+			firstPoll = false;
 			let raw;
 			try {
 				raw = await statusTool({
@@ -46,7 +76,7 @@ const AvenorPlugin = async (ctx) => {
 			}
 			const result = Array.isArray(raw) ? raw[0] : raw;
 			if (!result) continue;
-			registerSessionId(result.session_id, run.runId);
+			registerSessionId(result.session_id, result.runtime_id, run.runId);
 			if (TERMINAL_STATUSES.has(result.status)) {
 				trackedRuns.delete(run.runId);
 				await ctx.client.session.promptAsync({
@@ -60,10 +90,70 @@ const AvenorPlugin = async (ctx) => {
 			}
 		}
 	}
+	async function pollChannelMessages(sessionId) {
+		if (channelPolling || !brokerUrl || !parentRunId || !parentToken) return;
+		channelPolling = true;
+		let consecutiveErrors = 0;
+		const MAX_CONSECUTIVE_ERRORS = 10;
+		try {
+			while (consecutiveErrors < MAX_CONSECUTIVE_ERRORS) {
+				await sleep(POLL_INTERVAL_MS);
+				let msgs;
+				try {
+					const resp = await fetch(`${brokerUrl}/poll-control`, {
+						method: "POST",
+						headers: { "Content-Type": "application/json" },
+						body: JSON.stringify({
+							run_id: parentRunId,
+							token: parentToken
+						})
+					});
+					if (!resp.ok) {
+						consecutiveErrors++;
+						continue;
+					}
+					msgs = await resp.json();
+					consecutiveErrors = 0;
+				} catch {
+					consecutiveErrors++;
+					continue;
+				}
+				for (const msg of msgs ?? []) {
+					if (msg.type !== "agent_message") continue;
+					let payload;
+					try {
+						payload = typeof msg.payload === "string" ? JSON.parse(msg.payload) : msg.payload;
+					} catch {
+						continue;
+					}
+					const text = typeof payload?.message === "string" ? payload.message : "";
+					if (!text) continue;
+					const from = payload.from_run_id ?? msg.from_run_id ?? "unknown";
+					const role = payload.role ?? "";
+					const resolvedRunId = trackedRuns.has(from) ? from : sessionIdToRunId.get(from) ?? runtimeIdToRunId.get(from);
+					const channelText = formatAgentMessage((resolvedRunId ? trackedRuns.get(resolvedRunId) : void 0)?.agent ?? (role ? `agent-${role}` : "agent"), from, role, text);
+					try {
+						await ctx.client.session.promptAsync({
+							path: { id: sessionId },
+							body: { parts: [{
+								type: "text",
+								text: channelText
+							}] }
+						});
+					} catch {
+						return;
+					}
+				}
+			}
+		} finally {
+			channelPolling = false;
+		}
+	}
 	return {
 		event: async ({ event }) => {
 			if (event.type !== "session.idle") return;
 			const { sessionID } = event.properties;
+			pollChannelMessages(sessionID).catch(console.error);
 			for (const run of trackedRuns.values()) if (run.orchestratorSessionId === sessionID && !run.monitoring) {
 				run.monitoring = true;
 				monitorRun(run).catch(console.error);
@@ -92,6 +182,16 @@ const AvenorPlugin = async (ctx) => {
 				}] }
 			}).catch(() => {});
 		},
+		"chat.message": async (message, _output) => {
+			if (!message?.parts) return;
+			for (const part of message.parts) if (part?.type === "text" && typeof part?.text === "string" && part.text.includes("<channel ")) part.text = formatChannelBlocks(part.text);
+		},
+		"experimental.text.complete": async (_input, output) => {
+			if (typeof output.text !== "string" || !output.text.includes("<channel ")) return;
+			try {
+				output.text = formatChannelBlocks(output.text);
+			} catch {}
+		},
 		tool: {
 			avenor_spawn: tool({
 				description: "Dispatch an agent run via avenor. Blocks by default, showing live progress as an updating tool call. Set wait=false for fire-and-forget — you will be re-prompted automatically on completion.",
@@ -99,6 +199,7 @@ const AvenorPlugin = async (ctx) => {
 					agent: z.string().describe("Agent name (required, no default)"),
 					prompt: z.string().optional().describe("Prompt text"),
 					prompt_file: z.string().optional().describe("Path to prompt file"),
+					dir: z.string().optional().describe("Working directory for the run (defaults to the session project directory)"),
 					label: z.string().optional().describe("Human-readable label for the run"),
 					timeout: z.string().optional().describe("Timeout duration (e.g. 3600s)"),
 					model: z.string().optional().describe("Model override"),
@@ -108,27 +209,36 @@ const AvenorPlugin = async (ctx) => {
 					wait: z.boolean().default(true).describe("Block until complete with live status updates. False = fire-and-forget.")
 				},
 				async execute(args, context) {
+					const parentRunId = ensureParentRunId();
 					const result = await spawnTool({
 						agent: args.agent,
 						prompt: args.prompt,
 						promptFile: args.prompt_file,
 						label: args.label,
-						dir: context.directory,
+						dir: args.dir ?? context.directory,
 						timeout: args.timeout,
 						model: args.model,
 						backend: args.backend,
 						serverUrl: args.server_url,
-						supervisorId: args.supervisor_id
+						supervisorId: args.supervisor_id,
+						parent_run_id: parentRunId
 					});
+					if (result.broker_url) brokerUrl = result.broker_url;
+					if (result.parent_token) parentToken = result.parent_token;
 					const supervisorId = result.supervisor_id || args.supervisor_id;
 					trackedRuns.set(result.run_id, {
 						runId: result.run_id,
+						agent: args.agent,
 						orchestratorSessionId: context.sessionID,
 						label: result.label,
 						supervisorId,
 						monitoring: args.wait
 					});
-					if (!args.wait) return result;
+					if (result.runtime_id) runtimeIdToRunId.set(result.runtime_id, result.run_id);
+					if (!args.wait) return {
+						title: `${result.label} — dispatched`,
+						output: `Dispatched "${result.label}" (run_id: ${result.run_id}). Call avenor_status with run_id to check progress, or wait for the completion notification.`
+					};
 					context.metadata({ title: `Starting ${result.label}…` });
 					let firstPoll = true;
 					while (!context.abort.aborted) {
@@ -146,7 +256,7 @@ const AvenorPlugin = async (ctx) => {
 						}
 						const status = Array.isArray(raw) ? raw[0] : raw;
 						if (!status) continue;
-						registerSessionId(status.session_id, result.run_id);
+						registerSessionId(status.session_id, status.runtime_id, result.run_id);
 						if (status.pending_permission) context.metadata({
 							title: `[blocked] ${result.label}`,
 							metadata: {
@@ -204,10 +314,11 @@ const AvenorPlugin = async (ctx) => {
 					supervisor_id: z.string().optional().describe("Reuse an existing supervisor by socket path")
 				},
 				async execute(args, _context) {
-					return statusTool({
+					const result = await statusTool({
 						runId: args.run_id,
 						supervisorId: args.supervisor_id
 					});
+					return JSON.stringify(result, null, 2);
 				}
 			}),
 			avenor_answer_permission: tool({
@@ -219,12 +330,13 @@ const AvenorPlugin = async (ctx) => {
 					supervisor_id: z.string().optional().describe("Reuse an existing supervisor by socket path")
 				},
 				async execute(args, _context) {
-					return answerPermissionTool({
+					const result = await answerPermissionTool({
 						runId: args.run_id,
 						optionId: args.option_id,
 						requestId: args.request_id,
 						supervisorId: args.supervisor_id
 					});
+					return JSON.stringify(result, null, 2);
 				}
 			}),
 			avenor_follow_up: tool({
@@ -236,12 +348,13 @@ const AvenorPlugin = async (ctx) => {
 					supervisor_id: z.string().optional().describe("Reuse an existing supervisor by socket path")
 				},
 				async execute(args, _context) {
-					return followUpTool({
+					const result = await followUpTool({
 						runId: args.run_id,
 						message: args.message,
 						label: args.label,
 						supervisorId: args.supervisor_id
 					});
+					return JSON.stringify(result, null, 2);
 				}
 			}),
 			avenor_events: tool({
@@ -253,12 +366,13 @@ const AvenorPlugin = async (ctx) => {
 					supervisor_id: z.string().optional().describe("Reuse an existing supervisor by socket path")
 				},
 				async execute(args, _context) {
-					return eventsTool({
+					const result = await eventsTool({
 						runId: args.run_id,
 						types: args.types,
 						limit: args.limit,
 						supervisorId: args.supervisor_id
 					});
+					return JSON.stringify(result, null, 2);
 				}
 			}),
 			avenor_shutdown: tool({
@@ -268,10 +382,11 @@ const AvenorPlugin = async (ctx) => {
 					force: z.boolean().optional().describe("Force shutdown instead of graceful")
 				},
 				async execute(args, _context) {
-					return shutdownTool({
+					const result = await shutdownTool({
 						supervisorId: args.supervisor_id,
 						force: args.force
 					});
+					return JSON.stringify(result, null, 2);
 				}
 			})
 		}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dougbots/avenor-opencode",
-  "version": "0.2.1",
+  "version": "0.3.1",
   "type": "module",
   "repository": {
     "type": "git",
@@ -27,7 +27,7 @@
     "dev": "tsdown --watch"
   },
   "dependencies": {
-    "@dougbots/avenor-core": "^0.2.1",
+    "@dougbots/avenor-core": "^0.3.0",
     "zod": "^4.4.3"
   },
   "peerDependencies": {