@relayfx/sdk 0.0.45 → 0.0.47

package/dist/index.js

@@ -3553,6 +3553,7 @@ __export(exports_memory_repository, {
   query: () => query,
   memoryLayer: () => memoryLayer11,
   layer: () => layer13,
+  forget: () => forget,
   Service: () => Service14,
   MemoryRow: () => MemoryRow,
   MemoryRepositoryError: () => MemoryRepositoryError
@@ -3721,7 +3722,17 @@ var layer13 = Layer14.effect(Service14, Effect14.gen(function* () {
     const decoded = yield* Effect14.forEach(rows, decodeRow9);
     return yield* rankMatches(decoded.map(toRecord7), input.embedding, input.topK);
   });
-  return Service14.of({ upsert: upsert2, query });
+  const forget = Effect14.fn("MemoryRepository.forget")(function* (input) {
+    const tenantId = yield* current();
+    yield* (input.id === undefined ? sql2`
+            DELETE FROM relay_memory_records
+            WHERE tenant_id = ${tenantId} AND agent = ${input.agent} AND subject = ${input.subject}
+          ` : sql2`
+            DELETE FROM relay_memory_records
+            WHERE tenant_id = ${tenantId} AND agent = ${input.agent} AND subject = ${input.subject} AND id = ${input.id}
+          `).pipe(Effect14.asVoid, Effect14.mapError(toRepositoryError10));
+  });
+  return Service14.of({ upsert: upsert2, query, forget });
 }));
 var memoryLayer11 = Layer14.effect(Service14, Effect14.gen(function* () {
   const records = yield* Ref2.make(new Map);
@@ -3751,7 +3762,20 @@ var memoryLayer11 = Layer14.effect(Service14, Effect14.gen(function* () {
     const scoped = Array.from(current2.values()).filter((record2) => record2.agent === input.agent && record2.subject === input.subject).map(cloneRecord4);
     return yield* rankMatches(scoped, input.embedding, input.topK);
   });
-  return Service14.of({ upsert: upsert2, query });
+  const forget = Effect14.fn("MemoryRepository.memory.forget")(function* (input) {
+    yield* Ref2.update(records, (current2) => {
+      const next = new Map(current2);
+      for (const [id2, record2] of current2) {
+        if (record2.agent !== input.agent || record2.subject !== input.subject)
+          continue;
+        if (input.id !== undefined && id2 !== input.id)
+          continue;
+        next.delete(id2);
+      }
+      return next;
+    });
+  });
+  return Service14.of({ upsert: upsert2, query, forget });
 }));
 var testLayer11 = (implementation) => Layer14.succeed(Service14, Service14.of(implementation));
 var upsert2 = Effect14.fn("MemoryRepository.upsert.call")(function* (input) {
@@ -3762,6 +3786,10 @@ var query = Effect14.fn("MemoryRepository.query.call")(function* (input) {
   const repository = yield* Service14;
   return yield* repository.query(input);
 });
+var forget = Effect14.fn("MemoryRepository.forget.call")(function* (input) {
+  const repository = yield* Service14;
+  return yield* repository.forget(input);
+});
 // ../store-sql/src/permission/permission-rule-repository.ts
 var exports_permission_rule_repository = {};
 __export(exports_permission_rule_repository, {
@@ -8453,7 +8481,7 @@ __export(exports_agent_loop_service, {
   AgentLoopBudgetExceeded: () => AgentLoopBudgetExceeded
 });
 
-// ../../node_modules/.bun/@batonfx+core@0.3.3/node_modules/@batonfx/core/src/agent.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.6/node_modules/@batonfx/core/src/agent.ts
 var exports_agent = {};
 __export(exports_agent, {
   streamObject: () => streamObject,
@@ -8463,10 +8491,10 @@ __export(exports_agent, {
   generate: () => generate,
   defaultObjectPrompt: () => defaultObjectPrompt
 });
-import { Cause as Cause3, Effect as Effect45, Fiber, Option as Option15, Queue as Queue2, Ref as Ref10, Schema as Schema47, Stream as Stream7 } from "effect";
-import { Chat, LanguageModel as LanguageModel3, Prompt as Prompt4, Response as Response3, Telemetry, Tokenizer as Tokenizer2, Tool as Tool4, Toolkit as Toolkit3 } from "effect/unstable/ai";
+import { Cause as Cause3, Effect as Effect46, Fiber, Option as Option16, Queue as Queue2, Ref as Ref11, Schema as Schema48, Stream as Stream7 } from "effect";
+import { Chat, LanguageModel as LanguageModel4, Prompt as Prompt4, Response as Response3, Telemetry, Tokenizer as Tokenizer2, Tool as Tool4, Toolkit as Toolkit3 } from "effect/unstable/ai";
 
-// ../../node_modules/.bun/@batonfx+core@0.3.3/node_modules/@batonfx/core/src/agent-event.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.6/node_modules/@batonfx/core/src/agent-event.ts
 var exports_agent_event = {};
 __export(exports_agent_event, {
   addUsage: () => addUsage,
@@ -8523,7 +8551,7 @@ class AgentSuspended extends Schema38.TaggedErrorClass()("@batonfx/core/AgentSus
 }) {
 }
 
-// ../../node_modules/.bun/@batonfx+core@0.3.3/node_modules/@batonfx/core/src/approvals.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.6/node_modules/@batonfx/core/src/approvals.ts
 var exports_approvals = {};
 __export(exports_approvals, {
   testLayer: () => testLayer26,
@@ -8539,7 +8567,7 @@ var autoApprove = Layer29.succeed(Approvals, Approvals.of({ check: () => Effect3
 var denyAll = Layer29.succeed(Approvals, Approvals.of({ check: () => Effect31.succeed({ _tag: "Denied" }) }));
 var testLayer26 = (implementation) => Layer29.succeed(Approvals, Approvals.of(implementation));
 
-// ../../node_modules/.bun/@batonfx+core@0.3.3/node_modules/@batonfx/core/src/compaction.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.6/node_modules/@batonfx/core/src/compaction.ts
 var exports_compaction = {};
 __export(exports_compaction, {
   truncate: () => truncate,
@@ -8557,7 +8585,7 @@ __export(exports_compaction, {
 import { Context as Context32, Effect as Effect34, Layer as Layer32, Option as Option10, Schema as Schema41 } from "effect";
 import { LanguageModel, Prompt as Prompt3, Tokenizer, Toolkit as Toolkit2 } from "effect/unstable/ai";
 
-// ../../node_modules/.bun/@batonfx+core@0.3.3/node_modules/@batonfx/core/src/session.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.6/node_modules/@batonfx/core/src/session.ts
 var exports_session = {};
 __export(exports_session, {
   testLayer: () => testLayer27,
@@ -8730,7 +8758,7 @@ var memoryLayer24 = Layer30.effect(SessionStore, Ref7.make(initialState).pipe(Ef
 }))));
 var testLayer27 = (implementation) => Layer30.succeed(SessionStore, SessionStore.of(implementation));
 
-// ../../node_modules/.bun/@batonfx+core@0.3.3/node_modules/@batonfx/core/src/tool-output.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.6/node_modules/@batonfx/core/src/tool-output.ts
 var exports_tool_output = {};
 __export(exports_tool_output, {
   testLayer: () => testLayer28,
@@ -8790,7 +8818,7 @@ var bound = (result, options) => Effect33.gen(function* () {
   return { _tag: "Success", result: output, encodedResult: output };
 });
 
-// ../../node_modules/.bun/@batonfx+core@0.3.3/node_modules/@batonfx/core/src/compaction.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.6/node_modules/@batonfx/core/src/compaction.ts
 var DEFAULT_RESERVE_TOKENS = 16384;
 var DEFAULT_KEEP_RECENT_TOKENS = 20000;
 var SUMMARY_TEMPLATE = `Summarize the conversation so another agent can continue seamlessly.
@@ -8973,7 +9001,7 @@ var truncate = (maxTokens) => ({
 var testLayer29 = (implementation) => Layer32.succeed(Compaction, Compaction.of(implementation));
 var isContextOverflow = (error) => /context|token|prompt/i.test(error instanceof Error ? `${error.name}: ${error.message}` : String(error)) && /overflow|exceed|exceeded|maximum|too large|too long|length/i.test(error instanceof Error ? `${error.name}: ${error.message}` : String(error));
 
-// ../../node_modules/.bun/@batonfx+core@0.3.3/node_modules/@batonfx/core/src/instructions.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.6/node_modules/@batonfx/core/src/instructions.ts
 var exports_instructions = {};
 __export(exports_instructions, {
   testLayer: () => testLayer30,
@@ -9022,7 +9050,7 @@ var renderUpdate = (epoch, context) => Effect35.gen(function* () {
 var layer27 = (sources) => Layer33.succeed(Instructions, Instructions.of({ sources: [...sources] }));
 var testLayer30 = (implementation) => Layer33.succeed(Instructions, Instructions.of(implementation));
 
-// ../../node_modules/.bun/@batonfx+core@0.3.3/node_modules/@batonfx/core/src/memory.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.6/node_modules/@batonfx/core/src/memory.ts
 var exports_memory = {};
 __export(exports_memory, {
   testLayer: () => testLayer31,
@@ -9042,16 +9070,18 @@ class Memory extends Context34.Service()("@batonfx/core/Memory") {
 }
 var noop = {
   recall: () => Effect36.succeed([]),
-  remember: () => Effect36.void
+  remember: () => Effect36.void,
+  forget: () => Effect36.void
 };
 var merge = (first, second) => ({
   recall: (input) => Effect36.all([first.recall(input), second.recall(input)]).pipe(Effect36.map(([firstItems, secondItems]) => [...firstItems, ...secondItems])),
-  remember: (input) => Effect36.all([first.remember(input), second.remember(input)], { discard: true })
+  remember: (input) => Effect36.all([first.remember(input), second.remember(input)], { discard: true }),
+  forget: (input) => Effect36.all([first.forget(input), second.forget(input)], { discard: true })
 });
 var noopLayer = Layer34.succeed(Memory, Memory.of(noop));
 var testLayer31 = (implementation) => Layer34.succeed(Memory, Memory.of(implementation));
 
-// ../../node_modules/.bun/@batonfx+core@0.3.3/node_modules/@batonfx/core/src/model-middleware.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.6/node_modules/@batonfx/core/src/model-middleware.ts
 var exports_model_middleware = {};
 __export(exports_model_middleware, {
   layer: () => layer28,
@@ -9065,21 +9095,110 @@ class ModelMiddleware extends Context35.Service()("@batonfx/core/ModelMiddleware
 var identityLayer = Layer35.succeed(ModelMiddleware, []);
 var layer28 = (middleware) => Layer35.succeed(ModelMiddleware, middleware);
 
-// ../../node_modules/.bun/@batonfx+core@0.3.3/node_modules/@batonfx/core/src/model-resilience.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.6/node_modules/@batonfx/core/src/model-registry.ts
+var exports_model_registry = {};
+__export(exports_model_registry, {
+  testLayer: () => testLayer32,
+  registrations: () => registrations,
+  registrationFromLayer: () => registrationFromLayer,
+  register: () => register4,
+  provide: () => provide,
+  memoryLayer: () => memoryLayer25,
+  layerFromRegistrationEffects: () => layerFromRegistrationEffects,
+  layer: () => layer29,
+  combine: () => combine,
+  Service: () => Service29,
+  LanguageModelNotRegistered: () => LanguageModelNotRegistered
+});
+import { Chunk as Chunk2, Context as Context36, Effect as Effect38, Layer as Layer36, Option as Option13, Ref as Ref9, Schema as Schema43, Semaphore as Semaphore3 } from "effect";
+import { Model } from "effect/unstable/ai";
+
+class LanguageModelNotRegistered extends Schema43.TaggedErrorClass()("LanguageModelNotRegistered", {
+  provider: Schema43.String,
+  model: Schema43.String,
+  registration_key: Schema43.optionalKey(Schema43.String)
+}) {
+}
+
+class Service29 extends Context36.Service()("@batonfx/core/ModelRegistry") {
+}
+var registrationVariantKey = (value) => value.registrationKey ?? null;
+var selectionVariantKey = (selection) => selection.registrationKey ?? null;
+var registryIdentity = (registration) => JSON.stringify([registration.provider, registration.model, registrationVariantKey(registration)]);
+var matchesSelection = (selection) => (registration) => registration.provider === selection.provider && registration.model === selection.model && registrationVariantKey(registration) === selectionVariantKey(selection);
+var upsertRegistration = (registry, registration) => {
+  const key2 = registryIdentity(registration);
+  const exists = Option13.isSome(Chunk2.findFirst(registry, (item) => registryIdentity(item) === key2));
+  if (!exists)
+    return Chunk2.append(registry, registration);
+  return Chunk2.map(registry, (item) => registryIdentity(item) === key2 ? registration : item);
+};
+var findRegistration = (registry, selection) => Chunk2.findFirst(registry, matchesSelection(selection)).pipe(Option13.getOrUndefined);
+var registrationFromLayer = (input) => Model.make(input.provider, input.model, input.layer).captureRequirements.pipe(Effect38.map((layer29) => ({
+  provider: input.provider,
+  model: input.model,
+  layer: layer29,
+  ...input.registrationKey === undefined ? {} : { registrationKey: input.registrationKey },
+  ...input.metadata === undefined ? {} : { metadata: input.metadata }
+})));
+var layer29 = (initialRegistrations = [], options) => Layer36.effect(Service29, Effect38.gen(function* () {
+  const registry = yield* Ref9.make(initialRegistrations.reduce(upsertRegistration, Chunk2.empty()));
+  const semaphore = options?.maxConcurrentModelCalls === undefined ? undefined : yield* Semaphore3.make(options.maxConcurrentModelCalls);
+  const register4 = Effect38.fn("ModelRegistry.register")(function* (input) {
+    yield* Ref9.update(registry, (items) => upsertRegistration(items, input.registration));
+  });
+  const registrations = Ref9.get(registry).pipe(Effect38.map(Chunk2.toReadonlyArray));
+  const provide = Effect38.fn("ModelRegistry.provide")(function* (selection, effect) {
+    const items = yield* Ref9.get(registry);
+    const registration = findRegistration(items, selection);
+    if (registration === undefined) {
+      return yield* Effect38.fail(new LanguageModelNotRegistered({
+        provider: selection.provider,
+        model: selection.model,
+        ...selection.registrationKey === undefined ? {} : { registration_key: selection.registrationKey }
+      }));
+    }
+    const provided = effect.pipe(Effect38.provide(registration.layer));
+    return yield* semaphore === undefined ? provided : semaphore.withPermits(1)(provided);
+  });
+  return Service29.of({
+    register: register4,
+    registrations,
+    provide
+  });
+}));
+var layerFromRegistrationEffects = (registrations, options) => Layer36.unwrap(Effect38.all(registrations).pipe(Effect38.map((items) => layer29(items, options))));
+var combine = (registries, options) => Layer36.unwrap(Effect38.forEach(registries, (registry) => Layer36.build(registry).pipe(Effect38.flatMap((context) => Context36.get(context, Service29).registrations))).pipe(Effect38.map((groups) => layer29(groups.flat(), options))));
+var memoryLayer25 = layer29;
+var testLayer32 = (implementation) => Layer36.succeed(Service29, Service29.of(implementation));
+var register4 = Effect38.fn("ModelRegistry.register.call")(function* (input) {
+  const service = yield* Service29;
+  return yield* service.register(input);
+});
+var registrations = Effect38.fn("ModelRegistry.registrations.call")(function* () {
+  const service = yield* Service29;
+  return yield* service.registrations;
+});
+var provide = (selection, effect) => Effect38.gen(function* () {
+  const service = yield* Service29;
+  return yield* service.provide(selection, effect);
+});
+
+// ../../node_modules/.bun/@batonfx+core@0.3.6/node_modules/@batonfx/core/src/model-resilience.ts
 var exports_model_resilience = {};
 __export(exports_model_resilience, {
-  testLayer: () => testLayer32,
+  testLayer: () => testLayer33,
   none: () => none,
   make: () => make3,
-  layer: () => layer29,
+  layer: () => layer30,
   defaultClassify: () => defaultClassify,
   apply: () => apply,
   ModelResilience: () => ModelResilience
 });
-import { Cause, Context as Context36, Effect as Effect38, Layer as Layer36, Schedule as Schedule2, Stream as Stream5 } from "effect";
+import { Cause, Context as Context37, Effect as Effect39, Layer as Layer37, Schedule as Schedule2, Stream as Stream5 } from "effect";
 import { AiError, Response as Response2 } from "effect/unstable/ai";
 
-class ModelResilience extends Context36.Service()("@batonfx/core/ModelResilience") {
+class ModelResilience extends Context37.Service()("@batonfx/core/ModelResilience") {
 }
 var defaultClassify = (error) => AiError.isAiError(error) && error.isRetryable ? "transient" : "terminal";
 var none = { classify: () => "terminal", retrySchedule: Schedule2.recurs(0) };
@@ -9087,9 +9206,9 @@ var make3 = (input) => ({
   classify: input?.classify ?? defaultClassify,
   retrySchedule: input?.retrySchedule ?? none.retrySchedule
 });
-var layer29 = (input) => Layer36.succeed(ModelResilience, ModelResilience.of(make3(input)));
-var testLayer32 = (implementation) => Layer36.succeed(ModelResilience, ModelResilience.of(implementation));
-var retryEffect = (effect, resilience) => Effect38.suspend(effect).pipe(Effect38.retry({
+var layer30 = (input) => Layer37.succeed(ModelResilience, ModelResilience.of(make3(input)));
+var testLayer33 = (implementation) => Layer37.succeed(ModelResilience, ModelResilience.of(implementation));
+var retryEffect = (effect, resilience) => Effect39.suspend(effect).pipe(Effect39.retry({
   schedule: resilience.retrySchedule,
   while: (error) => resilience.classify(error) === "transient"
 }));
@@ -9100,7 +9219,7 @@ var apply = (model, resilience) => ({
   generateObject: (options) => retryEffect(() => model.generateObject(options), resilience),
   streamText: (options) => Stream5.suspend(() => {
     let emitted = false;
-    return model.streamText(options).pipe(Stream5.tap(() => Effect38.sync(() => {
+    return model.streamText(options).pipe(Stream5.tap(() => Effect39.sync(() => {
       emitted = true;
     })), Stream5.catchCause((cause) => {
       if (Cause.hasInterrupts(cause))
@@ -9111,10 +9230,10 @@ var apply = (model, resilience) => ({
   }).pipe(Stream5.retry(retryStreamSchedule(resilience)))
 });
 
-// ../../node_modules/.bun/@batonfx+core@0.3.3/node_modules/@batonfx/core/src/permissions.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.6/node_modules/@batonfx/core/src/permissions.ts
 var exports_permissions = {};
 __export(exports_permissions, {
-  testLayer: () => testLayer33,
+  testLayer: () => testLayer34,
   ruleStoreTestLayer: () => ruleStoreTestLayer,
   ruleStoreMemory: () => ruleStoreMemory,
   matches: () => matches,
@@ -9126,17 +9245,17 @@ __export(exports_permissions, {
   Permissions: () => Permissions,
   PermissionError: () => PermissionError
 });
-import { Context as Context37, Effect as Effect39, Layer as Layer37, Option as Option13, Ref as Ref9, Schema as Schema43 } from "effect";
+import { Context as Context38, Effect as Effect40, Layer as Layer38, Option as Option14, Ref as Ref10, Schema as Schema44 } from "effect";
 
-class PermissionError extends Schema43.TaggedErrorClass()("@batonfx/core/PermissionError", {
-  message: Schema43.String
+class PermissionError extends Schema44.TaggedErrorClass()("@batonfx/core/PermissionError", {
+  message: Schema44.String
 }) {
 }
 
-class Permissions extends Context37.Service()("@batonfx/core/Permissions") {
+class Permissions extends Context38.Service()("@batonfx/core/Permissions") {
 }
 
-class RuleStore extends Context37.Service()("@batonfx/core/PermissionRuleStore") {
+class RuleStore extends Context38.Service()("@batonfx/core/PermissionRuleStore") {
 }
 var escapeRegExp = (value) => value.replace(/[|\\{}()[\]^$+?.]/g, "\\$&");
 var glob = (pattern) => new RegExp(`^${pattern.split("*").map(escapeRegExp).join(".*")}$`);
@@ -9223,28 +9342,28 @@ var decisionFor = (ruleset, request) => {
       return { _tag: "Ask", token: tokenFor(request) };
   }
 };
-var fromRuleset = (ruleset) => Layer37.succeed(Permissions, Permissions.of({
-  evaluate: (request) => Effect39.succeed(decisionFor(ruleset, request)),
-  await: () => Effect39.succeed(Option13.none())
+var fromRuleset = (ruleset) => Layer38.succeed(Permissions, Permissions.of({
+  evaluate: (request) => Effect40.succeed(decisionFor(ruleset, request)),
+  await: () => Effect40.succeed(Option14.none())
 }));
-var allowAll = Layer37.succeed(Permissions, Permissions.of({
-  evaluate: () => Effect39.succeed({ _tag: "Allow" }),
-  await: () => Effect39.succeed(Option13.none())
+var allowAll = Layer38.succeed(Permissions, Permissions.of({
+  evaluate: () => Effect40.succeed({ _tag: "Allow" }),
+  await: () => Effect40.succeed(Option14.none())
 }));
-var interactive = (options) => Layer37.succeed(Permissions, Permissions.of({
-  evaluate: (request) => Effect39.succeed(decisionFor(options.ruleset, request)),
-  await: (pending) => options.onAsk(pending).pipe(Effect39.map(Option13.some))
+var interactive = (options) => Layer38.succeed(Permissions, Permissions.of({
+  evaluate: (request) => Effect40.succeed(decisionFor(options.ruleset, request)),
+  await: (pending) => options.onAsk(pending).pipe(Effect40.map(Option14.some))
 }));
-var ruleStoreMemory = (initialRules = []) => Layer37.effect(RuleStore, Ref9.make(initialRules).pipe(Effect39.map((rules) => RuleStore.of({
-  remember: (rule) => Ref9.update(rules, (current2) => [...current2, rule])
+var ruleStoreMemory = (initialRules = []) => Layer38.effect(RuleStore, Ref10.make(initialRules).pipe(Effect40.map((rules) => RuleStore.of({
+  remember: (rule) => Ref10.update(rules, (current2) => [...current2, rule])
 }))));
-var ruleStoreTestLayer = (implementation) => Layer37.succeed(RuleStore, RuleStore.of(implementation));
-var testLayer33 = (implementation) => Layer37.succeed(Permissions, Permissions.of(implementation));
+var ruleStoreTestLayer = (implementation) => Layer38.succeed(RuleStore, RuleStore.of(implementation));
+var testLayer34 = (implementation) => Layer38.succeed(Permissions, Permissions.of(implementation));
 
-// ../../node_modules/.bun/@batonfx+core@0.3.3/node_modules/@batonfx/core/src/skill-source.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.6/node_modules/@batonfx/core/src/skill-source.ts
 var exports_skill_source = {};
 __export(exports_skill_source, {
-  testLayer: () => testLayer34,
+  testLayer: () => testLayer35,
   selectListings: () => selectListings,
   makeListing: () => makeListing,
   fromSkills: () => fromSkills,
@@ -9253,29 +9372,29 @@ __export(exports_skill_source, {
   SkillSource: () => SkillSource,
   DESCRIPTION_CAP: () => DESCRIPTION_CAP
 });
-import { Context as Context38, Effect as Effect40, Layer as Layer38, Schema as Schema44 } from "effect";
+import { Context as Context39, Effect as Effect41, Layer as Layer39, Schema as Schema45 } from "effect";
 
-class SkillSourceError extends Schema44.TaggedErrorClass()("@batonfx/core/SkillSourceError", {
-  source: Schema44.String,
-  message: Schema44.String,
-  cause: Schema44.optionalKey(Schema44.Defect())
+class SkillSourceError extends Schema45.TaggedErrorClass()("@batonfx/core/SkillSourceError", {
+  source: Schema45.String,
+  message: Schema45.String,
+  cause: Schema45.optionalKey(Schema45.Defect())
 }) {
 }
 var DESCRIPTION_CAP = 1536;
 
-class SkillSource extends Context38.Service()("@batonfx/core/SkillSource") {
+class SkillSource extends Context39.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 Layer38.succeed(SkillSource, SkillSource.of({
-    all: Effect40.succeed(all),
-    get: (name) => Effect40.succeed(byName.get(name))
+  return Layer39.succeed(SkillSource, SkillSource.of({
+    all: Effect41.succeed(all),
+    get: (name) => Effect41.succeed(byName.get(name))
   }));
 };
 var empty = fromSkills([]);
-var testLayer34 = (implementation) => Layer38.succeed(SkillSource, SkillSource.of(implementation));
+var testLayer35 = (implementation) => Layer39.succeed(SkillSource, SkillSource.of(implementation));
 var estimatedTokens = (listing) => Math.ceil(listing.length / 4);
 var usageRank = (skill, recentlyUsed) => {
   const index2 = recentlyUsed.indexOf(skill.frontmatter.name);
@@ -9299,22 +9418,22 @@ var selectListings = (skills, budgetTokens, recentlyUsed) => {
   return selected;
 };
 
-// ../../node_modules/.bun/@batonfx+core@0.3.3/node_modules/@batonfx/core/src/steering.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.6/node_modules/@batonfx/core/src/steering.ts
 var exports_steering = {};
 __export(exports_steering, {
-  testLayer: () => testLayer35,
-  layer: () => layer30,
+  testLayer: () => testLayer36,
+  layer: () => layer31,
   SteeringQueueFull: () => SteeringQueueFull,
   Steering: () => Steering
 });
-import { Context as Context39, Effect as Effect41, Exit, Layer as Layer39, Queue, Schema as Schema45 } from "effect";
+import { Context as Context40, Effect as Effect42, Exit, Layer as Layer40, Queue, Schema as Schema46 } from "effect";
 
-class Steering extends Context39.Service()("@batonfx/core/Steering") {
+class Steering extends Context40.Service()("@batonfx/core/Steering") {
 }
 
-class SteeringQueueFull extends Schema45.TaggedErrorClass()("@batonfx/core/SteeringQueueFull", {
-  queue: Schema45.Literals(["steering", "followUp"]),
-  capacity: Schema45.Number
+class SteeringQueueFull extends Schema46.TaggedErrorClass()("@batonfx/core/SteeringQueueFull", {
+  queue: Schema46.Literals(["steering", "followUp"]),
+  capacity: Schema46.Number
 }) {
 }
 var resolvePolicy = (policy, mode) => ({
@@ -9333,18 +9452,18 @@ var queueStrategy = (strategy) => {
       return "suspend";
   }
 };
-var makeQueue = (name, policy) => (policy.capacity === undefined ? Queue.unbounded() : Queue.make({ capacity: policy.capacity, strategy: queueStrategy(policy.onFull) })).pipe(Effect41.map((queue) => ({ name, queue, policy })));
-var offer = (runtime, message) => Queue.offer(runtime.queue, message).pipe(Effect41.flatMap((offered) => {
+var makeQueue = (name, policy) => (policy.capacity === undefined ? Queue.unbounded() : Queue.make({ capacity: policy.capacity, strategy: queueStrategy(policy.onFull) })).pipe(Effect42.map((queue) => ({ name, queue, policy })));
+var offer = (runtime, message) => Queue.offer(runtime.queue, message).pipe(Effect42.flatMap((offered) => {
   if (offered || runtime.policy.capacity === undefined || runtime.policy.onFull !== "fail")
-    return Effect41.void;
-  return Effect41.fail(new SteeringQueueFull({ queue: runtime.name, capacity: runtime.policy.capacity }));
+    return Effect42.void;
+  return Effect42.fail(new SteeringQueueFull({ queue: runtime.name, capacity: runtime.policy.capacity }));
 }));
-var drainOne = (queue) => Effect41.sync(() => {
+var drainOne = (queue) => Effect42.sync(() => {
   const taken = Queue.takeUnsafe(queue);
   return taken === undefined || !Exit.isSuccess(taken) ? [] : [taken.value];
 });
 var drain = (queue, mode) => mode === "all" ? Queue.clear(queue) : drainOne(queue);
-var layer30 = (options = {}) => Layer39.effect(Steering, Effect41.gen(function* () {
+var layer31 = (options = {}) => Layer40.effect(Steering, Effect42.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({
@@ -9354,30 +9473,30 @@ var layer30 = (options = {}) => Layer39.effect(Steering, Effect41.gen(function*
     takeFollowUp: () => drain(followUpQueue.queue, followUpQueue.policy.mode)
   });
 }));
-var testLayer35 = (implementation) => Layer39.succeed(Steering, Steering.of(implementation));
+var testLayer36 = (implementation) => Layer40.succeed(Steering, Steering.of(implementation));
 
-// ../../node_modules/.bun/@batonfx+core@0.3.3/node_modules/@batonfx/core/src/tool-context.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.6/node_modules/@batonfx/core/src/tool-context.ts
 var exports_tool_context = {};
 __export(exports_tool_context, {
-  testLayer: () => testLayer36,
+  testLayer: () => testLayer37,
   layerDefault: () => layerDefault,
   ToolContext: () => ToolContext
 });
-import { Context as Context40, Effect as Effect42, Layer as Layer40 } from "effect";
+import { Context as Context41, Effect as Effect43, Layer as Layer41 } from "effect";
 
-class ToolContext extends Context40.Service()("@batonfx/core/ToolContext") {
+class ToolContext extends Context41.Service()("@batonfx/core/ToolContext") {
 }
-var layerDefault = Layer40.sync(ToolContext, () => ToolContext.of({
+var layerDefault = Layer41.sync(ToolContext, () => ToolContext.of({
   signal: new AbortController().signal,
-  emit: () => Effect42.void,
+  emit: () => Effect43.void,
   sessionId: "local"
 }));
-var testLayer36 = (implementation) => Layer40.succeed(ToolContext, ToolContext.of(implementation));
+var testLayer37 = (implementation) => Layer41.succeed(ToolContext, ToolContext.of(implementation));
 
-// ../../node_modules/.bun/@batonfx+core@0.3.3/node_modules/@batonfx/core/src/tool-executor.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.6/node_modules/@batonfx/core/src/tool-executor.ts
 var exports_tool_executor = {};
 __export(exports_tool_executor, {
-  testLayer: () => testLayer37,
+  testLayer: () => testLayer38,
   sandbox: () => sandbox,
   router: () => router,
   routeToolkit: () => routeToolkit,
@@ -9389,8 +9508,8 @@ __export(exports_tool_executor, {
   client: () => client,
   ToolExecutor: () => ToolExecutor
 });
-import { Cause as Cause2, Context as Context41, Effect as Effect43, Layer as Layer41, Option as Option14, Schema as Schema46, Sink as Sink2, Stream as Stream6 } from "effect";
-class ToolExecutor extends Context41.Service()("@batonfx/core/ToolExecutor") {
+import { Cause as Cause2, Context as Context42, Effect as Effect44, Layer as Layer42, Option as Option15, Schema as Schema47, Sink as Sink2, Stream as Stream6 } from "effect";
+class ToolExecutor extends Context42.Service()("@batonfx/core/ToolExecutor") {
 }
 var failureMessage = (cause) => {
   const error = Cause2.squash(cause);
@@ -9412,47 +9531,47 @@ var resultMessage = (result) => {
 var schemaMessage = (error) => error instanceof Error ? error.message : typeof error === "string" ? error : resultMessage(error);
 var decodeSuccess = (tool2, result) => {
   const successSchema = tool2.successSchema;
-  if (!Schema46.isSchema(successSchema)) {
-    return Effect43.succeed({ _tag: "Success", result, encodedResult: result });
+  if (!Schema47.isSchema(successSchema)) {
+    return Effect44.succeed({ _tag: "Success", result, encodedResult: result });
   }
-  return Schema46.decodeUnknownEffect(successSchema)(result).pipe(Effect43.flatMap((decoded) => Schema46.encodeUnknownEffect(successSchema)(decoded).pipe(Effect43.map((encoded) => ({ _tag: "Success", result: decoded, encodedResult: encoded })))), Effect43.catchCause((cause) => Effect43.succeed(failureOutcome(`invalid client result: ${schemaMessage(Cause2.squash(cause))}`))));
+  return Schema47.decodeUnknownEffect(successSchema)(result).pipe(Effect44.flatMap((decoded) => Schema47.encodeUnknownEffect(successSchema)(decoded).pipe(Effect44.map((encoded) => ({ _tag: "Success", result: decoded, encodedResult: encoded })))), Effect44.catchCause((cause) => Effect44.succeed(failureOutcome(`invalid client result: ${schemaMessage(Cause2.squash(cause))}`))));
 };
 var placementOutcome = (placement, tool2, response) => {
   switch (response._tag) {
     case "Failure":
-      return Effect43.succeed(failureOutcome(response.message));
+      return Effect44.succeed(failureOutcome(response.message));
     case "Suspend":
-      return Effect43.succeed({ _tag: "Suspend", token: response.token });
+      return Effect44.succeed({ _tag: "Suspend", token: response.token });
     case "Success":
-      return decodeSuccess(tool2, response.result).pipe(Effect43.map((outcome) => outcome._tag === "Failure" ? failureOutcome(outcome.message.replace("invalid client result", `invalid ${placement} result`)) : outcome));
+      return decodeSuccess(tool2, response.result).pipe(Effect44.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 Effect43.succeed(failureOutcome(`Tool ${request.call.name} is not registered`));
+    return Effect44.succeed(failureOutcome(`Tool ${request.call.name} is not registered`));
   }
-  return toolkit.handle(request.call.name, request.call.params).pipe(Effect43.flatMap((results) => results.pipe(Stream6.filter((item) => item.preliminary === false), Stream6.run(Sink2.last()))), Effect43.map(Option14.match({
+  return toolkit.handle(request.call.name, request.call.params).pipe(Effect44.flatMap((results) => results.pipe(Stream6.filter((item) => item.preliminary === false), Stream6.run(Sink2.last()))), Effect44.map(Option15.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
     }
-  })), Effect43.catchCause((cause) => {
+  })), Effect44.catchCause((cause) => {
     if (Cause2.hasInterrupts(cause))
-      return Effect43.interrupt;
+      return Effect44.interrupt;
     const error = Cause2.squash(cause);
     if (error instanceof AgentSuspended) {
-      return Effect43.succeed({ _tag: "Suspend", token: error.token });
+      return Effect44.succeed({ _tag: "Suspend", token: error.token });
     }
-    return Effect43.succeed(failureOutcome(failureMessage(cause)));
+    return Effect44.succeed(failureOutcome(failureMessage(cause)));
   }));
 };
 function executeToolkit(toolkit, request) {
-  return ("handle" in toolkit ? Effect43.succeed(toolkit) : toolkit).pipe(Effect43.flatMap((handled) => executeWithToolkit(handled, request)));
+  return ("handle" in toolkit ? Effect44.succeed(toolkit) : toolkit).pipe(Effect44.flatMap((handled) => executeWithToolkit(handled, request)));
 }
 function fromToolkit(toolkit) {
-  return Layer41.effect(ToolExecutor, ("handle" in toolkit ? Effect43.succeed(toolkit) : toolkit).pipe(Effect43.map((handled) => ToolExecutor.of({
+  return Layer42.effect(ToolExecutor, ("handle" in toolkit ? Effect44.succeed(toolkit) : toolkit).pipe(Effect44.map((handled) => ToolExecutor.of({
     execute: (request) => executeWithToolkit(handled, request)
   }))));
 }
@@ -9471,10 +9590,10 @@ var placementRoute = (placement, options) => {
     execute: (request) => {
       const tool2 = options.toolkit.tools[request.call.name];
       if (tool2 === undefined)
-        return Effect43.succeed(failureOutcome(`Tool ${request.call.name} is not registered`));
+        return Effect44.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 ? Effect43.retry(effect, options.schedule) : effect;
-      return scheduled.pipe(Effect43.flatMap((response) => placementOutcome(placement, tool2, response)), Effect43.catchCause((cause) => Cause2.hasInterrupts(cause) ? Effect43.interrupt : Effect43.succeed(failureOutcome(`${placement} tool infrastructure failed: ${failureMessage(cause)}`))));
+      const scheduled = "schedule" in options && options.schedule !== undefined ? Effect44.retry(effect, options.schedule) : effect;
+      return scheduled.pipe(Effect44.flatMap((response) => placementOutcome(placement, tool2, response)), Effect44.catchCause((cause) => Cause2.hasInterrupts(cause) ? Effect44.interrupt : Effect44.succeed(failureOutcome(`${placement} tool infrastructure failed: ${failureMessage(cause)}`))));
     }
   });
 };
@@ -9487,20 +9606,20 @@ function routeToolkit(toolkit) {
     tools: Object.keys(handled.tools),
     execute: (request) => executeWithToolkit(handled, request)
   });
-  return "handle" in toolkit ? makeRoute(toolkit) : toolkit.pipe(Effect43.map(makeRoute));
+  return "handle" in toolkit ? makeRoute(toolkit) : toolkit.pipe(Effect44.map(makeRoute));
 }
-var routeInputEffect = (input) => Effect43.isEffect(input) ? input : Effect43.succeed(input);
+var routeInputEffect = (input) => Effect44.isEffect(input) ? input : Effect44.succeed(input);
 function router(routes) {
-  return Layer41.effect(ToolExecutor, Effect43.all(Array.from(routes, routeInputEffect)).pipe(Effect43.map((resolved) => ToolExecutor.of({
+  return Layer42.effect(ToolExecutor, Effect44.all(Array.from(routes, routeInputEffect)).pipe(Effect44.map((resolved) => ToolExecutor.of({
     execute: (request) => {
       const matched = resolved.find((candidate) => candidate.matches(request));
-      return matched === undefined ? Effect43.succeed(failureOutcome(`Tool ${request.call.name} is not registered`)) : matched.execute(request);
+      return matched === undefined ? Effect44.succeed(failureOutcome(`Tool ${request.call.name} is not registered`)) : matched.execute(request);
     }
   }))));
 }
-var testLayer37 = (implementation) => Layer41.succeed(ToolExecutor, ToolExecutor.of(implementation));
+var testLayer38 = (implementation) => Layer42.succeed(ToolExecutor, ToolExecutor.of(implementation));
 
-// ../../node_modules/.bun/@batonfx+core@0.3.3/node_modules/@batonfx/core/src/turn-policy.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.6/node_modules/@batonfx/core/src/turn-policy.ts
 var exports_turn_policy = {};
 __export(exports_turn_policy, {
   untilToolCall: () => untilToolCall,
@@ -9510,7 +9629,7 @@ __export(exports_turn_policy, {
   decision: () => decision,
   both: () => both
 });
-import { Effect as Effect44 } from "effect";
+import { Effect as Effect45 } from "effect";
 var decision = {
   continue: (overrides) => ({
     _tag: "Continue",
@@ -9519,8 +9638,8 @@ var decision = {
   stop: { _tag: "Stop" }
 };
 var make4 = (decide) => ({ decide });
-var recurs = (n) => make4((info) => Effect44.succeed(info.turn < n + 1 ? decision.continue() : decision.stop));
-var untilToolCall = (name) => make4((info) => Effect44.succeed(info.pendingToolResults.some((result) => result.name === name) ? decision.stop : decision.continue()));
+var recurs = (n) => make4((info) => Effect45.succeed(info.turn < n + 1 ? decision.continue() : decision.stop));
+var untilToolCall = (name) => make4((info) => Effect45.succeed(info.pendingToolResults.some((result) => result.name === name) ? decision.stop : decision.continue()));
 var mergeOverrides = (first, second) => {
   if (first === undefined)
     return second;
@@ -9528,7 +9647,7 @@ var mergeOverrides = (first, second) => {
     return first;
   return { ...first, ...second };
 };
-var both = (first, second) => make4((info) => Effect44.gen(function* () {
+var both = (first, second) => make4((info) => Effect45.gen(function* () {
   const left = yield* first.decide(info);
   if (left._tag === "Stop")
     return decision.stop;
@@ -9539,14 +9658,17 @@ var both = (first, second) => make4((info) => Effect44.gen(function* () {
 }));
 var defaultPolicy = recurs(8);
 
-// ../../node_modules/.bun/@batonfx+core@0.3.3/node_modules/@batonfx/core/src/agent.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.6/node_modules/@batonfx/core/src/agent.ts
 function make5(nameOrOptions, options = {}) {
   const resolved = typeof nameOrOptions === "string" ? { ...options, name: nameOrOptions } : nameOrOptions;
   return {
     name: resolved.name,
     ...resolved.instructions === undefined ? {} : { instructions: resolved.instructions },
     toolkit: resolved.toolkit ?? Toolkit3.empty,
-    policy: resolved.policy ?? defaultPolicy
+    policy: resolved.policy ?? defaultPolicy,
+    ...resolved.model === undefined ? {} : { model: resolved.model },
+    ...resolved.memory === undefined ? {} : { memory: resolved.memory },
+    ...resolved.metadata === undefined ? {} : { metadata: resolved.metadata }
   };
 }
 var defaultObjectPrompt = "Return the final structured output for the task above.";
@@ -9558,14 +9680,14 @@ var steeringDrainedEvent = (turn, queue, messages) => ({
 });
 var skillListingBudgetTokens = 2048;
 var activateSkillToolName = "activate_skill";
-var activateSkillParameters = Schema47.Struct({ name: Schema47.String });
+var activateSkillParameters = Schema48.Struct({ name: Schema48.String });
 var activateSkillTool = Tool4.make(activateSkillToolName, {
   description: "Load the full body for one listed Baton skill by name before applying that skill.",
   parameters: activateSkillParameters,
-  success: Schema47.Struct({
-    name: Schema47.String,
-    body: Schema47.String,
-    allowedTools: Schema47.Array(Schema47.String)
+  success: Schema48.Struct({
+    name: Schema48.String,
+    body: Schema48.String,
+    allowedTools: Schema48.Array(Schema48.String)
   })
 });
 var errorMessage = (error) => error instanceof Error ? `${error.name}: ${error.message}` : String(error);
@@ -9612,15 +9734,15 @@ var isUserMessagePart = (part) => part.type === "text" || part.type === "file";
 var approvalRequired = (tool2, call, messages) => {
   const needsApproval = tool2?.needsApproval;
   if (needsApproval === undefined)
-    return Effect45.succeed(false);
+    return Effect46.succeed(false);
   if (typeof needsApproval === "boolean")
-    return Effect45.succeed(needsApproval);
-  return Effect45.suspend(() => {
+    return Effect46.succeed(needsApproval);
+  return Effect46.suspend(() => {
     const result = needsApproval(call.params, { toolCallId: call.id, messages });
-    return Effect45.isEffect(result) ? result : Effect45.succeed(result);
-  }).pipe(Effect45.catchCause((cause) => Cause3.hasInterrupts(cause) ? Effect45.interrupt : Effect45.succeed(true)));
+    return Effect46.isEffect(result) ? result : Effect46.succeed(result);
+  }).pipe(Effect46.catchCause((cause) => Cause3.hasInterrupts(cause) ? Effect46.interrupt : Effect46.succeed(true)));
 };
-var applyPromptChain = (chain, prompt, context) => Effect45.gen(function* () {
+var applyPromptChain = (chain, prompt, context) => Effect46.gen(function* () {
   let current2 = prompt;
   for (const middleware of chain) {
     if (middleware.transformPrompt !== undefined) {
@@ -9629,10 +9751,10 @@ var applyPromptChain = (chain, prompt, context) => Effect45.gen(function* () {
   }
   return current2;
 });
-var applyPartChain = (chain, part, context) => Effect45.gen(function* () {
-  let current2 = Option15.some(part);
+var applyPartChain = (chain, part, context) => Effect46.gen(function* () {
+  let current2 = Option16.some(part);
   for (const middleware of chain) {
-    if (Option15.isNone(current2))
+    if (Option16.isNone(current2))
       break;
     if (middleware.transformPart !== undefined) {
       current2 = yield* middleware.transformPart(current2.value, context);
@@ -9640,74 +9762,83 @@ var applyPartChain = (chain, part, context) => Effect45.gen(function* () {
   }
   return current2;
 });
-var streamInternal = (agent, options, structured) => Stream7.unwrap(Effect45.gen(function* () {
-  const executor = yield* Effect45.serviceOption(ToolExecutor);
-  const approvals = yield* Effect45.serviceOption(Approvals);
-  const chain = yield* Effect45.serviceOption(ModelMiddleware).pipe(Effect45.map(Option15.match({ onNone: () => [], onSome: (service) => service })));
+var streamInternal = (agent, options, structured) => Stream7.unwrap(Effect46.gen(function* () {
+  const executor = yield* Effect46.serviceOption(ToolExecutor);
+  const approvals = yield* Effect46.serviceOption(Approvals);
+  const chain = yield* Effect46.serviceOption(ModelMiddleware).pipe(Effect46.map(Option16.match({ onNone: () => [], onSome: (service) => service })));
   if (options.history !== undefined && options.persistence !== undefined) {
-    return yield* Effect45.fail(new AgentError({
+    return yield* Effect46.fail(new AgentError({
       message: "RunOptions.history and RunOptions.persistence are mutually exclusive",
       turn: 0
     }));
   }
   if (options.toolOutputMaxBytes !== undefined && (!Number.isFinite(options.toolOutputMaxBytes) || options.toolOutputMaxBytes < 0)) {
-    return yield* Effect45.fail(new AgentError({
+    return yield* Effect46.fail(new AgentError({
       message: "RunOptions.toolOutputMaxBytes must be a non-negative finite number",
       turn: 0
     }));
   }
   if (options.compaction?.contextWindow !== undefined && (!Number.isFinite(options.compaction.contextWindow) || options.compaction.contextWindow <= 0)) {
-    return yield* Effect45.fail(new AgentError({
+    return yield* Effect46.fail(new AgentError({
       message: "RunOptions.compaction.contextWindow must be a positive finite number",
       turn: 0
     }));
   }
   const sessionId = options.sessionId ?? "local";
-  const instructionsService = yield* Effect45.serviceOption(Instructions);
-  const skillSourceService = yield* Effect45.serviceOption(SkillSource);
-  const skillRuntime = Option15.isNone(skillSourceService) ? undefined : {
+  const instructionsService = yield* Effect46.serviceOption(Instructions);
+  const skillSourceService = yield* Effect46.serviceOption(SkillSource);
+  const skillRuntime = Option16.isNone(skillSourceService) ? undefined : {
     source: skillSourceService.value,
-    skills: yield* skillSourceService.value.all.pipe(Effect45.mapError((error) => new AgentError({ message: error.message, turn: 0, cause: error })))
+    skills: yield* skillSourceService.value.all.pipe(Effect46.mapError((error) => new AgentError({ message: error.message, turn: 0, cause: error })))
   };
   const selectedSkills = skillRuntime === undefined ? [] : selectListings(skillRuntime.skills, skillListingBudgetTokens, []);
   const skillListings = selectedSkills.map((skill) => skill.listing).join(`
 `);
   const hasActivatableSkills = selectedSkills.length > 0;
-  const instructionsEpoch = options.system === undefined && options.history === undefined && Option15.isSome(instructionsService) ? yield* openEpoch(instructionsService.value, { agentName: agent.name, turn: 0 }) : undefined;
+  const instructionsEpoch = options.system === undefined && options.history === undefined && Option16.isSome(instructionsService) ? yield* openEpoch(instructionsService.value, { agentName: agent.name, turn: 0 }) : undefined;
   const baseSystem = options.system ?? (instructionsEpoch === undefined ? agent.instructions : instructionsEpoch.baseline.length === 0 ? agent.instructions : instructionsEpoch.baseline);
   const system = appendInstructionFragment(baseSystem, options.history === undefined && skillListings.length > 0 ? skillListingsInstructions(skillListings) : undefined);
-  const persistenceService = yield* Effect45.serviceOption(Chat.Persistence);
-  const resilienceService = yield* Effect45.serviceOption(ModelResilience);
-  const permissionsService = yield* Effect45.serviceOption(Permissions);
-  const steeringService = yield* Effect45.serviceOption(Steering);
-  const compactionService = yield* Effect45.serviceOption(Compaction);
-  const memoryService = yield* Effect45.serviceOption(Memory);
-  const sessionService = yield* Effect45.serviceOption(SessionStore);
-  const tokenizerService = yield* Effect45.serviceOption(Tokenizer2.Tokenizer);
+  const persistenceService = yield* Effect46.serviceOption(Chat.Persistence);
+  const resilienceService = yield* Effect46.serviceOption(ModelResilience);
+  const modelRegistryService = yield* Effect46.serviceOption(Service29);
+  const permissionsService = yield* Effect46.serviceOption(Permissions);
+  const steeringService = yield* Effect46.serviceOption(Steering);
+  const compactionService = yield* Effect46.serviceOption(Compaction);
+  const memoryService = yield* Effect46.serviceOption(Memory);
+  const sessionService = yield* Effect46.serviceOption(SessionStore);
+  const tokenizerService = yield* Effect46.serviceOption(Tokenizer2.Tokenizer);
   const persistenceOptions = options.persistence;
-  const memoryOptions = options.memory;
+  const memoryOptions = options.memory ?? (agent.memory === undefined ? undefined : { key: agent.memory });
+  const agentModel = agent.model;
+  const agentModelContext = agentModel === undefined ? undefined : yield* Option16.match(modelRegistryService, {
+    onNone: () => Effect46.fail(new AgentError({
+      message: "Agent.model requires ModelRegistry in context",
+      turn: 0
+    })),
+    onSome: (registry) => registry.provide(agentModel, Effect46.context()).pipe(Effect46.mapError((error) => new AgentError({ message: errorMessage(error), turn: 0, cause: error })))
+  });
   const memoryRuntime = memoryOptions === undefined ? undefined : {
     key: memoryOptions.key,
-    service: yield* Option15.match(memoryService, {
-      onNone: () => Effect45.fail(new AgentError({
-        message: "RunOptions.memory requires Memory in context",
+    service: yield* Option16.match(memoryService, {
+      onNone: () => Effect46.fail(new AgentError({
+        message: options.memory === undefined ? "Agent.memory requires Memory in context" : "RunOptions.memory requires Memory in context",
         turn: 0
       })),
-      onSome: Effect45.succeed
+      onSome: Effect46.succeed
     })
   };
-  const persisted = persistenceOptions === undefined ? undefined : yield* Option15.match(persistenceService, {
-    onNone: () => Effect45.fail(new AgentError({
+  const persisted = persistenceOptions === undefined ? undefined : yield* Option16.match(persistenceService, {
+    onNone: () => Effect46.fail(new AgentError({
       message: "RunOptions.persistence requires Chat.Persistence in context",
       turn: 0
     })),
-    onSome: (service) => service.getOrCreate(persistenceOptions.chatId, persistenceOptions.timeToLive === undefined ? undefined : { timeToLive: persistenceOptions.timeToLive }).pipe(Effect45.mapError((error) => new AgentError({ message: errorMessage(error), turn: 0, cause: error })))
+    onSome: (service) => service.getOrCreate(persistenceOptions.chatId, persistenceOptions.timeToLive === undefined ? undefined : { timeToLive: persistenceOptions.timeToLive }).pipe(Effect46.mapError((error) => new AgentError({ message: errorMessage(error), turn: 0, cause: error })))
   });
-  const seedSystem = persisted !== undefined && system !== undefined && (yield* Ref10.get(persisted.history)).content.length === 0 ? system : undefined;
+  const seedSystem = persisted !== undefined && system !== undefined && (yield* Ref11.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 chat = persisted ?? (yield* freshChat);
-  const savePersisted = persisted === undefined ? Effect45.void : persisted.save.pipe(Effect45.mapError((error) => new AgentError({ message: errorMessage(error), turn: 0, cause: error })));
-  const failSuspended = (call, token, reason) => Stream7.unwrap(savePersisted.pipe(Effect45.as(Stream7.fail(suspended(call, token, reason)))));
+  const savePersisted = persisted === undefined ? Effect46.void : persisted.save.pipe(Effect46.mapError((error) => new AgentError({ message: errorMessage(error), turn: 0, cause: error })));
+  const failSuspended = (call, token, reason) => Stream7.unwrap(savePersisted.pipe(Effect46.as(Stream7.fail(suspended(call, token, reason)))));
   const state = {
     text: "",
     turn: 0,
@@ -9720,20 +9851,20 @@ var streamInternal = (agent, options, structured) => Stream7.unwrap(Effect45.gen
   const activatedSkillTools = new Map;
   let sessionSyncedMessages = 0;
   let sessionInitialized = false;
-  const activeSession = Option15.isSome(compactionService) ? sessionService : Option15.none();
+  const activeSession = Option16.isSome(compactionService) ? sessionService : Option16.none();
   const sessionError = (turn, error) => new AgentError({ message: error.message, turn, cause: error });
   const compactionError = (turn, error) => new AgentError({ message: error.message, turn, cause: error });
   const memoryError = (turn, error) => new AgentError({ message: error.message, turn, cause: error });
   const skillError = (turn, error) => new AgentError({ message: error.message, turn, cause: error });
   const isSkillActivationCall = (call) => call.name === activateSkillToolName && skillRuntime !== undefined && hasActivatableSkills;
-  const insertRecalledItems = (turn, prompt, items) => Effect45.gen(function* () {
+  const insertRecalledItems = (turn, prompt, items) => Effect46.gen(function* () {
     const parts = items.flatMap((item) => item.parts);
     if (parts.length === 0)
       return prompt;
     const userParts = [];
     for (const part of parts) {
       if (!isUserMessagePart(part)) {
-        return yield* Effect45.fail(new AgentError({
+        return yield* Effect46.fail(new AgentError({
           message: `Memory recalled unsupported prompt part type: ${part.type}`,
           turn
         }));
@@ -9744,12 +9875,12 @@ var streamInternal = (agent, options, structured) => Stream7.unwrap(Effect45.gen
     const [first, ...rest] = prompt.content;
     return first?.role === "system" ? Prompt4.fromMessages([first, memoryMessage2, ...rest]) : Prompt4.fromMessages([memoryMessage2, ...prompt.content]);
   });
-  const recallInitialPrompt = (prompt) => memoryRuntime === undefined ? Effect45.succeed(prompt) : memoryRuntime.service.recall({ key: memoryRuntime.key, turn: 0, prompt }).pipe(Effect45.mapError((error) => memoryError(0, error)), Effect45.flatMap((items) => insertRecalledItems(0, prompt, items)));
-  const rememberTurn = (turn, transcript, terminal) => memoryRuntime === undefined ? Effect45.void : memoryRuntime.service.remember({ key: memoryRuntime.key, turn, transcript, terminal }).pipe(Effect45.mapError((error) => memoryError(turn, error)));
-  const syncSession = (turn, transcript) => Option15.match(activeSession, {
-    onNone: () => Effect45.succeed([]),
-    onSome: (session) => Effect45.gen(function* () {
-      const existingPath = yield* session.path().pipe(Effect45.mapError((error) => sessionError(turn, error)));
+  const recallInitialPrompt = (prompt) => memoryRuntime === undefined ? Effect46.succeed(prompt) : memoryRuntime.service.recall({ key: memoryRuntime.key, turn: 0, prompt }).pipe(Effect46.mapError((error) => memoryError(0, error)), Effect46.flatMap((items) => insertRecalledItems(0, prompt, items)));
+  const rememberTurn = (turn, transcript, terminal) => memoryRuntime === undefined ? Effect46.void : memoryRuntime.service.remember({ key: memoryRuntime.key, turn, transcript, terminal }).pipe(Effect46.mapError((error) => memoryError(turn, error)));
+  const syncSession = (turn, transcript) => Option16.match(activeSession, {
+    onNone: () => Effect46.succeed([]),
+    onSome: (session) => Effect46.gen(function* () {
+      const existingPath = yield* session.path().pipe(Effect46.mapError((error) => sessionError(turn, error)));
       if (!sessionInitialized) {
         sessionInitialized = true;
         if (existingPath.length > 0) {
@@ -9758,40 +9889,40 @@ var streamInternal = (agent, options, structured) => Stream7.unwrap(Effect45.gen
         }
       }
       for (const message of transcript.content.slice(sessionSyncedMessages)) {
-        yield* session.append({ _tag: "Message", message }).pipe(Effect45.mapError((error) => sessionError(turn, error)));
+        yield* session.append({ _tag: "Message", message }).pipe(Effect46.mapError((error) => sessionError(turn, error)));
       }
       sessionSyncedMessages = transcript.content.length;
-      return yield* session.path().pipe(Effect45.mapError((error) => sessionError(turn, error)));
+      return yield* session.path().pipe(Effect46.mapError((error) => sessionError(turn, error)));
     })
   });
   const countTokens = (turn, prompt) => {
     if (state.contextTokens !== undefined)
-      return Effect45.succeed(state.contextTokens);
-    return Option15.match(tokenizerService, {
-      onNone: () => Effect45.succeed(0),
-      onSome: (tokenizer) => tokenizer.tokenize(prompt).pipe(Effect45.map((tokens) => tokens.length), Effect45.mapError((error) => new AgentError({ message: errorMessage(error), turn, cause: error })))
+      return Effect46.succeed(state.contextTokens);
+    return Option16.match(tokenizerService, {
+      onNone: () => Effect46.succeed(0),
+      onSome: (tokenizer) => tokenizer.tokenize(prompt).pipe(Effect46.map((tokens) => tokens.length), Effect46.mapError((error) => new AgentError({ message: errorMessage(error), turn, cause: error })))
     });
   };
-  const compactionUsage = (turn, history, prompt) => countTokens(turn, Prompt4.concat(history, prompt)).pipe(Effect45.map((contextTokens) => ({
+  const compactionUsage = (turn, history, prompt) => countTokens(turn, Prompt4.concat(history, prompt)).pipe(Effect46.map((contextTokens) => ({
     contextTokens,
     contextWindow: options.compaction?.contextWindow ?? Number.POSITIVE_INFINITY,
     reserveTokens: DEFAULT_RESERVE_TOKENS
   })));
-  const applyCompactionResult = (turn, result) => Effect45.gen(function* () {
-    yield* Ref10.set(chat.history, result.history);
+  const applyCompactionResult = (turn, result) => Effect46.gen(function* () {
+    yield* Ref11.set(chat.history, result.history);
     sessionSyncedMessages = result.history.content.length;
-    if (result._tag === "Summarize" && Option15.isSome(activeSession)) {
+    if (result._tag === "Summarize" && Option16.isSome(activeSession)) {
       yield* activeSession.value.append({
         _tag: "Compaction",
         summary: result.summary,
         firstKeptEntryId: result.firstKeptEntryId
-      }).pipe(Effect45.mapError((error) => sessionError(turn, error)));
+      }).pipe(Effect46.mapError((error) => sessionError(turn, error)));
     }
   });
-  const preparePrompt = (turn, prompt, overflow) => Option15.match(compactionService, {
-    onNone: () => Effect45.succeed(prompt),
-    onSome: (compaction) => Effect45.gen(function* () {
-      const history = yield* Ref10.get(chat.history);
+  const preparePrompt = (turn, prompt, overflow) => Option16.match(compactionService, {
+    onNone: () => Effect46.succeed(prompt),
+    onSome: (compaction) => Effect46.gen(function* () {
+      const history = yield* Ref11.get(chat.history);
       const path2 = yield* syncSession(turn, history);
       const usage = yield* compactionUsage(turn, history, prompt);
       const compacted = yield* compaction.maybeCompact({
@@ -9804,28 +9935,28 @@ var streamInternal = (agent, options, structured) => Stream7.unwrap(Effect45.gen
         usage,
         overflow,
         ...options.toolOutputMaxBytes === undefined ? {} : { toolOutputMaxBytes: options.toolOutputMaxBytes }
-      }).pipe(Effect45.mapError((error) => compactionError(turn, error)));
-      if (Option15.isNone(compacted))
+      }).pipe(Effect46.mapError((error) => compactionError(turn, error)));
+      if (Option16.isNone(compacted))
         return prompt;
       yield* applyCompactionResult(turn, compacted.value);
       return compacted.value.prompt;
     })
   });
-  const boundedSuccessResult = (turn, call, outcome) => (options.toolOutputMaxBytes === undefined ? Effect45.succeed(outcome) : bound(outcome, { toolCallId: call.id, maxBytes: options.toolOutputMaxBytes }).pipe(Effect45.mapError((error) => new AgentError({ message: error.message, turn, cause: error })))).pipe(Effect45.map((bounded) => successResult(call, bounded)));
+  const boundedSuccessResult = (turn, call, outcome) => (options.toolOutputMaxBytes === undefined ? Effect46.succeed(outcome) : bound(outcome, { toolCallId: call.id, maxBytes: options.toolOutputMaxBytes }).pipe(Effect46.mapError((error) => new AgentError({ message: error.message, turn, cause: error })))).pipe(Effect46.map((bounded) => successResult(call, bounded)));
   const outcomeEvents = (turn, call, outcome) => {
     switch (outcome._tag) {
       case "Success":
-        return (isSkillActivationCall(call) ? Effect45.succeed(successResult(call, outcome)) : boundedSuccessResult(turn, call, outcome)).pipe(Effect45.map((result) => {
+        return (isSkillActivationCall(call) ? Effect46.succeed(successResult(call, outcome)) : boundedSuccessResult(turn, call, outcome)).pipe(Effect46.map((result) => {
           state.pending.push(result);
           return Stream7.fromIterable([{ _tag: "ToolExecutionCompleted", turn, call, result }]);
         }));
       case "Failure": {
         const result = failedResult(call, outcome.message);
         state.pending.push(result);
-        return Effect45.succeed(Stream7.fromIterable([{ _tag: "ToolExecutionCompleted", turn, call, result }]));
+        return Effect46.succeed(Stream7.fromIterable([{ _tag: "ToolExecutionCompleted", turn, call, result }]));
       }
       case "Suspend":
-        return Effect45.succeed(failSuspended(call, outcome.token, "tool-wait"));
+        return Effect46.succeed(failSuspended(call, outcome.token, "tool-wait"));
     }
   };
   const defaultExecute = (request) => {
@@ -9833,11 +9964,11 @@ var streamInternal = (agent, options, structured) => Stream7.unwrap(Effect45.gen
       return executeToolkit(agent.toolkit, request);
     }
     const activated = activatedSkillTools.get(request.call.name);
-    return activated === undefined ? Effect45.succeed({ _tag: "Failure", message: `Tool ${request.call.name} is not registered` }) : executeToolkit(Toolkit3.make(activated), request);
+    return activated === undefined ? Effect46.succeed({ _tag: "Failure", message: `Tool ${request.call.name} is not registered` }) : executeToolkit(Toolkit3.make(activated), request);
   };
-  const executeApproved = (turn, call, request) => Stream7.concat(Stream7.fromIterable([{ _tag: "ToolExecutionStarted", turn, call }]), Stream7.unwrap(Effect45.gen(function* () {
+  const executeApproved = (turn, call, request) => Stream7.concat(Stream7.fromIterable([{ _tag: "ToolExecutionStarted", turn, call }]), Stream7.unwrap(Effect46.gen(function* () {
     const progressQueue = yield* Queue2.unbounded();
-    const signal = yield* Effect45.abortSignal;
+    const signal = yield* Effect46.abortSignal;
     const context = ToolContext.of({
       signal,
       sessionId,
@@ -9849,14 +9980,14 @@ var streamInternal = (agent, options, structured) => Stream7.unwrap(Effect45.gen
           ...progress.message === undefined ? {} : { message: progress.message },
           ...progress.data === undefined ? {} : { data: progress.data }
         };
-        return Queue2.offer(progressQueue, event).pipe(Effect45.asVoid);
+        return Queue2.offer(progressQueue, event).pipe(Effect46.asVoid);
       }
     });
-    const execution = isSkillActivationCall(call) ? activateSkillOutcome(turn, call) : Option15.match(executor, {
+    const execution = isSkillActivationCall(call) ? activateSkillOutcome(turn, call) : Option16.match(executor, {
       onNone: () => defaultExecute(request),
       onSome: (service) => service.execute(request)
     });
-    const fiber = yield* execution.pipe(Effect45.provideService(ToolContext, context), Effect45.ensuring(Queue2.end(progressQueue).pipe(Effect45.asVoid)), Effect45.forkScoped({ startImmediately: true }));
+    const fiber = yield* execution.pipe(Effect46.provideService(ToolContext, context), Effect46.ensuring(Queue2.end(progressQueue).pipe(Effect46.asVoid)), Effect46.forkScoped({ startImmediately: true }));
     return Stream7.concat(Stream7.fromQueue(progressQueue), Stream7.fromEffect(Fiber.join(fiber)).pipe(Stream7.flatMap((outcome) => Stream7.unwrap(outcomeEvents(turn, call, outcome)))));
   })));
   const permissionError = (turn, error) => new AgentError({ message: error.message, turn, cause: error });
@@ -9865,13 +9996,13 @@ var streamInternal = (agent, options, structured) => Stream7.unwrap(Effect45.gen
     state.pending.push(result);
     return Stream7.fromIterable([{ _tag: "ToolExecutionCompleted", turn, call, result }]);
   };
-  const activateSkillOutcome = (turn, call) => Effect45.gen(function* () {
+  const activateSkillOutcome = (turn, call) => Effect46.gen(function* () {
     if (skillRuntime === undefined)
       return { _tag: "Failure", message: "SkillSource is not available" };
-    const params = Schema47.decodeUnknownOption(activateSkillParameters)(call.params);
-    if (Option15.isNone(params))
+    const params = Schema48.decodeUnknownOption(activateSkillParameters)(call.params);
+    if (Option16.isNone(params))
       return { _tag: "Failure", message: "Skill activation requires a name" };
-    const skill = yield* skillRuntime.source.get(params.value.name).pipe(Effect45.mapError((error) => skillError(turn, error)));
+    const skill = yield* skillRuntime.source.get(params.value.name).pipe(Effect46.mapError((error) => skillError(turn, error)));
     if (skill === undefined)
       return { _tag: "Failure", message: `Skill not found: ${params.value.name}` };
     if (skill.frontmatter.disableModelInvocation === true) {
@@ -9879,7 +10010,7 @@ var streamInternal = (agent, options, structured) => Stream7.unwrap(Effect45.gen
     }
     let body = activatedSkillBodies.get(skill.frontmatter.name);
     if (body === undefined) {
-      body = yield* skill.body.pipe(Effect45.mapError((error) => skillError(turn, error)));
+      body = yield* skill.body.pipe(Effect46.mapError((error) => skillError(turn, error)));
       activatedSkillBodies.set(skill.frontmatter.name, body);
       for (const tool2 of skill.tools) {
         activatedSkillTools.set(tool2.name, tool2);
@@ -9892,14 +10023,14 @@ var streamInternal = (agent, options, structured) => Stream7.unwrap(Effect45.gen
     };
     return { _tag: "Success", result: output, encodedResult: output };
   });
-  const rememberAlways = (turn, call) => Effect45.serviceOption(RuleStore).pipe(Effect45.flatMap(Option15.match({
-    onNone: () => Effect45.void,
-    onSome: (store) => store.remember({ pattern: call.name, level: "allow" }).pipe(Effect45.mapError((error) => permissionError(turn, error)))
+  const rememberAlways = (turn, call) => Effect46.serviceOption(RuleStore).pipe(Effect46.flatMap(Option16.match({
+    onNone: () => Effect46.void,
+    onSome: (store) => store.remember({ pattern: call.name, level: "allow" }).pipe(Effect46.mapError((error) => permissionError(turn, error)))
   })));
-  const approvalEvents = (turn, call, messages, request, tool2) => Stream7.unwrap(approvalRequired(tool2, call, messages).pipe(Effect45.map((isRequired) => {
+  const approvalEvents = (turn, call, messages, request, tool2) => Stream7.unwrap(approvalRequired(tool2, call, messages).pipe(Effect46.map((isRequired) => {
     if (!isRequired)
       return executeApproved(turn, call, request);
-    if (Option15.isNone(approvals)) {
+    if (Option16.isNone(approvals)) {
       const result = failedResult(call, "Approvals service is required for approval-gated tools");
       state.pending.push(result);
       return Stream7.fromIterable([
@@ -9907,7 +10038,7 @@ var streamInternal = (agent, options, structured) => Stream7.unwrap(Effect45.gen
         { _tag: "ToolExecutionCompleted", turn, call, result }
       ]);
     }
-    return Stream7.concat(Stream7.fromIterable([{ _tag: "ApprovalRequested", turn, call }]), Stream7.unwrap(approvals.value.check(request).pipe(Effect45.map((decision2) => {
+    return Stream7.concat(Stream7.fromIterable([{ _tag: "ApprovalRequested", turn, call }]), Stream7.unwrap(approvals.value.check(request).pipe(Effect46.map((decision2) => {
       switch (decision2._tag) {
         case "Approved":
           return executeApproved(turn, call, request);
@@ -9928,7 +10059,7 @@ var streamInternal = (agent, options, structured) => Stream7.unwrap(Effect45.gen
       case "Denied":
         return permissionDeniedEvents(turn, call, answer.reason);
       case "Always":
-        return Stream7.unwrap(rememberAlways(turn, call).pipe(Effect45.as(executeApproved(turn, call, request))));
+        return Stream7.unwrap(rememberAlways(turn, call).pipe(Effect46.as(executeApproved(turn, call, request))));
     }
   };
   const permissionAskEvents = (turn, call, request, token) => {
@@ -9940,9 +10071,9 @@ var streamInternal = (agent, options, structured) => Stream7.unwrap(Effect45.gen
       turn,
       toolCallId: call.id
     };
-    if (Option15.isNone(permissionsService))
+    if (Option16.isNone(permissionsService))
       return failSuspended(call, token, "approval");
-    return Stream7.concat(Stream7.fromIterable([{ _tag: "ApprovalRequested", turn, call }]), Stream7.unwrap(permissionsService.value.await(pending).pipe(Effect45.mapError((error) => permissionError(turn, error)), Effect45.map(Option15.match({
+    return Stream7.concat(Stream7.fromIterable([{ _tag: "ApprovalRequested", turn, call }]), Stream7.unwrap(permissionsService.value.await(pending).pipe(Effect46.mapError((error) => permissionError(turn, error)), Effect46.map(Option16.match({
       onNone: () => failSuspended(call, token, "approval"),
       onSome: (answer) => permissionAnsweredEvents(turn, call, request, answer)
     })))));
@@ -9950,7 +10081,7 @@ var streamInternal = (agent, options, structured) => Stream7.unwrap(Effect45.gen
   const toolCallEvents = (turn, call, messages) => {
     const request = { call, turn, agentName: agent.name, sessionId };
     const tool2 = currentToolkit().tools[call.name];
-    if (Option15.isNone(permissionsService))
+    if (Option16.isNone(permissionsService))
       return approvalEvents(turn, call, messages, request, tool2);
     return Stream7.unwrap(permissionsService.value.evaluate({
       tool: call.name,
@@ -9959,7 +10090,7 @@ var streamInternal = (agent, options, structured) => Stream7.unwrap(Effect45.gen
       turn,
       toolCallId: call.id,
       sessionId
-    }).pipe(Effect45.mapError((error) => permissionError(turn, error)), Effect45.map((decision2) => {
+    }).pipe(Effect46.mapError((error) => permissionError(turn, error)), Effect46.map((decision2) => {
       switch (decision2._tag) {
         case "Allow":
           return approvalEvents(turn, call, messages, request, tool2);
@@ -9970,8 +10101,8 @@ var streamInternal = (agent, options, structured) => Stream7.unwrap(Effect45.gen
       }
     })));
   };
-  const captureFinishPart = (part) => Effect45.gen(function* () {
-    const span = yield* Effect45.currentSpan;
+  const captureFinishPart = (part) => Effect46.gen(function* () {
+    const span = yield* Effect46.currentSpan;
     state.finish = {
       usage: state.finish === undefined ? part.usage : addUsage(state.finish.usage, part.usage),
       reason: part.reason
@@ -9986,18 +10117,20 @@ var streamInternal = (agent, options, structured) => Stream7.unwrap(Effect45.gen
       },
       response: { finishReasons: [part.reason] }
     });
-  }).pipe(Effect45.orDie);
-  const captureStructuredUsage = (content) => Effect45.sync(() => {
+  }).pipe(Effect46.orDie);
+  const captureStructuredUsage = (content) => Effect46.sync(() => {
     for (const part of content) {
       if (part.type === "finish") {
         state.usage = state.usage === undefined ? part.usage : addUsage(state.usage, part.usage);
       }
     }
   });
-  const withModelResilience = (effect) => Option15.match(resilienceService, {
+  const withModelResilience = (effect) => Option16.match(resilienceService, {
     onNone: () => effect,
-    onSome: (resilience) => Effect45.flatMap(LanguageModel3.LanguageModel, (model) => effect.pipe(Effect45.provideService(LanguageModel3.LanguageModel, apply(model, resilience))))
+    onSome: (resilience) => Effect46.flatMap(LanguageModel4.LanguageModel, (model) => effect.pipe(Effect46.provideService(LanguageModel4.LanguageModel, apply(model, resilience))))
   });
+  const withAgentModel = (effect) => agentModelContext === undefined ? effect : effect.pipe(Effect46.provide(agentModelContext));
+  const provideAgentModel = (stream2) => agentModelContext === undefined ? stream2 : stream2.pipe(Stream7.provideContext(agentModelContext));
   const partEvents = (turn, part, messages) => {
     if (part.type === "error") {
       return Stream7.fail(new AgentError({ message: errorMessage(part.error), turn, cause: part.error }));
@@ -10015,7 +10148,7 @@ var streamInternal = (agent, options, structured) => Stream7.unwrap(Effect45.gen
     }
     return modelPart;
   };
-  const applyPartToEvents = (turn, part, messages) => Stream7.unwrap(applyPartChain(chain, part, { agentName: agent.name, turn }).pipe(Effect45.map(Option15.match({
+  const applyPartToEvents = (turn, part, messages) => Stream7.unwrap(applyPartChain(chain, part, { agentName: agent.name, turn }).pipe(Effect46.map(Option16.match({
     onSome: (transformed) => partEvents(turn, transformed, messages),
     onNone: () => part.type === "tool-call" ? Stream7.fail(new MiddlewareViolation({
       turn,
@@ -10026,18 +10159,18 @@ var streamInternal = (agent, options, structured) => Stream7.unwrap(Effect45.gen
   const activeToolkit = (activeTools) => Toolkit3.make(...Object.values(currentToolkit().tools).filter((tool2) => activeTools.includes(tool2.name)));
   const modelTurn = (turn, prompt, overrides) => {
     const toolkit = overrides?.activeTools === undefined ? currentToolkit() : activeToolkit(overrides.activeTools);
-    const attempt = (activePrompt, retryOverflow) => Stream7.unwrap(Ref10.get(chat.history).pipe(Effect45.map((historyBeforeAttempt) => {
+    const attempt = (activePrompt, retryOverflow) => Stream7.unwrap(Ref11.get(chat.history).pipe(Effect46.map((historyBeforeAttempt) => {
       let emitted = false;
       const messages = Prompt4.concat(historyBeforeAttempt, activePrompt).content;
-      return chat.streamText({ prompt: activePrompt, toolkit, disableToolCallResolution: true }).pipe(Stream7.map((part) => ({ part, messages })), Stream7.tap(() => Effect45.sync(() => {
+      return chat.streamText({ prompt: activePrompt, toolkit, disableToolCallResolution: true }).pipe(Stream7.map((part) => ({ part, messages })), Stream7.tap(() => Effect46.sync(() => {
         emitted = true;
       })), Stream7.catchCause((cause) => {
         if (Cause3.hasInterrupts(cause))
-          return Stream7.fromEffect(Effect45.interrupt);
+          return Stream7.fromEffect(Effect46.interrupt);
         const error = Cause3.squash(cause);
-        if (retryOverflow && !emitted && isContextOverflow(error) && Option15.isSome(compactionService)) {
-          return Stream7.unwrap(Effect45.gen(function* () {
-            yield* Ref10.set(chat.history, historyBeforeAttempt);
+        if (retryOverflow && !emitted && isContextOverflow(error) && Option16.isSome(compactionService)) {
+          return Stream7.unwrap(Effect46.gen(function* () {
+            yield* Ref11.set(chat.history, historyBeforeAttempt);
             const compactedPrompt = yield* preparePrompt(turn, activePrompt, true);
             return attempt(compactedPrompt, false);
           }));
@@ -10045,12 +10178,12 @@ var streamInternal = (agent, options, structured) => Stream7.unwrap(Effect45.gen
         return Stream7.make({ part: Response3.makePart("error", { error }), messages });
       }));
     })));
-    const parts = Stream7.unwrap(applyPromptChain(chain, Prompt4.make(prompt), { agentName: agent.name, turn }).pipe(Effect45.flatMap((transformedPrompt) => preparePrompt(turn, transformedPrompt, false)), Effect45.map((preparedPrompt) => attempt(preparedPrompt, true).pipe(Stream7.flatMap(({ part, messages }) => applyPartToEvents(turn, part, messages))))));
-    const resilientParts = Option15.match(resilienceService, {
+    const parts = Stream7.unwrap(applyPromptChain(chain, Prompt4.make(prompt), { agentName: agent.name, turn }).pipe(Effect46.flatMap((transformedPrompt) => preparePrompt(turn, transformedPrompt, false)), Effect46.map((preparedPrompt) => attempt(preparedPrompt, true).pipe(Stream7.flatMap(({ part, messages }) => applyPartToEvents(turn, part, messages))))));
+    const resilientParts = Option16.match(resilienceService, {
       onNone: () => parts,
-      onSome: (resilience) => Stream7.unwrap(LanguageModel3.LanguageModel.pipe(Effect45.map((model) => parts.pipe(Stream7.provideService(LanguageModel3.LanguageModel, apply(model, resilience))))))
+      onSome: (resilience) => Stream7.unwrap(LanguageModel4.LanguageModel.pipe(Effect46.map((model) => parts.pipe(Stream7.provideService(LanguageModel4.LanguageModel, apply(model, resilience))))))
     });
-    return overrides?.model === undefined ? resilientParts : resilientParts.pipe(Stream7.provide(overrides.model));
+    return overrides?.model === undefined ? provideAgentModel(resilientParts) : resilientParts.pipe(Stream7.provide(overrides.model));
   };
   const turnCompletedEvent = (turn, transcript) => ({
     _tag: "TurnCompleted",
@@ -10065,21 +10198,21 @@ var streamInternal = (agent, options, structured) => Stream7.unwrap(Effect45.gen
     transcript,
     ...state.usage === undefined ? {} : { usage: state.usage }
   });
-  const structuredFinalEvents = (turn, config) => Stream7.fromEffect(Effect45.gen(function* () {
+  const structuredFinalEvents = (turn, config) => Stream7.fromEffect(Effect46.gen(function* () {
     const structuredTurn = turn + 1;
     const transformedPrompt = yield* applyPromptChain(chain, Prompt4.make(config.objectPrompt), {
       agentName: agent.name,
       turn: structuredTurn
     });
-    const response = yield* withModelResilience(chat.generateObject({
+    const response = yield* withAgentModel(withModelResilience(chat.generateObject({
       prompt: transformedPrompt,
       schema: config.schema,
       objectName: config.objectName,
       toolChoice: "none"
-    })).pipe(Effect45.mapError((error) => new AgentError({ message: errorMessage(error), turn: structuredTurn, cause: error })));
+    }))).pipe(Effect46.mapError((error) => new AgentError({ message: errorMessage(error), turn: structuredTurn, cause: error })));
     yield* captureStructuredUsage(response.content);
     yield* savePersisted;
-    const transcript = yield* Ref10.get(chat.history);
+    const transcript = yield* Ref11.get(chat.history);
     const structuredOutput = {
       _tag: "StructuredOutput",
       turn: structuredTurn,
@@ -10089,16 +10222,16 @@ var streamInternal = (agent, options, structured) => Stream7.unwrap(Effect45.gen
     return [structuredOutput, terminalCompletedEvent(structuredTurn, transcript)];
   })).pipe(Stream7.flatMap((events) => Stream7.fromIterable(events)));
   const promptFromSteeringMessages = (messages) => messages.reduce((prompt, message) => Prompt4.concat(prompt, message.prompt), Prompt4.empty);
-  const takeSteering = () => Option15.match(steeringService, {
-    onNone: () => Effect45.succeed([]),
+  const takeSteering = () => Option16.match(steeringService, {
+    onNone: () => Effect46.succeed([]),
     onSome: (service) => service.takeSteering()
   });
-  const takeFollowUp = () => Option15.match(steeringService, {
-    onNone: () => Effect45.succeed([]),
+  const takeFollowUp = () => Option16.match(steeringService, {
+    onNone: () => Effect46.succeed([]),
     onSome: (service) => service.takeFollowUp()
   });
-  const afterTurn = (turn) => Effect45.gen(function* () {
-    const transcript = yield* Ref10.get(chat.history);
+  const afterTurn = (turn) => Effect46.gen(function* () {
+    const transcript = yield* Ref11.get(chat.history);
     yield* syncSession(turn, transcript);
     const pending = state.pending;
     yield* rememberTurn(turn, transcript, pending.length === 0);
@@ -10153,7 +10286,7 @@ var streamInternal = (agent, options, structured) => Stream7.unwrap(Effect45.gen
   }).pipe(Stream7.drain);
   const runTurn = (turn, prompt, overrides) => {
     let next;
-    const currentTurn = Stream7.fromIterable([{ _tag: "TurnStarted", turn }]).pipe(Stream7.concat(resetTurnState(turn)), Stream7.concat(modelTurn(turn, prompt, overrides)), Stream7.concat(Stream7.unwrap(afterTurn(turn).pipe(Effect45.map((result) => {
+    const currentTurn = Stream7.fromIterable([{ _tag: "TurnStarted", turn }]).pipe(Stream7.concat(resetTurnState(turn)), Stream7.concat(modelTurn(turn, prompt, overrides)), Stream7.concat(Stream7.unwrap(afterTurn(turn).pipe(Effect46.map((result) => {
       next = result.next;
       return result.events;
     })))), Stream7.withSpan("Baton.Agent.turn", { attributes: { "baton.turn": turn } }));
@@ -10167,7 +10300,7 @@ var streamInternal = (agent, options, structured) => Stream7.unwrap(Effect45.gen
       params: resume.call.params,
       providerExecuted: false
     });
-    const currentTurn = resetTurnState(0).pipe(Stream7.concat(Stream7.unwrap(Ref10.get(chat.history).pipe(Effect45.map((history) => toolCallEvents(0, call, history.content))))), Stream7.concat(Stream7.unwrap(afterTurn(0).pipe(Effect45.map((result) => {
+    const currentTurn = resetTurnState(0).pipe(Stream7.concat(Stream7.unwrap(Ref11.get(chat.history).pipe(Effect46.map((history) => toolCallEvents(0, call, history.content))))), Stream7.concat(Stream7.unwrap(afterTurn(0).pipe(Effect46.map((result) => {
       next = result.next;
       return result.events;
     })))), Stream7.withSpan("Baton.Agent.turn", { attributes: { "baton.turn": 0 } }));
@@ -10178,10 +10311,10 @@ var streamInternal = (agent, options, structured) => Stream7.unwrap(Effect45.gen
   const runStream = options.resume === undefined ? runTurn(0, initialPrompt) : resumeStream(options.resume);
   return runStream.pipe(Stream7.catchCause((cause) => {
     if (Cause3.hasInterrupts(cause))
-      return Stream7.fromEffect(Effect45.interrupt);
+      return Stream7.fromEffect(Effect46.interrupt);
     const error = Cause3.squash(cause);
     if (error instanceof AgentSuspended) {
-      return Stream7.unwrap(Ref10.get(chat.history).pipe(Effect45.map((transcript) => Stream7.concat(Stream7.fromIterable([turnCompletedEvent(state.turn, transcript)]), Stream7.failCause(cause)))));
+      return Stream7.unwrap(Ref11.get(chat.history).pipe(Effect46.map((transcript) => Stream7.concat(Stream7.fromIterable([turnCompletedEvent(state.turn, transcript)]), Stream7.failCause(cause)))));
     }
     return Stream7.failCause(cause);
   }));
@@ -10192,29 +10325,29 @@ var streamObject = (agent, options) => streamInternal(agent, options, {
   objectName: options.objectName ?? "output",
   objectPrompt: options.objectPrompt ?? defaultObjectPrompt
 });
-var generate = (agent, options) => Stream7.runLast(stream2(agent, options)).pipe(Effect45.flatMap(Option15.match({
-  onNone: () => Effect45.fail(new AgentError({ message: "Agent run ended without a Completed event", turn: 0 })),
-  onSome: (event) => event._tag === "Completed" ? Effect45.succeed({ text: event.text, turns: event.turns, transcript: event.transcript }) : Effect45.fail(new AgentError({ message: "Agent run ended without a Completed event", turn: 0 }))
+var generate = (agent, options) => Stream7.runLast(stream2(agent, options)).pipe(Effect46.flatMap(Option16.match({
+  onNone: () => Effect46.fail(new AgentError({ message: "Agent run ended without a Completed event", turn: 0 })),
+  onSome: (event) => event._tag === "Completed" ? Effect46.succeed({ text: event.text, turns: event.turns, transcript: event.transcript }) : Effect46.fail(new AgentError({ message: "Agent run ended without a Completed event", turn: 0 }))
 })));
 var generateObject = (agent, options) => Stream7.runFold(streamObject(agent, options), () => ({
-  value: Option15.none(),
-  completed: Option15.none()
+  value: Option16.none(),
+  completed: Option16.none()
 }), (acc, event) => {
   if (event._tag === "StructuredOutput") {
-    return { ...acc, value: Option15.some(event.value) };
+    return { ...acc, value: Option16.some(event.value) };
   }
   if (event._tag === "Completed") {
-    return { ...acc, completed: Option15.some(event) };
+    return { ...acc, completed: Option16.some(event) };
   }
   return acc;
-}).pipe(Effect45.flatMap(({ value, completed }) => Option15.match(completed, {
-  onNone: () => Effect45.fail(new AgentError({ message: "Agent object run ended without a Completed event", turn: 0 })),
-  onSome: (event) => Option15.match(value, {
-    onNone: () => Effect45.fail(new AgentError({
+}).pipe(Effect46.flatMap(({ value, completed }) => Option16.match(completed, {
+  onNone: () => Effect46.fail(new AgentError({ message: "Agent object run ended without a Completed event", turn: 0 })),
+  onSome: (event) => Option16.match(value, {
+    onNone: () => Effect46.fail(new AgentError({
       message: "Agent object run ended without a StructuredOutput event",
       turn: 0
     })),
-    onSome: (typedValue) => Effect45.succeed({
+    onSome: (typedValue) => Effect46.succeed({
       text: event.text,
       turns: event.turns,
       transcript: event.transcript,
@@ -10222,14 +10355,14 @@ var generateObject = (agent, options) => Stream7.runFold(streamObject(agent, opt
     })
   })
 })));
-// ../../node_modules/.bun/@batonfx+core@0.3.3/node_modules/@batonfx/core/src/agent-tool.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.6/node_modules/@batonfx/core/src/agent-tool.ts
 var exports_agent_tool = {};
 __export(exports_agent_tool, {
   asTool: () => asTool
 });
-import { Cause as Cause4, Effect as Effect46, Schema as Schema48 } from "effect";
+import { Cause as Cause4, Effect as Effect47, Schema as Schema49 } from "effect";
 import { Tool as Tool5, Toolkit as Toolkit4 } from "effect/unstable/ai";
-var defaultParameters = Schema48.Struct({ prompt: Schema48.String });
+var defaultParameters = Schema49.Struct({ prompt: Schema49.String });
 var errorMessage2 = (error) => {
   if (error instanceof AgentSuspended) {
     return `suspended on ${error.tool_name}: ${error.reason}`;
@@ -10248,39 +10381,39 @@ var errorMessage2 = (error) => {
 var causeMessage = (agentName, cause) => `sub-agent '${agentName}' could not complete: ${errorMessage2(Cause4.squash(cause))}`;
 var lazyHandled = (toolkit, name, handler) => ({
   tools: toolkit.tools,
-  handle: (toolName, params) => toolkit.pipe(Effect46.provide(toolkit.toLayer({
+  handle: (toolName, params) => toolkit.pipe(Effect47.provide(toolkit.toLayer({
     [name]: handler
-  })), Effect46.flatMap((handled) => handled.handle(toolName, params)))
+  })), Effect47.flatMap((handled) => handled.handle(toolName, params)))
 });
 var asTool = (agent, options = {}) => {
   const name = options.name ?? agent.name;
   const parameters = options.parameters ?? defaultParameters;
-  const success2 = options.success ?? Schema48.String;
+  const success2 = options.success ?? Schema49.String;
   const toPrompt = options.toPrompt ?? ((params) => params.prompt);
   const fromResult = options.fromResult ?? ((result) => result.text);
   const tool2 = Tool5.make(name, {
     ...options.description === undefined ? {} : { description: options.description },
     parameters,
     success: success2,
-    failure: Schema48.String,
+    failure: Schema49.String,
     failureMode: "return"
   });
   const toolkit = Toolkit4.make(tool2);
-  const handler = (params) => Effect46.gen(function* () {
-    const prompt = yield* Effect46.try({ try: () => toPrompt(params), catch: errorMessage2 });
-    const result = yield* generate(agent, { prompt }).pipe(Effect46.catchCause((cause) => {
+  const handler = (params) => Effect47.gen(function* () {
+    const prompt = yield* Effect47.try({ try: () => toPrompt(params), catch: errorMessage2 });
+    const result = yield* generate(agent, { prompt }).pipe(Effect47.catchCause((cause) => {
       if (Cause4.hasInterrupts(cause))
-        return Effect46.interrupt;
+        return Effect47.interrupt;
       const error = Cause4.squash(cause);
       if (error instanceof AgentSuspended)
-        return Effect46.die(error);
-      return Effect46.fail(causeMessage(agent.name, cause));
+        return Effect47.die(error);
+      return Effect47.fail(causeMessage(agent.name, cause));
     }));
-    return yield* Effect46.try({ try: () => fromResult(result), catch: errorMessage2 });
+    return yield* Effect47.try({ try: () => fromResult(result), catch: errorMessage2 });
   });
   return lazyHandled(toolkit, name, handler);
 };
-// ../../node_modules/.bun/@batonfx+core@0.3.3/node_modules/@batonfx/core/src/guardrail.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.6/node_modules/@batonfx/core/src/guardrail.ts
 var exports_guardrail = {};
 __export(exports_guardrail, {
   validateInput: () => validateInput2,
@@ -10288,7 +10421,7 @@ __export(exports_guardrail, {
   redactInput: () => redactInput,
   filterOutput: () => filterOutput
 });
-import { Effect as Effect47, Option as Option16 } from "effect";
+import { Effect as Effect48, Option as Option17 } from "effect";
 import { Prompt as Prompt6, Response as Response4 } from "effect/unstable/ai";
 var replacement = (options) => options.replacement ?? "[redacted]";
 var redactText = (text3, options) => text3.replace(options.pattern, replacement(options));
@@ -10338,19 +10471,19 @@ var redactPromptText = (prompt, options) => Prompt6.fromMessages(prompt.content.
   }
 }));
 var validateInput2 = (check2) => ({
-  transformPrompt: (prompt, context) => check2(prompt, context).pipe(Effect47.flatMap(Option16.match({
-    onNone: () => Effect47.succeed(prompt),
-    onSome: (reason) => Effect47.fail(new AgentError({ message: `Input guardrail blocked: ${reason}`, turn: context.turn }))
+  transformPrompt: (prompt, context) => check2(prompt, context).pipe(Effect48.flatMap(Option17.match({
+    onNone: () => Effect48.succeed(prompt),
+    onSome: (reason) => Effect48.fail(new AgentError({ message: `Input guardrail blocked: ${reason}`, turn: context.turn }))
   })))
 });
 var redactInput = (options) => ({
-  transformPrompt: (prompt) => Effect47.succeed(redactPromptText(prompt, options))
+  transformPrompt: (prompt) => Effect48.succeed(redactPromptText(prompt, options))
 });
 var redactOutput = (options) => ({
   transformPart: (part) => {
     if (part.type !== "text-delta")
-      return Effect47.succeed(Option16.some(part));
-    return Effect47.succeed(Option16.some(Response4.makePart("text-delta", {
+      return Effect48.succeed(Option17.some(part));
+    return Effect48.succeed(Option17.some(Response4.makePart("text-delta", {
       id: part.id,
       delta: redactText(part.delta, options),
       metadata: part.metadata
@@ -10358,22 +10491,22 @@ var redactOutput = (options) => ({
   }
 });
 var filterOutput = (keep) => ({
-  transformPart: (part, context) => Effect47.succeed(part.type === "tool-call" || keep(part, context) ? Option16.some(part) : Option16.none())
+  transformPart: (part, context) => Effect48.succeed(part.type === "tool-call" || keep(part, context) ? Option17.some(part) : Option17.none())
 });
-// ../../node_modules/.bun/@batonfx+core@0.3.3/node_modules/@batonfx/core/src/handoff.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.6/node_modules/@batonfx/core/src/handoff.ts
 var exports_handoff = {};
 __export(exports_handoff, {
   transferTool: () => transferTool,
   supervisor: () => supervisor,
   fanOut: () => fanOut
 });
-import { Effect as Effect48, Schema as Schema49 } from "effect";
+import { Effect as Effect49, Schema as Schema50 } from "effect";
 import { AiError as AiError2, Toolkit as Toolkit5 } from "effect/unstable/ai";
-var defaultTransferParameters = Schema49.Struct({ prompt: Schema49.String });
+var defaultTransferParameters = Schema50.Struct({ prompt: Schema50.String });
 var transferName = (agentName) => `transfer_to_${agentName}`;
 var positiveConcurrency = (value) => {
   const concurrency = value ?? 4;
-  return Number.isInteger(concurrency) && concurrency > 0 ? Effect48.succeed(concurrency) : Effect48.fail(new AgentError({
+  return Number.isInteger(concurrency) && concurrency > 0 ? Effect49.succeed(concurrency) : Effect49.fail(new AgentError({
     message: "Handoff.fanOut concurrency must be a positive integer",
     turn: 0
   }));
@@ -10387,7 +10520,7 @@ var mergeHandled = (toolkits) => {
     tools,
     handle: (name, params) => {
       const toolkit = toolkits.find((candidate) => candidate.tools[name] !== undefined);
-      return toolkit === undefined ? Effect48.fail(AiError2.make({
+      return toolkit === undefined ? Effect49.fail(AiError2.make({
         module: "Handoff",
         method: `${String(name)}.handle`,
         reason: new AiError2.ToolNotFoundError({
@@ -10407,7 +10540,7 @@ var transferTool = (target, options = {}) => asTool(target, {
   ...options.toPrompt === undefined ? {} : { toPrompt: options.toPrompt },
   ...options.fromResult === undefined ? {} : { fromResult: options.fromResult }
 });
-var fanOut = (children, options = {}) => positiveConcurrency(options.concurrency).pipe(Effect48.flatMap((concurrency) => Effect48.forEach(children, (child) => generate(child.agent, { ...child.options, prompt: child.prompt }), {
+var fanOut = (children, options = {}) => positiveConcurrency(options.concurrency).pipe(Effect49.flatMap((concurrency) => Effect49.forEach(children, (child) => generate(child.agent, { ...child.options, prompt: child.prompt }), {
   concurrency
 })));
 var supervisor = (options) => {
@@ -10423,96 +10556,8 @@ var supervisor = (options) => {
     toolkit
   };
 };
-// ../../node_modules/.bun/@batonfx+core@0.3.3/node_modules/@batonfx/core/src/model-registry.ts
-var exports_model_registry = {};
-__export(exports_model_registry, {
-  testLayer: () => testLayer38,
-  registrations: () => registrations,
-  registrationFromLayer: () => registrationFromLayer,
-  register: () => register4,
-  provide: () => provide,
-  memoryLayer: () => memoryLayer25,
-  layerFromRegistrationEffects: () => layerFromRegistrationEffects,
-  layer: () => layer31,
-  combine: () => combine,
-  Service: () => Service29,
-  LanguageModelNotRegistered: () => LanguageModelNotRegistered
-});
-import { Chunk as Chunk2, Context as Context42, Effect as Effect49, Layer as Layer43, Option as Option17, Ref as Ref11, Schema as Schema50, Semaphore as Semaphore3 } from "effect";
-import { Model } from "effect/unstable/ai";
-
-class LanguageModelNotRegistered extends Schema50.TaggedErrorClass()("LanguageModelNotRegistered", {
-  provider: Schema50.String,
-  model: Schema50.String,
-  registration_key: Schema50.optionalKey(Schema50.String)
-}) {
-}
 
-class Service29 extends Context42.Service()("@batonfx/core/ModelRegistry") {
-}
-var registrationVariantKey = (value) => value.registrationKey ?? null;
-var selectionVariantKey = (selection) => selection.registrationKey ?? null;
-var registryIdentity = (registration) => JSON.stringify([registration.provider, registration.model, registrationVariantKey(registration)]);
-var matchesSelection = (selection) => (registration) => registration.provider === selection.provider && registration.model === selection.model && registrationVariantKey(registration) === selectionVariantKey(selection);
-var upsertRegistration = (registry, registration) => {
-  const key2 = registryIdentity(registration);
-  const exists = Option17.isSome(Chunk2.findFirst(registry, (item) => registryIdentity(item) === key2));
-  if (!exists)
-    return Chunk2.append(registry, registration);
-  return Chunk2.map(registry, (item) => registryIdentity(item) === key2 ? registration : item);
-};
-var findRegistration = (registry, selection) => Chunk2.findFirst(registry, matchesSelection(selection)).pipe(Option17.getOrUndefined);
-var registrationFromLayer = (input) => Model.make(input.provider, input.model, input.layer).captureRequirements.pipe(Effect49.map((layer31) => ({
-  provider: input.provider,
-  model: input.model,
-  layer: layer31,
-  ...input.registrationKey === undefined ? {} : { registrationKey: input.registrationKey },
-  ...input.metadata === undefined ? {} : { metadata: input.metadata }
-})));
-var layer31 = (initialRegistrations = [], options) => Layer43.effect(Service29, Effect49.gen(function* () {
-  const registry = yield* Ref11.make(initialRegistrations.reduce(upsertRegistration, Chunk2.empty()));
-  const semaphore = options?.maxConcurrentModelCalls === undefined ? undefined : yield* Semaphore3.make(options.maxConcurrentModelCalls);
-  const register4 = Effect49.fn("ModelRegistry.register")(function* (input) {
-    yield* Ref11.update(registry, (items) => upsertRegistration(items, input.registration));
-  });
-  const registrations = Ref11.get(registry).pipe(Effect49.map(Chunk2.toReadonlyArray));
-  const provide = Effect49.fn("ModelRegistry.provide")(function* (selection, effect) {
-    const items = yield* Ref11.get(registry);
-    const registration = findRegistration(items, selection);
-    if (registration === undefined) {
-      return yield* Effect49.fail(new LanguageModelNotRegistered({
-        provider: selection.provider,
-        model: selection.model,
-        ...selection.registrationKey === undefined ? {} : { registration_key: selection.registrationKey }
-      }));
-    }
-    const provided = effect.pipe(Effect49.provide(registration.layer));
-    return yield* semaphore === undefined ? provided : semaphore.withPermits(1)(provided);
-  });
-  return Service29.of({
-    register: register4,
-    registrations,
-    provide
-  });
-}));
-var layerFromRegistrationEffects = (registrations, options) => Layer43.unwrap(Effect49.all(registrations).pipe(Effect49.map((items) => layer31(items, options))));
-var combine = (registries, options) => Layer43.unwrap(Effect49.forEach(registries, (registry) => Layer43.build(registry).pipe(Effect49.flatMap((context) => Context42.get(context, Service29).registrations))).pipe(Effect49.map((groups) => layer31(groups.flat(), options))));
-var memoryLayer25 = layer31;
-var testLayer38 = (implementation) => Layer43.succeed(Service29, Service29.of(implementation));
-var register4 = Effect49.fn("ModelRegistry.register.call")(function* (input) {
-  const service = yield* Service29;
-  return yield* service.register(input);
-});
-var registrations = Effect49.fn("ModelRegistry.registrations.call")(function* () {
-  const service = yield* Service29;
-  return yield* service.registrations;
-});
-var provide = (selection, effect) => Effect49.gen(function* () {
-  const service = yield* Service29;
-  return yield* service.provide(selection, effect);
-});
-
-// ../../node_modules/.bun/@batonfx+core@0.3.3/node_modules/@batonfx/core/src/index.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.6/node_modules/@batonfx/core/src/index.ts
 import {
   AiError as AiError3,
   Chat as Chat2,
@@ -11308,7 +11353,15 @@ var make6 = (options = {}) => Effect54.gen(function* () {
       createdAt
     }).pipe(Effect54.mapError(memoryError));
   });
-  return { recall, remember: remember2 };
+  const forget2 = Effect54.fn("MemoryService.forget")(function* (input) {
+    const subject = yield* decodeSubject(input.key.subject);
+    yield* repository.forget({
+      agent: input.key.agent,
+      subject,
+      ...input.id === undefined ? {} : { id: input.id }
+    }).pipe(Effect54.mapError(memoryError));
+  });
+  return { recall, remember: remember2, forget: forget2 };
 });
 var serviceLayer = (options) => Layer47.effect(Service33, make6(options).pipe(Effect54.map(Service33.of)));
 var batonLayer = Layer47.effect(exports_memory.Memory, Effect54.gen(function* () {
@@ -11324,6 +11377,10 @@ var remember2 = Effect54.fn("MemoryService.remember.call")(function* (input) {
   const service = yield* Service33;
   return yield* service.remember(input);
 });
+var forget2 = Effect54.fn("MemoryService.forget.call")(function* (input) {
+  const service = yield* Service33;
+  return yield* service.forget(input);
+});
 
 // ../runtime/src/model/language-model-service.ts
 var exports_language_model_service = {};
@@ -12639,7 +12696,8 @@ var terminalMemoryTranscript = (prompt, text3) => {
 };
 var recallOnlyMemory = (memory) => exports_memory.Memory.of({
   recall: memory.recall,
-  remember: () => Effect67.void
+  remember: () => Effect67.void,
+  forget: () => Effect67.void
 });
 var metadataValue = (metadata11, key2) => metadata11?.[key2];
 var decodeOptionalNumber = (value, key2, valid) => {
@@ -15735,14 +15793,42 @@ var toolRefsFromBatonAgent = (agent) => {
   const tools = agent.toolkit.tools;
   return Object.values(tools).map((tool2) => ({ name: tool2.name }));
 };
-var registerAgentPayload = (input) => {
+var modelSelectionFromBatonAgent = (selection) => ({
+  provider: selection.provider,
+  model: selection.model,
+  ...selection.registrationKey === undefined ? {} : { registration_key: selection.registrationKey }
+});
+var decodeBatonAgentName = (name) => Schema75.decodeUnknownEffect(exports_shared_schema.NonEmptyString)(name).pipe(Effect79.mapError(() => new ClientError({ message: "Baton agent name must not be blank" })));
+var decodeBatonAgentMetadata = (metadata11) => metadata11 === undefined ? Effect79.succeed(undefined) : Schema75.decodeUnknownEffect(exports_shared_schema.Metadata)(metadata11).pipe(Effect79.mapError(() => new ClientError({ message: "Baton agent metadata must be JSON metadata" })));
+var decodeBatonMemorySubject = (subject) => Schema75.decodeUnknownEffect(exports_ids_schema.MemorySubjectId)(subject).pipe(Effect79.mapError(() => new ClientError({ message: "Baton agent memory subject must be a MemorySubjectId" })));
+var metadataFromBatonAgent = Effect79.fn("Client.metadataFromBatonAgent")(function* (input) {
+  const agentMetadata = yield* decodeBatonAgentMetadata(input.agent.metadata);
+  const memorySubject = input.agent.memory === undefined ? undefined : yield* decodeBatonMemorySubject(input.agent.memory.subject);
+  const metadata11 = {
+    ...agentMetadata,
+    ...memorySubject === undefined ? {} : { memory_subject_id: memorySubject },
+    ...input.metadata
+  };
+  return Object.keys(metadata11).length === 0 ? undefined : metadata11;
+});
+var modelSelectionFromRegisterInput = (input) => {
+  if (input.model !== undefined)
+    return Effect79.succeed(input.model);
+  if (input.agent.model !== undefined)
+    return Effect79.succeed(modelSelectionFromBatonAgent(input.agent.model));
+  return Effect79.fail(new ClientError({ message: "Client.registerAgent requires model or agent.model" }));
+};
+var registerAgentPayload = Effect79.fn("Client.registerAgentPayload")(function* (input) {
   if (!isRegisterBatonAgentInput(input))
     return exports_agent_schema.define(input);
+  const name = yield* decodeBatonAgentName(input.agent.name);
+  const model = yield* modelSelectionFromRegisterInput(input);
+  const metadata11 = yield* metadataFromBatonAgent(input);
   return exports_agent_schema.define({
     id: input.id,
-    name: Schema75.decodeUnknownSync(exports_shared_schema.NonEmptyString)(input.agent.name),
+    name,
     ...input.agent.instructions === undefined ? {} : { instructions: input.agent.instructions },
-    model: input.model,
+    model,
     tools: toolRefsFromBatonAgent(input.agent),
     permissions: input.permissions ?? [],
     ...input.skill_definition_ids === undefined ? {} : { skill_definition_ids: input.skill_definition_ids },
@@ -15753,9 +15839,9 @@ var registerAgentPayload = (input) => {
     ...input.child_run_presets === undefined ? {} : { child_run_presets: input.child_run_presets },
     ...input.handoff_targets === undefined ? {} : { handoff_targets: input.handoff_targets },
     ...input.output_schema_ref === undefined ? {} : { output_schema_ref: input.output_schema_ref },
-    ...input.metadata === undefined ? {} : { metadata: input.metadata }
+    ...metadata11 === undefined ? {} : { metadata: metadata11 }
   });
-};
+});
 var agentDefinitionNotFound = (id2) => new ClientError({ message: `Agent not found: ${id2}` });
 var wakeMetadata = (input) => ({
   ...input.metadata,
@@ -15893,7 +15979,7 @@ var layerFromRuntime = Layer70.effect(Service50, Effect79.gen(function* () {
   const skillRegistry = yield* exports_skill_registry_service.Service;
   return Service50.of({
     registerAgent: Effect79.fn("Client.runtime.registerAgent")(function* (input) {
-      const payload = registerAgentPayload(input);
+      const payload = yield* registerAgentPayload(input);
       const registered = yield* agentRegistry.register(payload).pipe(Effect79.mapError(toClientError));
       if (input.address !== undefined) {
         yield* addressBook.register(input.address, { kind: "local-agent", route_key: payload.id }).pipe(Effect79.mapError(toClientError));
@@ -16720,7 +16806,7 @@ __export(exports_language_model_registration, {
   anthropic: () => anthropic
 });
 
-// ../../node_modules/.bun/@batonfx+providers@0.3.3/node_modules/@batonfx/providers/src/anthropic.ts
+// ../../node_modules/.bun/@batonfx+providers@0.3.6/node_modules/@batonfx/providers/src/anthropic.ts
 import { AnthropicClient, AnthropicLanguageModel } from "@effect/ai-anthropic";
 import { Layer as Layer72 } from "effect";
 import { FetchHttpClient as FetchHttpClient2 } from "effect/unstable/http";
@@ -16736,13 +16822,13 @@ var anthropic = (input) => exports_model_registry.registrationFromLayer({
 });
 var anthropicClientLayerConfig = AnthropicClient.layerConfig;
 var withAnthropic = (options) => exports_model_registry.layerFromRegistrationEffects([anthropic(options)]).pipe(Layer72.provide(AnthropicClient.layerConfig({ ...options.clientConfig, apiKey: options.apiKey })), Layer72.provide(FetchHttpClient2.layer));
-// ../../node_modules/.bun/@batonfx+providers@0.3.3/node_modules/@batonfx/providers/src/deterministic.ts
+// ../../node_modules/.bun/@batonfx+providers@0.3.6/node_modules/@batonfx/providers/src/deterministic.ts
 import { OpenAiClient as OpenAiClient3 } from "@effect/ai-openai";
 import { Effect as Effect81, Layer as Layer74, Option as Option29, Stream as Stream12 } from "effect";
 import { LanguageModel as LanguageModel8, Response as Response7 } from "effect/unstable/ai";
 import { FetchHttpClient as FetchHttpClient4 } from "effect/unstable/http";
 
-// ../../node_modules/.bun/@batonfx+providers@0.3.3/node_modules/@batonfx/providers/src/openai.ts
+// ../../node_modules/.bun/@batonfx+providers@0.3.6/node_modules/@batonfx/providers/src/openai.ts
 import { OpenAiClient as OpenAiClient2, OpenAiLanguageModel } from "@effect/ai-openai";
 import { Layer as Layer73 } from "effect";
 import { FetchHttpClient as FetchHttpClient3 } from "effect/unstable/http";
@@ -16759,7 +16845,7 @@ var openAi = (input) => exports_model_registry.registrationFromLayer({
 var openAiClientLayerConfig2 = OpenAiClient2.layerConfig;
 var withOpenAi = (options) => exports_model_registry.layerFromRegistrationEffects([openAi(options)]).pipe(Layer73.provide(OpenAiClient2.layerConfig({ ...options.clientConfig, apiKey: options.apiKey })), Layer73.provide(FetchHttpClient3.layer));
 
-// ../../node_modules/.bun/@batonfx+providers@0.3.3/node_modules/@batonfx/providers/src/deterministic.ts
+// ../../node_modules/.bun/@batonfx+providers@0.3.6/node_modules/@batonfx/providers/src/deterministic.ts
 var deterministicModelLayer = Layer74.effect(LanguageModel8.LanguageModel, LanguageModel8.make({
   generateText: () => Effect81.succeed([{ type: "text", text: "deterministic response" }]),
   streamText: () => Stream12.make(Response7.makePart("text-delta", { id: "text", delta: "deterministic response" }))
@@ -16783,7 +16869,7 @@ var withOpenAiOrDeterministic = (options) => Layer74.unwrap(Effect81.gen(functio
     ...Option29.isSome(openAiRegistration) ? [openAiRegistration.value] : []
   ]);
 }));
-// ../../node_modules/.bun/@batonfx+providers@0.3.3/node_modules/@batonfx/providers/src/openai-compat.ts
+// ../../node_modules/.bun/@batonfx+providers@0.3.6/node_modules/@batonfx/providers/src/openai-compat.ts
 import { OpenAiClient as OpenAiClient4, OpenAiLanguageModel as OpenAiLanguageModel2 } from "@effect/ai-openai-compat";
 import { Config as Config8, Layer as Layer75 } from "effect";
 import { FetchHttpClient as FetchHttpClient5 } from "effect/unstable/http";
@@ -16804,7 +16890,7 @@ var clientLayerConfig = (options) => OpenAiClient4.layerConfig({
   ...options.baseUrl === undefined ? {} : { apiUrl: Config8.succeed(options.baseUrl) }
 });
 var withOpenAiCompatible = (options) => exports_model_registry.layerFromRegistrationEffects([openAiCompatible(options)]).pipe(Layer75.provide(clientLayerConfig(options)), Layer75.provide(FetchHttpClient5.layer));
-// ../../node_modules/.bun/@batonfx+providers@0.3.3/node_modules/@batonfx/providers/src/openrouter.ts
+// ../../node_modules/.bun/@batonfx+providers@0.3.6/node_modules/@batonfx/providers/src/openrouter.ts
 import { OpenRouterClient, OpenRouterLanguageModel } from "@effect/ai-openrouter";
 import { Layer as Layer76 } from "effect";
 import { FetchHttpClient as FetchHttpClient6 } from "effect/unstable/http";