@dougbots/avenor-core 0.10.1 → 0.10.3

package/dist/index.d.ts

@@ -407,6 +407,13 @@ declare class Supervisor {
   private static start;
   private startProcess;
   get supervisorId(): string;
+  /**
+   * Look up a run by its public run ID first, then by its label alias.
+   * Public run IDs are canonical; labels are lookup-only aliases.
+   */
+  getRunByReference(reference: string): RunInfo | undefined;
+  /** Match a stored run by its broker runtime ID. */
+  getRunByRuntimeId(runtimeId: string): RunInfo | undefined;
   static isCurrentInstance(supervisorId: string): boolean;
   static currentInstance(): Supervisor | null;
   getClient(): Client;
@@ -420,7 +427,7 @@ declare class Supervisor {
 declare function socketsRoot(): string;
 //#endregion
 //#region src/tools/get-supervisor-client.d.ts
-declare function getSupervisorClient(supervisorId: string): Promise<{
+declare function getSupervisorClient(supervisorId: string | undefined): Promise<{
   client: Client;
   isSingleton: boolean;
   sup: Supervisor | null;

package/dist/index.js

@@ -1496,6 +1496,18 @@ var Supervisor = class Supervisor {
 	get supervisorId() {
 		return this.socketPath;
 	}
+	/**
+	* Look up a run by its public run ID first, then by its label alias.
+	* Public run IDs are canonical; labels are lookup-only aliases.
+	*/
+	getRunByReference(reference) {
+		return this.runs.get(reference) ?? this.aliases.get(reference);
+	}
+	/** Match a stored run by its broker runtime ID. */
+	getRunByRuntimeId(runtimeId) {
+		if (!runtimeId) return void 0;
+		for (const runInfo of this.runs.values()) if (runInfo.runtimeId === runtimeId) return runInfo;
+	}
 	static isCurrentInstance(supervisorId) {
 		return Supervisor.instance !== null && Supervisor.instance.supervisorId === supervisorId;
 	}
@@ -1641,6 +1653,15 @@ function validateObservedAt(observedAt) {
 //#endregion
 //#region src/tools/get-supervisor-client.ts
 async function getSupervisorClient(supervisorId) {
+	if (supervisorId === void 0) {
+		const sup = await Supervisor.get();
+		return {
+			client: sup.getClient(),
+			isSingleton: true,
+			sup,
+			supervisorId: sup.supervisorId
+		};
+	}
 	const id = validateSupervisorSocketPath(supervisorId);
 	const current = Supervisor.currentInstance();
 	if (current !== null && validateSupervisorSocketPath(current.supervisorId) === id) return {
@@ -2096,14 +2117,11 @@ function validateThinkingForBackendResume(backend, value) {
 //#region src/tools/run-resolution.ts
 /** Resolve a local public run ID before considering a label alias. */
 function findLocalRunByReference(sup, reference) {
-	const { runs, aliases } = sup;
-	return runs.get(reference) ?? aliases.get(reference);
+	return sup.getRunByReference(reference);
 }
 /** Match a supervisor list entry to its stored runtime identity. */
 function findLocalRunByRuntimeId(sup, runtimeId) {
-	if (!runtimeId) return void 0;
-	const { runs } = sup;
-	for (const runInfo of runs.values()) if (runInfo.runtimeId === runtimeId) return runInfo;
+	return sup.getRunByRuntimeId(runtimeId);
 }
 //#endregion
 //#region src/tools/status.ts
@@ -3016,9 +3034,10 @@ function extractReplyMessage(result) {
 	return JSON.stringify(result);
 }
 async function executeAskTool(args, getSupervisorClient) {
-	const { client, isSingleton } = await getSupervisorClient(args.supervisorId);
+	const { client, isSingleton, sup, supervisorId } = await getSupervisorClient(args.supervisorId);
 	try {
-		const result = await client.brokerAsk(args.toRunId, args.message);
+		const target = (isSingleton && sup ? findLocalRunByReference(sup, args.toRunId) : findExternalRun(supervisorId, args.toRunId))?.runtimeId ?? args.toRunId;
+		const result = await client.brokerAsk(target, args.message);
 		return {
 			reply: extractReplyMessage(result),
 			from_run_id: result.from_run_id ?? ""

package/package.json

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