@dougbots/avenor-opencode 0.3.1 → 0.3.3

package/dist/index.js

@@ -1,5 +1,4 @@
 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
@@ -88,6 +87,21 @@ const AvenorPlugin = async (ctx) => {
 				}).catch(() => {});
 				return;
 			}
+			if (result.status === "waiting") {
+				const perm = result.pending_permission;
+				const lines = [`Sub-agent "${run.label}" 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 (result.phase_label) lines.push(`Question: ${result.phase_label}`);
+				lines.push(`Use \`avenor_follow_up\` with run_id "${run.runId}" to respond, or \`avenor_status\` to re-check.`);
+				await ctx.client.session.promptAsync({
+					path: { id: run.orchestratorSessionId },
+					body: { parts: [{
+						type: "text",
+						text: lines.join("\n")
+					}] }
+				}).catch(() => {});
+				return;
+			}
 		}
 	}
 	async function pollChannelMessages(sessionId) {
@@ -196,17 +210,17 @@ const AvenorPlugin = async (ctx) => {
 			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.",
 				args: {
-					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"),
-					backend: z.string().optional().describe("Backend override"),
-					server_url: z.string().optional().describe("Backend server URL"),
-					supervisor_id: z.string().optional().describe("Reuse an existing supervisor by socket path"),
-					wait: z.boolean().default(true).describe("Block until complete with live status updates. False = fire-and-forget.")
+					agent: tool.schema.string().describe("Agent name (required, no default)"),
+					prompt: tool.schema.string().optional().describe("Prompt text"),
+					prompt_file: tool.schema.string().optional().describe("Path to prompt file"),
+					dir: tool.schema.string().optional().describe("Working directory for the run (defaults to the session project directory)"),
+					label: tool.schema.string().optional().describe("Human-readable label for the run"),
+					timeout: tool.schema.string().optional().describe("Timeout duration (e.g. 3600s)"),
+					model: tool.schema.string().optional().describe("Model override"),
+					backend: tool.schema.string().optional().describe("Backend override"),
+					server_url: tool.schema.string().optional().describe("Backend server URL"),
+					supervisor_id: tool.schema.string().optional().describe("Reuse an existing supervisor by socket path"),
+					wait: tool.schema.boolean().default(true).describe("Block until complete with live status updates. False = fire-and-forget.")
 				},
 				async execute(args, context) {
 					const parentRunId = ensureParentRunId();
@@ -298,6 +312,25 @@ const AvenorPlugin = async (ctx) => {
 								}
 							};
 						}
+						if (status.status === "waiting") {
+							const perm = status.pending_permission;
+							const lines = [`Sub-agent "${result.label}" is waiting for input.`];
+							if (perm) lines.push(`Permission request: ${perm.description}`, `To answer: call \`avenor_answer_permission\` with run_id "${result.run_id}", option_id "allow_once" | "allow_always" | "deny"`);
+							else if (status.phase_label) lines.push(`Question: ${status.phase_label}`);
+							lines.push(`Use \`avenor_follow_up\` with run_id "${result.run_id}" to respond, or \`avenor_status\` to re-check.`);
+							const tracked = trackedRuns.get(result.run_id);
+							if (tracked) tracked.monitoring = false;
+							return {
+								title: `${result.label} — waiting`,
+								output: lines.join("\n"),
+								metadata: {
+									status: "waiting",
+									run_id: result.run_id,
+									session_id: status.session_id,
+									...perm && { pending_permission: perm }
+								}
+							};
+						}
 					}
 					trackedRuns.delete(result.run_id);
 					return {
@@ -310,8 +343,8 @@ const AvenorPlugin = async (ctx) => {
 			avenor_status: tool({
 				description: "Get status of a run or all runs. Surfaces pending permission requests.",
 				args: {
-					run_id: z.string().optional().describe("Specific run ID to query"),
-					supervisor_id: z.string().optional().describe("Reuse an existing supervisor by socket path")
+					run_id: tool.schema.string().optional().describe("Specific run ID to query"),
+					supervisor_id: tool.schema.string().optional().describe("Reuse an existing supervisor by socket path")
 				},
 				async execute(args, _context) {
 					const result = await statusTool({
@@ -324,10 +357,10 @@ const AvenorPlugin = async (ctx) => {
 			avenor_answer_permission: tool({
 				description: "Answer a pending permission request for a sub-agent. Pass option_id from avenor_status pending_permission.options, or use \"allow_once\", \"allow_always\", \"deny\".",
 				args: {
-					run_id: z.string().describe("Run ID with the pending permission"),
-					option_id: z.string().describe("allow_once | allow_always | deny, or option_id from pending_permission.options"),
-					request_id: z.string().optional().describe("Permission request ID (auto-discovered if omitted)"),
-					supervisor_id: z.string().optional().describe("Reuse an existing supervisor by socket path")
+					run_id: tool.schema.string().describe("Run ID with the pending permission"),
+					option_id: tool.schema.string().describe("allow_once | allow_always | deny, or option_id from pending_permission.options"),
+					request_id: tool.schema.string().optional().describe("Permission request ID (auto-discovered if omitted)"),
+					supervisor_id: tool.schema.string().optional().describe("Reuse an existing supervisor by socket path")
 				},
 				async execute(args, _context) {
 					const result = await answerPermissionTool({
@@ -342,10 +375,10 @@ const AvenorPlugin = async (ctx) => {
 			avenor_follow_up: tool({
 				description: "Resume a completed run with a follow-up message.",
 				args: {
-					run_id: z.string().describe("Completed run ID to resume"),
-					message: z.string().describe("Follow-up message text"),
-					label: z.string().optional().describe("Override label (defaults to <original>-followup)"),
-					supervisor_id: z.string().optional().describe("Reuse an existing supervisor by socket path")
+					run_id: tool.schema.string().describe("Completed run ID to resume"),
+					message: tool.schema.string().describe("Follow-up message text"),
+					label: tool.schema.string().optional().describe("Override label (defaults to <original>-followup)"),
+					supervisor_id: tool.schema.string().optional().describe("Reuse an existing supervisor by socket path")
 				},
 				async execute(args, _context) {
 					const result = await followUpTool({
@@ -360,10 +393,10 @@ const AvenorPlugin = async (ctx) => {
 			avenor_events: tool({
 				description: "Read events from a run. Filter by type. Returns last N events.",
 				args: {
-					run_id: z.string().describe("Run ID to read events from"),
-					types: z.array(z.string()).optional().describe("Filter by event types"),
-					limit: z.number().optional().describe("Max events to return (default 50)"),
-					supervisor_id: z.string().optional().describe("Reuse an existing supervisor by socket path")
+					run_id: tool.schema.string().describe("Run ID to read events from"),
+					types: tool.schema.array(tool.schema.string()).optional().describe("Filter by event types"),
+					limit: tool.schema.number().optional().describe("Max events to return (default 50)"),
+					supervisor_id: tool.schema.string().optional().describe("Reuse an existing supervisor by socket path")
 				},
 				async execute(args, _context) {
 					const result = await eventsTool({
@@ -378,8 +411,8 @@ const AvenorPlugin = async (ctx) => {
 			avenor_shutdown: tool({
 				description: "Shut down the avenor supervisor and clean up temp files.",
 				args: {
-					supervisor_id: z.string().optional().describe("Supervisor to shut down (defaults to singleton)"),
-					force: z.boolean().optional().describe("Force shutdown instead of graceful")
+					supervisor_id: tool.schema.string().optional().describe("Supervisor to shut down (defaults to singleton)"),
+					force: tool.schema.boolean().optional().describe("Force shutdown instead of graceful")
 				},
 				async execute(args, _context) {
 					const result = await shutdownTool({

package/package.json

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