@botpress/adk 1.3.11 → 1.3.12

package/dist/agent-project/validation-errors.d.ts

@@ -13,7 +13,7 @@ export declare class ValidationErrors {
     static missingRequiredField(file: string, field: string): ValidationError;
     static invalidDependenciesSyntax(error: string, line?: number): ValidationError;
     static invalidVersionFormat(integration: string, version: string): ValidationError;
-    static unknownIntegration(integration: string, source: string): ValidationError;
+    static unknownIntegration(integration: string, source: string, detailedMessage?: string): ValidationError;
     static integrationVersionError(integration: string, errorMessage: string): ValidationError;
     static unknownInterface(errorMessage: string): ValidationError;
     static incompatibleVersion(integration: string, required: string, available: string): ValidationError;

package/dist/agent-project/validation-errors.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validation-errors.d.ts","sourceRoot":"","sources":["../../src/agent-project/validation-errors.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"validation-errors.d.ts","sourceRoot":"","sources":["../../src/agent-project/validation-errors.ts"],"names":[],"mappings":"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"}

package/dist/index.js

@@ -2183,14 +2183,14 @@ class ValidationErrors {
       context: { integration, version }
     };
   }
-  static unknownIntegration(integration, source) {
+  static unknownIntegration(integration, source, detailedMessage) {
     return {
       $type: ValidationErrors.$type,
       code: "UNKNOWN_INTEGRATION" /* UNKNOWN_INTEGRATION */,
       severity: "error" /* 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 }
     };
   }
@@ -2483,7 +2483,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));
         }
       }
     });
@@ -2503,51 +2504,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 = [];
@@ -4496,7 +4526,7 @@ class AgentProjectGenerator {
         deploy: "adk deploy"
       },
       dependencies: {
-        "@botpress/runtime": `^${"1.3.11"}`
+        "@botpress/runtime": `^${"1.3.12"}`
       },
       devDependencies: {
         typescript: "^5.0.0"
@@ -7341,5 +7371,5 @@ export {
   AgentProject
 };
 
-//# debugId=85F632FE363855A564756E2164756E21
+//# debugId=4411053C000756E964756E2164756E21
 //# sourceMappingURL=index.js.map