@relayfx/sdk 0.0.40 → 0.0.41

package/dist/index.js

@@ -18,7 +18,7 @@ var __require = import.meta.require;
 // src/adapter-outbox.ts
 var exports_adapter_outbox = {};
 __export(exports_adapter_outbox, {
-  testLayer: () => testLayer52,
+  testLayer: () => testLayer53,
   submitInbound: () => submitInbound,
   release: () => release3,
   layer: () => layer53,
@@ -32,7 +32,7 @@ import { Context as Context64, Effect as Effect80, Layer as Layer71 } from "effe
 var exports_client = {};
 __export(exports_client, {
   wake: () => wake2,
-  testLayer: () => testLayer51,
+  testLayer: () => testLayer52,
   submitInboundEnvelope: () => submitInboundEnvelope,
   streamExecution: () => streamExecution,
   steer: () => steer,
@@ -7223,13 +7223,16 @@ var digestDefinitions = Effect25.fn("ToolInputSchemaDigest.digestDefinitions")(f
 // ../runtime/src/tool/tool-runtime-service.ts
 var exports_tool_runtime_service = {};
 __export(exports_tool_runtime_service, {
+  toolsFromToolkit: () => toolsFromToolkit,
   toolFromRegistered: () => toolFromRegistered,
   tool: () => tool,
   testLayer: () => testLayer23,
   run: () => run,
   registeredTools: () => registeredTools,
   register: () => register2,
+  memoryLayerFromToolkit: () => memoryLayerFromToolkit,
   memoryLayer: () => memoryLayer23,
+  layerFromToolkit: () => layerFromToolkit,
   layer: () => layer23,
   dynamicTool: () => dynamicTool,
   definitions: () => definitions,
@@ -7243,7 +7246,7 @@ __export(exports_tool_runtime_service, {
   Service: () => Service26
 });
 import { Tool as AiTool } from "effect/unstable/ai";
-import { Chunk, Context as Context26, Effect as Effect28, HashSet as HashSet3, Layer as Layer26, Option as Option6, Ref as Ref6, Schema as Schema35 } from "effect";
+import { Chunk, Context as Context26, Effect as Effect28, HashSet as HashSet3, Layer as Layer26, Option as Option6, Ref as Ref6, Schema as Schema35, Sink, Stream as Stream4 } from "effect";
 
 // ../runtime/src/execution/event-log-service.ts
 var exports_event_log_service = {};
@@ -7860,6 +7863,27 @@ var parametersForInputSchema = (inputSchema) => {
 };
 var attachJsonSchema = (tool, jsonSchema) => jsonSchema === undefined ? tool : Object.assign(tool, { jsonSchema });
 var toolFromRegistered = (tool) => tool.tool;
+var isStructFieldMap = (value) => typeof value === "object" && value !== null && !Array.isArray(value) && Object.values(value).every((field) => Schema35.isSchema(field));
+var parametersSchemaFromEffectTool = (tool) => {
+  const parameters = tool.parametersSchema;
+  if (Schema35.isSchema(parameters))
+    return parameters;
+  if (isStructFieldMap(parameters))
+    return Schema35.Struct(parameters);
+  return Schema35.Unknown;
+};
+var jsonSchemaFromEffectToolParameters = (tool) => {
+  const parameters = tool.parametersSchema;
+  if (Schema35.isSchema(parameters))
+    return AiTool.getJsonSchema(tool);
+  if (isStructFieldMap(parameters))
+    return AiTool.getJsonSchemaFromSchema(Schema35.Struct(parameters));
+  return AiTool.getJsonSchema(tool);
+};
+var runHandledToolkitTool = (toolkit, name, input) => toolkit.handle(name, input).pipe(Effect28.flatMap((results) => results.pipe(Stream4.filter((item) => item.preliminary === false), Stream4.run(Sink.last()))), Effect28.flatMap(Option6.match({
+  onNone: () => Effect28.fail("Tool handler did not produce a final result"),
+  onSome: (result) => result.isFailure ? Effect28.fail(result.result) : Effect28.succeed(jsonValue(result.encodedResult))
+})));
 var finalToolResult = (tool, input) => Effect28.gen(function* () {
   const context = {
     executionId: input.executionId,
@@ -7947,16 +7971,30 @@ var recordRequested = (repository, eventLog, input) => repository.getCall(input.
 }));
 var recordReceived = (repository, eventLog, input, result) => repository.recordResult({ result, createdAt: input.createdAt + 1 }).pipe(Effect28.catchTag("DuplicateToolResult", () => repository.getResult(result.call_id).pipe(Effect28.mapError(mapRepositoryError4), Effect28.flatMap((existing) => existing === undefined ? Effect28.fail(new ToolRuntimeError({ message: "DuplicateToolResult" })) : Effect28.succeed(existing)))), Effect28.mapError(preserveRecordResultError), Effect28.flatMap((record2) => appendIdempotentTo(eventLog, resultEvent(input, record2.result)).pipe(Effect28.mapError(mapEventLogError2), Effect28.as(record2.result))));
 var nonEmptyName = (name) => Schema35.decodeUnknownSync(exports_shared_schema.NonEmptyString)(name);
+var needsApprovalFromEffectTool = (tool) => tool.needsApproval === undefined ? undefined : typeof tool.needsApproval === "boolean" ? tool.needsApproval : true;
 var definitionFromEffectTool = (modelTool, options) => ({
   name: modelTool.name,
   description: AiTool.getDescription(modelTool) ?? "",
-  input_schema: jsonValue(AiTool.getJsonSchema(modelTool)),
+  input_schema: jsonValue(jsonSchemaFromEffectToolParameters(modelTool)),
   output_schema: jsonValue(AiTool.getJsonSchemaFromSchema(modelTool.successSchema)),
   permissions: options.permissions ?? [],
   ...options.requirements === undefined ? {} : { requirements: options.requirements },
   ...options.needsApproval === undefined ? {} : { needs_approval: options.needsApproval },
   ...options.metadata === undefined ? {} : { metadata: options.metadata }
 });
+var toolkitOptionsFor = (tool, options = {}) => typeof options === "function" ? options(tool) : options;
+var registeredToolFromToolkit = (toolkit, modelTool, options = {}) => {
+  const toolOptions = toolkitOptionsFor(modelTool, options);
+  const needsApproval = toolOptions.needsApproval ?? needsApprovalFromEffectTool(modelTool);
+  return {
+    definition: definitionFromEffectTool(modelTool, { ...toolOptions, needsApproval }),
+    tool: modelTool,
+    ...toolOptions.requiredPermissions === undefined ? {} : { requiredPermissions: toolOptions.requiredPermissions },
+    validateInput: (input) => Schema35.decodeUnknownEffect(parametersSchemaFromEffectTool(modelTool))(input).pipe(Effect28.mapError((error) => new ToolInputInvalid({ tool_name: modelTool.name, message: error.message })), Effect28.asVoid),
+    run: (input) => runHandledToolkitTool(toolkit, modelTool.name, input)
+  };
+};
+var toolsFromToolkit = (toolkit, options = {}) => Object.values(toolkit.tools).map((modelTool) => registeredToolFromToolkit(toolkit, modelTool, options));
 var tool = (name, options) => {
   const effectTool = AiTool.make(name, {
     description: options.description,
@@ -7967,7 +8005,6 @@ var tool = (name, options) => {
   });
   const definition = definitionFromEffectTool(effectTool, options);
   return {
-    name: nonEmptyName(name),
     definition,
     tool: effectTool,
     ...options.requiredPermissions === undefined ? {} : { requiredPermissions: options.requiredPermissions },
@@ -7984,7 +8021,6 @@ var dynamicTool = (name, options) => {
     needsApproval: options.needsApproval
   }), parameters.jsonSchema);
   return {
-    name: nonEmptyName(name),
     definition: {
       name: nonEmptyName(name),
       description: options.description,
@@ -8000,7 +8036,7 @@ var dynamicTool = (name, options) => {
     run: options.run
   };
 };
-var layer23 = (initialTools = []) => Layer26.effect(Service26, Effect28.gen(function* () {
+var makeService = (initialTools) => Effect28.gen(function* () {
   const repository = yield* exports_tool_call_repository.Service;
   const eventLog = yield* Service24;
   const waits = yield* Service25;
@@ -8048,8 +8084,14 @@ var layer23 = (initialTools = []) => Layer26.effect(Service26, Effect28.gen(func
       }).pipe(Effect28.tapError((error) => recordToolCall(input.call.name, error._tag === "ToolExecutionWaitRequested" ? "wait" : error._tag === "ToolPermissionDenied" ? "denied" : "failure")));
     })
   });
+});
+var layer23 = (initialTools = []) => Layer26.effect(Service26, makeService(initialTools));
+var layerFromToolkit = (toolkit, options = {}) => Layer26.effect(Service26, Effect28.gen(function* () {
+  const handled = yield* toolkit;
+  return yield* makeService(toolsFromToolkit(handled, options));
 }));
 var memoryLayer23 = (tools = []) => layer23(tools).pipe(Layer26.provide(layer22), Layer26.provide(exports_tool_call_repository.memoryLayer), Layer26.provide(exports_envelope_repository.memoryLayer), Layer26.provide(exports_schedule_repository.memoryLayer), Layer26.provide(memoryLayer21));
+var memoryLayerFromToolkit = (toolkit, options = {}) => layerFromToolkit(toolkit, options).pipe(Layer26.provide(layer22), Layer26.provide(exports_tool_call_repository.memoryLayer), Layer26.provide(exports_envelope_repository.memoryLayer), Layer26.provide(exports_schedule_repository.memoryLayer), Layer26.provide(memoryLayer21));
 var testLayer23 = (implementation) => Layer26.succeed(Service26, Service26.of(implementation));
 var register2 = Effect28.fn("ToolRuntime.register.call")(function* (registeredTool) {
   const service = yield* Service26;
@@ -8318,7 +8360,7 @@ var resolveLocalAgent = Effect30.fn("AddressResolution.resolveLocalAgent.call")(
 var exports_agent_loop_service = {};
 __export(exports_agent_loop_service, {
   toolFromDefinition: () => toolFromDefinition,
-  testLayer: () => testLayer45,
+  testLayer: () => testLayer46,
   run: () => run3,
   mapBoundaryError: () => mapBoundaryError,
   layer: () => layer44,
@@ -8329,7 +8371,7 @@ __export(exports_agent_loop_service, {
   AgentLoopBudgetExceeded: () => AgentLoopBudgetExceeded
 });
 
-// ../../node_modules/.bun/@batonfx+core@0.2.0/node_modules/@batonfx/core/src/agent.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.0/node_modules/@batonfx/core/src/agent.ts
 var exports_agent = {};
 __export(exports_agent, {
   streamObject: () => streamObject,
@@ -8339,10 +8381,10 @@ __export(exports_agent, {
   generate: () => generate,
   defaultObjectPrompt: () => defaultObjectPrompt
 });
-import { Cause as Cause3, Effect as Effect45, Fiber, Option as Option15, Queue as Queue2, Ref as Ref10, Schema as Schema45, Stream as Stream6 } from "effect";
-import { Chat, LanguageModel as LanguageModel3, Prompt as Prompt4, Response as Response3, Telemetry, Tokenizer as Tokenizer2, Tool as Tool4, Toolkit as Toolkit2 } from "effect/unstable/ai";
+import { Cause as Cause3, Effect as Effect45, Fiber, Option as Option15, Queue as Queue2, Ref as Ref10, Schema as Schema45, Stream as Stream7 } from "effect";
+import { Chat, LanguageModel as LanguageModel3, Prompt as Prompt4, Response as Response3, Telemetry, Tokenizer as Tokenizer2, Tool as Tool4, Toolkit as Toolkit3 } from "effect/unstable/ai";
 
-// ../../node_modules/.bun/@batonfx+core@0.2.0/node_modules/@batonfx/core/src/agent-event.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.0/node_modules/@batonfx/core/src/agent-event.ts
 var exports_agent_event = {};
 __export(exports_agent_event, {
   addUsage: () => addUsage,
@@ -8399,7 +8441,7 @@ class AgentSuspended extends Schema38.TaggedErrorClass()("@batonfx/core/AgentSus
 }) {
 }
 
-// ../../node_modules/.bun/@batonfx+core@0.2.0/node_modules/@batonfx/core/src/approvals.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.0/node_modules/@batonfx/core/src/approvals.ts
 var exports_approvals = {};
 __export(exports_approvals, {
   testLayer: () => testLayer26,
@@ -8415,7 +8457,7 @@ var autoApprove = Layer29.succeed(Approvals, Approvals.of({ check: () => Effect3
 var denyAll = Layer29.succeed(Approvals, Approvals.of({ check: () => Effect31.succeed({ _tag: "Denied" }) }));
 var testLayer26 = (implementation) => Layer29.succeed(Approvals, Approvals.of(implementation));
 
-// ../../node_modules/.bun/@batonfx+core@0.2.0/node_modules/@batonfx/core/src/compaction.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.0/node_modules/@batonfx/core/src/compaction.ts
 var exports_compaction = {};
 __export(exports_compaction, {
   truncate: () => truncate,
@@ -8431,9 +8473,9 @@ __export(exports_compaction, {
   Compaction: () => Compaction
 });
 import { Context as Context32, Effect as Effect34, Layer as Layer32, Option as Option10, Schema as Schema41 } from "effect";
-import { LanguageModel, Prompt as Prompt3, Tokenizer, Toolkit } from "effect/unstable/ai";
+import { LanguageModel, Prompt as Prompt3, Tokenizer, Toolkit as Toolkit2 } from "effect/unstable/ai";
 
-// ../../node_modules/.bun/@batonfx+core@0.2.0/node_modules/@batonfx/core/src/session.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.0/node_modules/@batonfx/core/src/session.ts
 var exports_session = {};
 __export(exports_session, {
   testLayer: () => testLayer27,
@@ -8565,7 +8607,7 @@ var memoryLayer24 = Layer30.effect(SessionStore, Ref7.make(initialState).pipe(Ef
 }))));
 var testLayer27 = (implementation) => Layer30.succeed(SessionStore, SessionStore.of(implementation));
 
-// ../../node_modules/.bun/@batonfx+core@0.2.0/node_modules/@batonfx/core/src/tool-output.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.0/node_modules/@batonfx/core/src/tool-output.ts
 var exports_tool_output = {};
 __export(exports_tool_output, {
   testLayer: () => testLayer28,
@@ -8625,7 +8667,7 @@ var bound = (result, options) => Effect33.gen(function* () {
   return { _tag: "Success", result: output, encodedResult: output };
 });
 
-// ../../node_modules/.bun/@batonfx+core@0.2.0/node_modules/@batonfx/core/src/compaction.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.0/node_modules/@batonfx/core/src/compaction.ts
 var DEFAULT_RESERVE_TOKENS = 16384;
 var DEFAULT_KEEP_RECENT_TOKENS = 20000;
 var SUMMARY_TEMPLATE = `Summarize the conversation so another agent can continue seamlessly.
@@ -8755,7 +8797,7 @@ var defaultStrategy = (options = {}) => ({
       const [compactedHead] = request.toolOutputMaxBytes === undefined ? [head, false] : yield* microcompactPrompt(head, request.toolOutputMaxBytes);
       const prompt = summaryPrompt(options.summaryPrompt ?? SUMMARY_TEMPLATE, compactedHead);
       const model = yield* LanguageModel.LanguageModel;
-      return yield* model.generateText({ prompt, toolkit: Toolkit.empty, toolChoice: "none" }).pipe(Effect34.map((response) => response.text), Effect34.mapError((error) => new CompactionError({ message: String(error), cause: error })));
+      return yield* model.generateText({ prompt, toolkit: Toolkit2.empty, toolChoice: "none" }).pipe(Effect34.map((response) => response.text), Effect34.mapError((error) => new CompactionError({ message: String(error), cause: error })));
     });
     return options.summaryModel === undefined ? effect : effect.pipe(Effect34.provide(options.summaryModel));
   }
@@ -8808,7 +8850,7 @@ var truncate = (maxTokens) => ({
 var testLayer29 = (implementation) => Layer32.succeed(Compaction, Compaction.of(implementation));
 var isContextOverflow = (error) => /context|token|prompt/i.test(error instanceof Error ? `${error.name}: ${error.message}` : String(error)) && /overflow|exceed|exceeded|maximum|too large|too long|length/i.test(error instanceof Error ? `${error.name}: ${error.message}` : String(error));
 
-// ../../node_modules/.bun/@batonfx+core@0.2.0/node_modules/@batonfx/core/src/instructions.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.0/node_modules/@batonfx/core/src/instructions.ts
 var exports_instructions = {};
 __export(exports_instructions, {
   testLayer: () => testLayer30,
@@ -8857,7 +8899,7 @@ var renderUpdate = (epoch, context) => Effect35.gen(function* () {
 var layer27 = (sources) => Layer33.succeed(Instructions, Instructions.of({ sources: [...sources] }));
 var testLayer30 = (implementation) => Layer33.succeed(Instructions, Instructions.of(implementation));
 
-// ../../node_modules/.bun/@batonfx+core@0.2.0/node_modules/@batonfx/core/src/memory.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.0/node_modules/@batonfx/core/src/memory.ts
 var exports_memory = {};
 __export(exports_memory, {
   testLayer: () => testLayer31,
@@ -8886,7 +8928,7 @@ var merge = (first, second) => ({
 var noopLayer = Layer34.succeed(Memory, Memory.of(noop));
 var testLayer31 = (implementation) => Layer34.succeed(Memory, Memory.of(implementation));
 
-// ../../node_modules/.bun/@batonfx+core@0.2.0/node_modules/@batonfx/core/src/model-middleware.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.0/node_modules/@batonfx/core/src/model-middleware.ts
 var exports_model_middleware = {};
 __export(exports_model_middleware, {
   layer: () => layer28,
@@ -8900,7 +8942,7 @@ class ModelMiddleware extends Context35.Service()("@batonfx/core/ModelMiddleware
 var identityLayer = Layer35.succeed(ModelMiddleware, []);
 var layer28 = (middleware) => Layer35.succeed(ModelMiddleware, middleware);
 
-// ../../node_modules/.bun/@batonfx+core@0.2.0/node_modules/@batonfx/core/src/model-resilience.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.0/node_modules/@batonfx/core/src/model-resilience.ts
 var exports_model_resilience = {};
 __export(exports_model_resilience, {
   testLayer: () => testLayer32,
@@ -8911,7 +8953,7 @@ __export(exports_model_resilience, {
   apply: () => apply,
   ModelResilience: () => ModelResilience
 });
-import { Cause, Context as Context36, Effect as Effect38, Layer as Layer36, Schedule as Schedule2, Stream as Stream4 } from "effect";
+import { Cause, Context as Context36, Effect as Effect38, Layer as Layer36, Schedule as Schedule2, Stream as Stream5 } from "effect";
 import { AiError, Response as Response2 } from "effect/unstable/ai";
 
 class ModelResilience extends Context36.Service()("@batonfx/core/ModelResilience") {
@@ -8933,20 +8975,20 @@ var apply = (model, resilience) => ({
   ...model,
   generateText: (options) => retryEffect(() => model.generateText(options), resilience),
   generateObject: (options) => retryEffect(() => model.generateObject(options), resilience),
-  streamText: (options) => Stream4.suspend(() => {
+  streamText: (options) => Stream5.suspend(() => {
     let emitted = false;
-    return model.streamText(options).pipe(Stream4.tap(() => Effect38.sync(() => {
+    return model.streamText(options).pipe(Stream5.tap(() => Effect38.sync(() => {
       emitted = true;
-    })), Stream4.catchCause((cause) => {
+    })), Stream5.catchCause((cause) => {
       if (Cause.hasInterrupts(cause))
-        return Stream4.failCause(cause);
+        return Stream5.failCause(cause);
       const error = Cause.squash(cause);
-      return emitted ? Stream4.make(Response2.makePart("error", { error })) : Stream4.failCause(cause);
+      return emitted ? Stream5.make(Response2.makePart("error", { error })) : Stream5.failCause(cause);
     }));
-  }).pipe(Stream4.retry(retryStreamSchedule(resilience)))
+  }).pipe(Stream5.retry(retryStreamSchedule(resilience)))
 });
 
-// ../../node_modules/.bun/@batonfx+core@0.2.0/node_modules/@batonfx/core/src/permissions.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.0/node_modules/@batonfx/core/src/permissions.ts
 var exports_permissions = {};
 __export(exports_permissions, {
   testLayer: () => testLayer33,
@@ -9076,7 +9118,7 @@ var ruleStoreMemory = (initialRules = []) => Layer37.effect(RuleStore, Ref9.make
 var ruleStoreTestLayer = (implementation) => Layer37.succeed(RuleStore, RuleStore.of(implementation));
 var testLayer33 = (implementation) => Layer37.succeed(Permissions, Permissions.of(implementation));
 
-// ../../node_modules/.bun/@batonfx+core@0.2.0/node_modules/@batonfx/core/src/skill-source.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.0/node_modules/@batonfx/core/src/skill-source.ts
 var exports_skill_source = {};
 __export(exports_skill_source, {
   testLayer: () => testLayer34,
@@ -9134,7 +9176,7 @@ var selectListings = (skills, budgetTokens, recentlyUsed) => {
   return selected;
 };
 
-// ../../node_modules/.bun/@batonfx+core@0.2.0/node_modules/@batonfx/core/src/steering.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.0/node_modules/@batonfx/core/src/steering.ts
 var exports_steering = {};
 __export(exports_steering, {
   testLayer: () => testLayer35,
@@ -9164,7 +9206,13 @@ var layer30 = (options = {}) => Layer39.effect(Steering, Effect41.gen(function*
 }));
 var testLayer35 = (implementation) => Layer39.succeed(Steering, Steering.of(implementation));
 
-// ../../node_modules/.bun/@batonfx+core@0.2.0/node_modules/@batonfx/core/src/tool-context.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.0/node_modules/@batonfx/core/src/tool-context.ts
+var exports_tool_context = {};
+__export(exports_tool_context, {
+  testLayer: () => testLayer36,
+  layerDefault: () => layerDefault,
+  ToolContext: () => ToolContext
+});
 import { Context as Context40, Effect as Effect42, Layer as Layer40 } from "effect";
 
 class ToolContext extends Context40.Service()("@batonfx/core/ToolContext") {
@@ -9174,16 +9222,20 @@ var layerDefault = Layer40.sync(ToolContext, () => ToolContext.of({
   emit: () => Effect42.void,
   sessionId: "local"
 }));
+var testLayer36 = (implementation) => Layer40.succeed(ToolContext, ToolContext.of(implementation));
 
-// ../../node_modules/.bun/@batonfx+core@0.2.0/node_modules/@batonfx/core/src/tool-executor.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.0/node_modules/@batonfx/core/src/tool-executor.ts
 var exports_tool_executor = {};
 __export(exports_tool_executor, {
-  testLayer: () => testLayer36,
+  testLayer: () => testLayer37,
+  router: () => router,
+  routeToolkit: () => routeToolkit,
+  route: () => route,
   fromToolkit: () => fromToolkit,
   executeToolkit: () => executeToolkit,
   ToolExecutor: () => ToolExecutor
 });
-import { Cause as Cause2, Context as Context41, Effect as Effect43, Layer as Layer41, Option as Option14, Sink, Stream as Stream5 } from "effect";
+import { Cause as Cause2, Context as Context41, Effect as Effect43, Layer as Layer41, Option as Option14, Sink as Sink2, Stream as Stream6 } from "effect";
 class ToolExecutor extends Context41.Service()("@batonfx/core/ToolExecutor") {
 }
 var failureMessage = (cause) => {
@@ -9207,7 +9259,7 @@ var executeWithToolkit = (toolkit, request) => {
   if (toolkit.tools[request.call.name] === undefined) {
     return Effect43.succeed(failureOutcome(`Tool ${request.call.name} is not registered`));
   }
-  return toolkit.handle(request.call.name, request.call.params).pipe(Effect43.flatMap((results) => results.pipe(Stream5.filter((item) => item.preliminary === false), Stream5.run(Sink.last()))), Effect43.map(Option14.match({
+  return toolkit.handle(request.call.name, request.call.params).pipe(Effect43.flatMap((results) => results.pipe(Stream6.filter((item) => item.preliminary === false), Stream6.run(Sink2.last()))), Effect43.map(Option14.match({
     onNone: () => failureOutcome("Tool handler did not produce a final result"),
     onSome: (result) => result.isFailure ? failureOutcome(resultMessage(result.result)) : {
       _tag: "Success",
@@ -9232,9 +9284,31 @@ function fromToolkit(toolkit) {
     execute: (request) => executeWithToolkit(handled, request)
   }))));
 }
-var testLayer36 = (implementation) => Layer41.succeed(ToolExecutor, ToolExecutor.of(implementation));
+var route = (options) => {
+  const routedTools = options.tools ?? [];
+  return {
+    tools: routedTools,
+    matches: (request) => routedTools.includes(request.call.name) || options.matches?.(request) === true,
+    execute: options.execute
+  };
+};
+function routeToolkit(toolkit) {
+  const makeRoute = (handled) => route({
+    tools: Object.keys(handled.tools),
+    execute: (request) => executeWithToolkit(handled, request)
+  });
+  return "handle" in toolkit ? makeRoute(toolkit) : toolkit.pipe(Effect43.map(makeRoute));
+}
+var routeInputEffect = (input) => Effect43.isEffect(input) ? input : Effect43.succeed(input);
+var router = (routes) => Layer41.effect(ToolExecutor, Effect43.all(Array.from(routes, routeInputEffect)).pipe(Effect43.map((resolved) => ToolExecutor.of({
+  execute: (request) => {
+    const matched = resolved.find((candidate) => candidate.matches(request));
+    return matched === undefined ? Effect43.succeed(failureOutcome(`Tool ${request.call.name} is not registered`)) : matched.execute(request);
+  }
+}))));
+var testLayer37 = (implementation) => Layer41.succeed(ToolExecutor, ToolExecutor.of(implementation));
 
-// ../../node_modules/.bun/@batonfx+core@0.2.0/node_modules/@batonfx/core/src/turn-policy.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.0/node_modules/@batonfx/core/src/turn-policy.ts
 var exports_turn_policy = {};
 __export(exports_turn_policy, {
   untilToolCall: () => untilToolCall,
@@ -9273,13 +9347,13 @@ var both = (first, second) => make4((info) => Effect44.gen(function* () {
 }));
 var defaultPolicy = recurs(8);
 
-// ../../node_modules/.bun/@batonfx+core@0.2.0/node_modules/@batonfx/core/src/agent.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.0/node_modules/@batonfx/core/src/agent.ts
 function make5(nameOrOptions, options = {}) {
   const resolved = typeof nameOrOptions === "string" ? { ...options, name: nameOrOptions } : nameOrOptions;
   return {
     name: resolved.name,
     ...resolved.instructions === undefined ? {} : { instructions: resolved.instructions },
-    toolkit: resolved.toolkit ?? Toolkit2.empty,
+    toolkit: resolved.toolkit ?? Toolkit3.empty,
     policy: resolved.policy ?? defaultPolicy
   };
 }
@@ -9368,7 +9442,7 @@ var applyPartChain = (chain, part, context) => Effect45.gen(function* () {
   }
   return current2;
 });
-var streamInternal = (agent, options, structured) => Stream6.unwrap(Effect45.gen(function* () {
+var streamInternal = (agent, options, structured) => Stream7.unwrap(Effect45.gen(function* () {
   const executor = yield* Effect45.serviceOption(ToolExecutor);
   const approvals = yield* Effect45.serviceOption(Approvals);
   const chain = yield* Effect45.serviceOption(ModelMiddleware).pipe(Effect45.map(Option15.match({ onNone: () => [], onSome: (service) => service })));
@@ -9435,7 +9509,7 @@ var streamInternal = (agent, options, structured) => Stream6.unwrap(Effect45.gen
   const freshChat = options.history !== undefined ? Chat.fromPrompt(options.history) : system !== undefined ? Chat.fromPrompt([Prompt4.makeMessage("system", { content: system })]) : Chat.empty;
   const chat = persisted ?? (yield* freshChat);
   const savePersisted = persisted === undefined ? Effect45.void : persisted.save.pipe(Effect45.mapError((error) => new AgentError({ message: errorMessage(error), turn: 0, cause: error })));
-  const failSuspended = (call, token, reason) => Stream6.unwrap(savePersisted.pipe(Effect45.as(Stream6.fail(suspended(call, token, reason)))));
+  const failSuspended = (call, token, reason) => Stream7.unwrap(savePersisted.pipe(Effect45.as(Stream7.fail(suspended(call, token, reason)))));
   const state = {
     text: "",
     turn: 0,
@@ -9545,12 +9619,12 @@ var streamInternal = (agent, options, structured) => Stream6.unwrap(Effect45.gen
       case "Success":
         return (isSkillActivationCall(call) ? Effect45.succeed(successResult(call, outcome)) : boundedSuccessResult(turn, call, outcome)).pipe(Effect45.map((result) => {
           state.pending.push(result);
-          return Stream6.fromIterable([{ _tag: "ToolExecutionCompleted", turn, call, result }]);
+          return Stream7.fromIterable([{ _tag: "ToolExecutionCompleted", turn, call, result }]);
         }));
       case "Failure": {
         const result = failedResult(call, outcome.message);
         state.pending.push(result);
-        return Effect45.succeed(Stream6.fromIterable([{ _tag: "ToolExecutionCompleted", turn, call, result }]));
+        return Effect45.succeed(Stream7.fromIterable([{ _tag: "ToolExecutionCompleted", turn, call, result }]));
       }
       case "Suspend":
         return Effect45.succeed(failSuspended(call, outcome.token, "tool-wait"));
@@ -9561,9 +9635,9 @@ var streamInternal = (agent, options, structured) => Stream6.unwrap(Effect45.gen
       return executeToolkit(agent.toolkit, request);
     }
     const activated = activatedSkillTools.get(request.call.name);
-    return activated === undefined ? Effect45.succeed({ _tag: "Failure", message: `Tool ${request.call.name} is not registered` }) : executeToolkit(Toolkit2.make(activated), request);
+    return activated === undefined ? Effect45.succeed({ _tag: "Failure", message: `Tool ${request.call.name} is not registered` }) : executeToolkit(Toolkit3.make(activated), request);
   };
-  const executeApproved = (turn, call, request) => Stream6.concat(Stream6.fromIterable([{ _tag: "ToolExecutionStarted", turn, call }]), Stream6.unwrap(Effect45.gen(function* () {
+  const executeApproved = (turn, call, request) => Stream7.concat(Stream7.fromIterable([{ _tag: "ToolExecutionStarted", turn, call }]), Stream7.unwrap(Effect45.gen(function* () {
     const progressQueue = yield* Queue2.unbounded();
     const signal = yield* Effect45.abortSignal;
     const context = ToolContext.of({
@@ -9585,13 +9659,13 @@ var streamInternal = (agent, options, structured) => Stream6.unwrap(Effect45.gen
       onSome: (service) => service.execute(request)
     });
     const fiber = yield* execution.pipe(Effect45.provideService(ToolContext, context), Effect45.ensuring(Queue2.end(progressQueue).pipe(Effect45.asVoid)), Effect45.forkScoped({ startImmediately: true }));
-    return Stream6.concat(Stream6.fromQueue(progressQueue), Stream6.fromEffect(Fiber.join(fiber)).pipe(Stream6.flatMap((outcome) => Stream6.unwrap(outcomeEvents(turn, call, outcome)))));
+    return Stream7.concat(Stream7.fromQueue(progressQueue), Stream7.fromEffect(Fiber.join(fiber)).pipe(Stream7.flatMap((outcome) => Stream7.unwrap(outcomeEvents(turn, call, outcome)))));
   })));
   const permissionError = (turn, error) => new AgentError({ message: error.message, turn, cause: error });
   const permissionDeniedEvents = (turn, call, reason) => {
     const result = failedResult(call, reason ?? "Permission denied");
     state.pending.push(result);
-    return Stream6.fromIterable([{ _tag: "ToolExecutionCompleted", turn, call, result }]);
+    return Stream7.fromIterable([{ _tag: "ToolExecutionCompleted", turn, call, result }]);
   };
   const activateSkillOutcome = (turn, call) => Effect45.gen(function* () {
     if (skillRuntime === undefined)
@@ -9624,25 +9698,25 @@ var streamInternal = (agent, options, structured) => Stream6.unwrap(Effect45.gen
     onNone: () => Effect45.void,
     onSome: (store) => store.remember({ pattern: call.name, level: "allow" }).pipe(Effect45.mapError((error) => permissionError(turn, error)))
   })));
-  const approvalEvents = (turn, call, messages, request, tool2) => Stream6.unwrap(approvalRequired(tool2, call, messages).pipe(Effect45.map((isRequired) => {
+  const approvalEvents = (turn, call, messages, request, tool2) => Stream7.unwrap(approvalRequired(tool2, call, messages).pipe(Effect45.map((isRequired) => {
     if (!isRequired)
       return executeApproved(turn, call, request);
     if (Option15.isNone(approvals)) {
       const result = failedResult(call, "Approvals service is required for approval-gated tools");
       state.pending.push(result);
-      return Stream6.fromIterable([
+      return Stream7.fromIterable([
         { _tag: "ApprovalRequested", turn, call },
         { _tag: "ToolExecutionCompleted", turn, call, result }
       ]);
     }
-    return Stream6.concat(Stream6.fromIterable([{ _tag: "ApprovalRequested", turn, call }]), Stream6.unwrap(approvals.value.check(request).pipe(Effect45.map((decision2) => {
+    return Stream7.concat(Stream7.fromIterable([{ _tag: "ApprovalRequested", turn, call }]), Stream7.unwrap(approvals.value.check(request).pipe(Effect45.map((decision2) => {
       switch (decision2._tag) {
         case "Approved":
           return executeApproved(turn, call, request);
         case "Denied": {
           const result = failedResult(call, decision2.reason ?? "Tool call denied");
           state.pending.push(result);
-          return Stream6.fromIterable([{ _tag: "ToolExecutionCompleted", turn, call, result }]);
+          return Stream7.fromIterable([{ _tag: "ToolExecutionCompleted", turn, call, result }]);
         }
         case "Pending":
           return failSuspended(call, decision2.token, "approval");
@@ -9656,7 +9730,7 @@ var streamInternal = (agent, options, structured) => Stream6.unwrap(Effect45.gen
       case "Denied":
         return permissionDeniedEvents(turn, call, answer.reason);
       case "Always":
-        return Stream6.unwrap(rememberAlways(turn, call).pipe(Effect45.as(executeApproved(turn, call, request))));
+        return Stream7.unwrap(rememberAlways(turn, call).pipe(Effect45.as(executeApproved(turn, call, request))));
     }
   };
   const permissionAskEvents = (turn, call, request, token) => {
@@ -9670,7 +9744,7 @@ var streamInternal = (agent, options, structured) => Stream6.unwrap(Effect45.gen
     };
     if (Option15.isNone(permissionsService))
       return failSuspended(call, token, "approval");
-    return Stream6.concat(Stream6.fromIterable([{ _tag: "ApprovalRequested", turn, call }]), Stream6.unwrap(permissionsService.value.await(pending).pipe(Effect45.mapError((error) => permissionError(turn, error)), Effect45.map(Option15.match({
+    return Stream7.concat(Stream7.fromIterable([{ _tag: "ApprovalRequested", turn, call }]), Stream7.unwrap(permissionsService.value.await(pending).pipe(Effect45.mapError((error) => permissionError(turn, error)), Effect45.map(Option15.match({
       onNone: () => failSuspended(call, token, "approval"),
       onSome: (answer) => permissionAnsweredEvents(turn, call, request, answer)
     })))));
@@ -9680,7 +9754,7 @@ var streamInternal = (agent, options, structured) => Stream6.unwrap(Effect45.gen
     const tool2 = currentToolkit().tools[call.name];
     if (Option15.isNone(permissionsService))
       return approvalEvents(turn, call, messages, request, tool2);
-    return Stream6.unwrap(permissionsService.value.evaluate({
+    return Stream7.unwrap(permissionsService.value.evaluate({
       tool: call.name,
       params: call.params,
       agentName: agent.name,
@@ -9728,57 +9802,57 @@ var streamInternal = (agent, options, structured) => Stream6.unwrap(Effect45.gen
   });
   const partEvents = (turn, part, messages) => {
     if (part.type === "error") {
-      return Stream6.fail(new AgentError({ message: errorMessage(part.error), turn, cause: part.error }));
+      return Stream7.fail(new AgentError({ message: errorMessage(part.error), turn, cause: part.error }));
     }
-    const modelPart = Stream6.fromIterable([{ _tag: "ModelPart", turn, part }]);
+    const modelPart = Stream7.fromIterable([{ _tag: "ModelPart", turn, part }]);
     if (part.type === "tool-call") {
       const call = part;
-      return call.providerExecuted === true ? modelPart : Stream6.concat(modelPart, toolCallEvents(turn, call, messages));
+      return call.providerExecuted === true ? modelPart : Stream7.concat(modelPart, toolCallEvents(turn, call, messages));
     }
     if (part.type === "text-delta") {
       state.text = `${state.text}${part.delta}`;
     }
     if (part.type === "finish") {
-      return modelPart.pipe(Stream6.tap(() => captureFinishPart(part)));
+      return modelPart.pipe(Stream7.tap(() => captureFinishPart(part)));
     }
     return modelPart;
   };
-  const applyPartToEvents = (turn, part, messages) => Stream6.unwrap(applyPartChain(chain, part, { agentName: agent.name, turn }).pipe(Effect45.map(Option15.match({
+  const applyPartToEvents = (turn, part, messages) => Stream7.unwrap(applyPartChain(chain, part, { agentName: agent.name, turn }).pipe(Effect45.map(Option15.match({
     onSome: (transformed) => partEvents(turn, transformed, messages),
-    onNone: () => part.type === "tool-call" ? Stream6.fail(new MiddlewareViolation({
+    onNone: () => part.type === "tool-call" ? Stream7.fail(new MiddlewareViolation({
       turn,
       detail: "ModelMiddleware dropped a tool-call part"
-    })) : Stream6.empty
+    })) : Stream7.empty
   }))));
-  const currentToolkit = () => Toolkit2.make(...Object.values(agent.toolkit.tools), ...hasActivatableSkills ? [activateSkillTool] : [], ...activatedSkillTools.values());
-  const activeToolkit = (activeTools) => Toolkit2.make(...Object.values(currentToolkit().tools).filter((tool2) => activeTools.includes(tool2.name)));
+  const currentToolkit = () => Toolkit3.make(...Object.values(agent.toolkit.tools), ...hasActivatableSkills ? [activateSkillTool] : [], ...activatedSkillTools.values());
+  const activeToolkit = (activeTools) => Toolkit3.make(...Object.values(currentToolkit().tools).filter((tool2) => activeTools.includes(tool2.name)));
   const modelTurn = (turn, prompt, overrides) => {
     const toolkit = overrides?.activeTools === undefined ? currentToolkit() : activeToolkit(overrides.activeTools);
-    const attempt = (activePrompt, retryOverflow) => Stream6.unwrap(Ref10.get(chat.history).pipe(Effect45.map((historyBeforeAttempt) => {
+    const attempt = (activePrompt, retryOverflow) => Stream7.unwrap(Ref10.get(chat.history).pipe(Effect45.map((historyBeforeAttempt) => {
       let emitted = false;
       const messages = Prompt4.concat(historyBeforeAttempt, activePrompt).content;
-      return chat.streamText({ prompt: activePrompt, toolkit, disableToolCallResolution: true }).pipe(Stream6.map((part) => ({ part, messages })), Stream6.tap(() => Effect45.sync(() => {
+      return chat.streamText({ prompt: activePrompt, toolkit, disableToolCallResolution: true }).pipe(Stream7.map((part) => ({ part, messages })), Stream7.tap(() => Effect45.sync(() => {
         emitted = true;
-      })), Stream6.catchCause((cause) => {
+      })), Stream7.catchCause((cause) => {
         if (Cause3.hasInterrupts(cause))
-          return Stream6.fromEffect(Effect45.interrupt);
+          return Stream7.fromEffect(Effect45.interrupt);
         const error = Cause3.squash(cause);
         if (retryOverflow && !emitted && isContextOverflow(error) && Option15.isSome(compactionService)) {
-          return Stream6.unwrap(Effect45.gen(function* () {
+          return Stream7.unwrap(Effect45.gen(function* () {
             yield* Ref10.set(chat.history, historyBeforeAttempt);
             const compactedPrompt = yield* preparePrompt(turn, activePrompt, true);
             return attempt(compactedPrompt, false);
           }));
         }
-        return Stream6.make({ part: Response3.makePart("error", { error }), messages });
+        return Stream7.make({ part: Response3.makePart("error", { error }), messages });
       }));
     })));
-    const parts = Stream6.unwrap(applyPromptChain(chain, Prompt4.make(prompt), { agentName: agent.name, turn }).pipe(Effect45.flatMap((transformedPrompt) => preparePrompt(turn, transformedPrompt, false)), Effect45.map((preparedPrompt) => attempt(preparedPrompt, true).pipe(Stream6.flatMap(({ part, messages }) => applyPartToEvents(turn, part, messages))))));
+    const parts = Stream7.unwrap(applyPromptChain(chain, Prompt4.make(prompt), { agentName: agent.name, turn }).pipe(Effect45.flatMap((transformedPrompt) => preparePrompt(turn, transformedPrompt, false)), Effect45.map((preparedPrompt) => attempt(preparedPrompt, true).pipe(Stream7.flatMap(({ part, messages }) => applyPartToEvents(turn, part, messages))))));
     const resilientParts = Option15.match(resilienceService, {
       onNone: () => parts,
-      onSome: (resilience) => Stream6.unwrap(LanguageModel3.LanguageModel.pipe(Effect45.map((model) => parts.pipe(Stream6.provideService(LanguageModel3.LanguageModel, apply(model, resilience))))))
+      onSome: (resilience) => Stream7.unwrap(LanguageModel3.LanguageModel.pipe(Effect45.map((model) => parts.pipe(Stream7.provideService(LanguageModel3.LanguageModel, apply(model, resilience))))))
     });
-    return overrides?.model === undefined ? resilientParts : resilientParts.pipe(Stream6.provide(overrides.model));
+    return overrides?.model === undefined ? resilientParts : resilientParts.pipe(Stream7.provide(overrides.model));
   };
   const turnCompletedEvent = (turn, transcript) => ({
     _tag: "TurnCompleted",
@@ -9793,7 +9867,7 @@ var streamInternal = (agent, options, structured) => Stream6.unwrap(Effect45.gen
     transcript,
     ...state.usage === undefined ? {} : { usage: state.usage }
   });
-  const structuredFinalEvents = (turn, config) => Stream6.fromEffect(Effect45.gen(function* () {
+  const structuredFinalEvents = (turn, config) => Stream7.fromEffect(Effect45.gen(function* () {
     const structuredTurn = turn + 1;
     const transformedPrompt = yield* applyPromptChain(chain, Prompt4.make(config.objectPrompt), {
       agentName: agent.name,
@@ -9815,7 +9889,7 @@ var streamInternal = (agent, options, structured) => Stream6.unwrap(Effect45.gen
       content: response.content
     };
     return [structuredOutput, terminalCompletedEvent(structuredTurn, transcript)];
-  })).pipe(Stream6.flatMap((events) => Stream6.fromIterable(events)));
+  })).pipe(Stream7.flatMap((events) => Stream7.fromIterable(events)));
   const promptFromSteeringMessages = (messages) => messages.reduce((prompt, message) => Prompt4.concat(prompt, message.prompt), Prompt4.empty);
   const takeSteering = () => Option15.match(steeringService, {
     onNone: () => Effect45.succeed([]),
@@ -9835,18 +9909,18 @@ var streamInternal = (agent, options, structured) => Stream6.unwrap(Effect45.gen
       const followUp = yield* takeFollowUp();
       if (followUp.length > 0) {
         return {
-          events: Stream6.fromIterable([completed]),
+          events: Stream7.fromIterable([completed]),
           next: { prompt: promptFromSteeringMessages(followUp) }
         };
       }
       if (structured !== undefined) {
         return {
-          events: Stream6.concat(Stream6.fromIterable([completed]), structuredFinalEvents(turn, structured))
+          events: Stream7.concat(Stream7.fromIterable([completed]), structuredFinalEvents(turn, structured))
         };
       }
       yield* savePersisted;
       return {
-        events: Stream6.fromIterable([completed, terminalCompletedEvent(turn, transcript)])
+        events: Stream7.fromIterable([completed, terminalCompletedEvent(turn, transcript)])
       };
     }
     const decision2 = yield* agent.policy.decide({
@@ -9856,7 +9930,7 @@ var streamInternal = (agent, options, structured) => Stream6.unwrap(Effect45.gen
     });
     if (decision2._tag === "Stop") {
       return {
-        events: Stream6.concat(Stream6.fromIterable([completed]), Stream6.fail(new TurnLimitExceeded({
+        events: Stream7.concat(Stream7.fromIterable([completed]), Stream7.fail(new TurnLimitExceeded({
           turn: turn + 1,
           pending: pending.map((result) => ({
             tool_call_id: result.id,
@@ -9871,21 +9945,21 @@ var streamInternal = (agent, options, structured) => Stream6.unwrap(Effect45.gen
     const basePrompt = steering.length === 0 ? toolPrompt : Prompt4.concat(promptFromSteeringMessages(steering), toolPrompt);
     const prompt = decision2.overrides?.instructions === undefined ? basePrompt : withSystem(decision2.overrides.instructions, basePrompt);
     return {
-      events: Stream6.fromIterable([completed]),
+      events: Stream7.fromIterable([completed]),
       next: { prompt, ...decision2.overrides === undefined ? {} : { overrides: decision2.overrides } }
     };
   });
-  const resetTurnState = (turn) => Stream6.sync(() => {
+  const resetTurnState = (turn) => Stream7.sync(() => {
     state.turn = turn;
     state.finish = undefined;
-  }).pipe(Stream6.drain);
+  }).pipe(Stream7.drain);
   const runTurn = (turn, prompt, overrides) => {
     let next;
-    const currentTurn = Stream6.fromIterable([{ _tag: "TurnStarted", turn }]).pipe(Stream6.concat(resetTurnState(turn)), Stream6.concat(modelTurn(turn, prompt, overrides)), Stream6.concat(Stream6.unwrap(afterTurn(turn).pipe(Effect45.map((result) => {
+    const currentTurn = Stream7.fromIterable([{ _tag: "TurnStarted", turn }]).pipe(Stream7.concat(resetTurnState(turn)), Stream7.concat(modelTurn(turn, prompt, overrides)), Stream7.concat(Stream7.unwrap(afterTurn(turn).pipe(Effect45.map((result) => {
       next = result.next;
       return result.events;
-    })))), Stream6.withSpan("Baton.Agent.turn", { attributes: { "baton.turn": turn } }));
-    return Stream6.concat(currentTurn, Stream6.suspend(() => next === undefined ? Stream6.empty : runTurn(turn + 1, next.prompt, next.overrides)));
+    })))), Stream7.withSpan("Baton.Agent.turn", { attributes: { "baton.turn": turn } }));
+    return Stream7.concat(currentTurn, Stream7.suspend(() => next === undefined ? Stream7.empty : runTurn(turn + 1, next.prompt, next.overrides)));
   };
   const resumeStream = (resume) => {
     let next;
@@ -9895,36 +9969,36 @@ var streamInternal = (agent, options, structured) => Stream6.unwrap(Effect45.gen
       params: resume.call.params,
       providerExecuted: false
     });
-    const currentTurn = resetTurnState(0).pipe(Stream6.concat(Stream6.unwrap(Ref10.get(chat.history).pipe(Effect45.map((history) => toolCallEvents(0, call, history.content))))), Stream6.concat(Stream6.unwrap(afterTurn(0).pipe(Effect45.map((result) => {
+    const currentTurn = resetTurnState(0).pipe(Stream7.concat(Stream7.unwrap(Ref10.get(chat.history).pipe(Effect45.map((history) => toolCallEvents(0, call, history.content))))), Stream7.concat(Stream7.unwrap(afterTurn(0).pipe(Effect45.map((result) => {
       next = result.next;
       return result.events;
-    })))), Stream6.withSpan("Baton.Agent.turn", { attributes: { "baton.turn": 0 } }));
-    return Stream6.concat(currentTurn, Stream6.suspend(() => next === undefined ? Stream6.empty : runTurn(1, next.prompt, next.overrides)));
+    })))), Stream7.withSpan("Baton.Agent.turn", { attributes: { "baton.turn": 0 } }));
+    return Stream7.concat(currentTurn, Stream7.suspend(() => next === undefined ? Stream7.empty : runTurn(1, next.prompt, next.overrides)));
   };
   const baseInitialPrompt = seedSystem === undefined ? Prompt4.make(options.prompt) : withSystem(seedSystem, Prompt4.make(options.prompt));
   const initialPrompt = options.resume === undefined ? yield* recallInitialPrompt(baseInitialPrompt) : baseInitialPrompt;
   const runStream = options.resume === undefined ? runTurn(0, initialPrompt) : resumeStream(options.resume);
-  return runStream.pipe(Stream6.catchCause((cause) => {
+  return runStream.pipe(Stream7.catchCause((cause) => {
     if (Cause3.hasInterrupts(cause))
-      return Stream6.fromEffect(Effect45.interrupt);
+      return Stream7.fromEffect(Effect45.interrupt);
     const error = Cause3.squash(cause);
     if (error instanceof AgentSuspended) {
-      return Stream6.unwrap(Ref10.get(chat.history).pipe(Effect45.map((transcript) => Stream6.concat(Stream6.fromIterable([turnCompletedEvent(state.turn, transcript)]), Stream6.failCause(cause)))));
+      return Stream7.unwrap(Ref10.get(chat.history).pipe(Effect45.map((transcript) => Stream7.concat(Stream7.fromIterable([turnCompletedEvent(state.turn, transcript)]), Stream7.failCause(cause)))));
     }
-    return Stream6.failCause(cause);
+    return Stream7.failCause(cause);
   }));
-})).pipe(Stream6.withSpan("Baton.Agent.run", { attributes: { "baton.agent.name": agent.name } }));
+})).pipe(Stream7.withSpan("Baton.Agent.run", { attributes: { "baton.agent.name": agent.name } }));
 var stream2 = (agent, options) => streamInternal(agent, options, undefined);
 var streamObject = (agent, options) => streamInternal(agent, options, {
   schema: options.schema,
   objectName: options.objectName ?? "output",
   objectPrompt: options.objectPrompt ?? defaultObjectPrompt
 });
-var generate = (agent, options) => Stream6.runLast(stream2(agent, options)).pipe(Effect45.flatMap(Option15.match({
+var generate = (agent, options) => Stream7.runLast(stream2(agent, options)).pipe(Effect45.flatMap(Option15.match({
   onNone: () => Effect45.fail(new AgentError({ message: "Agent run ended without a Completed event", turn: 0 })),
   onSome: (event) => event._tag === "Completed" ? Effect45.succeed({ text: event.text, turns: event.turns, transcript: event.transcript }) : Effect45.fail(new AgentError({ message: "Agent run ended without a Completed event", turn: 0 }))
 })));
-var generateObject = (agent, options) => Stream6.runFold(streamObject(agent, options), () => ({
+var generateObject = (agent, options) => Stream7.runFold(streamObject(agent, options), () => ({
   value: Option15.none(),
   completed: Option15.none()
 }), (acc, event) => {
@@ -9950,21 +10024,211 @@ var generateObject = (agent, options) => Stream6.runFold(streamObject(agent, opt
     })
   })
 })));
-// ../../node_modules/.bun/@batonfx+core@0.2.0/node_modules/@batonfx/core/src/agent-tool.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.0/node_modules/@batonfx/core/src/agent-tool.ts
+var exports_agent_tool = {};
+__export(exports_agent_tool, {
+  asTool: () => asTool
+});
 import { Cause as Cause4, Effect as Effect46, Schema as Schema46 } from "effect";
-import { Tool as Tool5, Toolkit as Toolkit3 } from "effect/unstable/ai";
+import { Tool as Tool5, Toolkit as Toolkit4 } from "effect/unstable/ai";
 var defaultParameters = Schema46.Struct({ prompt: Schema46.String });
-// ../../node_modules/.bun/@batonfx+core@0.2.0/node_modules/@batonfx/core/src/guardrail.ts
+var errorMessage2 = (error) => {
+  if (error instanceof AgentSuspended) {
+    return `suspended on ${error.tool_name}: ${error.reason}`;
+  }
+  if (error instanceof AgentError) {
+    return `failed on turn ${error.turn}: ${error.message}`;
+  }
+  if (error instanceof TurnLimitExceeded) {
+    return `turn limit exceeded at turn ${error.turn}`;
+  }
+  if (error instanceof MiddlewareViolation) {
+    return `middleware violation on turn ${error.turn}: ${error.detail}`;
+  }
+  return error instanceof Error ? `${error.name}: ${error.message}` : String(error);
+};
+var causeMessage = (agentName, cause) => `sub-agent '${agentName}' could not complete: ${errorMessage2(Cause4.squash(cause))}`;
+var lazyHandled = (toolkit, name, handler) => ({
+  tools: toolkit.tools,
+  handle: (toolName, params) => toolkit.pipe(Effect46.provide(toolkit.toLayer({
+    [name]: handler
+  })), Effect46.flatMap((handled) => handled.handle(toolName, params)))
+});
+var asTool = (agent, options = {}) => {
+  const name = options.name ?? agent.name;
+  const parameters = options.parameters ?? defaultParameters;
+  const success2 = options.success ?? Schema46.String;
+  const toPrompt = options.toPrompt ?? ((params) => params.prompt);
+  const fromResult = options.fromResult ?? ((result) => result.text);
+  const tool2 = Tool5.make(name, {
+    ...options.description === undefined ? {} : { description: options.description },
+    parameters,
+    success: success2,
+    failure: Schema46.String,
+    failureMode: "return"
+  });
+  const toolkit = Toolkit4.make(tool2);
+  const handler = (params) => Effect46.gen(function* () {
+    const prompt = yield* Effect46.try({ try: () => toPrompt(params), catch: errorMessage2 });
+    const result = yield* generate(agent, { prompt }).pipe(Effect46.catchCause((cause) => {
+      if (Cause4.hasInterrupts(cause))
+        return Effect46.interrupt;
+      const error = Cause4.squash(cause);
+      if (error instanceof AgentSuspended)
+        return Effect46.die(error);
+      return Effect46.fail(causeMessage(agent.name, cause));
+    }));
+    return yield* Effect46.try({ try: () => fromResult(result), catch: errorMessage2 });
+  });
+  return lazyHandled(toolkit, name, handler);
+};
+// ../../node_modules/.bun/@batonfx+core@0.3.0/node_modules/@batonfx/core/src/guardrail.ts
+var exports_guardrail = {};
+__export(exports_guardrail, {
+  validateInput: () => validateInput2,
+  redactOutput: () => redactOutput,
+  redactInput: () => redactInput,
+  filterOutput: () => filterOutput
+});
 import { Effect as Effect47, Option as Option16 } from "effect";
 import { Prompt as Prompt6, Response as Response4 } from "effect/unstable/ai";
-// ../../node_modules/.bun/@batonfx+core@0.2.0/node_modules/@batonfx/core/src/handoff.ts
+var replacement = (options) => options.replacement ?? "[redacted]";
+var redactText = (text3, options) => text3.replace(options.pattern, replacement(options));
+var redactUserPart = (part, options) => part.type === "text" ? Prompt6.makePart("text", { text: redactText(part.text, options), options: part.options }) : part;
+var redactAssistantPart = (part, options) => {
+  switch (part.type) {
+    case "text":
+      return Prompt6.makePart("text", { text: redactText(part.text, options), options: part.options });
+    case "reasoning":
+      return Prompt6.makePart("reasoning", { text: redactText(part.text, options), options: part.options });
+    default:
+      return part;
+  }
+};
+var redactToolPart = (part, options) => {
+  if (part.type !== "tool-approval-response" || part.reason === undefined)
+    return part;
+  return Prompt6.makePart("tool-approval-response", {
+    approvalId: part.approvalId,
+    approved: part.approved,
+    reason: redactText(part.reason, options),
+    options: part.options
+  });
+};
+var redactPromptText = (prompt, options) => Prompt6.fromMessages(prompt.content.map((message) => {
+  switch (message.role) {
+    case "system":
+      return Prompt6.makeMessage("system", {
+        content: redactText(message.content, options),
+        options: message.options
+      });
+    case "user":
+      return Prompt6.makeMessage("user", {
+        content: message.content.map((part) => redactUserPart(part, options)),
+        options: message.options
+      });
+    case "assistant":
+      return Prompt6.makeMessage("assistant", {
+        content: message.content.map((part) => redactAssistantPart(part, options)),
+        options: message.options
+      });
+    case "tool":
+      return Prompt6.makeMessage("tool", {
+        content: message.content.map((part) => redactToolPart(part, options)),
+        options: message.options
+      });
+  }
+}));
+var validateInput2 = (check2) => ({
+  transformPrompt: (prompt, context) => check2(prompt, context).pipe(Effect47.flatMap(Option16.match({
+    onNone: () => Effect47.succeed(prompt),
+    onSome: (reason) => Effect47.fail(new AgentError({ message: `Input guardrail blocked: ${reason}`, turn: context.turn }))
+  })))
+});
+var redactInput = (options) => ({
+  transformPrompt: (prompt) => Effect47.succeed(redactPromptText(prompt, options))
+});
+var redactOutput = (options) => ({
+  transformPart: (part) => {
+    if (part.type !== "text-delta")
+      return Effect47.succeed(Option16.some(part));
+    return Effect47.succeed(Option16.some(Response4.makePart("text-delta", {
+      id: part.id,
+      delta: redactText(part.delta, options),
+      metadata: part.metadata
+    })));
+  }
+});
+var filterOutput = (keep) => ({
+  transformPart: (part, context) => Effect47.succeed(part.type === "tool-call" || keep(part, context) ? Option16.some(part) : Option16.none())
+});
+// ../../node_modules/.bun/@batonfx+core@0.3.0/node_modules/@batonfx/core/src/handoff.ts
+var exports_handoff = {};
+__export(exports_handoff, {
+  transferTool: () => transferTool,
+  supervisor: () => supervisor,
+  fanOut: () => fanOut
+});
 import { Effect as Effect48, Schema as Schema47 } from "effect";
-import { AiError as AiError2, Toolkit as Toolkit4 } from "effect/unstable/ai";
+import { AiError as AiError2, Toolkit as Toolkit5 } from "effect/unstable/ai";
 var defaultTransferParameters = Schema47.Struct({ prompt: Schema47.String });
-// ../../node_modules/.bun/@batonfx+core@0.2.0/node_modules/@batonfx/core/src/model-registry.ts
+var transferName = (agentName) => `transfer_to_${agentName}`;
+var positiveConcurrency = (value) => {
+  const concurrency = value ?? 4;
+  return Number.isInteger(concurrency) && concurrency > 0 ? Effect48.succeed(concurrency) : Effect48.fail(new AgentError({
+    message: "Handoff.fanOut concurrency must be a positive integer",
+    turn: 0
+  }));
+};
+var mergeHandled = (toolkits) => {
+  const tools = {};
+  for (const toolkit of toolkits) {
+    Object.assign(tools, toolkit.tools);
+  }
+  return {
+    tools,
+    handle: (name, params) => {
+      const toolkit = toolkits.find((candidate) => candidate.tools[name] !== undefined);
+      return toolkit === undefined ? Effect48.fail(AiError2.make({
+        module: "Handoff",
+        method: `${String(name)}.handle`,
+        reason: new AiError2.ToolNotFoundError({
+          toolName: String(name),
+          availableTools: Object.keys(tools)
+        })
+      })) : toolkit.handle(name, params);
+    }
+  };
+};
+var toolkitFromHandled = (toolkit) => Toolkit5.make(...Object.values(toolkit.tools));
+var transferTool = (target, options = {}) => asTool(target, {
+  name: options.nameOverride ?? transferName(target.name),
+  description: options.description ?? `Transfer to ${target.name}`,
+  ...options.parameters === undefined ? {} : { parameters: options.parameters },
+  ...options.success === undefined ? {} : { success: options.success },
+  ...options.toPrompt === undefined ? {} : { toPrompt: options.toPrompt },
+  ...options.fromResult === undefined ? {} : { fromResult: options.fromResult }
+});
+var fanOut = (children, options = {}) => positiveConcurrency(options.concurrency).pipe(Effect48.flatMap((concurrency) => Effect48.forEach(children, (child) => generate(child.agent, { ...child.options, prompt: child.prompt }), {
+  concurrency
+})));
+var supervisor = (options) => {
+  const transferTools = options.specialists.map((specialist) => transferTool(specialist));
+  const toolkit = mergeHandled(transferTools);
+  return {
+    agent: make5({
+      name: options.name,
+      ...options.instructions === undefined ? {} : { instructions: options.instructions },
+      toolkit: toolkitFromHandled(toolkit),
+      ...options.policy === undefined ? {} : { policy: options.policy }
+    }),
+    toolkit
+  };
+};
+// ../../node_modules/.bun/@batonfx+core@0.3.0/node_modules/@batonfx/core/src/model-registry.ts
 var exports_model_registry = {};
 __export(exports_model_registry, {
-  testLayer: () => testLayer37,
+  testLayer: () => testLayer38,
   registrations: () => registrations,
   registrationFromLayer: () => registrationFromLayer,
   register: () => register4,
@@ -10036,7 +10300,7 @@ var layer31 = (initialRegistrations = [], options) => Layer43.effect(Service29,
 var layerFromRegistrationEffects = (registrations, options) => Layer43.unwrap(Effect49.all(registrations).pipe(Effect49.map((items) => layer31(items, options))));
 var combine = (registries, options) => Layer43.unwrap(Effect49.forEach(registries, (registry) => Layer43.build(registry).pipe(Effect49.flatMap((context) => Context42.get(context, Service29).registrations))).pipe(Effect49.map((groups) => layer31(groups.flat(), options))));
 var memoryLayer25 = layer31;
-var testLayer37 = (implementation) => Layer43.succeed(Service29, Service29.of(implementation));
+var testLayer38 = (implementation) => Layer43.succeed(Service29, Service29.of(implementation));
 var register4 = Effect49.fn("ModelRegistry.register.call")(function* (input) {
   const service = yield* Service29;
   return yield* service.register(input);
@@ -10049,14 +10313,32 @@ var provide = (selection, effect) => Effect49.gen(function* () {
   const service = yield* Service29;
   return yield* service.provide(selection, effect);
 });
+
+// ../../node_modules/.bun/@batonfx+core@0.3.0/node_modules/@batonfx/core/src/index.ts
+import {
+  AiError as AiError3,
+  Chat as Chat2,
+  EmbeddingModel,
+  IdGenerator,
+  LanguageModel as LanguageModel5,
+  Model as Model2,
+  Prompt as Prompt8,
+  Response as Response5,
+  ResponseIdTracker,
+  Telemetry as Telemetry2,
+  Tokenizer as Tokenizer3,
+  Tool as Tool7,
+  Toolkit as Toolkit6
+} from "effect/unstable/ai";
+
 // ../runtime/src/agent/agent-loop-service.ts
-import { Config as Config3, Context as Context54, Crypto as Crypto3, Effect as Effect67, HashSet as HashSet6, Layer as Layer60, Option as Option22, Ref as Ref18, Schema as Schema61, Stream as Stream7 } from "effect";
-import { Chat as Chat2, LanguageModel as LanguageModel5, Prompt as Prompt11, Tokenizer as Tokenizer3, Toolkit as Toolkit5 } from "effect/unstable/ai";
+import { Config as Config3, Context as Context54, Crypto as Crypto3, Effect as Effect67, HashSet as HashSet6, Layer as Layer60, Option as Option22, Ref as Ref18, Schema as Schema61, Stream as Stream8 } from "effect";
+import { Chat as Chat3, LanguageModel as LanguageModel6, Prompt as Prompt12, Tokenizer as Tokenizer4, Toolkit as Toolkit7 } from "effect/unstable/ai";
 
 // ../runtime/src/child/child-run-service.ts
 var exports_child_run_service = {};
 __export(exports_child_run_service, {
-  testLayer: () => testLayer38,
+  testLayer: () => testLayer39,
   spawnStatic: () => spawnStatic,
   spawnDynamic: () => spawnDynamic,
   resolveForDispatch: () => resolveForDispatch,
@@ -10321,7 +10603,7 @@ var layer32 = Layer45.effect(Service31, Effect51.gen(function* () {
   });
 }));
 var memoryLayer26 = layer32.pipe(Layer45.provide(exports_child_execution_repository.memoryLayer), Layer45.provide(memoryLayer21));
-var testLayer38 = (implementation) => Layer45.succeed(Service31, Service31.of(implementation));
+var testLayer39 = (implementation) => Layer45.succeed(Service31, Service31.of(implementation));
 var agentContextFromSchema = (input) => ({
   toolNames: input.tool_names,
   permissions: input.permissions,
@@ -10582,11 +10864,11 @@ var transferTools = (config) => (config.agent.handoff_targets ?? []).map((target
 
 // ../runtime/src/memory/memory-service.ts
 import { Clock as Clock3, Context as Context46, Effect as Effect54, Layer as Layer47, Schema as Schema53 } from "effect";
-import { EmbeddingModel as EmbeddingModel2, Prompt as Prompt8 } from "effect/unstable/ai";
+import { EmbeddingModel as EmbeddingModel3, Prompt as Prompt9 } from "effect/unstable/ai";
 
 // ../runtime/src/model/embedding-model-service.ts
 import { Context as Context45, Effect as Effect53, Layer as Layer46, Ref as Ref13, Schema as Schema52 } from "effect";
-import { EmbeddingModel, Model as Model2 } from "effect/unstable/ai";
+import { EmbeddingModel as EmbeddingModel2, Model as Model3 } from "effect/unstable/ai";
 
 class EmbeddingModelNotRegistered extends Schema52.TaggedErrorClass()("EmbeddingModelNotRegistered", {
   provider: Schema52.String,
@@ -10625,7 +10907,7 @@ var resolveDefault = (registrations2, options) => {
   }
   return registrations2.length === 1 ? registrations2[0] : undefined;
 };
-var registrationFromLayer2 = (input) => Model2.make(input.provider, input.model, input.layer).captureRequirements.pipe(Effect53.map((layer33) => toRegistration({
+var registrationFromLayer2 = (input) => Model3.make(input.provider, input.model, input.layer).captureRequirements.pipe(Effect53.map((layer33) => toRegistration({
   provider: input.provider,
   model: input.model,
   ...input.registrationKey === undefined ? {} : { registrationKey: input.registrationKey },
@@ -10683,12 +10965,12 @@ var deterministicVector = (input, dimensions) => {
 };
 var deterministicLayer = (options = {}) => {
   const dimensions = options.dimensions ?? 64;
-  return Layer46.mergeAll(Layer46.effect(EmbeddingModel.EmbeddingModel, EmbeddingModel.make({
+  return Layer46.mergeAll(Layer46.effect(EmbeddingModel2.EmbeddingModel, EmbeddingModel2.make({
     embedMany: ({ inputs }) => Effect53.succeed({
       results: inputs.map((input) => deterministicVector(input, dimensions)),
       usage: { inputTokens: inputs.reduce((total, input) => total + words(input).length, 0) }
     })
-  })), Layer46.succeed(EmbeddingModel.Dimensions, dimensions));
+  })), Layer46.succeed(EmbeddingModel2.Dimensions, dimensions));
 };
 var deterministicRegistration = (options = {}) => registrationFromLayer2({
   provider: options.provider ?? "test",
@@ -10718,7 +11000,7 @@ var memoryError = (error) => new exports_memory.MemoryError({
   message: error instanceof Error ? `${error.name}: ${error.message}` : String(error)
 });
 var decodeSubject = (subject) => Schema53.decodeUnknownEffect(exports_ids_schema.MemorySubjectId)(subject).pipe(Effect54.mapError(memoryError));
-var textPart = (text3) => Prompt8.makePart("text", { text: text3 });
+var textPart = (text3) => Prompt9.makePart("text", { text: text3 });
 var textFromParts = (parts) => parts.filter((part) => part.type === "text").map((part) => part.text).join(`
 `).trim();
 var latestUserText = (prompt) => {
@@ -10781,7 +11063,7 @@ var hashText = (input) => {
 };
 var memoryId = (input, text3) => `memory:${input.key.agent}:${input.key.subject}:${input.turn}:${hashText(`${input.key.agent}\x00${input.key.subject}\x00${input.turn}\x00${text3}`)}`;
 var embed = (models, text3, options) => {
-  const program = EmbeddingModel2.EmbeddingModel.pipe(Effect54.flatMap((model) => model.embed(text3)));
+  const program = EmbeddingModel3.EmbeddingModel.pipe(Effect54.flatMap((model) => model.embed(text3)));
   return (options?.embeddingSelection === undefined ? models.provideDefault(program) : models.provide(options.embeddingSelection, program)).pipe(Effect54.mapError(memoryError));
 };
 var make6 = (options = {}) => Effect54.gen(function* () {
@@ -10848,7 +11130,7 @@ var remember2 = Effect54.fn("MemoryService.remember.call")(function* (input) {
 // ../runtime/src/model/language-model-service.ts
 var exports_language_model_service = {};
 __export(exports_language_model_service, {
-  testLayer: () => testLayer39,
+  testLayer: () => testLayer40,
   registrations: () => registrations3,
   registrationFromLayer: () => registrationFromLayer3,
   register: () => register6,
@@ -10882,7 +11164,7 @@ var layer35 = (initialRegistrations = [], options) => Layer48.effect(Service34,
 })).pipe(Layer48.provide(exports_model_registry.layer(initialRegistrations, options)));
 var layerFromRegistrationEffects3 = (registrations3, options) => Layer48.unwrap(Effect55.all(registrations3).pipe(Effect55.map((items) => layer35(items, options))));
 var memoryLayer28 = layer35;
-var testLayer39 = (implementation) => Layer48.succeed(Service34, Service34.of(implementation));
+var testLayer40 = (implementation) => Layer48.succeed(Service34, Service34.of(implementation));
 var register6 = Effect55.fn("LanguageModelService.register.call")(function* (input) {
   const service = yield* Service34;
   return yield* service.register(input);
@@ -10903,7 +11185,7 @@ var provideForAgent = (agent, effect) => Effect55.gen(function* () {
 // ../runtime/src/model/model-call-policy.ts
 var exports_model_call_policy = {};
 __export(exports_model_call_policy, {
-  testLayer: () => testLayer40,
+  testLayer: () => testLayer41,
   noRetryLayer: () => noRetryLayer,
   make: () => make7,
   layer: () => layer36,
@@ -10912,11 +11194,11 @@ __export(exports_model_call_policy, {
   Service: () => Service35
 });
 import { Context as Context48, Duration as Duration3, Layer as Layer49, Schedule as Schedule3 } from "effect";
-import { AiError as AiError3 } from "effect/unstable/ai";
+import { AiError as AiError4 } from "effect/unstable/ai";
 
 class Service35 extends Context48.Service()("@relayfx/runtime/ModelCallPolicy") {
 }
-var isOutputValidationError = (error) => AiError3.isAiError(error) ? error.reason._tag === "InvalidOutputError" : AiError3.isAiErrorReason(error) && error._tag === "InvalidOutputError";
+var isOutputValidationError = (error) => AiError4.isAiError(error) ? error.reason._tag === "InvalidOutputError" : AiError4.isAiErrorReason(error) && error._tag === "InvalidOutputError";
 var defaultClassify2 = (error) => isOutputValidationError(error) ? "terminal" : exports_model_resilience.defaultClassify(error);
 var defaultSchedule = Schedule3.exponential(Duration3.seconds(1)).pipe(Schedule3.jittered, Schedule3.both(Schedule3.recurs(4)));
 var make7 = (input) => ({
@@ -10925,12 +11207,12 @@ var make7 = (input) => ({
 });
 var layer36 = (input) => Layer49.succeed(Service35, Service35.of(make7(input)));
 var noRetryLayer = layer36({ retrySchedule: Schedule3.recurs(0) });
-var testLayer40 = (implementation) => Layer49.succeed(Service35, Service35.of(implementation));
+var testLayer41 = (implementation) => Layer49.succeed(Service35, Service35.of(implementation));
 
 // ../runtime/src/schema-registry/schema-registry-service.ts
 var exports_schema_registry_service = {};
 __export(exports_schema_registry_service, {
-  testLayer: () => testLayer41,
+  testLayer: () => testLayer42,
   resolve: () => resolve4,
   registrations: () => registrations4,
   register: () => register7,
@@ -10969,7 +11251,7 @@ var layer37 = (initialRegistrations = []) => Layer50.effect(Service36, Effect56.
   return Service36.of({ register: register7, registrations: registrations4, resolve: resolve4 });
 }));
 var memoryLayer29 = layer37;
-var testLayer41 = (implementation) => Layer50.succeed(Service36, Service36.of(implementation));
+var testLayer42 = (implementation) => Layer50.succeed(Service36, Service36.of(implementation));
 var register7 = Effect56.fn("SchemaRegistry.register.call")(function* (registration) {
   const service = yield* Service36;
   return yield* service.register(registration);
@@ -11065,7 +11347,7 @@ var make8 = Effect57.fn("RelaySessionStore.make")(function* (sessionId, entrySco
 // ../runtime/src/content/blob-store-service.ts
 var exports_blob_store_service = {};
 __export(exports_blob_store_service, {
-  testLayer: () => testLayer42,
+  testLayer: () => testLayer43,
   resolve: () => resolve5,
   put: () => put3,
   passthroughLayer: () => passthroughLayer,
@@ -11134,7 +11416,7 @@ var memoryLayer30 = Layer52.effect(Service38, Effect58.gen(function* () {
     })
   });
 }));
-var testLayer42 = (implementation) => Layer52.succeed(Service38, Service38.of(implementation));
+var testLayer43 = (implementation) => Layer52.succeed(Service38, Service38.of(implementation));
 var resolve5 = Effect58.fn("BlobStore.resolve.call")(function* (part) {
   const service = yield* Service38;
   return yield* service.resolve(part);
@@ -11147,7 +11429,7 @@ var put3 = Effect58.fn("BlobStore.put.call")(function* (input) {
 // ../runtime/src/agent/prompt-assembler-service.ts
 var exports_prompt_assembler_service = {};
 __export(exports_prompt_assembler_service, {
-  testLayer: () => testLayer44,
+  testLayer: () => testLayer45,
   layer: () => layer38,
   defaultLayerWithStores: () => defaultLayerWithStores,
   defaultLayer: () => defaultLayer,
@@ -11157,12 +11439,12 @@ __export(exports_prompt_assembler_service, {
   PromptAssemblerError: () => PromptAssemblerError
 });
 import { Context as Context53, Effect as Effect60, Layer as Layer54, Schema as Schema57 } from "effect";
-import { Prompt as Prompt9 } from "effect/unstable/ai";
+import { Prompt as Prompt10 } from "effect/unstable/ai";
 
 // ../runtime/src/content/artifact-store-service.ts
 var exports_artifact_store_service = {};
 __export(exports_artifact_store_service, {
-  testLayer: () => testLayer43,
+  testLayer: () => testLayer44,
   resolve: () => resolve6,
   register: () => register8,
   passthroughLayer: () => passthroughLayer2,
@@ -11206,7 +11488,7 @@ var memoryServiceLayer = Layer53.effect(Service39, Effect59.gen(function* () {
   return Service39.of({ resolve: memory.resolve });
 }));
 var memoryLayer31 = memoryServiceLayer.pipe(Layer53.provideMerge(Layer53.effect(Memory2, makeMemory)));
-var testLayer43 = (implementation) => Layer53.succeed(Service39, Service39.of(implementation));
+var testLayer44 = (implementation) => Layer53.succeed(Service39, Service39.of(implementation));
 var resolve6 = Effect59.fn("ArtifactStore.resolve.call")(function* (part) {
   const service = yield* Service39;
   return yield* service.resolve(part);
@@ -11230,19 +11512,19 @@ var contentToPromptPart = (part) => {
   const options = part.provider_options;
   switch (part.type) {
     case "text":
-      return Prompt9.makePart("text", { text: part.text, ...options === undefined ? {} : { options } });
+      return Prompt10.makePart("text", { text: part.text, ...options === undefined ? {} : { options } });
     case "structured":
-      return Prompt9.makePart("text", {
+      return Prompt10.makePart("text", {
         text: stringifyJson(part.value),
         ...options === undefined ? {} : { options }
       });
     case "tool-call":
-      return Prompt9.makePart("text", {
+      return Prompt10.makePart("text", {
         text: stringifyJson(part.call),
         ...options === undefined ? {} : { options }
       });
     case "tool-result":
-      return Prompt9.makePart("text", {
+      return Prompt10.makePart("text", {
         text: stringifyJson(part.result),
         ...options === undefined ? {} : { options }
       });
@@ -11252,7 +11534,7 @@ var toAssemblerError = (error) => new PromptAssemblerError({
   message: error.reason !== undefined ? `${error._tag}: ${error.reason}` : error.message !== undefined ? `${error._tag}: ${error.message}` : error._tag
 });
 var resolveBlobPart = (blobs, part) => blobs.resolve(part).pipe(Effect60.map((resolved) => [
-  Prompt9.makePart("file", {
+  Prompt10.makePart("file", {
     mediaType: resolved.mediaType,
     data: resolved._tag === "Bytes" ? resolved.bytes : resolved.url,
     ...resolved.fileName === undefined ? {} : { fileName: resolved.fileName },
@@ -11293,9 +11575,9 @@ var defaultSystem = (agent, tools) => [`Agent: ${agent.name}`, agent.instruction
 `);
 var defaultPrompt = (blobs, artifacts, input) => Effect60.forEach(input, (part) => resolveContentPart(blobs, artifacts, part), { concurrency: 1 }).pipe(Effect60.map((parts) => {
   const flat = parts.flat();
-  return Prompt9.fromMessages([
-    Prompt9.makeMessage("user", {
-      content: flat.length === 0 ? [Prompt9.makePart("text", { text: "" })] : flat
+  return Prompt10.fromMessages([
+    Prompt10.makeMessage("user", {
+      content: flat.length === 0 ? [Prompt10.makePart("text", { text: "" })] : flat
     })
   ]);
 }));
@@ -11309,7 +11591,7 @@ var defaultLayerWithStores = Layer54.effect(Service40, Effect60.gen(function* ()
 }));
 var defaultLayer = defaultLayerWithStores.pipe(Layer54.provide(Layer54.mergeAll(passthroughLayer, passthroughLayer2)));
 var layer38 = (implementation) => Layer54.succeed(Service40, Service40.of(implementation));
-var testLayer44 = (implementation) => Layer54.succeed(Service40, Service40.of(implementation));
+var testLayer45 = (implementation) => Layer54.succeed(Service40, Service40.of(implementation));
 var assemble = Effect60.fn("PromptAssembler.assemble.call")(function* (input) {
   const service = yield* Service40;
   return yield* service.assemble(input);
@@ -11552,7 +11834,7 @@ var layer40 = (config) => Layer56.mergeAll(Layer56.succeed(exports_permissions.P
 
 // ../runtime/src/agent/relay-steering.ts
 import { Clock as Clock7, Effect as Effect63, Layer as Layer57, Schema as Schema59 } from "effect";
-import { Prompt as Prompt10 } from "effect/unstable/ai";
+import { Prompt as Prompt11 } from "effect/unstable/ai";
 var jsonValue4 = (value) => Schema59.decodeUnknownSync(exports_shared_schema.JsonValue)(value);
 var stringifyJson2 = (value) => JSON.stringify(jsonValue4(value));
 var createdAtForSequence2 = (config, sequence) => config.startedAt + sequence - config.eventSequence;
@@ -11571,22 +11853,22 @@ var purePromptPart = (part) => {
 };
 var contentToPromptPart2 = (part) => {
   const pure = purePromptPart(part);
-  return pure === undefined ? Prompt10.makePart("text", { text: stringifyJson2(part) }) : contentToPromptPart(pure);
+  return pure === undefined ? Prompt11.makePart("text", { text: stringifyJson2(part) }) : contentToPromptPart(pure);
 };
-var promptForContent = (content) => Prompt10.fromMessages([
-  Prompt10.makeMessage("user", {
-    content: content.length === 0 ? [Prompt10.makePart("text", { text: "" })] : content.map((part) => contentToPromptPart2(part))
+var promptForContent = (content) => Prompt11.fromMessages([
+  Prompt11.makeMessage("user", {
+    content: content.length === 0 ? [Prompt11.makePart("text", { text: "" })] : content.map((part) => contentToPromptPart2(part))
   })
 ]);
 var promptTextParts = (prompt) => prompt.content.flatMap((message) => typeof message.content === "string" ? [exports_content_schema.text(message.content)] : message.content.flatMap((part) => part.type === "text" ? [exports_content_schema.text(part.text)] : []));
 var contentFromMessage = (message) => {
   if (typeof message.prompt === "string")
     return [exports_content_schema.text(message.prompt)];
-  const prompt = Prompt10.make(message.prompt);
+  const prompt = Prompt11.make(message.prompt);
   const textParts = promptTextParts(prompt);
   if (textParts.length > 0)
     return textParts;
-  return [exports_content_schema.text(stringifyJson2(Schema59.encodeSync(Prompt10.Prompt)(prompt)))];
+  return [exports_content_schema.text(stringifyJson2(Schema59.encodeSync(Prompt11.Prompt)(prompt)))];
 };
 var steeringReceivedEvent = (config, kind, drain2, messages, sequence) => ({
   id: exports_ids_schema.EventId.make(`event:${drain2.drainId}:received`),
@@ -11961,10 +12243,13 @@ var toolFromDefinition = (definition) => dynamicTool(definition.name, {
   ...definition.metadata === undefined ? {} : { metadata: definition.metadata },
   run: () => Effect67.die("model-facing toolkit is not executed")
 }).tool;
-var toolkitFromRegistered = (registered) => Toolkit5.make(...registered.map(toolFromRegistered));
-var handlersForToolExecutor = (registered) => Object.fromEntries(registered.map((tool2) => [tool2.name, () => Effect67.die(`Relay ToolExecutor must execute ${tool2.name}`)]));
+var toolkitFromRegistered = (registered) => Toolkit7.make(...registered.map(toolFromRegistered));
+var handlersForToolExecutor = (registered) => Object.fromEntries(registered.map((tool2) => [
+  tool2.definition.name,
+  () => Effect67.die(`Relay ToolExecutor must execute ${tool2.definition.name}`)
+]));
 var persistTranscript = (chats, input, transcript) => Effect67.gen(function* () {
-  const chat = yield* Chat2.fromPrompt(transcript);
+  const chat = yield* Chat3.fromPrompt(transcript);
   const exportData = yield* chat.export.pipe(Effect67.mapError((error) => loopError(error, input.eventSequence + 1)));
   yield* chats.save({ executionId: input.executionId, exportData, updatedAt: input.completedAt }).pipe(Effect67.mapError((error) => loopError(error, input.eventSequence + 1)));
 });
@@ -11976,7 +12261,7 @@ var restoreHistory = Effect67.fn("AgentLoop.restoreHistory")(function* (chats, i
       next_event_sequence: input.eventSequence + 1
     }));
   }
-  const chat = yield* Chat2.fromExport(record2.exportData).pipe(Effect67.mapError((error) => loopError(error, input.eventSequence + 1)));
+  const chat = yield* Chat3.fromExport(record2.exportData).pipe(Effect67.mapError((error) => loopError(error, input.eventSequence + 1)));
   return yield* Ref18.get(chat.history);
 });
 var saveContextEpoch = Effect67.fn("AgentLoop.saveContextEpoch")(function* (epochs, input, epoch) {
@@ -12040,9 +12325,9 @@ var terminalMemoryTranscript = (prompt, text3) => {
     return;
   if (promptHasAssistantText(prompt, text3))
     return prompt;
-  return Prompt11.fromMessages([
+  return Prompt12.fromMessages([
     ...prompt.content,
-    Prompt11.makeMessage("assistant", { content: [Prompt11.makePart("text", { text: text3 })] })
+    Prompt12.makeMessage("assistant", { content: [Prompt12.makePart("text", { text: text3 })] })
   ]);
 };
 var recallOnlyMemory = (memory) => exports_memory.Memory.of({
@@ -12089,7 +12374,7 @@ var layer44 = Layer60.effect(Service41, Effect67.gen(function* () {
   const permissionRules = yield* Effect67.serviceOption(exports_permission_rule_repository.Service);
   const steeringRepository = yield* Effect67.serviceOption(exports_steering_repository.Service);
   const waits = yield* Effect67.serviceOption(Service25);
-  const tokenizer = yield* Effect67.serviceOption(Tokenizer3.Tokenizer);
+  const tokenizer = yield* Effect67.serviceOption(Tokenizer4.Tokenizer);
   return Service41.of({
     run: Effect67.fn("AgentLoop.run")(function* (input) {
       const existing = yield* existingOutput(eventLog, input);
@@ -12106,7 +12391,7 @@ var layer44 = Layer60.effect(Service41, Effect67.gen(function* () {
       yield* appendEvent(eventLog, inputPreparedEvent(input, definitions2), input.eventSequence + 1);
       const toolOutputMaxBytes = yield* effectiveToolOutputMaxBytes(input);
       const compactionOptions = yield* effectiveCompactionOptions(input);
-      const runTokenizer = yield* Effect67.serviceOption(Tokenizer3.Tokenizer);
+      const runTokenizer = yield* Effect67.serviceOption(Tokenizer4.Tokenizer);
       const activeTokenizer = Option22.isSome(runTokenizer) ? runTokenizer : tokenizer;
       const allocator = yield* make12(input.eventSequence + 1);
       const toolkit = toolkitFromRegistered(registered);
@@ -12286,13 +12571,13 @@ var layer44 = Layer60.effect(Service41, Effect67.gen(function* () {
         }
       });
       const runFold = Effect67.gen(function* () {
-        const base = yield* LanguageModel5.LanguageModel;
+        const base = yield* LanguageModel6.LanguageModel;
         const sessionStore = input.sessionId !== undefined && Option22.isSome(sessionRepository) ? yield* make8(input.sessionId, input.sessionEntryScope ?? input.executionId).pipe(Effect67.provideService(exports_session_repository.Service, sessionRepository.value)) : undefined;
-        const folded = exports_agent.stream(agent, batonOptions).pipe(Stream7.runFoldEffect(() => ({ text: "", transcript: undefined, turn: undefined, tokensUsed: seededTokens }), foldEvent), Effect67.provideService(LanguageModel5.LanguageModel, base), Effect67.provideService(exports_model_resilience.ModelResilience, policy), Effect67.provide(executorLayer), Effect67.provide(handlerLayer), Effect67.provide(layer39), Effect67.provide(exports_model_middleware.identityLayer), Effect67.provide(instructionsLayer), Effect67.provide(permissionsLayer), Effect67.provide(steeringLayer));
+        const folded = exports_agent.stream(agent, batonOptions).pipe(Stream8.runFoldEffect(() => ({ text: "", transcript: undefined, turn: undefined, tokensUsed: seededTokens }), foldEvent), Effect67.provideService(LanguageModel6.LanguageModel, base), Effect67.provideService(exports_model_resilience.ModelResilience, policy), Effect67.provide(executorLayer), Effect67.provide(handlerLayer), Effect67.provide(layer39), Effect67.provide(exports_model_middleware.identityLayer), Effect67.provide(instructionsLayer), Effect67.provide(permissionsLayer), Effect67.provide(steeringLayer));
         const withToolOutput = toolOutputStore === undefined ? folded : folded.pipe(Effect67.provideService(exports_tool_output.ToolOutputStore, toolOutputStore));
         const withCompaction = compactionService === undefined ? withToolOutput : withToolOutput.pipe(Effect67.provideService(exports_compaction.Compaction, compactionService));
         const withSession = sessionStore === undefined ? withCompaction : withCompaction.pipe(Effect67.provideService(exports_session.SessionStore, sessionStore));
-        const withTokenizer = Option22.isNone(activeTokenizer) ? withSession : withSession.pipe(Effect67.provideService(Tokenizer3.Tokenizer, activeTokenizer.value));
+        const withTokenizer = Option22.isNone(activeTokenizer) ? withSession : withSession.pipe(Effect67.provideService(Tokenizer4.Tokenizer, activeTokenizer.value));
         return yield* memory !== undefined && Option22.isSome(durableMemory) ? withTokenizer.pipe(Effect67.provideService(exports_memory.Memory, recallOnlyMemory(durableMemory.value))) : withTokenizer;
       });
       const finalState = yield* languageModels.provideForAgent(input.agent, runFold).pipe(Effect67.catch((error) => allocator.current.pipe(Effect67.flatMap((current2) => Effect67.fail(mapBoundaryError(error, current2))))));
@@ -12304,7 +12589,7 @@ var layer44 = Layer60.effect(Service41, Effect67.gen(function* () {
         }
       }
       const schemaRef = input.agent.output_schema_ref;
-      const structuredOutput = schemaRef === undefined || finalState.transcript === undefined ? undefined : yield* Chat2.fromPrompt(finalState.transcript).pipe(Effect67.flatMap((chat) => runStructuredTurn(languageModels, schemas, chat, input, schemaRef, completedSequence + 1)));
+      const structuredOutput = schemaRef === undefined || finalState.transcript === undefined ? undefined : yield* Chat3.fromPrompt(finalState.transcript).pipe(Effect67.flatMap((chat) => runStructuredTurn(languageModels, schemas, chat, input, schemaRef, completedSequence + 1)));
       const structuredPart = structuredOutput === undefined || schemaRef === undefined ? [] : [{ type: "structured", value: structuredOutput, schema_ref: schemaRef }];
       yield* appendEvent(eventLog, outputCompletedEvent(input, [...completedContent(finalState.text), ...structuredPart], finalState.text, completedSequence, structuredOutput), completedSequence + 1);
       return {
@@ -12317,7 +12602,7 @@ var layer44 = Layer60.effect(Service41, Effect67.gen(function* () {
     })
   });
 }));
-var testLayer45 = (implementation) => Layer60.succeed(Service41, Service41.of(implementation));
+var testLayer46 = (implementation) => Layer60.succeed(Service41, Service41.of(implementation));
 var run3 = Effect67.fn("AgentLoop.run.call")(function* (input) {
   const service = yield* Service41;
   return yield* service.run(input);
@@ -12456,7 +12741,7 @@ var notify = Effect68.fn("ParentNotifier.notify.call")(function* (input) {
 // ../runtime/src/skill/skill-registry-service.ts
 var exports_skill_registry_service = {};
 __export(exports_skill_registry_service, {
-  testLayer: () => testLayer46,
+  testLayer: () => testLayer47,
   sourceLayerForExecution: () => sourceLayerForExecution,
   sourceForExecution: () => sourceForExecution,
   register: () => register9,
@@ -12589,7 +12874,7 @@ var layer45 = Layer62.effect(Service43, Effect69.gen(function* () {
     })
   });
 }));
-var testLayer46 = (implementation) => Layer62.succeed(Service43, Service43.of(implementation));
+var testLayer47 = (implementation) => Layer62.succeed(Service43, Service43.of(implementation));
 var register9 = Effect69.fn("SkillRegistry.register.call")(function* (input) {
   const service = yield* Service43;
   return yield* service.register(input);
@@ -12637,7 +12922,7 @@ var sourceLayerForExecution = (executionId) => Layer62.effect(exports_skill_sour
 // ../runtime/src/execution/execution-service.ts
 var exports_execution_service = {};
 __export(exports_execution_service, {
-  testLayer: () => testLayer47,
+  testLayer: () => testLayer48,
   stream: () => stream3,
   spawnChildRun: () => spawnChildRun,
   send: () => send,
@@ -12649,7 +12934,7 @@ __export(exports_execution_service, {
   Service: () => Service44,
   ExecutionServiceError: () => ExecutionServiceError
 });
-import { Clock as Clock9, Context as Context57, Effect as Effect70, Layer as Layer63, Option as Option24, Schema as Schema64, Stream as Stream8 } from "effect";
+import { Clock as Clock9, Context as Context57, Effect as Effect70, Layer as Layer63, Option as Option24, Schema as Schema64, Stream as Stream9 } from "effect";
 import { ShardingConfig } from "effect/unstable/cluster";
 class ExecutionServiceError extends Schema64.TaggedErrorClass()("ExecutionServiceError", {
   message: Schema64.String,
@@ -12941,11 +13226,11 @@ var layer46 = Layer63.effect(Service44, Effect70.gen(function* () {
         ...override === undefined ? {} : { override }
       }).pipe(Effect70.mapError(mapChildRunError2));
     }),
-    stream: (input) => eventLog.stream(input).pipe(Stream8.take(input.limit ?? 1000), Stream8.mapError((error) => mapEventLogError4(error)))
+    stream: (input) => eventLog.stream(input).pipe(Stream9.take(input.limit ?? 1000), Stream9.mapError((error) => mapEventLogError4(error)))
   });
 }));
 var memoryLayer32 = layer46.pipe(Layer63.provide(layer32), Layer63.provide(exports_execution_repository.memoryLayer), Layer63.provide(exports_session_repository.memoryLayer), Layer63.provide(exports_child_execution_repository.memoryLayer), Layer63.provide(memoryLayer21), Layer63.provide(ShardingConfig.layer({ runnerAddress: Option24.none() })));
-var testLayer47 = (implementation) => Layer63.succeed(Service44, Service44.of(implementation));
+var testLayer48 = (implementation) => Layer63.succeed(Service44, Service44.of(implementation));
 var accept = Effect70.fn("ExecutionService.accept.call")(function* (input) {
   const service = yield* Service44;
   return yield* service.accept(input);
@@ -12966,7 +13251,7 @@ var spawnChildRun = Effect70.fn("ExecutionService.spawnChildRun.call")(function*
   const service = yield* Service44;
   return yield* service.spawnChildRun(input);
 });
-var stream3 = (input) => Stream8.unwrap(Service44.pipe(Effect70.map((service) => service.stream(input))));
+var stream3 = (input) => Stream9.unwrap(Service44.pipe(Effect70.map((service) => service.stream(input))));
 
 // ../runtime/src/workspace/workspace-planner-service.ts
 import { Context as Context59, Effect as Effect72, HashSet as HashSet7, Layer as Layer65, Option as Option25, Schema as Schema66 } from "effect";
@@ -14016,7 +14301,7 @@ var client = entity.client;
 // ../runtime/src/envelope/envelope-service.ts
 var exports_envelope_service = {};
 __export(exports_envelope_service, {
-  testLayer: () => testLayer48,
+  testLayer: () => testLayer49,
   send: () => send2,
   memoryLayer: () => memoryLayer33,
   layer: () => layer50,
@@ -14080,16 +14365,16 @@ var waitIdFor = (input) => {
     return;
   return input.waitId ?? exports_ids_schema.WaitId.make(`wait:${input.envelopeId}`);
 };
-var readyFor = (input, route) => {
-  if (route.kind === "local-agent")
+var readyFor = (input, route2) => {
+  if (route2.kind === "local-agent")
     return;
   return {
     id: exports_ids_schema.EnvelopeReadyId.make(`envelope-ready:${input.envelopeId}`),
-    routeType: route.kind,
-    routeKey: route.route_key,
+    routeType: route2.kind,
+    routeKey: route2.route_key,
     availableAt: input.createdAt,
     ...input.input.correlation_key === undefined ? {} : { idempotencyKey: input.input.correlation_key },
-    ...route.metadata === undefined ? {} : { metadata: route.metadata }
+    ...route2.metadata === undefined ? {} : { metadata: route2.metadata }
   };
 };
 var acceptedEvent2 = (input) => ({
@@ -14106,7 +14391,7 @@ var acceptedEvent2 = (input) => ({
   },
   created_at: input.createdAt
 });
-var routedEvent = (input, route) => ({
+var routedEvent = (input, route2) => ({
   id: exports_ids_schema.EventId.make(`event:${input.envelopeId}:routed`),
   execution_id: input.executionId,
   type: "envelope.routed",
@@ -14114,8 +14399,8 @@ var routedEvent = (input, route) => ({
   cursor: `${input.executionId}:envelope:${input.envelopeId}:routed`,
   data: {
     envelope_id: input.envelopeId,
-    route_kind: route.kind,
-    route_key: route.route_key
+    route_kind: route2.kind,
+    route_key: route2.route_key
   },
   created_at: input.createdAt + 1
 });
@@ -14145,13 +14430,13 @@ var layer50 = Layer67.effect(Service47, Effect74.gen(function* () {
         "relay.address.from": input.input.from,
         "relay.address.to": input.input.to
       });
-      const route = yield* addressBook.resolve(input.input.to).pipe(Effect74.mapError(mapAddressBookError2));
+      const route2 = yield* addressBook.resolve(input.input.to).pipe(Effect74.mapError(mapAddressBookError2));
       yield* Effect74.annotateCurrentSpan({
-        "relay.route.kind": route.kind,
-        "relay.route.key": route.route_key
+        "relay.route.kind": route2.kind,
+        "relay.route.key": route2.route_key
       });
       const envelope = envelopeFrom(input);
-      const ready = readyFor(input, route);
+      const ready = readyFor(input, route2);
       const waitId = waitIdFor(input);
       const accepted2 = yield* repository.acceptEnvelope({
         envelope,
@@ -14159,17 +14444,17 @@ var layer50 = Layer67.effect(Service47, Effect74.gen(function* () {
         ...ready === undefined ? {} : { ready }
       }).pipe(Effect74.mapError(mapRepositoryError12));
       yield* eventLog.append(acceptedEvent2(input)).pipe(Effect74.mapError(mapEventLogError7));
-      yield* eventLog.append(routedEvent(input, route)).pipe(Effect74.mapError(mapEventLogError7));
+      yield* eventLog.append(routedEvent(input, route2)).pipe(Effect74.mapError(mapEventLogError7));
       if (ready !== undefined) {
         yield* eventLog.append(readyEvent(input, ready)).pipe(Effect74.mapError(mapEventLogError7));
       }
-      yield* recordEnvelopeSent(route.kind);
+      yield* recordEnvelopeSent(route2.kind);
       return accepted2;
     })
   });
 }));
 var memoryLayer33 = (routes = []) => layer50.pipe(Layer67.provide(memoryLayer20(routes)), Layer67.provide(exports_envelope_repository.memoryLayer), Layer67.provide(memoryLayer21));
-var testLayer48 = (implementation) => Layer67.succeed(Service47, Service47.of(implementation));
+var testLayer49 = (implementation) => Layer67.succeed(Service47, Service47.of(implementation));
 var send2 = Effect74.fn("EnvelopeService.send.call")(function* (input) {
   const service = yield* Service47;
   return yield* service.send(input);
@@ -14180,7 +14465,7 @@ __export(exports_runner_runtime_service, {
   testLayerWithServices: () => testLayerWithServices,
   testLayerWithLanguageModelService: () => testLayerWithLanguageModelService,
   testLayerWithDatabaseCheck: () => testLayerWithDatabaseCheck,
-  testLayer: () => testLayer50,
+  testLayer: () => testLayer51,
   testClientLayerWithDatabaseCheck: () => testClientLayerWithDatabaseCheck,
   testClientLayer: () => testClientLayer,
   shardingConfigFromEnv: () => shardingConfigFromEnv,
@@ -14203,7 +14488,7 @@ __export(exports_runner_runtime_service, {
   DatabaseMode: () => DatabaseMode,
   ClusterConfigMismatch: () => ClusterConfigMismatch
 });
-import { Config as Config5, Context as Context62, Crypto as Crypto4, Duration as Duration5, Effect as Effect77, Layer as Layer69, Option as Option27, Schema as Schema71, Stream as Stream9 } from "effect";
+import { Config as Config5, Context as Context62, Crypto as Crypto4, Duration as Duration5, Effect as Effect77, Layer as Layer69, Option as Option27, Schema as Schema71, Stream as Stream10 } from "effect";
 import {
   ClusterWorkflowEngine,
   HttpRunner,
@@ -14221,13 +14506,13 @@ import { FetchHttpClient } from "effect/unstable/http";
 import { SqlClient as SqlClient22 } from "effect/unstable/sql/SqlClient";
 import { RpcSerialization } from "effect/unstable/rpc";
 import { WorkflowEngine } from "effect/unstable/workflow";
-import { LanguageModel as LanguageModel6 } from "effect/unstable/ai";
+import { LanguageModel as LanguageModel7 } from "effect/unstable/ai";
 
 // ../runtime/src/schedule/scheduler-service.ts
 var exports_scheduler_service = {};
 __export(exports_scheduler_service, {
   workerIdConfig: () => workerIdConfig,
-  testLayer: () => testLayer49,
+  testLayer: () => testLayer50,
   startIdempotencyKey: () => startIdempotencyKey,
   runOnce: () => runOnce2,
   pollIntervalMillisConfig: () => pollIntervalMillisConfig,
@@ -14284,7 +14569,7 @@ var parseCron = (cronExpr) => {
   return Result3.isFailure(parsed) ? Effect76.fail(new ScheduleCronInvalid({ cron_expr: cronExpr, message: String(parsed.failure) })) : Effect76.succeed(parsed.success);
 };
 var startIdempotencyKey = (schedule) => `schedule:${schedule.id}:${schedule.next_run_at}`;
-var errorMessage2 = (error) => {
+var errorMessage3 = (error) => {
   if (error instanceof Error)
     return error.message;
   if (typeof error === "object" && error !== null && "message" in error && typeof error.message === "string") {
@@ -14292,7 +14577,7 @@ var errorMessage2 = (error) => {
   }
   return String(error);
 };
-var toSchedulerError = (error) => new SchedulerError({ message: errorMessage2(error) });
+var toSchedulerError = (error) => new SchedulerError({ message: errorMessage3(error) });
 var dispatchMetadata = (schedule) => ({
   source: "schedule",
   schedule_id: schedule.id
@@ -14412,7 +14697,7 @@ var layer51 = Layer68.effect(Service48, Effect76.gen(function* () {
   return service;
 }));
 var memoryLayer34 = Layer68.effect(Service48, make14);
-var testLayer49 = (implementation) => Layer68.succeed(Service48, Service48.of(implementation));
+var testLayer50 = (implementation) => Layer68.succeed(Service48, Service48.of(implementation));
 var runOnce2 = Effect76.fn("SchedulerService.runOnce.call")(function* () {
   const service = yield* Service48;
   return yield* service.runOnce;
@@ -14568,7 +14853,7 @@ var agentLoopLayerWith = (toolRuntimeLayer, promptAssemblerLayer, schemaRegistry
 var runtimeServicesLayerWith = (toolRuntimeLayer, promptAssemblerLayer, schemaRegistryLayer) => Layer69.mergeAll(addressResolutionLayerWith(toolRuntimeLayer), layer45, executionServiceLayer, agentLoopLayerWith(toolRuntimeLayer, promptAssemblerLayer, schemaRegistryLayer), layer47, parentNotifierLayer).pipe(Layer69.provideMerge(layer22), Layer69.provideMerge(layerFromRepository2));
 var workflowLayerWith = (toolRuntimeLayer, promptAssemblerLayer, schemaRegistryLayer) => layer48.pipe(Layer69.provideMerge(runtimeServicesLayerWith(toolRuntimeLayer, promptAssemblerLayer, schemaRegistryLayer)));
 var workflowAndEntityLayerWith = (toolRuntimeLayer, schedulerLayer, promptAssemblerLayer, schemaRegistryLayer) => Layer69.mergeAll(layer49, schedulerLayer).pipe(Layer69.provideMerge(workflowLayerWith(toolRuntimeLayer, promptAssemblerLayer, schemaRegistryLayer)));
-var makeService = (database, checkDatabase) => Effect77.gen(function* () {
+var makeService2 = (database, checkDatabase) => Effect77.gen(function* () {
   const sharding = yield* Sharding.Sharding;
   const workflow = yield* WorkflowEngine.WorkflowEngine;
   const makeClient = yield* client;
@@ -14589,7 +14874,7 @@ var makeService = (database, checkDatabase) => Effect77.gen(function* () {
     })
   });
 });
-var checkLayer = (database, checkDatabase) => Layer69.effect(Service49, makeService(database, checkDatabase));
+var checkLayer = (database, checkDatabase) => Layer69.effect(Service49, makeService2(database, checkDatabase));
 var memoryCheckLayer = checkLayer("memory", Effect77.void);
 var detectDialect = Effect77.serviceOption(SqlClient22).pipe(Effect77.map(Option27.match({
   onNone: () => "sql",
@@ -14614,7 +14899,7 @@ var databaseHealthCheck = Effect77.gen(function* () {
 var sqlCheckLayer = Layer69.effect(Service49, Effect77.gen(function* () {
   const dialect2 = yield* detectDialect;
   const checkDatabase = yield* databaseHealthCheck;
-  return yield* makeService(dialect2, checkDatabase);
+  return yield* makeService2(dialect2, checkDatabase);
 }));
 var makeClientService = (database, checkDatabase) => Effect77.gen(function* () {
   const sharding = yield* Sharding.Sharding;
@@ -14647,9 +14932,9 @@ var sqlClientCheckLayer = Layer69.effect(Service49, Effect77.gen(function* () {
   const checkDatabase = yield* databaseHealthCheck;
   return yield* makeClientService(dialect2, checkDatabase);
 }));
-var deterministicTestModelLayer = Layer69.effect(LanguageModel6.LanguageModel, LanguageModel6.make({
+var deterministicTestModelLayer = Layer69.effect(LanguageModel7.LanguageModel, LanguageModel7.make({
   generateText: () => Effect77.succeed([{ type: "text", text: "deterministic test response" }]),
-  streamText: () => Stream9.make({ type: "text-delta", id: "text", delta: "deterministic test response" })
+  streamText: () => Stream10.make({ type: "text-delta", id: "text", delta: "deterministic test response" })
 }));
 var testLanguageModelLayer = layerFromRegistrationEffects3([
   registrationFromLayer3({
@@ -14735,7 +15020,7 @@ var testLayerWithServices = (options) => layerWith({
   schedulerLayer: memoryLayer34
 }).pipe(Layer69.provideMerge(testCryptoLayer));
 var testLayerWithLanguageModelService = (languageModelLayer) => testLayerWithServices({ languageModelLayer, toolRuntimeLayer: layer23() });
-var testLayer50 = testLayerWithServices({
+var testLayer51 = testLayerWithServices({
   languageModelLayer: testLanguageModelLayer,
   toolRuntimeLayer: layer23()
 });
@@ -15020,7 +15305,7 @@ var guard = Effect78.fn("ActivityVersionRegistry.guard")(function* (input) {
   }));
 });
 // src/client.ts
-import { Clock as Clock11, Context as Context63, Effect as Effect79, Layer as Layer70, Option as Option28, Schema as Schema73, SchemaGetter, SchemaIssue, Stream as Stream10 } from "effect";
+import { Clock as Clock11, Context as Context63, Effect as Effect79, Layer as Layer70, Option as Option28, Schema as Schema73, SchemaGetter, SchemaIssue, Stream as Stream11 } from "effect";
 import { EntityId, ShardId, Sharding as Sharding2, ShardingConfig as ShardingConfig3 } from "effect/unstable/cluster";
 
 class ClientError extends Schema73.TaggedErrorClass()("ClientError", {
@@ -15030,7 +15315,7 @@ class ClientError extends Schema73.TaggedErrorClass()("ClientError", {
 
 class Service50 extends Context63.Service()("@relayfx/sdk/Client") {
 }
-var errorMessage3 = (error) => {
+var errorMessage4 = (error) => {
   if (error instanceof Error)
     return error.message;
   if (typeof error === "object" && error !== null && "message" in error && typeof error.message === "string") {
@@ -15041,7 +15326,7 @@ var errorMessage3 = (error) => {
   }
   return String(error);
 };
-var toClientError = (error) => new ClientError({ message: errorMessage3(error) });
+var toClientError = (error) => new ClientError({ message: errorMessage4(error) });
 var malformedCursor = (wire) => new SchemaIssue.InvalidValue(Option28.some(wire), { message: "Malformed pagination cursor" });
 var decodeCursorFields = (wire) => Effect79.gen(function* () {
   const decoded = yield* Effect79.try({
@@ -15138,6 +15423,32 @@ var startExecutionByAgentDefinitionPayload = (input, definition) => ({
   ...input.wait_id === undefined ? {} : { wait_id: input.wait_id },
   metadata: metadataWithIdempotencyKey(input.metadata, input.idempotency_key)
 });
+var isRegisterBatonAgentInput = (input) => ("agent" in input);
+var toolRefsFromBatonAgent = (agent) => {
+  const tools = agent.toolkit.tools;
+  return Object.values(tools).map((tool2) => ({ name: tool2.name }));
+};
+var registerAgentPayload = (input) => {
+  if (!isRegisterBatonAgentInput(input))
+    return exports_agent_schema.define(input);
+  return exports_agent_schema.define({
+    id: input.id,
+    name: Schema73.decodeUnknownSync(exports_shared_schema.NonEmptyString)(input.agent.name),
+    ...input.agent.instructions === undefined ? {} : { instructions: input.agent.instructions },
+    model: input.model,
+    tools: toolRefsFromBatonAgent(input.agent),
+    permissions: input.permissions ?? [],
+    ...input.skill_definition_ids === undefined ? {} : { skill_definition_ids: input.skill_definition_ids },
+    ...input.permission_rules === undefined ? {} : { permission_rules: input.permission_rules },
+    ...input.max_tool_turns === undefined ? {} : { max_tool_turns: input.max_tool_turns },
+    ...input.max_wait_turns === undefined ? {} : { max_wait_turns: input.max_wait_turns },
+    ...input.token_budget === undefined ? {} : { token_budget: input.token_budget },
+    ...input.child_run_presets === undefined ? {} : { child_run_presets: input.child_run_presets },
+    ...input.handoff_targets === undefined ? {} : { handoff_targets: input.handoff_targets },
+    ...input.output_schema_ref === undefined ? {} : { output_schema_ref: input.output_schema_ref },
+    ...input.metadata === undefined ? {} : { metadata: input.metadata }
+  });
+};
 var agentDefinitionNotFound = (id2) => new ClientError({ message: `Agent not found: ${id2}` });
 var wakeMetadata = (input) => ({
   ...input.metadata,
@@ -15275,7 +15586,7 @@ var layerFromRuntime = Layer70.effect(Service50, Effect79.gen(function* () {
   const skillRegistry = yield* exports_skill_registry_service.Service;
   return Service50.of({
     registerAgent: Effect79.fn("Client.runtime.registerAgent")(function* (input) {
-      const payload = exports_agent_schema.define(input);
+      const payload = registerAgentPayload(input);
       const registered = yield* agentRegistry.register(payload).pipe(Effect79.mapError(toClientError));
       if (input.address !== undefined) {
         yield* addressBook.register(input.address, { kind: "local-agent", route_key: payload.id }).pipe(Effect79.mapError(toClientError));
@@ -15448,7 +15759,7 @@ var layerFromRuntime = Layer70.effect(Service50, Effect79.gen(function* () {
       executionId: input.execution_id,
       ...input.after_cursor === undefined ? {} : { afterCursor: input.after_cursor },
       ...input.limit === undefined ? {} : { limit: input.limit }
-    }).pipe(Stream10.mapError(toClientError)),
+    }).pipe(Stream11.mapError(toClientError)),
     wake: Effect79.fn("Client.runtime.wake")(function* (input) {
       return yield* wakeRuntime(waits, eventLog, executionRepository, makeExecutionClient, input);
     }),
@@ -15557,7 +15868,7 @@ var layerFromRuntime = Layer70.effect(Service50, Effect79.gen(function* () {
     })
   });
 }));
-var testLayer51 = (implementation) => Layer70.succeed(Service50, Service50.of(implementation));
+var testLayer52 = (implementation) => Layer70.succeed(Service50, Service50.of(implementation));
 var registerAgentDefinition = Effect79.fn("Client.registerAgentDefinition.call")(function* (input) {
   const service = yield* Service50;
   return yield* service.registerAgentDefinition(input);
@@ -15658,7 +15969,7 @@ var send3 = Effect79.fn("Client.send.call")(function* (input) {
   const service = yield* Service50;
   return yield* service.send(input);
 });
-var streamExecution = (input) => Stream10.unwrap(Service50.pipe(Effect79.map((service) => service.streamExecution(input))));
+var streamExecution = (input) => Stream11.unwrap(Service50.pipe(Effect79.map((service) => service.streamExecution(input))));
 var wake2 = Effect79.fn("Client.wake.call")(function* (input) {
   const service = yield* Service50;
   return yield* service.wake(input);
@@ -15728,7 +16039,7 @@ var layer53 = Layer71.effect(Service51, Effect80.gen(function* () {
     })
   });
 }));
-var testLayer52 = (implementation) => Layer71.succeed(Service51, Service51.of(implementation));
+var testLayer53 = (implementation) => Layer71.succeed(Service51, Service51.of(implementation));
 var claim = Effect80.fn("AdapterOutbox.claim.call")(function* (input) {
   const service = yield* Service51;
   return yield* service.claim(input);
@@ -15748,7 +16059,7 @@ var submitInbound = Effect80.fn("AdapterOutbox.submitInbound.call")(function* (i
 // src/database.ts
 var exports_database = {};
 __export(exports_database, {
-  testLayer: () => testLayer53,
+  testLayer: () => testLayer54,
   pgTypeParsers: () => pgTypeParsers2,
   layerFromPgClient: () => layerFromPgClient2,
   dialect: () => dialect2,
@@ -15758,7 +16069,7 @@ __export(exports_database, {
 });
 var Service52 = exports_database_service.Service;
 var layerFromPgClient2 = exports_database_service.layerFromPgClient;
-var testLayer53 = exports_database_service.testLayer;
+var testLayer54 = exports_database_service.testLayer;
 var check3 = exports_database_service.check;
 var pgTypeParsers2 = exports_database_service.pgTypeParsers;
 var Dialect2 = exports_database_service.Dialect;
@@ -16102,7 +16413,7 @@ __export(exports_language_model_registration, {
   anthropic: () => anthropic
 });
 
-// ../../node_modules/.bun/@batonfx+providers@0.2.0/node_modules/@batonfx/providers/src/anthropic.ts
+// ../../node_modules/.bun/@batonfx+providers@0.3.0/node_modules/@batonfx/providers/src/anthropic.ts
 import { AnthropicClient, AnthropicLanguageModel } from "@effect/ai-anthropic";
 import { Layer as Layer72 } from "effect";
 import { FetchHttpClient as FetchHttpClient2 } from "effect/unstable/http";
@@ -16118,13 +16429,13 @@ var anthropic = (input) => exports_model_registry.registrationFromLayer({
 });
 var anthropicClientLayerConfig = AnthropicClient.layerConfig;
 var withAnthropic = (options) => exports_model_registry.layerFromRegistrationEffects([anthropic(options)]).pipe(Layer72.provide(AnthropicClient.layerConfig({ ...options.clientConfig, apiKey: options.apiKey })), Layer72.provide(FetchHttpClient2.layer));
-// ../../node_modules/.bun/@batonfx+providers@0.2.0/node_modules/@batonfx/providers/src/deterministic.ts
+// ../../node_modules/.bun/@batonfx+providers@0.3.0/node_modules/@batonfx/providers/src/deterministic.ts
 import { OpenAiClient as OpenAiClient3 } from "@effect/ai-openai";
-import { Effect as Effect81, Layer as Layer74, Option as Option29, Stream as Stream11 } from "effect";
-import { LanguageModel as LanguageModel7, Response as Response6 } from "effect/unstable/ai";
+import { Effect as Effect81, Layer as Layer74, Option as Option29, Stream as Stream12 } from "effect";
+import { LanguageModel as LanguageModel8, Response as Response7 } from "effect/unstable/ai";
 import { FetchHttpClient as FetchHttpClient4 } from "effect/unstable/http";
 
-// ../../node_modules/.bun/@batonfx+providers@0.2.0/node_modules/@batonfx/providers/src/openai.ts
+// ../../node_modules/.bun/@batonfx+providers@0.3.0/node_modules/@batonfx/providers/src/openai.ts
 import { OpenAiClient as OpenAiClient2, OpenAiLanguageModel } from "@effect/ai-openai";
 import { Layer as Layer73 } from "effect";
 import { FetchHttpClient as FetchHttpClient3 } from "effect/unstable/http";
@@ -16141,10 +16452,10 @@ var openAi = (input) => exports_model_registry.registrationFromLayer({
 var openAiClientLayerConfig2 = OpenAiClient2.layerConfig;
 var withOpenAi = (options) => exports_model_registry.layerFromRegistrationEffects([openAi(options)]).pipe(Layer73.provide(OpenAiClient2.layerConfig({ ...options.clientConfig, apiKey: options.apiKey })), Layer73.provide(FetchHttpClient3.layer));
 
-// ../../node_modules/.bun/@batonfx+providers@0.2.0/node_modules/@batonfx/providers/src/deterministic.ts
-var deterministicModelLayer = Layer74.effect(LanguageModel7.LanguageModel, LanguageModel7.make({
+// ../../node_modules/.bun/@batonfx+providers@0.3.0/node_modules/@batonfx/providers/src/deterministic.ts
+var deterministicModelLayer = Layer74.effect(LanguageModel8.LanguageModel, LanguageModel8.make({
   generateText: () => Effect81.succeed([{ type: "text", text: "deterministic response" }]),
-  streamText: () => Stream11.make(Response6.makePart("text-delta", { id: "text", delta: "deterministic response" }))
+  streamText: () => Stream12.make(Response7.makePart("text-delta", { id: "text", delta: "deterministic response" }))
 }));
 var deterministicModel = (input = {}) => exports_model_registry.registrationFromLayer({
   provider: input.provider ?? "deterministic",
@@ -16165,7 +16476,7 @@ var withOpenAiOrDeterministic = (options) => Layer74.unwrap(Effect81.gen(functio
     ...Option29.isSome(openAiRegistration) ? [openAiRegistration.value] : []
   ]);
 }));
-// ../../node_modules/.bun/@batonfx+providers@0.2.0/node_modules/@batonfx/providers/src/openai-compat.ts
+// ../../node_modules/.bun/@batonfx+providers@0.3.0/node_modules/@batonfx/providers/src/openai-compat.ts
 import { OpenAiClient as OpenAiClient4, OpenAiLanguageModel as OpenAiLanguageModel2 } from "@effect/ai-openai-compat";
 import { Config as Config8, Layer as Layer75 } from "effect";
 import { FetchHttpClient as FetchHttpClient5 } from "effect/unstable/http";
@@ -16186,7 +16497,7 @@ var clientLayerConfig = (options) => OpenAiClient4.layerConfig({
   ...options.baseUrl === undefined ? {} : { apiUrl: Config8.succeed(options.baseUrl) }
 });
 var withOpenAiCompatible = (options) => exports_model_registry.layerFromRegistrationEffects([openAiCompatible(options)]).pipe(Layer75.provide(clientLayerConfig(options)), Layer75.provide(FetchHttpClient5.layer));
-// ../../node_modules/.bun/@batonfx+providers@0.2.0/node_modules/@batonfx/providers/src/openrouter.ts
+// ../../node_modules/.bun/@batonfx+providers@0.3.0/node_modules/@batonfx/providers/src/openrouter.ts
 import { OpenRouterClient, OpenRouterLanguageModel } from "@effect/ai-openrouter";
 import { Layer as Layer76 } from "effect";
 import { FetchHttpClient as FetchHttpClient6 } from "effect/unstable/http";