@botpress/adk-cli 1.6.9 → 1.7.0

package/dist/bp-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bundled-bp-cli",
-  "version": "4.22.0",
+  "version": "4.23.1",
   "private": true,
   "dependencies": {
     "@botpress/cli": "^4.20.2"

package/dist/cli.js

@@ -313776,6 +313776,7 @@ __export(exports_internal, {
   CONFIGURATION_TYPE_HEADER: () => CONFIGURATION_TYPE_HEADER,
   CONFIGURATION_PAYLOAD_HEADER: () => CONFIGURATION_PAYLOAD_HEADER,
   BuiltInWorkflows: () => BuiltInWorkflows,
+  BuiltInActions: () => BuiltInActions,
   BaseWorkflowInstance: () => BaseWorkflowInstance,
   BaseConversationInstance: () => BaseConversationInstance,
   BUILT_IN_STATES: () => BUILT_IN_STATES,
@@ -314157,11 +314158,11 @@ function expand_(str, isTop) {
           if (pad) {
             const need = width - c4.length;
             if (need > 0) {
-              const z25 = new Array(need + 1).join("0");
+              const z26 = new Array(need + 1).join("0");
               if (i2 < 0) {
-                c4 = "-" + z25 + c4.slice(1);
+                c4 = "-" + z26 + c4.slice(1);
               } else {
-                c4 = z25 + c4;
+                c4 = z26 + c4;
               }
             }
           }
@@ -316993,8 +316994,9 @@ function initializeParentWorker(bot2) {
     const workerStats = pool.getWorkerStats();
     debugLog2(`[Main] Pool stats - Total: ${workerStats.total}, Idle: ${workerStats.idle}, Busy: ${workerStats.busy}`);
     try {
-      await pool.executeTask(event2);
-      debugLog2("[Main] Event processed successfully by worker");
+      const result = await pool.executeTask(event2);
+      debugLog2("[Main] Event processed successfully by worker, result:", result);
+      return result;
     } catch (error) {
       console.error("[Main] Error processing event:", error);
       throw error;
@@ -317047,11 +317049,12 @@ function runWorker(bot2) {
         taskId
       });
       debugLog3(`[Worker] Processing event for task ${taskId}...`);
-      await bot2.handler(event2);
+      const result = await bot2.handler(event2);
       debugLog3(`[Worker] Task ${taskId} completed successfully`);
       parentPort.postMessage({
         type: "complete",
-        taskId
+        taskId,
+        result
       });
     } catch (error) {
       console.error(`Error processing task ${taskId}:`, error);
@@ -318432,6 +318435,25 @@ var import_const, import_const2, __create4, __defProp6, __getOwnPropDesc3, __get
       workflow: res.workflow
     });
   }
+  asTool(options) {
+    const description = options?.description || this.description || `Starts the ${this.name} workflow`;
+    return new Autonomous.Tool({
+      name: this.name,
+      description,
+      input: this._inputSchema,
+      output: X.object({
+        workflowId: X.string().describe("The ID of the started workflow"),
+        status: X.string().describe("The initial status of the workflow")
+      }),
+      handler: async (input) => {
+        const instance = await this.start(input);
+        return {
+          workflowId: instance.id,
+          status: instance.status
+        };
+      }
+    });
+  }
 }, Item, SyncInput, SyncOutput, createSyncWorkflow = (props) => new BaseWorkflow({
   name: `data_source_sync_${props.type}`,
   input: SyncInput,
@@ -318458,7 +318480,63 @@ var import_const, import_const2, __create4, __defProp6, __getOwnPropDesc3, __get
     this.id = id3;
     this.type = type;
   }
-}, KnowledgeIndexingWorkflow, BuiltInWorkflows, getState = () => getSingleton("__ADK_GLOBAL_PROJECT", () => {
+}, KnowledgeIndexingWorkflow, BuiltInWorkflows, Typings3, BaseAction = class {
+  name;
+  title;
+  description;
+  attributes;
+  input;
+  output;
+  cached;
+  handler;
+  constructor(props) {
+    if (!/^[a-zA-Z][a-zA-Z0-9]*$/.test(props.name)) {
+      throw new Error(`Action name "${props.name}" must be alphanumeric with no special characters or spaces`);
+    }
+    this.name = props.name;
+    if (props.title !== undefined) {
+      this.title = props.title;
+    }
+    if (props.description !== undefined) {
+      this.description = props.description;
+    }
+    if (props.attributes !== undefined) {
+      this.attributes = props.attributes;
+    }
+    this.input = props.input;
+    this.output = props.output;
+    this.cached = props.cached ?? false;
+    this.handler = props.handler;
+  }
+  getDefinition() {
+    const def = {
+      type: "action",
+      name: this.name
+    };
+    if (this.title !== undefined) {
+      def.title = this.title;
+    }
+    if (this.description !== undefined) {
+      def.description = this.description;
+    }
+    if (this.input) {
+      def.input = Jv.toJSONSchema(this.input);
+    }
+    if (this.output) {
+      def.output = Jv.toJSONSchema(this.output);
+    }
+    if (this.cached !== undefined) {
+      def.cached = this.cached;
+    }
+    if (this.attributes !== undefined) {
+      def.attributes = this.attributes;
+    }
+    return def;
+  }
+  async execute({ input, client }) {
+    return await this.handler({ input, client });
+  }
+}, tablesRecomputeRows, BuiltInActions, getState = () => getSingleton("__ADK_GLOBAL_PROJECT", () => {
   const state = {
     initialized: false,
     primitives: {
@@ -318782,7 +318860,7 @@ var import_const, import_const2, __create4, __defProp6, __getOwnPropDesc3, __get
   TrackedState;
   constructor(conversation2, client) {
     this.id = conversation2.id;
-    this.channel = conversation2.channel;
+    this.channel = `${conversation2.integration}.${conversation2.channel}`;
     this.integration = conversation2.integration;
     this.tags = conversation2.tags;
     this.conversation = conversation2;
@@ -318857,7 +318935,7 @@ var import_const, import_const2, __create4, __defProp6, __getOwnPropDesc3, __get
       }
     });
   }
-}, ConversationHandler, Typings3, BaseConversation, updateWorkflow = async (props) => {
+}, ConversationHandler, Typings4, BaseConversation, updateWorkflow = async (props) => {
   const client = context.get("client");
   const workflowId = props.id;
   const workflowsToUpdate = [];
@@ -319430,7 +319508,7 @@ var import_const, import_const2, __create4, __defProp6, __getOwnPropDesc3, __get
   static getMetaDataSymbol() {
     return XmlNode.getMetaDataSymbol();
   }
-}, State, WebsiteSource, DirectorySource, Typings4, BaseKnowledge = class {
+}, State, WebsiteSource, DirectorySource, Typings5, BaseKnowledge = class {
   name;
   sources;
   description;
@@ -319470,62 +319548,6 @@ var import_const, import_const2, __create4, __defProp6, __getOwnPropDesc3, __get
       }
     });
   }
-}, Typings5, BaseAction = class {
-  name;
-  title;
-  description;
-  attributes;
-  input;
-  output;
-  cached;
-  handler;
-  constructor(props) {
-    if (!/^[a-zA-Z][a-zA-Z0-9]*$/.test(props.name)) {
-      throw new Error(`Action name "${props.name}" must be alphanumeric with no special characters or spaces`);
-    }
-    this.name = props.name;
-    if (props.title !== undefined) {
-      this.title = props.title;
-    }
-    if (props.description !== undefined) {
-      this.description = props.description;
-    }
-    if (props.attributes !== undefined) {
-      this.attributes = props.attributes;
-    }
-    this.input = props.input;
-    this.output = props.output;
-    this.cached = props.cached ?? false;
-    this.handler = props.handler;
-  }
-  getDefinition() {
-    const def = {
-      type: "action",
-      name: this.name
-    };
-    if (this.title !== undefined) {
-      def.title = this.title;
-    }
-    if (this.description !== undefined) {
-      def.description = this.description;
-    }
-    if (this.input) {
-      def.input = Jv.toJSONSchema(this.input);
-    }
-    if (this.output) {
-      def.output = Jv.toJSONSchema(this.output);
-    }
-    if (this.cached !== undefined) {
-      def.cached = this.cached;
-    }
-    if (this.attributes !== undefined) {
-      def.attributes = this.attributes;
-    }
-    return def;
-  }
-  async execute({ input }) {
-    return this.handler(input);
-  }
 }, Typings6, BaseTable = class {
   name;
   description;
@@ -319539,6 +319561,11 @@ var import_const, import_const2, __create4, __defProp6, __getOwnPropDesc3, __get
     return context.get("client");
   }
   constructor(props) {
+    const tableNameSchema = z_exports.string().min(1).refine((name2) => !z_exports.string().uuid().safeParse(name2).success, "Table name cannot be a UUID").refine((name2) => /^[a-zA-Z_$][a-zA-Z0-9_]{0,29}Table$/.test(name2), "Table name must start with a letter/underscore, be 35 chars or less, contain only letters/numbers/underscores, and end with 'Table'");
+    const validation = tableNameSchema.safeParse(props.name);
+    if (!validation.success) {
+      throw new Errors.InvalidPrimitiveError(`Invalid table name '${props.name}'`, validation.error);
+    }
     this.name = props.name;
     if (props.description !== undefined) {
       this.description = props.description;
@@ -319880,7 +319907,7 @@ var import_const, import_const2, __create4, __defProp6, __getOwnPropDesc3, __get
             clearTimeout(pendingComplete.taskTimer);
           if (pendingComplete.ackTimer)
             clearTimeout(pendingComplete.ackTimer);
-          pendingComplete.resolve(message2);
+          pendingComplete.resolve(message2.result);
           this.pendingTasks.delete(message2.taskId);
         }
         const completeTiming = this.taskTimings.get(message2.taskId);
@@ -319905,7 +319932,8 @@ var import_const, import_const2, __create4, __defProp6, __getOwnPropDesc3, __get
             clearTimeout(pendingError.taskTimer);
           if (pendingError.ackTimer)
             clearTimeout(pendingError.ackTimer);
-          pendingError.reject(new Error(message2.error || "Worker task failed"));
+          const rejectionError = new Error(message2.error || "Worker task failed");
+          pendingError.reject(rejectionError);
           this.pendingTasks.delete(message2.taskId);
         }
         this.taskTimings.delete(message2.taskId);
@@ -320218,6 +320246,8 @@ var init_internal = __esm(() => {
   init_dist9();
   init_dist5();
   init_dist5();
+  init_dist5();
+  init_dist5();
   init_dist8();
   init_dist7();
   init_dist8();
@@ -320229,7 +320259,6 @@ var init_internal = __esm(() => {
   init_dist5();
   init_dist5();
   init_dist5();
-  init_dist5();
   init_dist7();
   init_dist5();
   import_const = __toESM(require_dist2(), 1);
@@ -320250,7 +320279,7 @@ var init_internal = __esm(() => {
   });
   init_define_PACKAGE_VERSIONS = __esm2({
     "<define:__PACKAGE_VERSIONS__>"() {
-      define_PACKAGE_VERSIONS_default = { runtime: "1.6.9", adk: "not-installed", sdk: "4.17.3", llmz: "0.0.27", zai: "2.5.0", cognitive: "0.2.0" };
+      define_PACKAGE_VERSIONS_default = { runtime: "1.7.0", adk: "not-installed", sdk: "4.17.3", llmz: "0.0.27", zai: "2.5.0", cognitive: "0.2.0" };
     }
   });
   init_globalThis = __esm2({
@@ -352667,8 +352696,7 @@ ${issues.join(`
     name: "handler.action",
     importance: "high",
     attributes: {
-      ...required("botId", "workflowId", "eventId", "event.type"),
-      ...optional("messageId", "userId", "integration", "channel", "conversationId", "parentWorkflowId"),
+      ...required("botId"),
       "action.name": { type: "string", required: true },
       "action.input": { type: "json", required: true }
     }
@@ -354998,7 +355026,7 @@ ${iteration.status.execution_error.stack}`;
       const botAction = adk.project.actions.find((a2) => a2.name === propertyName);
       if (botAction) {
         const handler = async (input) => {
-          return botAction.handler(input);
+          return await botAction.handler(input);
         };
         handler.asTool = () => new Autonomous.Tool({
           name: botAction.name,
@@ -355255,6 +355283,59 @@ ${iteration.status.execution_error.stack}`;
   BuiltInWorkflows = {
     KnowledgeIndexingWorkflow
   };
+  init_define_BUILD();
+  init_define_PACKAGE_VERSIONS();
+  init_define_BUILD();
+  init_define_PACKAGE_VERSIONS();
+  init_define_BUILD();
+  init_define_PACKAGE_VERSIONS();
+  ((Typings8) => {
+    Typings8.Primitive = "action";
+  })(Typings3 || (Typings3 = {}));
+  tablesRecomputeRows = new BaseAction({
+    name: "tablesRecomputeRows",
+    input: X.object({
+      tableId: X.string(),
+      botId: X.string(),
+      schema: X.any(),
+      requests: X.array(X.object({
+        row: X.record(X.any()),
+        columnsToRecompute: X.array(X.string())
+      }))
+    }),
+    output: X.object({
+      isFinished: X.boolean(),
+      rows: X.array(X.any())
+    }),
+    handler: async ({ input, client }) => {
+      const { tableId, requests } = input;
+      const { table: remoteTable } = await client._inner.getTable({ table: tableId });
+      const table2 = adk.project.tables.find((x) => x.name === remoteTable.name);
+      async function computeRow(row, columnsToRecompute) {
+        const newRow = { id: row.id };
+        for (const colName of columnsToRecompute) {
+          const col = table2?.columns[colName];
+          if (!col || !col.computed) {
+            newRow[colName] = { status: "error", error: "Column not found or not computed" };
+            continue;
+          }
+          newRow[colName] = {
+            status: "computed",
+            value: await col.value(row)
+          };
+        }
+        return newRow;
+      }
+      const computedRows = await Promise.all(requests.map(async (r) => {
+        const computedRow = await computeRow(r.row, r.columnsToRecompute);
+        return computedRow;
+      }));
+      return { isFinished: true, rows: computedRows };
+    }
+  });
+  BuiltInActions = {
+    tablesRecomputeRows
+  };
   adk = {
     get environment() {
       return Environment;
@@ -355545,7 +355626,7 @@ ${iteration.status.execution_error.stack}`;
   ConversationHandler = Symbol.for("conversation.handler");
   ((Typings8) => {
     Typings8.Primitive = "conversation";
-  })(Typings3 || (Typings3 = {}));
+  })(Typings4 || (Typings4 = {}));
   BaseConversation = class {
     channel;
     schema;
@@ -355685,6 +355766,7 @@ ${iteration.status.execution_error.stack}`;
       await this.#handler({
         type,
         message: message2,
+        channel: conversationInstance.channel,
         event: event2,
         request: requestObject,
         conversation: conversationInstance,
@@ -355708,6 +355790,8 @@ ${iteration.status.execution_error.stack}`;
   init_define_PACKAGE_VERSIONS();
   init_define_BUILD();
   init_define_PACKAGE_VERSIONS();
+  init_define_BUILD();
+  init_define_PACKAGE_VERSIONS();
   storage2 = getSingleton("__ADK_GLOBAL_CTX_WORKFLOW_STEP", () => new AsyncLocalStorage3);
   step.listen = async (name2) => {
     await _step(name2, async () => {
@@ -356858,11 +356942,6 @@ ${iteration.status.execution_error.stack}`;
   init_define_PACKAGE_VERSIONS();
   ((Typings8) => {
     Typings8.Primitive = "knowledge";
-  })(Typings4 || (Typings4 = {}));
-  init_define_BUILD();
-  init_define_PACKAGE_VERSIONS();
-  ((Typings8) => {
-    Typings8.Primitive = "action";
   })(Typings5 || (Typings5 = {}));
   init_define_BUILD();
   init_define_PACKAGE_VERSIONS();
@@ -356884,13 +356963,13 @@ ${iteration.status.execution_error.stack}`;
     Primitives22.Definitions = Definitions;
     Primitives22.BaseConversation = BaseConversation;
     Primitives22.BaseConversationInstance = BaseConversationInstance;
-    Primitives22.Conversation = Typings3;
+    Primitives22.Conversation = Typings4;
     Primitives22.BaseKnowledge = BaseKnowledge;
-    Primitives22.Knowledge = Typings4;
+    Primitives22.Knowledge = Typings5;
     Primitives22.BaseWorkflow = BaseWorkflow;
     Primitives22.Workflow = Typings;
     Primitives22.BaseAction = BaseAction;
-    Primitives22.Action = Typings5;
+    Primitives22.Action = Typings3;
     Primitives22.BaseTable = BaseTable;
     Primitives22.Table = Typings6;
     Primitives22.BaseTrigger = Trigger;
@@ -372426,7 +372505,7 @@ class AgentProjectGenerator {
         deploy: "adk deploy"
       },
       dependencies: {
-        "@botpress/runtime": "^1.6.9"
+        "@botpress/runtime": "^1.7.0"
       },
       devDependencies: {
         typescript: "^5.9.3"
@@ -373715,6 +373794,9 @@ class InterfaceSync {
 function isBuiltinWorkflow2(name2) {
   return !!Object.values(BuiltInWorkflows).find((x) => x.name === name2);
 }
+function isBuiltinAction(name2) {
+  return !!Object.values(BuiltInActions).find((x) => x.name === name2);
+}
 function getImportPath(from, to3) {
   return path29.relative(path29.dirname(from), to3).replace(/\.ts$/, "").replace(/\\/g, "/");
 }
@@ -374282,23 +374364,14 @@ declare module "@botpress/runtime/_types/state" {
     await createFile(path29.join(this.outputPath, "bot.definition.ts"), await formatCode(content));
   }
   async generateBotIndex() {
-    const project = await AgentProject.load(this.projectPath);
-    const actionHandlers = [];
-    for (const action of project.actions) {
-      const def = action.definition;
-      actionHandlers.push(`"${def.name}": Actions["${def.name}"].execute.bind(Actions["${def.name}"])`);
-    }
     const content = dedent_default`
       import * as bp from '.botpress'
       import { setupAdkRuntime } from './adk-runtime'
       import { Actions } from './actions'
-      import {isMainThread, isWorkerMode, initializeParentWorker, runWorker} from '@botpress/runtime/internal'
+      import {isMainThread, isWorkerMode, initializeParentWorker, runWorker, BuiltInActions} from '@botpress/runtime/internal'
 
       const bot = new bp.Bot({
-        actions: {
-          ${actionHandlers.join(`,
-          `)}
-        },
+        actions: {}
       })
 
       // ============================================================================
@@ -374600,6 +374673,9 @@ declare module "@botpress/runtime/_types/state" {
       const exports = new Set;
       let index = 1;
       for (const action of project.actions) {
+        if (isBuiltinAction(action.definition.name)) {
+          continue;
+        }
         if (!imports.has(action.path)) {
           const name2 = `actions_${index++}`;
           const importPath = getImportPath(dest, path29.join(project.path, action.path));
@@ -374725,6 +374801,7 @@ declare module "@botpress/runtime/_types/state" {
         handlers.event.setup(bot);
         handlers.trigger.setup(bot);
         handlers.workflow.setup(bot);
+        handlers.actions.setup(bot);
       }
     `;
     await createFile(path29.join(this.outputPath, "src", "adk-runtime.ts"), await formatCode(content));
@@ -375917,6 +375994,7 @@ ${this.stderrLines.join(`
         });
         await this.loadDependencies();
         await this.loadBuiltInWorkflows();
+        await this.loadBuiltInActions();
         await this.loadAgentPrimitives();
         if (this._agentInfo) {
           this._assetsManager = new AssetsManager({
@@ -376205,6 +376283,18 @@ ${this.stderrLines.join(`
         }
       }
     }
+    async loadBuiltInActions() {
+      for (const action of Object.values(BuiltInActions)) {
+        const definition = Primitives3.Definitions.getDefinition(action);
+        if (Primitives3.Definitions.isActionDefinition(definition)) {
+          this._actions.push({
+            definition,
+            export: "default",
+            path: "<adk:builtin>"
+          });
+        }
+      }
+    }
     async registerDataSourceWorkflows(knowledgeBase, kbPath, kbExport) {
       try {
         if (!knowledgeBase.sources || !Array.isArray(knowledgeBase.sources)) {
@@ -381633,7 +381723,7 @@ var init_Separator = __esm(async () => {
 var require_package3 = __commonJS((exports, module) => {
   module.exports = {
     name: "@botpress/adk",
-    version: "1.6.9",
+    version: "1.7.0",
     description: "Core ADK library for building AI agents on Botpress",
     type: "module",
     main: "dist/index.js",
@@ -381680,7 +381770,7 @@ var require_package3 = __commonJS((exports, module) => {
       "@botpress/cli": "^4.20",
       "@botpress/client": "^1.27.0",
       "@botpress/cognitive": "^0.2.0",
-      "@botpress/runtime": "^1.6.9",
+      "@botpress/runtime": "^1.7.0",
       "@botpress/sdk": "^4.17.3",
       "@bpinternal/yargs-extra": "^0.0.21",
       "@parcel/watcher": "^2.5.1",
@@ -383068,7 +383158,7 @@ function checkRuntimeVersion(agentRoot) {
 `));
   }
 }
-var semver2, EXPECTED_RUNTIME_VERSION = "1.6.9";
+var semver2, EXPECTED_RUNTIME_VERSION = "1.7.0";
 var init_runtime_version_check = __esm(() => {
   init_source();
   semver2 = __toESM(require_semver2(), 1);
@@ -398667,7 +398757,7 @@ if (!checkNodeVersion(true)) {
 }
 var __filename2 = fileURLToPath9(import.meta.url);
 var __dirname5 = dirname3(__filename2);
-var CLI_VERSION = "1.6.9";
+var CLI_VERSION = "1.7.0";
 program.name("adk").description("Botpress Agent Development Kit (ADK) - CLI for building AI agents").version(CLI_VERSION).option("--no-cache", "Disable caching for integration lookups").configureHelp({
   formatHelp: () => formatHelp(program, CLI_VERSION)
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@botpress/adk-cli",
-  "version": "1.6.9",
+  "version": "1.7.0",
   "description": "Command-line interface for the Botpress Agent Development Kit (ADK)",
   "type": "module",
   "main": "dist/index.js",
@@ -40,9 +40,9 @@
     "url": "https://github.com/botpress/adk"
   },
   "dependencies": {
-    "@botpress/adk": "^1.6.9",
+    "@botpress/adk": "^1.7.0",
     "@botpress/cli": "^4.20",
-    "@botpress/runtime": "^1.6.9",
+    "@botpress/runtime": "^1.7.0",
     "adm-zip": "^0.5.16",
     "chalk": "^5.4.1",
     "clipboardy": "^4.0.0",