@relayfx/sdk 0.0.43 → 0.0.45

package/dist/ai.js

@@ -5005,6 +5005,38 @@ var payloadFromInput = (input) => {
         message: input.message,
         ...input.metadata === undefined ? {} : { metadata: input.metadata }
       };
+    case "ToolCall":
+      return {
+        part: input.part,
+        ...input.metadata === undefined ? {} : { metadata: input.metadata }
+      };
+    case "ToolResult":
+      return {
+        part: input.part,
+        ...input.metadata === undefined ? {} : { metadata: input.metadata }
+      };
+    case "Memory":
+      return {
+        items: input.items,
+        ...input.metadata === undefined ? {} : { metadata: input.metadata }
+      };
+    case "Skill":
+      return {
+        name: input.name,
+        body: input.body,
+        ...input.metadata === undefined ? {} : { metadata: input.metadata }
+      };
+    case "Steering":
+      return {
+        message: input.message,
+        ...input.metadata === undefined ? {} : { metadata: input.metadata }
+      };
+    case "Handoff":
+      return {
+        target: input.target,
+        summary: input.summary,
+        ...input.metadata === undefined ? {} : { metadata: input.metadata }
+      };
     case "Compaction":
       return {
         summary: input.summary,
@@ -5034,6 +5066,44 @@ var toEntryRecord = (row) => {
         _tag: "Message",
         message: payload.message
       });
+    case "ToolCall":
+      return Effect18.succeed({
+        ...base,
+        _tag: "ToolCall",
+        part: payload.part
+      });
+    case "ToolResult":
+      return Effect18.succeed({
+        ...base,
+        _tag: "ToolResult",
+        part: payload.part
+      });
+    case "Memory":
+      return Effect18.succeed({
+        ...base,
+        _tag: "Memory",
+        items: Array.isArray(payload.items) ? payload.items.map(String) : []
+      });
+    case "Skill":
+      return Effect18.succeed({
+        ...base,
+        _tag: "Skill",
+        name: String(payload.name ?? ""),
+        body: String(payload.body ?? "")
+      });
+    case "Steering":
+      return Effect18.succeed({
+        ...base,
+        _tag: "Steering",
+        message: payload.message
+      });
+    case "Handoff":
+      return Effect18.succeed({
+        ...base,
+        _tag: "Handoff",
+        target: String(payload.target ?? ""),
+        summary: String(payload.summary ?? "")
+      });
     case "Compaction":
       return Effect18.succeed({
         ...base,
@@ -5081,6 +5151,18 @@ var appendToRecord = (input) => {
   switch (input.input._tag) {
     case "Message":
       return { ...base, _tag: "Message", message: input.input.message };
+    case "ToolCall":
+      return { ...base, _tag: "ToolCall", part: input.input.part };
+    case "ToolResult":
+      return { ...base, _tag: "ToolResult", part: input.input.part };
+    case "Memory":
+      return { ...base, _tag: "Memory", items: input.input.items };
+    case "Skill":
+      return { ...base, _tag: "Skill", name: input.input.name, body: input.input.body };
+    case "Steering":
+      return { ...base, _tag: "Steering", message: input.input.message };
+    case "Handoff":
+      return { ...base, _tag: "Handoff", target: input.input.target, summary: input.input.summary };
     case "Compaction":
       return {
         ...base,
@@ -8318,7 +8400,7 @@ __export(exports_agent_loop_service, {
   AgentLoopBudgetExceeded: () => AgentLoopBudgetExceeded
 });
 
-// ../../node_modules/.bun/@batonfx+core@0.3.2/node_modules/@batonfx/core/src/agent.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.3/node_modules/@batonfx/core/src/agent.ts
 var exports_agent = {};
 __export(exports_agent, {
   streamObject: () => streamObject,
@@ -8331,7 +8413,7 @@ __export(exports_agent, {
 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";
 
-// ../../node_modules/.bun/@batonfx+core@0.3.2/node_modules/@batonfx/core/src/agent-event.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.3/node_modules/@batonfx/core/src/agent-event.ts
 var exports_agent_event = {};
 __export(exports_agent_event, {
   addUsage: () => addUsage,
@@ -8388,7 +8470,7 @@ class AgentSuspended extends Schema38.TaggedErrorClass()("@batonfx/core/AgentSus
 }) {
 }
 
-// ../../node_modules/.bun/@batonfx+core@0.3.2/node_modules/@batonfx/core/src/approvals.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.3/node_modules/@batonfx/core/src/approvals.ts
 var exports_approvals = {};
 __export(exports_approvals, {
   testLayer: () => testLayer26,
@@ -8404,7 +8486,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.2/node_modules/@batonfx/core/src/compaction.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.3/node_modules/@batonfx/core/src/compaction.ts
 var exports_compaction = {};
 __export(exports_compaction, {
   truncate: () => truncate,
@@ -8422,7 +8504,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.2/node_modules/@batonfx/core/src/session.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.3/node_modules/@batonfx/core/src/session.ts
 var exports_session = {};
 __export(exports_session, {
   testLayer: () => testLayer27,
@@ -8462,6 +8544,18 @@ var entryFromInput = (input, id2, parentId) => {
   switch (input._tag) {
     case "Message":
       return { ...base, _tag: "Message", message: input.message };
+    case "ToolCall":
+      return { ...base, _tag: "ToolCall", part: input.part };
+    case "ToolResult":
+      return { ...base, _tag: "ToolResult", part: input.part };
+    case "Memory":
+      return { ...base, _tag: "Memory", items: input.items };
+    case "Skill":
+      return { ...base, _tag: "Skill", name: input.name, body: input.body };
+    case "Steering":
+      return { ...base, _tag: "Steering", message: input.message };
+    case "Handoff":
+      return { ...base, _tag: "Handoff", target: input.target, summary: input.summary };
     case "Compaction":
       return { ...base, _tag: "Compaction", summary: input.summary, firstKeptEntryId: input.firstKeptEntryId };
     case "BranchSummary":
@@ -8524,6 +8618,17 @@ ${summary}
 var branchSummaryMessage = (summary) => messageFromText("system", `<abandoned-branch-summary>
 ${summary}
 </abandoned-branch-summary>`);
+var attributeValue = (value) => value.replaceAll("&", "&amp;").replaceAll('"', "&quot;");
+var memoryMessage = (items) => messageFromText("system", `<memory>
+${items.join(`
+`)}
+</memory>`);
+var skillMessage = (entry) => messageFromText("system", `<skill name="${attributeValue(entry.name)}">
+${entry.body}
+</skill>`);
+var handoffMessage = (entry) => messageFromText("system", `<handoff target="${attributeValue(entry.target)}">
+${entry.summary}
+</handoff>`);
 var projectedMessages = (path2) => {
   const compactionIndex = path2.findLastIndex((entry) => entry._tag === "Compaction");
   const messages = [];
@@ -8536,6 +8641,24 @@ var projectedMessages = (path2) => {
       case "Message":
         messages.push(entry.message);
         break;
+      case "ToolCall":
+        messages.push(Prompt2.makeMessage("assistant", { content: [entry.part] }));
+        break;
+      case "ToolResult":
+        messages.push(Prompt2.makeMessage("tool", { content: [entry.part] }));
+        break;
+      case "Memory":
+        messages.push(memoryMessage(entry.items));
+        break;
+      case "Skill":
+        messages.push(skillMessage(entry));
+        break;
+      case "Steering":
+        messages.push(entry.message);
+        break;
+      case "Handoff":
+        messages.push(handoffMessage(entry));
+        break;
       case "BranchSummary":
         messages.push(branchSummaryMessage(entry.summary));
         break;
@@ -8554,7 +8677,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.2/node_modules/@batonfx/core/src/tool-output.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.3/node_modules/@batonfx/core/src/tool-output.ts
 var exports_tool_output = {};
 __export(exports_tool_output, {
   testLayer: () => testLayer28,
@@ -8614,7 +8737,7 @@ var bound = (result, options) => Effect33.gen(function* () {
   return { _tag: "Success", result: output, encodedResult: output };
 });
 
-// ../../node_modules/.bun/@batonfx+core@0.3.2/node_modules/@batonfx/core/src/compaction.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.3/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.
@@ -8797,7 +8920,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.2/node_modules/@batonfx/core/src/instructions.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.3/node_modules/@batonfx/core/src/instructions.ts
 var exports_instructions = {};
 __export(exports_instructions, {
   testLayer: () => testLayer30,
@@ -8846,7 +8969,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.2/node_modules/@batonfx/core/src/memory.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.3/node_modules/@batonfx/core/src/memory.ts
 var exports_memory = {};
 __export(exports_memory, {
   testLayer: () => testLayer31,
@@ -8875,7 +8998,7 @@ var merge = (first, second) => ({
 var noopLayer = Layer34.succeed(Memory, Memory.of(noop));
 var testLayer31 = (implementation) => Layer34.succeed(Memory, Memory.of(implementation));
 
-// ../../node_modules/.bun/@batonfx+core@0.3.2/node_modules/@batonfx/core/src/model-middleware.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.3/node_modules/@batonfx/core/src/model-middleware.ts
 var exports_model_middleware = {};
 __export(exports_model_middleware, {
   layer: () => layer28,
@@ -8889,7 +9012,7 @@ class ModelMiddleware extends Context35.Service()("@batonfx/core/ModelMiddleware
 var identityLayer = Layer35.succeed(ModelMiddleware, []);
 var layer28 = (middleware) => Layer35.succeed(ModelMiddleware, middleware);
 
-// ../../node_modules/.bun/@batonfx+core@0.3.2/node_modules/@batonfx/core/src/model-resilience.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.3/node_modules/@batonfx/core/src/model-resilience.ts
 var exports_model_resilience = {};
 __export(exports_model_resilience, {
   testLayer: () => testLayer32,
@@ -8935,7 +9058,7 @@ var apply = (model, resilience) => ({
   }).pipe(Stream5.retry(retryStreamSchedule(resilience)))
 });
 
-// ../../node_modules/.bun/@batonfx+core@0.3.2/node_modules/@batonfx/core/src/permissions.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.3/node_modules/@batonfx/core/src/permissions.ts
 var exports_permissions = {};
 __export(exports_permissions, {
   testLayer: () => testLayer33,
@@ -9065,7 +9188,7 @@ var ruleStoreMemory = (initialRules = []) => Layer37.effect(RuleStore, Ref9.make
 var ruleStoreTestLayer = (implementation) => Layer37.succeed(RuleStore, RuleStore.of(implementation));
 var testLayer33 = (implementation) => Layer37.succeed(Permissions, Permissions.of(implementation));
 
-// ../../node_modules/.bun/@batonfx+core@0.3.2/node_modules/@batonfx/core/src/skill-source.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.3/node_modules/@batonfx/core/src/skill-source.ts
 var exports_skill_source = {};
 __export(exports_skill_source, {
   testLayer: () => testLayer34,
@@ -9123,7 +9246,7 @@ var selectListings = (skills, budgetTokens, recentlyUsed) => {
   return selected;
 };
 
-// ../../node_modules/.bun/@batonfx+core@0.3.2/node_modules/@batonfx/core/src/steering.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.3/node_modules/@batonfx/core/src/steering.ts
 var exports_steering = {};
 __export(exports_steering, {
   testLayer: () => testLayer35,
@@ -9180,7 +9303,7 @@ var layer30 = (options = {}) => Layer39.effect(Steering, Effect41.gen(function*
 }));
 var testLayer35 = (implementation) => Layer39.succeed(Steering, Steering.of(implementation));
 
-// ../../node_modules/.bun/@batonfx+core@0.3.2/node_modules/@batonfx/core/src/tool-context.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.3/node_modules/@batonfx/core/src/tool-context.ts
 var exports_tool_context = {};
 __export(exports_tool_context, {
   testLayer: () => testLayer36,
@@ -9198,7 +9321,7 @@ var layerDefault = Layer40.sync(ToolContext, () => ToolContext.of({
 }));
 var testLayer36 = (implementation) => Layer40.succeed(ToolContext, ToolContext.of(implementation));
 
-// ../../node_modules/.bun/@batonfx+core@0.3.2/node_modules/@batonfx/core/src/tool-executor.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.3/node_modules/@batonfx/core/src/tool-executor.ts
 var exports_tool_executor = {};
 __export(exports_tool_executor, {
   testLayer: () => testLayer37,
@@ -9324,7 +9447,7 @@ function router(routes) {
 }
 var testLayer37 = (implementation) => Layer41.succeed(ToolExecutor, ToolExecutor.of(implementation));
 
-// ../../node_modules/.bun/@batonfx+core@0.3.2/node_modules/@batonfx/core/src/turn-policy.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.3/node_modules/@batonfx/core/src/turn-policy.ts
 var exports_turn_policy = {};
 __export(exports_turn_policy, {
   untilToolCall: () => untilToolCall,
@@ -9363,7 +9486,7 @@ var both = (first, second) => make4((info) => Effect44.gen(function* () {
 }));
 var defaultPolicy = recurs(8);
 
-// ../../node_modules/.bun/@batonfx+core@0.3.2/node_modules/@batonfx/core/src/agent.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.3/node_modules/@batonfx/core/src/agent.ts
 function make5(nameOrOptions, options = {}) {
   const resolved = typeof nameOrOptions === "string" ? { ...options, name: nameOrOptions } : nameOrOptions;
   return {
@@ -9564,9 +9687,9 @@ var streamInternal = (agent, options, structured) => Stream7.unwrap(Effect45.gen
       }
       userParts.push(part);
     }
-    const memoryMessage = Prompt4.makeMessage("user", { content: userParts });
+    const memoryMessage2 = Prompt4.makeMessage("user", { content: userParts });
     const [first, ...rest] = prompt.content;
-    return first?.role === "system" ? Prompt4.fromMessages([first, memoryMessage, ...rest]) : Prompt4.fromMessages([memoryMessage, ...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)));
@@ -10046,7 +10169,7 @@ var generateObject = (agent, options) => Stream7.runFold(streamObject(agent, opt
     })
   })
 })));
-// ../../node_modules/.bun/@batonfx+core@0.3.2/node_modules/@batonfx/core/src/agent-tool.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.3/node_modules/@batonfx/core/src/agent-tool.ts
 var exports_agent_tool = {};
 __export(exports_agent_tool, {
   asTool: () => asTool
@@ -10104,7 +10227,7 @@ var asTool = (agent, options = {}) => {
   });
   return lazyHandled(toolkit, name, handler);
 };
-// ../../node_modules/.bun/@batonfx+core@0.3.2/node_modules/@batonfx/core/src/guardrail.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.3/node_modules/@batonfx/core/src/guardrail.ts
 var exports_guardrail = {};
 __export(exports_guardrail, {
   validateInput: () => validateInput2,
@@ -10184,7 +10307,7 @@ var redactOutput = (options) => ({
 var filterOutput = (keep) => ({
   transformPart: (part, context) => Effect47.succeed(part.type === "tool-call" || keep(part, context) ? Option16.some(part) : Option16.none())
 });
-// ../../node_modules/.bun/@batonfx+core@0.3.2/node_modules/@batonfx/core/src/handoff.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.3/node_modules/@batonfx/core/src/handoff.ts
 var exports_handoff = {};
 __export(exports_handoff, {
   transferTool: () => transferTool,
@@ -10247,7 +10370,7 @@ var supervisor = (options) => {
     toolkit
   };
 };
-// ../../node_modules/.bun/@batonfx+core@0.3.2/node_modules/@batonfx/core/src/model-registry.ts
+// ../../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,
@@ -10336,7 +10459,7 @@ var provide = (selection, effect) => Effect49.gen(function* () {
   return yield* service.provide(selection, effect);
 });
 
-// ../../node_modules/.bun/@batonfx+core@0.3.2/node_modules/@batonfx/core/src/index.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.3/node_modules/@batonfx/core/src/index.ts
 import {
   AiError as AiError3,
   Chat as Chat2,
@@ -11295,6 +11418,70 @@ class Service37 extends Context50.Service()("@relayfx/runtime/RelaySessionStore"
 var mapError = (error) => new exports_session.SessionStoreError({ message: error.message });
 var entryId = (id2) => exports_ids_schema.SessionEntryId.make(id2);
 var metadata10 = (value) => value;
+var entrySuffix = (entryPrefix, id2) => Number.parseInt(id2.slice(entryPrefix.length), 10);
+var maxScopedSuffix = (entryPrefix, entries) => Math.max(...entries.map((entry) => entrySuffix(entryPrefix, entry.id)).filter(Number.isFinite));
+var recordAppendInput = (record2) => {
+  switch (record2._tag) {
+    case "Message":
+      return {
+        _tag: "Message",
+        message: record2.message,
+        ...record2.metadata === undefined ? {} : { metadata: record2.metadata }
+      };
+    case "ToolCall":
+      return {
+        _tag: "ToolCall",
+        part: record2.part,
+        ...record2.metadata === undefined ? {} : { metadata: record2.metadata }
+      };
+    case "ToolResult":
+      return {
+        _tag: "ToolResult",
+        part: record2.part,
+        ...record2.metadata === undefined ? {} : { metadata: record2.metadata }
+      };
+    case "Memory":
+      return {
+        _tag: "Memory",
+        items: record2.items,
+        ...record2.metadata === undefined ? {} : { metadata: record2.metadata }
+      };
+    case "Skill":
+      return {
+        _tag: "Skill",
+        name: record2.name,
+        body: record2.body,
+        ...record2.metadata === undefined ? {} : { metadata: record2.metadata }
+      };
+    case "Steering":
+      return {
+        _tag: "Steering",
+        message: record2.message,
+        ...record2.metadata === undefined ? {} : { metadata: record2.metadata }
+      };
+    case "Handoff":
+      return {
+        _tag: "Handoff",
+        target: record2.target,
+        summary: record2.summary,
+        ...record2.metadata === undefined ? {} : { metadata: record2.metadata }
+      };
+    case "Compaction":
+      return {
+        _tag: "Compaction",
+        summary: record2.summary,
+        firstKeptEntryId: record2.firstKeptEntryId,
+        ...record2.metadata === undefined ? {} : { metadata: record2.metadata }
+      };
+    case "BranchSummary":
+      return {
+        _tag: "BranchSummary",
+        summary: record2.summary,
+        ...record2.metadata === undefined ? {} : { metadata: record2.metadata }
+      };
+  }
+};
+var appendInputMatchesRecord = (input, record2) => exports_shared_schema.canonicalString(input) === exports_shared_schema.canonicalString(recordAppendInput(record2));
 var toAppendInput = (input) => {
   switch (input._tag) {
     case "Message":
@@ -11303,6 +11490,44 @@ var toAppendInput = (input) => {
         message: input.message,
         ...input.metadata === undefined ? {} : { metadata: metadata10(input.metadata) }
       };
+    case "ToolCall":
+      return {
+        _tag: "ToolCall",
+        part: input.part,
+        ...input.metadata === undefined ? {} : { metadata: metadata10(input.metadata) }
+      };
+    case "ToolResult":
+      return {
+        _tag: "ToolResult",
+        part: input.part,
+        ...input.metadata === undefined ? {} : { metadata: metadata10(input.metadata) }
+      };
+    case "Memory":
+      return {
+        _tag: "Memory",
+        items: input.items,
+        ...input.metadata === undefined ? {} : { metadata: metadata10(input.metadata) }
+      };
+    case "Skill":
+      return {
+        _tag: "Skill",
+        name: input.name,
+        body: input.body,
+        ...input.metadata === undefined ? {} : { metadata: metadata10(input.metadata) }
+      };
+    case "Steering":
+      return {
+        _tag: "Steering",
+        message: input.message,
+        ...input.metadata === undefined ? {} : { metadata: metadata10(input.metadata) }
+      };
+    case "Handoff":
+      return {
+        _tag: "Handoff",
+        target: input.target,
+        summary: input.summary,
+        ...input.metadata === undefined ? {} : { metadata: metadata10(input.metadata) }
+      };
     case "Compaction":
       return {
         _tag: "Compaction",
@@ -11322,20 +11547,21 @@ var make8 = Effect57.fn("RelaySessionStore.make")(function* (sessionId, entrySco
   const repository = yield* exports_session_repository.Service;
   const state = yield* Ref15.make(undefined);
   const entryPrefix = `${sessionId}:entry:${entryScope}:`;
-  const initialState2 = Effect57.fn("RelaySessionStore.initialState")(function* () {
+  const initialState2 = Effect57.fn("RelaySessionStore.initialState")(function* (input) {
     const current2 = yield* Ref15.get(state);
     if (current2 !== undefined)
       return current2;
     const currentPath = yield* repository.path({ sessionId }).pipe(Effect57.mapError(mapError));
-    const existingScopeIndex = currentPath.findIndex((entry) => entry.id.startsWith(entryPrefix));
-    const initialLeaf = existingScopeIndex === -1 ? currentPath.at(-1)?.id ?? null : currentPath[existingScopeIndex]?.parentId ?? null;
-    const initialized = { leaf: initialLeaf, next: 0 };
+    const scopedEntries = currentPath.filter((entry) => entry.id.startsWith(entryPrefix));
+    const firstScopedEntry = scopedEntries[0];
+    const initialized = firstScopedEntry === undefined ? { leaf: currentPath.at(-1)?.id ?? null, next: 0 } : appendInputMatchesRecord(input, firstScopedEntry) ? { leaf: firstScopedEntry.parentId, next: entrySuffix(entryPrefix, firstScopedEntry.id) } : {
+      leaf: scopedEntries.at(-1)?.id ?? firstScopedEntry.id,
+      next: maxScopedSuffix(entryPrefix, scopedEntries) + 1
+    };
     yield* Ref15.set(state, initialized);
     return initialized;
   });
-  const append4 = Effect57.fn("RelaySessionStore.append")(function* (input) {
-    const current2 = yield* initialState2();
-    const now = yield* Clock4.currentTimeMillis;
+  const appendFromState = Effect57.fn("RelaySessionStore.appendFromState")(function* (input, current2, now) {
     const entry = yield* repository.appendEntry({
       id: exports_ids_schema.SessionEntryId.make(`${entryPrefix}${current2.next}`),
       sessionId,
@@ -11346,6 +11572,12 @@ var make8 = Effect57.fn("RelaySessionStore.make")(function* (sessionId, entrySco
     yield* Ref15.set(state, { leaf: entry.id, next: current2.next + 1 });
     return entry;
   });
+  const append4 = Effect57.fn("RelaySessionStore.append")(function* (input) {
+    const appendInput = toAppendInput(input);
+    const current2 = yield* initialState2(appendInput);
+    const now = yield* Clock4.currentTimeMillis;
+    return yield* appendFromState(input, current2, now);
+  });
   const path2 = Effect57.fn("RelaySessionStore.path")((leaf2) => repository.path({
     sessionId,
     ...leaf2 === undefined ? {} : { leafId: entryId(leaf2) }
@@ -15351,7 +15583,7 @@ __export(exports_language_model_registration, {
   anthropic: () => anthropic
 });
 
-// ../../node_modules/.bun/@batonfx+providers@0.3.2/node_modules/@batonfx/providers/src/anthropic.ts
+// ../../node_modules/.bun/@batonfx+providers@0.3.3/node_modules/@batonfx/providers/src/anthropic.ts
 import { AnthropicClient, AnthropicLanguageModel } from "@effect/ai-anthropic";
 import { Layer as Layer70 } from "effect";
 import { FetchHttpClient as FetchHttpClient2 } from "effect/unstable/http";
@@ -15367,13 +15599,13 @@ var anthropic = (input) => exports_model_registry.registrationFromLayer({
 });
 var anthropicClientLayerConfig = AnthropicClient.layerConfig;
 var withAnthropic = (options) => exports_model_registry.layerFromRegistrationEffects([anthropic(options)]).pipe(Layer70.provide(AnthropicClient.layerConfig({ ...options.clientConfig, apiKey: options.apiKey })), Layer70.provide(FetchHttpClient2.layer));
-// ../../node_modules/.bun/@batonfx+providers@0.3.2/node_modules/@batonfx/providers/src/deterministic.ts
+// ../../node_modules/.bun/@batonfx+providers@0.3.3/node_modules/@batonfx/providers/src/deterministic.ts
 import { OpenAiClient as OpenAiClient3 } from "@effect/ai-openai";
 import { Effect as Effect79, Layer as Layer72, Option as Option28, Stream as Stream11 } 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.2/node_modules/@batonfx/providers/src/openai.ts
+// ../../node_modules/.bun/@batonfx+providers@0.3.3/node_modules/@batonfx/providers/src/openai.ts
 import { OpenAiClient as OpenAiClient2, OpenAiLanguageModel } from "@effect/ai-openai";
 import { Layer as Layer71 } from "effect";
 import { FetchHttpClient as FetchHttpClient3 } from "effect/unstable/http";
@@ -15390,7 +15622,7 @@ var openAi = (input) => exports_model_registry.registrationFromLayer({
 var openAiClientLayerConfig2 = OpenAiClient2.layerConfig;
 var withOpenAi = (options) => exports_model_registry.layerFromRegistrationEffects([openAi(options)]).pipe(Layer71.provide(OpenAiClient2.layerConfig({ ...options.clientConfig, apiKey: options.apiKey })), Layer71.provide(FetchHttpClient3.layer));
 
-// ../../node_modules/.bun/@batonfx+providers@0.3.2/node_modules/@batonfx/providers/src/deterministic.ts
+// ../../node_modules/.bun/@batonfx+providers@0.3.3/node_modules/@batonfx/providers/src/deterministic.ts
 var deterministicModelLayer = Layer72.effect(LanguageModel8.LanguageModel, LanguageModel8.make({
   generateText: () => Effect79.succeed([{ type: "text", text: "deterministic response" }]),
   streamText: () => Stream11.make(Response7.makePart("text-delta", { id: "text", delta: "deterministic response" }))
@@ -15414,7 +15646,7 @@ var withOpenAiOrDeterministic = (options) => Layer72.unwrap(Effect79.gen(functio
     ...Option28.isSome(openAiRegistration) ? [openAiRegistration.value] : []
   ]);
 }));
-// ../../node_modules/.bun/@batonfx+providers@0.3.2/node_modules/@batonfx/providers/src/openai-compat.ts
+// ../../node_modules/.bun/@batonfx+providers@0.3.3/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 Layer73 } from "effect";
 import { FetchHttpClient as FetchHttpClient5 } from "effect/unstable/http";
@@ -15435,7 +15667,7 @@ var clientLayerConfig = (options) => OpenAiClient4.layerConfig({
   ...options.baseUrl === undefined ? {} : { apiUrl: Config8.succeed(options.baseUrl) }
 });
 var withOpenAiCompatible = (options) => exports_model_registry.layerFromRegistrationEffects([openAiCompatible(options)]).pipe(Layer73.provide(clientLayerConfig(options)), Layer73.provide(FetchHttpClient5.layer));
-// ../../node_modules/.bun/@batonfx+providers@0.3.2/node_modules/@batonfx/providers/src/openrouter.ts
+// ../../node_modules/.bun/@batonfx+providers@0.3.3/node_modules/@batonfx/providers/src/openrouter.ts
 import { OpenRouterClient, OpenRouterLanguageModel } from "@effect/ai-openrouter";
 import { Layer as Layer74 } from "effect";
 import { FetchHttpClient as FetchHttpClient6 } from "effect/unstable/http";

package/dist/index.js

@@ -5058,6 +5058,38 @@ var payloadFromInput = (input) => {
         message: input.message,
         ...input.metadata === undefined ? {} : { metadata: input.metadata }
       };
+    case "ToolCall":
+      return {
+        part: input.part,
+        ...input.metadata === undefined ? {} : { metadata: input.metadata }
+      };
+    case "ToolResult":
+      return {
+        part: input.part,
+        ...input.metadata === undefined ? {} : { metadata: input.metadata }
+      };
+    case "Memory":
+      return {
+        items: input.items,
+        ...input.metadata === undefined ? {} : { metadata: input.metadata }
+      };
+    case "Skill":
+      return {
+        name: input.name,
+        body: input.body,
+        ...input.metadata === undefined ? {} : { metadata: input.metadata }
+      };
+    case "Steering":
+      return {
+        message: input.message,
+        ...input.metadata === undefined ? {} : { metadata: input.metadata }
+      };
+    case "Handoff":
+      return {
+        target: input.target,
+        summary: input.summary,
+        ...input.metadata === undefined ? {} : { metadata: input.metadata }
+      };
     case "Compaction":
       return {
         summary: input.summary,
@@ -5087,6 +5119,44 @@ var toEntryRecord = (row) => {
         _tag: "Message",
         message: payload.message
       });
+    case "ToolCall":
+      return Effect18.succeed({
+        ...base,
+        _tag: "ToolCall",
+        part: payload.part
+      });
+    case "ToolResult":
+      return Effect18.succeed({
+        ...base,
+        _tag: "ToolResult",
+        part: payload.part
+      });
+    case "Memory":
+      return Effect18.succeed({
+        ...base,
+        _tag: "Memory",
+        items: Array.isArray(payload.items) ? payload.items.map(String) : []
+      });
+    case "Skill":
+      return Effect18.succeed({
+        ...base,
+        _tag: "Skill",
+        name: String(payload.name ?? ""),
+        body: String(payload.body ?? "")
+      });
+    case "Steering":
+      return Effect18.succeed({
+        ...base,
+        _tag: "Steering",
+        message: payload.message
+      });
+    case "Handoff":
+      return Effect18.succeed({
+        ...base,
+        _tag: "Handoff",
+        target: String(payload.target ?? ""),
+        summary: String(payload.summary ?? "")
+      });
     case "Compaction":
       return Effect18.succeed({
         ...base,
@@ -5134,6 +5204,18 @@ var appendToRecord = (input) => {
   switch (input.input._tag) {
     case "Message":
       return { ...base, _tag: "Message", message: input.input.message };
+    case "ToolCall":
+      return { ...base, _tag: "ToolCall", part: input.input.part };
+    case "ToolResult":
+      return { ...base, _tag: "ToolResult", part: input.input.part };
+    case "Memory":
+      return { ...base, _tag: "Memory", items: input.input.items };
+    case "Skill":
+      return { ...base, _tag: "Skill", name: input.input.name, body: input.input.body };
+    case "Steering":
+      return { ...base, _tag: "Steering", message: input.input.message };
+    case "Handoff":
+      return { ...base, _tag: "Handoff", target: input.input.target, summary: input.input.summary };
     case "Compaction":
       return {
         ...base,
@@ -8371,7 +8453,7 @@ __export(exports_agent_loop_service, {
   AgentLoopBudgetExceeded: () => AgentLoopBudgetExceeded
 });
 
-// ../../node_modules/.bun/@batonfx+core@0.3.2/node_modules/@batonfx/core/src/agent.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.3/node_modules/@batonfx/core/src/agent.ts
 var exports_agent = {};
 __export(exports_agent, {
   streamObject: () => streamObject,
@@ -8384,7 +8466,7 @@ __export(exports_agent, {
 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";
 
-// ../../node_modules/.bun/@batonfx+core@0.3.2/node_modules/@batonfx/core/src/agent-event.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.3/node_modules/@batonfx/core/src/agent-event.ts
 var exports_agent_event = {};
 __export(exports_agent_event, {
   addUsage: () => addUsage,
@@ -8441,7 +8523,7 @@ class AgentSuspended extends Schema38.TaggedErrorClass()("@batonfx/core/AgentSus
 }) {
 }
 
-// ../../node_modules/.bun/@batonfx+core@0.3.2/node_modules/@batonfx/core/src/approvals.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.3/node_modules/@batonfx/core/src/approvals.ts
 var exports_approvals = {};
 __export(exports_approvals, {
   testLayer: () => testLayer26,
@@ -8457,7 +8539,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.2/node_modules/@batonfx/core/src/compaction.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.3/node_modules/@batonfx/core/src/compaction.ts
 var exports_compaction = {};
 __export(exports_compaction, {
   truncate: () => truncate,
@@ -8475,7 +8557,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.2/node_modules/@batonfx/core/src/session.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.3/node_modules/@batonfx/core/src/session.ts
 var exports_session = {};
 __export(exports_session, {
   testLayer: () => testLayer27,
@@ -8515,6 +8597,18 @@ var entryFromInput = (input, id2, parentId) => {
   switch (input._tag) {
     case "Message":
       return { ...base, _tag: "Message", message: input.message };
+    case "ToolCall":
+      return { ...base, _tag: "ToolCall", part: input.part };
+    case "ToolResult":
+      return { ...base, _tag: "ToolResult", part: input.part };
+    case "Memory":
+      return { ...base, _tag: "Memory", items: input.items };
+    case "Skill":
+      return { ...base, _tag: "Skill", name: input.name, body: input.body };
+    case "Steering":
+      return { ...base, _tag: "Steering", message: input.message };
+    case "Handoff":
+      return { ...base, _tag: "Handoff", target: input.target, summary: input.summary };
     case "Compaction":
       return { ...base, _tag: "Compaction", summary: input.summary, firstKeptEntryId: input.firstKeptEntryId };
     case "BranchSummary":
@@ -8577,6 +8671,17 @@ ${summary}
 var branchSummaryMessage = (summary) => messageFromText("system", `<abandoned-branch-summary>
 ${summary}
 </abandoned-branch-summary>`);
+var attributeValue = (value) => value.replaceAll("&", "&amp;").replaceAll('"', "&quot;");
+var memoryMessage = (items) => messageFromText("system", `<memory>
+${items.join(`
+`)}
+</memory>`);
+var skillMessage = (entry) => messageFromText("system", `<skill name="${attributeValue(entry.name)}">
+${entry.body}
+</skill>`);
+var handoffMessage = (entry) => messageFromText("system", `<handoff target="${attributeValue(entry.target)}">
+${entry.summary}
+</handoff>`);
 var projectedMessages = (path2) => {
   const compactionIndex = path2.findLastIndex((entry) => entry._tag === "Compaction");
   const messages = [];
@@ -8589,6 +8694,24 @@ var projectedMessages = (path2) => {
       case "Message":
         messages.push(entry.message);
         break;
+      case "ToolCall":
+        messages.push(Prompt2.makeMessage("assistant", { content: [entry.part] }));
+        break;
+      case "ToolResult":
+        messages.push(Prompt2.makeMessage("tool", { content: [entry.part] }));
+        break;
+      case "Memory":
+        messages.push(memoryMessage(entry.items));
+        break;
+      case "Skill":
+        messages.push(skillMessage(entry));
+        break;
+      case "Steering":
+        messages.push(entry.message);
+        break;
+      case "Handoff":
+        messages.push(handoffMessage(entry));
+        break;
       case "BranchSummary":
         messages.push(branchSummaryMessage(entry.summary));
         break;
@@ -8607,7 +8730,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.2/node_modules/@batonfx/core/src/tool-output.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.3/node_modules/@batonfx/core/src/tool-output.ts
 var exports_tool_output = {};
 __export(exports_tool_output, {
   testLayer: () => testLayer28,
@@ -8667,7 +8790,7 @@ var bound = (result, options) => Effect33.gen(function* () {
   return { _tag: "Success", result: output, encodedResult: output };
 });
 
-// ../../node_modules/.bun/@batonfx+core@0.3.2/node_modules/@batonfx/core/src/compaction.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.3/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.
@@ -8850,7 +8973,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.2/node_modules/@batonfx/core/src/instructions.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.3/node_modules/@batonfx/core/src/instructions.ts
 var exports_instructions = {};
 __export(exports_instructions, {
   testLayer: () => testLayer30,
@@ -8899,7 +9022,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.2/node_modules/@batonfx/core/src/memory.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.3/node_modules/@batonfx/core/src/memory.ts
 var exports_memory = {};
 __export(exports_memory, {
   testLayer: () => testLayer31,
@@ -8928,7 +9051,7 @@ var merge = (first, second) => ({
 var noopLayer = Layer34.succeed(Memory, Memory.of(noop));
 var testLayer31 = (implementation) => Layer34.succeed(Memory, Memory.of(implementation));
 
-// ../../node_modules/.bun/@batonfx+core@0.3.2/node_modules/@batonfx/core/src/model-middleware.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.3/node_modules/@batonfx/core/src/model-middleware.ts
 var exports_model_middleware = {};
 __export(exports_model_middleware, {
   layer: () => layer28,
@@ -8942,7 +9065,7 @@ class ModelMiddleware extends Context35.Service()("@batonfx/core/ModelMiddleware
 var identityLayer = Layer35.succeed(ModelMiddleware, []);
 var layer28 = (middleware) => Layer35.succeed(ModelMiddleware, middleware);
 
-// ../../node_modules/.bun/@batonfx+core@0.3.2/node_modules/@batonfx/core/src/model-resilience.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.3/node_modules/@batonfx/core/src/model-resilience.ts
 var exports_model_resilience = {};
 __export(exports_model_resilience, {
   testLayer: () => testLayer32,
@@ -8988,7 +9111,7 @@ var apply = (model, resilience) => ({
   }).pipe(Stream5.retry(retryStreamSchedule(resilience)))
 });
 
-// ../../node_modules/.bun/@batonfx+core@0.3.2/node_modules/@batonfx/core/src/permissions.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.3/node_modules/@batonfx/core/src/permissions.ts
 var exports_permissions = {};
 __export(exports_permissions, {
   testLayer: () => testLayer33,
@@ -9118,7 +9241,7 @@ var ruleStoreMemory = (initialRules = []) => Layer37.effect(RuleStore, Ref9.make
 var ruleStoreTestLayer = (implementation) => Layer37.succeed(RuleStore, RuleStore.of(implementation));
 var testLayer33 = (implementation) => Layer37.succeed(Permissions, Permissions.of(implementation));
 
-// ../../node_modules/.bun/@batonfx+core@0.3.2/node_modules/@batonfx/core/src/skill-source.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.3/node_modules/@batonfx/core/src/skill-source.ts
 var exports_skill_source = {};
 __export(exports_skill_source, {
   testLayer: () => testLayer34,
@@ -9176,7 +9299,7 @@ var selectListings = (skills, budgetTokens, recentlyUsed) => {
   return selected;
 };
 
-// ../../node_modules/.bun/@batonfx+core@0.3.2/node_modules/@batonfx/core/src/steering.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.3/node_modules/@batonfx/core/src/steering.ts
 var exports_steering = {};
 __export(exports_steering, {
   testLayer: () => testLayer35,
@@ -9233,7 +9356,7 @@ var layer30 = (options = {}) => Layer39.effect(Steering, Effect41.gen(function*
 }));
 var testLayer35 = (implementation) => Layer39.succeed(Steering, Steering.of(implementation));
 
-// ../../node_modules/.bun/@batonfx+core@0.3.2/node_modules/@batonfx/core/src/tool-context.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.3/node_modules/@batonfx/core/src/tool-context.ts
 var exports_tool_context = {};
 __export(exports_tool_context, {
   testLayer: () => testLayer36,
@@ -9251,7 +9374,7 @@ var layerDefault = Layer40.sync(ToolContext, () => ToolContext.of({
 }));
 var testLayer36 = (implementation) => Layer40.succeed(ToolContext, ToolContext.of(implementation));
 
-// ../../node_modules/.bun/@batonfx+core@0.3.2/node_modules/@batonfx/core/src/tool-executor.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.3/node_modules/@batonfx/core/src/tool-executor.ts
 var exports_tool_executor = {};
 __export(exports_tool_executor, {
   testLayer: () => testLayer37,
@@ -9377,7 +9500,7 @@ function router(routes) {
 }
 var testLayer37 = (implementation) => Layer41.succeed(ToolExecutor, ToolExecutor.of(implementation));
 
-// ../../node_modules/.bun/@batonfx+core@0.3.2/node_modules/@batonfx/core/src/turn-policy.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.3/node_modules/@batonfx/core/src/turn-policy.ts
 var exports_turn_policy = {};
 __export(exports_turn_policy, {
   untilToolCall: () => untilToolCall,
@@ -9416,7 +9539,7 @@ var both = (first, second) => make4((info) => Effect44.gen(function* () {
 }));
 var defaultPolicy = recurs(8);
 
-// ../../node_modules/.bun/@batonfx+core@0.3.2/node_modules/@batonfx/core/src/agent.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.3/node_modules/@batonfx/core/src/agent.ts
 function make5(nameOrOptions, options = {}) {
   const resolved = typeof nameOrOptions === "string" ? { ...options, name: nameOrOptions } : nameOrOptions;
   return {
@@ -9617,9 +9740,9 @@ var streamInternal = (agent, options, structured) => Stream7.unwrap(Effect45.gen
       }
       userParts.push(part);
     }
-    const memoryMessage = Prompt4.makeMessage("user", { content: userParts });
+    const memoryMessage2 = Prompt4.makeMessage("user", { content: userParts });
     const [first, ...rest] = prompt.content;
-    return first?.role === "system" ? Prompt4.fromMessages([first, memoryMessage, ...rest]) : Prompt4.fromMessages([memoryMessage, ...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)));
@@ -10099,7 +10222,7 @@ var generateObject = (agent, options) => Stream7.runFold(streamObject(agent, opt
     })
   })
 })));
-// ../../node_modules/.bun/@batonfx+core@0.3.2/node_modules/@batonfx/core/src/agent-tool.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.3/node_modules/@batonfx/core/src/agent-tool.ts
 var exports_agent_tool = {};
 __export(exports_agent_tool, {
   asTool: () => asTool
@@ -10157,7 +10280,7 @@ var asTool = (agent, options = {}) => {
   });
   return lazyHandled(toolkit, name, handler);
 };
-// ../../node_modules/.bun/@batonfx+core@0.3.2/node_modules/@batonfx/core/src/guardrail.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.3/node_modules/@batonfx/core/src/guardrail.ts
 var exports_guardrail = {};
 __export(exports_guardrail, {
   validateInput: () => validateInput2,
@@ -10237,7 +10360,7 @@ var redactOutput = (options) => ({
 var filterOutput = (keep) => ({
   transformPart: (part, context) => Effect47.succeed(part.type === "tool-call" || keep(part, context) ? Option16.some(part) : Option16.none())
 });
-// ../../node_modules/.bun/@batonfx+core@0.3.2/node_modules/@batonfx/core/src/handoff.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.3/node_modules/@batonfx/core/src/handoff.ts
 var exports_handoff = {};
 __export(exports_handoff, {
   transferTool: () => transferTool,
@@ -10300,7 +10423,7 @@ var supervisor = (options) => {
     toolkit
   };
 };
-// ../../node_modules/.bun/@batonfx+core@0.3.2/node_modules/@batonfx/core/src/model-registry.ts
+// ../../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,
@@ -10389,7 +10512,7 @@ var provide = (selection, effect) => Effect49.gen(function* () {
   return yield* service.provide(selection, effect);
 });
 
-// ../../node_modules/.bun/@batonfx+core@0.3.2/node_modules/@batonfx/core/src/index.ts
+// ../../node_modules/.bun/@batonfx+core@0.3.3/node_modules/@batonfx/core/src/index.ts
 import {
   AiError as AiError3,
   Chat as Chat2,
@@ -11348,6 +11471,70 @@ class Service37 extends Context50.Service()("@relayfx/runtime/RelaySessionStore"
 var mapError = (error) => new exports_session.SessionStoreError({ message: error.message });
 var entryId = (id2) => exports_ids_schema.SessionEntryId.make(id2);
 var metadata10 = (value) => value;
+var entrySuffix = (entryPrefix, id2) => Number.parseInt(id2.slice(entryPrefix.length), 10);
+var maxScopedSuffix = (entryPrefix, entries) => Math.max(...entries.map((entry) => entrySuffix(entryPrefix, entry.id)).filter(Number.isFinite));
+var recordAppendInput = (record2) => {
+  switch (record2._tag) {
+    case "Message":
+      return {
+        _tag: "Message",
+        message: record2.message,
+        ...record2.metadata === undefined ? {} : { metadata: record2.metadata }
+      };
+    case "ToolCall":
+      return {
+        _tag: "ToolCall",
+        part: record2.part,
+        ...record2.metadata === undefined ? {} : { metadata: record2.metadata }
+      };
+    case "ToolResult":
+      return {
+        _tag: "ToolResult",
+        part: record2.part,
+        ...record2.metadata === undefined ? {} : { metadata: record2.metadata }
+      };
+    case "Memory":
+      return {
+        _tag: "Memory",
+        items: record2.items,
+        ...record2.metadata === undefined ? {} : { metadata: record2.metadata }
+      };
+    case "Skill":
+      return {
+        _tag: "Skill",
+        name: record2.name,
+        body: record2.body,
+        ...record2.metadata === undefined ? {} : { metadata: record2.metadata }
+      };
+    case "Steering":
+      return {
+        _tag: "Steering",
+        message: record2.message,
+        ...record2.metadata === undefined ? {} : { metadata: record2.metadata }
+      };
+    case "Handoff":
+      return {
+        _tag: "Handoff",
+        target: record2.target,
+        summary: record2.summary,
+        ...record2.metadata === undefined ? {} : { metadata: record2.metadata }
+      };
+    case "Compaction":
+      return {
+        _tag: "Compaction",
+        summary: record2.summary,
+        firstKeptEntryId: record2.firstKeptEntryId,
+        ...record2.metadata === undefined ? {} : { metadata: record2.metadata }
+      };
+    case "BranchSummary":
+      return {
+        _tag: "BranchSummary",
+        summary: record2.summary,
+        ...record2.metadata === undefined ? {} : { metadata: record2.metadata }
+      };
+  }
+};
+var appendInputMatchesRecord = (input, record2) => exports_shared_schema.canonicalString(input) === exports_shared_schema.canonicalString(recordAppendInput(record2));
 var toAppendInput = (input) => {
   switch (input._tag) {
     case "Message":
@@ -11356,6 +11543,44 @@ var toAppendInput = (input) => {
         message: input.message,
         ...input.metadata === undefined ? {} : { metadata: metadata10(input.metadata) }
       };
+    case "ToolCall":
+      return {
+        _tag: "ToolCall",
+        part: input.part,
+        ...input.metadata === undefined ? {} : { metadata: metadata10(input.metadata) }
+      };
+    case "ToolResult":
+      return {
+        _tag: "ToolResult",
+        part: input.part,
+        ...input.metadata === undefined ? {} : { metadata: metadata10(input.metadata) }
+      };
+    case "Memory":
+      return {
+        _tag: "Memory",
+        items: input.items,
+        ...input.metadata === undefined ? {} : { metadata: metadata10(input.metadata) }
+      };
+    case "Skill":
+      return {
+        _tag: "Skill",
+        name: input.name,
+        body: input.body,
+        ...input.metadata === undefined ? {} : { metadata: metadata10(input.metadata) }
+      };
+    case "Steering":
+      return {
+        _tag: "Steering",
+        message: input.message,
+        ...input.metadata === undefined ? {} : { metadata: metadata10(input.metadata) }
+      };
+    case "Handoff":
+      return {
+        _tag: "Handoff",
+        target: input.target,
+        summary: input.summary,
+        ...input.metadata === undefined ? {} : { metadata: metadata10(input.metadata) }
+      };
     case "Compaction":
       return {
         _tag: "Compaction",
@@ -11375,20 +11600,21 @@ var make8 = Effect57.fn("RelaySessionStore.make")(function* (sessionId, entrySco
   const repository = yield* exports_session_repository.Service;
   const state = yield* Ref15.make(undefined);
   const entryPrefix = `${sessionId}:entry:${entryScope}:`;
-  const initialState2 = Effect57.fn("RelaySessionStore.initialState")(function* () {
+  const initialState2 = Effect57.fn("RelaySessionStore.initialState")(function* (input) {
     const current2 = yield* Ref15.get(state);
     if (current2 !== undefined)
       return current2;
     const currentPath = yield* repository.path({ sessionId }).pipe(Effect57.mapError(mapError));
-    const existingScopeIndex = currentPath.findIndex((entry) => entry.id.startsWith(entryPrefix));
-    const initialLeaf = existingScopeIndex === -1 ? currentPath.at(-1)?.id ?? null : currentPath[existingScopeIndex]?.parentId ?? null;
-    const initialized = { leaf: initialLeaf, next: 0 };
+    const scopedEntries = currentPath.filter((entry) => entry.id.startsWith(entryPrefix));
+    const firstScopedEntry = scopedEntries[0];
+    const initialized = firstScopedEntry === undefined ? { leaf: currentPath.at(-1)?.id ?? null, next: 0 } : appendInputMatchesRecord(input, firstScopedEntry) ? { leaf: firstScopedEntry.parentId, next: entrySuffix(entryPrefix, firstScopedEntry.id) } : {
+      leaf: scopedEntries.at(-1)?.id ?? firstScopedEntry.id,
+      next: maxScopedSuffix(entryPrefix, scopedEntries) + 1
+    };
     yield* Ref15.set(state, initialized);
     return initialized;
   });
-  const append4 = Effect57.fn("RelaySessionStore.append")(function* (input) {
-    const current2 = yield* initialState2();
-    const now = yield* Clock4.currentTimeMillis;
+  const appendFromState = Effect57.fn("RelaySessionStore.appendFromState")(function* (input, current2, now) {
     const entry = yield* repository.appendEntry({
       id: exports_ids_schema.SessionEntryId.make(`${entryPrefix}${current2.next}`),
       sessionId,
@@ -11399,6 +11625,12 @@ var make8 = Effect57.fn("RelaySessionStore.make")(function* (sessionId, entrySco
     yield* Ref15.set(state, { leaf: entry.id, next: current2.next + 1 });
     return entry;
   });
+  const append4 = Effect57.fn("RelaySessionStore.append")(function* (input) {
+    const appendInput = toAppendInput(input);
+    const current2 = yield* initialState2(appendInput);
+    const now = yield* Clock4.currentTimeMillis;
+    return yield* appendFromState(input, current2, now);
+  });
   const path2 = Effect57.fn("RelaySessionStore.path")((leaf2) => repository.path({
     sessionId,
     ...leaf2 === undefined ? {} : { leafId: entryId(leaf2) }
@@ -16488,7 +16720,7 @@ __export(exports_language_model_registration, {
   anthropic: () => anthropic
 });
 
-// ../../node_modules/.bun/@batonfx+providers@0.3.2/node_modules/@batonfx/providers/src/anthropic.ts
+// ../../node_modules/.bun/@batonfx+providers@0.3.3/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";
@@ -16504,13 +16736,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.2/node_modules/@batonfx/providers/src/deterministic.ts
+// ../../node_modules/.bun/@batonfx+providers@0.3.3/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.2/node_modules/@batonfx/providers/src/openai.ts
+// ../../node_modules/.bun/@batonfx+providers@0.3.3/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";
@@ -16527,7 +16759,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.2/node_modules/@batonfx/providers/src/deterministic.ts
+// ../../node_modules/.bun/@batonfx+providers@0.3.3/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" }))
@@ -16551,7 +16783,7 @@ var withOpenAiOrDeterministic = (options) => Layer74.unwrap(Effect81.gen(functio
     ...Option29.isSome(openAiRegistration) ? [openAiRegistration.value] : []
   ]);
 }));
-// ../../node_modules/.bun/@batonfx+providers@0.3.2/node_modules/@batonfx/providers/src/openai-compat.ts
+// ../../node_modules/.bun/@batonfx+providers@0.3.3/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";
@@ -16572,7 +16804,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.2/node_modules/@batonfx/providers/src/openrouter.ts
+// ../../node_modules/.bun/@batonfx+providers@0.3.3/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";

package/dist/types/store-sql/session/session-repository.d.ts

@@ -1,6 +1,6 @@
 import { Ids, Shared } from "../../schema/index";
 import { Context, Effect, Layer, Schema } from "effect";
-import type { Message } from "effect/unstable/ai/Prompt";
+import type { Message, ToolCallPart, ToolResultPart } from "effect/unstable/ai/Prompt";
 import { SqlClient } from "effect/unstable/sql/SqlClient";
 declare const SessionRepositoryError_base: Schema.Class<SessionRepositoryError, Schema.TaggedStruct<"SessionRepositoryError", {
     readonly message: Schema.String;
@@ -55,6 +55,32 @@ export type AppendSessionEntryInput = {
     readonly _tag: "Message";
     readonly message: Message;
     readonly metadata?: Shared.Metadata;
+} | {
+    readonly _tag: "ToolCall";
+    readonly part: ToolCallPart;
+    readonly metadata?: Shared.Metadata;
+} | {
+    readonly _tag: "ToolResult";
+    readonly part: ToolResultPart;
+    readonly metadata?: Shared.Metadata;
+} | {
+    readonly _tag: "Memory";
+    readonly items: ReadonlyArray<string>;
+    readonly metadata?: Shared.Metadata;
+} | {
+    readonly _tag: "Skill";
+    readonly name: string;
+    readonly body: string;
+    readonly metadata?: Shared.Metadata;
+} | {
+    readonly _tag: "Steering";
+    readonly message: Message;
+    readonly metadata?: Shared.Metadata;
+} | {
+    readonly _tag: "Handoff";
+    readonly target: string;
+    readonly summary: string;
+    readonly metadata?: Shared.Metadata;
 } | {
     readonly _tag: "Compaction";
     readonly summary: string;
@@ -73,6 +99,56 @@ export type SessionEntryRecord = {
     readonly message: Message;
     readonly metadata?: Shared.Metadata;
     readonly createdAt: number;
+} | {
+    readonly id: Ids.SessionEntryId;
+    readonly sessionId: Ids.SessionId;
+    readonly parentId: Ids.SessionEntryId | null;
+    readonly _tag: "ToolCall";
+    readonly part: ToolCallPart;
+    readonly metadata?: Shared.Metadata;
+    readonly createdAt: number;
+} | {
+    readonly id: Ids.SessionEntryId;
+    readonly sessionId: Ids.SessionId;
+    readonly parentId: Ids.SessionEntryId | null;
+    readonly _tag: "ToolResult";
+    readonly part: ToolResultPart;
+    readonly metadata?: Shared.Metadata;
+    readonly createdAt: number;
+} | {
+    readonly id: Ids.SessionEntryId;
+    readonly sessionId: Ids.SessionId;
+    readonly parentId: Ids.SessionEntryId | null;
+    readonly _tag: "Memory";
+    readonly items: ReadonlyArray<string>;
+    readonly metadata?: Shared.Metadata;
+    readonly createdAt: number;
+} | {
+    readonly id: Ids.SessionEntryId;
+    readonly sessionId: Ids.SessionId;
+    readonly parentId: Ids.SessionEntryId | null;
+    readonly _tag: "Skill";
+    readonly name: string;
+    readonly body: string;
+    readonly metadata?: Shared.Metadata;
+    readonly createdAt: number;
+} | {
+    readonly id: Ids.SessionEntryId;
+    readonly sessionId: Ids.SessionId;
+    readonly parentId: Ids.SessionEntryId | null;
+    readonly _tag: "Steering";
+    readonly message: Message;
+    readonly metadata?: Shared.Metadata;
+    readonly createdAt: number;
+} | {
+    readonly id: Ids.SessionEntryId;
+    readonly sessionId: Ids.SessionId;
+    readonly parentId: Ids.SessionEntryId | null;
+    readonly _tag: "Handoff";
+    readonly target: string;
+    readonly summary: string;
+    readonly metadata?: Shared.Metadata;
+    readonly createdAt: number;
 } | {
     readonly id: Ids.SessionEntryId;
     readonly sessionId: Ids.SessionId;

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@relayfx/sdk",
-  "version": "0.0.43",
+  "version": "0.0.45",
   "type": "module",
   "exports": {
     ".": {
@@ -25,8 +25,8 @@
     "typecheck": "bun tsc --noEmit"
   },
   "dependencies": {
-    "@batonfx/core": "0.3.2",
-    "@batonfx/providers": "0.3.2",
+    "@batonfx/core": "0.3.3",
+    "@batonfx/providers": "0.3.3",
     "@effect/ai-anthropic": "4.0.0-beta.93",
     "@effect/ai-openai": "4.0.0-beta.93",
     "@effect/ai-openai-compat": "4.0.0-beta.93",