@botpress/adk 1.14.1 → 1.15.1

package/dist/generators/client-wrapper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client-wrapper.d.ts","sourceRoot":"","sources":["../../src/generators/client-wrapper.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAA;AAShE,wBAAsB,qBAAqB,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CA6dhF"}
+{"version":3,"file":"client-wrapper.d.ts","sourceRoot":"","sources":["../../src/generators/client-wrapper.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAA;AAShE,wBAAsB,qBAAqB,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAkdhF"}

package/dist/generators/tests.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tests.d.ts","sourceRoot":"","sources":["../../src/generators/tests.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,oBAAoB,GAAI,aAAa,MAAM,EAAE,SAAS,MAAM,oDAiBrE,CAAA;AAEJ,eAAO,MAAM,kBAAkB,GAAI,KAAK,MAAM,EAAE,SAAS,MAAM;;;;;;;;iBAkBi3/6B,CAAC;uBAA0H,CAAC;;;;;;;;iBAAuU,CAAC;uBAAyH,CAAC;;;;sBAAsM,CAAC;;;;;;;iBAA6S,CAAC;uBAA0H,CAAC;oBAAkC,CAAC;qBAAoC,CAAC;;;;;;;;;;;sBAA2Y,CAAC;;;;;;;iBAA8O,CAAC;uBAA2H,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAApnlN,CAAC;uBAA0H,CAAC;;;;;;;;iBAAuU,CAAC;uBAAyH,CAAC;;;;sBAAsM,CAAC;;;;;;;iBAA6S,CAAC;uBAA0H,CAAC;oBAAkC,CAAC;qBAAoC,CAAC;;;;;;;;;;;sBAA2Y,CAAC;;;;;;;iBAA8O,CAAC;uBAA2H,CAAC;;;;;;;;;;;;;;;;;;;;;;EADlxiuB,CAAA"}
+{"version":3,"file":"tests.d.ts","sourceRoot":"","sources":["../../src/generators/tests.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,oBAAoB,GAAI,aAAa,MAAM,EAAE,SAAS,MAAM,oDAiBrE,CAAA;AAEJ,eAAO,MAAM,kBAAkB,GAAI,KAAK,MAAM,EAAE,SAAS,MAAM;;;;;;;;iBAkB8i8+B,CAAC;uBAA0H,CAAC;;;;;;;;iBAAuU,CAAC;uBAAyH,CAAC;;;;sBAAsM,CAAC;;;;;;;iBAA6S,CAAC;uBAA0H,CAAC;oBAAkC,CAAC;qBAAoC,CAAC;;;;;;;;;;;sBAA2Y,CAAC;;;;;;;iBAA8O,CAAC;uBAA2H,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAA/6rN,CAAC;uBAA0H,CAAC;;;;;;;;iBAAuU,CAAC;uBAAyH,CAAC;;;;sBAAsM,CAAC;;;;;;;iBAA6S,CAAC;uBAA0H,CAAC;oBAAkC,CAAC;qBAAoC,CAAC;;;;;;;;;;;sBAA2Y,CAAC;;;;;;;iBAA8O,CAAC;uBAA2H,CAAC;;;;;;;;;;;;;;;;;;;;;;EADpp4xB,CAAA"}

package/dist/index.js

@@ -651,7 +651,7 @@ var PRETTIER_CONFIG, formatCode = async (code, filepath) => {
 `));
     return code;
   }
-}, ADK_VERSION = "1.14.1", relative2 = (from, to) => {
+}, ADK_VERSION = "1.15.1", relative2 = (from, to) => {
   const fromDir = path10.dirname(from);
   const relative3 = path10.relative(fromDir, to);
   return relative3.startsWith(".") ? relative3 : `./${relative3}`;
@@ -794,7 +794,7 @@ var init_integration_action_types = __esm(() => {
 var require_package = __commonJS((exports, module) => {
   module.exports = {
     name: "@botpress/adk",
-    version: "1.14.1",
+    version: "1.15.1",
     description: "Core ADK library for building AI agents on Botpress",
     type: "module",
     main: "dist/index.js",
@@ -838,11 +838,11 @@ var require_package = __commonJS((exports, module) => {
       url: "https://github.com/botpress/adk"
     },
     dependencies: {
-      "@botpress/cli": "^5.2.0",
-      "@botpress/client": "^1.28.0",
-      "@botpress/cognitive": "^0.3.3",
-      "@botpress/runtime": "^1.14.1",
-      "@botpress/sdk": "^5.1.0",
+      "@botpress/cli": "catalog:",
+      "@botpress/client": "catalog:",
+      "@botpress/cognitive": "catalog:",
+      "@botpress/runtime": "workspace:*",
+      "@botpress/sdk": "catalog:",
       "@bpinternal/jex": "^1.2.4",
       "@bpinternal/yargs-extra": "^0.0.21",
       "@parcel/watcher": "^2.5.1",
@@ -851,7 +851,7 @@ var require_package = __commonJS((exports, module) => {
       execa: "9.6.1",
       glob: "^11.1.0",
       luxon: "^3.7.2",
-      prettier: "^3.7.4",
+      prettier: "catalog:",
       semver: "^7.7.2",
       "ts-morph": "^27.0.2"
     },
@@ -867,9 +867,9 @@ var require_package = __commonJS((exports, module) => {
     },
     engines: {
       node: ">=22.0.0",
-      bun: ">=1.3.0"
+      bun: ">=1.3.9"
     },
-    packageManager: "bun@1.3.0"
+    packageManager: "bun@1.3.9"
   };
 });
 
@@ -1085,7 +1085,7 @@ import os3 from "os";
 import path4 from "path";
 import createDebug from "debug";
 var debug = createDebug("adk:bp-cli");
-var BP_CLI_VERSION = "5.2.0";
+var BP_CLI_VERSION = "5.5.6";
 var BP_CLI_INSTALL_ALL = path4.join(os3.homedir(), ".adk", `bp-cli`);
 var BP_CLI_INSTALL_DIR = path4.join(BP_CLI_INSTALL_ALL, BP_CLI_VERSION);
 var BP_CLI_BIN_PATH = path4.join(BP_CLI_INSTALL_DIR, "node_modules", "@botpress", "cli", "bin.js");
@@ -6393,7 +6393,7 @@ class AgentProjectGenerator {
         deploy: "adk deploy"
       },
       dependencies: {
-        "@botpress/runtime": `^${"1.14.1"}`
+        "@botpress/runtime": `^${"1.15.1"}`
       },
       devDependencies: {
         typescript: "^5.9.3"
@@ -7019,32 +7019,57 @@ async function generateClientWrapper(project) {
     if (action.definition.attributes?.visibility === "hidden") {
       continue;
     }
-    if (action.path === "<adk:builtin>") {
+    try {
+      if (action.path === "<adk:builtin>") {
+        actionTypes.push({
+          name: action.definition.name,
+          inputType: "any",
+          outputType: "any"
+        });
+        continue;
+      }
+      const absolutePath = path18.join(project.path, action.path);
+      const actionModule = await import(`${absolutePath}?t=${Date.now()}`);
+      const actionInstance = actionModule[action.export] || actionModule.default;
+      if (actionInstance && actionInstance.input && actionInstance.output) {
+        const inputType = actionInstance.input.toTypescriptType ? actionInstance.input.toTypescriptType({ treatDefaultAsOptional: true }) : "any";
+        const outputType = actionInstance.output.toTypescriptType ? actionInstance.output.toTypescriptType() : "any";
+        actionTypes.push({
+          name: action.definition.name,
+          inputType,
+          outputType
+        });
+      }
+    } catch (error) {
+      console.warn(`Warning: Could not process action ${action.definition.name}:`, error);
       actionTypes.push({
         name: action.definition.name,
-        path: "",
-        export: "",
-        isBuiltin: true
+        inputType: "any",
+        outputType: "any"
       });
-      continue;
     }
-    actionTypes.push({
-      name: action.definition.name,
-      path: action.path,
-      export: action.export,
-      isBuiltin: false
-    });
   }
   const workflowTypes = [];
   for (const workflow of project.workflows) {
-    if (isBuiltinWorkflow(workflow.definition.name)) {
-      continue;
+    try {
+      if (isBuiltinWorkflow(workflow.definition.name)) {
+        continue;
+      }
+      const workflowPath = path18.join(project.path, workflow.path);
+      const workflowModule = await import(`${workflowPath}?t=${Date.now()}`);
+      const workflowInstance = workflowModule[workflow.export] || workflowModule.default;
+      if (workflowInstance) {
+        const inputType = workflowInstance.inputSchema ? workflowInstance.inputSchema.toTypescriptType?.({ treatDefaultAsOptional: true }) || "any" : "{}";
+        const outputType = workflowInstance.outputSchema ? workflowInstance.outputSchema.toTypescriptType?.() || "any" : "{}";
+        workflowTypes.push({
+          name: workflow.definition.name,
+          inputType,
+          outputType
+        });
+      }
+    } catch (error) {
+      console.warn(`Warning: Could not process workflow ${workflow.definition.name}:`, error);
     }
-    workflowTypes.push({
-      name: workflow.definition.name,
-      path: workflow.path,
-      export: workflow.export
-    });
   }
   const tableTypes = [];
   for (const table of project.tables) {
@@ -7064,7 +7089,7 @@ async function generateClientWrapper(project) {
           } else {
             schema = colDef;
           }
-          const tsType = schema.toTypescriptType ? schema.toTypescriptType() : "any";
+          const tsType = schema.toTypescriptType ? schema.toTypescriptType({ treatDefaultAsOptional: true }) : "any";
           if (!computed) {
             inputColumns.push(`${colName}: ${tsType}`);
           }
@@ -7080,21 +7105,6 @@ async function generateClientWrapper(project) {
       console.warn(`Warning: Could not process table ${table.definition.name}:`, error);
     }
   }
-  const actionImportMap = new Map;
-  let actionImportIndex = 0;
-  const actionImports = actionTypes.filter((action) => !action.isBuiltin).map((action) => {
-    const importPath = action.path.replace(/\.ts$/, ".js");
-    actionImportMap.set(action.name, actionImportIndex);
-    const importStatement = `import type * as Action${actionImportIndex} from '../${importPath}'`;
-    actionImportIndex++;
-    return importStatement;
-  }).join(`
-`);
-  const workflowImports = workflowTypes.map((workflow, index) => {
-    const importPath = workflow.path.replace(/\.ts$/, ".js");
-    return `import type * as Workflow${index} from '../${importPath}'`;
-  }).join(`
-`);
   const content = `
 // @ts-nocheck
 ////////////////////////////////////////////////////////
@@ -7105,10 +7115,6 @@ async function generateClientWrapper(project) {
 ////////////////////////////////////////////////////////
 
 import type { Client, Workflow } from '@botpress/client'
-import type { z } from '@botpress/sdk'
-
-${actionImports}
-${workflowImports}
 
 // Utility type to simplify complex types
 type Simplify<T> = T extends (...args: infer A) => infer R
@@ -7176,23 +7182,12 @@ export interface AdkClient {
    * Typed action calls
    */
   actions: {
-    ${actionTypes.map((action) => {
-    if (action.isBuiltin) {
-      return `
-    /**
-     * Call action: ${action.name}
-     */
-    '${action.name}': (input: any) => Promise<any>
-    `;
-    }
-    const importIndex = actionImportMap.get(action.name);
-    return `
+    ${actionTypes.map((action) => `
     /**
      * Call action: ${action.name}
      */
-    '${action.name}': (input: z.input<typeof Action${importIndex}.default.input>) => Promise<z.infer<typeof Action${importIndex}.default.output>>
-    `;
-  }).join(`
+    '${action.name}': (input: ${action.inputType}) => Promise<${action.outputType}>
+    `).join(`
 `)}
   }
 
@@ -7200,23 +7195,20 @@ export interface AdkClient {
    * Typed workflow operations
    */
   workflows: {
-    ${workflowTypes.map((workflow, index) => {
-    const inputType = `z.input<typeof Workflow${index}.default.inputSchema>`;
-    const outputType = `z.infer<typeof Workflow${index}.default.outputSchema>`;
-    return `
+    ${workflowTypes.map((workflow) => `
     '${workflow.name}': {
       /**
        * Create workflow: ${workflow.name}
        */
-      createWorkflow: (params: Omit<ParamCreateWorkflow, 'name' | 'input'> & { input?: ${inputType} }) => Promise<Omit<CreateWorkflowResponse, 'workflow'> & { workflow: TypedWorkflow<${inputType}, ${outputType}> }>
+      createWorkflow: (params: Omit<ParamCreateWorkflow, 'name' | 'input'> & { input?: ${workflow.inputType} }) => Promise<Omit<CreateWorkflowResponse, 'workflow'> & { workflow: TypedWorkflow<${workflow.inputType}, ${workflow.outputType}> }>
       /**
        * Get workflow by ID
        */
-      getWorkflow: (params: ParamGetWorkflow) => Promise<Omit<GetWorkflowResponse, 'workflow'> & { workflow: TypedWorkflow<${inputType}, ${outputType}> }>
+      getWorkflow: (params: ParamGetWorkflow) => Promise<Omit<GetWorkflowResponse, 'workflow'> & { workflow: TypedWorkflow<${workflow.inputType}, ${workflow.outputType}> }>
       /**
        * Update workflow
        */
-      updateWorkflow: (params: Omit<ParamUpdateWorkflow, 'output'> & { output?: ${outputType} }) => Promise<Omit<UpdateWorkflowResponse, 'workflow'> & { workflow: TypedWorkflow<${inputType}, ${outputType}> }>
+      updateWorkflow: (params: Omit<ParamUpdateWorkflow, 'output'> & { output?: ${workflow.outputType} }) => Promise<Omit<UpdateWorkflowResponse, 'workflow'> & { workflow: TypedWorkflow<${workflow.inputType}, ${workflow.outputType}> }>
       /**
        * Delete workflow
        */
@@ -7224,10 +7216,9 @@ export interface AdkClient {
       /**
        * Get or create workflow with deduplication key
        */
-      getOrCreateWorkflow: (params: Omit<ParamGetOrCreateWorkflow, 'name' | 'input'> & { input?: ${inputType} }) => Promise<Omit<GetOrCreateWorkflowResponse, 'workflow'> & { workflow: TypedWorkflow<${inputType}, ${outputType}> }>
+      getOrCreateWorkflow: (params: Omit<ParamGetOrCreateWorkflow, 'name' | 'input'> & { input?: ${workflow.inputType} }) => Promise<Omit<GetOrCreateWorkflowResponse, 'workflow'> & { workflow: TypedWorkflow<${workflow.inputType}, ${workflow.outputType}> }>
     }
-    `;
-  }).join(`
+    `).join(`
 `)}
   }
 
@@ -7306,12 +7297,12 @@ export function createAdkClient(client: Client): AdkClient {
   return {
     actions: {
       ${actionTypes.map((action) => `
-      '${action.name}': async (input) => {
+      '${action.name}': async (input: ${action.inputType}) => {
         const response = await client.callAction({
           type: '${action.name}',
           input,
         })
-        return response.output as any
+        return response.output as ${action.outputType}
       }
       `).join(`,
 `)}
@@ -11868,4 +11859,4 @@ export {
   AgentProject
 };
 
-//# debugId=9C7E68110BCAF64064756E2164756E21
+//# debugId=1ABEC121119F1E3B64756E2164756E21