@orkestrel/agent 0.0.8 → 0.0.10

package/dist/src/core/index.cjs

@@ -278,7 +278,7 @@ var WorkspaceError = class extends Error {
 		super(message);
 		this.name = "WorkspaceError";
 		this.code = code;
-		this.context = context;
+		if (context !== void 0) this.context = context;
 	}
 };
 /**
@@ -398,8 +398,8 @@ var Conversation = class {
 	constructor(options, seed) {
 		this.#id = seed?.id ?? options?.id ?? crypto.randomUUID();
 		this.#emitter = new _orkestrel_emitter.Emitter({
-			on: options?.on,
-			error: options?.error
+			...options?.on === void 0 ? {} : { on: options.on },
+			...options?.error === void 0 ? {} : { error: options.error }
 		});
 		this.#summarize = options?.summarize;
 		this.#keep = options?.keep ?? 0;
@@ -609,10 +609,11 @@ var ConversationManager = class {
 	}
 	add(input) {
 		const sections = input?.sections ?? this.#sections;
+		const summarize = input?.summarize ?? this.#summarize;
 		const conversation = new Conversation({
 			...input?.id === void 0 ? {} : { id: input.id },
 			...input?.on === void 0 ? {} : { on: input.on },
-			summarize: input?.summarize ?? this.#summarize,
+			...summarize === void 0 ? {} : { summarize },
 			keep: input?.keep ?? this.#keep,
 			...sections === void 0 ? {} : { sections }
 		}, input?.snapshot);
@@ -818,6 +819,38 @@ async function settleAgentJob(agent, allowPartial) {
 	return result;
 }
 /**
+* Handle one queued agent job by rehydrating it through a registry with the queue
+* attempt's signal, then applying the shared partial-result policy.
+*
+* @param registry - The registry that rehydrates the serializable job
+* @param allowPartial - Whether a partial result resolves instead of throwing
+* @param input - The serializable agent job
+* @param execution - The queue attempt whose signal bounds the agent
+* @returns The settled agent result
+*/
+function handleAgentQueueJob(registry, allowPartial, input, execution) {
+	return settleAgentJob(registry.build(input, execution.signal), allowPartial);
+}
+/**
+* Handle one runner agent job by fanning out its declared children, rehydrating the
+* parent through a registry with the controller signal, and applying the shared
+* partial-result policy.
+*
+* @remarks
+* Children are fired and tracked through the runner controller without awaiting them
+* inline, preserving bounded-runner progress.
+*
+* @param registry - The registry that rehydrates serializable jobs
+* @param allowPartial - Whether a partial result resolves instead of throwing
+* @param controller - The runner controller for this parent job
+* @returns The settled parent agent result
+*/
+function handleAgentRunnerJob(registry, allowPartial, controller) {
+	const children = controller.input.children;
+	if (children !== void 0) for (const child of children) controller.spawn(child);
+	return settleAgentJob(registry.build(controller.input, controller.signal), allowPartial);
+}
+/**
 * Whether a {@link FileContent} is the TEXT arm — the narrowing guard for the text-vs-binary
 * union (AGENTS §14: narrow an untyped arm via a guard, never an `as`).
 *
@@ -1415,6 +1448,15 @@ function escapeRegExp(value) {
 	return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
 /**
+* Sanitize one reported token count into a safe non-negative integer.
+*
+* @param value - The token count to sanitize
+* @returns The floored count, or `0` when the value is non-finite or non-positive
+*/
+function sanitizeToken(value) {
+	return Number.isFinite(value) && value > 0 ? Math.floor(value) : 0;
+}
+/**
 * Sanitize a {@link TokenUsage} into safe, non-negative integers — the guard an agent's
 * abort-usage path applies to a provider's partial usage before it is charged against a
 * budget or folded into the run total.
@@ -1433,11 +1475,10 @@ function escapeRegExp(value) {
 * ```
 */
 function sanitizeUsage(usage) {
-	const clean = (value) => Number.isFinite(value) && value > 0 ? Math.floor(value) : 0;
 	return {
-		prompt: clean(usage.prompt),
-		completion: clean(usage.completion),
-		total: clean(usage.total)
+		prompt: sanitizeToken(usage.prompt),
+		completion: sanitizeToken(usage.completion),
+		total: sanitizeToken(usage.total)
 	};
 }
 //#endregion
@@ -1521,8 +1562,8 @@ var InstructionManager = class {
 	#format;
 	constructor(options) {
 		this.#emitter = new _orkestrel_emitter.Emitter({
-			on: options?.on,
-			error: options?.error
+			...options?.on === void 0 ? {} : { on: options.on },
+			...options?.error === void 0 ? {} : { error: options.error }
 		});
 		this.#format = options?.format;
 	}
@@ -1724,8 +1765,8 @@ var Workspace = class {
 	constructor(options, seed) {
 		this.#id = options?.id ?? crypto.randomUUID();
 		this.#emitter = new _orkestrel_emitter.Emitter({
-			on: options?.on,
-			error: options?.error
+			...options?.on === void 0 ? {} : { on: options.on },
+			...options?.error === void 0 ? {} : { error: options.error }
 		});
 		if (seed) for (const [path, file] of seed) this.#files.set(path, file);
 	}
@@ -2018,10 +2059,12 @@ var WorkspaceManager = class {
 		return [...this.#workspaces.values()];
 	}
 	add(input) {
+		const on = input?.on ?? this.#on;
+		const error = input?.error ?? this.#error;
 		const workspace = new Workspace({
 			...input?.id === void 0 ? {} : { id: input.id },
-			on: input?.on ?? this.#on,
-			error: input?.error ?? this.#error
+			...on === void 0 ? {} : { on },
+			...error === void 0 ? {} : { error }
 		}, input?.seed);
 		this.#workspaces.set(workspace.id, workspace);
 		if (this.#active === void 0) this.#active = workspace.id;
@@ -2373,12 +2416,12 @@ var Agent = class {
 	constructor(provider, options) {
 		this.#provider = provider;
 		this.#context = new AgentContext({
-			system: options?.system,
-			tools: options?.tools,
-			instructions: options?.instructions,
-			workspaces: options?.workspaces,
-			scope: options?.scope,
-			conversations: options?.conversations
+			...options?.system === void 0 ? {} : { system: options.system },
+			...options?.tools === void 0 ? {} : { tools: options.tools },
+			...options?.instructions === void 0 ? {} : { instructions: options.instructions },
+			...options?.workspaces === void 0 ? {} : { workspaces: options.workspaces },
+			...options?.scope === void 0 ? {} : { scope: options.scope },
+			...options?.conversations === void 0 ? {} : { conversations: options.conversations }
 		});
 		this.#limit = options?.limit ?? 10;
 		this.#timeoutMs = options?.timeout;
@@ -2389,8 +2432,8 @@ var Agent = class {
 		this.#window = options?.window;
 		this.#strict = options?.strict ?? false;
 		this.#emitter = new _orkestrel_emitter.Emitter({
-			on: options?.on,
-			error: options?.error
+			...options?.on === void 0 ? {} : { on: options.on },
+			...options?.error === void 0 ? {} : { error: options.error }
 		});
 	}
 	get emitter() {
@@ -2413,42 +2456,42 @@ var Agent = class {
 		const budget = options?.budget ?? this.#budget;
 		budget?.start();
 		const limit = options?.limit ?? this.#limit;
-		const abort = (0, _orkestrel_abort.createAbort)({ signal: this.#parents(timeout, budget, options?.signal) });
+		const signal = this.#parents(timeout, budget, options?.signal);
+		const abort = (0, _orkestrel_abort.createAbort)(signal === void 0 ? {} : { signal });
 		this.#runs.add(abort);
 		this.#status = "running";
 		this.#emitter.emit("start", this.id);
-		const outcome = {
+		const state = { outcome: {
 			content: "",
 			thinking: void 0,
 			usage: void 0,
 			partial: false,
 			exhausted: false
-		};
+		} };
 		const channel = new Channel();
 		const settled = (0, _orkestrel_workflow.createDeferred)();
-		this.#pump(abort, outcome, timeout, channel, settled, options?.think, options?.schema, limit, budget);
+		this.#pump(abort, state, timeout, channel, settled, options?.think, options?.schema, limit, budget);
 		settled.promise.catch(() => {});
 		return {
 			events: this.#events(channel, abort),
 			result: settled.promise,
-			abort: (reason) => {
-				abort.abort(reason);
-			}
+			abort: abort.abort.bind(abort)
 		};
 	}
 	abort(reason) {
 		for (const abort of [...this.#runs]) abort.abort(reason);
 	}
-	async #pump(abort, outcome, timeout, channel, settled, think, schema, limit, budget) {
+	async #pump(abort, state, timeout, channel, settled, think, schema, limit, budget) {
 		let failure;
 		try {
-			for await (const chunk of this.#run(abort, outcome, think, schema, limit, budget)) channel.push(chunk);
+			for await (const chunk of this.#run(abort, state, think, schema, limit, budget)) channel.push(chunk);
 		} catch (error) {
 			failure = { error };
 		} finally {
 			timeout?.clear();
 			this.#runs.delete(abort);
 			if (failure === void 0) {
+				const outcome = state.outcome;
 				this.#status = "done";
 				channel.close();
 				const result = this.#result(outcome);
@@ -2471,7 +2514,7 @@ var Agent = class {
 			abort.abort();
 		}
 	}
-	async *#run(abort, outcome, think, schema, limit, budget) {
+	async *#run(abort, state, think, schema, limit, budget) {
 		const messages = [...this.#context.build(this.#provider.format)];
 		const tools = this.#context.tools;
 		let content = "";
@@ -2479,7 +2522,7 @@ var Agent = class {
 		let usage;
 		let pending = false;
 		let broke = false;
-		const compaction = { futile: false };
+		const compaction = { state: { futile: false } };
 		const compacting = this.#window !== void 0 && this.#context.conversations.active?.summarizable === true;
 		if (compacting) {
 			this.#window?.clear();
@@ -2491,14 +2534,20 @@ var Agent = class {
 				await this.#scheduler?.yield({ signal: abort.signal });
 			} catch (error) {
 				if (abort.signal.aborted) {
-					outcome.partial = true;
+					state.outcome = {
+						...state.outcome,
+						partial: true
+					};
 					broke = true;
 					break;
 				}
 				throw error;
 			}
 			if (abort.signal.aborted) {
-				outcome.partial = true;
+				state.outcome = {
+					...state.outcome,
+					partial: true
+				};
 				broke = true;
 				break;
 			}
@@ -2535,7 +2584,10 @@ var Agent = class {
 							usage = this.#sum(usage, abortUsage);
 						}
 					}
-					outcome.partial = true;
+					state.outcome = {
+						...state.outcome,
+						partial: true
+					};
 					broke = true;
 					break;
 				}
@@ -2593,17 +2645,21 @@ var Agent = class {
 			broke = true;
 			break;
 		}
-		if (!broke && pending) {
-			outcome.partial = true;
-			outcome.exhausted = !abort.signal.aborted;
-		}
-		outcome.content = content;
-		outcome.thinking = thinking;
-		outcome.usage = usage;
+		if (!broke && pending) state.outcome = {
+			...state.outcome,
+			partial: true,
+			exhausted: !abort.signal.aborted
+		};
+		state.outcome = {
+			...state.outcome,
+			content,
+			thinking,
+			usage
+		};
 	}
 	async #trim(messages, compaction, latchFutile) {
 		const conversation = this.#context.conversations.active;
-		if (this.#window === void 0 || conversation?.summarizable !== true || compaction.futile) return;
+		if (this.#window === void 0 || conversation?.summarizable !== true || compaction.state.futile) return;
 		this.#window.clear();
 		this.#window.consume(messages);
 		if (!this.#window.exhausted) return;
@@ -2616,7 +2672,7 @@ var Agent = class {
 			return;
 		}
 		if (section === void 0) {
-			if (latchFutile) compaction.futile = true;
+			if (latchFutile) compaction.state = { futile: true };
 			return;
 		}
 		messages.splice(0, messages.length, ...this.#context.build(this.#provider.format));
@@ -2778,16 +2834,17 @@ var AgentRegistry = class {
 		return agent;
 	}
 	#options(input, signal) {
+		const budget = this.#budget(input.budget);
 		return {
-			system: input.system,
 			tools: this.#manager(input.tools),
-			limit: input.limit,
-			timeout: input.timeout,
-			budget: this.#budget(input.budget),
-			authority: input.authority === void 0 ? void 0 : this.authority(input.authority),
-			scheduler: input.scheduler === void 0 ? void 0 : this.scheduler(input.scheduler),
-			conversations: this.#store === void 0 ? void 0 : new ConversationManager({ store: this.#store }),
-			signal
+			...input.system === void 0 ? {} : { system: input.system },
+			...input.limit === void 0 ? {} : { limit: input.limit },
+			...input.timeout === void 0 ? {} : { timeout: input.timeout },
+			...budget === void 0 ? {} : { budget },
+			...input.authority === void 0 ? {} : { authority: this.authority(input.authority) },
+			...input.scheduler === void 0 ? {} : { scheduler: this.scheduler(input.scheduler) },
+			...this.#store === void 0 ? {} : { conversations: new ConversationManager({ store: this.#store }) },
+			...signal === void 0 ? {} : { signal }
 		};
 	}
 	#manager(names) {
@@ -2853,7 +2910,7 @@ var Authority = class {
 		for (const rule of this.#rules) if (rule.match(context)) return {
 			zone: rule.zone,
 			allowed: rule.allowed ?? true,
-			reason: rule.reason
+			...rule.reason === void 0 ? {} : { reason: rule.reason }
 		};
 		return this.#fallback;
 	}
@@ -3032,16 +3089,19 @@ var Scope = class Scope {
 	files;
 	constructor(input) {
 		this.name = input.name;
-		this.instructions = input.instructions === void 0 ? void 0 : [...input.instructions];
-		this.tools = input.tools === void 0 ? void 0 : [...input.tools];
-		this.files = input.files === void 0 ? void 0 : [...input.files];
+		if (input.instructions !== void 0) this.instructions = [...input.instructions];
+		if (input.tools !== void 0) this.tools = [...input.tools];
+		if (input.files !== void 0) this.files = [...input.files];
 	}
 	narrow(config) {
+		const instructions = Scope.#intersect(this.instructions, config.instructions);
+		const tools = Scope.#intersect(this.tools, config.tools);
+		const files = Scope.#intersect(this.files, config.files);
 		return new Scope({
 			name: this.name,
-			instructions: Scope.#intersect(this.instructions, config.instructions),
-			tools: Scope.#intersect(this.tools, config.tools),
-			files: Scope.#intersect(this.files, config.files)
+			...instructions === void 0 ? {} : { instructions },
+			...tools === void 0 ? {} : { tools },
+			...files === void 0 ? {} : { files }
 		});
 	}
 	static #intersect(parent, child) {
@@ -3085,8 +3145,8 @@ var ScopeManager = class {
 	#emitter;
 	constructor(on, error) {
 		this.#emitter = new _orkestrel_emitter.Emitter({
-			on,
-			error
+			...on === void 0 ? {} : { on },
+			...error === void 0 ? {} : { error }
 		});
 	}
 	get emitter() {
@@ -3276,9 +3336,9 @@ var Tool = class {
 	#execute;
 	constructor(options) {
 		this.name = options.name;
-		this.description = options.description;
-		this.summary = options.summary;
-		this.parameters = options.parameters;
+		if (options.description !== void 0) this.description = options.description;
+		if (options.summary !== void 0) this.summary = options.summary;
+		if (options.parameters !== void 0) this.parameters = options.parameters;
 		this.#execute = options.execute;
 	}
 	execute(args) {
@@ -3936,11 +3996,11 @@ function createAgentRegistry(options) {
 function createAgentQueue(options) {
 	const { registry, allowPartial = false, concurrency, retries, timeout, store } = options;
 	return (0, _orkestrel_queue.createQueue)({
-		concurrency,
-		retries,
-		timeout,
-		store,
-		handler: (input, execution) => settleAgentJob(registry.build(input, execution.signal), allowPartial)
+		...concurrency === void 0 ? {} : { concurrency },
+		...retries === void 0 ? {} : { retries },
+		...timeout === void 0 ? {} : { timeout },
+		...store === void 0 ? {} : { store },
+		handler: handleAgentQueueJob.bind(void 0, registry, allowPartial)
 	});
 }
 /**
@@ -3982,14 +4042,10 @@ function createAgentQueue(options) {
 function createAgentRunner(options) {
 	const { registry, allowPartial = false, concurrency, retries, timeout } = options;
 	return (0, _orkestrel_workflow.createRunner)({
-		concurrency,
-		retries,
-		timeout,
-		handler: (controller) => {
-			const children = controller.input.children;
-			if (children !== void 0) for (const child of children) controller.spawn(child);
-			return settleAgentJob(registry.build(controller.input, controller.signal), allowPartial);
-		}
+		...concurrency === void 0 ? {} : { concurrency },
+		...retries === void 0 ? {} : { retries },
+		...timeout === void 0 ? {} : { timeout },
+		handler: handleAgentRunnerJob.bind(void 0, registry, allowPartial)
 	});
 }
 /**
@@ -4269,6 +4325,8 @@ exports.estimateMessages = estimateMessages;
 exports.estimateTokens = estimateTokens;
 exports.fencedFile = fencedFile;
 exports.filterAllowList = filterAllowList;
+exports.handleAgentQueueJob = handleAgentQueueJob;
+exports.handleAgentRunnerJob = handleAgentRunnerJob;
 exports.inferLanguage = inferLanguage;
 exports.isAgentError = isAgentError;
 exports.isAgentJobError = isAgentJobError;
@@ -4287,6 +4345,7 @@ exports.isWorkspaceError = isWorkspaceError;
 exports.isWorkspaceSnapshot = isWorkspaceSnapshot;
 exports.offsetAt = offsetAt;
 exports.rangeOf = rangeOf;
+exports.sanitizeToken = sanitizeToken;
 exports.sanitizeUsage = sanitizeUsage;
 exports.settleAgentJob = settleAgentJob;
 exports.sliceRange = sliceRange;