@dougbots/avenor-core 0.8.3 → 0.9.0

package/dist/index.d.ts

@@ -24,6 +24,7 @@ interface HistoryResult<TEvent = Event> {
   events: TEvent[];
   latest_seq?: number;
 }
+type ThinkingLevel = 'off' | 'minimal' | 'low' | 'medium' | 'high' | 'xhigh' | 'max';
 interface SpawnParams {
   agent?: string;
   prompt_file?: string;
@@ -32,6 +33,7 @@ interface SpawnParams {
   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;
@@ -290,6 +295,7 @@ declare function spawnTool(args: {
   dir?: string;
   timeout?: string;
   model?: string;
+  thinking?: ThinkingLevel;
   agentProfile?: string;
   backend?: string;
   serverUrl?: string;
@@ -442,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();
 	}
@@ -1150,7 +1162,14 @@ var Supervisor = class Supervisor {
 		this.callTimeoutMs = opts?.callTimeoutMs ?? 3e4;
 	}
 	static get(opts) {
-		if (Supervisor.instance && !Supervisor.instance.crashed) return Promise.resolve(Supervisor.instance);
+		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;
@@ -1216,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) => {
@@ -1262,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()) {
@@ -1287,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,
@@ -1379,6 +1406,7 @@ async function spawnTool(args) {
 		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);
@@ -2090,6 +2118,7 @@ async function executeFollowUpTool(args, getSupervisorClient) {
 			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);
@@ -2106,6 +2135,7 @@ async function executeFollowUpTool(args, getSupervisorClient) {
 			};
 			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;
@@ -2130,6 +2160,7 @@ async function executeFollowUpTool(args, getSupervisorClient) {
 	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);
@@ -2138,6 +2169,7 @@ async function executeFollowUpTool(args, getSupervisorClient) {
 		agent,
 		backend,
 		model,
+		thinking,
 		dir,
 		agent_profile: agentProfile,
 		prompt: args.message,

package/package.json

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