@botpress/runtime 1.3.4 → 1.3.6

package/dist/runtime/chat/components.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"components.d.ts","sourceRoot":"","sources":["../../../src/runtime/chat/components.ts"],"names":[],"mappings":"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"}

package/dist/runtime/handlers/conversation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"conversation.d.ts","sourceRoot":"","sources":["../../../src/runtime/handlers/conversation.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAS/E,eAAO,MAAM,KAAK,GAAI,KAAK,iBAAiB,SAwD3C,CAAC"}
+{"version":3,"file":"conversation.d.ts","sourceRoot":"","sources":["../../../src/runtime/handlers/conversation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAS/E,eAAO,MAAM,KAAK,GAAI,KAAK,iBAAiB,SA2D3C,CAAC"}

package/dist/runtime.js

@@ -48,7 +48,7 @@ var init_define_BUILD = __esm({
 var define_PACKAGE_VERSIONS_default;
 var init_define_PACKAGE_VERSIONS = __esm({
   "<define:__PACKAGE_VERSIONS__>"() {
-    define_PACKAGE_VERSIONS_default = { runtime: "1.3.4", adk: "not-installed", sdk: "4.17.0", llmz: "0.0.26", zai: "2.1.16", cognitive: "0.1.47" };
+    define_PACKAGE_VERSIONS_default = { runtime: "1.3.6", adk: "not-installed", sdk: "4.17.0", llmz: "0.0.26", zai: "2.1.16", cognitive: "0.1.47" };
   }
 });
 
@@ -39723,6 +39723,7 @@ var WellKnownMetadata = {
 
 // src/runtime/autonomous.ts
 var import_lodash2 = __toESM(require_lodash(), 1);
+import { AsyncResource } from "node:async_hooks";
 var Autonomous;
 ((Autonomous2) => {
   Autonomous2.Tool = LlmzTool;
@@ -39841,7 +39842,7 @@ If the question is not related to the knowledge bases, do NOT use this tool.`.tr
             options.interruption
           ]);
           const llmz_execute = (await import("llmz")).execute;
-          const originalContext = context2.getAll();
+          const asyncResource = new AsyncResource("autonomous.execution");
           const getNewIteration = (index) => createSpan(
             "autonomous.iteration",
             {
@@ -39899,32 +39900,27 @@ Always prefer information from the knowledge bases over general knowledge when a
               });
               return instructions;
             },
-            ...(props.tools || props.knowledge) && {
-              tools: async (ctx) => {
-                const tools = props.tools ? await getValue(props.tools, ctx) : [];
-                const allTools = [...tools ?? []];
-                if (search_knowledge) {
-                  allTools.push(search_knowledge);
-                }
+            ...props.objects && {
+              objects: async (ctx) => {
+                const objs = await getValue(props.objects, ctx) ?? [];
                 iterationSpan?.setAttribute(
-                  "autonomous.tools",
-                  allTools?.map((t) => t.name).join(", ")
+                  "autonomous.objects",
+                  objs.map((o) => o.name).join(", ")
                 );
-                return allTools.map(
-                  (tool) => tool.clone({
-                    handler: (args, ctx2) => {
-                      context2.enterWith(originalContext);
-                      return context2.run(originalContext, () => {
+                for (const obj of objs) {
+                  obj.tools = obj.tools?.map(
+                    (tool) => tool.clone({
+                      handler: asyncResource.bind((args, ctx2) => {
                         let err = null;
                         const result = span(
                           "autonomous.tool",
                           {
+                            "autonomous.tool.object": obj.name,
                             "autonomous.tool.name": tool.name,
                             "autonomous.tool.input": args
                           },
                           async (s) => {
-                            context2.enterWith(originalContext);
-                            const value = await tool.execute(args, ctx2).catch((e) => {
+                            const value = tool.execute(args, ctx2).catch((e) => {
                               err = e;
                               if (err && err?.constructor && err?.constructor?.name && err?.constructor?.name === "ThinkSignal") {
                                 s.setAttributes({
@@ -39960,25 +39956,92 @@ Always prefer information from the knowledge bases over general knowledge when a
                           throw err;
                         }
                         return result;
-                      });
-                    }
+                      })
+                    })
+                  ) ?? [];
+                }
+                return objs;
+              }
+            },
+            ...(props.tools || props.knowledge) && {
+              tools: async (ctx) => {
+                const tools = props.tools ? await getValue(props.tools, ctx) : [];
+                const allTools = [...tools ?? []];
+                if (search_knowledge) {
+                  allTools.push(search_knowledge);
+                }
+                iterationSpan?.setAttribute(
+                  "autonomous.tools",
+                  allTools?.map((t) => t.name).join(", ")
+                );
+                return allTools.map(
+                  (tool) => tool.clone({
+                    handler: asyncResource.bind((args, ctx2) => {
+                      let err = null;
+                      const result = span(
+                        "autonomous.tool",
+                        {
+                          "autonomous.tool.name": tool.name,
+                          "autonomous.tool.input": args
+                        },
+                        async (s) => {
+                          const value = tool.execute(args, ctx2).catch((e) => {
+                            err = e;
+                            if (err && err?.constructor && err?.constructor?.name && err?.constructor?.name === "ThinkSignal") {
+                              s.setAttributes({
+                                "autonomous.tool.status": "think"
+                              });
+                              s.setStatus({
+                                code: SpanStatusCode.UNSET,
+                                message: "ThinkSignal"
+                              });
+                              err[HandledErrorProp] = true;
+                              throw err;
+                            } else {
+                              s.setAttributes({
+                                "autonomous.tool.status": "error",
+                                "autonomous.tool.error": err.message
+                              });
+                              s.setStatus({
+                                code: SpanStatusCode.ERROR,
+                                message: err.message
+                              });
+                              s.recordException(err);
+                              throw err;
+                            }
+                          });
+                          s.setAttributes({
+                            "autonomous.tool.output": value,
+                            "autonomous.tool.status": "success"
+                          });
+                          return value;
+                        }
+                      );
+                      if (err) {
+                        throw err;
+                      }
+                      return result;
+                    })
                   })
                 );
               }
             },
-            ...props.objects && { objects: props.objects },
             ...props.exits && { exits: props.exits },
             ...joinedSignal && { signal: joinedSignal },
             ...props.hooks?.onBeforeTool && {
-              onBeforeTool: props.hooks.onBeforeTool
+              onBeforeTool: asyncResource.bind(props.hooks.onBeforeTool)
             },
             ...props.hooks?.onAfterTool && {
-              onAfterTool: props.hooks.onAfterTool
+              onAfterTool: asyncResource.bind(props.hooks.onAfterTool)
             },
             ...props.hooks?.onBeforeExecution && {
-              onBeforeExecution: props.hooks.onBeforeExecution
+              onBeforeExecution: asyncResource.bind(
+                props.hooks.onBeforeExecution
+              )
+            },
+            ...props.hooks?.onExit && {
+              onExit: asyncResource.bind(props.hooks.onExit)
             },
-            ...props.hooks?.onExit && { onExit: props.hooks.onExit },
             onTrace: ({ trace: trace2, iteration }) => {
               if (trace2.type === "code_execution") {
               } else if (trace2.type === "llm_call_started") {
@@ -39992,7 +40055,11 @@ Always prefer information from the knowledge bases over general knowledge when a
                   "property.value": trace2.value
                 });
               }
-              props.hooks?.onTrace?.({ trace: trace2, iteration });
+              if (props.hooks?.onTrace) {
+                return asyncResource.runInAsyncScope(
+                  () => props.hooks.onTrace({ trace: trace2, iteration })
+                );
+              }
             },
             onIterationEnd: async (iteration, controller) => {
               iterationSpan?.setAttributes({
@@ -40040,8 +40107,11 @@ ${iteration.status.execution_error.stack}`;
                 });
               }
               iterationSpan?.end();
-              contextManager.enterWith(execSpan.ctx);
-              await props.hooks?.onIterationEnd?.(iteration, controller);
+              if (props.hooks?.onIterationEnd) {
+                return await asyncResource.runInAsyncScope(
+                  () => props.hooks.onIterationEnd(iteration, controller)
+                );
+              }
             }
           });
           execSpan.setAttribute(
@@ -45334,6 +45404,7 @@ init_define_BUILD();
 init_define_PACKAGE_VERSIONS();
 import {
   Chat,
+  DefaultComponents,
   isAnyComponent as isAnyComponent2
 } from "llmz";
 
@@ -45663,9 +45734,6 @@ ${openTag}${inner}${closeTag}
 \`\`\``;
 }
 
-// src/runtime/chat/chat.ts
-import { DefaultComponents } from "llmz";
-
 // ../../node_modules/.bun/dedent@1.7.0/node_modules/dedent/dist/dedent.mjs
 init_define_BUILD();
 init_define_PACKAGE_VERSIONS();
@@ -45803,45 +45871,10 @@ var Config = {
   Analysis
 };
 
-// src/runtime/chat/citations.ts
-init_define_BUILD();
-init_define_PACKAGE_VERSIONS();
-function expandCitationsInObject(obj, citationsManager) {
-  if (typeof obj === "string" && obj.trim().length > 0) {
-    let footer = "";
-    const { cleaned } = citationsManager.extractCitations(obj, (citation) => {
-      footer += `${JSON.stringify(citation.source)}
-`;
-      return "";
-    }) ?? { cleaned: obj };
-    if (footer) {
-      return `${cleaned}
-
-${footer}`.trim();
-    }
-    return cleaned.trim();
-  }
-  if (Array.isArray(obj)) {
-    return obj.map(
-      (item) => expandCitationsInObject(item, citationsManager)
-    );
-  }
-  if (obj && typeof obj === "object") {
-    const result = {};
-    for (const [key, value] of Object.entries(obj)) {
-      result[key] = expandCitationsInObject(value, citationsManager);
-    }
-    return result;
-  }
-  return obj;
-}
-
 // src/runtime/chat/chat.ts
-var OutgoingMessages = Object.values(DefaultComponents);
 var BotpressChat = class extends Chat {
   _transcript;
   client;
-  cognitive;
   conversation;
   botId;
   logger;
@@ -45853,14 +45886,20 @@ var BotpressChat = class extends Chat {
       handler: async (message) => this.handle(message)
     });
     this.client = context3.client;
-    this.cognitive = context3.cognitive;
     this.conversation = context3.conversation;
     this.botId = context3.botId;
     this.logger = context3.logger;
     this.citations = context3.citations;
   }
   async getComponents() {
-    return OutgoingMessages;
+    return [
+      DefaultComponents.Text,
+      DefaultComponents.Image,
+      DefaultComponents.File,
+      DefaultComponents.Audio,
+      DefaultComponents.Video,
+      DefaultComponents.Card
+    ];
   }
   async clearTranscript() {
     this._transcript = [];
@@ -45979,12 +46018,18 @@ var BotpressChat = class extends Chat {
         "message.type": message.type
       },
       async (s) => {
+        const [payload, citations] = this.citations.removeCitationsFromObject(
+          message.payload
+        );
         const { message: created } = await this.client.createMessage({
           conversationId: this.conversation.id,
           tags: message.tags || {},
           userId: this.botId,
-          type: message.type,
-          payload: expandCitationsInObject(message.payload, this.citations)
+          type: message.type.toLowerCase(),
+          payload: {
+            ...payload,
+            metadata: { citations }
+          }
         });
         s.setAttribute("messageId", created.id);
         this._transcript?.push({
@@ -46018,20 +46063,9 @@ var BotpressChat = class extends Chat {
             if (isAnyComponent2(msg)) {
               await this.handle(msg);
             } else if (typeof msg === "string" && msg.trim().length) {
-              const { message: message2 } = await this.client.createMessage({
-                conversationId: this.conversation.id,
-                tags: {},
-                userId: this.botId,
+              await this.sendMessage({
                 type: "text",
-                payload: {
-                  text: expandCitationsInObject(msg, this.citations)
-                }
-              });
-              this._transcript?.push({
-                id: message2.id,
-                role: "assistant",
-                content: msg.trim(),
-                createdAt: (/* @__PURE__ */ new Date()).toISOString()
+                payload: { text: msg }
               });
             }
           }
@@ -46039,28 +46073,16 @@ var BotpressChat = class extends Chat {
         }
         const components = await this.getComponents();
         const component = components.find(
-          (c) => c.definition.name.toLowerCase() === message.type.toLowerCase()
+          (c) => c.definition.name.toLowerCase() === message.type.toLowerCase() || c.definition.aliases?.map((x) => x.toLowerCase()).includes(message.type.toLowerCase())
         );
         if (!component) {
           throw new Error(
             `Could not find component for message type "${message.type}"`
           );
         }
-        const { message: created } = await this.client.createMessage({
-          conversationId: this.conversation.id,
-          tags: {},
-          userId: this.botId,
+        await this.sendMessage({
           type: component.definition.name,
-          payload: expandCitationsInObject(
-            message.props,
-            this.citations
-          )
-        });
-        this._transcript?.push({
-          id: created.id,
-          role: "assistant",
-          content: JSON.stringify(message, null, 2),
-          createdAt: (/* @__PURE__ */ new Date()).toISOString()
+          payload: message.props
         });
       }
     );
@@ -46139,6 +46161,39 @@ var BotpressChat = class extends Chat {
   }
 };
 
+// src/runtime/chat/citations.ts
+init_define_BUILD();
+init_define_PACKAGE_VERSIONS();
+function expandCitationsInObject(obj, citationsManager) {
+  if (typeof obj === "string" && obj.trim().length > 0) {
+    let footer = "";
+    const { cleaned } = citationsManager.extractCitations(obj, (citation) => {
+      footer += `${JSON.stringify(citation.source)}
+`;
+      return "";
+    }) ?? { cleaned: obj };
+    if (footer) {
+      return `${cleaned}
+
+${footer}`.trim();
+    }
+    return cleaned.trim();
+  }
+  if (Array.isArray(obj)) {
+    return obj.map(
+      (item) => expandCitationsInObject(item, citationsManager)
+    );
+  }
+  if (obj && typeof obj === "object") {
+    const result = {};
+    for (const [key, value] of Object.entries(obj)) {
+      result[key] = expandCitationsInObject(value, citationsManager);
+    }
+    return result;
+  }
+  return obj;
+}
+
 // src/runtime/chat/transcript.ts
 init_define_BUILD();
 init_define_PACKAGE_VERSIONS();
@@ -46202,7 +46257,7 @@ function findMatchingHandler(handlers2, incomingChannel) {
 var setup = (bot2) => {
   bot2.on.message(
     "*",
-    async ({ conversation, message, logger, client, ctx, event, user: user2 }) => {
+    async ({ conversation, message, logger, ctx, event, user: user2 }) => {
       await span(
         "handler.conversation",
         {
@@ -46220,7 +46275,10 @@ var setup = (bot2) => {
         },
         async () => {
           const handlerName = conversation.integration + "." + conversation.channel;
-          const handler = findMatchingHandler(adk.project.conversations, handlerName);
+          const handler = findMatchingHandler(
+            adk.project.conversations,
+            handlerName
+          );
           if (!handler) {
             logger.debug(
               `Skipping message, no ADK Conversation defined for "${handlerName}"`
@@ -47124,6 +47182,12 @@ var AutonomousToolSpan = {
   name: "autonomous.tool",
   importance: "high",
   attributes: {
+    "autonomous.tool.object": {
+      type: "string",
+      title: "Object Name",
+      description: "The name of the object being used",
+      required: false
+    },
     "autonomous.tool.name": {
       type: "string",
       title: "Tool Name",