@botpress/adk-cli 1.5.11 → 1.5.12

package/dist/cli.js

@@ -315684,7 +315684,7 @@ var init_internal = __esm(() => {
   });
   init_define_PACKAGE_VERSIONS = __esm2({
     "<define:__PACKAGE_VERSIONS__>"() {
-      define_PACKAGE_VERSIONS_default = { runtime: "1.3.11", 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({
@@ -366418,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 }
     };
   }
@@ -366692,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));
         }
       }
     });
@@ -366712,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 = [];
@@ -367779,7 +367809,7 @@ class AgentProjectGenerator {
         deploy: "adk deploy"
       },
       dependencies: {
-        "@botpress/runtime": "^1.3.11"
+        "@botpress/runtime": "^1.3.12"
       },
       devDependencies: {
         typescript: "^5.0.0"
@@ -377020,7 +377050,7 @@ var init_Separator = __esm(async () => {
 var require_package3 = __commonJS((exports, module) => {
   module.exports = {
     name: "@botpress/adk",
-    version: "1.3.11",
+    version: "1.3.12",
     description: "Core ADK library for building AI agents on Botpress",
     type: "module",
     main: "dist/index.js",
@@ -380245,7 +380275,7 @@ function checkRuntimeVersion(agentRoot) {
 `));
   }
 }
-var semver, EXPECTED_RUNTIME_VERSION = "1.3.11";
+var semver, EXPECTED_RUNTIME_VERSION = "1.3.12";
 var init_runtime_version_check = __esm(() => {
   init_source();
   semver = __toESM(require_semver3(), 1);
@@ -395786,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.11";
+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.11",
+  "version": "1.5.12",
   "description": "Command-line interface for the Botpress Agent Development Kit (ADK)",
   "type": "module",
   "main": "dist/index.js",