@botpress/adk-cli 1.5.10 → 1.5.12

package/dist/cli.js

@@ -314312,7 +314312,7 @@ var import_const, import_const2, __create4, __defProp6, __getOwnPropDesc3, __get
     Object.assign(wf3, response.workflow);
   }
   return response;
-}, DEFAULT_MAX_ATTEMPTS = 5, MIN_STEP_REMAINING_TIME_MS = 1e4, storage2, step = async (name2, run, options = {}) => {
+}, import_ms22, DEFAULT_MAX_ATTEMPTS = 5, MIN_STEP_REMAINING_TIME_MS = 1e4, storage2, step = async (name2, run, options = {}) => {
   return _step(name2, run, options);
 }, workflowStepContextSchema, workflowExecutionContextSchema, StepSymbol, BaseWorkflowInstance, Definitions, TableSource, nameStartChar = ":A-Za-z_\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD", nameChar, nameRegexp, regexName, isName = function(string) {
   const match22 = regexName.exec(string);
@@ -315684,7 +315684,7 @@ var init_internal = __esm(() => {
   });
   init_define_PACKAGE_VERSIONS = __esm2({
     "<define:__PACKAGE_VERSIONS__>"() {
-      define_PACKAGE_VERSIONS_default = { runtime: "1.3.10", 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.12", adk: "not-installed", sdk: "4.17.0", llmz: "0.0.26", zai: "2.1.16", cognitive: "0.1.47" };
     }
   });
   init_globalThis = __esm2({
@@ -338765,41 +338765,41 @@ function print() { __p += __j.call(arguments, '') }
             return;
         }
       }
-      function fmtShort(ms22) {
-        var msAbs = Math.abs(ms22);
+      function fmtShort(ms32) {
+        var msAbs = Math.abs(ms32);
         if (msAbs >= d3) {
-          return Math.round(ms22 / d3) + "d";
+          return Math.round(ms32 / d3) + "d";
         }
         if (msAbs >= h3) {
-          return Math.round(ms22 / h3) + "h";
+          return Math.round(ms32 / h3) + "h";
         }
         if (msAbs >= m2) {
-          return Math.round(ms22 / m2) + "m";
+          return Math.round(ms32 / m2) + "m";
         }
         if (msAbs >= s2) {
-          return Math.round(ms22 / s2) + "s";
+          return Math.round(ms32 / s2) + "s";
         }
-        return ms22 + "ms";
+        return ms32 + "ms";
       }
-      function fmtLong(ms22) {
-        var msAbs = Math.abs(ms22);
+      function fmtLong(ms32) {
+        var msAbs = Math.abs(ms32);
         if (msAbs >= d3) {
-          return plural(ms22, msAbs, d3, "day");
+          return plural(ms32, msAbs, d3, "day");
         }
         if (msAbs >= h3) {
-          return plural(ms22, msAbs, h3, "hour");
+          return plural(ms32, msAbs, h3, "hour");
         }
         if (msAbs >= m2) {
-          return plural(ms22, msAbs, m2, "minute");
+          return plural(ms32, msAbs, m2, "minute");
         }
         if (msAbs >= s2) {
-          return plural(ms22, msAbs, s2, "second");
+          return plural(ms32, msAbs, s2, "second");
         }
-        return ms22 + " ms";
+        return ms32 + " ms";
       }
-      function plural(ms22, msAbs, n3, name2) {
+      function plural(ms32, msAbs, n3, name2) {
         var isPlural = msAbs >= n3 * 1.5;
-        return Math.round(ms22 / n3) + " " + name2 + (isPlural ? "s" : "");
+        return Math.round(ms32 / n3) + " " + name2 + (isPlural ? "s" : "");
       }
     }
   });
@@ -338842,8 +338842,8 @@ function print() { __p += __j.call(arguments, '') }
             }
             const self2 = debug;
             const curr = Number(/* @__PURE__ */ new Date);
-            const ms22 = curr - (prevTime || curr);
-            self2.diff = ms22;
+            const ms32 = curr - (prevTime || curr);
+            self2.diff = ms32;
             self2.prev = prevTime;
             self2.curr = curr;
             prevTime = curr;
@@ -351164,6 +351164,7 @@ ${iteration.status.execution_error.stack}`;
   init_define_PACKAGE_VERSIONS();
   init_define_BUILD();
   init_define_PACKAGE_VERSIONS();
+  import_ms22 = __toESM4(require_ms2(), 1);
   init_define_BUILD();
   init_define_PACKAGE_VERSIONS();
   init_define_BUILD();
@@ -351201,10 +351202,10 @@ ${iteration.status.execution_error.stack}`;
     workflowControlContext.abort();
     throw createStepSignal();
   };
-  step.sleep = async (name2, ms22) => {
+  step.sleep = async (name2, ms32) => {
     await _step(name2, async () => {
       const remainingTime = context.get("runtime").getRemainingExecutionTimeInMs();
-      if (remainingTime - MIN_STEP_REMAINING_TIME_MS <= ms22 || ms22 >= 1e4) {
+      if (remainingTime - MIN_STEP_REMAINING_TIME_MS <= ms32 || ms32 >= 1e4) {
         const client = context.get("client");
         const workflowControlContext = context.get("workflowControlContext");
         await client.createEvent({
@@ -351212,7 +351213,7 @@ ${iteration.status.execution_error.stack}`;
           payload: {},
           workflowId: workflowControlContext.workflow.id,
           schedule: {
-            delay: ms22
+            delay: ms32
           }
         });
         await updateWorkflow({
@@ -351221,15 +351222,15 @@ ${iteration.status.execution_error.stack}`;
         });
         workflowControlContext.abort();
       } else {
-        await new Promise((resolve) => void setTimeout(resolve, ms22));
+        await new Promise((resolve) => void setTimeout(resolve, ms32));
       }
     }, {}, {
       stepType: "sleep"
     });
   };
   step.sleepUntil = async (name2, date) => {
-    const ms22 = Math.max(0, new Date(date).getTime() - Date.now() - MIN_STEP_REMAINING_TIME_MS);
-    await step.sleep(name2, ms22);
+    const ms32 = Math.max(0, new Date(date).getTime() - Date.now() - MIN_STEP_REMAINING_TIME_MS);
+    await step.sleep(name2, ms32);
   };
   step.waitForWorkflow = async (name2, workflowId) => {
     const workflowControlContext = context.get("workflowControlContext");
@@ -366417,14 +366418,14 @@ class ValidationErrors {
       context: { integration, version }
     };
   }
-  static unknownIntegration(integration, source) {
+  static unknownIntegration(integration, source, detailedMessage) {
     return {
       $type: ValidationErrors.$type,
       code: "UNKNOWN_INTEGRATION",
       severity: "error",
-      message: `Unknown integration '${integration}' from source '${source}'`,
+      message: detailedMessage || `Unknown integration '${integration}' from source '${source}'`,
       file: "dependencies.json",
-      hint: `Check if the integration name is correct or if it exists in ${source}`,
+      hint: detailedMessage ? undefined : `Check if the integration name is correct or if it exists in ${source}`,
       context: { integration, source }
     };
   }
@@ -366691,7 +366692,8 @@ class IntegrationManager {
         if (error instanceof Error && error.message.includes("version")) {
           errors.push(ValidationErrors.integrationVersionError(integration.alias, error.message));
         } else {
-          errors.push(ValidationErrors.unknownIntegration(integration.alias, integration.ref.fullName));
+          const errorMessage = error instanceof Error ? error.message : undefined;
+          errors.push(ValidationErrors.unknownIntegration(integration.alias, integration.ref.fullName, errorMessage));
         }
       }
     });
@@ -366711,51 +366713,80 @@ class IntegrationManager {
       }
     }
     const client = await this.getClient();
-    let integrationResponse;
-    let versionError = null;
+    const integration = await this._findPrivateOrPublicIntegration(client, ref);
+    if (!integration) {
+      throw await this._buildIntegrationNotFoundError(client, ref);
+    }
+    await this.cache.setResolution(ref.name, ref.version, ref.workspace, integration.id, integration.updatedAt);
+    const definition = integration;
+    await this.cache.setDefinition(integration.id, integration.updatedAt, definition);
+    return definition;
+  }
+  async _findPrivateOrPublicIntegration(client, ref) {
+    const privateIntegration = await this._findPrivateIntegration(client, ref);
+    if (privateIntegration) {
+      return privateIntegration;
+    }
+    const publicIntegration = await this._findPublicIntegration(client, ref);
+    if (publicIntegration) {
+      return publicIntegration;
+    }
+    return;
+  }
+  async _findPrivateIntegration(client, ref) {
     try {
-      integrationResponse = await client.getIntegrationByName({
+      const version = ref.workspace && ref.version !== "latest" ? "latest" : ref.version;
+      const response = await client.getIntegrationByName({
+        name: ref.fullName,
+        version
+      });
+      return response.integration;
+    } catch (error) {
+      if (this._isResourceNotFoundError(error)) {
+        return;
+      }
+      throw error;
+    }
+  }
+  async _findPublicIntegration(client, ref) {
+    try {
+      const response = await client.getPublicIntegration({
         name: ref.fullName,
         version: ref.version
       });
-    } catch (privateError) {
-      try {
-        integrationResponse = await client.getPublicIntegration({
-          name: ref.name,
-          version: ref.version
-        });
-      } catch (publicError) {
-        versionError = publicError;
+      return response.integration;
+    } catch (error) {
+      if (this._isResourceNotFoundError(error)) {
+        return;
       }
+      throw error;
     }
-    if (!integrationResponse && versionError) {
-      let latestVersion = null;
-      try {
-        const latestResponse = await client.getIntegrationByName({
-          name: ref.fullName,
-          version: "latest"
-        });
-        latestVersion = latestResponse.integration.version;
-      } catch {
-        try {
-          const latestResponse = await client.getPublicIntegration({
-            name: ref.fullName,
-            version: "latest"
-          });
-          latestVersion = latestResponse.integration.version;
-        } catch {
-          const location2 = ref.workspace ? `workspace "${ref.workspace}"` : "the official Botpress hub";
-          throw new Error(`Integration "${ref.name}" does not exist in ${location2}`);
-        }
+  }
+  _isResourceNotFoundError(error) {
+    if (error && typeof error === "object" && "type" in error) {
+      return error.type === "ResourceNotFound";
+    }
+    return false;
+  }
+  async _buildIntegrationNotFoundError(client, ref) {
+    if (!ref.workspace) {
+      return new Error(`Integration "${ref.name}" not found in the official Botpress hub`);
+    }
+    let currentWorkspaceHandle;
+    try {
+      const credentials = this.options.credentials || await auth.getActiveCredentials();
+      const workspaceId = this.options.workspaceId || credentials.workspaceId;
+      if (workspaceId) {
+        const currentWorkspace = await client.getWorkspace({ id: workspaceId });
+        currentWorkspaceHandle = currentWorkspace?.handle;
       }
-      const location = ref.workspace ? `workspace "${ref.workspace}"` : "Botpress";
-      throw new Error(`Integration "${ref.name}" version "${ref.version}" not found in ${location}. Latest available version is "${latestVersion}"`);
+    } catch {
+      return new Error(`Integration "${ref.name}" not found in workspace "${ref.workspace}"`);
     }
-    const integration = integrationResponse.integration;
-    await this.cache.setResolution(ref.name, ref.version, ref.workspace, integration.id, integration.updatedAt);
-    const definition = integration;
-    await this.cache.setDefinition(integration.id, integration.updatedAt, definition);
-    return definition;
+    if (currentWorkspaceHandle === ref.workspace) {
+      return new Error(`Integration "${ref.name}" not found in workspace "${ref.workspace}". Are you sure you published the integration? Run 'adk deploy' to publish it to your workspace.`);
+    }
+    return new Error(`Integration "${ref.name}" not found in workspace "${ref.workspace}". This integration may be private. Private integrations can only be installed in the same workspace. If you want to share this integration with other workspaces, deploy it with --visibility="unlisted" or --visibility="public".`);
   }
   validateIntegration(integration) {
     const errors = [];
@@ -367778,7 +367809,7 @@ class AgentProjectGenerator {
         deploy: "adk deploy"
       },
       dependencies: {
-        "@botpress/runtime": "^1.3.10"
+        "@botpress/runtime": "^1.3.12"
       },
       devDependencies: {
         typescript: "^5.0.0"
@@ -377019,7 +377050,7 @@ var init_Separator = __esm(async () => {
 var require_package3 = __commonJS((exports, module) => {
   module.exports = {
     name: "@botpress/adk",
-    version: "1.3.10",
+    version: "1.3.12",
     description: "Core ADK library for building AI agents on Botpress",
     type: "module",
     main: "dist/index.js",
@@ -380244,7 +380275,7 @@ function checkRuntimeVersion(agentRoot) {
 `));
   }
 }
-var semver, EXPECTED_RUNTIME_VERSION = "1.3.10";
+var semver, EXPECTED_RUNTIME_VERSION = "1.3.12";
 var init_runtime_version_check = __esm(() => {
   init_source();
   semver = __toESM(require_semver3(), 1);
@@ -395785,7 +395816,7 @@ function formatHelp(cmd, version) {
 // src/cli.ts
 var __filename2 = fileURLToPath9(import.meta.url);
 var __dirname5 = dirname3(__filename2);
-var CLI_VERSION = "1.5.10";
+var CLI_VERSION = "1.5.12";
 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.5.10",
+  "version": "1.5.12",
   "description": "Command-line interface for the Botpress Agent Development Kit (ADK)",
   "type": "module",
   "main": "dist/index.js",