@relayfx/sdk 0.2.6 → 0.2.7

package/dist/{index-e4zcj5d4.js → index-km48etr2.js}

@@ -11457,7 +11457,7 @@ var resolveLocalAgent = Effect37.fn("AddressResolution.resolveLocalAgent.call")(
   return yield* service.resolveLocalAgent(addressId);
 });
 
-// ../../node_modules/.bun/@batonfx+core@0.4.0/node_modules/@batonfx/core/src/agent-event.ts
+// ../../node_modules/.bun/@batonfx+core@0.4.2/node_modules/@batonfx/core/dist/agent-event.js
 var exports_agent_event = {};
 __export(exports_agent_event, {
   addUsage: () => addUsage,
@@ -11467,7 +11467,7 @@ __export(exports_agent_event, {
   AgentError: () => AgentError
 });
 import { Schema as Schema52 } from "effect";
-import { Response } from "effect/unstable/ai";
+import { Prompt, Response, Tool as Tool2 } from "effect/unstable/ai";
 var addUsageField = (left, right) => left === undefined && right === undefined ? undefined : (left ?? 0) + (right ?? 0);
 var addUsage = (left, right) => new Response.Usage({
   inputTokens: {
@@ -11514,40 +11514,184 @@ class AgentSuspended extends Schema52.TaggedErrorClass()("@batonfx/core/AgentSus
 }) {
 }
 
-// ../../node_modules/.bun/@batonfx+core@0.4.0/node_modules/@batonfx/core/src/approvals.ts
+// ../../node_modules/.bun/@batonfx+core@0.4.2/node_modules/@batonfx/core/dist/tool-context.js
+var exports_tool_context = {};
+__export(exports_tool_context, {
+  testLayer: () => testLayer32,
+  layerDefault: () => layerDefault,
+  ToolContext: () => ToolContext
+});
+import { Context as Context35, Effect as Effect38, Layer as Layer35 } from "effect";
+
+class ToolContext extends Context35.Service()("@batonfx/core/ToolContext") {
+}
+var layerDefault = Layer35.sync(ToolContext, () => ToolContext.of({
+  signal: new AbortController().signal,
+  emit: () => Effect38.void,
+  sessionId: "local"
+}));
+var testLayer32 = (implementation) => Layer35.succeed(ToolContext, ToolContext.of(implementation));
+
+// ../../node_modules/.bun/@batonfx+core@0.4.2/node_modules/@batonfx/core/dist/tool-executor.js
+var exports_tool_executor = {};
+__export(exports_tool_executor, {
+  testLayer: () => testLayer33,
+  sandbox: () => sandbox,
+  router: () => router,
+  routeToolkit: () => routeToolkit,
+  route: () => route,
+  remote: () => remote,
+  mcp: () => mcp,
+  fromToolkit: () => fromToolkit,
+  executeToolkit: () => executeToolkit,
+  client: () => client,
+  ToolExecutor: () => ToolExecutor
+});
+import { Cause, Context as Context36, Effect as Effect39, Layer as Layer36, Option as Option10, Schedule as Schedule3, Schema as Schema53, Sink as Sink2, Stream as Stream7 } from "effect";
+import { Response as Response2, Tool as Tool3, Toolkit as Toolkit2 } from "effect/unstable/ai";
+class ToolExecutor extends Context36.Service()("@batonfx/core/ToolExecutor") {
+}
+var failureMessage = (cause) => {
+  const error5 = Cause.squash(cause);
+  return error5 instanceof Error ? `${error5.name}: ${error5.message}` : String(error5);
+};
+var failureOutcome = (message) => ({ _tag: "Failure", message });
+var resultMessage = (result) => {
+  if (typeof result === "string")
+    return result;
+  if (result instanceof Error)
+    return `${result.name}: ${result.message}`;
+  try {
+    const message = JSON.stringify(result);
+    return message === undefined ? String(result) : message;
+  } catch {
+    return String(result);
+  }
+};
+var schemaMessage = (error5) => error5 instanceof Error ? error5.message : typeof error5 === "string" ? error5 : resultMessage(error5);
+var decodeSuccess = (tool2, result) => {
+  const successSchema = tool2.successSchema;
+  if (!Schema53.isSchema(successSchema)) {
+    return Effect39.succeed({ _tag: "Success", result, encodedResult: result });
+  }
+  return Schema53.decodeUnknownEffect(successSchema)(result).pipe(Effect39.flatMap((decoded) => Schema53.encodeUnknownEffect(successSchema)(decoded).pipe(Effect39.map((encoded) => ({ _tag: "Success", result: decoded, encodedResult: encoded })))), Effect39.catchCause((cause) => Effect39.succeed(failureOutcome(`invalid client result: ${schemaMessage(Cause.squash(cause))}`))));
+};
+var placementOutcome = (placement, tool2, response) => {
+  switch (response._tag) {
+    case "Failure":
+      return Effect39.succeed(failureOutcome(response.message));
+    case "Suspend":
+      return Effect39.succeed({ _tag: "Suspend", token: response.token });
+    case "Success":
+      return decodeSuccess(tool2, response.result).pipe(Effect39.map((outcome) => outcome._tag === "Failure" ? failureOutcome(outcome.message.replace("invalid client result", `invalid ${placement} result`)) : outcome));
+  }
+};
+var executeWithToolkit = (toolkit, request) => {
+  if (toolkit.tools[request.call.name] === undefined) {
+    return Effect39.succeed(failureOutcome(`Tool ${request.call.name} is not registered`));
+  }
+  return toolkit.handle(request.call.name, request.call.params).pipe(Effect39.flatMap((results) => results.pipe(Stream7.filter((item) => item.preliminary === false), Stream7.run(Sink2.last()))), Effect39.map(Option10.match({
+    onNone: () => failureOutcome("Tool handler did not produce a final result"),
+    onSome: (result) => result.isFailure ? failureOutcome(resultMessage(result.result)) : {
+      _tag: "Success",
+      result: result.result,
+      encodedResult: result.encodedResult
+    }
+  })), Effect39.catchCause((cause) => {
+    if (Cause.hasInterrupts(cause))
+      return Effect39.interrupt;
+    const error5 = Cause.squash(cause);
+    if (error5 instanceof AgentSuspended) {
+      return Effect39.succeed({ _tag: "Suspend", token: error5.token });
+    }
+    return Effect39.succeed(failureOutcome(failureMessage(cause)));
+  }));
+};
+function executeToolkit(toolkit, request) {
+  return ("handle" in toolkit ? Effect39.succeed(toolkit) : toolkit).pipe(Effect39.flatMap((handled) => executeWithToolkit(handled, request)));
+}
+function fromToolkit(toolkit) {
+  return Layer36.effect(ToolExecutor, ("handle" in toolkit ? Effect39.succeed(toolkit) : toolkit).pipe(Effect39.map((handled) => ToolExecutor.of({
+    execute: (request) => executeWithToolkit(handled, request)
+  }))));
+}
+var route = (options) => {
+  const routedTools = options.tools ?? [];
+  return {
+    tools: routedTools,
+    matches: (request) => routedTools.includes(request.call.name) || options.matches?.(request) === true,
+    execute: options.execute
+  };
+};
+var placementRoute = (placement, options) => {
+  const routedTools = options.tools ?? Object.keys(options.toolkit.tools);
+  return route({
+    tools: routedTools,
+    execute: (request) => {
+      const tool2 = options.toolkit.tools[request.call.name];
+      if (tool2 === undefined)
+        return Effect39.succeed(failureOutcome(`Tool ${request.call.name} is not registered`));
+      const effect = options.execute({ ...request, placement, tool: tool2 });
+      const scheduled = "schedule" in options && options.schedule !== undefined ? Effect39.retry(effect, options.schedule) : effect;
+      return scheduled.pipe(Effect39.flatMap((response) => placementOutcome(placement, tool2, response)), Effect39.catchCause((cause) => Cause.hasInterrupts(cause) ? Effect39.interrupt : Effect39.succeed(failureOutcome(`${placement} tool infrastructure failed: ${failureMessage(cause)}`))));
+    }
+  });
+};
+var client = (options) => placementRoute("client", options);
+var remote = (options) => placementRoute("remote", options);
+var mcp = (options) => placementRoute("mcp", options);
+var sandbox = (options) => placementRoute("sandbox", options);
+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(Effect39.map(makeRoute));
+}
+var routeInputEffect = (input) => Effect39.isEffect(input) ? input : Effect39.succeed(input);
+function router(routes) {
+  return Layer36.effect(ToolExecutor, Effect39.all(Array.from(routes, routeInputEffect)).pipe(Effect39.map((resolved) => ToolExecutor.of({
+    execute: (request) => {
+      const matched = resolved.find((candidate) => candidate.matches(request));
+      return matched === undefined ? Effect39.succeed(failureOutcome(`Tool ${request.call.name} is not registered`)) : matched.execute(request);
+    }
+  }))));
+}
+var testLayer33 = (implementation) => Layer36.succeed(ToolExecutor, ToolExecutor.of(implementation));
+
+// ../../node_modules/.bun/@batonfx+core@0.4.2/node_modules/@batonfx/core/dist/approvals.js
 var exports_approvals = {};
 __export(exports_approvals, {
-  testLayer: () => testLayer32,
+  testLayer: () => testLayer34,
   denyAll: () => denyAll,
   autoApprove: () => autoApprove,
   Approvals: () => Approvals
 });
-import { Context as Context35, Effect as Effect38, Layer as Layer35 } from "effect";
-
-class Approvals extends Context35.Service()("@batonfx/core/Approvals") {
+import { Context as Context37, Effect as Effect40, Layer as Layer37 } from "effect";
+class Approvals extends Context37.Service()("@batonfx/core/Approvals") {
 }
-var autoApprove = Layer35.succeed(Approvals, Approvals.of({ check: () => Effect38.succeed({ _tag: "Approved" }) }));
-var denyAll = Layer35.succeed(Approvals, Approvals.of({ check: () => Effect38.succeed({ _tag: "Denied" }) }));
-var testLayer32 = (implementation) => Layer35.succeed(Approvals, Approvals.of(implementation));
+var autoApprove = Layer37.succeed(Approvals, Approvals.of({ check: () => Effect40.succeed({ _tag: "Approved" }) }));
+var denyAll = Layer37.succeed(Approvals, Approvals.of({ check: () => Effect40.succeed({ _tag: "Denied" }) }));
+var testLayer34 = (implementation) => Layer37.succeed(Approvals, Approvals.of(implementation));
 
-// ../../node_modules/.bun/@batonfx+core@0.4.0/node_modules/@batonfx/core/src/session.ts
+// ../../node_modules/.bun/@batonfx+core@0.4.2/node_modules/@batonfx/core/dist/session.js
 var exports_session = {};
 __export(exports_session, {
-  testLayer: () => testLayer33,
+  testLayer: () => testLayer35,
   memoryLayer: () => memoryLayer32,
   buildContext: () => buildContext,
   SessionStoreError: () => SessionStoreError,
   SessionStore: () => SessionStore
 });
-import { Context as Context36, Effect as Effect39, HashMap as HashMap3, Layer as Layer36, Option as Option10, Ref as Ref10, Schema as Schema53 } from "effect";
+import { Context as Context38, Effect as Effect41, HashMap as HashMap3, Layer as Layer38, Option as Option11, Ref as Ref10, Schema as Schema54 } from "effect";
 import { Prompt as Prompt2 } from "effect/unstable/ai";
 
-class SessionStoreError extends Schema53.TaggedErrorClass()("@batonfx/core/SessionStoreError", {
-  message: Schema53.String
+class SessionStoreError extends Schema54.TaggedErrorClass()("@batonfx/core/SessionStoreError", {
+  message: Schema54.String
 }) {
 }
 
-class SessionStore extends Context36.Service()("@batonfx/core/SessionStore") {
+class SessionStore extends Context38.Service()("@batonfx/core/SessionStore") {
 }
 var initialState = {
   entries: HashMap3.empty(),
@@ -11560,7 +11704,7 @@ var failure2 = (message) => ({
   _tag: "Failure",
   error: new SessionStoreError({ message })
 });
-var effectFromResult = (result) => result._tag === "Failure" ? Effect39.fail(result.error) : Effect39.succeed(result.value);
+var effectFromResult = (result) => result._tag === "Failure" ? Effect41.fail(result.error) : Effect41.succeed(result.value);
 var entryFromInput = (input, id2, parentId) => {
   const base2 = {
     id: id2,
@@ -11595,7 +11739,7 @@ var pathFromState = (state, leaf2) => {
     if (entries.length > state.order.length)
       return failure2(`Session path for leaf ${leaf2} contains a cycle`);
     const entry = HashMap3.get(state.entries, cursor);
-    if (Option10.isNone(entry))
+    if (Option11.isNone(entry))
       return failure2(`Session entry ${cursor} does not exist`);
     const value = entry.value;
     entries.push(value);
@@ -11633,7 +11777,7 @@ var appendState = (state, input) => {
   ];
 };
 var setLeafState = (state, id2) => {
-  if (id2 !== null && Option10.isNone(HashMap3.get(state.entries, id2)))
+  if (id2 !== null && Option11.isNone(HashMap3.get(state.entries, id2)))
     return [failure2(`Session entry ${id2} does not exist`), state];
   return [success(undefined), { ...state, leaf: id2 }];
 };
@@ -11695,41 +11839,40 @@ var projectedMessages = (path2) => {
   return messages;
 };
 var buildContext = (path2) => Prompt2.fromMessages(projectedMessages(path2));
-var memoryLayer32 = Layer36.effect(SessionStore, Ref10.make(initialState).pipe(Effect39.map((state) => SessionStore.of({
-  append: (entry) => Ref10.modify(state, (current2) => appendState(current2, entry)).pipe(Effect39.flatMap(effectFromResult)),
-  path: (leaf2) => Ref10.get(state).pipe(Effect39.flatMap((current2) => leaf2 === undefined && current2.leaf === null ? Effect39.succeed([]) : effectFromResult(pathFromState(current2, leaf2 ?? current2.leaf ?? "")))),
-  setLeaf: (id2) => Ref10.modify(state, (current2) => setLeafState(current2, id2)).pipe(Effect39.flatMap(effectFromResult)),
-  leaf: Ref10.get(state).pipe(Effect39.map((current2) => current2.leaf))
+var memoryLayer32 = Layer38.effect(SessionStore, Ref10.make(initialState).pipe(Effect41.map((state) => SessionStore.of({
+  append: (entry) => Ref10.modify(state, (current2) => appendState(current2, entry)).pipe(Effect41.flatMap(effectFromResult)),
+  path: (leaf2) => Ref10.get(state).pipe(Effect41.flatMap((current2) => leaf2 === undefined && current2.leaf === null ? Effect41.succeed([]) : effectFromResult(pathFromState(current2, leaf2 ?? current2.leaf ?? "")))),
+  setLeaf: (id2) => Ref10.modify(state, (current2) => setLeafState(current2, id2)).pipe(Effect41.flatMap(effectFromResult)),
+  leaf: Ref10.get(state).pipe(Effect41.map((current2) => current2.leaf))
 }))));
-var testLayer33 = (implementation) => Layer36.succeed(SessionStore, SessionStore.of(implementation));
+var testLayer35 = (implementation) => Layer38.succeed(SessionStore, SessionStore.of(implementation));
 
-// ../../node_modules/.bun/@batonfx+core@0.4.0/node_modules/@batonfx/core/src/tool-output.ts
+// ../../node_modules/.bun/@batonfx+core@0.4.2/node_modules/@batonfx/core/dist/tool-output.js
 var exports_tool_output = {};
 __export(exports_tool_output, {
-  testLayer: () => testLayer34,
+  testLayer: () => testLayer36,
   layerNoop: () => layerNoop,
   layerMemory: () => layerMemory,
   bound: () => bound,
   ToolOutputStore: () => ToolOutputStore,
   ToolOutputError: () => ToolOutputError
 });
-import { Context as Context37, Effect as Effect40, HashMap as HashMap4, Layer as Layer37, Option as Option11, Ref as Ref11, Schema as Schema54 } from "effect";
-
-class ToolOutputStore extends Context37.Service()("@batonfx/core/ToolOutputStore") {
+import { Context as Context39, Effect as Effect42, HashMap as HashMap4, Layer as Layer39, Option as Option12, Ref as Ref11, Schema as Schema55 } from "effect";
+class ToolOutputStore extends Context39.Service()("@batonfx/core/ToolOutputStore") {
 }
 
-class ToolOutputError extends Schema54.TaggedErrorClass()("@batonfx/core/ToolOutputError", {
-  message: Schema54.String
+class ToolOutputError extends Schema55.TaggedErrorClass()("@batonfx/core/ToolOutputError", {
+  message: Schema55.String
 }) {
 }
-var layerNoop = Layer37.succeed(ToolOutputStore, ToolOutputStore.of({ put: () => Effect40.succeed(Option11.none()) }));
-var layerMemory = Layer37.effect(ToolOutputStore, Ref11.make({ next: 0, records: HashMap4.empty() }).pipe(Effect40.map((state) => ToolOutputStore.of({
+var layerNoop = Layer39.succeed(ToolOutputStore, ToolOutputStore.of({ put: () => Effect42.succeed(Option12.none()) }));
+var layerMemory = Layer39.effect(ToolOutputStore, Ref11.make({ next: 0, records: HashMap4.empty() }).pipe(Effect42.map((state) => ToolOutputStore.of({
   put: (toolCallId, content) => Ref11.modify(state, ({ next, records }) => {
     const id2 = `mem:tool-output-${next + 1}`;
-    return [Option11.some(id2), { next: next + 1, records: HashMap4.set(records, id2, { toolCallId, content }) }];
+    return [Option12.some(id2), { next: next + 1, records: HashMap4.set(records, id2, { toolCallId, content }) }];
   })
 }))));
-var testLayer34 = (implementation) => Layer37.succeed(ToolOutputStore, ToolOutputStore.of(implementation));
+var testLayer36 = (implementation) => Layer39.succeed(ToolOutputStore, ToolOutputStore.of(implementation));
 var encoder2 = new TextEncoder;
 var decoder = new TextDecoder;
 var serialized = (value) => {
@@ -11737,19 +11880,19 @@ var serialized = (value) => {
   return json === undefined ? String(value) : json;
 };
 var preview = (value, maxBytes) => decoder.decode(encoder2.encode(value).slice(0, maxBytes));
-var bound = (result, options) => Effect40.gen(function* () {
+var bound = (result, options) => Effect42.gen(function* () {
   const encoded = serialized(result.encodedResult);
   const bytes = encoder2.encode(encoded).byteLength;
   if (bytes <= options.maxBytes)
     return result;
-  const maybeStore = yield* Effect40.serviceOption(ToolOutputStore);
-  if (Option11.isNone(maybeStore))
+  const maybeStore = yield* Effect42.serviceOption(ToolOutputStore);
+  if (Option12.isNone(maybeStore))
     return result;
   const path2 = yield* maybeStore.value.put(options.toolCallId, {
     result: result.result,
     encodedResult: result.encodedResult
   });
-  if (Option11.isNone(path2))
+  if (Option12.isNone(path2))
     return result;
   const output = {
     inline: {
@@ -11763,12 +11906,12 @@ var bound = (result, options) => Effect40.gen(function* () {
   return { _tag: "Success", result: output, encodedResult: output };
 });
 
-// ../../node_modules/.bun/@batonfx+core@0.4.0/node_modules/@batonfx/core/src/compaction.ts
+// ../../node_modules/.bun/@batonfx+core@0.4.2/node_modules/@batonfx/core/dist/compaction.js
 var exports_compaction = {};
 __export(exports_compaction, {
   truncate: () => truncate,
   toolOutputBound: () => toolOutputBound,
-  testLayer: () => testLayer35,
+  testLayer: () => testLayer37,
   structuredSummary: () => structuredSummary,
   strategy: () => strategy,
   make: () => make2,
@@ -11783,8 +11926,8 @@ __export(exports_compaction, {
   Compaction: () => Compaction,
   AgentSummary: () => AgentSummary
 });
-import { Context as Context38, Effect as Effect41, Layer as Layer38, Option as Option12, Schema as Schema55 } from "effect";
-import { LanguageModel, Prompt as Prompt3, Tokenizer, Toolkit as Toolkit2 } from "effect/unstable/ai";
+import { Context as Context40, Effect as Effect43, Layer as Layer40, Option as Option13, Schema as Schema56 } from "effect";
+import { LanguageModel, Prompt as Prompt3, Tokenizer, Toolkit as Toolkit3 } from "effect/unstable/ai";
 var DEFAULT_RESERVE_TOKENS = 16384;
 var DEFAULT_KEEP_RECENT_TOKENS = 20000;
 var SUMMARY_TEMPLATE = `Summarize the conversation so another agent can continue seamlessly.
@@ -11802,21 +11945,21 @@ Use Markdown with these sections:
 ## Critical Context
 
 Do not mention that context was compacted.`;
-var AgentSummary = Schema55.Struct({
-  goal: Schema55.String,
-  facts: Schema55.Array(Schema55.String),
-  decisions: Schema55.Array(Schema55.String),
-  openQuestions: Schema55.Array(Schema55.String),
-  toolFindings: Schema55.Array(Schema55.String)
+var AgentSummary = Schema56.Struct({
+  goal: Schema56.String,
+  facts: Schema56.Array(Schema56.String),
+  decisions: Schema56.Array(Schema56.String),
+  openQuestions: Schema56.Array(Schema56.String),
+  toolFindings: Schema56.Array(Schema56.String)
 });
 
-class CompactionError extends Schema55.TaggedErrorClass()("@batonfx/core/CompactionError", {
-  message: Schema55.String,
-  cause: Schema55.optionalKey(Schema55.Defect())
+class CompactionError extends Schema56.TaggedErrorClass()("@batonfx/core/CompactionError", {
+  message: Schema56.String,
+  cause: Schema56.optionalKey(Schema56.Defect())
 }) {
 }
 
-class Compaction extends Context38.Service()("@batonfx/core/Compaction") {
+class Compaction extends Context40.Service()("@batonfx/core/Compaction") {
 }
 var serialized2 = (value) => {
   const json = JSON.stringify(value);
@@ -11852,11 +11995,11 @@ var isPromptToolResult = (part) => part.type === "tool-result";
 var messageHasToolCall = (message) => typeof message.content !== "string" && message.content.some((part) => part.type === "tool-call");
 var isToolMessage = (entry) => entry?._tag === "Message" && entry.message.role === "tool";
 var isAssistantToolCallEntry = (entry) => entry?._tag === "Message" && entry.message.role === "assistant" && messageHasToolCall(entry.message);
-var compactToolPart = (part, maxBytes) => Effect41.gen(function* () {
+var compactToolPart = (part, maxBytes) => Effect43.gen(function* () {
   if (part.isFailure)
     return [part, false];
   const success2 = { _tag: "Success", result: part.result, encodedResult: part.result };
-  const bounded = yield* bound(success2, { toolCallId: part.id, maxBytes }).pipe(Effect41.mapError((error5) => new CompactionError({ message: error5.message, cause: error5 })));
+  const bounded = yield* bound(success2, { toolCallId: part.id, maxBytes }).pipe(Effect43.mapError((error5) => new CompactionError({ message: error5.message, cause: error5 })));
   if (bounded === success2)
     return [part, false];
   return [
@@ -11869,7 +12012,7 @@ var compactToolPart = (part, maxBytes) => Effect41.gen(function* () {
     true
   ];
 });
-var microcompactPrompt = (prompt, maxBytes) => Effect41.gen(function* () {
+var microcompactPrompt = (prompt, maxBytes) => Effect43.gen(function* () {
   let changed = false;
   const messages = [];
   for (const message of prompt.content) {
@@ -11931,20 +12074,20 @@ var defaultStrategy = (options = {}) => ({
   cut: (entries, keepRecentTokens) => {
     const index = safeCutIndex(entries, keepRecentTokens);
     if (index <= 0 || index >= entries.length)
-      return Option12.none();
+      return Option13.none();
     const recent = entries.slice(index);
     const first = recent[0];
-    return first === undefined ? Option12.none() : Option12.some({ firstKeptEntryId: first.id, head: entries.slice(0, index), recent });
+    return first === undefined ? Option13.none() : Option13.some({ firstKeptEntryId: first.id, head: entries.slice(0, index), recent });
   },
   summarize: (plan2, request) => {
-    const effect = Effect41.gen(function* () {
+    const effect = Effect43.gen(function* () {
       const head = buildContext(plan2.head);
       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: Toolkit2.empty, toolChoice: "none" }).pipe(Effect41.map((response) => response.text), Effect41.mapError((error5) => new CompactionError({ message: String(error5), cause: error5 })));
+      return yield* model.generateText({ prompt, toolkit: Toolkit3.empty, toolChoice: "none" }).pipe(Effect43.map((response) => response.text), Effect43.mapError((error5) => new CompactionError({ message: String(error5), cause: error5 })));
     });
-    return options.summaryModel === undefined ? effect : effect.pipe(Effect41.provide(options.summaryModel));
+    return options.summaryModel === undefined ? effect : effect.pipe(Effect43.provide(options.summaryModel));
   }
 });
 var strategy = (parts, base2 = defaultStrategy()) => parts.reduce((current2, part) => ({
@@ -11962,7 +12105,7 @@ var keepRecent = (options) => ({
 });
 var structuredSummary = (options = {}) => ({
   summarize: (plan2, request) => {
-    const effect = Effect41.gen(function* () {
+    const effect = Effect43.gen(function* () {
       const head = buildContext(plan2.head);
       const [compactedHead] = request.toolOutputMaxBytes === undefined ? [head, false] : yield* microcompactPrompt(head, request.toolOutputMaxBytes);
       const prompt = summaryPrompt(options.summaryPrompt ?? SUMMARY_TEMPLATE, compactedHead);
@@ -11972,17 +12115,17 @@ var structuredSummary = (options = {}) => ({
         schema: AgentSummary,
         objectName: options.objectName ?? "AgentSummary",
         toolChoice: "none"
-      }).pipe(Effect41.map((response) => renderAgentSummary(response.value)), Effect41.mapError((error5) => new CompactionError({ message: String(error5), cause: error5 })));
+      }).pipe(Effect43.map((response) => renderAgentSummary(response.value)), Effect43.mapError((error5) => new CompactionError({ message: String(error5), cause: error5 })));
     });
-    return options.summaryModel === undefined ? effect : effect.pipe(Effect41.provide(options.summaryModel));
+    return options.summaryModel === undefined ? effect : effect.pipe(Effect43.provide(options.summaryModel));
   }
 });
 var make2 = (compactionStrategy, options = {}) => ({
-  maybeCompact: (input) => Effect41.gen(function* () {
+  maybeCompact: (input) => Effect43.gen(function* () {
     const usage = normalizeUsage(input.usage, options);
     const shouldCompact = input.overflow || compactionStrategy.shouldCompact(usage);
     if (!shouldCompact)
-      return Option12.none();
+      return Option13.none();
     let history = input.history;
     let prompt = input.prompt;
     let changed = false;
@@ -11994,11 +12137,11 @@ var make2 = (compactionStrategy, options = {}) => ({
       prompt = compactedPrompt;
       changed = historyChanged || promptChanged;
       if (changed && fits(history, prompt, usage))
-        return Option12.some(makeMicrocompact(history, prompt));
+        return Option13.some(makeMicrocompact(history, prompt));
     }
     const plan2 = compactionStrategy.cut(input.path ?? [], compactionStrategy.keepRecentTokens ?? options.keepRecentTokens ?? DEFAULT_KEEP_RECENT_TOKENS);
-    if (Option12.isNone(plan2))
-      return changed ? Option12.some(makeMicrocompact(history, prompt)) : Option12.none();
+    if (Option13.isNone(plan2))
+      return changed ? Option13.some(makeMicrocompact(history, prompt)) : Option13.none();
     const summary = yield* compactionStrategy.summarize(plan2.value, {
       ...input,
       history,
@@ -12008,7 +12151,7 @@ var make2 = (compactionStrategy, options = {}) => ({
     });
     const recent = buildContext(plan2.value.recent);
     const [compactedRecent] = toolOutputMaxBytes === undefined ? [recent, false] : yield* microcompactPrompt(recent, toolOutputMaxBytes);
-    return Option12.some({
+    return Option13.some({
       _tag: "Summarize",
       history: compactedHistory(summary, plan2.value.head, compactedRecent),
       prompt,
@@ -12017,43 +12160,42 @@ var make2 = (compactionStrategy, options = {}) => ({
     });
   })
 });
-var layer32 = (options = {}, providedStrategy = options.strategy ?? defaultStrategy(options)) => Layer38.succeed(Compaction, Compaction.of(make2(providedStrategy, options)));
+var layer32 = (options = {}, providedStrategy = options.strategy ?? defaultStrategy(options)) => Layer40.succeed(Compaction, Compaction.of(make2(providedStrategy, options)));
 var truncate = (maxTokens) => ({
-  maybeCompact: (input) => Effect41.gen(function* () {
+  maybeCompact: (input) => Effect43.gen(function* () {
     const usage = input.usage;
     if (!input.overflow && !(Number.isFinite(usage.contextWindow) && usage.contextTokens > usage.contextWindow - usage.reserveTokens)) {
-      return Option12.none();
+      return Option13.none();
     }
-    const tokenizer = yield* Effect41.serviceOption(Tokenizer.Tokenizer);
-    if (Option12.isNone(tokenizer))
-      return Option12.none();
-    const prompt = yield* tokenizer.value.truncate(Prompt3.concat(input.history, input.prompt), maxTokens).pipe(Effect41.mapError((error5) => new CompactionError({ message: String(error5), cause: error5 })));
-    return Option12.some(makeMicrocompact(Prompt3.empty, prompt));
+    const tokenizer = yield* Effect43.serviceOption(Tokenizer.Tokenizer);
+    if (Option13.isNone(tokenizer))
+      return Option13.none();
+    const prompt = yield* tokenizer.value.truncate(Prompt3.concat(input.history, input.prompt), maxTokens).pipe(Effect43.mapError((error5) => new CompactionError({ message: String(error5), cause: error5 })));
+    return Option13.some(makeMicrocompact(Prompt3.empty, prompt));
   })
 });
-var testLayer35 = (implementation) => Layer38.succeed(Compaction, Compaction.of(implementation));
+var testLayer37 = (implementation) => Layer40.succeed(Compaction, Compaction.of(implementation));
 var isContextOverflow = (error5) => /context|token|prompt/i.test(error5 instanceof Error ? `${error5.name}: ${error5.message}` : String(error5)) && /overflow|exceed|exceeded|maximum|too large|too long|length/i.test(error5 instanceof Error ? `${error5.name}: ${error5.message}` : String(error5));
 
-// ../../node_modules/.bun/@batonfx+core@0.4.0/node_modules/@batonfx/core/src/instructions.ts
+// ../../node_modules/.bun/@batonfx+core@0.4.2/node_modules/@batonfx/core/dist/instructions.js
 var exports_instructions = {};
 __export(exports_instructions, {
-  testLayer: () => testLayer36,
+  testLayer: () => testLayer38,
   staticSource: () => staticSource,
   renderUpdate: () => renderUpdate,
   openEpoch: () => openEpoch,
   layer: () => layer33,
   Instructions: () => Instructions
 });
-import { Context as Context39, Effect as Effect42, Layer as Layer39, Option as Option13 } from "effect";
-
-class Instructions extends Context39.Service()("@batonfx/core/Instructions") {
+import { Context as Context41, Effect as Effect44, Layer as Layer41, Option as Option14 } from "effect";
+class Instructions extends Context41.Service()("@batonfx/core/Instructions") {
 }
 var staticSource = (id2, text2) => ({
   id: id2,
   cache: "baseline",
-  render: () => Effect42.succeed(text2.length === 0 ? Option13.none() : Option13.some(text2))
+  render: () => Effect44.succeed(text2.length === 0 ? Option14.none() : Option14.some(text2))
 });
-var openEpoch = (instructions, context) => Effect42.gen(function* () {
+var openEpoch = (instructions, context) => Effect44.gen(function* () {
   const baseline = [];
   const dynamic = [];
   for (const source of instructions.sources) {
@@ -12061,7 +12203,7 @@ var openEpoch = (instructions, context) => Effect42.gen(function* () {
       dynamic.push(source);
     } else {
       const rendered = yield* source.render(context);
-      if (Option13.isSome(rendered))
+      if (Option14.isSome(rendered))
         baseline.push(rendered.value);
     }
   }
@@ -12069,69 +12211,70 @@ var openEpoch = (instructions, context) => Effect42.gen(function* () {
 
 `), dynamic };
 });
-var renderUpdate = (epoch, context) => Effect42.gen(function* () {
+var renderUpdate = (epoch, context) => Effect44.gen(function* () {
   const fragments = [];
   for (const source of epoch.dynamic) {
     const rendered = yield* source.render(context);
-    if (Option13.isSome(rendered))
+    if (Option14.isSome(rendered))
       fragments.push(rendered.value);
   }
-  return fragments.length === 0 ? Option13.none() : Option13.some(fragments.join(`
+  return fragments.length === 0 ? Option14.none() : Option14.some(fragments.join(`
 
 `));
 });
-var layer33 = (sources) => Layer39.succeed(Instructions, Instructions.of({ sources: [...sources] }));
-var testLayer36 = (implementation) => Layer39.succeed(Instructions, Instructions.of(implementation));
+var layer33 = (sources) => Layer41.succeed(Instructions, Instructions.of({ sources: [...sources] }));
+var testLayer38 = (implementation) => Layer41.succeed(Instructions, Instructions.of(implementation));
 
-// ../../node_modules/.bun/@batonfx+core@0.4.0/node_modules/@batonfx/core/src/memory.ts
+// ../../node_modules/.bun/@batonfx+core@0.4.2/node_modules/@batonfx/core/dist/memory.js
 var exports_memory = {};
 __export(exports_memory, {
-  testLayer: () => testLayer37,
+  testLayer: () => testLayer39,
   noopLayer: () => noopLayer,
   merge: () => merge,
   MemoryError: () => MemoryError,
   Memory: () => Memory
 });
-import { Context as Context40, Effect as Effect43, Layer as Layer40, Schema as Schema56 } from "effect";
+import { Context as Context42, Effect as Effect45, Layer as Layer42, Schema as Schema57 } from "effect";
+import { Prompt as Prompt4 } from "effect/unstable/ai";
 
-class MemoryError extends Schema56.TaggedErrorClass()("@batonfx/core/MemoryError", {
-  message: Schema56.String
+class MemoryError extends Schema57.TaggedErrorClass()("@batonfx/core/MemoryError", {
+  message: Schema57.String
 }) {
 }
 
-class Memory extends Context40.Service()("@batonfx/core/Memory") {
+class Memory extends Context42.Service()("@batonfx/core/Memory") {
 }
 var noop = {
-  recall: () => Effect43.succeed([]),
-  remember: () => Effect43.void,
-  forget: () => Effect43.void
+  recall: () => Effect45.succeed([]),
+  remember: () => Effect45.void,
+  forget: () => Effect45.void
 };
 var merge = (first, second) => ({
-  recall: (input) => Effect43.all([first.recall(input), second.recall(input)]).pipe(Effect43.map(([firstItems, secondItems]) => [...firstItems, ...secondItems])),
-  remember: (input) => Effect43.all([first.remember(input), second.remember(input)], { discard: true }),
-  forget: (input) => Effect43.all([first.forget(input), second.forget(input)], { discard: true })
+  recall: (input) => Effect45.all([first.recall(input), second.recall(input)]).pipe(Effect45.map(([firstItems, secondItems]) => [...firstItems, ...secondItems])),
+  remember: (input) => Effect45.all([first.remember(input), second.remember(input)], { discard: true }),
+  forget: (input) => Effect45.all([first.forget(input), second.forget(input)], { discard: true })
 });
-var noopLayer = Layer40.succeed(Memory, Memory.of(noop));
-var testLayer37 = (implementation) => Layer40.succeed(Memory, Memory.of(implementation));
+var noopLayer = Layer42.succeed(Memory, Memory.of(noop));
+var testLayer39 = (implementation) => Layer42.succeed(Memory, Memory.of(implementation));
 
-// ../../node_modules/.bun/@batonfx+core@0.4.0/node_modules/@batonfx/core/src/model-middleware.ts
+// ../../node_modules/.bun/@batonfx+core@0.4.2/node_modules/@batonfx/core/dist/model-middleware.js
 var exports_model_middleware = {};
 __export(exports_model_middleware, {
   layer: () => layer34,
   identityLayer: () => identityLayer,
   ModelMiddleware: () => ModelMiddleware
 });
-import { Context as Context41, Layer as Layer41 } from "effect";
-
-class ModelMiddleware extends Context41.Service()("@batonfx/core/ModelMiddleware") {
+import { Context as Context43, Effect as Effect46, Layer as Layer43, Option as Option15 } from "effect";
+import { Prompt as Prompt5, Response as Response3 } from "effect/unstable/ai";
+class ModelMiddleware extends Context43.Service()("@batonfx/core/ModelMiddleware") {
 }
-var identityLayer = Layer41.succeed(ModelMiddleware, []);
-var layer34 = (middleware) => Layer41.succeed(ModelMiddleware, middleware);
+var identityLayer = Layer43.succeed(ModelMiddleware, []);
+var layer34 = (middleware) => Layer43.succeed(ModelMiddleware, middleware);
 
-// ../../node_modules/.bun/@batonfx+core@0.4.0/node_modules/@batonfx/core/src/model-registry.ts
+// ../../node_modules/.bun/@batonfx+core@0.4.2/node_modules/@batonfx/core/dist/model-registry.js
 var exports_model_registry = {};
 __export(exports_model_registry, {
-  testLayer: () => testLayer38,
+  testLayer: () => testLayer40,
   registrations: () => registrations,
   registrationFromLayer: () => registrationFromLayer,
   register: () => register4,
@@ -12143,17 +12286,17 @@ __export(exports_model_registry, {
   Service: () => Service35,
   LanguageModelNotRegistered: () => LanguageModelNotRegistered
 });
-import { Chunk as Chunk2, Context as Context42, Effect as Effect45, Layer as Layer42, Option as Option15, Ref as Ref12, Schema as Schema57, Semaphore as Semaphore4 } from "effect";
-import { Model } from "effect/unstable/ai";
+import { Chunk as Chunk2, Context as Context44, Effect as Effect47, Layer as Layer44, Option as Option16, Ref as Ref12, Schema as Schema58, Semaphore as Semaphore4 } from "effect";
+import { LanguageModel as LanguageModel2, Model } from "effect/unstable/ai";
 
-class LanguageModelNotRegistered extends Schema57.TaggedErrorClass()("LanguageModelNotRegistered", {
-  provider: Schema57.String,
-  model: Schema57.String,
-  registration_key: Schema57.optionalKey(Schema57.String)
+class LanguageModelNotRegistered extends Schema58.TaggedErrorClass()("LanguageModelNotRegistered", {
+  provider: Schema58.String,
+  model: Schema58.String,
+  registration_key: Schema58.optionalKey(Schema58.String)
 }) {
 }
 
-class Service35 extends Context42.Service()("@batonfx/core/ModelRegistry") {
+class Service35 extends Context44.Service()("@batonfx/core/ModelRegistry") {
 }
 var registrationVariantKey = (value) => value.registrationKey ?? null;
 var selectionVariantKey = (selection) => selection.registrationKey ?? null;
@@ -12161,37 +12304,37 @@ var registryIdentity = (registration) => JSON.stringify([registration.provider,
 var matchesSelection = (selection) => (registration) => registration.provider === selection.provider && registration.model === selection.model && registrationVariantKey(registration) === selectionVariantKey(selection);
 var upsertRegistration = (registry, registration) => {
   const key3 = registryIdentity(registration);
-  const exists = Option15.isSome(Chunk2.findFirst(registry, (item) => registryIdentity(item) === key3));
+  const exists = Option16.isSome(Chunk2.findFirst(registry, (item) => registryIdentity(item) === key3));
   if (!exists)
     return Chunk2.append(registry, registration);
   return Chunk2.map(registry, (item) => registryIdentity(item) === key3 ? registration : item);
 };
-var findRegistration = (registry, selection) => Chunk2.findFirst(registry, matchesSelection(selection)).pipe(Option15.getOrUndefined);
-var registrationFromLayer = (input) => Model.make(input.provider, input.model, input.layer).captureRequirements.pipe(Effect45.map((layer35) => ({
+var findRegistration = (registry, selection) => Chunk2.findFirst(registry, matchesSelection(selection)).pipe(Option16.getOrUndefined);
+var registrationFromLayer = (input) => Model.make(input.provider, input.model, input.layer).captureRequirements.pipe(Effect47.map((layer35) => ({
   provider: input.provider,
   model: input.model,
   layer: layer35,
   ...input.registrationKey === undefined ? {} : { registrationKey: input.registrationKey },
   ...input.metadata === undefined ? {} : { metadata: input.metadata }
 })));
-var layer35 = (initialRegistrations = [], options) => Layer42.effect(Service35, Effect45.gen(function* () {
+var layer35 = (initialRegistrations = [], options) => Layer44.effect(Service35, Effect47.gen(function* () {
   const registry = yield* Ref12.make(initialRegistrations.reduce(upsertRegistration, Chunk2.empty()));
   const semaphore = options?.maxConcurrentModelCalls === undefined ? undefined : yield* Semaphore4.make(options.maxConcurrentModelCalls);
-  const register4 = Effect45.fn("ModelRegistry.register")(function* (input) {
+  const register4 = Effect47.fn("ModelRegistry.register")(function* (input) {
     yield* Ref12.update(registry, (items) => upsertRegistration(items, input.registration));
   });
-  const registrations = Ref12.get(registry).pipe(Effect45.map(Chunk2.toReadonlyArray));
-  const provide = Effect45.fn("ModelRegistry.provide")(function* (selection, effect) {
+  const registrations = Ref12.get(registry).pipe(Effect47.map(Chunk2.toReadonlyArray));
+  const provide = Effect47.fn("ModelRegistry.provide")(function* (selection, effect) {
     const items = yield* Ref12.get(registry);
     const registration = findRegistration(items, selection);
     if (registration === undefined) {
-      return yield* Effect45.fail(new LanguageModelNotRegistered({
+      return yield* Effect47.fail(new LanguageModelNotRegistered({
         provider: selection.provider,
         model: selection.model,
         ...selection.registrationKey === undefined ? {} : { registration_key: selection.registrationKey }
       }));
     }
-    const provided = effect.pipe(Effect45.provide(registration.layer));
+    const provided = effect.pipe(Effect47.provide(registration.layer));
     return yield* semaphore === undefined ? provided : semaphore.withPermits(1)(provided);
   });
   return Service35.of({
@@ -12200,27 +12343,27 @@ var layer35 = (initialRegistrations = [], options) => Layer42.effect(Service35,
     provide
   });
 }));
-var layerFromRegistrationEffects = (registrations, options) => Layer42.unwrap(Effect45.all(registrations).pipe(Effect45.map((items) => layer35(items, options))));
-var combine = (registries, options) => Layer42.unwrap(Effect45.forEach(registries, (registry) => Layer42.build(registry).pipe(Effect45.flatMap((context) => Context42.get(context, Service35).registrations))).pipe(Effect45.map((groups) => layer35(groups.flat(), options))));
+var layerFromRegistrationEffects = (registrations, options) => Layer44.unwrap(Effect47.all(registrations).pipe(Effect47.map((items) => layer35(items, options))));
+var combine = (registries, options) => Layer44.unwrap(Effect47.forEach(registries, (registry) => Layer44.build(registry).pipe(Effect47.flatMap((context) => Context44.get(context, Service35).registrations))).pipe(Effect47.map((groups) => layer35(groups.flat(), options))));
 var memoryLayer33 = layer35;
-var testLayer38 = (implementation) => Layer42.succeed(Service35, Service35.of(implementation));
-var register4 = Effect45.fn("ModelRegistry.register.call")(function* (input) {
+var testLayer40 = (implementation) => Layer44.succeed(Service35, Service35.of(implementation));
+var register4 = Effect47.fn("ModelRegistry.register.call")(function* (input) {
   const service = yield* Service35;
   return yield* service.register(input);
 });
-var registrations = Effect45.fn("ModelRegistry.registrations.call")(function* () {
+var registrations = Effect47.fn("ModelRegistry.registrations.call")(function* () {
   const service = yield* Service35;
   return yield* service.registrations;
 });
-var provide = (selection, effect) => Effect45.gen(function* () {
+var provide = (selection, effect) => Effect47.gen(function* () {
   const service = yield* Service35;
   return yield* service.provide(selection, effect);
 });
 
-// ../../node_modules/.bun/@batonfx+core@0.4.0/node_modules/@batonfx/core/src/model-resilience.ts
+// ../../node_modules/.bun/@batonfx+core@0.4.2/node_modules/@batonfx/core/dist/model-resilience.js
 var exports_model_resilience = {};
 __export(exports_model_resilience, {
-  testLayer: () => testLayer39,
+  testLayer: () => testLayer41,
   none: () => none,
   make: () => make3,
   layer: () => layer36,
@@ -12228,45 +12371,45 @@ __export(exports_model_resilience, {
   apply: () => apply,
   ModelResilience: () => ModelResilience
 });
-import { Cause, Context as Context43, Effect as Effect46, Layer as Layer43, Schedule as Schedule3, Stream as Stream7 } from "effect";
-import { AiError, Response as Response2 } from "effect/unstable/ai";
+import { Cause as Cause2, Context as Context45, Effect as Effect48, Layer as Layer45, Schedule as Schedule4, Stream as Stream8 } from "effect";
+import { AiError, LanguageModel as LanguageModel3, Response as Response4 } from "effect/unstable/ai";
 
-class ModelResilience extends Context43.Service()("@batonfx/core/ModelResilience") {
+class ModelResilience extends Context45.Service()("@batonfx/core/ModelResilience") {
 }
 var defaultClassify = (error5) => AiError.isAiError(error5) && error5.isRetryable ? "transient" : "terminal";
-var none = { classify: () => "terminal", retrySchedule: Schedule3.recurs(0) };
+var none = { classify: () => "terminal", retrySchedule: Schedule4.recurs(0) };
 var make3 = (input) => ({
   classify: input?.classify ?? defaultClassify,
   retrySchedule: input?.retrySchedule ?? none.retrySchedule
 });
-var layer36 = (input) => Layer43.succeed(ModelResilience, ModelResilience.of(make3(input)));
-var testLayer39 = (implementation) => Layer43.succeed(ModelResilience, ModelResilience.of(implementation));
-var retryEffect = (effect, resilience) => Effect46.suspend(effect).pipe(Effect46.retry({
+var layer36 = (input) => Layer45.succeed(ModelResilience, ModelResilience.of(make3(input)));
+var testLayer41 = (implementation) => Layer45.succeed(ModelResilience, ModelResilience.of(implementation));
+var retryEffect = (effect, resilience) => Effect48.suspend(effect).pipe(Effect48.retry({
   schedule: resilience.retrySchedule,
   while: (error5) => resilience.classify(error5) === "transient"
 }));
-var retryStreamSchedule = (resilience) => resilience.retrySchedule.pipe(Schedule3.while(({ input }) => resilience.classify(input) === "transient"));
+var retryStreamSchedule = (resilience) => resilience.retrySchedule.pipe(Schedule4.while(({ input }) => resilience.classify(input) === "transient"));
 var apply = (model, resilience) => ({
   ...model,
   generateText: (options) => retryEffect(() => model.generateText(options), resilience),
   generateObject: (options) => retryEffect(() => model.generateObject(options), resilience),
-  streamText: (options) => Stream7.suspend(() => {
+  streamText: (options) => Stream8.suspend(() => {
     let emitted = false;
-    return model.streamText(options).pipe(Stream7.tap(() => Effect46.sync(() => {
+    return model.streamText(options).pipe(Stream8.tap(() => Effect48.sync(() => {
       emitted = true;
-    })), Stream7.catchCause((cause) => {
-      if (Cause.hasInterrupts(cause))
-        return Stream7.failCause(cause);
-      const error5 = Cause.squash(cause);
-      return emitted ? Stream7.make(Response2.makePart("error", { error: error5 })) : Stream7.failCause(cause);
+    })), Stream8.catchCause((cause) => {
+      if (Cause2.hasInterrupts(cause))
+        return Stream8.failCause(cause);
+      const error5 = Cause2.squash(cause);
+      return emitted ? Stream8.make(Response4.makePart("error", { error: error5 })) : Stream8.failCause(cause);
     }));
-  }).pipe(Stream7.retry(retryStreamSchedule(resilience)))
+  }).pipe(Stream8.retry(retryStreamSchedule(resilience)))
 });
 
-// ../../node_modules/.bun/@batonfx+core@0.4.0/node_modules/@batonfx/core/src/permissions.ts
+// ../../node_modules/.bun/@batonfx+core@0.4.2/node_modules/@batonfx/core/dist/permissions.js
 var exports_permissions = {};
 __export(exports_permissions, {
-  testLayer: () => testLayer40,
+  testLayer: () => testLayer42,
   ruleStoreTestLayer: () => ruleStoreTestLayer,
   ruleStoreMemory: () => ruleStoreMemory,
   matches: () => matches,
@@ -12278,17 +12421,17 @@ __export(exports_permissions, {
   Permissions: () => Permissions,
   PermissionError: () => PermissionError
 });
-import { Context as Context44, Effect as Effect47, Layer as Layer44, Option as Option16, Ref as Ref13, Schema as Schema58 } from "effect";
+import { Context as Context46, Effect as Effect49, Layer as Layer46, Option as Option17, Ref as Ref13, Schema as Schema59 } from "effect";
 
-class PermissionError extends Schema58.TaggedErrorClass()("@batonfx/core/PermissionError", {
-  message: Schema58.String
+class PermissionError extends Schema59.TaggedErrorClass()("@batonfx/core/PermissionError", {
+  message: Schema59.String
 }) {
 }
 
-class Permissions extends Context44.Service()("@batonfx/core/Permissions") {
+class Permissions extends Context46.Service()("@batonfx/core/Permissions") {
 }
 
-class RuleStore extends Context44.Service()("@batonfx/core/PermissionRuleStore") {
+class RuleStore extends Context46.Service()("@batonfx/core/PermissionRuleStore") {
 }
 var escapeRegExp = (value) => value.replace(/[|\\{}()[\]^$+?.]/g, "\\$&");
 var glob = (pattern) => new RegExp(`^${pattern.split("*").map(escapeRegExp).join(".*")}$`);
@@ -12375,28 +12518,28 @@ var decisionFor = (ruleset, request) => {
       return { _tag: "Ask", token: tokenFor(request) };
   }
 };
-var fromRuleset = (ruleset) => Layer44.succeed(Permissions, Permissions.of({
-  evaluate: (request) => Effect47.succeed(decisionFor(ruleset, request)),
-  await: () => Effect47.succeed(Option16.none())
+var fromRuleset = (ruleset) => Layer46.succeed(Permissions, Permissions.of({
+  evaluate: (request) => Effect49.succeed(decisionFor(ruleset, request)),
+  await: () => Effect49.succeed(Option17.none())
 }));
-var allowAll = Layer44.succeed(Permissions, Permissions.of({
-  evaluate: () => Effect47.succeed({ _tag: "Allow" }),
-  await: () => Effect47.succeed(Option16.none())
+var allowAll = Layer46.succeed(Permissions, Permissions.of({
+  evaluate: () => Effect49.succeed({ _tag: "Allow" }),
+  await: () => Effect49.succeed(Option17.none())
 }));
-var interactive = (options) => Layer44.succeed(Permissions, Permissions.of({
-  evaluate: (request) => Effect47.succeed(decisionFor(options.ruleset, request)),
-  await: (pending) => options.onAsk(pending).pipe(Effect47.map(Option16.some))
+var interactive = (options) => Layer46.succeed(Permissions, Permissions.of({
+  evaluate: (request) => Effect49.succeed(decisionFor(options.ruleset, request)),
+  await: (pending) => options.onAsk(pending).pipe(Effect49.map(Option17.some))
 }));
-var ruleStoreMemory = (initialRules = []) => Layer44.effect(RuleStore, Ref13.make(initialRules).pipe(Effect47.map((rules) => RuleStore.of({
+var ruleStoreMemory = (initialRules = []) => Layer46.effect(RuleStore, Ref13.make(initialRules).pipe(Effect49.map((rules) => RuleStore.of({
   remember: (rule) => Ref13.update(rules, (current2) => [...current2, rule])
 }))));
-var ruleStoreTestLayer = (implementation) => Layer44.succeed(RuleStore, RuleStore.of(implementation));
-var testLayer40 = (implementation) => Layer44.succeed(Permissions, Permissions.of(implementation));
+var ruleStoreTestLayer = (implementation) => Layer46.succeed(RuleStore, RuleStore.of(implementation));
+var testLayer42 = (implementation) => Layer46.succeed(Permissions, Permissions.of(implementation));
 
-// ../../node_modules/.bun/@batonfx+core@0.4.0/node_modules/@batonfx/core/src/skill-source.ts
+// ../../node_modules/.bun/@batonfx+core@0.4.2/node_modules/@batonfx/core/dist/skill-source.js
 var exports_skill_source = {};
 __export(exports_skill_source, {
-  testLayer: () => testLayer41,
+  testLayer: () => testLayer43,
   selectListings: () => selectListings,
   merge: () => merge2,
   makeListing: () => makeListing,
@@ -12407,31 +12550,32 @@ __export(exports_skill_source, {
   SkillSource: () => SkillSource,
   DESCRIPTION_CAP: () => DESCRIPTION_CAP
 });
-import { Context as Context45, Effect as Effect48, Layer as Layer45, Schema as Schema59 } from "effect";
+import { Context as Context47, Effect as Effect50, Layer as Layer47, Schema as Schema60 } from "effect";
+import { Tool as Tool4 } from "effect/unstable/ai";
 
-class SkillSourceError extends Schema59.TaggedErrorClass()("@batonfx/core/SkillSourceError", {
-  source: Schema59.String,
-  message: Schema59.String,
-  cause: Schema59.optionalKey(Schema59.Defect())
+class SkillSourceError extends Schema60.TaggedErrorClass()("@batonfx/core/SkillSourceError", {
+  source: Schema60.String,
+  message: Schema60.String,
+  cause: Schema60.optionalKey(Schema60.Defect())
 }) {
 }
 var DESCRIPTION_CAP = 1024;
 
-class SkillSource extends Context45.Service()("@batonfx/core/SkillSource") {
+class SkillSource extends Context47.Service()("@batonfx/core/SkillSource") {
 }
 var makeListing = (frontmatter, descriptionCap = DESCRIPTION_CAP) => `- ${frontmatter.name}: ${frontmatter.description.slice(0, Math.max(0, descriptionCap))}`;
 var fromSkills = (skills) => {
   const all = [...skills];
   const byName = new Map(all.map((skill) => [skill.frontmatter.name, skill]));
-  return Layer45.succeed(SkillSource, SkillSource.of({
-    all: Effect48.succeed(all),
-    get: (name) => Effect48.succeed(byName.get(name))
+  return Layer47.succeed(SkillSource, SkillSource.of({
+    all: Effect50.succeed(all),
+    get: (name) => Effect50.succeed(byName.get(name))
   }));
 };
 var empty = fromSkills([]);
-var testLayer41 = (implementation) => Layer45.succeed(SkillSource, SkillSource.of(implementation));
+var testLayer43 = (implementation) => Layer47.succeed(SkillSource, SkillSource.of(implementation));
 var merge2 = (sources) => ({
-  all: Effect48.forEach(sources, (source) => source.all).pipe(Effect48.map((groups) => {
+  all: Effect50.forEach(sources, (source) => source.all).pipe(Effect50.map((groups) => {
     const byName = new Map;
     for (const skills of groups) {
       for (const skill of skills)
@@ -12439,7 +12583,7 @@ var merge2 = (sources) => ({
     }
     return [...byName.values()];
   })),
-  get: (name) => Effect48.gen(function* () {
+  get: (name) => Effect50.gen(function* () {
     for (const source of sources.toReversed()) {
       const found = yield* source.get(name);
       if (found !== undefined)
@@ -12448,7 +12592,7 @@ var merge2 = (sources) => ({
     return;
   })
 });
-var layer37 = (sources) => Layer45.effect(SkillSource, Effect48.forEach(sources, (source) => source).pipe(Effect48.map((built) => SkillSource.of(merge2(built)))));
+var layer37 = (sources) => Layer47.effect(SkillSource, Effect50.forEach(sources, (source) => source).pipe(Effect50.map((built) => SkillSource.of(merge2(built)))));
 var estimatedTokens = (listing) => Math.ceil(listing.length / 4);
 var usageRank = (skill, recentlyUsed) => {
   const index = recentlyUsed.indexOf(skill.frontmatter.name);
@@ -12472,22 +12616,23 @@ var selectListings = (skills, budgetTokens, recentlyUsed) => {
   return selected;
 };
 
-// ../../node_modules/.bun/@batonfx+core@0.4.0/node_modules/@batonfx/core/src/steering.ts
+// ../../node_modules/.bun/@batonfx+core@0.4.2/node_modules/@batonfx/core/dist/steering.js
 var exports_steering = {};
 __export(exports_steering, {
-  testLayer: () => testLayer42,
+  testLayer: () => testLayer44,
   layer: () => layer38,
   SteeringQueueFull: () => SteeringQueueFull,
   Steering: () => Steering
 });
-import { Context as Context46, Effect as Effect49, Exit, Layer as Layer46, Queue, Schema as Schema60 } from "effect";
+import { Context as Context48, Effect as Effect51, Exit, Layer as Layer48, Queue, Schema as Schema61 } from "effect";
+import { Prompt as Prompt6 } from "effect/unstable/ai";
 
-class Steering extends Context46.Service()("@batonfx/core/Steering") {
+class Steering extends Context48.Service()("@batonfx/core/Steering") {
 }
 
-class SteeringQueueFull extends Schema60.TaggedErrorClass()("@batonfx/core/SteeringQueueFull", {
-  queue: Schema60.Literals(["steering", "followUp"]),
-  capacity: Schema60.Number
+class SteeringQueueFull extends Schema61.TaggedErrorClass()("@batonfx/core/SteeringQueueFull", {
+  queue: Schema61.Literals(["steering", "followUp"]),
+  capacity: Schema61.Number
 }) {
 }
 var resolvePolicy = (policy, mode) => ({
@@ -12506,18 +12651,18 @@ var queueStrategy = (strategy2) => {
       return "suspend";
   }
 };
-var makeQueue = (name, policy) => (policy.capacity === undefined ? Queue.unbounded() : Queue.make({ capacity: policy.capacity, strategy: queueStrategy(policy.onFull) })).pipe(Effect49.map((queue) => ({ name, queue, policy })));
-var offer = (runtime, message) => Queue.offer(runtime.queue, message).pipe(Effect49.flatMap((offered) => {
+var makeQueue = (name, policy) => (policy.capacity === undefined ? Queue.unbounded() : Queue.make({ capacity: policy.capacity, strategy: queueStrategy(policy.onFull) })).pipe(Effect51.map((queue) => ({ name, queue, policy })));
+var offer = (runtime, message) => Queue.offer(runtime.queue, message).pipe(Effect51.flatMap((offered) => {
   if (offered || runtime.policy.capacity === undefined || runtime.policy.onFull !== "fail")
-    return Effect49.void;
-  return Effect49.fail(new SteeringQueueFull({ queue: runtime.name, capacity: runtime.policy.capacity }));
+    return Effect51.void;
+  return Effect51.fail(new SteeringQueueFull({ queue: runtime.name, capacity: runtime.policy.capacity }));
 }));
-var drainOne = (queue) => Effect49.sync(() => {
+var drainOne = (queue) => Effect51.sync(() => {
   const taken = Queue.takeUnsafe(queue);
   return taken === undefined || !Exit.isSuccess(taken) ? [] : [taken.value];
 });
 var drain2 = (queue, mode) => mode === "all" ? Queue.clear(queue) : drainOne(queue);
-var layer38 = (options = {}) => Layer46.effect(Steering, Effect49.gen(function* () {
+var layer38 = (options = {}) => Layer48.effect(Steering, Effect51.gen(function* () {
   const steeringQueue = yield* makeQueue("steering", resolvePolicy(options.steering, "all"));
   const followUpQueue = yield* makeQueue("followUp", resolvePolicy(options.followUp, "one-at-a-time"));
   return Steering.of({
@@ -12527,153 +12672,9 @@ var layer38 = (options = {}) => Layer46.effect(Steering, Effect49.gen(function*
     takeFollowUp: () => drain2(followUpQueue.queue, followUpQueue.policy.mode)
   });
 }));
-var testLayer42 = (implementation) => Layer46.succeed(Steering, Steering.of(implementation));
-
-// ../../node_modules/.bun/@batonfx+core@0.4.0/node_modules/@batonfx/core/src/tool-context.ts
-var exports_tool_context = {};
-__export(exports_tool_context, {
-  testLayer: () => testLayer43,
-  layerDefault: () => layerDefault,
-  ToolContext: () => ToolContext
-});
-import { Context as Context47, Effect as Effect50, Layer as Layer47 } from "effect";
-
-class ToolContext extends Context47.Service()("@batonfx/core/ToolContext") {
-}
-var layerDefault = Layer47.sync(ToolContext, () => ToolContext.of({
-  signal: new AbortController().signal,
-  emit: () => Effect50.void,
-  sessionId: "local"
-}));
-var testLayer43 = (implementation) => Layer47.succeed(ToolContext, ToolContext.of(implementation));
-
-// ../../node_modules/.bun/@batonfx+core@0.4.0/node_modules/@batonfx/core/src/tool-executor.ts
-var exports_tool_executor = {};
-__export(exports_tool_executor, {
-  testLayer: () => testLayer44,
-  sandbox: () => sandbox,
-  router: () => router,
-  routeToolkit: () => routeToolkit,
-  route: () => route,
-  remote: () => remote,
-  mcp: () => mcp,
-  fromToolkit: () => fromToolkit,
-  executeToolkit: () => executeToolkit,
-  client: () => client,
-  ToolExecutor: () => ToolExecutor
-});
-import { Cause as Cause2, Context as Context48, Effect as Effect51, Layer as Layer48, Option as Option17, Schema as Schema61, Sink as Sink2, Stream as Stream8 } from "effect";
-class ToolExecutor extends Context48.Service()("@batonfx/core/ToolExecutor") {
-}
-var failureMessage = (cause) => {
-  const error5 = Cause2.squash(cause);
-  return error5 instanceof Error ? `${error5.name}: ${error5.message}` : String(error5);
-};
-var failureOutcome = (message) => ({ _tag: "Failure", message });
-var resultMessage = (result) => {
-  if (typeof result === "string")
-    return result;
-  if (result instanceof Error)
-    return `${result.name}: ${result.message}`;
-  try {
-    const message = JSON.stringify(result);
-    return message === undefined ? String(result) : message;
-  } catch {
-    return String(result);
-  }
-};
-var schemaMessage = (error5) => error5 instanceof Error ? error5.message : typeof error5 === "string" ? error5 : resultMessage(error5);
-var decodeSuccess = (tool2, result) => {
-  const successSchema = tool2.successSchema;
-  if (!Schema61.isSchema(successSchema)) {
-    return Effect51.succeed({ _tag: "Success", result, encodedResult: result });
-  }
-  return Schema61.decodeUnknownEffect(successSchema)(result).pipe(Effect51.flatMap((decoded) => Schema61.encodeUnknownEffect(successSchema)(decoded).pipe(Effect51.map((encoded) => ({ _tag: "Success", result: decoded, encodedResult: encoded })))), Effect51.catchCause((cause) => Effect51.succeed(failureOutcome(`invalid client result: ${schemaMessage(Cause2.squash(cause))}`))));
-};
-var placementOutcome = (placement, tool2, response) => {
-  switch (response._tag) {
-    case "Failure":
-      return Effect51.succeed(failureOutcome(response.message));
-    case "Suspend":
-      return Effect51.succeed({ _tag: "Suspend", token: response.token });
-    case "Success":
-      return decodeSuccess(tool2, response.result).pipe(Effect51.map((outcome) => outcome._tag === "Failure" ? failureOutcome(outcome.message.replace("invalid client result", `invalid ${placement} result`)) : outcome));
-  }
-};
-var executeWithToolkit = (toolkit, request) => {
-  if (toolkit.tools[request.call.name] === undefined) {
-    return Effect51.succeed(failureOutcome(`Tool ${request.call.name} is not registered`));
-  }
-  return toolkit.handle(request.call.name, request.call.params).pipe(Effect51.flatMap((results) => results.pipe(Stream8.filter((item) => item.preliminary === false), Stream8.run(Sink2.last()))), Effect51.map(Option17.match({
-    onNone: () => failureOutcome("Tool handler did not produce a final result"),
-    onSome: (result) => result.isFailure ? failureOutcome(resultMessage(result.result)) : {
-      _tag: "Success",
-      result: result.result,
-      encodedResult: result.encodedResult
-    }
-  })), Effect51.catchCause((cause) => {
-    if (Cause2.hasInterrupts(cause))
-      return Effect51.interrupt;
-    const error5 = Cause2.squash(cause);
-    if (error5 instanceof AgentSuspended) {
-      return Effect51.succeed({ _tag: "Suspend", token: error5.token });
-    }
-    return Effect51.succeed(failureOutcome(failureMessage(cause)));
-  }));
-};
-function executeToolkit(toolkit, request) {
-  return ("handle" in toolkit ? Effect51.succeed(toolkit) : toolkit).pipe(Effect51.flatMap((handled) => executeWithToolkit(handled, request)));
-}
-function fromToolkit(toolkit) {
-  return Layer48.effect(ToolExecutor, ("handle" in toolkit ? Effect51.succeed(toolkit) : toolkit).pipe(Effect51.map((handled) => ToolExecutor.of({
-    execute: (request) => executeWithToolkit(handled, request)
-  }))));
-}
-var route = (options) => {
-  const routedTools = options.tools ?? [];
-  return {
-    tools: routedTools,
-    matches: (request) => routedTools.includes(request.call.name) || options.matches?.(request) === true,
-    execute: options.execute
-  };
-};
-var placementRoute = (placement, options) => {
-  const routedTools = options.tools ?? Object.keys(options.toolkit.tools);
-  return route({
-    tools: routedTools,
-    execute: (request) => {
-      const tool2 = options.toolkit.tools[request.call.name];
-      if (tool2 === undefined)
-        return Effect51.succeed(failureOutcome(`Tool ${request.call.name} is not registered`));
-      const effect = options.execute({ ...request, placement, tool: tool2 });
-      const scheduled = "schedule" in options && options.schedule !== undefined ? Effect51.retry(effect, options.schedule) : effect;
-      return scheduled.pipe(Effect51.flatMap((response) => placementOutcome(placement, tool2, response)), Effect51.catchCause((cause) => Cause2.hasInterrupts(cause) ? Effect51.interrupt : Effect51.succeed(failureOutcome(`${placement} tool infrastructure failed: ${failureMessage(cause)}`))));
-    }
-  });
-};
-var client = (options) => placementRoute("client", options);
-var remote = (options) => placementRoute("remote", options);
-var mcp = (options) => placementRoute("mcp", options);
-var sandbox = (options) => placementRoute("sandbox", options);
-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(Effect51.map(makeRoute));
-}
-var routeInputEffect = (input) => Effect51.isEffect(input) ? input : Effect51.succeed(input);
-function router(routes) {
-  return Layer48.effect(ToolExecutor, Effect51.all(Array.from(routes, routeInputEffect)).pipe(Effect51.map((resolved) => ToolExecutor.of({
-    execute: (request) => {
-      const matched = resolved.find((candidate) => candidate.matches(request));
-      return matched === undefined ? Effect51.succeed(failureOutcome(`Tool ${request.call.name} is not registered`)) : matched.execute(request);
-    }
-  }))));
-}
-var testLayer44 = (implementation) => Layer48.succeed(ToolExecutor, ToolExecutor.of(implementation));
+var testLayer44 = (implementation) => Layer48.succeed(Steering, Steering.of(implementation));
 
-// ../../node_modules/.bun/@batonfx+core@0.4.0/node_modules/@batonfx/core/src/turn-policy.ts
+// ../../node_modules/.bun/@batonfx+core@0.4.2/node_modules/@batonfx/core/dist/turn-policy.js
 var exports_turn_policy = {};
 __export(exports_turn_policy, {
   untilToolCall: () => untilToolCall,
@@ -12683,7 +12684,8 @@ __export(exports_turn_policy, {
   decision: () => decision,
   both: () => both
 });
-import { Effect as Effect52 } from "effect";
+import { Effect as Effect52, Layer as Layer49 } from "effect";
+import { LanguageModel as LanguageModel4, Prompt as Prompt7, Response as Response5 } from "effect/unstable/ai";
 var decision = {
   continue: (overrides) => ({
     _tag: "Continue",
@@ -12721,7 +12723,7 @@ var both = (first, second) => ({
 });
 var defaultPolicy = recurs(8);
 
-// ../../node_modules/.bun/@batonfx+core@0.4.0/node_modules/@batonfx/core/src/agent.ts
+// ../../node_modules/.bun/@batonfx+core@0.4.2/node_modules/@batonfx/core/dist/agent.js
 var exports_agent = {};
 __export(exports_agent, {
   streamObject: () => streamObject,
@@ -12732,13 +12734,13 @@ __export(exports_agent, {
   defaultObjectPrompt: () => defaultObjectPrompt
 });
 import { Cause as Cause3, Effect as Effect53, Fiber, Option as Option18, Queue as Queue2, Ref as Ref14, Schema as Schema62, Stream as Stream9 } from "effect";
-import { Chat, LanguageModel as LanguageModel4, Prompt as Prompt4, Response as Response3, Telemetry, Tokenizer as Tokenizer2, Tool as Tool3, Toolkit as Toolkit3 } from "effect/unstable/ai";
+import { Chat, LanguageModel as LanguageModel5, Prompt as Prompt8, Response as Response6, Telemetry, Tokenizer as Tokenizer2, Tool as Tool5, Toolkit as Toolkit4 } from "effect/unstable/ai";
 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 ?? Toolkit3.empty,
+    toolkit: resolved.toolkit ?? Toolkit4.empty,
     policy: resolved.policy ?? defaultPolicy,
     ...resolved.model === undefined ? {} : { model: resolved.model },
     ...resolved.memory === undefined ? {} : { memory: resolved.memory },
@@ -12755,7 +12757,7 @@ var steeringDrainedEvent = (turn, queue, messages) => ({
 var skillListingBudgetTokens = 2048;
 var activateSkillToolName = "activate_skill";
 var activateSkillParameters = Schema62.Struct({ name: Schema62.String });
-var activateSkillTool = Tool3.make(activateSkillToolName, {
+var activateSkillTool = Tool5.make(activateSkillToolName, {
   description: "Load the full body for one listed Baton skill by name before applying that skill.",
   parameters: activateSkillParameters,
   success: Schema62.Struct({
@@ -12774,7 +12776,7 @@ var appendInstructionFragment = (base2, fragment) => {
 
 ${fragment}`;
 };
-var successResult = (call, outcome) => Response3.toolResultPart({
+var successResult = (call, outcome) => Response6.toolResultPart({
   id: call.id,
   name: call.name,
   isFailure: false,
@@ -12783,7 +12785,7 @@ var successResult = (call, outcome) => Response3.toolResultPart({
   providerExecuted: false,
   preliminary: false
 });
-var failedResult = (call, message) => Response3.toolResultPart({
+var failedResult = (call, message) => Response6.toolResultPart({
   id: call.id,
   name: call.name,
   isFailure: true,
@@ -12799,7 +12801,7 @@ var suspended = (call, token, reason) => new AgentSuspended({
   tool_name: call.name,
   tool_params: call.params
 });
-var withSystem = (instructions, prompt) => Prompt4.fromMessages([Prompt4.makeMessage("system", { content: instructions }), ...prompt.content]);
+var withSystem = (instructions, prompt) => Prompt8.fromMessages([Prompt8.makeMessage("system", { content: instructions }), ...prompt.content]);
 var skillListingsInstructions = (listings) => `Available skills:
 ${listings}
 
@@ -12909,10 +12911,10 @@ var streamInternal = (agent, options, structured) => Stream9.unwrap(Effect53.gen
     onSome: (service) => service.getOrCreate(persistenceOptions.chatId, persistenceOptions.timeToLive === undefined ? undefined : { timeToLive: persistenceOptions.timeToLive }).pipe(Effect53.mapError((error5) => new AgentError({ message: errorMessage(error5), turn: 0, cause: error5 })))
   });
   const seedSystem = persisted !== undefined && system !== undefined && (yield* Ref14.get(persisted.history)).content.length === 0 ? system : undefined;
-  const freshChat = options.history !== undefined ? Chat.fromPrompt(options.history) : system !== undefined ? Chat.fromPrompt([Prompt4.makeMessage("system", { content: system })]) : Chat.empty;
+  const freshChat = options.history !== undefined ? Chat.fromPrompt(options.history) : system !== undefined ? Chat.fromPrompt([Prompt8.makeMessage("system", { content: system })]) : Chat.empty;
   const chat = persisted ?? (yield* freshChat);
   const savePersisted = persisted === undefined ? Effect53.void : persisted.save.pipe(Effect53.mapError((error5) => new AgentError({ message: errorMessage(error5), turn: 0, cause: error5 })));
-  const failSuspended = (call, token, reason) => Stream9.unwrap(savePersisted.pipe(Effect53.as(Stream9.fail(suspended(call, token, reason)))));
+  const failSuspended = (call, token, reason) => Stream9.fail(suspended(call, token, reason));
   const state = {
     text: "",
     turn: 0,
@@ -12945,9 +12947,9 @@ var streamInternal = (agent, options, structured) => Stream9.unwrap(Effect53.gen
       }
       userParts.push(part);
     }
-    const memoryMessage2 = Prompt4.makeMessage("user", { content: userParts });
+    const memoryMessage2 = Prompt8.makeMessage("user", { content: userParts });
     const [first, ...rest] = prompt.content;
-    return first?.role === "system" ? Prompt4.fromMessages([first, memoryMessage2, ...rest]) : Prompt4.fromMessages([memoryMessage2, ...prompt.content]);
+    return first?.role === "system" ? Prompt8.fromMessages([first, memoryMessage2, ...rest]) : Prompt8.fromMessages([memoryMessage2, ...prompt.content]);
   });
   const recallInitialPrompt = (prompt) => memoryRuntime === undefined ? Effect53.succeed(prompt) : memoryRuntime.service.recall({ key: memoryRuntime.key, turn: 0, prompt }).pipe(Effect53.mapError((error5) => memoryError(0, error5)), Effect53.flatMap((items) => insertRecalledItems(0, prompt, items)));
   const rememberTurn = (turn, transcript, terminal2) => memoryRuntime === undefined ? Effect53.void : memoryRuntime.service.remember({ key: memoryRuntime.key, turn, transcript, terminal: terminal2 }).pipe(Effect53.mapError((error5) => memoryError(turn, error5)));
@@ -12977,7 +12979,7 @@ var streamInternal = (agent, options, structured) => Stream9.unwrap(Effect53.gen
       onSome: (tokenizer) => tokenizer.tokenize(prompt).pipe(Effect53.map((tokens) => tokens.length), Effect53.mapError((error5) => new AgentError({ message: errorMessage(error5), turn, cause: error5 })))
     });
   };
-  const compactionUsage = (turn, history, prompt) => countTokens(turn, Prompt4.concat(history, prompt)).pipe(Effect53.map((contextTokens) => ({
+  const compactionUsage = (turn, history, prompt) => countTokens(turn, Prompt8.concat(history, prompt)).pipe(Effect53.map((contextTokens) => ({
     contextTokens,
     contextWindow: options.compaction?.contextWindow ?? Number.POSITIVE_INFINITY,
     reserveTokens: DEFAULT_RESERVE_TOKENS
@@ -13038,7 +13040,7 @@ var streamInternal = (agent, options, structured) => Stream9.unwrap(Effect53.gen
       return executeToolkit(agent.toolkit, request);
     }
     const activated = activatedSkillTools.get(request.call.name);
-    return activated === undefined ? Effect53.succeed({ _tag: "Failure", message: `Tool ${request.call.name} is not registered` }) : executeToolkit(Toolkit3.make(activated), request);
+    return activated === undefined ? Effect53.succeed({ _tag: "Failure", message: `Tool ${request.call.name} is not registered` }) : executeToolkit(Toolkit4.make(activated), request);
   };
   const executeApproved = (turn, call, request) => Stream9.concat(Stream9.fromIterable([{ _tag: "ToolExecutionStarted", turn, call }]), Stream9.unwrap(Effect53.gen(function* () {
     const progressQueue = yield* Queue2.unbounded();
@@ -13201,7 +13203,7 @@ var streamInternal = (agent, options, structured) => Stream9.unwrap(Effect53.gen
   });
   const withModelResilience = (effect) => Option18.match(resilienceService, {
     onNone: () => effect,
-    onSome: (resilience) => Effect53.flatMap(LanguageModel4.LanguageModel, (model) => effect.pipe(Effect53.provideService(LanguageModel4.LanguageModel, apply(model, resilience))))
+    onSome: (resilience) => Effect53.flatMap(LanguageModel5.LanguageModel, (model) => effect.pipe(Effect53.provideService(LanguageModel5.LanguageModel, apply(model, resilience))))
   });
   const withAgentModel = (effect) => agentModelContext === undefined ? effect : effect.pipe(Effect53.provide(agentModelContext));
   const provideAgentModel = (stream2) => agentModelContext === undefined ? stream2 : stream2.pipe(Stream9.provideContext(agentModelContext));
@@ -13229,13 +13231,13 @@ var streamInternal = (agent, options, structured) => Stream9.unwrap(Effect53.gen
       detail: "ModelMiddleware dropped a tool-call part"
     })) : Stream9.empty
   }))));
-  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 currentToolkit = () => Toolkit4.make(...Object.values(agent.toolkit.tools), ...hasActivatableSkills ? [activateSkillTool] : [], ...activatedSkillTools.values());
+  const activeToolkit = (activeTools) => Toolkit4.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) => Stream9.unwrap(Ref14.get(chat.history).pipe(Effect53.map((historyBeforeAttempt) => {
       let emitted = false;
-      const messages = Prompt4.concat(historyBeforeAttempt, activePrompt).content;
+      const messages = Prompt8.concat(historyBeforeAttempt, activePrompt).content;
       return chat.streamText({ prompt: activePrompt, toolkit, disableToolCallResolution: true }).pipe(Stream9.map((part) => ({ part, messages })), Stream9.tap(() => Effect53.sync(() => {
         emitted = true;
       })), Stream9.catchCause((cause) => {
@@ -13249,13 +13251,13 @@ var streamInternal = (agent, options, structured) => Stream9.unwrap(Effect53.gen
             return attempt(compactedPrompt, false);
           }));
         }
-        return Stream9.make({ part: Response3.makePart("error", { error: error5 }), messages });
+        return Stream9.make({ part: Response6.makePart("error", { error: error5 }), messages });
       }));
     })));
-    const parts = Stream9.unwrap(applyPromptChain(chain, Prompt4.make(prompt), { agentName: agent.name, turn }).pipe(Effect53.flatMap((transformedPrompt) => preparePrompt(turn, transformedPrompt, false)), Effect53.map((preparedPrompt) => attempt(preparedPrompt, true).pipe(Stream9.flatMap(({ part, messages }) => applyPartToEvents(turn, part, messages))))));
+    const parts = Stream9.unwrap(applyPromptChain(chain, Prompt8.make(prompt), { agentName: agent.name, turn }).pipe(Effect53.flatMap((transformedPrompt) => preparePrompt(turn, transformedPrompt, false)), Effect53.map((preparedPrompt) => attempt(preparedPrompt, true).pipe(Stream9.flatMap(({ part, messages }) => applyPartToEvents(turn, part, messages))))));
     const resilientParts = Option18.match(resilienceService, {
       onNone: () => parts,
-      onSome: (resilience) => Stream9.unwrap(LanguageModel4.LanguageModel.pipe(Effect53.map((model) => parts.pipe(Stream9.provideService(LanguageModel4.LanguageModel, apply(model, resilience))))))
+      onSome: (resilience) => Stream9.unwrap(LanguageModel5.LanguageModel.pipe(Effect53.map((model) => parts.pipe(Stream9.provideService(LanguageModel5.LanguageModel, apply(model, resilience))))))
     });
     return overrides?.model === undefined ? provideAgentModel(resilientParts) : resilientParts.pipe(Stream9.provide(overrides.model));
   };
@@ -13274,7 +13276,7 @@ var streamInternal = (agent, options, structured) => Stream9.unwrap(Effect53.gen
   });
   const structuredFinalEvents = (turn, config) => Stream9.fromEffect(Effect53.gen(function* () {
     const structuredTurn = turn + 1;
-    const transformedPrompt = yield* applyPromptChain(chain, Prompt4.make(config.objectPrompt), {
+    const transformedPrompt = yield* applyPromptChain(chain, Prompt8.make(config.objectPrompt), {
       agentName: agent.name,
       turn: structuredTurn
     });
@@ -13295,7 +13297,7 @@ var streamInternal = (agent, options, structured) => Stream9.unwrap(Effect53.gen
     };
     return [structuredOutput, terminalCompletedEvent(structuredTurn, transcript)];
   })).pipe(Stream9.flatMap((events) => Stream9.fromIterable(events)));
-  const promptFromSteeringMessages = (messages) => messages.reduce((prompt, message) => Prompt4.concat(prompt, message.prompt), Prompt4.empty);
+  const promptFromSteeringMessages = (messages) => messages.reduce((prompt, message) => Prompt8.concat(prompt, message.prompt), Prompt8.empty);
   const takeSteering = () => Option18.match(steeringService, {
     onNone: () => Effect53.succeed([]),
     onSome: (service) => service.takeSteering()
@@ -13346,8 +13348,8 @@ var streamInternal = (agent, options, structured) => Stream9.unwrap(Effect53.gen
     }
     state.pending = [];
     const steering = yield* takeSteering();
-    const toolPrompt = Prompt4.fromResponseParts(pending);
-    const basePrompt = steering.length === 0 ? toolPrompt : Prompt4.concat(promptFromSteeringMessages(steering), toolPrompt);
+    const toolPrompt = Prompt8.fromResponseParts(pending);
+    const basePrompt = steering.length === 0 ? toolPrompt : Prompt8.concat(promptFromSteeringMessages(steering), toolPrompt);
     const prompt = decision2.overrides?.instructions === undefined ? basePrompt : withSystem(decision2.overrides.instructions, basePrompt);
     return {
       events: Stream9.fromIterable(steering.length === 0 ? [completed] : [completed, steeringDrainedEvent(turn, "steering", steering)]),
@@ -13368,7 +13370,7 @@ var streamInternal = (agent, options, structured) => Stream9.unwrap(Effect53.gen
   };
   const resumeStream = (resume) => {
     let next;
-    const call = Response3.makePart("tool-call", {
+    const call = Response6.makePart("tool-call", {
       id: resume.call.id,
       name: resume.call.name,
       params: resume.call.params,
@@ -13380,7 +13382,7 @@ var streamInternal = (agent, options, structured) => Stream9.unwrap(Effect53.gen
     })))), Stream9.withSpan("Baton.Agent.turn", { attributes: { "baton.turn": 0 } }));
     return Stream9.concat(currentTurn, Stream9.suspend(() => next === undefined ? Stream9.empty : runTurn(1, next.prompt, next.overrides)));
   };
-  const baseInitialPrompt = seedSystem === undefined ? Prompt4.make(options.prompt) : withSystem(seedSystem, Prompt4.make(options.prompt));
+  const baseInitialPrompt = seedSystem === undefined ? Prompt8.make(options.prompt) : withSystem(seedSystem, Prompt8.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(Stream9.catchCause((cause) => {
@@ -13388,7 +13390,13 @@ var streamInternal = (agent, options, structured) => Stream9.unwrap(Effect53.gen
       return Stream9.fromEffect(Effect53.interrupt);
     const error5 = Cause3.squash(cause);
     if (error5 instanceof AgentSuspended) {
-      return Stream9.unwrap(Ref14.get(chat.history).pipe(Effect53.map((transcript) => Stream9.concat(Stream9.fromIterable([turnCompletedEvent(state.turn, transcript)]), Stream9.failCause(cause)))));
+      return Stream9.unwrap(Effect53.gen(function* () {
+        const transcript = yield* Ref14.get(chat.history);
+        const checkpoint = state.pending.length === 0 ? transcript : Prompt8.concat(transcript, Prompt8.fromResponseParts(state.pending));
+        yield* Ref14.set(chat.history, checkpoint);
+        yield* savePersisted;
+        return Stream9.concat(Stream9.fromIterable([turnCompletedEvent(state.turn, checkpoint)]), Stream9.failCause(cause));
+      }));
     }
     return Stream9.failCause(cause);
   }));
@@ -13430,13 +13438,13 @@ var generateObject = (agent, options) => Stream9.runFold(streamObject(agent, opt
   })
 })));
 
-// ../../node_modules/.bun/@batonfx+core@0.4.0/node_modules/@batonfx/core/src/agent-tool.ts
+// ../../node_modules/.bun/@batonfx+core@0.4.2/node_modules/@batonfx/core/dist/agent-tool.js
 var exports_agent_tool = {};
 __export(exports_agent_tool, {
   asTool: () => asTool
 });
 import { Cause as Cause4, Effect as Effect54, Schema as Schema63 } from "effect";
-import { Tool as Tool4, Toolkit as Toolkit4 } from "effect/unstable/ai";
+import { Prompt as Prompt9, Tool as Tool6, Toolkit as Toolkit5 } from "effect/unstable/ai";
 var defaultParameters = Schema63.Struct({ prompt: Schema63.String });
 var errorMessage2 = (error5) => {
   if (error5 instanceof AgentSuspended) {
@@ -13466,14 +13474,14 @@ var asTool = (agent, options = {}) => {
   const success2 = options.success ?? Schema63.String;
   const toPrompt = options.toPrompt ?? ((params) => params.prompt);
   const fromResult = options.fromResult ?? ((result) => result.text);
-  const tool2 = Tool4.make(name, {
+  const tool2 = Tool6.make(name, {
     ...options.description === undefined ? {} : { description: options.description },
     parameters,
     success: success2,
     failure: Schema63.String,
     failureMode: "return"
   });
-  const toolkit = Toolkit4.make(tool2);
+  const toolkit = Toolkit5.make(tool2);
   const handler = (params) => Effect54.gen(function* () {
     const prompt = yield* Effect54.try({ try: () => toPrompt(params), catch: errorMessage2 });
     const result = yield* generate(agent, { prompt }).pipe(Effect54.catchCause((cause) => {
@@ -13486,7 +13494,7 @@ var asTool = (agent, options = {}) => {
   return lazyHandled(toolkit, name, handler);
 };
 
-// ../../node_modules/.bun/@batonfx+core@0.4.0/node_modules/@batonfx/core/src/guardrail.ts
+// ../../node_modules/.bun/@batonfx+core@0.4.2/node_modules/@batonfx/core/dist/guardrail.js
 var exports_guardrail = {};
 __export(exports_guardrail, {
   validateInput: () => validateInput2,
@@ -13495,16 +13503,16 @@ __export(exports_guardrail, {
   filterOutput: () => filterOutput
 });
 import { Effect as Effect55, Option as Option19 } from "effect";
-import { Prompt as Prompt6, Response as Response4 } from "effect/unstable/ai";
+import { Prompt as Prompt10, Response as Response7 } from "effect/unstable/ai";
 var replacement = (options) => options.replacement ?? "[redacted]";
 var redactText = (text2, options) => text2.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 redactUserPart = (part, options) => part.type === "text" ? Prompt10.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 });
+      return Prompt10.makePart("text", { text: redactText(part.text, options), options: part.options });
     case "reasoning":
-      return Prompt6.makePart("reasoning", { text: redactText(part.text, options), options: part.options });
+      return Prompt10.makePart("reasoning", { text: redactText(part.text, options), options: part.options });
     default:
       return part;
   }
@@ -13512,32 +13520,32 @@ var redactAssistantPart = (part, options) => {
 var redactToolPart = (part, options) => {
   if (part.type !== "tool-approval-response" || part.reason === undefined)
     return part;
-  return Prompt6.makePart("tool-approval-response", {
+  return Prompt10.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) => {
+var redactPromptText = (prompt, options) => Prompt10.fromMessages(prompt.content.map((message) => {
   switch (message.role) {
     case "system":
-      return Prompt6.makeMessage("system", {
+      return Prompt10.makeMessage("system", {
         content: redactText(message.content, options),
         options: message.options
       });
     case "user":
-      return Prompt6.makeMessage("user", {
+      return Prompt10.makeMessage("user", {
         content: message.content.map((part) => redactUserPart(part, options)),
         options: message.options
       });
     case "assistant":
-      return Prompt6.makeMessage("assistant", {
+      return Prompt10.makeMessage("assistant", {
         content: message.content.map((part) => redactAssistantPart(part, options)),
         options: message.options
       });
     case "tool":
-      return Prompt6.makeMessage("tool", {
+      return Prompt10.makeMessage("tool", {
         content: message.content.map((part) => redactToolPart(part, options)),
         options: message.options
       });
@@ -13556,7 +13564,7 @@ var redactOutput = (options) => ({
   transformPart: (part) => {
     if (part.type !== "text-delta")
       return Effect55.succeed(Option19.some(part));
-    return Effect55.succeed(Option19.some(Response4.makePart("text-delta", {
+    return Effect55.succeed(Option19.some(Response7.makePart("text-delta", {
       id: part.id,
       delta: redactText(part.delta, options),
       metadata: part.metadata
@@ -13567,7 +13575,7 @@ var filterOutput = (keep) => ({
   transformPart: (part, context) => Effect55.succeed(part.type === "tool-call" || keep(part, context) ? Option19.some(part) : Option19.none())
 });
 
-// ../../node_modules/.bun/@batonfx+core@0.4.0/node_modules/@batonfx/core/src/handoff.ts
+// ../../node_modules/.bun/@batonfx+core@0.4.2/node_modules/@batonfx/core/dist/handoff.js
 var exports_handoff = {};
 __export(exports_handoff, {
   transferTool: () => transferTool,
@@ -13575,7 +13583,7 @@ __export(exports_handoff, {
   fanOut: () => fanOut
 });
 import { Effect as Effect56, Schema as Schema64 } from "effect";
-import { AiError as AiError2, Toolkit as Toolkit5 } from "effect/unstable/ai";
+import { AiError as AiError2, Prompt as Prompt11, Tool as Tool7, Toolkit as Toolkit6 } from "effect/unstable/ai";
 var defaultTransferParameters = Schema64.Struct({ prompt: Schema64.String });
 var transferName = (agentName) => `transfer_to_${agentName}`;
 var positiveConcurrency = (value) => {
@@ -13605,7 +13613,7 @@ var mergeHandled = (toolkits) => {
     }
   };
 };
-var toolkitFromHandled = (toolkit) => Toolkit5.make(...Object.values(toolkit.tools));
+var toolkitFromHandled = (toolkit) => Toolkit6.make(...Object.values(toolkit.tools));
 var transferTool = (target, options = {}) => asTool(target, {
   name: options.nameOverride ?? transferName(target.name),
   description: options.description ?? `Transfer to ${target.name}`,
@@ -13631,22 +13639,8 @@ var supervisor = (options) => {
   };
 };
 
-// ../../node_modules/.bun/@batonfx+core@0.4.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 Tool6,
-  Toolkit as Toolkit6
-} from "effect/unstable/ai";
+// ../../node_modules/.bun/@batonfx+core@0.4.2/node_modules/@batonfx/core/dist/index.js
+import { AiError as AiError3, Chat as Chat2, EmbeddingModel, IdGenerator, LanguageModel as LanguageModel6, Model as Model2, Prompt as Prompt12, Response as Response8, ResponseIdTracker, Telemetry as Telemetry2, Tokenizer as Tokenizer3, Tool as Tool8, Toolkit as Toolkit7 } from "effect/unstable/ai";
 
 // ../runtime/src/child/child-run-service.ts
 var exports_child_run_service = {};
@@ -14870,7 +14864,7 @@ __export(exports_agent_loop_service, {
   AgentLoopBudgetExceeded: () => AgentLoopBudgetExceeded
 });
 import { Config as Config4, Context as Context67, Crypto as Crypto3, Effect as Effect87, HashSet as HashSet6, Layer as Layer73, Option as Option25, Ref as Ref21, Schema as Schema89, Stream as Stream12 } from "effect";
-import { Chat as Chat3, LanguageModel as LanguageModel6, Prompt as Prompt12, Tokenizer as Tokenizer4, Toolkit as Toolkit7 } from "effect/unstable/ai";
+import { Chat as Chat3, LanguageModel as LanguageModel7, Prompt as Prompt16, Tokenizer as Tokenizer4, Toolkit as Toolkit8 } from "effect/unstable/ai";
 
 // ../runtime/src/child/spawn-child-run-tool.ts
 import { Effect as Effect66, Schema as Schema73 } from "effect";
@@ -15103,7 +15097,7 @@ var transferTools = (config) => (config.agent.handoff_targets ?? []).map((target
 
 // ../runtime/src/memory/memory-service.ts
 import { Clock as Clock8, Context as Context59, Effect as Effect68, Layer as Layer60, Schema as Schema75 } from "effect";
-import { EmbeddingModel as EmbeddingModel3, Prompt as Prompt9 } from "effect/unstable/ai";
+import { EmbeddingModel as EmbeddingModel3, Prompt as Prompt13 } from "effect/unstable/ai";
 
 // ../runtime/src/model/embedding-model-service.ts
 import { Context as Context58, Effect as Effect67, Layer as Layer59, Ref as Ref18, Schema as Schema74 } from "effect";
@@ -15239,7 +15233,7 @@ var memoryError = (error5) => new exports_memory.MemoryError({
   message: error5 instanceof Error ? `${error5.name}: ${error5.message}` : String(error5)
 });
 var decodeSubject = (subject) => Schema75.decodeUnknownEffect(exports_ids_schema.MemorySubjectId)(subject).pipe(Effect68.mapError(memoryError));
-var textPart = (text2) => Prompt9.makePart("text", { text: text2 });
+var textPart = (text2) => Prompt13.makePart("text", { text: text2 });
 var textFromParts = (parts) => parts.filter((part) => part.type === "text").map((part) => part.text).join(`
 `).trim();
 var latestUserText = (prompt) => {
@@ -16329,7 +16323,7 @@ __export(exports_prompt_assembler_service, {
   PromptAssemblerError: () => PromptAssemblerError
 });
 import { Context as Context66, Effect as Effect80, Layer as Layer67, Schema as Schema85 } from "effect";
-import { Prompt as Prompt10 } from "effect/unstable/ai";
+import { Prompt as Prompt14 } from "effect/unstable/ai";
 
 // ../runtime/src/content/artifact-store-service.ts
 var exports_artifact_store_service = {};
@@ -16402,19 +16396,19 @@ var contentToPromptPart = (part) => {
   const options = part.provider_options;
   switch (part.type) {
     case "text":
-      return Prompt10.makePart("text", { text: part.text, ...options === undefined ? {} : { options } });
+      return Prompt14.makePart("text", { text: part.text, ...options === undefined ? {} : { options } });
     case "structured":
-      return Prompt10.makePart("text", {
+      return Prompt14.makePart("text", {
         text: stringifyJson(part.value),
         ...options === undefined ? {} : { options }
       });
     case "tool-call":
-      return Prompt10.makePart("text", {
+      return Prompt14.makePart("text", {
         text: stringifyJson(part.call),
         ...options === undefined ? {} : { options }
       });
     case "tool-result":
-      return Prompt10.makePart("text", {
+      return Prompt14.makePart("text", {
         text: stringifyJson(part.result),
         ...options === undefined ? {} : { options }
       });
@@ -16424,7 +16418,7 @@ var toAssemblerError = (error5) => new PromptAssemblerError({
   message: error5.reason !== undefined ? `${error5._tag}: ${error5.reason}` : error5.message !== undefined ? `${error5._tag}: ${error5.message}` : error5._tag
 });
 var resolveBlobPart = (blobs, part) => blobs.resolve(part).pipe(Effect80.map((resolved) => [
-  Prompt10.makePart("file", {
+  Prompt14.makePart("file", {
     mediaType: resolved.mediaType,
     data: resolved._tag === "Bytes" ? resolved.bytes : resolved.url,
     ...resolved.fileName === undefined ? {} : { fileName: resolved.fileName },
@@ -16465,9 +16459,9 @@ var defaultSystem = (agent, tools) => [`Agent: ${agent.name}`, agent.instruction
 `);
 var defaultPrompt = (blobs, artifacts, input) => Effect80.forEach(input, (part) => resolveContentPart(blobs, artifacts, part), { concurrency: 1 }).pipe(Effect80.map((parts) => {
   const flat = parts.flat();
-  return Prompt10.fromMessages([
-    Prompt10.makeMessage("user", {
-      content: flat.length === 0 ? [Prompt10.makePart("text", { text: "" })] : flat
+  return Prompt14.fromMessages([
+    Prompt14.makeMessage("user", {
+      content: flat.length === 0 ? [Prompt14.makePart("text", { text: "" })] : flat
     })
   ]);
 }));
@@ -16723,7 +16717,7 @@ var layer53 = (config) => Layer69.mergeAll(Layer69.succeed(exports_permissions.P
 
 // ../runtime/src/agent/relay-steering.ts
 import { Clock as Clock14, Effect as Effect83, Layer as Layer70, Schema as Schema87 } from "effect";
-import { Prompt as Prompt11 } from "effect/unstable/ai";
+import { Prompt as Prompt15 } from "effect/unstable/ai";
 var jsonValue4 = (value) => Schema87.decodeUnknownSync(exports_shared_schema.JsonValue)(value);
 var stringifyJson2 = (value) => JSON.stringify(jsonValue4(value));
 var createdAtForSequence2 = (config, sequence) => config.startedAt + sequence - config.eventSequence;
@@ -16742,22 +16736,22 @@ var purePromptPart = (part) => {
 };
 var contentToPromptPart2 = (part) => {
   const pure = purePromptPart(part);
-  return pure === undefined ? Prompt11.makePart("text", { text: stringifyJson2(part) }) : contentToPromptPart(pure);
+  return pure === undefined ? Prompt15.makePart("text", { text: stringifyJson2(part) }) : contentToPromptPart(pure);
 };
-var promptForContent = (content) => Prompt11.fromMessages([
-  Prompt11.makeMessage("user", {
-    content: content.length === 0 ? [Prompt11.makePart("text", { text: "" })] : content.map((part) => contentToPromptPart2(part))
+var promptForContent = (content) => Prompt15.fromMessages([
+  Prompt15.makeMessage("user", {
+    content: content.length === 0 ? [Prompt15.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 = Prompt11.make(message.prompt);
+  const prompt = Prompt15.make(message.prompt);
   const textParts = promptTextParts(prompt);
   if (textParts.length > 0)
     return textParts;
-  return [exports_content_schema.text(stringifyJson2(Schema87.encodeSync(Prompt11.Prompt)(prompt)))];
+  return [exports_content_schema.text(stringifyJson2(Schema87.encodeSync(Prompt15.Prompt)(prompt)))];
 };
 var steeringReceivedEvent = (config, kind, drain3, messages, sequence) => ({
   id: exports_ids_schema.EventId.make(`event:${drain3.drainId}:received`),
@@ -17149,7 +17143,7 @@ var toolFromDefinition = (definition) => dynamicTool(definition.name, {
   ...definition.metadata === undefined ? {} : { metadata: definition.metadata },
   run: () => Effect87.die("model-facing toolkit is not executed")
 }).tool;
-var toolkitFromRegistered = (registered) => Toolkit7.make(...registered.map(toolFromRegistered));
+var toolkitFromRegistered = (registered) => Toolkit8.make(...registered.map(toolFromRegistered));
 var handlersForToolExecutor = (registered) => Object.fromEntries(registered.map((tool2) => [
   tool2.definition.name,
   () => Effect87.die(`Relay ToolExecutor must execute ${tool2.definition.name}`)
@@ -17231,9 +17225,9 @@ var terminalMemoryTranscript = (prompt, text2) => {
     return;
   if (promptHasAssistantText(prompt, text2))
     return prompt;
-  return Prompt12.fromMessages([
+  return Prompt16.fromMessages([
     ...prompt.content,
-    Prompt12.makeMessage("assistant", { content: [Prompt12.makePart("text", { text: text2 })] })
+    Prompt16.makeMessage("assistant", { content: [Prompt16.makePart("text", { text: text2 })] })
   ]);
 };
 var recallOnlyMemory = (memory) => exports_memory.Memory.of({
@@ -17505,9 +17499,9 @@ var layer57 = Layer73.effect(Service54, Effect87.gen(function* () {
         }
       });
       const runFold = Effect87.gen(function* () {
-        const base2 = yield* LanguageModel6.LanguageModel;
+        const base2 = yield* LanguageModel7.LanguageModel;
         const sessionStore = input.sessionId !== undefined && Option25.isSome(sessionRepository) ? yield* make8(input.sessionId, input.sessionEntryScope ?? input.executionId).pipe(Effect87.provideService(exports_session_repository.Service, sessionRepository.value)) : undefined;
-        const folded = exports_agent.stream(agent, batonOptions).pipe(Stream12.runFoldEffect(() => ({ text: "", transcript: undefined, turn: undefined, tokensUsed: seededTokens }), foldEvent), Effect87.provideService(LanguageModel6.LanguageModel, base2), Effect87.provideService(exports_model_resilience.ModelResilience, policy), Effect87.provide(executorLayer), Effect87.provide(handlerLayer), Effect87.provide(layer52), Effect87.provide(exports_model_middleware.identityLayer), Effect87.provide(instructionsLayer), Effect87.provide(permissionsLayer), Effect87.provide(steeringLayer));
+        const folded = exports_agent.stream(agent, batonOptions).pipe(Stream12.runFoldEffect(() => ({ text: "", transcript: undefined, turn: undefined, tokensUsed: seededTokens }), foldEvent), Effect87.provideService(LanguageModel7.LanguageModel, base2), Effect87.provideService(exports_model_resilience.ModelResilience, policy), Effect87.provide(executorLayer), Effect87.provide(handlerLayer), Effect87.provide(layer52), Effect87.provide(exports_model_middleware.identityLayer), Effect87.provide(instructionsLayer), Effect87.provide(permissionsLayer), Effect87.provide(steeringLayer));
         const withToolOutput = toolOutputStore === undefined ? folded : folded.pipe(Effect87.provideService(exports_tool_output.ToolOutputStore, toolOutputStore));
         const withCompaction = compactionService === undefined ? withToolOutput : withToolOutput.pipe(Effect87.provideService(exports_compaction.Compaction, compactionService));
         const withSession = sessionStore === undefined ? withCompaction : withCompaction.pipe(Effect87.provideService(exports_session.SessionStore, sessionStore));
@@ -19214,7 +19208,7 @@ import { FetchHttpClient } from "effect/unstable/http";
 import { SqlClient as SqlClient30 } from "effect/unstable/sql/SqlClient";
 import { RpcSerialization } from "effect/unstable/rpc";
 import { WorkflowEngine } from "effect/unstable/workflow";
-import { LanguageModel as LanguageModel7 } from "effect/unstable/ai";
+import { LanguageModel as LanguageModel8 } from "effect/unstable/ai";
 
 // ../runtime/src/execution/execution-watch-service.ts
 var exports_execution_watch_service = {};
@@ -19747,7 +19741,7 @@ var sqlClientCheckLayer = Layer87.effect(Service67, Effect101.gen(function* () {
   const checkDatabase = yield* databaseHealthCheck;
   return yield* makeClientService(dialect2, checkDatabase);
 }));
-var deterministicTestModelLayer = Layer87.effect(LanguageModel7.LanguageModel, LanguageModel7.make({
+var deterministicTestModelLayer = Layer87.effect(LanguageModel8.LanguageModel, LanguageModel8.make({
   generateText: () => Effect101.succeed([{ type: "text", text: "deterministic test response" }]),
   streamText: () => Stream15.make({ type: "text-delta", id: "text", delta: "deterministic test response" })
 }));
@@ -20625,4 +20619,4 @@ var recoverAll = Effect104.fn("ChildFanOutAdmissionService.recoverAll.call")(fun
   const service = yield* Service69;
   return yield* service.recoverAll(inputFor);
 });
-export { __export, exports_ids_schema, exports_shared_schema, exports_address_schema, exports_tool_schema, exports_agent_schema, exports_content_schema, exports_execution_schema, exports_child_orchestration_schema, exports_envelope_schema, exports_inbox_schema, exports_entity_schema, exports_presence_schema, exports_schedule_schema, exports_skill_schema, exports_state_schema, exports_wait_schema, exports_workflow_schema, Dialect, dialect, fromDbTimestamp, fromNullableDbTimestamp, timestampParam, encodeJson, decodeJson, decodeBool, exports_child_execution_repository, exports_child_fan_out_repository, exports_cluster_registry_repository, exports_envelope_repository, exports_notification_bus, exports_execution_event_repository, exports_execution_repository, exports_inbox_repository, exports_schedule_repository, exports_session_repository, exports_skill_definition_repository, exports_steering_repository, exports_tool_call_repository, exports_workflow_definition_repository, exports_address_book_service, exports_event_log_service, exports_wait_service, exports_tool_runtime_service, exports_agent_registry_service, exports_address_resolution_service, exports_agent_event, exports_approvals, exports_session, exports_tool_output, exports_compaction, exports_instructions, exports_memory, exports_model_middleware, exports_model_registry, exports_model_resilience, exports_permissions, exports_skill_source, exports_steering, exports_tool_context, exports_tool_executor, exports_turn_policy, exports_agent, exports_agent_tool, exports_guardrail, exports_handoff, AiError3 as AiError, Chat2 as Chat, EmbeddingModel, IdGenerator, LanguageModel5 as LanguageModel, Model2 as Model, Prompt8 as Prompt, Response5 as Response, ResponseIdTracker, Telemetry2 as Telemetry, Tokenizer3 as Tokenizer, Tool6 as Tool, Toolkit6 as Toolkit, exports_child_run_service, exports_language_model_service, exports_model_call_policy, exports_presence_service, exports_presence_tool, exports_schema_registry_service, exports_blob_store_service, exports_execution_state_service, exports_skill_registry_service, exports_execution_service, exports_tool_transition_coordinator, exports_execution_workflow, exports_wait_signal, exports_topic_service, exports_envelope_service, exports_artifact_store_service, exports_prompt_assembler_service, exports_agent_loop_service, exports_child_fan_out_transition_service, exports_child_fan_out_runtime, exports_execution_entity, exports_entity_registry_service, exports_entity_instance_service, exports_execution_watch_service, exports_session_stream_service, exports_scheduler_service, exports_runner_runtime_service, exports_definition_runtime, exports_activity_version_registry };
+export { __export, exports_ids_schema, exports_shared_schema, exports_address_schema, exports_tool_schema, exports_agent_schema, exports_content_schema, exports_execution_schema, exports_child_orchestration_schema, exports_envelope_schema, exports_inbox_schema, exports_entity_schema, exports_presence_schema, exports_schedule_schema, exports_skill_schema, exports_state_schema, exports_wait_schema, exports_workflow_schema, Dialect, dialect, fromDbTimestamp, fromNullableDbTimestamp, timestampParam, encodeJson, decodeJson, decodeBool, exports_child_execution_repository, exports_child_fan_out_repository, exports_cluster_registry_repository, exports_envelope_repository, exports_notification_bus, exports_execution_event_repository, exports_execution_repository, exports_inbox_repository, exports_schedule_repository, exports_session_repository, exports_skill_definition_repository, exports_steering_repository, exports_tool_call_repository, exports_workflow_definition_repository, exports_address_book_service, exports_event_log_service, exports_wait_service, exports_tool_runtime_service, exports_agent_registry_service, exports_address_resolution_service, exports_agent_event, exports_tool_context, exports_tool_executor, exports_approvals, exports_session, exports_tool_output, exports_compaction, exports_instructions, exports_memory, exports_model_middleware, exports_model_registry, exports_model_resilience, exports_permissions, exports_skill_source, exports_steering, exports_turn_policy, exports_agent, exports_agent_tool, exports_guardrail, exports_handoff, AiError3 as AiError, Chat2 as Chat, EmbeddingModel, IdGenerator, LanguageModel6 as LanguageModel, Model2 as Model, Prompt12 as Prompt, Response8 as Response, ResponseIdTracker, Telemetry2 as Telemetry, Tokenizer3 as Tokenizer, Tool8 as Tool, Toolkit7 as Toolkit, exports_child_run_service, exports_language_model_service, exports_model_call_policy, exports_presence_service, exports_presence_tool, exports_schema_registry_service, exports_blob_store_service, exports_execution_state_service, exports_skill_registry_service, exports_execution_service, exports_tool_transition_coordinator, exports_execution_workflow, exports_wait_signal, exports_topic_service, exports_envelope_service, exports_artifact_store_service, exports_prompt_assembler_service, exports_agent_loop_service, exports_child_fan_out_transition_service, exports_child_fan_out_runtime, exports_execution_entity, exports_entity_registry_service, exports_entity_instance_service, exports_execution_watch_service, exports_session_stream_service, exports_scheduler_service, exports_runner_runtime_service, exports_definition_runtime, exports_activity_version_registry };