@dougbots/avenor-core 0.2.1 → 0.3.0

package/dist/index.d.ts

@@ -63,6 +63,8 @@ interface RunInfo {
   eventLogPath: string;
   runtimeId?: string;
   sessionId?: string;
+  brokerUrl?: string;
+  parentToken?: string;
 }
 interface SupervisorOptions {
   binaryPath?: string;
@@ -105,10 +107,14 @@ declare function spawnTool(args: {
   serverUrl?: string;
   sessionId?: string;
   supervisorId?: string;
+  parent_run_id?: string;
 }): Promise<{
   run_id: string;
   label: string;
   supervisor_id: string;
+  runtime_id?: string;
+  broker_url?: string;
+  parent_token?: string;
 }>;
 //#endregion
 //#region src/tools/status.d.ts
@@ -116,6 +122,7 @@ interface StatusResult {
   run_id: string;
   label: string;
   status: string;
+  runtime_id?: string;
   phase?: string;
   phase_label?: string;
   pending_permission?: {

package/dist/index.js

@@ -399,7 +399,9 @@ var Supervisor = class Supervisor {
 			sentinelPath: result.sentinel_file ?? sentinelPath,
 			eventLogPath: result.on_event ?? eventLogPath,
 			runtimeId: result.runtime_id,
-			sessionId: result.session_id
+			sessionId: result.session_id,
+			brokerUrl: result.broker_url,
+			parentToken: result.parent_token
 		};
 		this.runs.set(runInfo.label, runInfo);
 		this.runs.set(runId, runInfo);
@@ -481,30 +483,35 @@ async function spawnTool(args) {
 		const { client, isSingleton, supervisorId } = await getSupervisorClient(args.supervisorId);
 		const { sentinelPath, eventLogPath } = ensureRunPaths(runId);
 		try {
+			const result = await client.spawn({
+				agent: args.agent,
+				prompt: args.prompt,
+				prompt_file: args.promptFile,
+				label,
+				dir: args.dir,
+				timeout: args.timeout !== void 0 ? validateTimeout(args.timeout) : void 0,
+				model: args.model,
+				backend: args.backend,
+				server_url: args.serverUrl,
+				session_id: args.sessionId,
+				sentinel_file: sentinelPath,
+				on_event: eventLogPath,
+				parent_run_id: args.parent_run_id
+			});
 			return {
-				run_id: (await client.spawn({
-					agent: args.agent,
-					prompt: args.prompt,
-					prompt_file: args.promptFile,
-					label,
-					dir: args.dir,
-					timeout: args.timeout !== void 0 ? validateTimeout(args.timeout) : void 0,
-					model: args.model,
-					backend: args.backend,
-					server_url: args.serverUrl,
-					session_id: args.sessionId,
-					sentinel_file: sentinelPath,
-					on_event: eventLogPath
-				})).runtime_id ?? runId,
+				run_id: result.runtime_id ?? runId,
 				label,
-				supervisor_id: supervisorId
+				supervisor_id: supervisorId,
+				runtime_id: result.runtime_id,
+				broker_url: result.broker_url,
+				parent_token: result.parent_token
 			};
 		} finally {
 			if (!isSingleton) client.close();
 		}
 	}
 	const sup = await Supervisor.get();
-	await sup.spawn({
+	const runInfo = await sup.spawn({
 		agent: args.agent,
 		prompt: args.prompt,
 		prompt_file: args.promptFile,
@@ -514,12 +521,16 @@ async function spawnTool(args) {
 		model: args.model,
 		backend: args.backend,
 		server_url: args.serverUrl,
-		session_id: args.sessionId
+		session_id: args.sessionId,
+		parent_run_id: args.parent_run_id
 	});
 	return {
 		run_id: runId,
 		label,
-		supervisor_id: sup.supervisorId
+		supervisor_id: sup.supervisorId,
+		runtime_id: runInfo.runtimeId,
+		broker_url: runInfo.brokerUrl,
+		parent_token: runInfo.parentToken
 	};
 }
 //#endregion
@@ -556,21 +567,22 @@ async function sentinelExists(filePath) {
 		return false;
 	}
 }
+function sentinelStatusToResult(sentinelStatus) {
+	switch (sentinelStatus) {
+		case "DONE": return "done";
+		case "FAILED": return "failed";
+		case "TIMEOUT": return "timeout";
+		case "KILLED": return "killed";
+		case "BLOCKED": return "failed";
+		default: return "running";
+	}
+}
 function translateStatus(rawPhase, sentinelData) {
 	const sentinelStatus = sentinelData?._status;
 	switch (rawPhase) {
-		case "idle":
+		case "idle": return sentinelStatus ? sentinelStatusToResult(sentinelStatus) : "running";
 		case "running": return "running";
-		case "ended":
-			if (sentinelStatus) switch (sentinelStatus) {
-				case "DONE": return "done";
-				case "FAILED": return "failed";
-				case "TIMEOUT": return "timeout";
-				case "KILLED": return "killed";
-				case "BLOCKED": return "failed";
-				default: return "running";
-			}
-			return "running";
+		case "ended": return sentinelStatus ? sentinelStatusToResult(sentinelStatus) : "running";
 		case "DONE": return "done";
 		case "FAILED": return "failed";
 		case "TIMEOUT": return "timeout";
@@ -587,6 +599,7 @@ async function buildRunStatus(client, runInfo, liveStatus) {
 		run_id: runInfo.label,
 		label: runInfo.label,
 		status: translated,
+		runtime_id: liveStatus?.runtime_id ?? runInfo.runtimeId,
 		phase: liveStatus?.phase,
 		phase_label: liveStatus?.phase_label,
 		session_id: sentinel?.SESSION ?? liveStatus?.session_id ?? void 0,
@@ -623,6 +636,7 @@ async function statusTool(args) {
 					run_id: args.runId,
 					label: args.runId,
 					status: translateStatus(liveStatus?.phase ?? liveStatus?.status ?? "running", sentinel),
+					runtime_id: liveStatus?.runtime_id,
 					phase: liveStatus?.phase,
 					phase_label: liveStatus?.phase_label,
 					session_id: sentinel?.SESSION ?? liveStatus?.session_id ?? void 0,

package/package.json

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