@dougbots/avenor-core 0.7.1 → 0.8.1

package/dist/index.d.ts

@@ -38,6 +38,7 @@ interface SpawnParams {
   session_id?: string;
   sentinel_file?: string;
   on_event?: string;
+  auto_approve?: boolean;
   [key: string]: unknown;
 }
 declare class Client {
@@ -67,7 +68,7 @@ declare class Client {
   list(): Promise<Array<Record<string, unknown>>>;
   spawn(params: SpawnParams): Promise<Record<string, unknown>>;
   shutdown(mode: string): Promise<void>;
-  answerPermission(runtimeId: string, requestId: string, optionId: string): Promise<void>;
+  answerPermission(runtimeId: string, requestId: string, optionId: string, message?: string): Promise<void>;
   prompt(runtimeId: string, text: string): Promise<void>;
   interruptAndPrompt(runtimeId: string, text: string, keepQueue?: boolean): Promise<void>;
   cancel(runtimeId?: string): Promise<void>;
@@ -83,6 +84,7 @@ interface RunPermissionOption {
   option_id: string;
   label: string;
   kind: string;
+  requires_message?: boolean;
 }
 interface RunPermissionSummary {
   request_id?: string;
@@ -238,9 +240,11 @@ interface RunInfo {
   agent?: string;
   agentProfile?: string;
   backend?: string;
+  model?: string;
   dir?: string;
   brokerUrl?: string;
   parentToken?: string;
+  autoApprove?: boolean;
 }
 interface SupervisorOptions {
   binaryPath?: string;
@@ -272,6 +276,9 @@ declare class Supervisor {
   }): Promise<void>;
 }
 //#endregion
+//#region src/paths.d.ts
+declare function socketsRoot(): string;
+//#endregion
 //#region src/tools/spawn.d.ts
 declare function spawnTool(args: {
   agent: string;
@@ -312,6 +319,7 @@ interface StatusResult {
       option_id: string;
       label: string;
       kind: string;
+      requires_message?: boolean;
     }>;
   };
   session_id?: string;
@@ -322,6 +330,7 @@ interface StatusResult {
   dir?: string;
   parent_id?: string;
   children?: string[];
+  pid?: number;
   event_path?: string;
   usage?: Record<string, unknown>;
   latest_seq?: number;
@@ -384,6 +393,7 @@ declare function answerPermissionTool(args: {
   optionId: string;
   requestId?: string;
   supervisorId?: string;
+  message?: string;
 }): Promise<{
   ok: boolean;
 }>;
@@ -424,4 +434,4 @@ declare function shutdownTool(args: {
   cleaned_up: string[];
 }>;
 //#endregion
-export { type Client, DEFAULT_RUN_REDUCER_LIMITS, type Event, type HistoryOptions, type HistoryResult, type InspectResult, type NormalizedRunEvent, type ObserveRunOptions, type ResultResult, type ResultToolArgs, type RunChunkRole, type RunIdentity, type RunInfo, type RunObserver, type RunObserverClient, type RunPermissionOption, type RunPermissionSummary, RunReducer, type RunReducerLimits, type RunSnapshot, type RunSnapshotSeed, type RunToolState, type RunToolSummary, type RunTranscriptEntry, type SpawnParams, type StatusResult, type StatusView, type SubscribeOptions, Supervisor, type SupervisorOptions, answerPermissionTool, createRunSnapshot, dial, eventsTool, extractEventText, findAvenorBinary, followUpTool, getInstallDir, getVersion, inspectTool, installerBinaryPath, normalizeRunEvent, observeRun, reduceRunSnapshot, resultTool, shutdownTool, spawnTool, statusTool };
+export { type Client, DEFAULT_RUN_REDUCER_LIMITS, type Event, type HistoryOptions, type HistoryResult, type InspectResult, type NormalizedRunEvent, type ObserveRunOptions, type ResultResult, type ResultToolArgs, type RunChunkRole, type RunIdentity, type RunInfo, type RunObserver, type RunObserverClient, type RunPermissionOption, type RunPermissionSummary, RunReducer, type RunReducerLimits, type RunSnapshot, type RunSnapshotSeed, type RunToolState, type RunToolSummary, type RunTranscriptEntry, type SpawnParams, type StatusResult, type StatusView, type SubscribeOptions, Supervisor, type SupervisorOptions, answerPermissionTool, createRunSnapshot, dial, eventsTool, extractEventText, findAvenorBinary, followUpTool, getInstallDir, getVersion, inspectTool, installerBinaryPath, normalizeRunEvent, observeRun, reduceRunSnapshot, resultTool, shutdownTool, socketsRoot, spawnTool, statusTool };

package/dist/index.js

@@ -246,12 +246,14 @@ var Client = class {
 	async shutdown(mode) {
 		await this.call("shutdown", { mode });
 	}
-	async answerPermission(runtimeId, requestId, optionId) {
-		await this.call("answer_permission", {
+	async answerPermission(runtimeId, requestId, optionId, message) {
+		const params = {
 			runtime_id: runtimeId,
 			request_id: requestId,
 			option_id: optionId
-		});
+		};
+		if (message) params.message = message;
+		await this.call("answer_permission", params);
 	}
 	async prompt(runtimeId, text) {
 		await this.call("prompt", {
@@ -363,13 +365,15 @@ function normalizePermissionOptions(value) {
 		const record = asRecord(item);
 		if (!record) continue;
 		const option_id = stringField(record, "option_id", "optionId") ?? "";
-		const label = stringField(record, "label") ?? option_id;
+		const label = stringField(record, "label", "name") ?? option_id;
 		const kind = stringField(record, "kind") ?? "";
+		const requires_message = record.requires_message === true || record.requiresMessage === true;
 		if (!option_id && !label && !kind) continue;
 		options.push({
 			option_id,
 			label,
-			kind
+			kind,
+			...requires_message && { requires_message: true }
 		});
 	}
 	return options;
@@ -1271,9 +1275,11 @@ var Supervisor = class Supervisor {
 			agent: spawnParams.agent ?? params.agent,
 			agentProfile: spawnParams.agent_profile,
 			backend: spawnParams.backend,
+			model: spawnParams.model,
 			dir: spawnParams.dir,
 			brokerUrl: result.broker_url,
-			parentToken: result.parent_token
+			parentToken: result.parent_token,
+			autoApprove: spawnParams.auto_approve
 		};
 		this.runs.set(runInfo.label, runInfo);
 		this.runs.set(runId, runInfo);
@@ -1438,6 +1444,9 @@ async function sentinelExists(filePath) {
 		return false;
 	}
 }
+function rawStatusPhase(source) {
+	return stringField(source ?? {}, "phase") || stringField(source ?? {}, "status") || "running";
+}
 function sentinelStatusToResult(sentinelStatus) {
 	switch (sentinelStatus) {
 		case "DONE": return "done";
@@ -1475,8 +1484,9 @@ function normalizePermission(raw) {
 		if (!record) return null;
 		return {
 			option_id: stringField(record, "option_id", "optionId") ?? "",
-			label: stringField(record, "label") ?? "",
-			kind: stringField(record, "kind") ?? ""
+			label: stringField(record, "label", "name") ?? "",
+			kind: stringField(record, "kind") ?? "",
+			...(record.requires_message === true || record.requiresMessage === true) && { requires_message: true }
 		};
 	}).filter((item) => item !== null) : [];
 	if (!request_id && !description && options.length === 0) return;
@@ -1511,6 +1521,7 @@ function buildBaseStatus(source, fallback, translatedStatus) {
 		dir: stringField(source, "dir"),
 		parent_id: stringField(source, "parent_id", "parentId"),
 		children: stringArrayField(source, "children"),
+		pid: typeof source.pid === "number" ? source.pid : void 0,
 		event_path: stringField(source, "event_path", "on_event"),
 		usage: asRecord(source.usage) ?? void 0,
 		latest_seq: numberField(source, "latest_seq"),
@@ -1535,7 +1546,7 @@ function shapeStatusResult(result, view = "full") {
 async function buildRunStatus(runInfo, liveStatus) {
 	let sentinel = null;
 	if (await sentinelExists(runInfo.sentinelPath)) sentinel = await parseSentinel$1(runInfo.sentinelPath);
-	const translated = translateStatus(liveStatus?.phase ?? liveStatus?.status ?? "running", sentinel);
+	const translated = translateStatus(rawStatusPhase(liveStatus), sentinel);
 	return buildBaseStatus(liveStatus ?? {}, {
 		run_id: runInfo.runId,
 		label: runInfo.label,
@@ -1580,14 +1591,14 @@ async function statusTool(args) {
 					runtime_id: stringField(liveStatus ?? {}, "runtime_id", "id"),
 					session_id: sentinel?.SESSION ?? liveStatus?.session_id,
 					stop_reason: sentinel?._status
-				}, translateStatus(liveStatus?.phase ?? liveStatus?.status ?? "running", sentinel)), args.view);
+				}, translateStatus(rawStatusPhase(liveStatus), sentinel)), args.view);
 			}
 			return (await client.list()).map((entry) => shapeStatusResult(buildBaseStatus(entry, {
 				run_id: String(entry.run_id ?? entry.runtime_id ?? entry.id ?? ""),
 				label: String(entry.label ?? entry.runtime_id ?? entry.id ?? ""),
 				runtime_id: String(entry.runtime_id ?? entry.id ?? ""),
 				session_id: entry.session_id
-			}, translateStatus(entry.phase ?? entry.status ?? "running", null)), args.view));
+			}, translateStatus(rawStatusPhase(entry), null)), args.view));
 		} finally {
 			if (!isSingleton) client.close();
 		}
@@ -1608,7 +1619,7 @@ async function statusTool(args) {
 			runtime_id: stringField(liveStatus ?? {}, "runtime_id", "id"),
 			session_id: sentinel?.SESSION ?? liveStatus?.session_id,
 			stop_reason: sentinel?._status
-		}, translateStatus(liveStatus?.phase ?? liveStatus?.status ?? "running", sentinel)), args.view);
+		}, translateStatus(rawStatusPhase(liveStatus), sentinel)), args.view);
 	}
 	const list = await client.list();
 	const results = [];
@@ -1623,7 +1634,7 @@ async function statusTool(args) {
 			label: entryLabel,
 			runtime_id: entryId,
 			session_id: entry.session_id
-		}, translateStatus(entry.phase ?? entry.status ?? "running", null)), args.view));
+		}, translateStatus(rawStatusPhase(entry), null)), args.view));
 	}
 	return results;
 }
@@ -1981,6 +1992,12 @@ function findRunByLabel$1(sup, runId) {
 	if (byKey) return byKey;
 	for (const info of runs.values()) if (info.label === runId) return info;
 }
+function pendingPermissionRequestID(liveStatus) {
+	const status = asRecord(liveStatus);
+	if (!status) return void 0;
+	const permission = asRecord(status.permission) ?? asRecord(status.pending_permission);
+	return permission ? stringField(permission, "request_id", "requestId") : void 0;
+}
 async function answerPermissionTool(args) {
 	let client;
 	let sup = null;
@@ -1996,11 +2013,10 @@ async function answerPermissionTool(args) {
 		validateRunId(args.runId);
 		const runtimeId = (sup ? findRunByLabel$1(sup, args.runId) : void 0)?.runtimeId ?? args.runId;
 		if (!requestId) {
-			const pp = (await client.status(runtimeId))?.pending_permission;
-			if (!pp?.request_id) throw new Error("no pending permission request for this run");
-			requestId = pp.request_id;
+			requestId = pendingPermissionRequestID(await client.status(runtimeId));
+			if (!requestId) throw new Error("no pending permission request for this run");
 		}
-		await client.answerPermission(runtimeId, requestId, args.optionId);
+		await client.answerPermission(runtimeId, requestId, args.optionId, args.message);
 		return { ok: true };
 	} finally {
 		if (supervisorId && !isSingleton) client.close();
@@ -2014,6 +2030,11 @@ function findRunByLabel(sup, runId) {
 	if (byKey) return byKey;
 	for (const info of runs.values()) if (info.label === runId) return info;
 }
+function resolveAutoApprove(liveStatus, runInfo) {
+	const liveAutoApprove = liveStatus?.auto_approve;
+	if (typeof liveAutoApprove === "boolean") return liveAutoApprove;
+	return typeof runInfo?.autoApprove === "boolean" ? runInfo.autoApprove : void 0;
+}
 function requireResumableAgent(agent) {
 	if (agent === void 0) throw new Error("run has no agent to resume");
 	return agent;
@@ -2046,14 +2067,16 @@ async function followUpTool(args) {
 			const fallbackSessionId = runInfo?.sessionId;
 			let liveStatus = null;
 			try {
-				liveStatus = await client.status(args.runId);
+				liveStatus = await client.status(runInfo?.runtimeId ?? args.runId);
 			} catch {}
 			const sessionId = (await parseSentinel(liveStatus?.sentinel_file ?? path.join(runsRoot(), args.runId, "sentinel.done")))?.SESSION ?? liveStatus?.session_id ?? fallbackSessionId;
 			if (!sessionId) throw new Error("run has no session to resume");
 			const agent = requireResumableAgent(liveStatus?.agent ?? runInfo?.agent);
 			const backend = liveStatus?.backend ?? runInfo?.backend;
+			const model = liveStatus?.model ?? runInfo?.model;
 			const dir = liveStatus?.dir ?? runInfo?.dir;
 			const agentProfile = liveStatus?.agent_profile ?? runInfo?.agentProfile;
+			const autoApprove = resolveAutoApprove(liveStatus, runInfo);
 			const followUpRunId = crypto.randomUUID();
 			const followUpLabel = args.label ?? `${args.runId}-followup`;
 			const { sentinelPath: followUpSentinelPath, eventLogPath } = ensureRunPaths(followUpRunId);
@@ -2066,8 +2089,10 @@ async function followUpTool(args) {
 				on_event: eventLogPath
 			};
 			if (backend) spawnParams.backend = backend;
+			if (model) spawnParams.model = model;
 			if (dir) spawnParams.dir = dir;
 			if (agentProfile) spawnParams.agent_profile = agentProfile;
+			if (autoApprove === true) spawnParams.auto_approve = true;
 			return {
 				run_id: (await client.spawn(spawnParams)).runtime_id ?? followUpRunId,
 				label: followUpLabel
@@ -2088,17 +2113,21 @@ async function followUpTool(args) {
 	} catch {}
 	const agent = requireResumableAgent(liveStatus?.agent ?? runInfo.agent);
 	const backend = liveStatus?.backend ?? runInfo.backend;
+	const model = liveStatus?.model ?? runInfo.model;
 	const dir = liveStatus?.dir ?? runInfo.dir;
 	const agentProfile = liveStatus?.agent_profile ?? runInfo.agentProfile;
+	const autoApprove = resolveAutoApprove(liveStatus, runInfo);
 	const followUpLabel = args.label ?? `${runInfo.label}-followup`;
 	const followUpRun = await sup.spawn({
 		agent,
 		backend,
+		model,
 		dir,
 		agent_profile: agentProfile,
 		prompt: args.message,
 		session_id: sessionId,
-		label: followUpLabel
+		label: followUpLabel,
+		...autoApprove === true ? { auto_approve: true } : {}
 	});
 	return {
 		run_id: followUpRun.runId,
@@ -2162,4 +2191,4 @@ async function shutdownTool(args) {
 	};
 }
 //#endregion
-export { DEFAULT_RUN_REDUCER_LIMITS, RunReducer, Supervisor, answerPermissionTool, createRunSnapshot, dial, eventsTool, extractEventText, findAvenorBinary, followUpTool, getInstallDir, getVersion, inspectTool, installerBinaryPath, normalizeRunEvent, observeRun, reduceRunSnapshot, resultTool, shutdownTool, spawnTool, statusTool };
+export { DEFAULT_RUN_REDUCER_LIMITS, RunReducer, Supervisor, answerPermissionTool, createRunSnapshot, dial, eventsTool, extractEventText, findAvenorBinary, followUpTool, getInstallDir, getVersion, inspectTool, installerBinaryPath, normalizeRunEvent, observeRun, reduceRunSnapshot, resultTool, shutdownTool, socketsRoot, spawnTool, statusTool };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dougbots/avenor-core",
-  "version": "0.7.1",
+  "version": "0.8.1",
   "type": "module",
   "repository": {
     "type": "git",