@statelyai/agent 2.0.0-next.2 → 2.0.0-next.4

package/dist/index.js

@@ -40,7 +40,7 @@ module.exports = __toCommonJS(src_exports);
 // src/agent.ts
 var import_xstate4 = require("xstate");
 
-// src/strategies/simple.ts
+// src/strategies/simpleStrategy.ts
 var import_ai3 = require("ai");
 
 // src/utils.ts
@@ -60,22 +60,6 @@ function getAllTransitions(state) {
   }).flat(2);
   return transitions;
 }
-function getAllMachineTransitions(stateNode) {
-  const transitions = [...stateNode.transitions.values()].map((nodeTransitions) => {
-    return nodeTransitions.map((transition) => {
-      return {
-        ...transition,
-        guard: typeof transition.guard === "string" ? { type: transition.guard } : transition.guard
-        // TODO: fix
-      };
-    });
-  }).flat(2);
-  for (const s of Object.values(stateNode.states)) {
-    const stateTransitions = getAllMachineTransitions(s);
-    transitions.push(...stateTransitions);
-  }
-  return transitions;
-}
 function wrapInXml(tagName, content) {
   return `<${tagName}>${content}</${tagName}>`;
 }
@@ -93,14 +77,6 @@ function randomId(prefix) {
   const random = Math.random().toString(36).substring(2, 9);
   return `${prefix || ""}${timestamp}${random}`;
 }
-var machineHashes = /* @__PURE__ */ new WeakMap();
-function getMachineHash(machine) {
-  if (machineHashes.has(machine)) return machineHashes.get(machine);
-  const transitions = getAllMachineTransitions(machine.root);
-  const machineHash = (0, import_object_hash.default)(transitions);
-  machineHashes.set(machine, machineHash);
-  return machineHash;
-}
 function isActorRef(actorRefLike) {
   return "src" in actorRefLike && "system" in actorRefLike && "sessionId" in actorRefLike;
 }
@@ -119,7 +95,7 @@ function isMachineActor(actor) {
   return "src" in actor && typeof actor.src === "object" && actor.src !== null && "definition" in actor.src;
 }
 
-// src/strategies/simple.ts
+// src/strategies/simpleStrategy.ts
 var import_xstate3 = require("xstate");
 
 // src/text.ts
@@ -128,6 +104,7 @@ var import_ai = require("ai");
 // src/templates/defaultText.ts
 var defaultTextTemplate = (data) => {
   const preamble = [
+    data.stateValue ? wrapInXml("stateValue", JSON.stringify(data.stateValue)) : void 0,
     data.context ? wrapInXml("context", JSON.stringify(data.context)) : void 0
   ].filter(Boolean).join("\n");
   return `
@@ -195,7 +172,6 @@ function fromTextStream(agent, options) {
 }
 function fromText(agent, options) {
   const resolvedOptions = {
-    ...agent.defaultOptions,
     ...options
   };
   const template = resolvedOptions.template ?? defaultTextTemplate;
@@ -221,10 +197,7 @@ function fromText(agent, options) {
 var import_xstate2 = require("xstate");
 var import_ai2 = require("ai");
 async function agentDecide(agent, options) {
-  const resolvedOptions = {
-    ...agent.defaultOptions,
-    ...options
-  };
+  const resolvedOptions = options;
   const {
     strategy = agent.strategy,
     goal,
@@ -234,6 +207,8 @@ async function agentDecide(agent, options) {
     machine,
     model = agent.model,
     messages,
+    episodeId = agent.episodeId,
+    maxAttempts = 2,
     ...otherDecideInput
   } = resolvedOptions;
   const filteredEventSchemas = allowedEvents ? Object.fromEntries(
@@ -242,14 +217,18 @@ async function agentDecide(agent, options) {
     })
   ) : events;
   let attempts = 0;
-  const maxAttempts = resolvedOptions.maxAttempts ?? 2;
   let decision;
+  const minimalState = {
+    value: state.value,
+    context: state.context
+  };
   while (attempts++ < maxAttempts) {
     decision = await strategy(agent, {
+      episodeId,
       model,
       goal,
       events: filteredEventSchemas,
-      state,
+      state: minimalState,
       machine,
       messages,
       // TODO: fix UIMessage thing
@@ -257,7 +236,6 @@ async function agentDecide(agent, options) {
     });
     if (decision?.nextEvent) {
       agent.addDecision(decision);
-      await resolvedOptions.execute?.(decision.nextEvent);
       break;
     }
   }
@@ -275,30 +253,26 @@ function fromDecision(agent, defaultInput) {
       ...defaultInput,
       ...inputObject
     };
-    const state = {
-      value: snapshot.value,
-      context: resolvedInput.context
-    };
     const decision = await agentDecide(agent, {
       machine: parentRef.logic,
       state: snapshot,
-      context: resolvedInput.context,
-      execute: async (event) => {
-        parentRef.send(event);
-      },
       ...resolvedInput,
       // @ts-ignore
       messages: resolvedInput.messages
     });
+    if (decision?.nextEvent) {
+      parentRef.send(decision.nextEvent);
+    }
     return decision;
   });
 }
-function getToolMap(_agent, input) {
-  const transitions = input.machine ? getTransitions(input.state, input.machine) : Object.entries(input.events).map(([eventType, { description }]) => ({
+function getToolMap(agent, input) {
+  const events = input.events ?? agent.events;
+  const transitions = input.machine ? getTransitions(input.state, input.machine) : Object.entries(events).map(([eventType, { description }]) => ({
     eventType,
     description
   }));
-  const filter = (eventType) => Object.keys(input.events).includes(eventType);
+  const filter = (eventType) => Object.keys(events).includes(eventType);
   const functionNameMapping = {};
   const toolTransitions = transitions.filter((t) => {
     return filter(t.eventType);
@@ -336,7 +310,7 @@ function getToolMap(_agent, input) {
   return toolMap;
 }
 
-// src/strategies/simple.ts
+// src/strategies/simpleStrategy.ts
 var simpleStrategyPromptTemplate = (data) => {
   return `
 ${convertToXml(data)}
@@ -350,21 +324,13 @@ async function simpleStrategy(agent, input) {
     return void 0;
   }
   const prompt = simpleStrategyPromptTemplate({
-    context: input.context,
+    stateValue: input.state.value,
+    context: input.context ?? input.state.context,
     goal: input.goal
   });
   const messages = await getMessages(agent, prompt, input);
   const model = input.model ? agent.wrap(input.model) : agent.model;
-  const {
-    state,
-    context,
-    machine,
-    prevDecision,
-    events,
-    goal,
-    model: _,
-    ...rest
-  } = input;
+  const { state, machine, events, goal, model: _, ...rest } = input;
   const machineState = input.machine && input.state ? input.machine.resolveState({
     ...input.state,
     context: input.state.context ?? {}
@@ -391,11 +357,12 @@ async function simpleStrategy(agent, input) {
     return void 0;
   }
   return {
+    id: randomId(),
     strategy: "simple",
     goal: input.goal,
     goalState: input.state,
     nextEvent: singleResult.result,
-    episodeId: agent.episodeId,
+    episodeId: input.episodeId ?? agent.episodeId,
     timestamp: Date.now(),
     paths: [
       {
@@ -552,7 +519,6 @@ function createAgent({
   });
 }
 var Agent = class extends import_xstate4.Actor {
-  // todo
   constructor({
     logic = agentLogic,
     id,
@@ -609,9 +575,10 @@ var Agent = class extends import_xstate4.Actor {
   addFeedback(feedbackInput) {
     const feedback = {
       ...feedbackInput,
+      comment: feedbackInput.comment ?? void 0,
       attributes: { ...feedbackInput.attributes },
       timestamp: feedbackInput.timestamp ?? Date.now(),
-      episodeId: this.episodeId
+      episodeId: feedbackInput.episodeId ?? this.episodeId
     };
     this.send({
       type: "agent.feedback",
@@ -632,9 +599,12 @@ var Agent = class extends import_xstate4.Actor {
       event,
       state,
       id: observationInput.id ?? randomId(),
-      episodeId: this.episodeId,
+      episodeId: observationInput.episodeId ?? this.episodeId,
       timestamp: observationInput.timestamp ?? Date.now(),
-      machineHash: observationInput.machine ? getMachineHash(observationInput.machine) : void 0
+      decisionId: observationInput.decisionId
+      // machineHash: observationInput.machine
+      //   ? getMachineHash(observationInput.machine)
+      //   : undefined,
     };
     this.send({
       type: "agent.observe",
@@ -668,15 +638,16 @@ var Agent = class extends import_xstate4.Actor {
     const agent = this;
     async function handleObservation(observationInput) {
       const observation = agent.addObservation(observationInput);
-      const input = getInput?.(observation);
-      if (input) {
-        const res = await agentDecide(agent, {
+      const interactInput = getInput?.(observation);
+      if (interactInput) {
+        const decision = await agentDecide(agent, {
           machine,
           state: observation.state,
-          ...input
+          ...interactInput
         });
-        if (res?.nextEvent) {
-          actorRef.send(res.nextEvent);
+        if (decision?.nextEvent) {
+          decision.nextEvent["_decision"] = decision.id;
+          actorRef.send(decision.nextEvent);
         }
       }
       prevState = observationInput.state;
@@ -686,21 +657,24 @@ var Agent = class extends import_xstate4.Actor {
         if (!subscribed || inspEvent.actorRef !== actorRef || inspEvent.type !== "@xstate.snapshot") {
           return;
         }
+        const decisionId = inspEvent.event["_decision"];
+        const decision = decisionId ? agent.getDecisions().find((d) => d.id === decisionId) : void 0;
         const observationInput = {
           event: inspEvent.event,
           prevState,
           state: inspEvent.snapshot,
-          machine: actorRef.src
+          goal: decision?.goal,
+          decisionId
         };
         await handleObservation(observationInput);
       }
     }) : void 0;
     if (actorRef._processingStatus === 1) {
       handleObservation({
+        decisionId: void 0,
         prevState: void 0,
         event: void 0,
-        state: actorRef.getSnapshot(),
-        machine: actorRef.src
+        state: actorRef.getSnapshot()
       });
     }
     return {
@@ -718,11 +692,14 @@ var Agent = class extends import_xstate4.Actor {
         if (inspEvent.actorRef !== actorRef || inspEvent.type !== "@xstate.snapshot") {
           return;
         }
+        const decisionId = inspEvent.event["_decision"];
+        const decision = decisionId ? this.getDecisions().find((d) => d.id === decisionId) : void 0;
         const observationInput = {
+          decisionId,
           event: inspEvent.event,
           prevState,
           state: inspEvent.snapshot,
-          machine: actorRef.src
+          goal: decision?.goal
         };
         prevState = observationInput.state;
         this.addObservation(observationInput);
@@ -745,8 +722,8 @@ var Agent = class extends import_xstate4.Actor {
    * - The `machine` (e.g. a state machine) that specifies what can happen next
    * - Additional `context`
    */
-  async decide(opts) {
-    return agentDecide(this, opts);
+  async decide(input) {
+    return agentDecide(this, input);
   }
 };
 // Annotate the CommonJS export names for ESM import in node:

package/dist/index.mjs

@@ -4,7 +4,7 @@ import {
   fromTransition
 } from "xstate";
 
-// src/strategies/simple.ts
+// src/strategies/simpleStrategy.ts
 import { generateText as generateText2 } from "ai";
 
 // src/utils.ts
@@ -24,22 +24,6 @@ function getAllTransitions(state) {
   }).flat(2);
   return transitions;
 }
-function getAllMachineTransitions(stateNode) {
-  const transitions = [...stateNode.transitions.values()].map((nodeTransitions) => {
-    return nodeTransitions.map((transition) => {
-      return {
-        ...transition,
-        guard: typeof transition.guard === "string" ? { type: transition.guard } : transition.guard
-        // TODO: fix
-      };
-    });
-  }).flat(2);
-  for (const s of Object.values(stateNode.states)) {
-    const stateTransitions = getAllMachineTransitions(s);
-    transitions.push(...stateTransitions);
-  }
-  return transitions;
-}
 function wrapInXml(tagName, content) {
   return `<${tagName}>${content}</${tagName}>`;
 }
@@ -57,14 +41,6 @@ function randomId(prefix) {
   const random = Math.random().toString(36).substring(2, 9);
   return `${prefix || ""}${timestamp}${random}`;
 }
-var machineHashes = /* @__PURE__ */ new WeakMap();
-function getMachineHash(machine) {
-  if (machineHashes.has(machine)) return machineHashes.get(machine);
-  const transitions = getAllMachineTransitions(machine.root);
-  const machineHash = hash(transitions);
-  machineHashes.set(machine, machineHash);
-  return machineHash;
-}
 function isActorRef(actorRefLike) {
   return "src" in actorRefLike && "system" in actorRefLike && "sessionId" in actorRefLike;
 }
@@ -83,7 +59,7 @@ function isMachineActor(actor) {
   return "src" in actor && typeof actor.src === "object" && actor.src !== null && "definition" in actor.src;
 }
 
-// src/strategies/simple.ts
+// src/strategies/simpleStrategy.ts
 import { getNextSnapshot } from "xstate";
 
 // src/text.ts
@@ -95,6 +71,7 @@ import {
 // src/templates/defaultText.ts
 var defaultTextTemplate = (data) => {
   const preamble = [
+    data.stateValue ? wrapInXml("stateValue", JSON.stringify(data.stateValue)) : void 0,
     data.context ? wrapInXml("context", JSON.stringify(data.context)) : void 0
   ].filter(Boolean).join("\n");
   return `
@@ -166,7 +143,6 @@ function fromTextStream(agent, options) {
 }
 function fromText(agent, options) {
   const resolvedOptions = {
-    ...agent.defaultOptions,
     ...options
   };
   const template = resolvedOptions.template ?? defaultTextTemplate;
@@ -192,10 +168,7 @@ function fromText(agent, options) {
 import { fromPromise as fromPromise2 } from "xstate";
 import { tool } from "ai";
 async function agentDecide(agent, options) {
-  const resolvedOptions = {
-    ...agent.defaultOptions,
-    ...options
-  };
+  const resolvedOptions = options;
   const {
     strategy = agent.strategy,
     goal,
@@ -205,6 +178,8 @@ async function agentDecide(agent, options) {
     machine,
     model = agent.model,
     messages,
+    episodeId = agent.episodeId,
+    maxAttempts = 2,
     ...otherDecideInput
   } = resolvedOptions;
   const filteredEventSchemas = allowedEvents ? Object.fromEntries(
@@ -213,14 +188,18 @@ async function agentDecide(agent, options) {
     })
   ) : events;
   let attempts = 0;
-  const maxAttempts = resolvedOptions.maxAttempts ?? 2;
   let decision;
+  const minimalState = {
+    value: state.value,
+    context: state.context
+  };
   while (attempts++ < maxAttempts) {
     decision = await strategy(agent, {
+      episodeId,
       model,
       goal,
       events: filteredEventSchemas,
-      state,
+      state: minimalState,
       machine,
       messages,
       // TODO: fix UIMessage thing
@@ -228,7 +207,6 @@ async function agentDecide(agent, options) {
     });
     if (decision?.nextEvent) {
       agent.addDecision(decision);
-      await resolvedOptions.execute?.(decision.nextEvent);
       break;
     }
   }
@@ -246,30 +224,26 @@ function fromDecision(agent, defaultInput) {
       ...defaultInput,
       ...inputObject
     };
-    const state = {
-      value: snapshot.value,
-      context: resolvedInput.context
-    };
     const decision = await agentDecide(agent, {
       machine: parentRef.logic,
       state: snapshot,
-      context: resolvedInput.context,
-      execute: async (event) => {
-        parentRef.send(event);
-      },
       ...resolvedInput,
       // @ts-ignore
       messages: resolvedInput.messages
     });
+    if (decision?.nextEvent) {
+      parentRef.send(decision.nextEvent);
+    }
     return decision;
   });
 }
-function getToolMap(_agent, input) {
-  const transitions = input.machine ? getTransitions(input.state, input.machine) : Object.entries(input.events).map(([eventType, { description }]) => ({
+function getToolMap(agent, input) {
+  const events = input.events ?? agent.events;
+  const transitions = input.machine ? getTransitions(input.state, input.machine) : Object.entries(events).map(([eventType, { description }]) => ({
     eventType,
     description
   }));
-  const filter = (eventType) => Object.keys(input.events).includes(eventType);
+  const filter = (eventType) => Object.keys(events).includes(eventType);
   const functionNameMapping = {};
   const toolTransitions = transitions.filter((t) => {
     return filter(t.eventType);
@@ -307,7 +281,7 @@ function getToolMap(_agent, input) {
   return toolMap;
 }
 
-// src/strategies/simple.ts
+// src/strategies/simpleStrategy.ts
 var simpleStrategyPromptTemplate = (data) => {
   return `
 ${convertToXml(data)}
@@ -321,21 +295,13 @@ async function simpleStrategy(agent, input) {
     return void 0;
   }
   const prompt = simpleStrategyPromptTemplate({
-    context: input.context,
+    stateValue: input.state.value,
+    context: input.context ?? input.state.context,
     goal: input.goal
   });
   const messages = await getMessages(agent, prompt, input);
   const model = input.model ? agent.wrap(input.model) : agent.model;
-  const {
-    state,
-    context,
-    machine,
-    prevDecision,
-    events,
-    goal,
-    model: _,
-    ...rest
-  } = input;
+  const { state, machine, events, goal, model: _, ...rest } = input;
   const machineState = input.machine && input.state ? input.machine.resolveState({
     ...input.state,
     context: input.state.context ?? {}
@@ -362,11 +328,12 @@ async function simpleStrategy(agent, input) {
     return void 0;
   }
   return {
+    id: randomId(),
     strategy: "simple",
     goal: input.goal,
     goalState: input.state,
     nextEvent: singleResult.result,
-    episodeId: agent.episodeId,
+    episodeId: input.episodeId ?? agent.episodeId,
     timestamp: Date.now(),
     paths: [
       {
@@ -525,7 +492,6 @@ function createAgent({
   });
 }
 var Agent = class extends Actor {
-  // todo
   constructor({
     logic = agentLogic,
     id,
@@ -582,9 +548,10 @@ var Agent = class extends Actor {
   addFeedback(feedbackInput) {
     const feedback = {
       ...feedbackInput,
+      comment: feedbackInput.comment ?? void 0,
       attributes: { ...feedbackInput.attributes },
       timestamp: feedbackInput.timestamp ?? Date.now(),
-      episodeId: this.episodeId
+      episodeId: feedbackInput.episodeId ?? this.episodeId
     };
     this.send({
       type: "agent.feedback",
@@ -605,9 +572,12 @@ var Agent = class extends Actor {
       event,
       state,
       id: observationInput.id ?? randomId(),
-      episodeId: this.episodeId,
+      episodeId: observationInput.episodeId ?? this.episodeId,
       timestamp: observationInput.timestamp ?? Date.now(),
-      machineHash: observationInput.machine ? getMachineHash(observationInput.machine) : void 0
+      decisionId: observationInput.decisionId
+      // machineHash: observationInput.machine
+      //   ? getMachineHash(observationInput.machine)
+      //   : undefined,
     };
     this.send({
       type: "agent.observe",
@@ -641,15 +611,16 @@ var Agent = class extends Actor {
     const agent = this;
     async function handleObservation(observationInput) {
       const observation = agent.addObservation(observationInput);
-      const input = getInput?.(observation);
-      if (input) {
-        const res = await agentDecide(agent, {
+      const interactInput = getInput?.(observation);
+      if (interactInput) {
+        const decision = await agentDecide(agent, {
           machine,
           state: observation.state,
-          ...input
+          ...interactInput
         });
-        if (res?.nextEvent) {
-          actorRef.send(res.nextEvent);
+        if (decision?.nextEvent) {
+          decision.nextEvent["_decision"] = decision.id;
+          actorRef.send(decision.nextEvent);
         }
       }
       prevState = observationInput.state;
@@ -659,21 +630,24 @@ var Agent = class extends Actor {
         if (!subscribed || inspEvent.actorRef !== actorRef || inspEvent.type !== "@xstate.snapshot") {
           return;
         }
+        const decisionId = inspEvent.event["_decision"];
+        const decision = decisionId ? agent.getDecisions().find((d) => d.id === decisionId) : void 0;
         const observationInput = {
           event: inspEvent.event,
           prevState,
           state: inspEvent.snapshot,
-          machine: actorRef.src
+          goal: decision?.goal,
+          decisionId
         };
         await handleObservation(observationInput);
       }
     }) : void 0;
     if (actorRef._processingStatus === 1) {
       handleObservation({
+        decisionId: void 0,
         prevState: void 0,
         event: void 0,
-        state: actorRef.getSnapshot(),
-        machine: actorRef.src
+        state: actorRef.getSnapshot()
       });
     }
     return {
@@ -691,11 +665,14 @@ var Agent = class extends Actor {
         if (inspEvent.actorRef !== actorRef || inspEvent.type !== "@xstate.snapshot") {
           return;
         }
+        const decisionId = inspEvent.event["_decision"];
+        const decision = decisionId ? this.getDecisions().find((d) => d.id === decisionId) : void 0;
         const observationInput = {
+          decisionId,
           event: inspEvent.event,
           prevState,
           state: inspEvent.snapshot,
-          machine: actorRef.src
+          goal: decision?.goal
         };
         prevState = observationInput.state;
         this.addObservation(observationInput);
@@ -718,8 +695,8 @@ var Agent = class extends Actor {
    * - The `machine` (e.g. a state machine) that specifies what can happen next
    * - Additional `context`
    */
-  async decide(opts) {
-    return agentDecide(this, opts);
+  async decide(input) {
+    return agentDecide(this, input);
   }
 };
 export {