@dougbots/avenor-core 0.3.6 → 0.3.7

package/dist/index.js

@@ -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,
@@ -624,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);

package/package.json

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