@orkestrel/agent 0.0.27 → 0.0.29

package/dist/src/core/index.cjs

@@ -2448,7 +2448,8 @@ var Agent = class {
 				broke = true;
 				break;
 			}
-			const advertised = filterAllowList(this.#context.scope?.tools, tools.definitions(), (definition) => definition.name);
+			const names = this.#context.scope?.tools?.slice();
+			const advertised = filterAllowList(names, tools.definitions(), (definition) => definition.name);
 			const definitions = advertised.length > 0 ? advertised : void 0;
 			let charged = 0;
 			let turnContent = "";
@@ -2502,8 +2503,10 @@ var Agent = class {
 					usage: resultUsage
 				};
 			}
-			if (result.tools !== void 0 && result.tools.length > 0) {
-				const authorization = this.#authorize(result.tools);
+			if (definitions === void 0) for (const call of result.tools ?? []) this.#emitter.emit("deny", call, "no tool is advertised in the active scope");
+			else if (result.tools !== void 0 && result.tools.length > 0) {
+				const admitted = filterAllowList(names, result.tools, (call) => call.name);
+				const authorization = this.#authorize(result.tools, admitted);
 				if (abort.signal.aborted) {
 					partial = true;
 					broke = true;
@@ -2575,24 +2578,33 @@ var Agent = class {
 		messages.splice(0, messages.length, ...this.#context.build(this.#provider.format));
 		return false;
 	}
-	#authorize(calls) {
-		if (this.#authority === void 0) return void 0;
+	#authorize(calls, admitted) {
 		const authority = this.#authority;
-		const allowed = [];
+		const allowed = /* @__PURE__ */ new Map();
 		const denials = /* @__PURE__ */ new Map();
-		for (const call of calls) {
+		for (const [index, call] of calls.entries()) {
+			if (!admitted.includes(call)) {
+				const reason = `${call.name} is not in the active scope`;
+				denials.set(index, denyCall(call, reason));
+				this.#emitter.emit("deny", call, reason);
+				continue;
+			}
+			if (authority === void 0) {
+				allowed.set(index, call);
+				continue;
+			}
 			let decision;
 			try {
 				decision = authority.evaluate({ call });
 			} catch (error) {
 				const reason = (0, _orkestrel_workflow.errorToMessage)(error);
-				denials.set(call.id, denyCall(call, reason));
+				denials.set(index, denyCall(call, reason));
 				this.#emitter.emit("deny", call, reason);
 				continue;
 			}
-			if (decision.allowed) allowed.push(call);
+			if (decision.allowed) allowed.set(index, call);
 			else {
-				denials.set(call.id, denyCall(call, decision.reason));
+				denials.set(index, denyCall(call, decision.reason));
 				this.#emitter.emit("deny", call, decision.reason);
 			}
 		}
@@ -2602,12 +2614,16 @@ var Agent = class {
 		};
 	}
 	async #dispatch(tools, calls, signal, authorization) {
-		if (authorization === void 0) return tools.execute(calls, { signal });
 		const { allowed, denials } = authorization;
-		const executed = allowed.length > 0 ? await tools.execute(allowed, { signal }) : [];
-		const byId = new Map(denials);
-		for (const result of executed) byId.set(result.id, result);
-		return calls.map((call) => byId.get(call.id) ?? denyCall(call, void 0));
+		const executed = allowed.size > 0 ? await tools.execute([...allowed.values()], { signal }) : [];
+		const results = new Map(denials);
+		let offset = 0;
+		for (const index of allowed.keys()) {
+			const result = executed[offset];
+			if (result !== void 0) results.set(index, result);
+			offset += 1;
+		}
+		return calls.map((call, index) => results.get(index) ?? denyCall(call, void 0));
 	}
 	async *#provide(messages, signal, definitions, think, schema, onDelta) {
 		const options = {};