[pull] master from botpress:master

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@botpress/cli",
-  "version": "4.14.1",
+  "version": "4.14.3",
   "description": "Botpress CLI",
   "scripts": {
     "build": "pnpm run bundle && pnpm run template:gen",

packages/cli/src/command-implementations/global-command.ts

@@ -94,6 +94,7 @@ export abstract class GlobalCommand<C extends GlobalCommandDefinition> extends B
         )
       }
       ;({ token, workspaceId, apiUrl } = await this._readProfileFromFS(this.argv.profile))
+      this.logger.log(`Using profile "${this.argv.profile}"`, { prefix: '👤' })
     } else {
       token = credentials.token ?? (await cache.get('token'))
       workspaceId = credentials.workspaceId ?? (await cache.get('workspaceId'))

packages/cli/src/command-implementations/init-command.ts

@@ -80,14 +80,22 @@ export class InitCommand extends GlobalCommand<InitCommandDefinition> {
     const name = await this._getName('plugin', template.defaultProjectName)
     const { fullName, shortName } = this._getFullNameAndShortName({ workspaceHandle, name })
 
-    await this._copy({
-      srcDir: template.absolutePath,
-      destDir: workDir,
-      name: shortName,
-      pkgJson: {
-        pluginName: fullName,
-      },
-    })
+    try {
+      await this._copy({
+        srcDir: template.absolutePath,
+        destDir: workDir,
+        name: shortName,
+        pkgJson: {
+          pluginName: fullName,
+        },
+      })
+    } catch (error) {
+      if (error instanceof errors.AbortedOperationError) {
+        this.logger.log('Aborted')
+        return
+      }
+      throw error
+    }
     this.logger.success(`Plugin project initialized in ${chalk.bold(pathlib.join(workDir, shortName))}`)
   }
 
@@ -182,9 +190,9 @@ export class InitCommand extends GlobalCommand<InitCommandDefinition> {
     const dirName = utils.casing.to.kebabCase(name)
     const destination = pathlib.join(destDir, dirName)
 
-    const exist = await this._checkIfDestinationExists(destination)
-    if (exist) {
-      return
+    const destinationCanBeUsed = await this._checkIfDestinationCanBeUsed(destination)
+    if (!destinationCanBeUsed) {
+      throw new errors.AbortedOperationError()
     }
 
     await fs.promises.cp(srcDir, destination, { recursive: true })
@@ -198,17 +206,16 @@ export class InitCommand extends GlobalCommand<InitCommandDefinition> {
     await fs.promises.writeFile(pkgJsonPath, JSON.stringify(updatedJson, null, 2))
   }
 
-  private _checkIfDestinationExists = async (destination: string) => {
+  private _checkIfDestinationCanBeUsed = async (destination: string) => {
     if (fs.existsSync(destination)) {
       const override = await this.prompt.confirm(
         `Directory ${chalk.bold(destination)} already exists. Do you want to overwrite it?`
       )
       if (!override) {
-        this.logger.log('Aborting')
-        return true
+        return false
       }
     }
-    return false
+    return true
   }
 }
 

packages/cli/src/config.ts

@@ -127,7 +127,7 @@ const globalSchema = {
   },
   profile: {
     type: 'string',
-    description: 'The CLI profile defined in the $BP_BOTPRESS_HOME/.profiles json format file',
+    description: 'The CLI profile defined in the $BP_BOTPRESS_HOME/profiles.json json format file',
   },
 } satisfies CommandSchema
 

packages/cli/src/consts.ts

@@ -18,7 +18,7 @@ export const cliRootDir = CLI_ROOT_DIR
 export const installDirName = 'bp_modules'
 export const outDirName = '.botpress'
 export const distDirName = 'dist'
-export const profileFileName = '.profiles'
+export const profileFileName = 'profiles.json'
 
 export const fromCliRootDir = {}
 

packages/cli/src/errors.ts

@@ -163,3 +163,9 @@ export class ProjectDefinitionNotFoundError extends BotpressCLIError {
     super(message)
   }
 }
+
+export class AbortedOperationError extends BotpressCLIError {
+  public constructor() {
+    super('Aborted')
+  }
+}