@relayfx/sdk 0.3.5 → 0.3.7

package/dist/{index-5dqkw53p.js → index-h8rx4xya.js}

@@ -8,7 +8,7 @@ import {
   SqlFailure,
   make,
   normalizeAcquisitionCause
-} from "./index-cq8t8ka1.js";
+} from "./index-8awt651b.js";
 
 // src/migration-errors.ts
 import { Cause, Effect, Function } from "effect";

package/dist/{index-cyfx5y3r.js → index-pw46cfne.js}

@@ -442,6 +442,9 @@ var DefinitionSchema = Schema5.Struct({
   skill_definition_ids: Schema5.optionalKey(Schema5.Array(SkillDefinitionId)),
   permission_rules: Schema5.optionalKey(PermissionRuleset),
   turn_policy: Schema5.optionalKey(TurnPolicySnapshot),
+  tool_execution: Schema5.optionalKey(Schema5.Struct({
+    concurrency: PositiveSafeInteger
+  })),
   compaction_policy: Schema5.optionalKey(CompactionPolicy),
   max_tool_turns: Schema5.optionalKey(Schema5.Int.check(Schema5.isGreaterThanOrEqualTo(1))),
   max_wait_turns: Schema5.optionalKey(Schema5.Int.check(Schema5.isGreaterThanOrEqualTo(0))),
@@ -463,6 +466,7 @@ var define = (input) => ({
     ...input.skill_definition_ids === undefined ? {} : { skill_definition_ids: input.skill_definition_ids },
     ...input.permission_rules === undefined ? {} : { permission_rules: input.permission_rules },
     ...input.turn_policy === undefined ? {} : { turn_policy: input.turn_policy },
+    ...input.tool_execution === undefined ? {} : { tool_execution: input.tool_execution },
     ...input.compaction_policy === undefined ? {} : { compaction_policy: input.compaction_policy },
     ...input.max_tool_turns === undefined ? {} : { max_tool_turns: input.max_tool_turns },
     ...input.max_wait_turns === undefined ? {} : { max_wait_turns: input.max_wait_turns },
@@ -1114,42 +1118,46 @@ var Classification = Schema17.Union([
   TimerWait,
   ExternalWait
 ]).annotate({ identifier: "Relay.WaitClassification" });
-var suffixAfter = (waitId, namespace) => waitId.slice(namespace.length);
+var scopedToolCallId = (waitId, namespace) => {
+  const scope = waitId.slice(namespace.length);
+  const separator = scope.indexOf(":");
+  return ToolCallId.make(decodeURIComponent(scope.slice(separator + 1)));
+};
 var classify = (input) => {
   const waitId = input.wait_id;
   if (waitId.startsWith("wait:permission:")) {
     return {
       kind: "permission",
       wait_id: waitId,
-      tool_call_id: ToolCallId.make(suffixAfter(waitId, "wait:permission:"))
+      tool_call_id: scopedToolCallId(waitId, "wait:permission:")
     };
   }
   if (waitId.startsWith("wait:approval:")) {
     return {
       kind: "tool_approval",
       wait_id: waitId,
-      tool_call_id: ToolCallId.make(suffixAfter(waitId, "wait:approval:"))
+      tool_call_id: scopedToolCallId(waitId, "wait:approval:")
     };
   }
   if (waitId.startsWith("wait:child:")) {
     return {
       kind: "child_join",
       wait_id: waitId,
-      child_execution_id: ChildExecutionId.make(suffixAfter(waitId, "wait:child:"))
+      child_execution_id: ChildExecutionId.make(waitId.slice("wait:child:".length))
     };
   }
   if (waitId.startsWith("wait:inbox:")) {
     return {
       kind: "inbox",
       wait_id: waitId,
-      tool_call_id: ToolCallId.make(suffixAfter(waitId, "wait:inbox:"))
+      tool_call_id: ToolCallId.make(waitId.slice("wait:inbox:".length))
     };
   }
   if (waitId.startsWith("wait:tool:")) {
     return {
       kind: "tool_placement",
       wait_id: waitId,
-      tool_call_id: ToolCallId.make(suffixAfter(waitId, "wait:tool:"))
+      tool_call_id: scopedToolCallId(waitId, "wait:tool:")
     };
   }
   if (waitId.startsWith("wait:reply:") || input.envelope_id !== undefined && input.mode === "reply") {

package/dist/{index-8fpd6kvj.js → index-t5bbk8cp.js}

@@ -3,7 +3,7 @@ import {
   __export
 } from "./index-nb39b5ae.js";
 
-// ../../node_modules/.bun/@batonfx+core@0.6.2/node_modules/@batonfx/core/dist/turn-policy.js
+// ../../node_modules/.bun/@batonfx+core@0.6.4/node_modules/@batonfx/core/dist/turn-policy.js
 var exports_turn_policy = {};
 __export(exports_turn_policy, {
   untilToolCall: () => untilToolCall,
@@ -74,7 +74,7 @@ var both = dual(2, (first, second) => ({
 }));
 var defaultPolicy = forever;
 
-// ../../node_modules/.bun/@batonfx+core@0.6.2/node_modules/@batonfx/core/dist/agent-event.js
+// ../../node_modules/.bun/@batonfx+core@0.6.4/node_modules/@batonfx/core/dist/agent-event.js
 var exports_agent_event = {};
 __export(exports_agent_event, {
   addUsage: () => addUsage,
@@ -169,9 +169,18 @@ class AgentSuspended extends Schema2.TaggedErrorClass()("@batonfx/core/AgentSusp
   token: Schema2.String,
   reason: Schema2.Literals(["tool-wait", "approval"]),
   authorization_stage: Schema2.optional(Schema2.Literals(["permission", "approval"])),
+  tool_call_index: Schema2.optional(Schema2.Int.check(Schema2.isGreaterThanOrEqualTo(0))),
   tool_call_id: Schema2.String,
   tool_name: Schema2.String,
   tool_params: Schema2.Unknown,
+  tool_call_batch: Schema2.Array(Schema2.Struct({
+    type: Schema2.Literal("tool-call"),
+    id: Schema2.String,
+    name: Schema2.String,
+    params: Schema2.Unknown,
+    providerExecuted: Schema2.Boolean,
+    metadata: Response2.ProviderMetadata
+  })),
   active_tools: Schema2.optional(Schema2.Array(Schema2.String)),
   activated_skills: Schema2.optional(Schema2.Array(Schema2.String))
 }) {
@@ -184,7 +193,7 @@ class ResumeMismatch extends Schema2.TaggedErrorClass()("@batonfx/core/ResumeMis
 }) {
 }
 
-// ../../node_modules/.bun/@batonfx+core@0.6.2/node_modules/@batonfx/core/dist/tool-context.js
+// ../../node_modules/.bun/@batonfx+core@0.6.4/node_modules/@batonfx/core/dist/tool-context.js
 var exports_tool_context = {};
 __export(exports_tool_context, {
   testLayer: () => testLayer,
@@ -202,7 +211,7 @@ var layerDefault = Layer2.sync(ToolContext, () => ToolContext.of({
 }));
 var testLayer = (implementation) => Layer2.succeed(ToolContext, ToolContext.of(implementation));
 
-// ../../node_modules/.bun/@batonfx+core@0.6.2/node_modules/@batonfx/core/dist/tool-executor.js
+// ../../node_modules/.bun/@batonfx+core@0.6.4/node_modules/@batonfx/core/dist/tool-executor.js
 var exports_tool_executor = {};
 __export(exports_tool_executor, {
   testLayer: () => testLayer2,
@@ -427,7 +436,7 @@ function router(routes) {
 }
 var testLayer2 = (implementation) => Layer3.succeed(ToolExecutor, ToolExecutor.of(implementation));
 
-// ../../node_modules/.bun/@batonfx+core@0.6.2/node_modules/@batonfx/core/dist/approvals.js
+// ../../node_modules/.bun/@batonfx+core@0.6.4/node_modules/@batonfx/core/dist/approvals.js
 var exports_approvals = {};
 __export(exports_approvals, {
   testLayer: () => testLayer3,
@@ -442,7 +451,7 @@ var autoApprove = Layer4.succeed(Approvals, Approvals.of({ check: () => Effect4.
 var denyAll = Layer4.succeed(Approvals, Approvals.of({ check: () => Effect4.succeed({ _tag: "Denied" }) }));
 var testLayer3 = (implementation) => Layer4.succeed(Approvals, Approvals.of(implementation));
 
-// ../../node_modules/.bun/@batonfx+core@0.6.2/node_modules/@batonfx/core/dist/memory.js
+// ../../node_modules/.bun/@batonfx+core@0.6.4/node_modules/@batonfx/core/dist/memory.js
 var exports_memory = {};
 __export(exports_memory, {
   testLayer: () => testLayer4,
@@ -510,7 +519,7 @@ var layerNoop = Layer5.succeed(Memory, Memory.of(noop));
 var noopLayer = layerNoop;
 var testLayer4 = (implementation) => Layer5.succeed(Memory, Memory.of(implementation));
 
-// ../../node_modules/.bun/@batonfx+core@0.6.2/node_modules/@batonfx/core/dist/session.js
+// ../../node_modules/.bun/@batonfx+core@0.6.4/node_modules/@batonfx/core/dist/session.js
 var exports_session = {};
 __export(exports_session, {
   testLayer: () => testLayer5,
@@ -789,7 +798,7 @@ var layerMemory = Layer6.effect(SessionStore, Ref.make(initialState).pipe(Effect
 var memoryLayer = layerMemory;
 var testLayer5 = (implementation) => Layer6.succeed(SessionStore, SessionStore.of(implementation));
 
-// ../../node_modules/.bun/@batonfx+core@0.6.2/node_modules/@batonfx/core/dist/tool-output.js
+// ../../node_modules/.bun/@batonfx+core@0.6.4/node_modules/@batonfx/core/dist/tool-output.js
 var exports_tool_output = {};
 __export(exports_tool_output, {
   testLayer: () => testLayer6,
@@ -865,7 +874,7 @@ var bound = Function2.dual(2, (result, options) => Effect7.gen(function* () {
   return boundedFromOriginal(encoded, bytes, options.maxBytes, [path.value]);
 }));
 
-// ../../node_modules/.bun/@batonfx+core@0.6.2/node_modules/@batonfx/core/dist/compaction.js
+// ../../node_modules/.bun/@batonfx+core@0.6.4/node_modules/@batonfx/core/dist/compaction.js
 var exports_compaction = {};
 __export(exports_compaction, {
   truncate: () => truncate,
@@ -1134,7 +1143,7 @@ var truncate = (maxTokens) => ({
 });
 var testLayer7 = (implementation) => Layer8.succeed(Compaction, Compaction.of(implementation));
 
-// ../../node_modules/.bun/@batonfx+core@0.6.2/node_modules/@batonfx/core/dist/instructions.js
+// ../../node_modules/.bun/@batonfx+core@0.6.4/node_modules/@batonfx/core/dist/instructions.js
 var exports_instructions = {};
 __export(exports_instructions, {
   testLayer: () => testLayer8,
@@ -1183,7 +1192,7 @@ var renderUpdate = dual3(2, (epoch, context) => Effect9.gen(function* () {
 var layer2 = (sources) => Layer9.succeed(Instructions, Instructions.of({ sources: [...sources] }));
 var testLayer8 = (implementation) => Layer9.succeed(Instructions, Instructions.of(implementation));
 
-// ../../node_modules/.bun/@batonfx+core@0.6.2/node_modules/@batonfx/core/dist/model-middleware.js
+// ../../node_modules/.bun/@batonfx+core@0.6.4/node_modules/@batonfx/core/dist/model-middleware.js
 var exports_model_middleware = {};
 __export(exports_model_middleware, {
   layerIdentity: () => layerIdentity,
@@ -1199,7 +1208,7 @@ var layerIdentity = Layer10.succeed(ModelMiddleware, []);
 var identityLayer = layerIdentity;
 var layer3 = (middleware) => Layer10.succeed(ModelMiddleware, middleware);
 
-// ../../node_modules/.bun/@batonfx+core@0.6.2/node_modules/@batonfx/core/dist/model-registry.js
+// ../../node_modules/.bun/@batonfx+core@0.6.4/node_modules/@batonfx/core/dist/model-registry.js
 var exports_model_registry = {};
 __export(exports_model_registry, {
   testLayer: () => testLayer9,
@@ -1326,7 +1335,7 @@ var operate = Function4.dual(2, (selection, effect) => Effect11.gen(function* ()
 var stream = Function4.dual(2, (selection, operation) => Stream2.unwrap(Service.pipe(Effect11.map((service) => service.stream(selection, operation)))));
 var provide = operate;
 
-// ../../node_modules/.bun/@batonfx+core@0.6.2/node_modules/@batonfx/core/dist/model-resilience.js
+// ../../node_modules/.bun/@batonfx+core@0.6.4/node_modules/@batonfx/core/dist/model-resilience.js
 var exports_model_resilience = {};
 __export(exports_model_resilience, {
   testLayer: () => testLayer10,
@@ -1379,7 +1388,7 @@ var apply = Function5.dual(2, (model, resilience) => ({
   streamText: (options) => retryStream(() => model.streamText(options), (error) => Response5.makePart("error", { error }), resilience)
 }));
 
-// ../../node_modules/.bun/@batonfx+core@0.6.2/node_modules/@batonfx/core/dist/permissions.js
+// ../../node_modules/.bun/@batonfx+core@0.6.4/node_modules/@batonfx/core/dist/permissions.js
 var exports_permissions = {};
 __export(exports_permissions, {
   testLayer: () => testLayer11,
@@ -1513,7 +1522,7 @@ var ruleStoreMemory = (initialRules = []) => Layer13.effect(RuleStore, Ref4.make
 var ruleStoreTestLayer = (implementation) => Layer13.succeed(RuleStore, RuleStore.of(implementation));
 var testLayer11 = (implementation) => Layer13.succeed(Permissions, Permissions.of(implementation));
 
-// ../../node_modules/.bun/@batonfx+core@0.6.2/node_modules/@batonfx/core/dist/skill-source.js
+// ../../node_modules/.bun/@batonfx+core@0.6.4/node_modules/@batonfx/core/dist/skill-source.js
 var exports_skill_source = {};
 __export(exports_skill_source, {
   testLayer: () => testLayer12,
@@ -1593,7 +1602,7 @@ var selectListings = Function6.dual(3, (skills, budgetTokens, recentlyUsed) => {
   return selected;
 });
 
-// ../../node_modules/.bun/@batonfx+core@0.6.2/node_modules/@batonfx/core/dist/steering.js
+// ../../node_modules/.bun/@batonfx+core@0.6.4/node_modules/@batonfx/core/dist/steering.js
 var exports_steering = {};
 __export(exports_steering, {
   testLayer: () => testLayer13,
@@ -1651,7 +1660,7 @@ var layer7 = (options = {}) => Layer15.effect(Steering, Effect15.gen(function* (
 }));
 var testLayer13 = (implementation) => Layer15.succeed(Steering, Steering.of(implementation));
 
-// ../../node_modules/.bun/@batonfx+core@0.6.2/node_modules/@batonfx/core/dist/agent.js
+// ../../node_modules/.bun/@batonfx+core@0.6.4/node_modules/@batonfx/core/dist/agent.js
 var exports_agent = {};
 __export(exports_agent, {
   streamObject: () => streamObject,
@@ -1670,7 +1679,7 @@ import { Cause as Cause4, Channel, Effect as Effect18, Equal, Exit as Exit2, Fib
 import { dual as dual7 } from "effect/Function";
 import { AiError as AiError3, Chat, LanguageModel as LanguageModel5, Prompt as Prompt9, Response as Response7, Telemetry, Tokenizer as Tokenizer2, Tool as Tool7, Toolkit as Toolkit4 } from "effect/unstable/ai";
 
-// ../../node_modules/.bun/@batonfx+core@0.6.2/node_modules/@batonfx/core/dist/tool-authorization.js
+// ../../node_modules/.bun/@batonfx+core@0.6.4/node_modules/@batonfx/core/dist/tool-authorization.js
 import { Cause as Cause3, Context as Context15, Effect as Effect16, Layer as Layer16, Option as Option10, Schema as Schema13 } from "effect";
 import { dual as dual5 } from "effect/Function";
 import { Prompt as Prompt8, Response as Response6, Tool as Tool5 } from "effect/unstable/ai";
@@ -1697,6 +1706,7 @@ var suspension = (request, token, stage) => ({
     tool_call_id: request.call.id,
     tool_name: request.call.name,
     tool_params: request.call.params,
+    tool_call_batch: request.execution.toolCallBatch.calls,
     active_tools: request.activeTools,
     activated_skills: request.activatedSkills
   })
@@ -1841,7 +1851,7 @@ var make4 = (options = {}) => ({
 });
 var fromPermissions = dual5((args) => args.length === 2 || args.length === 1 && ("evaluate" in args[0]), (permissions, options = {}) => make4({ ...options, permissions }));
 
-// ../../node_modules/.bun/@batonfx+core@0.6.2/node_modules/@batonfx/core/dist/tool-registry.js
+// ../../node_modules/.bun/@batonfx+core@0.6.4/node_modules/@batonfx/core/dist/tool-registry.js
 import { Effect as Effect17, HashMap as HashMap3, Option as Option11 } from "effect";
 import { dual as dual6 } from "effect/Function";
 import { Tool as Tool6, Toolkit as Toolkit3 } from "effect/unstable/ai";
@@ -1894,7 +1904,7 @@ var select = dual6(2, (registry, names) => {
   };
 });
 
-// ../../node_modules/.bun/@batonfx+core@0.6.2/node_modules/@batonfx/core/dist/agent.js
+// ../../node_modules/.bun/@batonfx+core@0.6.4/node_modules/@batonfx/core/dist/agent.js
 var AgentTypeId = Symbol.for("@batonfx/core/Agent");
 var ModelLayerTypeId = Symbol.for("@batonfx/core/Agent/ModelLayer");
 var classifyOtherFailure = () => "other";
@@ -1996,6 +2006,8 @@ var suspensionMetadata = Schema14.Struct({
   token: Schema14.String,
   reason: Schema14.Literals(["tool-wait", "approval"]),
   authorization_stage: Schema14.optional(Schema14.Literals(["permission", "approval"])),
+  tool_call_index: Schema14.optional(Schema14.Int.check(Schema14.isGreaterThanOrEqualTo(0))),
+  tool_call_batch_ids: Schema14.Array(Schema14.String),
   active_tools: Schema14.optional(Schema14.Array(Schema14.String)),
   activated_skills: Schema14.optional(Schema14.Array(Schema14.String))
 });
@@ -2010,7 +2022,7 @@ var releasePersistedChatLock = (persistence, chatId, lock) => {
   if (locks.size === 0)
     persistenceLocks.delete(persistence);
 };
-var unresolvedToolCall = (messages) => {
+var unresolvedToolCall = (messages, toolCallId) => {
   const unpaired = new Map;
   const ambiguous = new Set;
   for (const [messageIndex, message] of messages.entries()) {
@@ -2039,12 +2051,22 @@ var unresolvedToolCall = (messages) => {
     }
   }
   const unresolved = [...unpaired.entries()].flatMap(([id, occurrences]) => ambiguous.has(id) ? [] : occurrences.filter(({ call }) => !call.providerExecuted));
-  const pending = unresolved[0];
-  return unresolved.length === 1 && pending !== undefined ? {
+  const pending = toolCallId === undefined ? unresolved.find(({ call }) => Option12.isSome(Schema14.decodeUnknownOption(suspensionMetadata)(call.options[suspensionCheckpointOption]))) : unresolved.find(({ call }) => call.id === toolCallId);
+  const pendingMessage = pending === undefined ? undefined : messages[pending.messageIndex];
+  const toolCallBatch = pendingMessage?.role === "assistant" ? pendingMessage.content.flatMap((part) => part.type === "tool-call" && !part.providerExecuted ? [
+    Response7.makePart("tool-call", {
+      id: part.id,
+      name: part.name,
+      params: part.params,
+      providerExecuted: false
+    })
+  ] : []) : [];
+  return pending !== undefined ? {
     call: pending.call,
     messages: messages.slice(0, pending.messageIndex),
     messageIndex: pending.messageIndex,
-    partIndex: pending.partIndex
+    partIndex: pending.partIndex,
+    toolCallBatch
   } : undefined;
 };
 var suspensionCheckpoint = (messages) => {
@@ -2054,18 +2076,21 @@ var suspensionCheckpoint = (messages) => {
   const metadata = Schema14.decodeUnknownOption(suspensionMetadata)(unresolved.call.options[suspensionCheckpointOption]);
   if (Option12.isNone(metadata))
     return;
+  if (!Equal.equals(metadata.value.tool_call_batch_ids, unresolved.toolCallBatch.map((call) => call.id)))
+    return;
   return {
     call: unresolved.call,
     messages: unresolved.messages,
     suspension: AgentSuspended.make({
       ...metadata.value,
+      tool_call_batch: unresolved.toolCallBatch,
       tool_call_id: unresolved.call.id,
       tool_name: unresolved.call.name,
       tool_params: unresolved.call.params
     })
   };
 };
-var sameSuspension = (left, right) => left.token === right.token && left.reason === right.reason && left.authorization_stage === right.authorization_stage && left.tool_call_id === right.tool_call_id && left.tool_name === right.tool_name && Equal.equals(left.tool_params, right.tool_params) && Equal.equals(left.active_tools, right.active_tools) && Equal.equals(left.activated_skills, right.activated_skills);
+var sameSuspension = (left, right) => left.token === right.token && left.reason === right.reason && left.authorization_stage === right.authorization_stage && left.tool_call_index === right.tool_call_index && Equal.equals(left.tool_call_batch, right.tool_call_batch) && left.tool_call_id === right.tool_call_id && left.tool_name === right.tool_name && Equal.equals(left.tool_params, right.tool_params) && Equal.equals(left.active_tools, right.active_tools) && Equal.equals(left.activated_skills, right.activated_skills);
 var skillListingBudgetTokens = 2048;
 var activateSkillToolName = "activate_skill";
 var activateSkillParameters = Schema14.Struct({ name: Schema14.String });
@@ -2121,12 +2146,14 @@ var domainFailureResult = (call, outcome) => Response7.toolResultPart({
   providerExecuted: false,
   preliminary: false
 });
-var suspended = (call, token, reason) => AgentSuspended.make({
+var suspended = (call, toolCallBatch, toolCallIndex, token, reason) => AgentSuspended.make({
   token,
   reason,
+  tool_call_index: toolCallIndex,
   tool_call_id: call.id,
   tool_name: call.name,
-  tool_params: call.params
+  tool_params: call.params,
+  tool_call_batch: toolCallBatch.calls
 });
 var withSystem = (instructions, prompt) => Prompt9.fromMessages([Prompt9.makeMessage("system", { content: instructions }), ...prompt.content]);
 var skillListingsInstructions = (listings) => `Available skills:
@@ -2347,7 +2374,7 @@ var streamInternal = (agent, options, structured) => Stream4.unwrap(Effect18.gen
   const appendPending = (turn, pending) => pending.length === 0 ? Ref5.get(chat.history) : Ref5.updateAndGet(chat.history, (history) => Prompt9.concat(history, Prompt9.fromResponseParts(pending))).pipe(Effect18.tap(() => savePersisted(turn)));
   const checkpointSuspended = (turn, pending, suspension2) => Effect18.gen(function* () {
     const withPending = yield* appendPending(turn, pending);
-    const unresolved = unresolvedToolCall(withPending.content);
+    const unresolved = unresolvedToolCall(withPending.content, suspension2.tool_call_id);
     if (unresolved === undefined || unresolved.call.id !== suspension2.tool_call_id || unresolved.call.name !== suspension2.tool_name || !Equal.equals(unresolved.call.params, suspension2.tool_params)) {
       return yield* AgentError.make({
         message: "Suspension does not match the unresolved checkpoint call",
@@ -2358,6 +2385,8 @@ var streamInternal = (agent, options, structured) => Stream4.unwrap(Effect18.gen
       token: suspension2.token,
       reason: suspension2.reason,
       ...suspension2.authorization_stage === undefined ? {} : { authorization_stage: suspension2.authorization_stage },
+      ...suspension2.tool_call_index === undefined ? {} : { tool_call_index: suspension2.tool_call_index },
+      tool_call_batch_ids: suspension2.tool_call_batch.map((call) => call.id),
       ...suspension2.active_tools === undefined ? {} : { active_tools: suspension2.active_tools },
       ...suspension2.activated_skills === undefined ? {} : { activated_skills: suspension2.activated_skills }
     };
@@ -2384,7 +2413,7 @@ var streamInternal = (agent, options, structured) => Stream4.unwrap(Effect18.gen
     return yield* Ref5.get(chat.history);
   });
   const checkpointPending = (turn, pending) => appendPending(turn, pending).pipe(Effect18.tap((checkpoint) => syncSession(turn, checkpoint)));
-  const failSuspended = (call, token, reason) => Stream4.fail(suspended(call, token, reason));
+  const failSuspended = (call, toolCallBatch, toolCallIndex, token, reason) => Stream4.fail(suspended(call, toolCallBatch, toolCallIndex, token, reason));
   const state = {
     text: "",
     turn: 0,
@@ -2603,7 +2632,7 @@ var streamInternal = (agent, options, structured) => Stream4.unwrap(Effect18.gen
     })
   });
   const boundedSuccessResult = (call, outcome) => options.toolOutputMaxBytes === undefined ? Effect18.succeed(successResult(call, outcome)) : bound(outcome, { toolCallId: call.id, maxBytes: options.toolOutputMaxBytes }).pipe(Effect18.map((bounded2) => successResult(call, bounded2)));
-  const outcomeEvents = (turn, call, outcome, droppedProgress, registry) => {
+  const outcomeEvents = (turn, toolCallBatch, toolCallIndex, call, outcome, droppedProgress, registry) => {
     const metadata = droppedProgress === 0 ? {} : { metadata: { toolProgress: { dropped: droppedProgress } } };
     switch (outcome._tag) {
       case "Success":
@@ -2613,7 +2642,7 @@ var streamInternal = (agent, options, structured) => Stream4.unwrap(Effect18.gen
         return Effect18.succeed(Stream4.fromIterable([{ _tag: "ToolExecutionCompleted", turn, call, result, ...metadata }]));
       }
       case "Suspend":
-        return Effect18.succeed(failSuspended(call, outcome.token, "tool-wait"));
+        return Effect18.succeed(failSuspended(call, toolCallBatch, toolCallIndex, outcome.token, "tool-wait"));
     }
   };
   const defaultExecute = (request, registry) => {
@@ -2680,7 +2709,7 @@ var streamInternal = (agent, options, structured) => Stream4.unwrap(Effect18.gen
     });
     const execution = isSkillActivationCall(call, registry) ? activateSkillOutcome(turn, call) : Option12.isNone(executor) ? defaultExecute(request, registry) : executor.value.execute(request).pipe(Effect18.mapError((error) => Schema14.is(RemoteRetryError)(error) ? AgentError.make({ message: error.message, turn, cause: error }) : error));
     const fiber = yield* execution.pipe(Effect18.provideService(ToolContext, context), Effect18.ensuring(Queue2.end(progressQueue).pipe(Effect18.asVoid)), Effect18.forkScoped({ startImmediately: true }));
-    return Stream4.concat(Stream4.fromQueue(progressQueue), Stream4.fromEffect(Fiber.join(fiber)).pipe(Stream4.flatMap((outcome) => Stream4.unwrap(Ref5.get(droppedProgress).pipe(Effect18.flatMap((dropped) => outcomeEvents(turn, call, outcome, dropped, registry)))))));
+    return Stream4.concat(Stream4.fromQueue(progressQueue), Stream4.fromEffect(Fiber.join(fiber)).pipe(Stream4.flatMap((outcome) => Stream4.unwrap(Ref5.get(droppedProgress).pipe(Effect18.flatMap((dropped) => outcomeEvents(turn, request.toolCallBatch, request.toolCallIndex, call, outcome, dropped, registry)))))));
   })));
   const activateSkillOutcome = (turn, call) => Effect18.gen(function* () {
     if (skillRuntime === undefined) {
@@ -2734,8 +2763,8 @@ var streamInternal = (agent, options, structured) => Stream4.unwrap(Effect18.gen
     return { _tag: "Success", result: output, encodedResult: output };
   }).pipe(Effect18.mapError((error) => isToolNameCollision(error) || Schema14.is(FrameworkFailure)(error) ? error : skillError(turn, error)));
   const authorizationError2 = (turn, error) => AgentError.make({ message: error.message, turn, cause: error });
-  const toolCallEvents = (turn, call, messages, registry, authorizationStage, authorizationToken) => {
-    const request = { call, turn, agentName: agent.name, sessionId };
+  const toolCallEvents = (turn, toolCallBatch, toolCallIndex, call, messages, registry, authorizationStage, authorizationToken) => {
+    const request = { call, toolCallBatch, turn, toolCallIndex, agentName: agent.name, sessionId };
     const candidate = get(registry, call.name);
     if (candidate === undefined)
       return Stream4.fail(FrameworkFailure.make({
@@ -2774,9 +2803,11 @@ var streamInternal = (agent, options, structured) => Stream4.unwrap(Effect18.gen
               token: decision2.suspension.token,
               reason: "approval",
               authorization_stage: decision2.suspension.authorization_stage ?? "approval",
+              tool_call_index: toolCallIndex,
               tool_call_id: call.id,
               tool_name: call.name,
               tool_params: call.params,
+              tool_call_batch: toolCallBatch.calls,
               active_tools: activeTools,
               activated_skills: activatedSkills
             }));
@@ -2827,17 +2858,13 @@ var streamInternal = (agent, options, structured) => Stream4.unwrap(Effect18.gen
   function provideAgentModel(stream2) {
     return agentModelRegistry === undefined || agentModel === undefined ? stream2 : agentModelRegistry.stream(agentModel, stream2).pipe(Stream4.catchTag("LanguageModelNotRegistered", (error) => Stream4.fail(AgentError.make({ message: errorMessage(error), turn: state.turn, cause: error }))));
   }
-  const partEvents = (turn, part, messages, registry) => {
+  const partEvents = (turn, part) => {
     if (part.type === "error") {
       if (isToolNameCollision(part.error))
         return Stream4.fail(part.error);
       return Stream4.fail(AgentError.make({ message: errorMessage(part.error), turn, cause: part.error }));
     }
     const modelPart = Stream4.fromIterable([{ _tag: "ModelPart", turn, part }]);
-    if (part.type === "tool-call") {
-      const call = part;
-      return call.providerExecuted === true ? modelPart : Stream4.concat(modelPart, toolCallEvents(turn, call, messages, registry));
-    }
     if (part.type === "text-delta") {
       state.text = `${state.text}${part.delta}`;
     }
@@ -2940,13 +2967,29 @@ var streamInternal = (agent, options, structured) => Stream4.unwrap(Effect18.gen
         return Option12.isSome(failure2) && AiError3.isAiError(failure2.value) ? Stream4.fail(AgentError.make({ message: errorMessage(failure2.value), turn, cause: failure2.value })) : Stream4.failCause(cause);
       }));
     };
-    const parts = Stream4.unwrap(applyPromptChain(chain, Prompt9.make(prompt), { agentName: agent.name, turn }).pipe(Effect18.map((transformedPrompt) => attempt(transformedPrompt, true).pipe(Stream4.mapEffect(({ accept, part, messages }) => accept.pipe(Effect18.as({ part, messages }))), (accepted) => {
-      const concurrency = agent.toolExecution?.concurrency ?? 1;
-      if (concurrency === 1) {
-        return accepted.pipe(Stream4.flatMap(({ part, messages }) => partEvents(turn, part, messages, activeRegistry)), Stream4.tap(recordPending));
-      }
-      return accepted.pipe(Stream4.mapEffect(({ part, messages }) => Stream4.runCollect(partEvents(turn, part, messages, activeRegistry)), { concurrency }), Stream4.flatMap(Stream4.fromIterable), Stream4.tap(recordPending));
-    }))));
+    const parts = Stream4.unwrap(applyPromptChain(chain, Prompt9.make(prompt), { agentName: agent.name, turn }).pipe(Effect18.map((transformedPrompt) => {
+      let nextToolCallIndex = 0;
+      const calls = new Array;
+      const executions = new Array;
+      const toolCallBatch = { calls };
+      const accepted = attempt(transformedPrompt, true).pipe(Stream4.mapEffect(({ accept, part, messages }) => accept.pipe(Effect18.as({ part, messages }))), Stream4.map(({ part, messages }) => {
+        const toolCallIndex = nextToolCallIndex;
+        if (part.type === "tool-call" && part.providerExecuted !== true) {
+          const call = part;
+          nextToolCallIndex += 1;
+          calls.push(call);
+          executions.push({ call, messages, toolCallIndex });
+        }
+        return { part, messages, toolCallIndex };
+      }), Stream4.flatMap(({ part }) => partEvents(turn, part)));
+      return Stream4.concat(accepted, Stream4.suspend(() => {
+        Object.freeze(calls);
+        Object.freeze(toolCallBatch);
+        const concurrency = agent.toolExecution?.concurrency ?? 1;
+        const executionStreams = Stream4.fromIterable(executions);
+        return concurrency === 1 ? executionStreams.pipe(Stream4.flatMap(({ call, messages, toolCallIndex }) => toolCallEvents(turn, toolCallBatch, toolCallIndex, call, messages, activeRegistry)), Stream4.tap(recordPending)) : executionStreams.pipe(Stream4.mapEffect(({ call, messages, toolCallIndex }) => Stream4.runCollect(toolCallEvents(turn, toolCallBatch, toolCallIndex, call, messages, activeRegistry)), { concurrency }), Stream4.flatMap(Stream4.fromIterable), Stream4.tap(recordPending));
+      }));
+    })));
     const resilientParts = Option12.match(resilienceService, {
       onNone: () => parts,
       onSome: (resilience) => Stream4.unwrap(LanguageModel5.LanguageModel.pipe(Effect18.map((model) => parts.pipe(Stream4.provideService(LanguageModel5.LanguageModel, apply(model, {
@@ -3098,12 +3141,22 @@ var streamInternal = (agent, options, structured) => Stream4.unwrap(Effect18.gen
     const currentTurn = resetTurnState(0).pipe(Stream4.concat(Stream4.unwrap(Ref5.get(toolState).pipe(Effect18.map((tools) => {
       const suspension2 = checkpoint.suspension;
       const registry = suspension2.authorization_stage === undefined && suspension2.active_tools === undefined ? tools.registry : select(tools.registry, suspension2.active_tools ?? []);
-      return toolCallEvents(0, Response7.makePart("tool-call", {
-        id: checkpoint.call.id,
-        name: checkpoint.call.name,
-        params: checkpoint.call.params,
-        providerExecuted: false
-      }), checkpoint.messages, registry, suspension2.authorization_stage, suspension2.token).pipe(Stream4.tap(recordPending));
+      const calls = suspension2.tool_call_batch.map((call) => Response7.makePart("tool-call", {
+        id: call.id,
+        name: call.name,
+        params: call.params,
+        providerExecuted: call.providerExecuted,
+        metadata: call.metadata
+      }));
+      const toolCallBatch = { calls };
+      const startIndex = suspension2.tool_call_index ?? 0;
+      if (calls[startIndex] === undefined) {
+        return Stream4.fail(AgentError.make({ message: "Suspension tool call index is outside its batch", turn: 0 }));
+      }
+      const executions = Stream4.fromIterable(calls.slice(startIndex).map((call, offset) => ({ call, toolCallIndex: startIndex + offset })));
+      const execute = ({ call, toolCallIndex }) => toolCallEvents(0, toolCallBatch, toolCallIndex, call, checkpoint.messages, registry, toolCallIndex === startIndex ? suspension2.authorization_stage : undefined, toolCallIndex === startIndex ? suspension2.token : undefined);
+      const concurrency = agent.toolExecution?.concurrency ?? 1;
+      return concurrency === 1 ? executions.pipe(Stream4.flatMap(execute), Stream4.tap(recordPending)) : executions.pipe(Stream4.mapEffect((execution) => Stream4.runCollect(execute(execution)), { concurrency }), Stream4.flatMap(Stream4.fromIterable), Stream4.tap(recordPending));
     })))), Stream4.concat(Stream4.unwrap(afterTurn(0).pipe(Effect18.map((result) => {
       next = result.next;
       return result.events;
@@ -3200,7 +3253,7 @@ var generatePersistedObject = dual7(2, (agent, options) => Stream4.runFold(persi
   })
 }))));
 
-// ../../node_modules/.bun/@batonfx+core@0.6.2/node_modules/@batonfx/core/dist/agent-tool.js
+// ../../node_modules/.bun/@batonfx+core@0.6.4/node_modules/@batonfx/core/dist/agent-tool.js
 var exports_agent_tool = {};
 __export(exports_agent_tool, {
   asTool: () => asTool
@@ -3271,7 +3324,7 @@ var asTool = Function7.dual((args) => args.length !== 1 || ("name" in args[0]),
   return lazyHandled(toolkit, name, handler);
 });
 
-// ../../node_modules/.bun/@batonfx+core@0.6.2/node_modules/@batonfx/core/dist/guardrail.js
+// ../../node_modules/.bun/@batonfx+core@0.6.4/node_modules/@batonfx/core/dist/guardrail.js
 var exports_guardrail = {};
 __export(exports_guardrail, {
   validateInput: () => validateInput,
@@ -3352,7 +3405,7 @@ var filterOutput = (keep) => ({
   transformPart: (part, context) => Effect20.succeed(part.type === "tool-call" || keep(part, context) ? Option13.some(part) : Option13.none())
 });
 
-// ../../node_modules/.bun/@batonfx+core@0.6.2/node_modules/@batonfx/core/dist/handoff.js
+// ../../node_modules/.bun/@batonfx+core@0.6.4/node_modules/@batonfx/core/dist/handoff.js
 var exports_handoff = {};
 __export(exports_handoff, {
   transferTool: () => transferTool,
@@ -3432,7 +3485,7 @@ var supervisor = (options) => {
   };
 };
 
-// ../../node_modules/.bun/@batonfx+core@0.6.2/node_modules/@batonfx/core/dist/index.js
+// ../../node_modules/.bun/@batonfx+core@0.6.4/node_modules/@batonfx/core/dist/index.js
 import { AiError as AiError5, Chat as Chat2, EmbeddingModel, IdGenerator, LanguageModel as LanguageModel7, Model as Model2, Prompt as Prompt13, Response as Response9, ResponseIdTracker, Telemetry as Telemetry2, Tokenizer as Tokenizer3, Tool as Tool10, Toolkit as Toolkit7 } from "effect/unstable/ai";
 
 export { exports_turn_policy, exports_agent_event, exports_tool_context, exports_tool_executor, exports_approvals, exports_memory, exports_session, exports_tool_output, exports_compaction, exports_instructions, exports_model_middleware, exports_model_registry, exports_model_resilience, exports_permissions, exports_skill_source, exports_steering, exports_agent, exports_agent_tool, exports_guardrail, exports_handoff, AiError5 as AiError, Chat2 as Chat, EmbeddingModel, IdGenerator, Model2 as Model, Prompt13 as Prompt, Response9 as Response, ResponseIdTracker, Telemetry2 as Telemetry, Tokenizer3 as Tokenizer, Tool10 as Tool, Toolkit7 as Toolkit };

package/dist/index.js

@@ -13,10 +13,10 @@ import {
   exports_tool_runtime,
   exports_workflow_definition_host,
   makeDatabaseIdentity
-} from "./index-cq8t8ka1.js";
+} from "./index-8awt651b.js";
 import {
   exports_model_registry
-} from "./index-8fpd6kvj.js";
+} from "./index-t5bbk8cp.js";
 import {
   Service,
   exports_address_schema,
@@ -40,7 +40,7 @@ import {
   exports_tool_schema,
   exports_wait_schema,
   exports_workflow_schema
-} from "./index-cyfx5y3r.js";
+} from "./index-pw46cfne.js";
 import {
   __export
 } from "./index-nb39b5ae.js";
@@ -170,13 +170,13 @@ __export(exports_language_model_registration, {
   OpenAiAccountCredentialError: () => OpenAiAccountCredentialError
 });
 
-// ../../node_modules/.bun/@batonfx+providers@0.6.2/node_modules/@batonfx/providers/dist/deterministic.js
+// ../../node_modules/.bun/@batonfx+providers@0.6.4/node_modules/@batonfx/providers/dist/deterministic.js
 import { OpenAiClient as OpenAiClient2 } from "@effect/ai-openai";
 import { Config as Config2, Effect as Effect4, Layer as Layer3, Option, Stream as Stream2 } from "effect";
 import { LanguageModel, Response } from "effect/unstable/ai";
 import { FetchHttpClient as FetchHttpClient2 } from "effect/unstable/http";
 
-// ../../node_modules/.bun/@batonfx+providers@0.6.2/node_modules/@batonfx/providers/dist/openai.js
+// ../../node_modules/.bun/@batonfx+providers@0.6.4/node_modules/@batonfx/providers/dist/openai.js
 import { OpenAiClient, OpenAiLanguageModel } from "@effect/ai-openai";
 import { Config, Effect as Effect3, Layer as Layer2, Redacted, Schema, Stream } from "effect";
 import { AiError } from "effect/unstable/ai";
@@ -264,7 +264,7 @@ var openAiAccount = (input) => exports_model_registry.registrationFromLayer({
 var withOpenAiAccount = (input) => exports_model_registry.layerFromRegistrationEffects([openAiAccount(input)]);
 var withOpenAiAccountFetch = (input) => withOpenAiAccount(input).pipe(Layer2.provide(FetchHttpClient.layer));
 
-// ../../node_modules/.bun/@batonfx+providers@0.6.2/node_modules/@batonfx/providers/dist/deterministic.js
+// ../../node_modules/.bun/@batonfx+providers@0.6.4/node_modules/@batonfx/providers/dist/deterministic.js
 var deterministicModelLayer = Layer3.effect(LanguageModel.LanguageModel, LanguageModel.make({
   generateText: () => Effect4.succeed([{ type: "text", text: "deterministic response" }]),
   streamText: () => Stream2.make(Response.makePart("text-delta", { id: "text", delta: "deterministic response" }))
@@ -297,7 +297,7 @@ var withOpenAiOrDeterministic = (options) => Layer3.unwrap(Effect4.gen(function*
 }));
 var withOpenAiOrDeterministicFetch = (options) => withOpenAiOrDeterministic(options).pipe(Layer3.provide(FetchHttpClient2.layer));
 
-// ../../node_modules/.bun/@batonfx+providers@0.6.2/node_modules/@batonfx/providers/dist/anthropic.js
+// ../../node_modules/.bun/@batonfx+providers@0.6.4/node_modules/@batonfx/providers/dist/anthropic.js
 import { AnthropicClient, AnthropicLanguageModel } from "@effect/ai-anthropic";
 import { Config as Config3, Layer as Layer4, Redacted as Redacted2 } from "effect";
 import { AiError as AiError2 } from "effect/unstable/ai";
@@ -322,7 +322,7 @@ var anthropic = (input) => exports_model_registry.registrationFromLayer({
 var anthropicClientLayerConfig = AnthropicClient.layerConfig;
 var withAnthropic = (options) => exports_model_registry.layerFromRegistrationEffects([anthropic(options)]).pipe(Layer4.provide(AnthropicClient.layerConfig({ ...options.clientConfig, apiKey: options.apiKey })));
 var withAnthropicFetch = (options) => withAnthropic(options).pipe(Layer4.provide(FetchHttpClient3.layer));
-// ../../node_modules/.bun/@batonfx+providers@0.6.2/node_modules/@batonfx/providers/dist/openai-compat.js
+// ../../node_modules/.bun/@batonfx+providers@0.6.4/node_modules/@batonfx/providers/dist/openai-compat.js
 import { OpenAiClient as OpenAiClient3, OpenAiLanguageModel as OpenAiLanguageModel2 } from "@effect/ai-openai-compat";
 import { Config as Config4, Layer as Layer5, Redacted as Redacted3 } from "effect";
 import { FetchHttpClient as FetchHttpClient4 } from "effect/unstable/http";
@@ -345,7 +345,7 @@ var clientLayerConfig = (options) => OpenAiClient3.layerConfig({
 });
 var withOpenAiCompatible = (options) => exports_model_registry.layerFromRegistrationEffects([openAiCompatible(options)]).pipe(Layer5.provide(clientLayerConfig(options)));
 var withOpenAiCompatibleFetch = (options) => withOpenAiCompatible(options).pipe(Layer5.provide(FetchHttpClient4.layer));
-// ../../node_modules/.bun/@batonfx+providers@0.6.2/node_modules/@batonfx/providers/dist/openrouter.js
+// ../../node_modules/.bun/@batonfx+providers@0.6.4/node_modules/@batonfx/providers/dist/openrouter.js
 import { OpenRouterClient, OpenRouterLanguageModel } from "@effect/ai-openrouter";
 import { Config as Config5, Layer as Layer6, Redacted as Redacted4 } from "effect";
 import { AiError as AiError3 } from "effect/unstable/ai";