@dougbots/avenor-core 0.8.2 → 0.8.3

package/dist/index.d.ts

@@ -25,7 +25,7 @@ interface HistoryResult<TEvent = Event> {
   latest_seq?: number;
 }
 interface SpawnParams {
-  agent: string;
+  agent?: string;
   prompt_file?: string;
   prompt?: string;
   dir?: string;
@@ -253,6 +253,7 @@ interface SupervisorOptions {
 declare function findAvenorBinary(): string;
 declare class Supervisor {
   private static instance;
+  private static starting;
   private static cleanupRegistered;
   private static registerCleanup;
   private client;
@@ -265,6 +266,7 @@ declare class Supervisor {
   private callTimeoutMs;
   private constructor();
   static get(opts?: SupervisorOptions): Promise<Supervisor>;
+  private static start;
   private startProcess;
   get supervisorId(): string;
   static isCurrentInstance(supervisorId: string): boolean;
@@ -281,7 +283,7 @@ declare function socketsRoot(): string;
 //#endregion
 //#region src/tools/spawn.d.ts
 declare function spawnTool(args: {
-  agent: string;
+  agent?: string;
   prompt?: string;
   promptFile?: string;
   label?: string;
@@ -305,6 +307,11 @@ declare function spawnTool(args: {
 //#endregion
 //#region src/tools/status.d.ts
 type StatusView = 'lifecycle' | 'full';
+interface StatusToolArgs {
+  runId?: string;
+  supervisorId?: string;
+  view?: StatusView;
+}
 interface StatusResult {
   run_id: string;
   label: string;
@@ -337,13 +344,33 @@ interface StatusResult {
   final_output?: string;
   final_output_truncated?: boolean;
 }
-declare function statusTool(args: {
-  runId?: string;
+declare const statusTool: (args: StatusToolArgs) => Promise<StatusResult | StatusResult[]>;
+//#endregion
+//#region src/tools/events.d.ts
+interface EventsToolArgs {
+  runId: string;
+  types?: string[];
+  limit?: number;
   supervisorId?: string;
-  view?: StatusView;
-}): Promise<StatusResult | StatusResult[]>;
+  after_seq?: number;
+}
+interface EventsToolResult {
+  events: Array<{
+    event?: string;
+    type?: string;
+    ts?: number;
+    [key: string]: unknown;
+  }>;
+}
+declare const eventsTool: (args: EventsToolArgs) => Promise<EventsToolResult>;
 //#endregion
 //#region src/tools/inspect.d.ts
+interface InspectToolArgs {
+  runId: string;
+  supervisorId?: string;
+  limit?: number;
+  after_seq?: number;
+}
 interface InspectResult {
   run_id: string;
   label: string;
@@ -356,12 +383,7 @@ interface InspectResult {
   pending_permission?: RunSnapshot['pending_permission'];
   final_output?: string;
 }
-declare function inspectTool(args: {
-  runId: string;
-  supervisorId?: string;
-  limit?: number;
-  after_seq?: number;
-}): Promise<InspectResult>;
+declare const inspectTool: (args: InspectToolArgs) => Promise<InspectResult>;
 //#endregion
 //#region src/tools/result.d.ts
 interface ResultResult {
@@ -399,31 +421,17 @@ declare function answerPermissionTool(args: {
 }>;
 //#endregion
 //#region src/tools/follow-up.d.ts
-declare function followUpTool(args: {
+interface FollowUpToolArgs {
   runId: string;
   message: string;
   label?: string;
   supervisorId?: string;
-}): Promise<{
+}
+interface FollowUpToolResult {
   run_id: string;
   label: string;
-}>;
-//#endregion
-//#region src/tools/events.d.ts
-declare function eventsTool(args: {
-  runId: string;
-  types?: string[];
-  limit?: number;
-  supervisorId?: string;
-  after_seq?: number;
-}): Promise<{
-  events: Array<{
-    event?: string;
-    type?: string;
-    ts?: number;
-    [key: string]: unknown;
-  }>;
-}>;
+}
+declare const followUpTool: (args: FollowUpToolArgs) => Promise<FollowUpToolResult>;
 //#endregion
 //#region src/tools/shutdown.d.ts
 declare function shutdownTool(args: {

package/dist/index.js

@@ -1118,6 +1118,7 @@ function findAvenorBinary() {
 }
 var Supervisor = class Supervisor {
 	static instance = null;
+	static starting = null;
 	static cleanupRegistered = false;
 	static registerCleanup() {
 		if (Supervisor.cleanupRegistered) return;
@@ -1148,8 +1149,18 @@ var Supervisor = class Supervisor {
 		this.socketPath = socketPath;
 		this.callTimeoutMs = opts?.callTimeoutMs ?? 3e4;
 	}
-	static async get(opts) {
-		if (Supervisor.instance && !Supervisor.instance.crashed) return Supervisor.instance;
+	static get(opts) {
+		if (Supervisor.instance && !Supervisor.instance.crashed) return Promise.resolve(Supervisor.instance);
+		if (Supervisor.starting) return Supervisor.starting;
+		const starting = Supervisor.start(opts);
+		Supervisor.starting = starting;
+		const clearStarting = () => {
+			if (Supervisor.starting === starting) Supervisor.starting = null;
+		};
+		starting.then(clearStarting, clearStarting);
+		return starting;
+	}
+	static async start(opts) {
 		Supervisor.registerCleanup();
 		const binaryPath = opts?.binaryPath ?? findAvenorBinary();
 		const socketDir = socketsRoot();
@@ -1354,25 +1365,28 @@ async function getSupervisorClient(supervisorId) {
 async function spawnTool(args) {
 	const runId = crypto.randomUUID();
 	const label = args.label ?? runId;
+	const baseParams = {
+		prompt: args.prompt,
+		prompt_file: args.promptFile,
+		label,
+		dir: args.dir,
+		timeout: args.timeout !== void 0 ? validateTimeout(args.timeout) : void 0,
+		model: args.model,
+		agent_profile: args.agentProfile,
+		backend: args.backend,
+		server_url: args.serverUrl,
+		session_id: args.sessionId,
+		parent_run_id: args.parent_run_id
+	};
+	if (args.agent) baseParams.agent = args.agent;
 	if (args.supervisorId) {
 		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,
-				agent_profile: args.agentProfile,
-				backend: args.backend,
-				server_url: args.serverUrl,
-				session_id: args.sessionId,
+				...baseParams,
 				sentinel_file: sentinelPath,
-				on_event: eventLogPath,
-				parent_run_id: args.parent_run_id
+				on_event: eventLogPath
 			});
 			return {
 				run_id: result.runtime_id ?? runId,
@@ -1387,20 +1401,7 @@ async function spawnTool(args) {
 		}
 	}
 	const sup = await Supervisor.get();
-	const runInfo = await sup.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,
-		agent_profile: args.agentProfile,
-		backend: args.backend,
-		server_url: args.serverUrl,
-		session_id: args.sessionId,
-		parent_run_id: args.parent_run_id
-	}, runId);
+	const runInfo = await sup.spawn(baseParams, runId);
 	return {
 		run_id: runInfo.runId,
 		label: runInfo.label,
@@ -1564,7 +1565,7 @@ async function queryLiveStatus(client, runtimeId) {
 		return null;
 	}
 }
-async function statusTool(args) {
+async function executeStatusTool(args, getSupervisorClient) {
 	if (args.supervisorId) {
 		const { client, isSingleton, sup } = await getSupervisorClient(args.supervisorId);
 		try {
@@ -1638,6 +1639,10 @@ async function statusTool(args) {
 	}
 	return results;
 }
+function createStatusTool(getSupervisorClient) {
+	return (args) => executeStatusTool(args, getSupervisorClient);
+}
+const statusTool = createStatusTool(getSupervisorClient);
 //#endregion
 //#region src/tools/events.ts
 const MAX_EVENT_LIMIT = 1e3;
@@ -1717,7 +1722,7 @@ async function readNdjsonEvents(filePath, args) {
 	}
 	return events;
 }
-async function resolveRun(args) {
+async function resolveRun(args, getSupervisorClient) {
 	if (args.supervisorId) {
 		const { client, isSingleton, sup } = await getSupervisorClient(args.supervisorId);
 		const runInfo = isSingleton && sup ? findRunByLabel$2(sup, args.runId) : void 0;
@@ -1788,9 +1793,9 @@ async function resolveRun(args) {
 		eventLogPath
 	};
 }
-async function eventsTool(args) {
+async function executeEventsTool(args, getSupervisorClient) {
 	const limit = normalizeLimit(args.limit);
-	const resolved = await resolveRun(args);
+	const resolved = await resolveRun(args, getSupervisorClient);
 	try {
 		const failures = [];
 		if (resolved.eventLogPath) try {
@@ -1818,21 +1823,25 @@ async function eventsTool(args) {
 		if (!resolved.isSingleton) resolved.client.close();
 	}
 }
+function createEventsTool(getSupervisorClient) {
+	return (args) => executeEventsTool(args, getSupervisorClient);
+}
+const eventsTool = createEventsTool(getSupervisorClient);
 //#endregion
 //#region src/tools/inspect.ts
 function publicSnapshot(snapshot) {
 	const { _seen_seq_by_scope: _seen, _recent_legacy_keys: _recent, _last_semantic_fingerprint: _fingerprint, _last_source_event: _source, ...rest } = snapshot;
 	return rest;
 }
-async function inspectTool(args) {
-	const rawStatus = await statusTool({
+async function executeInspectTool(args, deps) {
+	const rawStatus = await deps.status({
 		runId: args.runId,
 		supervisorId: args.supervisorId
 	});
 	const status = Array.isArray(rawStatus) ? rawStatus[0] : rawStatus;
 	if (!status) throw new Error(`run not found: ${args.runId}`);
 	const reducer = new RunReducer();
-	const { events } = await eventsTool({
+	const { events } = await deps.events({
 		runId: args.runId,
 		supervisorId: args.supervisorId,
 		limit: args.limit,
@@ -1875,6 +1884,13 @@ async function inspectTool(args) {
 		final_output: clean.final_output
 	};
 }
+function createInspectTool(deps) {
+	return (args) => executeInspectTool(args, deps);
+}
+const inspectTool = createInspectTool({
+	status: statusTool,
+	events: eventsTool
+});
 //#endregion
 //#region src/tools/result.ts
 const DEFAULT_POLL_INTERVAL_MS = 1e3;
@@ -2057,7 +2073,7 @@ async function parseSentinel(filePath) {
 		return null;
 	}
 }
-async function followUpTool(args) {
+async function executeFollowUpTool(args, getSupervisorClient) {
 	if (args.supervisorId) {
 		const { client, isSingleton, sup } = await getSupervisorClient(args.supervisorId);
 		try {
@@ -2134,6 +2150,10 @@ async function followUpTool(args) {
 		label: followUpRun.label
 	};
 }
+function createFollowUpTool(getSupervisorClient) {
+	return (args) => executeFollowUpTool(args, getSupervisorClient);
+}
+const followUpTool = createFollowUpTool(getSupervisorClient);
 //#endregion
 //#region src/tools/shutdown.ts
 async function shutdownTool(args) {

package/package.json

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