@botpress/cli 0.8.3 → 0.8.6

package/dist/api/client.js

@@ -45,6 +45,19 @@ class ApiClient {
   token;
   workspaceId;
   static newClient = (props, logger) => new ApiClient(props, logger);
+  get isBotpressWorkspace() {
+    return [
+      "6a76fa10-e150-4ff6-8f59-a300feec06c1",
+      "95de33eb-1551-4af9-9088-e5dcb02efd09",
+      "11111111-1111-1111-aaaa-111111111111"
+    ].includes(this.workspaceId);
+  }
+  async getWorkspace() {
+    return this.client.getWorkspace({ id: this.workspaceId });
+  }
+  async updateWorkspace(props) {
+    return this.client.updateWorkspace({ id: this.workspaceId, ...props });
+  }
   async findIntegration(ref) {
     const formatted = (0, import_integration_ref.formatIntegrationRef)(ref);
     const privateIntegration = await this.findPrivateIntegration(ref);

package/dist/api/client.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/api/client.ts"],
-  "sourcesContent": ["import * as client from '@botpress/client'\nimport _ from 'lodash'\nimport { formatIntegrationRef, ApiIntegrationRef as IntegrationRef } from '../integration-ref'\nimport type { Logger } from '../logger'\nimport * as paging from './paging'\n\nexport type PageLister<R extends object> = (t: { nextToken?: string }) => Promise<R & { meta: { nextToken?: string } }>\n\nexport type ApiClientProps = {\n  apiUrl: string\n  token: string\n  workspaceId: string\n}\n\nexport type ApiClientFactory = {\n  newClient: (props: ApiClientProps, logger: Logger) => ApiClient\n}\n\ntype PublicIntegration = client.Integration\ntype PrivateIntegration = client.Integration & { workspaceId: string }\ntype Integration = client.Integration & { workspaceId?: string }\n\n/**\n * This class is used to wrap the Botpress API and provide a more convenient way to interact with it.\n */\nexport class ApiClient {\n  public readonly client: client.Client\n  public readonly url: string\n  public readonly token: string\n  public readonly workspaceId: string\n\n  public static newClient = (props: ApiClientProps, logger: Logger) => new ApiClient(props, logger)\n\n  public constructor(props: ApiClientProps, private _logger: Logger) {\n    const { apiUrl, token, workspaceId } = props\n    this.client = new client.Client({ apiUrl, token, workspaceId })\n    this.url = apiUrl\n    this.token = token\n    this.workspaceId = workspaceId\n  }\n\n  public async findIntegration(ref: IntegrationRef): Promise<Integration | undefined> {\n    const formatted = formatIntegrationRef(ref)\n\n    const privateIntegration = await this.findPrivateIntegration(ref)\n    if (privateIntegration) {\n      this._logger.debug(`Found integration \"${formatted}\" in workspace`)\n      return privateIntegration\n    }\n\n    const publicIntegration = await this.findPublicIntegration(ref)\n    if (publicIntegration) {\n      this._logger.debug(`Found integration \"${formatted}\" in hub`)\n      return publicIntegration\n    }\n\n    return\n  }\n\n  public async findPrivateIntegration(ref: IntegrationRef): Promise<PrivateIntegration | undefined> {\n    const { workspaceId } = this\n    if (ref.type === 'id') {\n      return this.validateStatus(\n        () => this.client.getIntegration(ref).then((r) => ({ ...r.integration, workspaceId })),\n        404\n      )\n    }\n    return this.validateStatus(\n      () => this.client.getIntegrationByName(ref).then((r) => ({ ...r.integration, workspaceId })),\n      404\n    )\n  }\n\n  public async findPublicIntegration(ref: IntegrationRef): Promise<PublicIntegration | undefined> {\n    if (ref.type === 'id') {\n      return this.validateStatus(() => this.client.getPublicIntegrationById(ref).then((r) => r.integration), 404)\n    }\n    return this.validateStatus(() => this.client.getPublicIntegration(ref).then((r) => r.integration), 404)\n  }\n\n  public async testLogin(): Promise<void> {\n    await this.client.listBots({})\n  }\n\n  public listAllPages = paging.listAllPages\n\n  public async validateStatus<V>(fn: () => Promise<V>, allowedStatuses: number | number[]): Promise<V | undefined> {\n    try {\n      const v = await fn()\n      return v\n    } catch (err) {\n      const allowedStatusesArray = _.isArray(allowedStatuses) ? allowedStatuses : [allowedStatuses]\n      const isAllowed = client.isApiError(err) && err.code && allowedStatusesArray.includes(err.code)\n      if (isAllowed) {\n        return\n      }\n      throw err\n    }\n  }\n}\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,aAAwB;AACxB,oBAAc;AACd,6BAA0E;AAE1E,aAAwB;AAqBjB,MAAM,UAAU;AAAA,EAQd,YAAY,OAA+B,SAAiB;AAAjB;AAChD,UAAM,EAAE,QAAQ,OAAO,YAAY,IAAI;AACvC,SAAK,SAAS,IAAI,OAAO,OAAO,EAAE,QAAQ,OAAO,YAAY,CAAC;AAC9D,SAAK,MAAM;AACX,SAAK,QAAQ;AACb,SAAK,cAAc;AAAA,EACrB;AAAA,EAbgB;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EAEhB,OAAc,YAAY,CAAC,OAAuB,WAAmB,IAAI,UAAU,OAAO,MAAM;AAAA,EAUhG,MAAa,gBAAgB,KAAuD;AAClF,UAAM,gBAAY,6CAAqB,GAAG;AAE1C,UAAM,qBAAqB,MAAM,KAAK,uBAAuB,GAAG;AAChE,QAAI,oBAAoB;AACtB,WAAK,QAAQ,MAAM,sBAAsB,yBAAyB;AAClE,aAAO;AAAA,IACT;AAEA,UAAM,oBAAoB,MAAM,KAAK,sBAAsB,GAAG;AAC9D,QAAI,mBAAmB;AACrB,WAAK,QAAQ,MAAM,sBAAsB,mBAAmB;AAC5D,aAAO;AAAA,IACT;AAEA;AAAA,EACF;AAAA,EAEA,MAAa,uBAAuB,KAA8D;AAChG,UAAM,EAAE,YAAY,IAAI;AACxB,QAAI,IAAI,SAAS,MAAM;AACrB,aAAO,KAAK;AAAA,QACV,MAAM,KAAK,OAAO,eAAe,GAAG,EAAE,KAAK,CAAC,OAAO,EAAE,GAAG,EAAE,aAAa,YAAY,EAAE;AAAA,QACrF;AAAA,MACF;AAAA,IACF;AACA,WAAO,KAAK;AAAA,MACV,MAAM,KAAK,OAAO,qBAAqB,GAAG,EAAE,KAAK,CAAC,OAAO,EAAE,GAAG,EAAE,aAAa,YAAY,EAAE;AAAA,MAC3F;AAAA,IACF;AAAA,EACF;AAAA,EAEA,MAAa,sBAAsB,KAA6D;AAC9F,QAAI,IAAI,SAAS,MAAM;AACrB,aAAO,KAAK,eAAe,MAAM,KAAK,OAAO,yBAAyB,GAAG,EAAE,KAAK,CAAC,MAAM,EAAE,WAAW,GAAG,GAAG;AAAA,IAC5G;AACA,WAAO,KAAK,eAAe,MAAM,KAAK,OAAO,qBAAqB,GAAG,EAAE,KAAK,CAAC,MAAM,EAAE,WAAW,GAAG,GAAG;AAAA,EACxG;AAAA,EAEA,MAAa,YAA2B;AACtC,UAAM,KAAK,OAAO,SAAS,CAAC,CAAC;AAAA,EAC/B;AAAA,EAEO,eAAe,OAAO;AAAA,EAE7B,MAAa,eAAkB,IAAsB,iBAA4D;AAC/G,QAAI;AACF,YAAM,IAAI,MAAM,GAAG;AACnB,aAAO;AAAA,IACT,SAAS,KAAP;AACA,YAAM,uBAAuB,cAAAA,QAAE,QAAQ,eAAe,IAAI,kBAAkB,CAAC,eAAe;AAC5F,YAAM,YAAY,OAAO,WAAW,GAAG,KAAK,IAAI,QAAQ,qBAAqB,SAAS,IAAI,IAAI;AAC9F,UAAI,WAAW;AACb;AAAA,MACF;AACA,YAAM;AAAA,IACR;AAAA,EACF;AACF;",
+  "sourcesContent": ["import * as client from '@botpress/client'\nimport _ from 'lodash'\nimport { formatIntegrationRef, ApiIntegrationRef as IntegrationRef } from '../integration-ref'\nimport type { Logger } from '../logger'\nimport * as paging from './paging'\n\nexport type PageLister<R extends object> = (t: { nextToken?: string }) => Promise<R & { meta: { nextToken?: string } }>\n\nexport type ApiClientProps = {\n  apiUrl: string\n  token: string\n  workspaceId: string\n}\n\nexport type ApiClientFactory = {\n  newClient: (props: ApiClientProps, logger: Logger) => ApiClient\n}\n\ntype PublicIntegration = client.Integration\ntype PrivateIntegration = client.Integration & { workspaceId: string }\ntype Integration = client.Integration & { workspaceId?: string }\n\ntype BaseOperation = (...args: any[]) => Promise<any>\ntype Operations = {\n  [K in keyof client.Client as client.Client[K] extends BaseOperation ? K : never]: client.Client[K]\n}\ntype Requests = {\n  [K in keyof Operations]: Parameters<Operations[K]>[0]\n}\ntype Responses = {\n  [K in keyof Operations]: ReturnType<Operations[K]>\n}\n\n/**\n * This class is used to wrap the Botpress API and provide a more convenient way to interact with it.\n */\nexport class ApiClient {\n  public readonly client: client.Client\n  public readonly url: string\n  public readonly token: string\n  public readonly workspaceId: string\n\n  public static newClient = (props: ApiClientProps, logger: Logger) => new ApiClient(props, logger)\n\n  public constructor(props: ApiClientProps, private _logger: Logger) {\n    const { apiUrl, token, workspaceId } = props\n    this.client = new client.Client({ apiUrl, token, workspaceId })\n    this.url = apiUrl\n    this.token = token\n    this.workspaceId = workspaceId\n  }\n\n  public get isBotpressWorkspace(): boolean {\n    return [\n      '6a76fa10-e150-4ff6-8f59-a300feec06c1',\n      '95de33eb-1551-4af9-9088-e5dcb02efd09',\n      '11111111-1111-1111-aaaa-111111111111',\n    ].includes(this.workspaceId)\n  }\n\n  public async getWorkspace(): Promise<Responses['getWorkspace']> {\n    return this.client.getWorkspace({ id: this.workspaceId })\n  }\n\n  public async updateWorkspace(props: Omit<Requests['updateWorkspace'], 'id'>): Promise<Responses['updateWorkspace']> {\n    return this.client.updateWorkspace({ id: this.workspaceId, ...props })\n  }\n\n  public async findIntegration(ref: IntegrationRef): Promise<Integration | undefined> {\n    const formatted = formatIntegrationRef(ref)\n\n    const privateIntegration = await this.findPrivateIntegration(ref)\n    if (privateIntegration) {\n      this._logger.debug(`Found integration \"${formatted}\" in workspace`)\n      return privateIntegration\n    }\n\n    const publicIntegration = await this.findPublicIntegration(ref)\n    if (publicIntegration) {\n      this._logger.debug(`Found integration \"${formatted}\" in hub`)\n      return publicIntegration\n    }\n\n    return\n  }\n\n  public async findPrivateIntegration(ref: IntegrationRef): Promise<PrivateIntegration | undefined> {\n    const { workspaceId } = this\n    if (ref.type === 'id') {\n      return this.validateStatus(\n        () => this.client.getIntegration(ref).then((r) => ({ ...r.integration, workspaceId })),\n        404\n      )\n    }\n    return this.validateStatus(\n      () => this.client.getIntegrationByName(ref).then((r) => ({ ...r.integration, workspaceId })),\n      404\n    )\n  }\n\n  public async findPublicIntegration(ref: IntegrationRef): Promise<PublicIntegration | undefined> {\n    if (ref.type === 'id') {\n      return this.validateStatus(() => this.client.getPublicIntegrationById(ref).then((r) => r.integration), 404)\n    }\n    return this.validateStatus(() => this.client.getPublicIntegration(ref).then((r) => r.integration), 404)\n  }\n\n  public async testLogin(): Promise<void> {\n    await this.client.listBots({})\n  }\n\n  public listAllPages = paging.listAllPages\n\n  public async validateStatus<V>(fn: () => Promise<V>, allowedStatuses: number | number[]): Promise<V | undefined> {\n    try {\n      const v = await fn()\n      return v\n    } catch (err) {\n      const allowedStatusesArray = _.isArray(allowedStatuses) ? allowedStatuses : [allowedStatuses]\n      const isAllowed = client.isApiError(err) && err.code && allowedStatusesArray.includes(err.code)\n      if (isAllowed) {\n        return\n      }\n      throw err\n    }\n  }\n}\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,aAAwB;AACxB,oBAAc;AACd,6BAA0E;AAE1E,aAAwB;AAgCjB,MAAM,UAAU;AAAA,EAQd,YAAY,OAA+B,SAAiB;AAAjB;AAChD,UAAM,EAAE,QAAQ,OAAO,YAAY,IAAI;AACvC,SAAK,SAAS,IAAI,OAAO,OAAO,EAAE,QAAQ,OAAO,YAAY,CAAC;AAC9D,SAAK,MAAM;AACX,SAAK,QAAQ;AACb,SAAK,cAAc;AAAA,EACrB;AAAA,EAbgB;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EAEhB,OAAc,YAAY,CAAC,OAAuB,WAAmB,IAAI,UAAU,OAAO,MAAM;AAAA,EAUhG,IAAW,sBAA+B;AACxC,WAAO;AAAA,MACL;AAAA,MACA;AAAA,MACA;AAAA,IACF,EAAE,SAAS,KAAK,WAAW;AAAA,EAC7B;AAAA,EAEA,MAAa,eAAmD;AAC9D,WAAO,KAAK,OAAO,aAAa,EAAE,IAAI,KAAK,YAAY,CAAC;AAAA,EAC1D;AAAA,EAEA,MAAa,gBAAgB,OAAuF;AAClH,WAAO,KAAK,OAAO,gBAAgB,EAAE,IAAI,KAAK,aAAa,GAAG,MAAM,CAAC;AAAA,EACvE;AAAA,EAEA,MAAa,gBAAgB,KAAuD;AAClF,UAAM,gBAAY,6CAAqB,GAAG;AAE1C,UAAM,qBAAqB,MAAM,KAAK,uBAAuB,GAAG;AAChE,QAAI,oBAAoB;AACtB,WAAK,QAAQ,MAAM,sBAAsB,yBAAyB;AAClE,aAAO;AAAA,IACT;AAEA,UAAM,oBAAoB,MAAM,KAAK,sBAAsB,GAAG;AAC9D,QAAI,mBAAmB;AACrB,WAAK,QAAQ,MAAM,sBAAsB,mBAAmB;AAC5D,aAAO;AAAA,IACT;AAEA;AAAA,EACF;AAAA,EAEA,MAAa,uBAAuB,KAA8D;AAChG,UAAM,EAAE,YAAY,IAAI;AACxB,QAAI,IAAI,SAAS,MAAM;AACrB,aAAO,KAAK;AAAA,QACV,MAAM,KAAK,OAAO,eAAe,GAAG,EAAE,KAAK,CAAC,OAAO,EAAE,GAAG,EAAE,aAAa,YAAY,EAAE;AAAA,QACrF;AAAA,MACF;AAAA,IACF;AACA,WAAO,KAAK;AAAA,MACV,MAAM,KAAK,OAAO,qBAAqB,GAAG,EAAE,KAAK,CAAC,OAAO,EAAE,GAAG,EAAE,aAAa,YAAY,EAAE;AAAA,MAC3F;AAAA,IACF;AAAA,EACF;AAAA,EAEA,MAAa,sBAAsB,KAA6D;AAC9F,QAAI,IAAI,SAAS,MAAM;AACrB,aAAO,KAAK,eAAe,MAAM,KAAK,OAAO,yBAAyB,GAAG,EAAE,KAAK,CAAC,MAAM,EAAE,WAAW,GAAG,GAAG;AAAA,IAC5G;AACA,WAAO,KAAK,eAAe,MAAM,KAAK,OAAO,qBAAqB,GAAG,EAAE,KAAK,CAAC,MAAM,EAAE,WAAW,GAAG,GAAG;AAAA,EACxG;AAAA,EAEA,MAAa,YAA2B;AACtC,UAAM,KAAK,OAAO,SAAS,CAAC,CAAC;AAAA,EAC/B;AAAA,EAEO,eAAe,OAAO;AAAA,EAE7B,MAAa,eAAkB,IAAsB,iBAA4D;AAC/G,QAAI;AACF,YAAM,IAAI,MAAM,GAAG;AACnB,aAAO;AAAA,IACT,SAAS,KAAP;AACA,YAAM,uBAAuB,cAAAA,QAAE,QAAQ,eAAe,IAAI,kBAAkB,CAAC,eAAe;AAC5F,YAAM,YAAY,OAAO,WAAW,GAAG,KAAK,IAAI,QAAQ,qBAAqB,SAAS,IAAI,IAAI;AAC9F,UAAI,WAAW;AACb;AAAA,MACF;AACA,YAAM;AAAA,IACR;AAAA,EACF;AACF;",
   "names": ["_"]
 }

package/dist/command-implementations/deploy-command.js

@@ -53,6 +53,7 @@ class DeployCommand extends import_project_command.ProjectCommand {
   async _deployIntegration(api, integrationDef) {
     const outfile = this.projectPaths.abs.outFile;
     const code = await fs.promises.readFile(outfile, "utf-8");
+    integrationDef = await this._manageWorkspaceHandle(api, integrationDef);
     const {
       name,
       version,
@@ -70,17 +71,22 @@ class DeployCommand extends import_project_command.ProjectCommand {
     const fallbackHandlerScriptFileContent = await this._readFile(identifier?.fallbackHandlerScript);
     const identifierLinkTemplateFileContent = await this._readFile(configuration?.identifier?.linkTemplateScript);
     const integration = await api.findIntegration({ type: "name", name, version });
-    if (integration && !integration.workspaceId) {
+    if (integration && integration.workspaceId !== api.workspaceId) {
       throw new errors.BotpressCLIError(
-        `Public integration ${integrationDef.name} v${integrationDef.version} is already deployed in another workspace.`
+        `Public integration ${name} v${version} is already deployed in another workspace.`
+      );
+    }
+    if (integration && integration.public && !api.isBotpressWorkspace) {
+      throw new errors.BotpressCLIError(
+        `Integration ${name} v${version} is already deployed publicly and cannot be updated. Please bump the version.`
       );
     }
     let message;
     if (integration) {
       this.logger.warn("Integration already exists. If you decide to deploy, it will overwrite the existing one.");
-      message = `Are you sure you want to override integration ${integrationDef.name} v${integrationDef.version}?`;
+      message = `Are you sure you want to override integration ${name} v${version}?`;
     } else {
-      message = `Are you sure you want to deploy integration ${integrationDef.name} v${integrationDef.version}?`;
+      message = `Are you sure you want to deploy integration ${name} v${version}?`;
     }
     const confirm = await this.prompt.confirm(message);
     if (!confirm) {
@@ -106,7 +112,7 @@ class DeployCommand extends import_project_command.ProjectCommand {
       },
       public: this.argv.public
     };
-    const startedMessage = `Deploying integration ${import_chalk.default.bold(integrationDef.name)} v${integrationDef.version}...`;
+    const startedMessage = `Deploying integration ${import_chalk.default.bold(name)} v${version}...`;
     const successMessage = "Integration deployed";
     if (integration) {
       const updateBody = (0, import_integration_body.prepareUpdateIntegrationBody)(
@@ -123,7 +129,7 @@ class DeployCommand extends import_project_command.ProjectCommand {
       const line = this.logger.line();
       line.started(startedMessage);
       await api.client.updateIntegration(updateBody).catch((thrown) => {
-        throw errors.BotpressCLIError.wrap(thrown, `Could not update integration "${integrationDef.name}"`);
+        throw errors.BotpressCLIError.wrap(thrown, `Could not update integration "${name}"`);
       });
       line.success(successMessage);
     } else {
@@ -133,7 +139,7 @@ class DeployCommand extends import_project_command.ProjectCommand {
       const line = this.logger.line();
       line.started(startedMessage);
       await api.client.createIntegration(createBody).catch((thrown) => {
-        throw errors.BotpressCLIError.wrap(thrown, `Could not create integration "${integrationDef.name}"`);
+        throw errors.BotpressCLIError.wrap(thrown, `Could not create integration "${name}"`);
       });
       line.success(successMessage);
     }
@@ -251,6 +257,88 @@ class DeployCommand extends import_project_command.ProjectCommand {
     });
     return fetchedBot;
   }
+  async _manageWorkspaceHandle(api, integration) {
+    const { name: localName, workspaceHandle: localHandle } = this._parseIntegrationName(integration.name);
+    if (!localHandle && api.isBotpressWorkspace) {
+      this.logger.debug("Botpress workspace detected; workspace handle omitted");
+      return integration;
+    }
+    const { handle: remoteHandle, name: workspaceName } = await api.getWorkspace().catch((thrown) => {
+      throw errors.BotpressCLIError.wrap(thrown, "Could not fetch workspace");
+    });
+    if (localHandle && remoteHandle) {
+      if (localHandle !== remoteHandle) {
+        throw new errors.BotpressCLIError(
+          `Your current workspace handle is "${remoteHandle}" but the integration handle is "${localHandle}".`
+        );
+      }
+      return integration;
+    }
+    const workspaceHandleIsMandatoryMsg = "Cannot deploy integration without workspace handle";
+    if (!localHandle && remoteHandle) {
+      const confirmAddHandle = await this.prompt.confirm(
+        `Your current workspace handle is "${remoteHandle}". Do you want to use the name "${remoteHandle}/${localName}"?`
+      );
+      if (!confirmAddHandle) {
+        throw new errors.BotpressCLIError(workspaceHandleIsMandatoryMsg);
+      }
+      const newName2 = `${remoteHandle}/${localName}`;
+      return { ...integration, name: newName2 };
+    }
+    if (localHandle && !remoteHandle) {
+      const { available } = await api.client.checkHandleAvailability({ handle: localHandle }).catch((thrown) => {
+        throw errors.BotpressCLIError.wrap(thrown, "Could not check handle availability");
+      });
+      if (!available) {
+        throw new errors.BotpressCLIError(`Handle "${localHandle}" is not yours and is not available`);
+      }
+      const confirmClaimHandle = await this.prompt.confirm(
+        `Handle "${localHandle}" is available. Do you want to claim it for your workspace ${workspaceName}?`
+      );
+      if (!confirmClaimHandle) {
+        throw new errors.BotpressCLIError(workspaceHandleIsMandatoryMsg);
+      }
+      await api.updateWorkspace({ handle: localHandle }).catch((thrown) => {
+        throw errors.BotpressCLIError.wrap(thrown, `Could not claim handle "${localHandle}"`);
+      });
+      this.logger.success(`Handle "${localHandle}" is now yours!`);
+      return integration;
+    }
+    this.logger.warn("It seems you don't have a workspace handle yet.");
+    let claimedHandle = void 0;
+    do {
+      const prompted = await this.prompt.text("Please enter a workspace handle");
+      if (!prompted) {
+        throw new errors.BotpressCLIError(workspaceHandleIsMandatoryMsg);
+      }
+      const { available, suggestions } = await api.client.checkHandleAvailability({ handle: prompted });
+      if (!available) {
+        this.logger.warn(`Handle "${prompted}" is not available. Suggestions: ${suggestions.join(", ")}`);
+        continue;
+      }
+      claimedHandle = prompted;
+      await api.updateWorkspace({ handle: claimedHandle }).catch((thrown) => {
+        throw errors.BotpressCLIError.wrap(thrown, `Could not claim handle "${claimedHandle}"`);
+      });
+    } while (!claimedHandle);
+    this.logger.success(`Handle "${claimedHandle}" is yours!`);
+    const newName = `${claimedHandle}/${localName}`;
+    return { ...integration, name: newName };
+  }
+  _parseIntegrationName = (integrationName) => {
+    const parts = integrationName.split("/");
+    if (parts.length > 2) {
+      throw new errors.BotpressCLIError(
+        `Invalid integration name "${integrationName}": a single forward slash is allowed`
+      );
+    }
+    if (parts.length === 2) {
+      const [workspaceHandle, name2] = parts;
+      return { name: name2, workspaceHandle };
+    }
+    const [name] = parts;
+    return { name };
+  };
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/command-implementations/deploy-command.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/command-implementations/deploy-command.ts"],
-  "sourcesContent": ["import type * as client from '@botpress/client'\nimport type * as sdk from '@botpress/sdk'\nimport chalk from 'chalk'\nimport * as fs from 'fs'\nimport { prepareCreateBotBody, prepareUpdateBotBody } from '../api/bot-body'\nimport type { ApiClient } from '../api/client'\nimport {\n  prepareUpdateIntegrationBody,\n  CreateIntegrationBody,\n  prepareCreateIntegrationBody,\n} from '../api/integration-body'\nimport type commandDefinitions from '../command-definitions'\nimport * as errors from '../errors'\nimport * as utils from '../utils'\nimport { BuildCommand } from './build-command'\nimport { ProjectCommand } from './project-command'\n\nexport type DeployCommandDefinition = typeof commandDefinitions.deploy\nexport class DeployCommand extends ProjectCommand<DeployCommandDefinition> {\n  public async run(): Promise<void> {\n    const api = await this.ensureLoginAndCreateClient(this.argv)\n\n    if (!this.argv.noBuild) {\n      await this._runBuild() // This ensures the bundle is always synced with source code\n    }\n\n    const integrationDef = await this.readIntegrationDefinitionFromFS()\n    if (integrationDef) {\n      return this._deployIntegration(api, integrationDef)\n    }\n    return this._deployBot(api, this.argv.botId, this.argv.createNewBot)\n  }\n\n  private async _runBuild() {\n    return new BuildCommand(this.api, this.prompt, this.logger, this.argv).run()\n  }\n\n  private async _deployIntegration(api: ApiClient, integrationDef: sdk.IntegrationDefinition) {\n    const outfile = this.projectPaths.abs.outFile\n    const code = await fs.promises.readFile(outfile, 'utf-8')\n\n    const {\n      name,\n      version,\n      icon: iconRelativeFilePath,\n      readme: readmeRelativeFilePath,\n      identifier,\n      configuration,\n    } = integrationDef\n\n    if (iconRelativeFilePath && !iconRelativeFilePath.toLowerCase().endsWith('.svg')) {\n      throw new errors.BotpressCLIError('Icon must be an SVG file')\n    }\n\n    const iconFileContent = await this._readMediaFile('icon', iconRelativeFilePath)\n    const readmeFileContent = await this._readMediaFile('readme', readmeRelativeFilePath)\n    const identifierExtractScriptFileContent = await this._readFile(identifier?.extractScript)\n    const fallbackHandlerScriptFileContent = await this._readFile(identifier?.fallbackHandlerScript)\n    const identifierLinkTemplateFileContent = await this._readFile(configuration?.identifier?.linkTemplateScript)\n\n    const integration = await api.findIntegration({ type: 'name', name, version })\n    if (integration && !integration.workspaceId) {\n      throw new errors.BotpressCLIError(\n        `Public integration ${integrationDef.name} v${integrationDef.version} is already deployed in another workspace.`\n      )\n    }\n\n    let message: string\n    if (integration) {\n      this.logger.warn('Integration already exists. If you decide to deploy, it will overwrite the existing one.')\n      message = `Are you sure you want to override integration ${integrationDef.name} v${integrationDef.version}?`\n    } else {\n      message = `Are you sure you want to deploy integration ${integrationDef.name} v${integrationDef.version}?`\n    }\n\n    const confirm = await this.prompt.confirm(message)\n    if (!confirm) {\n      this.logger.log('Aborted')\n      return\n    }\n\n    let createBody: CreateIntegrationBody = prepareCreateIntegrationBody(integrationDef)\n    createBody = {\n      ...createBody,\n      code,\n      icon: iconFileContent,\n      readme: readmeFileContent,\n      configuration: {\n        ...createBody.configuration,\n        identifier: {\n          ...(createBody.configuration?.identifier ?? {}),\n          linkTemplateScript: identifierLinkTemplateFileContent,\n        },\n      },\n      identifier: {\n        extractScript: identifierExtractScriptFileContent,\n        fallbackHandlerScript: fallbackHandlerScriptFileContent,\n      },\n      public: this.argv.public,\n    }\n\n    const startedMessage = `Deploying integration ${chalk.bold(integrationDef.name)} v${integrationDef.version}...`\n    const successMessage = 'Integration deployed'\n    if (integration) {\n      const updateBody = prepareUpdateIntegrationBody(\n        {\n          id: integration.id,\n          ...createBody,\n          public: this.argv.public,\n        },\n        integration\n      )\n\n      const { secrets: knownSecrets } = integration\n      updateBody.secrets = await this.promptSecrets(integrationDef, this.argv, { knownSecrets })\n      this._detectDeprecatedFeatures(integrationDef, { allowDeprecated: true })\n\n      const line = this.logger.line()\n      line.started(startedMessage)\n      await api.client.updateIntegration(updateBody).catch((thrown) => {\n        throw errors.BotpressCLIError.wrap(thrown, `Could not update integration \"${integrationDef.name}\"`)\n      })\n      line.success(successMessage)\n    } else {\n      const createSecrets = await this.promptSecrets(integrationDef, this.argv)\n      createBody.secrets = utils.records.filterValues(createSecrets, utils.guards.is.notNull)\n      this._detectDeprecatedFeatures(integrationDef, this.argv)\n\n      const line = this.logger.line()\n      line.started(startedMessage)\n      await api.client.createIntegration(createBody).catch((thrown) => {\n        throw errors.BotpressCLIError.wrap(thrown, `Could not create integration \"${integrationDef.name}\"`)\n      })\n      line.success(successMessage)\n    }\n  }\n\n  private _detectDeprecatedFeatures(\n    integrationDef: sdk.IntegrationDefinition,\n    opts: { allowDeprecated?: boolean } = {}\n  ) {\n    const deprecatedFields: string[] = []\n    const { user, channels } = integrationDef\n    if (user?.creation?.enabled) {\n      deprecatedFields.push('user.creation')\n    }\n\n    for (const [channelName, channel] of Object.entries(channels ?? {})) {\n      if (channel?.conversation?.creation?.enabled) {\n        deprecatedFields.push(`channels.${channelName}.creation`)\n      }\n    }\n\n    if (!deprecatedFields.length) {\n      return\n    }\n\n    const errorMessage = `The following fields of the integration's definition are deprecated: ${deprecatedFields.join(\n      ', '\n    )}`\n\n    if (opts.allowDeprecated) {\n      this.logger.warn(errorMessage)\n    } else {\n      throw new errors.BotpressCLIError(errorMessage)\n    }\n  }\n\n  private _readFile = async (filePath: string | undefined): Promise<string | undefined> => {\n    if (!filePath) {\n      return undefined\n    }\n\n    const absoluteFilePath = utils.path.absoluteFrom(this.projectPaths.abs.workDir, filePath)\n    return fs.promises.readFile(absoluteFilePath, 'utf-8').catch((thrown) => {\n      throw errors.BotpressCLIError.wrap(thrown, `Could not read file \"${absoluteFilePath}\"`)\n    })\n  }\n\n  private _readMediaFile = async (\n    filePurpose: 'icon' | 'readme',\n    filePath: string | undefined\n  ): Promise<string | undefined> => {\n    if (!filePath) {\n      return undefined\n    }\n\n    const absoluteFilePath = utils.path.absoluteFrom(this.projectPaths.abs.workDir, filePath)\n    return fs.promises.readFile(absoluteFilePath, 'base64').catch((thrown) => {\n      throw errors.BotpressCLIError.wrap(thrown, `Could not read ${filePurpose} file \"${absoluteFilePath}\"`)\n    })\n  }\n\n  private async _deployBot(api: ApiClient, argvBotId: string | undefined, argvCreateNew: boolean | undefined) {\n    const outfile = this.projectPaths.abs.outFile\n    const code = await fs.promises.readFile(outfile, 'utf-8')\n    const { default: botImpl } = utils.require.requireJsFile<{ default: sdk.Bot }>(outfile)\n\n    let bot: client.Bot\n    if (argvBotId && argvCreateNew) {\n      throw new errors.BotpressCLIError('Cannot specify both --botId and --createNew')\n    } else if (argvCreateNew) {\n      const confirm = await this.prompt.confirm('Are you sure you want to create a new bot ?')\n      if (!confirm) {\n        this.logger.log('Aborted')\n        return\n      }\n\n      bot = await this._createNewBot(api)\n    } else {\n      bot = await this._getExistingBot(api, argvBotId)\n\n      const confirm = await this.prompt.confirm(`Are you sure you want to deploy the bot \"${bot.name}\"?`)\n      if (!confirm) {\n        this.logger.log('Aborted')\n        return\n      }\n    }\n\n    const line = this.logger.line()\n    line.started(`Deploying bot ${chalk.bold(bot.name)}...`)\n\n    const integrationInstances = await this.fetchBotIntegrationInstances(botImpl, api)\n    const updateBotBody = prepareUpdateBotBody(\n      {\n        ...prepareCreateBotBody(botImpl),\n        id: bot.id,\n        code,\n        integrations: integrationInstances,\n      },\n      bot\n    )\n\n    const { bot: updatedBot } = await api.client.updateBot(updateBotBody).catch((thrown) => {\n      throw errors.BotpressCLIError.wrap(thrown, `Could not update bot \"${bot.name}\"`)\n    })\n    line.success('Bot deployed')\n    this.displayWebhookUrls(updatedBot)\n  }\n\n  private async _createNewBot(api: ApiClient): Promise<client.Bot> {\n    const line = this.logger.line()\n    const { bot: createdBot } = await api.client.createBot({}).catch((thrown) => {\n      throw errors.BotpressCLIError.wrap(thrown, 'Could not create bot')\n    })\n    line.success(`Bot created with ID \"${createdBot.id}\" and name \"${createdBot.name}\"`)\n    await this.projectCache.set('botId', createdBot.id)\n    return createdBot\n  }\n\n  private async _getExistingBot(api: ApiClient, botId: string | undefined): Promise<client.Bot> {\n    const promptedBotId = await this.projectCache.sync('botId', botId, async (defaultId) => {\n      const userBots = await api\n        .listAllPages(api.client.listBots, (r) => r.bots)\n        .catch((thrown) => {\n          throw errors.BotpressCLIError.wrap(thrown, 'Could not fetch existing bots')\n        })\n\n      if (!userBots.length) {\n        throw new errors.NoBotsFoundError()\n      }\n\n      const initial = userBots.find((bot) => bot.id === defaultId)\n\n      const prompted = await this.prompt.select('Which bot do you want to deploy?', {\n        initial: initial && { title: initial.name, value: initial.id },\n        choices: userBots.map((bot) => ({ title: bot.name, value: bot.id })),\n      })\n\n      if (!prompted) {\n        throw new errors.ParamRequiredError('Bot Id')\n      }\n\n      return prompted\n    })\n\n    const { bot: fetchedBot } = await api.client.getBot({ id: promptedBotId }).catch((thrown) => {\n      throw errors.BotpressCLIError.wrap(thrown, 'Could not get bot info')\n    })\n\n    return fetchedBot\n  }\n}\n"],
-  "mappings": "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",
-  "names": ["chalk"]
+  "sourcesContent": ["import type * as client from '@botpress/client'\nimport type * as sdk from '@botpress/sdk'\nimport chalk from 'chalk'\nimport * as fs from 'fs'\nimport { prepareCreateBotBody, prepareUpdateBotBody } from '../api/bot-body'\nimport type { ApiClient } from '../api/client'\nimport {\n  prepareUpdateIntegrationBody,\n  CreateIntegrationBody,\n  prepareCreateIntegrationBody,\n} from '../api/integration-body'\nimport type commandDefinitions from '../command-definitions'\nimport * as errors from '../errors'\nimport * as utils from '../utils'\nimport { BuildCommand } from './build-command'\nimport { ProjectCommand } from './project-command'\n\nexport type DeployCommandDefinition = typeof commandDefinitions.deploy\nexport class DeployCommand extends ProjectCommand<DeployCommandDefinition> {\n  public async run(): Promise<void> {\n    const api = await this.ensureLoginAndCreateClient(this.argv)\n\n    if (!this.argv.noBuild) {\n      await this._runBuild() // This ensures the bundle is always synced with source code\n    }\n\n    const integrationDef = await this.readIntegrationDefinitionFromFS()\n    if (integrationDef) {\n      return this._deployIntegration(api, integrationDef)\n    }\n    return this._deployBot(api, this.argv.botId, this.argv.createNewBot)\n  }\n\n  private async _runBuild() {\n    return new BuildCommand(this.api, this.prompt, this.logger, this.argv).run()\n  }\n\n  private async _deployIntegration(api: ApiClient, integrationDef: sdk.IntegrationDefinition) {\n    const outfile = this.projectPaths.abs.outFile\n    const code = await fs.promises.readFile(outfile, 'utf-8')\n\n    integrationDef = await this._manageWorkspaceHandle(api, integrationDef)\n\n    const {\n      name,\n      version,\n      icon: iconRelativeFilePath,\n      readme: readmeRelativeFilePath,\n      identifier,\n      configuration,\n    } = integrationDef\n\n    if (iconRelativeFilePath && !iconRelativeFilePath.toLowerCase().endsWith('.svg')) {\n      throw new errors.BotpressCLIError('Icon must be an SVG file')\n    }\n\n    const iconFileContent = await this._readMediaFile('icon', iconRelativeFilePath)\n    const readmeFileContent = await this._readMediaFile('readme', readmeRelativeFilePath)\n    const identifierExtractScriptFileContent = await this._readFile(identifier?.extractScript)\n    const fallbackHandlerScriptFileContent = await this._readFile(identifier?.fallbackHandlerScript)\n    const identifierLinkTemplateFileContent = await this._readFile(configuration?.identifier?.linkTemplateScript)\n\n    const integration = await api.findIntegration({ type: 'name', name, version })\n    if (integration && integration.workspaceId !== api.workspaceId) {\n      throw new errors.BotpressCLIError(\n        `Public integration ${name} v${version} is already deployed in another workspace.`\n      )\n    }\n\n    if (integration && integration.public && !api.isBotpressWorkspace) {\n      throw new errors.BotpressCLIError(\n        `Integration ${name} v${version} is already deployed publicly and cannot be updated. Please bump the version.`\n      )\n    }\n\n    let message: string\n    if (integration) {\n      this.logger.warn('Integration already exists. If you decide to deploy, it will overwrite the existing one.')\n      message = `Are you sure you want to override integration ${name} v${version}?`\n    } else {\n      message = `Are you sure you want to deploy integration ${name} v${version}?`\n    }\n\n    const confirm = await this.prompt.confirm(message)\n    if (!confirm) {\n      this.logger.log('Aborted')\n      return\n    }\n\n    let createBody: CreateIntegrationBody = prepareCreateIntegrationBody(integrationDef)\n    createBody = {\n      ...createBody,\n      code,\n      icon: iconFileContent,\n      readme: readmeFileContent,\n      configuration: {\n        ...createBody.configuration,\n        identifier: {\n          ...(createBody.configuration?.identifier ?? {}),\n          linkTemplateScript: identifierLinkTemplateFileContent,\n        },\n      },\n      identifier: {\n        extractScript: identifierExtractScriptFileContent,\n        fallbackHandlerScript: fallbackHandlerScriptFileContent,\n      },\n      public: this.argv.public,\n    }\n\n    const startedMessage = `Deploying integration ${chalk.bold(name)} v${version}...`\n    const successMessage = 'Integration deployed'\n    if (integration) {\n      const updateBody = prepareUpdateIntegrationBody(\n        {\n          id: integration.id,\n          ...createBody,\n          public: this.argv.public,\n        },\n        integration\n      )\n\n      const { secrets: knownSecrets } = integration\n      updateBody.secrets = await this.promptSecrets(integrationDef, this.argv, { knownSecrets })\n      this._detectDeprecatedFeatures(integrationDef, { allowDeprecated: true })\n\n      const line = this.logger.line()\n      line.started(startedMessage)\n      await api.client.updateIntegration(updateBody).catch((thrown) => {\n        throw errors.BotpressCLIError.wrap(thrown, `Could not update integration \"${name}\"`)\n      })\n      line.success(successMessage)\n    } else {\n      const createSecrets = await this.promptSecrets(integrationDef, this.argv)\n      createBody.secrets = utils.records.filterValues(createSecrets, utils.guards.is.notNull)\n      this._detectDeprecatedFeatures(integrationDef, this.argv)\n\n      const line = this.logger.line()\n      line.started(startedMessage)\n      await api.client.createIntegration(createBody).catch((thrown) => {\n        throw errors.BotpressCLIError.wrap(thrown, `Could not create integration \"${name}\"`)\n      })\n      line.success(successMessage)\n    }\n  }\n\n  private _detectDeprecatedFeatures(\n    integrationDef: sdk.IntegrationDefinition,\n    opts: { allowDeprecated?: boolean } = {}\n  ) {\n    const deprecatedFields: string[] = []\n    const { user, channels } = integrationDef\n    if (user?.creation?.enabled) {\n      deprecatedFields.push('user.creation')\n    }\n\n    for (const [channelName, channel] of Object.entries(channels ?? {})) {\n      if (channel?.conversation?.creation?.enabled) {\n        deprecatedFields.push(`channels.${channelName}.creation`)\n      }\n    }\n\n    if (!deprecatedFields.length) {\n      return\n    }\n\n    const errorMessage = `The following fields of the integration's definition are deprecated: ${deprecatedFields.join(\n      ', '\n    )}`\n\n    if (opts.allowDeprecated) {\n      this.logger.warn(errorMessage)\n    } else {\n      throw new errors.BotpressCLIError(errorMessage)\n    }\n  }\n\n  private _readFile = async (filePath: string | undefined): Promise<string | undefined> => {\n    if (!filePath) {\n      return undefined\n    }\n\n    const absoluteFilePath = utils.path.absoluteFrom(this.projectPaths.abs.workDir, filePath)\n    return fs.promises.readFile(absoluteFilePath, 'utf-8').catch((thrown) => {\n      throw errors.BotpressCLIError.wrap(thrown, `Could not read file \"${absoluteFilePath}\"`)\n    })\n  }\n\n  private _readMediaFile = async (\n    filePurpose: 'icon' | 'readme',\n    filePath: string | undefined\n  ): Promise<string | undefined> => {\n    if (!filePath) {\n      return undefined\n    }\n\n    const absoluteFilePath = utils.path.absoluteFrom(this.projectPaths.abs.workDir, filePath)\n    return fs.promises.readFile(absoluteFilePath, 'base64').catch((thrown) => {\n      throw errors.BotpressCLIError.wrap(thrown, `Could not read ${filePurpose} file \"${absoluteFilePath}\"`)\n    })\n  }\n\n  private async _deployBot(api: ApiClient, argvBotId: string | undefined, argvCreateNew: boolean | undefined) {\n    const outfile = this.projectPaths.abs.outFile\n    const code = await fs.promises.readFile(outfile, 'utf-8')\n    const { default: botImpl } = utils.require.requireJsFile<{ default: sdk.Bot }>(outfile)\n\n    let bot: client.Bot\n    if (argvBotId && argvCreateNew) {\n      throw new errors.BotpressCLIError('Cannot specify both --botId and --createNew')\n    } else if (argvCreateNew) {\n      const confirm = await this.prompt.confirm('Are you sure you want to create a new bot ?')\n      if (!confirm) {\n        this.logger.log('Aborted')\n        return\n      }\n\n      bot = await this._createNewBot(api)\n    } else {\n      bot = await this._getExistingBot(api, argvBotId)\n\n      const confirm = await this.prompt.confirm(`Are you sure you want to deploy the bot \"${bot.name}\"?`)\n      if (!confirm) {\n        this.logger.log('Aborted')\n        return\n      }\n    }\n\n    const line = this.logger.line()\n    line.started(`Deploying bot ${chalk.bold(bot.name)}...`)\n\n    const integrationInstances = await this.fetchBotIntegrationInstances(botImpl, api)\n    const updateBotBody = prepareUpdateBotBody(\n      {\n        ...prepareCreateBotBody(botImpl),\n        id: bot.id,\n        code,\n        integrations: integrationInstances,\n      },\n      bot\n    )\n\n    const { bot: updatedBot } = await api.client.updateBot(updateBotBody).catch((thrown) => {\n      throw errors.BotpressCLIError.wrap(thrown, `Could not update bot \"${bot.name}\"`)\n    })\n    line.success('Bot deployed')\n    this.displayWebhookUrls(updatedBot)\n  }\n\n  private async _createNewBot(api: ApiClient): Promise<client.Bot> {\n    const line = this.logger.line()\n    const { bot: createdBot } = await api.client.createBot({}).catch((thrown) => {\n      throw errors.BotpressCLIError.wrap(thrown, 'Could not create bot')\n    })\n    line.success(`Bot created with ID \"${createdBot.id}\" and name \"${createdBot.name}\"`)\n    await this.projectCache.set('botId', createdBot.id)\n    return createdBot\n  }\n\n  private async _getExistingBot(api: ApiClient, botId: string | undefined): Promise<client.Bot> {\n    const promptedBotId = await this.projectCache.sync('botId', botId, async (defaultId) => {\n      const userBots = await api\n        .listAllPages(api.client.listBots, (r) => r.bots)\n        .catch((thrown) => {\n          throw errors.BotpressCLIError.wrap(thrown, 'Could not fetch existing bots')\n        })\n\n      if (!userBots.length) {\n        throw new errors.NoBotsFoundError()\n      }\n\n      const initial = userBots.find((bot) => bot.id === defaultId)\n\n      const prompted = await this.prompt.select('Which bot do you want to deploy?', {\n        initial: initial && { title: initial.name, value: initial.id },\n        choices: userBots.map((bot) => ({ title: bot.name, value: bot.id })),\n      })\n\n      if (!prompted) {\n        throw new errors.ParamRequiredError('Bot Id')\n      }\n\n      return prompted\n    })\n\n    const { bot: fetchedBot } = await api.client.getBot({ id: promptedBotId }).catch((thrown) => {\n      throw errors.BotpressCLIError.wrap(thrown, 'Could not get bot info')\n    })\n\n    return fetchedBot\n  }\n\n  private async _manageWorkspaceHandle(\n    api: ApiClient,\n    integration: sdk.IntegrationDefinition\n  ): Promise<sdk.IntegrationDefinition> {\n    const { name: localName, workspaceHandle: localHandle } = this._parseIntegrationName(integration.name)\n    if (!localHandle && api.isBotpressWorkspace) {\n      this.logger.debug('Botpress workspace detected; workspace handle omitted')\n      return integration // botpress has the right to omit workspace handle\n    }\n\n    const { handle: remoteHandle, name: workspaceName } = await api.getWorkspace().catch((thrown) => {\n      throw errors.BotpressCLIError.wrap(thrown, 'Could not fetch workspace')\n    })\n\n    if (localHandle && remoteHandle) {\n      if (localHandle !== remoteHandle) {\n        throw new errors.BotpressCLIError(\n          `Your current workspace handle is \"${remoteHandle}\" but the integration handle is \"${localHandle}\".`\n        )\n      }\n      return integration\n    }\n\n    const workspaceHandleIsMandatoryMsg = 'Cannot deploy integration without workspace handle'\n\n    if (!localHandle && remoteHandle) {\n      const confirmAddHandle = await this.prompt.confirm(\n        `Your current workspace handle is \"${remoteHandle}\". Do you want to use the name \"${remoteHandle}/${localName}\"?`\n      )\n      if (!confirmAddHandle) {\n        throw new errors.BotpressCLIError(workspaceHandleIsMandatoryMsg)\n      }\n      const newName = `${remoteHandle}/${localName}`\n      return { ...integration, name: newName }\n    }\n\n    if (localHandle && !remoteHandle) {\n      const { available } = await api.client.checkHandleAvailability({ handle: localHandle }).catch((thrown) => {\n        throw errors.BotpressCLIError.wrap(thrown, 'Could not check handle availability')\n      })\n\n      if (!available) {\n        throw new errors.BotpressCLIError(`Handle \"${localHandle}\" is not yours and is not available`)\n      }\n\n      const confirmClaimHandle = await this.prompt.confirm(\n        `Handle \"${localHandle}\" is available. Do you want to claim it for your workspace ${workspaceName}?`\n      )\n      if (!confirmClaimHandle) {\n        throw new errors.BotpressCLIError(workspaceHandleIsMandatoryMsg)\n      }\n\n      await api.updateWorkspace({ handle: localHandle }).catch((thrown) => {\n        throw errors.BotpressCLIError.wrap(thrown, `Could not claim handle \"${localHandle}\"`)\n      })\n\n      this.logger.success(`Handle \"${localHandle}\" is now yours!`)\n      return integration\n    }\n\n    this.logger.warn(\"It seems you don't have a workspace handle yet.\")\n    let claimedHandle: string | undefined = undefined\n    do {\n      const prompted = await this.prompt.text('Please enter a workspace handle')\n      if (!prompted) {\n        throw new errors.BotpressCLIError(workspaceHandleIsMandatoryMsg)\n      }\n\n      const { available, suggestions } = await api.client.checkHandleAvailability({ handle: prompted })\n      if (!available) {\n        this.logger.warn(`Handle \"${prompted}\" is not available. Suggestions: ${suggestions.join(', ')}`)\n        continue\n      }\n\n      claimedHandle = prompted\n      await api.updateWorkspace({ handle: claimedHandle }).catch((thrown) => {\n        throw errors.BotpressCLIError.wrap(thrown, `Could not claim handle \"${claimedHandle}\"`)\n      })\n    } while (!claimedHandle)\n\n    this.logger.success(`Handle \"${claimedHandle}\" is yours!`)\n    const newName = `${claimedHandle}/${localName}`\n    return { ...integration, name: newName }\n  }\n\n  private _parseIntegrationName = (integrationName: string): { name: string; workspaceHandle?: string } => {\n    const parts = integrationName.split('/')\n    if (parts.length > 2) {\n      throw new errors.BotpressCLIError(\n        `Invalid integration name \"${integrationName}\": a single forward slash is allowed`\n      )\n    }\n    if (parts.length === 2) {\n      const [workspaceHandle, name] = parts as [string, string]\n      return { name, workspaceHandle }\n    }\n    const [name] = parts as [string]\n    return { name }\n  }\n}\n"],
+  "mappings": "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",
+  "names": ["chalk", "newName", "name"]
 }

package/e2e/index.ts

@@ -5,10 +5,18 @@ import { createDeployBot } from './tests/create-deploy-bot'
 import { createDeployIntegration } from './tests/create-deploy-integration'
 import { devBot } from './tests/dev-bot'
 import { requiredSecrets } from './tests/integration-secrets'
+import { prependWorkspaceHandle, enforceWorkspaceHandle } from './tests/manage-workspace-handle'
 import { Test } from './typings'
 import { sleep, TmpDirectory } from './utils'
 
-const tests: Test[] = [createDeployBot, createDeployIntegration, devBot, requiredSecrets]
+const tests: Test[] = [
+  createDeployBot,
+  createDeployIntegration,
+  devBot,
+  requiredSecrets,
+  prependWorkspaceHandle,
+  enforceWorkspaceHandle,
+]
 
 const timeout = (ms: number) =>
   sleep(ms).then(() => {

package/e2e/tests/manage-workspace-handle.ts

@@ -0,0 +1,105 @@
+import { Client } from '@botpress/client'
+import pathlib from 'path'
+import impl from '../../src/command-implementations'
+import { ApiIntegration, fetchAllIntegrations } from '../api'
+import defaults from '../defaults'
+import { Test } from '../typings'
+import * as utils from '../utils'
+
+const fetchIntegration = async (client: Client, integrationName: string): Promise<ApiIntegration | undefined> => {
+  const integrations = await fetchAllIntegrations(client)
+  return integrations.find(({ name }) => name === integrationName)
+}
+
+export const prependWorkspaceHandle: Test = {
+  name: 'cli should automatically preprend the workspace handle to the integration name when deploying',
+  handler: async ({ tmpDir, dependencies, workspaceHandle, logger, ...creds }) => {
+    const botpressHomeDir = pathlib.join(tmpDir, '.botpresshome')
+    const baseDir = pathlib.join(tmpDir, 'integrations')
+
+    const integrationSuffix = utils.getUUID()
+    const integrationName = `myintegration${integrationSuffix}`
+    const integrationDirName = integrationName
+    const integrationDir = pathlib.join(baseDir, integrationDirName)
+
+    const argv = {
+      ...defaults,
+      botpressHome: botpressHomeDir,
+      confirm: true,
+      ...creds,
+    }
+
+    const client = new Client({ apiUrl: creds.apiUrl, token: creds.token, workspaceId: creds.workspaceId })
+
+    await impl
+      .init({ ...argv, workDir: baseDir, name: integrationName, type: 'integration' })
+      .then(utils.handleExitCode)
+    await utils.fixBotpressDependencies({ workDir: integrationDir, target: dependencies })
+    await utils.npmInstall({ workDir: integrationDir }).then(utils.handleExitCode)
+    await impl.build({ ...argv, workDir: integrationDir }).then(utils.handleExitCode)
+    await impl.login({ ...argv }).then(utils.handleExitCode)
+
+    await impl
+      .deploy({ ...argv, createNewBot: undefined, botId: undefined, workDir: integrationDir })
+      .then(utils.handleExitCode)
+
+    logger.debug(`Fetching integration "${integrationName}"`)
+    let integration = await fetchIntegration(client, integrationName)
+    if (integration) {
+      throw new Error(`Integration ${integrationName} should not have been created`)
+    }
+
+    const expectedIntegrationName = `${workspaceHandle}/${integrationName}`
+    logger.debug(`Fetching integration "${expectedIntegrationName}"`)
+    integration = await fetchIntegration(client, expectedIntegrationName)
+    if (!integration) {
+      throw new Error(`Integration ${expectedIntegrationName} should have been created`)
+    }
+
+    logger.debug(`Deleting integration "${integrationName}"`)
+    await impl.integrations.subcommands.delete({ ...argv, integrationRef: integration.id }).then(({ exitCode }) => {
+      exitCode !== 0 && logger.warn(`Failed to delete integration "${integrationName}"`) // not enough to fail the test
+    })
+  },
+}
+
+export const enforceWorkspaceHandle: Test = {
+  name: 'cli should fail when attempting to deploy an integration with incorrect workspace handle',
+  handler: async ({ tmpDir, dependencies, ...creds }) => {
+    const botpressHomeDir = pathlib.join(tmpDir, '.botpresshome')
+    const baseDir = pathlib.join(tmpDir, 'integrations')
+
+    const randomSuffix = utils.getUUID().slice(0, 8)
+
+    const name = 'myintegration'
+    const handle = `myhandle${randomSuffix}`
+    const integrationName = `${handle}/${name}`
+    const integrationDirName = `${handle}-${name}`
+    const integrationDir = pathlib.join(baseDir, integrationDirName)
+
+    const argv = {
+      ...defaults,
+      botpressHome: botpressHomeDir,
+      confirm: true,
+      ...creds,
+    }
+
+    await impl
+      .init({ ...argv, workDir: baseDir, name: integrationName, type: 'integration' })
+      .then(utils.handleExitCode)
+    await utils.fixBotpressDependencies({ workDir: integrationDir, target: dependencies })
+    await utils.npmInstall({ workDir: integrationDir }).then(utils.handleExitCode)
+    await impl.login({ ...argv }).then(utils.handleExitCode)
+
+    const { exitCode } = await impl.deploy({
+      ...argv,
+      createNewBot: undefined,
+      botId: undefined,
+      workDir: integrationDir,
+    })
+
+    if (exitCode === 0) {
+      throw new Error(`Integration ${integrationName} should not have been deployed`)
+    }
+  },
+}

package/e2e/utils.ts

@@ -3,6 +3,7 @@ import fs from 'fs'
 import _ from 'lodash'
 import pathlib from 'path'
 import tmp from 'tmp'
+import * as uuid from 'uuid'
 
 type PackageJson = {
   name: string
@@ -71,3 +72,5 @@ export const handleExitCode = ({ exitCode }: { exitCode: number }) => {
     throw new Error(`Command exited with code ${exitCode}`)
   }
 }
+
+export const getUUID = () => uuid.v4().replace(/-/g, '')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@botpress/cli",
-  "version": "0.8.3",
+  "version": "0.8.6",
   "description": "Botpress CLI",
   "scripts": {
     "build": "pnpm run bundle && pnpm run template:gen",
@@ -20,8 +20,8 @@
   },
   "main": "dist/index.js",
   "dependencies": {
-    "@botpress/client": "0.14.2",
-    "@botpress/sdk": "0.8.2",
+    "@botpress/client": "0.15.0",
+    "@botpress/sdk": "0.8.4",
     "@bpinternal/const": "^0.0.20",
     "@bpinternal/tunnel": "^0.1.1",
     "@bpinternal/yargs-extra": "^0.0.3",

package/templates/echo-bot/package.json

@@ -8,8 +8,8 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@botpress/client": "0.14.2",
-    "@botpress/sdk": "0.8.2"
+    "@botpress/client": "0.15.0",
+    "@botpress/sdk": "0.8.4"
   },
   "devDependencies": {
     "@types/node": "^18.11.17",

package/templates/empty-integration/.botpress/implementation/channels/channel/messages/bloc.ts

@@ -0,0 +1,57 @@
+/* tslint:disable */
+/**
+ * This file was automatically generated by json-schema-to-typescript.
+ * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+ * and run json-schema-to-typescript to regenerate this file.
+ */
+
+export interface Bloc {
+  items: (
+    | {
+        type: "text";
+        payload: {
+          text: string;
+        };
+      }
+    | {
+        type: "markdown";
+        payload: {
+          markdown: string;
+        };
+      }
+    | {
+        type: "image";
+        payload: {
+          imageUrl: string;
+        };
+      }
+    | {
+        type: "audio";
+        payload: {
+          audioUrl: string;
+        };
+      }
+    | {
+        type: "video";
+        payload: {
+          videoUrl: string;
+        };
+      }
+    | {
+        type: "file";
+        payload: {
+          fileUrl: string;
+          title?: string;
+        };
+      }
+    | {
+        type: "location";
+        payload: {
+          latitude: number;
+          longitude: number;
+          address?: string;
+          title?: string;
+        };
+      }
+  )[];
+}

package/templates/empty-integration/.botpress/implementation/channels/channel/messages/index.ts

@@ -23,6 +23,8 @@ import * as dropdown from "./dropdown";
 export * as dropdown from "./dropdown";
 import * as choice from "./choice";
 export * as choice from "./choice";
+import * as bloc from "./bloc";
+export * as bloc from "./bloc";
 
 export type Messages = {
   text: text.Text;
@@ -36,4 +38,5 @@ export type Messages = {
   card: card.Card;
   dropdown: dropdown.Dropdown;
   choice: choice.Choice;
+  bloc: bloc.Bloc;
 }

package/templates/empty-integration/package.json

@@ -9,8 +9,8 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@botpress/client": "0.14.2",
-    "@botpress/sdk": "0.8.2"
+    "@botpress/client": "0.15.0",
+    "@botpress/sdk": "0.8.4"
   },
   "devDependencies": {
     "@types/node": "^18.11.17",

package/templates/empty-integration/src/index.ts

@@ -58,6 +58,9 @@ export default new botpress.Integration({
         dropdown: async () => {
           throw new NotImplementedError()
         },
+        bloc: async () => {
+          throw new NotImplementedError()
+        },
       },
     },
   },