@dougbots/avenor-core 0.8.2 → 0.9.0

package/dist/index.d.ts

@@ -24,14 +24,16 @@ interface HistoryResult<TEvent = Event> {
   events: TEvent[];
   latest_seq?: number;
 }
+type ThinkingLevel = 'off' | 'minimal' | 'low' | 'medium' | 'high' | 'xhigh' | 'max';
 interface SpawnParams {
-  agent: string;
+  agent?: string;
   prompt_file?: string;
   prompt?: string;
   dir?: string;
   label?: string;
   timeout?: number;
   model?: string;
+  thinking?: ThinkingLevel;
   agent_profile?: string;
   backend?: string;
   server_url?: string;
@@ -44,6 +46,7 @@ interface SpawnParams {
 declare class Client {
   private socket;
   private rl;
+  private closed;
   private nextID;
   private pending;
   private started;
@@ -72,6 +75,7 @@ declare class Client {
   prompt(runtimeId: string, text: string): Promise<void>;
   interruptAndPrompt(runtimeId: string, text: string, keepQueue?: boolean): Promise<void>;
   cancel(runtimeId?: string): Promise<void>;
+  isClosed(): boolean;
   close(): void;
 }
 declare function dial(socketPath: string, opts?: {
@@ -241,6 +245,7 @@ interface RunInfo {
   agentProfile?: string;
   backend?: string;
   model?: string;
+  thinking?: ThinkingLevel;
   dir?: string;
   brokerUrl?: string;
   parentToken?: string;
@@ -253,6 +258,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 +271,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,13 +288,14 @@ 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;
   dir?: string;
   timeout?: string;
   model?: string;
+  thinking?: ThinkingLevel;
   agentProfile?: string;
   backend?: string;
   serverUrl?: string;
@@ -305,6 +313,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 +350,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 +389,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 +427,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: {
@@ -434,4 +448,4 @@ declare function shutdownTool(args: {
   cleaned_up: string[];
 }>;
 //#endregion
-export { type Client, DEFAULT_RUN_REDUCER_LIMITS, type Event, type HistoryOptions, type HistoryResult, type InspectResult, type NormalizedRunEvent, type ObserveRunOptions, type ResultResult, type ResultToolArgs, type RunChunkRole, type RunIdentity, type RunInfo, type RunObserver, type RunObserverClient, type RunPermissionOption, type RunPermissionSummary, RunReducer, type RunReducerLimits, type RunSnapshot, type RunSnapshotSeed, type RunToolState, type RunToolSummary, type RunTranscriptEntry, type SpawnParams, type StatusResult, type StatusView, type SubscribeOptions, Supervisor, type SupervisorOptions, answerPermissionTool, createRunSnapshot, dial, eventsTool, extractEventText, findAvenorBinary, followUpTool, getInstallDir, getVersion, inspectTool, installerBinaryPath, normalizeRunEvent, observeRun, reduceRunSnapshot, resultTool, shutdownTool, socketsRoot, spawnTool, statusTool };
+export { type Client, DEFAULT_RUN_REDUCER_LIMITS, type Event, type HistoryOptions, type HistoryResult, type InspectResult, type NormalizedRunEvent, type ObserveRunOptions, type ResultResult, type ResultToolArgs, type RunChunkRole, type RunIdentity, type RunInfo, type RunObserver, type RunObserverClient, type RunPermissionOption, type RunPermissionSummary, RunReducer, type RunReducerLimits, type RunSnapshot, type RunSnapshotSeed, type RunToolState, type RunToolSummary, type RunTranscriptEntry, type SpawnParams, type StatusResult, type StatusView, type SubscribeOptions, Supervisor, type SupervisorOptions, type ThinkingLevel, answerPermissionTool, createRunSnapshot, dial, eventsTool, extractEventText, findAvenorBinary, followUpTool, getInstallDir, getVersion, inspectTool, installerBinaryPath, normalizeRunEvent, observeRun, reduceRunSnapshot, resultTool, shutdownTool, socketsRoot, spawnTool, statusTool };

package/dist/index.js

@@ -26,6 +26,7 @@ function removeResolver(resolvers, target) {
 var Client = class {
 	socket;
 	rl;
+	closed = false;
 	nextID = 0;
 	pending = /* @__PURE__ */ new Map();
 	started = false;
@@ -44,11 +45,15 @@ var Client = class {
 		});
 		this.callTimeout = opts?.callTimeoutMs ?? 3e4;
 		this.socket.on("error", (err) => {
+			this.closed = true;
 			this.pushEvent({
 				event: "protocol-error",
 				message: err.message
 			});
 		});
+		this.socket.on("close", () => {
+			this.closed = true;
+		});
 	}
 	startReadLoop() {
 		if (this.started) return;
@@ -85,6 +90,7 @@ var Client = class {
 			}
 		});
 		this.rl.on("close", () => {
+			this.closed = true;
 			for (const [, pc] of this.pending) {
 				clearTimeout(pc.timer);
 				pc.reject(/* @__PURE__ */ new Error("read response: connection closed"));
@@ -116,6 +122,7 @@ var Client = class {
 		else this.dropped++;
 	}
 	async call(method, params) {
+		if (this.isClosed()) throw new Error("control socket is closed");
 		this.startReadLoop();
 		const id = ++this.nextID;
 		const req = {
@@ -137,6 +144,7 @@ var Client = class {
 			});
 			this.socket.write(data, (err) => {
 				if (err) {
+					this.closed = true;
 					clearTimeout(timer);
 					this.pending.delete(id);
 					reject(/* @__PURE__ */ new Error(`write request: ${err.message}`));
@@ -272,7 +280,11 @@ var Client = class {
 		const params = runtimeId ? { runtime_id: runtimeId } : void 0;
 		await this.call("cancel", params);
 	}
+	isClosed() {
+		return this.closed || this.socket.destroyed || this.socket.writableEnded;
+	}
 	close() {
+		this.closed = true;
 		this.rl.close();
 		this.socket.destroy();
 	}
@@ -1118,6 +1130,7 @@ function findAvenorBinary() {
 }
 var Supervisor = class Supervisor {
 	static instance = null;
+	static starting = null;
 	static cleanupRegistered = false;
 	static registerCleanup() {
 		if (Supervisor.cleanupRegistered) return;
@@ -1148,8 +1161,25 @@ 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) {
+		const current = Supervisor.instance;
+		if (current && !current.crashed) {
+			if (current.client && !current.client.isClosed()) return Promise.resolve(current);
+			current.crashed = true;
+			current.crashCode = 0;
+			current.client?.close();
+			current.client = null;
+		}
+		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();
@@ -1205,15 +1235,13 @@ var Supervisor = class Supervisor {
 					reject(/* @__PURE__ */ new Error(`avenor exited with code ${code}${signal ? " signal " + signal : ""} during startup`));
 					return;
 				}
-				if (code !== 0 || signal) {
-					this.crashed = true;
-					this.crashCode = code ?? -1;
-					if (this.client) {
-						try {
-							this.client.close();
-						} catch {}
-						this.client = null;
-					}
+				this.crashed = true;
+				this.crashCode = code ?? -1;
+				if (this.client) {
+					try {
+						this.client.close();
+					} catch {}
+					this.client = null;
 				}
 			});
 			this.childProcess.on("error", (err) => {
@@ -1251,8 +1279,17 @@ var Supervisor = class Supervisor {
 		return Supervisor.instance;
 	}
 	getClient() {
-		if (this.crashed) throw new Error(`avenor supervisor crashed (exit code ${this.crashCode}). Call avenor_shutdown to clean up and retry.`);
+		if (this.crashed) {
+			const state = this.crashCode === 0 ? "exited" : "crashed";
+			throw new Error(`avenor supervisor ${state} (exit code ${this.crashCode}). Call avenor_shutdown to clean up and retry.`);
+		}
 		if (!this.client) throw new Error("supervisor not started");
+		if (this.client.isClosed()) {
+			this.crashed = true;
+			this.crashCode = 0;
+			this.client = null;
+			throw new Error("avenor supervisor connection closed");
+		}
 		return this.client;
 	}
 	async spawn(params, runId = crypto.randomUUID()) {
@@ -1276,6 +1313,7 @@ var Supervisor = class Supervisor {
 			agentProfile: spawnParams.agent_profile,
 			backend: spawnParams.backend,
 			model: spawnParams.model,
+			thinking: spawnParams.thinking,
 			dir: spawnParams.dir,
 			brokerUrl: result.broker_url,
 			parentToken: result.parent_token,
@@ -1354,25 +1392,29 @@ 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.thinking !== void 0) baseParams.thinking = args.thinking;
 	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 +1429,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 +1593,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 +1667,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 +1750,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 +1821,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 +1851,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 +1912,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 +2101,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 {
@@ -2074,6 +2118,7 @@ async function followUpTool(args) {
 			const agent = requireResumableAgent(liveStatus?.agent ?? runInfo?.agent);
 			const backend = liveStatus?.backend ?? runInfo?.backend;
 			const model = liveStatus?.model ?? runInfo?.model;
+			const thinking = liveStatus?.thinking ?? runInfo?.thinking;
 			const dir = liveStatus?.dir ?? runInfo?.dir;
 			const agentProfile = liveStatus?.agent_profile ?? runInfo?.agentProfile;
 			const autoApprove = resolveAutoApprove(liveStatus, runInfo);
@@ -2090,6 +2135,7 @@ async function followUpTool(args) {
 			};
 			if (backend) spawnParams.backend = backend;
 			if (model) spawnParams.model = model;
+			if (thinking) spawnParams.thinking = thinking;
 			if (dir) spawnParams.dir = dir;
 			if (agentProfile) spawnParams.agent_profile = agentProfile;
 			if (autoApprove === true) spawnParams.auto_approve = true;
@@ -2114,6 +2160,7 @@ async function followUpTool(args) {
 	const agent = requireResumableAgent(liveStatus?.agent ?? runInfo.agent);
 	const backend = liveStatus?.backend ?? runInfo.backend;
 	const model = liveStatus?.model ?? runInfo.model;
+	const thinking = liveStatus?.thinking ?? runInfo.thinking;
 	const dir = liveStatus?.dir ?? runInfo.dir;
 	const agentProfile = liveStatus?.agent_profile ?? runInfo.agentProfile;
 	const autoApprove = resolveAutoApprove(liveStatus, runInfo);
@@ -2122,6 +2169,7 @@ async function followUpTool(args) {
 		agent,
 		backend,
 		model,
+		thinking,
 		dir,
 		agent_profile: agentProfile,
 		prompt: args.message,
@@ -2134,6 +2182,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.9.0",
   "type": "module",
   "repository": {
     "type": "git",