@dougbots/avenor-core 0.3.5 → 0.3.7

package/dist/index.d.ts

@@ -58,6 +58,7 @@ declare function dial(socketPath: string, opts?: {
 //#endregion
 //#region src/supervisor.d.ts
 interface RunInfo {
+  runId: string;
   label: string;
   sentinelPath: string;
   eventLogPath: string;
@@ -90,8 +91,10 @@ declare class Supervisor {
   static isCurrentInstance(supervisorId: string): boolean;
   static currentInstance(): Supervisor | null;
   getClient(): Client;
-  spawn(params: SpawnParams): Promise<RunInfo>;
-  close(): Promise<void>;
+  spawn(params: SpawnParams, runId?: `${string}-${string}-${string}-${string}-${string}`): Promise<RunInfo>;
+  close(options?: {
+    skipShutdown?: boolean;
+  }): Promise<void>;
 }
 //#endregion
 //#region src/tools/spawn.d.ts

package/dist/index.js

@@ -383,9 +383,8 @@ var Supervisor = class Supervisor {
 		if (!this.client) throw new Error("supervisor not started");
 		return this.client;
 	}
-	async spawn(params) {
+	async spawn(params, runId = crypto.randomUUID()) {
 		const client = this.getClient();
-		const runId = crypto.randomUUID();
 		const { sentinelPath, eventLogPath } = ensureRunPaths(runId);
 		const spawnParams = {
 			...params,
@@ -395,6 +394,7 @@ var Supervisor = class Supervisor {
 		};
 		const result = await client.spawn(spawnParams);
 		const runInfo = {
+			runId,
 			label: spawnParams.label ?? runId,
 			sentinelPath: result.sentinel_file ?? sentinelPath,
 			eventLogPath: result.on_event ?? eventLogPath,
@@ -407,8 +407,8 @@ var Supervisor = class Supervisor {
 		this.runs.set(runId, runInfo);
 		return runInfo;
 	}
-	async close() {
-		if (this.client) try {
+	async close(options = {}) {
+		if (this.client && !options.skipShutdown) try {
 			await this.client.shutdown("graceful");
 		} catch {}
 		if (this.childProcess) {
@@ -447,26 +447,23 @@ function validateTimeout(value) {
 	return amount;
 }
 function validateSupervisorSocketPath(supervisorId) {
-	const canonical = fs.realpathSync(supervisorId);
 	const root = fs.realpathSync(socketsRoot());
-	const relative = path.relative(root, canonical);
-	if (relative.startsWith("..") || path.isAbsolute(relative) || !/^avenor-mcp-[^/\\]+\.sock$/.test(path.basename(canonical))) throw new Error(`invalid supervisorId: ${supervisorId}`);
-	return canonical;
+	const parent = fs.realpathSync(path.dirname(supervisorId));
+	const basename = path.basename(supervisorId);
+	if (parent !== root || !/^avenor-mcp-[^/\\]+\.sock$/.test(basename)) throw new Error(`invalid supervisorId: ${supervisorId}`);
+	return path.join(parent, basename);
 }
 //#endregion
 //#region src/tools/get-supervisor-client.ts
 async function getSupervisorClient(supervisorId) {
 	const id = validateSupervisorSocketPath(supervisorId);
-	if (Supervisor.isCurrentInstance(id)) {
-		const sup = Supervisor.currentInstance();
-		if (!sup) throw new Error(`Supervisor.isCurrentInstance() returned true but currentInstance() is null (id: ${id})`);
-		return {
-			client: sup.getClient(),
-			isSingleton: true,
-			sup,
-			supervisorId: id
-		};
-	}
+	const current = Supervisor.currentInstance();
+	if (current !== null && validateSupervisorSocketPath(current.supervisorId) === id) return {
+		client: current.getClient(),
+		isSingleton: true,
+		sup: current,
+		supervisorId: id
+	};
 	return {
 		client: await dial(id),
 		isSingleton: false,
@@ -523,10 +520,10 @@ async function spawnTool(args) {
 		server_url: args.serverUrl,
 		session_id: args.sessionId,
 		parent_run_id: args.parent_run_id
-	});
+	}, runId);
 	return {
-		run_id: runId,
-		label,
+		run_id: runInfo.runId,
+		label: runInfo.label,
 		supervisor_id: sup.supervisorId,
 		runtime_id: runInfo.runtimeId,
 		broker_url: runInfo.brokerUrl,
@@ -579,17 +576,18 @@ function sentinelStatusToResult(sentinelStatus) {
 }
 function translateStatus(rawPhase, sentinelData) {
 	const sentinelStatus = sentinelData?._status;
-	if (sentinelStatus && (rawPhase === "running" || rawPhase === "idle")) return sentinelStatusToResult(sentinelStatus);
-	switch (rawPhase) {
+	const phase = rawPhase.toLowerCase();
+	if (sentinelStatus && (phase === "running" || phase === "idle")) return sentinelStatusToResult(sentinelStatus);
+	switch (phase) {
 		case "idle": return sentinelStatus ? sentinelStatusToResult(sentinelStatus) : "running";
 		case "running": return "running";
 		case "waiting": return "waiting";
 		case "ended": return sentinelStatus ? sentinelStatusToResult(sentinelStatus) : "running";
-		case "DONE": return "done";
-		case "FAILED": return "failed";
-		case "TIMEOUT": return "timeout";
-		case "KILLED": return "killed";
-		case "BLOCKED": return "failed";
+		case "done": return "done";
+		case "failed": return "failed";
+		case "timeout": return "timeout";
+		case "killed": return "killed";
+		case "blocked": return "failed";
 		default: return "running";
 	}
 }
@@ -598,7 +596,7 @@ async function buildRunStatus(client, runInfo, liveStatus) {
 	if (await sentinelExists(runInfo.sentinelPath)) sentinel = await parseSentinel$1(runInfo.sentinelPath);
 	const translated = translateStatus(liveStatus?.phase ?? liveStatus?.status ?? "running", sentinel);
 	const result = {
-		run_id: runInfo.label,
+		run_id: runInfo.runId,
 		label: runInfo.label,
 		status: translated,
 		runtime_id: liveStatus?.runtime_id ?? runInfo.runtimeId,
@@ -623,10 +621,18 @@ async function buildRunStatus(client, runInfo, liveStatus) {
 }
 async function statusTool(args) {
 	if (args.supervisorId) {
-		const { client, isSingleton } = await getSupervisorClient(args.supervisorId);
+		const { client, isSingleton, sup } = await getSupervisorClient(args.supervisorId);
 		try {
 			if (args.runId) {
 				validateRunId(args.runId);
+				const runInfo = isSingleton && sup ? findRunByLabel$3(sup, args.runId) : void 0;
+				if (runInfo) {
+					let liveStatus = null;
+					if (runInfo.runtimeId) try {
+						liveStatus = await client.status(runInfo.runtimeId);
+					} catch {}
+					return buildRunStatus(client, runInfo, liveStatus);
+				}
 				let liveStatus = null;
 				try {
 					liveStatus = await client.status(args.runId);
@@ -831,7 +837,7 @@ async function followUpTool(args) {
 		label: followUpLabel
 	});
 	return {
-		run_id: followUpRun.label,
+		run_id: followUpRun.runId,
 		label: followUpRun.label
 	};
 }
@@ -894,7 +900,7 @@ async function shutdownTool(args) {
 					cleanedUp.push(info.eventLogPath);
 				} catch {}
 			}
-			await sup.close();
+			await sup.close({ skipShutdown: true });
 		} else {
 			const client = await dial(supervisorId);
 			try {
@@ -923,7 +929,7 @@ async function shutdownTool(args) {
 			cleanedUp.push(info.eventLogPath);
 		} catch {}
 	}
-	await sup.close();
+	await sup.close({ skipShutdown: true });
 	return {
 		ok: true,
 		cleaned_up: cleanedUp

package/package.json

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