bdy 1.25.13-dev → 1.25.14-dev

package/distTs/src/command/project/link.js

@@ -9,23 +9,34 @@ const input_1 = __importDefault(require("../../input"));
 const output_1 = __importDefault(require("../../output"));
 const node_path_1 = require("node:path");
 const node_fs_1 = __importDefault(require("node:fs"));
-const commandProjectLink = (0, utils_1.newCommand)('link', texts_1.DESC_COMMAND_PROJECT_LINK);
+// With --format json the narration below is skipped and prompts go to
+// stderr, so stdout carries only the linked project.
+let json = false;
+const commandProjectLink = (0, utils_1.newCommand)('link', texts_1.DESC_COMMAND_PROJECT_LINK, { requiredScopes: [utils_1.REST_API_SCOPE.PROJECT_WRITE] });
 commandProjectLink.usesDefaultContext = true;
 commandProjectLink.option('-w, --workspace <domain>', texts_1.OPTION_REST_API_WORKSPACE);
 commandProjectLink.option('-r, --relink', texts_1.OPT_COMMAND_PROJECT_LINK_RELINK);
 commandProjectLink.option('-g, --git', texts_1.OPT_COMMAND_PROJECT_LINK_GIT);
 commandProjectLink.option('-p, --project <name>', texts_1.OPTION_REST_API_PROJECT);
+commandProjectLink.option('--format <text|json>', texts_1.OPTION_FORMAT);
 commandProjectLink.argument('[directory]', texts_1.OPT_COMMAND_PROJECT_LINK_DIRECTORY);
 commandProjectLink.action(async (dir, options) => {
     const ProjectCfg = require('../../project/cfg').default;
+    json = options.format === 'json';
     output_1.default.handleSignals();
     const { path, git } = await checkPath(dir, options);
     const { workspace, project, url } = await createOrGetProject(path, options);
     ProjectCfg.init(path, workspace, project);
-    output_1.default.okSign();
-    output_1.default.normal(texts_1.TXT_COMMAND_PROJECT_LINK_TO, false);
-    output_1.default.cyan(` ${url}`);
-    await initRepo(workspace, project, path, git, options);
+    if (!json) {
+        output_1.default.okSign();
+        output_1.default.normal(texts_1.TXT_COMMAND_PROJECT_LINK_TO, false);
+        output_1.default.cyan(` ${url}`);
+    }
+    const data = await initRepo(workspace, project, path, git, options);
+    if (json) {
+        output_1.default.json(data);
+        output_1.default.exitNormal();
+    }
     tryNow();
     output_1.default.exitNormal();
 });
@@ -70,15 +81,17 @@ const initRepo = async (workspace, project, path, git, options) => {
     const { remote } = getProjectRemote(data);
     let repo = options.git;
     if (!repo)
-        repo = await output_1.default.confirm(texts_1.TXT_COMMAND_PROJECT_LINK_GIT_REPO);
+        repo = await output_1.default.confirm(texts_1.TXT_COMMAND_PROJECT_LINK_GIT_REPO, json);
     if (!repo)
-        return;
+        return data;
     if (!git) {
         await (0, utils_1.execLocally)('git init', {
             cwd: path,
         });
-        output_1.default.okSign();
-        output_1.default.normal(texts_1.TXT_COMMAND_PROJECT_LINK_GIT_REPO_INITIALIZED);
+        if (!json) {
+            output_1.default.okSign();
+            output_1.default.normal(texts_1.TXT_COMMAND_PROJECT_LINK_GIT_REPO_INITIALIZED);
+        }
     }
     const str = await (0, utils_1.execLocally)('git remote -v', {
         cwd: path,
@@ -88,18 +101,27 @@ const initRepo = async (workspace, project, path, git, options) => {
         await (0, utils_1.execLocally)(`git remote add origin ${remote}`, {
             cwd: path,
         });
-        output_1.default.okSign();
-        output_1.default.normal('Remote ', false);
-        output_1.default.cyan('origin ', false);
-        output_1.default.normal('set to ', false);
-        output_1.default.cyan(remote);
+        if (!json) {
+            output_1.default.okSign();
+            output_1.default.normal('Remote ', false);
+            output_1.default.cyan('origin ', false);
+            output_1.default.normal('set to ', false);
+            output_1.default.cyan(remote);
+        }
     }
     else if (remotes.origin !== remote) {
-        output_1.default.yellow(texts_1.OPT_COMMAND_PROJECT_LINK_HAS_REMOTE);
-        output_1.default.normal('Current origin: ', false);
-        output_1.default.cyan(remotes.origin);
-        output_1.default.normal('Buddy project: ', false);
-        output_1.default.cyan(remote);
+        if (json) {
+            output_1.default.noteWarning(texts_1.OPT_COMMAND_PROJECT_LINK_HAS_REMOTE);
+            output_1.default.note(`Current origin: ${remotes.origin}`);
+            output_1.default.note(`Buddy project: ${remote}`);
+        }
+        else {
+            output_1.default.yellow(texts_1.OPT_COMMAND_PROJECT_LINK_HAS_REMOTE);
+            output_1.default.normal('Current origin: ', false);
+            output_1.default.cyan(remotes.origin);
+            output_1.default.normal('Buddy project: ', false);
+            output_1.default.cyan(remote);
+        }
         const opt = await output_1.default.inputMenuAdv(texts_1.OPT_COMMAND_PROJECT_LINK_SET_GIT_REMOTE, [
             {
                 name: 'Add buddy remote',
@@ -126,11 +148,13 @@ const initRepo = async (workspace, project, path, git, options) => {
             await (0, utils_1.execLocally)(`git remote add buddy ${remote}`, {
                 cwd: path,
             });
-            output_1.default.okSign();
-            output_1.default.normal('Remote ', false);
-            output_1.default.cyan('buddy ', false);
-            output_1.default.normal('set to ', false);
-            output_1.default.cyan(remote);
+            if (!json) {
+                output_1.default.okSign();
+                output_1.default.normal('Remote ', false);
+                output_1.default.cyan('buddy ', false);
+                output_1.default.normal('set to ', false);
+                output_1.default.cyan(remote);
+            }
         }
         else if (opt === 'origin') {
             await (0, utils_1.execLocally)(`git remote rm origin`, {
@@ -139,12 +163,14 @@ const initRepo = async (workspace, project, path, git, options) => {
             await (0, utils_1.execLocally)(`git remote add origin ${remote}`, {
                 cwd: path,
             });
-            output_1.default.okSign();
-            output_1.default.normal('Origin replaced with ', false);
-            output_1.default.cyan(remote);
+            if (!json) {
+                output_1.default.okSign();
+                output_1.default.normal('Origin replaced with ', false);
+                output_1.default.cyan(remote);
+            }
         }
         else {
-            return;
+            return data;
         }
     }
     await (0, utils_1.execLocally)('git config --replace-all credential.helper ""', {
@@ -153,6 +179,7 @@ const initRepo = async (workspace, project, path, git, options) => {
     await (0, utils_1.execLocally)("git config --add credential.helper '!bdy project git credential'", {
         cwd: path,
     });
+    return data;
 };
 const checkPath = async (dir, options) => {
     const ProjectCfg = require('../../project/cfg').default;
@@ -176,13 +203,17 @@ const checkPath = async (dir, options) => {
         }
     }
     if (ProjectCfg.exists(path)) {
-        output_1.default.yellow(texts_1.TXT_COMMAND_PROJECT_LINK_DIR_LINKED);
+        if (json)
+            output_1.default.noteWarning(texts_1.TXT_COMMAND_PROJECT_LINK_DIR_LINKED);
+        else
+            output_1.default.yellow(texts_1.TXT_COMMAND_PROJECT_LINK_DIR_LINKED);
         let relink = options.relink;
         if (!relink) {
-            relink = await output_1.default.confirm(texts_1.TXT_COMMAND_PROJECT_LINK_DIR_CONFIRM);
+            relink = await output_1.default.confirm(texts_1.TXT_COMMAND_PROJECT_LINK_DIR_CONFIRM, json);
         }
+        // declined: nothing was linked
         if (!relink)
-            output_1.default.exitNormal();
+            output_1.default.exitResult(json, null);
     }
     const children = await node_fs_1.default.promises.readdir(path);
     const git = !!children.find((name) => name === '.git');
@@ -199,12 +230,17 @@ const createOrGetProject = async (path, options) => {
             url = String(response.html_url || '');
         }
         catch {
-            output_1.default.yellow((0, texts_1.TXT_COMMAND_PROJECT_LINK_NOT_FOUND)(project));
+            if (json)
+                output_1.default.noteWarning((0, texts_1.TXT_COMMAND_PROJECT_LINK_NOT_FOUND)(project));
+            else
+                output_1.default.yellow((0, texts_1.TXT_COMMAND_PROJECT_LINK_NOT_FOUND)(project));
             const response = await client.createProject(workspace, {
                 display_name: project,
             });
-            output_1.default.okSign();
-            output_1.default.normal(texts_1.TXT_COMMAND_PROJECT_CREATED);
+            if (!json) {
+                output_1.default.okSign();
+                output_1.default.normal(texts_1.TXT_COMMAND_PROJECT_CREATED);
+            }
             project = String(response.name || '');
             url = String(response.html_url || '');
         }
@@ -227,8 +263,10 @@ const createOrGetProject = async (path, options) => {
             const response = await client.createProject(workspace, {
                 display_name: name,
             });
-            output_1.default.okSign();
-            output_1.default.normal(texts_1.TXT_COMMAND_PROJECT_CREATED);
+            if (!json) {
+                output_1.default.okSign();
+                output_1.default.normal(texts_1.TXT_COMMAND_PROJECT_CREATED);
+            }
             project = String(response.name || '');
             url = String(response.html_url || '');
         }

package/distTs/src/command/project/list.js

@@ -8,6 +8,7 @@ const texts_1 = require("../../texts");
 const utils_1 = require("../../utils");
 const input_1 = __importDefault(require("../../input"));
 const commandProjectList = (0, utils_1.newCommand)('list', texts_1.DESC_COMMAND_PROJECT_LIST, {
+    requiredScopes: [utils_1.REST_API_SCOPE.PROJECT_READ],
     helpText: texts_1.HELP_PROJECT_LIST_PAGINATION,
 });
 commandProjectList.option('-w, --workspace <domain>', texts_1.OPTION_REST_API_WORKSPACE);

package/distTs/src/command/project/open.js

@@ -8,14 +8,16 @@ const texts_1 = require("../../texts");
 const input_1 = __importDefault(require("../../input"));
 const output_1 = __importDefault(require("../../output"));
 const commandProjectOpen = (0, utils_1.newCommand)('open', texts_1.DESC_COMMAND_RESOURCE_OPEN, {
+    requiredScopes: [utils_1.REST_API_SCOPE.PROJECT_READ],
     examples: [{ description: 'Open a project in Buddy', command: 'bdy project open my-project' }],
 });
 commandProjectOpen.option('-w, --workspace <domain>', texts_1.OPTION_REST_API_WORKSPACE);
+commandProjectOpen.option('--format <text|json>', texts_1.OPTION_FORMAT);
 commandProjectOpen.argument('<name>', texts_1.OPTION_REST_API_PROJECT);
 commandProjectOpen.action(async (name, options) => {
     const workspace = input_1.default.restApiWorkspace(options.workspace);
     const client = input_1.default.restApiTokenClient();
     const project = await client.getProject(workspace, name);
-    await output_1.default.openUrl(project.html_url);
+    await output_1.default.openUrl(project.html_url, options.format === 'json');
 });
 exports.default = commandProjectOpen;

package/distTs/src/command/register.js

@@ -7,13 +7,14 @@ const utils_1 = require("../utils");
 const texts_1 = require("../texts");
 const output_1 = __importDefault(require("../output"));
 const login_1 = require("./login");
-const commandRegister = (0, utils_1.newCommand)('register', texts_1.DESC_COMMAND_REGISTER);
+const commandRegister = (0, utils_1.newCommand)('register', texts_1.DESC_COMMAND_REGISTER, { requiredScopes: [] });
 commandRegister.usesDefaultContext = true;
 commandRegister.alias('sign-up');
 commandRegister.option('--api <url>', texts_1.OPTION_REST_API_ENDPOINT);
 commandRegister.option('--region <region>', texts_1.OPTION_REST_API_REGION);
 commandRegister.option('-e, --email <email>', texts_1.OPT_COMMAND_REGISTER_EMAIL);
 commandRegister.option('-n, --name <name>', texts_1.OPT_COMMAND_REGISTER_NAME);
+commandRegister.option('--format <text|json>', texts_1.OPTION_FORMAT);
 commandRegister.action(async (options) => {
     output_1.default.handleSignals();
     let email = options.email;

package/distTs/src/command/sandbox/app/add.js

@@ -8,6 +8,7 @@ const texts_1 = require("../../../texts");
 const input_1 = __importDefault(require("../../../input"));
 const output_1 = __importDefault(require("../../../output"));
 const commandSandboxAppAdd = (0, utils_1.newCommand)('add', texts_1.DESC_COMMAND_SANDBOX_APP_ADD, {
+    requiredScopes: [utils_1.REST_API_SCOPE.SANDBOX_WRITE],
     examples: texts_1.EXAMPLE_SANDBOX_APP_ADD,
     helpText: texts_1.HELP_SANDBOX_APP_ADD_JSON,
 });

package/distTs/src/command/sandbox/app/list.js

@@ -7,7 +7,7 @@ const utils_1 = require("../../../utils");
 const texts_1 = require("../../../texts");
 const input_1 = __importDefault(require("../../../input"));
 const output_1 = __importDefault(require("../../../output"));
-const commandSandboxAppList = (0, utils_1.newCommand)('list', texts_1.DESC_COMMAND_SANDBOX_APP_LIST, { examples: texts_1.EXAMPLE_SANDBOX_APP_LIST });
+const commandSandboxAppList = (0, utils_1.newCommand)('list', texts_1.DESC_COMMAND_SANDBOX_APP_LIST, { requiredScopes: [utils_1.REST_API_SCOPE.SANDBOX_READ], examples: texts_1.EXAMPLE_SANDBOX_APP_LIST });
 commandSandboxAppList.alias('ls');
 (0, utils_1.sandboxScopeOptions)(commandSandboxAppList);
 commandSandboxAppList.option('--format <text|json>', texts_1.OPTION_FORMAT);

package/distTs/src/command/sandbox/app/logs.js

@@ -7,7 +7,7 @@ const utils_1 = require("../../../utils");
 const texts_1 = require("../../../texts");
 const input_1 = __importDefault(require("../../../input"));
 const output_1 = __importDefault(require("../../../output"));
-const commandSandboxAppLogs = (0, utils_1.newCommand)('logs', texts_1.DESC_COMMAND_SANDBOX_APP_LOGS, { examples: texts_1.EXAMPLE_SANDBOX_APP_LOGS });
+const commandSandboxAppLogs = (0, utils_1.newCommand)('logs', texts_1.DESC_COMMAND_SANDBOX_APP_LOGS, { requiredScopes: [utils_1.REST_API_SCOPE.SANDBOX_READ], examples: texts_1.EXAMPLE_SANDBOX_APP_LOGS });
 commandSandboxAppLogs.hideVersionUpdate = true;
 (0, utils_1.sandboxScopeOptions)(commandSandboxAppLogs);
 commandSandboxAppLogs.option('-l, --limit <lines>', texts_1.OPTION_SANDBOX_LOGS_LIMIT);

package/distTs/src/command/sandbox/app/remove.js

@@ -7,20 +7,21 @@ const utils_1 = require("../../../utils");
 const texts_1 = require("../../../texts");
 const input_1 = __importDefault(require("../../../input"));
 const output_1 = __importDefault(require("../../../output"));
-const commandSandboxAppRemove = (0, utils_1.newCommand)('remove', texts_1.DESC_COMMAND_SANDBOX_APP_REMOVE, { examples: texts_1.EXAMPLE_SANDBOX_APP_REMOVE });
+const commandSandboxAppRemove = (0, utils_1.newCommand)('remove', texts_1.DESC_COMMAND_SANDBOX_APP_REMOVE, { requiredScopes: [utils_1.REST_API_SCOPE.SANDBOX_WRITE], examples: texts_1.EXAMPLE_SANDBOX_APP_REMOVE });
 commandSandboxAppRemove.alias('rm');
 (0, utils_1.sandboxScopeOptions)(commandSandboxAppRemove);
 commandSandboxAppRemove.argument('<identifier>', texts_1.OPTION_SANDBOX_IDENTIFIER);
 commandSandboxAppRemove.argument('<app-id>', texts_1.OPTION_SANDBOX_APP_ID);
+commandSandboxAppRemove.option('--format <text|json>', texts_1.OPTION_FORMAT);
 commandSandboxAppRemove.action(async (identifier, appId, options) => {
     const workspace = input_1.default.restApiWorkspace(options.workspace);
     const client = input_1.default.restApiTokenClient();
     const sandboxId = await input_1.default.sandboxId(client, workspace, options, identifier);
     const sandbox = await client.getSandbox(workspace, sandboxId);
     const apps = (sandbox.apps || []).filter((app) => app.id !== appId);
-    await client.updateSandbox(workspace, sandboxId, {
+    const result = await client.updateSandbox(workspace, sandboxId, {
         apps,
     });
-    output_1.default.exitSuccess(texts_1.TXT_SANDBOX_APP_REMOVED);
+    output_1.default.exitResult(options.format === 'json', result, texts_1.TXT_SANDBOX_APP_REMOVED);
 });
 exports.default = commandSandboxAppRemove;

package/distTs/src/command/sandbox/app/start.js

@@ -7,15 +7,16 @@ const utils_1 = require("../../../utils");
 const texts_1 = require("../../../texts");
 const input_1 = __importDefault(require("../../../input"));
 const output_1 = __importDefault(require("../../../output"));
-const commandSandboxAppStart = (0, utils_1.newCommand)('start', texts_1.DESC_COMMAND_SANDBOX_APP_START, { examples: texts_1.EXAMPLE_SANDBOX_APP_START });
+const commandSandboxAppStart = (0, utils_1.newCommand)('start', texts_1.DESC_COMMAND_SANDBOX_APP_START, { requiredScopes: [utils_1.REST_API_SCOPE.SANDBOX_WRITE], examples: texts_1.EXAMPLE_SANDBOX_APP_START });
 (0, utils_1.sandboxScopeOptions)(commandSandboxAppStart);
 commandSandboxAppStart.argument('<identifier>', texts_1.OPTION_SANDBOX_IDENTIFIER);
 commandSandboxAppStart.argument('<app-id>', texts_1.OPTION_SANDBOX_APP_ID);
+commandSandboxAppStart.option('--format <text|json>', texts_1.OPTION_FORMAT);
 commandSandboxAppStart.action(async (identifier, appId, options) => {
     const workspace = input_1.default.restApiWorkspace(options.workspace);
     const client = input_1.default.restApiTokenClient();
     const sandboxId = await input_1.default.sandboxId(client, workspace, options, identifier);
-    await client.startSandboxApp(workspace, sandboxId, appId);
-    output_1.default.exitSuccess(texts_1.TXT_SANDBOX_APP_STARTED);
+    const result = await client.startSandboxApp(workspace, sandboxId, appId);
+    output_1.default.exitResult(options.format === 'json', result, texts_1.TXT_SANDBOX_APP_STARTED);
 });
 exports.default = commandSandboxAppStart;

package/distTs/src/command/sandbox/app/status.js

@@ -3,11 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const cliError_1 = __importDefault(require("../../../cliError"));
 const utils_1 = require("../../../utils");
 const texts_1 = require("../../../texts");
 const input_1 = __importDefault(require("../../../input"));
 const output_1 = __importDefault(require("../../../output"));
-const commandSandboxAppStatus = (0, utils_1.newCommand)('status', texts_1.DESC_COMMAND_SANDBOX_APP_STATUS, { examples: texts_1.EXAMPLE_SANDBOX_APP_STATUS });
+const commandSandboxAppStatus = (0, utils_1.newCommand)('status', texts_1.DESC_COMMAND_SANDBOX_APP_STATUS, { requiredScopes: [utils_1.REST_API_SCOPE.SANDBOX_READ], examples: texts_1.EXAMPLE_SANDBOX_APP_STATUS });
 (0, utils_1.sandboxScopeOptions)(commandSandboxAppStatus);
 commandSandboxAppStatus.option('--format <text|json>', texts_1.OPTION_FORMAT);
 commandSandboxAppStatus.argument('<identifier>', texts_1.OPTION_SANDBOX_IDENTIFIER);
@@ -19,7 +20,7 @@ commandSandboxAppStatus.action(async (identifier, appId, options) => {
     const { apps, } = await client.getSandbox(workspace, sandboxId);
     const app = (apps || []).find((app) => app.id === appId);
     if (!app) {
-        output_1.default.exitError(texts_1.ERR_SANDBOX_APP_NOT_FOUND);
+        output_1.default.exitError(new cliError_1.default('not_found', texts_1.ERR_SANDBOX_APP_NOT_FOUND, texts_1.HINT_SANDBOX_APP_LIST));
     }
     if (options.format === 'json') {
         output_1.default.json(app);

package/distTs/src/command/sandbox/app/stop.js

@@ -7,15 +7,16 @@ const utils_1 = require("../../../utils");
 const texts_1 = require("../../../texts");
 const input_1 = __importDefault(require("../../../input"));
 const output_1 = __importDefault(require("../../../output"));
-const commandSandboxAppStop = (0, utils_1.newCommand)('stop', texts_1.DESC_COMMAND_SANDBOX_APP_STOP, { examples: texts_1.EXAMPLE_SANDBOX_APP_STOP });
+const commandSandboxAppStop = (0, utils_1.newCommand)('stop', texts_1.DESC_COMMAND_SANDBOX_APP_STOP, { requiredScopes: [utils_1.REST_API_SCOPE.SANDBOX_WRITE], examples: texts_1.EXAMPLE_SANDBOX_APP_STOP });
 (0, utils_1.sandboxScopeOptions)(commandSandboxAppStop);
 commandSandboxAppStop.argument('<identifier>', texts_1.OPTION_SANDBOX_IDENTIFIER);
 commandSandboxAppStop.argument('<app-id>', texts_1.OPTION_SANDBOX_APP_ID);
+commandSandboxAppStop.option('--format <text|json>', texts_1.OPTION_FORMAT);
 commandSandboxAppStop.action(async (identifier, appId, options) => {
     const workspace = input_1.default.restApiWorkspace(options.workspace);
     const client = input_1.default.restApiTokenClient();
     const sandboxId = await input_1.default.sandboxId(client, workspace, options, identifier);
-    await client.stopSandboxApp(workspace, sandboxId, appId);
-    output_1.default.exitSuccess(texts_1.TXT_SANDBOX_APP_STOPPED);
+    const result = await client.stopSandboxApp(workspace, sandboxId, appId);
+    output_1.default.exitResult(options.format === 'json', result, texts_1.TXT_SANDBOX_APP_STOPPED);
 });
 exports.default = commandSandboxAppStop;

package/distTs/src/command/sandbox/cp.js

@@ -12,6 +12,7 @@ const node_fs_1 = __importDefault(require("node:fs"));
 const promises_1 = __importDefault(require("node:stream/promises"));
 const picomatch_1 = __importDefault(require("picomatch"));
 const commandSandboxCp = (0, utils_1.newCommand)('cp', texts_1.DESC_COMMAND_SANDBOX_CP, {
+    requiredScopes: [utils_1.REST_API_SCOPE.SANDBOX_READ, utils_1.REST_API_SCOPE.SANDBOX_WRITE],
     examples: texts_1.EXAMPLE_SANDBOX_CP,
 });
 (0, utils_1.sandboxScopeOptions)(commandSandboxCp);
@@ -19,9 +20,12 @@ commandSandboxCp.option('-m, --merge', texts_1.OPTION_SANDBOX_CP_DOWNLOAD_MERGE)
 commandSandboxCp.option('-r, --replace', texts_1.OPTION_SANDBOX_CP_DOWNLOAD_REPLACE);
 commandSandboxCp.option('-u, --user <user>', texts_1.OPTION_SANDBOX_CP_USER);
 commandSandboxCp.option('--ignore <patterns...>', texts_1.OPTION_SANDBOX_CP_IGNORE);
+commandSandboxCp.option('--format <text|json>', texts_1.OPTION_FORMAT);
 commandSandboxCp.argument('<source>', texts_1.OPTION_SANDBOX_CP_SOURCE);
 commandSandboxCp.argument('<destination>', texts_1.OPTION_SANDBOX_CP_DEST);
-const upload = async (client, workspace, options, source, destination, ignore, userName) => {
+const exitCopied = (json, files, source, destination) => output_1.default.exitResult(json, { files, source, destination }, (0, texts_1.TXT_SANDBOX_CP_DONE)(files));
+const upload = async (client, workspace, options, source, destination, ignore, json, userName) => {
+    const say = output_1.default.progress(json);
     const { fdir } = require('fdir');
     const { sourcePath, sourceStats } = input_1.default.restApiSandboxUploadSourcePath(source);
     const { identifier, remotePath, isRemoteDir } = input_1.default.restApiSandboxUploadDestinationPath(destination);
@@ -30,10 +34,10 @@ const upload = async (client, workspace, options, source, destination, ignore, u
     if (sourceStats.isFile()) {
         // Single file copy
         const name = (0, path_1.basename)(sourcePath);
-        output_1.default.normal((0, texts_1.TXT_SANDBOX_CP_PROGRESS)(1, 1, name));
+        say((0, texts_1.TXT_SANDBOX_CP_PROGRESS)(1, 1, name));
         const remoteFile = isRemoteDir ? (0, path_1.join)(remotePath, name) : remotePath;
         await client.sandboxUploadFile(workspace, sandboxId, remoteFile, sourcePath, userName);
-        output_1.default.exitSuccess((0, texts_1.TXT_SANDBOX_CP_DONE)(1));
+        exitCopied(json, 1, source, destination);
     }
     else if (sourceStats.isDirectory()) {
         // Directory copy - get all files recursively
@@ -42,9 +46,9 @@ const upload = async (client, workspace, options, source, destination, ignore, u
             ? all.filter((p) => !isIgnored((0, path_1.relative)(sourcePath, p).replace(/\\/g, '/')))
             : all;
         if (files.length === 0) {
-            output_1.default.exitSuccess((0, texts_1.TXT_SANDBOX_CP_DONE)(0));
+            exitCopied(json, 0, source, destination);
         }
-        output_1.default.normal('');
+        say('');
         const baseRemoteDir = isRemoteDir
             ? (0, path_1.join)(remotePath, (0, path_1.basename)(sourcePath))
             : remotePath;
@@ -52,33 +56,32 @@ const upload = async (client, workspace, options, source, destination, ignore, u
             const localFile = files[i];
             const relativePath = (0, path_1.relative)(sourcePath, localFile);
             const remoteFile = (0, path_1.join)(baseRemoteDir, relativePath).replace(/\\/g, '/');
-            output_1.default.clearPreviousLine();
-            output_1.default.normal((0, texts_1.TXT_SANDBOX_CP_PROGRESS)(i + 1, files.length, relativePath));
+            say((0, texts_1.TXT_SANDBOX_CP_PROGRESS)(i + 1, files.length, relativePath), true, true);
             await client.sandboxUploadFile(workspace, sandboxId, remoteFile, localFile, userName);
         }
-        output_1.default.exitSuccess((0, texts_1.TXT_SANDBOX_CP_DONE)(files.length));
+        exitCopied(json, files.length, source, destination);
     }
     else {
         output_1.default.exitError((0, texts_1.ERR_SANDBOX_CP_SOURCE_NOT_FOUND)(source));
     }
 };
-const download = async (client, workspace, options, source, destination, merge, replace) => {
+const download = async (client, workspace, options, source, destination, merge, replace, json) => {
+    const say = output_1.default.progress(json);
     const { v4 } = require('uuid');
     const ArchiverExtract = require('../../unzipper').default;
     const { UNZIPPER_FORMAT } = require('../../unzipper');
     const { destPath, isDestPathDir } = input_1.default.restApiSandboxDownloadDestinationPath(destination, merge, replace);
     const { sourcePath, identifier } = input_1.default.restApiSandboxDownloadSourcePath(source);
     const sandboxId = await input_1.default.sandboxId(client, workspace, options, identifier);
-    output_1.default.normal(texts_1.TXT_SANDBOX_CP_DOWNLOAD, false);
+    say(texts_1.TXT_SANDBOX_CP_DOWNLOAD, false);
     const { body, headers } = await client.sandboxDownloadFile(workspace, sandboxId, sourcePath);
     const isFile = headers['content-type'] === 'application/octet-stream';
     const name = (0, path_1.basename)(sourcePath);
     if (isFile) {
         const destFilePath = isDestPathDir ? (0, path_1.join)(destPath, name) : destPath;
         await node_fs_1.default.promises.writeFile(destFilePath, body);
-        output_1.default.clearPreviousLine();
-        output_1.default.normal(texts_1.TXT_SANDBOX_CP_DOWNLOAD_DONE);
-        output_1.default.exitSuccess((0, texts_1.TXT_SANDBOX_CP_DONE)(1));
+        say(texts_1.TXT_SANDBOX_CP_DOWNLOAD_DONE, true, true);
+        exitCopied(json, 1, source, destination);
     }
     else {
         const destDirPath = isDestPathDir ? (0, path_1.join)(destPath, name) : destPath;
@@ -93,19 +96,16 @@ const download = async (client, workspace, options, source, destination, merge,
         };
         try {
             await promises_1.default.pipeline(body, node_fs_1.default.createWriteStream(zipPath));
-            output_1.default.clearPreviousLine();
-            output_1.default.normal(texts_1.TXT_SANDBOX_CP_DOWNLOAD_DONE);
-            output_1.default.normal(texts_1.TXT_SANDBOX_UNZIP);
+            say(texts_1.TXT_SANDBOX_CP_DOWNLOAD_DONE, true, true);
+            say(texts_1.TXT_SANDBOX_UNZIP);
             let count = 0;
             await ArchiverExtract.extract(UNZIPPER_FORMAT.TAR_GZ, zipPath, destDirPath, async () => {
                 count += 1;
-                output_1.default.clearPreviousLine();
-                output_1.default.normal((0, texts_1.TXT_SANDBOX_UNZIPPING_COUNT)(count));
+                say((0, texts_1.TXT_SANDBOX_UNZIPPING_COUNT)(count), true, true);
             });
             clearZip();
-            output_1.default.clearPreviousLine();
-            output_1.default.normal(texts_1.TXT_SANDBOX_UNZIP_DONE);
-            output_1.default.exitSuccess((0, texts_1.TXT_SANDBOX_CP_DONE)(count));
+            say(texts_1.TXT_SANDBOX_UNZIP_DONE, true, true);
+            exitCopied(json, count, source, destination);
         }
         catch {
             clearZip();
@@ -118,10 +118,10 @@ commandSandboxCp.action(async (source, destination, options) => {
     const client = input_1.default.restApiTokenClient();
     const isUpload = input_1.default.restApiSandboxIsUpload(destination);
     if (isUpload) {
-        await upload(client, workspace, options, source, destination, options.ignore || [], options.user);
+        await upload(client, workspace, options, source, destination, options.ignore || [], options.format === 'json', options.user);
     }
     else {
-        await download(client, workspace, options, source, destination, !!options.merge, !!options.replace);
+        await download(client, workspace, options, source, destination, !!options.merge, !!options.replace, options.format === 'json');
     }
 });
 exports.default = commandSandboxCp;

package/distTs/src/command/sandbox/create.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const cliError_1 = __importDefault(require("../../cliError"));
 const utils_1 = require("../../utils");
 const texts_1 = require("../../texts");
 const output_1 = __importDefault(require("../../output"));
@@ -23,6 +24,7 @@ const VALID_RESOURCES = [
     '12x24',
 ];
 const commandSandboxCreate = (0, utils_1.newCommand)('create', texts_1.DESC_COMMAND_SANDBOX_CREATE, {
+    requiredScopes: [utils_1.REST_API_SCOPE.SANDBOX_WRITE],
     examples: [...texts_1.EXAMPLE_SANDBOX_CREATE, ...texts_1.EXAMPLE_SANDBOX_ENDPOINT_CREATE],
 });
 commandSandboxCreate.alias('add');
@@ -107,7 +109,7 @@ commandSandboxCreate.action(async (options) => {
             const snapshots = snapshotsResult.snapshots || [];
             const foundSnapshot = snapshots.find((s) => s.name === options.snapshot);
             if (!foundSnapshot) {
-                output_1.default.exitError(texts_1.ERR_SANDBOX_SNAPSHOT_NOT_FOUND);
+                output_1.default.exitError(new cliError_1.default('not_found', texts_1.ERR_SANDBOX_SNAPSHOT_NOT_FOUND, texts_1.HINT_SANDBOX_SNAPSHOT_LIST));
             }
             body.snapshot_id = foundSnapshot.id;
         }

package/distTs/src/command/sandbox/destroy.js

@@ -7,19 +7,21 @@ const utils_1 = require("../../utils");
 const texts_1 = require("../../texts");
 const output_1 = __importDefault(require("../../output"));
 const input_1 = __importDefault(require("../../input"));
-const commandSandboxDestroy = (0, utils_1.newCommand)('destroy', texts_1.DESC_COMMAND_SANDBOX_DESTROY);
+const commandSandboxDestroy = (0, utils_1.newCommand)('destroy', texts_1.DESC_COMMAND_SANDBOX_DESTROY, { requiredScopes: [utils_1.REST_API_SCOPE.SANDBOX_MANAGE] });
 commandSandboxDestroy.aliases(['delete', 'rm']);
 (0, utils_1.sandboxScopeOptions)(commandSandboxDestroy);
 commandSandboxDestroy.option('-f, --force', texts_1.OPTION_CONFIRM_FORCE);
+commandSandboxDestroy.option('--format <text|json>', texts_1.OPTION_FORMAT);
 commandSandboxDestroy.argument('<identifier>', texts_1.OPTION_SANDBOX_IDENTIFIER);
 commandSandboxDestroy.action(async (identifier, options) => {
     const workspace = input_1.default.restApiWorkspace(options.workspace);
     const client = input_1.default.restApiTokenClient();
     const sandboxId = await input_1.default.sandboxId(client, workspace, options, identifier);
-    const confirmed = await output_1.default.confirmDestructive(options.force, (0, texts_1.TXT_SANDBOX_DESTROY_CONFIRM)(identifier));
+    const json = options.format === 'json';
+    const confirmed = await output_1.default.confirmDestructive(options.force, (0, texts_1.TXT_SANDBOX_DESTROY_CONFIRM)(identifier), json);
     if (!confirmed)
-        output_1.default.exitNormal();
+        output_1.default.exitResult(json, { deleted: null });
     await client.deleteSandbox(workspace, sandboxId);
-    output_1.default.exitSuccess((0, texts_1.TXT_SANDBOX_DESTROYED)(identifier));
+    output_1.default.exitResult(json, { deleted: identifier }, (0, texts_1.TXT_SANDBOX_DESTROYED)(identifier));
 });
 exports.default = commandSandboxDestroy;

package/distTs/src/command/sandbox/endpoint/add.js

@@ -8,7 +8,7 @@ const texts_1 = require("../../../texts");
 const output_1 = __importDefault(require("../../../output"));
 const input_1 = __importDefault(require("../../../input"));
 const tunnel_1 = require("../../../types/tunnel");
-const commandSandboxEndpointAdd = (0, utils_1.getBasicCommandSandboxEndpoint)('add', texts_1.DESC_COMMAND_SANDBOX_ENDPOINT_ADD, { examples: texts_1.EXAMPLE_SANDBOX_ENDPOINT_CREATE });
+const commandSandboxEndpointAdd = (0, utils_1.getBasicCommandSandboxEndpoint)('add', texts_1.DESC_COMMAND_SANDBOX_ENDPOINT_ADD, { requiredScopes: [utils_1.REST_API_SCOPE.SANDBOX_WRITE], examples: texts_1.EXAMPLE_SANDBOX_ENDPOINT_CREATE });
 commandSandboxEndpointAdd.alias('create');
 commandSandboxEndpointAdd.option('--format <text|json>', texts_1.OPTION_FORMAT);
 commandSandboxEndpointAdd.action(async (identifier, options) => {

package/distTs/src/command/sandbox/endpoint/delete.js

@@ -3,14 +3,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const cliError_1 = __importDefault(require("../../../cliError"));
 const utils_1 = require("../../../utils");
 const texts_1 = require("../../../texts");
 const output_1 = __importDefault(require("../../../output"));
 const input_1 = __importDefault(require("../../../input"));
-const commandSandboxEndpointDelete = (0, utils_1.newCommand)('delete', texts_1.DESC_COMMAND_SANDBOX_ENDPOINT_DELETE, { examples: texts_1.EXAMPLE_SANDBOX_ENDPOINT_DELETE });
+const commandSandboxEndpointDelete = (0, utils_1.newCommand)('delete', texts_1.DESC_COMMAND_SANDBOX_ENDPOINT_DELETE, { requiredScopes: [utils_1.REST_API_SCOPE.SANDBOX_WRITE], examples: texts_1.EXAMPLE_SANDBOX_ENDPOINT_DELETE });
 commandSandboxEndpointDelete.alias('rm');
 (0, utils_1.sandboxScopeOptions)(commandSandboxEndpointDelete);
 commandSandboxEndpointDelete.option('-f, --force', texts_1.OPTION_CONFIRM_FORCE);
+commandSandboxEndpointDelete.option('--format <text|json>', texts_1.OPTION_FORMAT);
 commandSandboxEndpointDelete.argument('<identifier>', texts_1.OPTION_SANDBOX_IDENTIFIER);
 commandSandboxEndpointDelete.argument('<endpoint-name>', texts_1.OPTION_SANDBOX_ENDPOINT_NAME_ARG);
 commandSandboxEndpointDelete.action(async (identifier, endpointName, options) => {
@@ -21,15 +23,16 @@ commandSandboxEndpointDelete.action(async (identifier, endpointName, options) =>
     const endpoints = sandbox.endpoints || [];
     const endpointIndex = endpoints.findIndex((ep) => ep.name === endpointName);
     if (endpointIndex === -1) {
-        output_1.default.exitError(texts_1.ERR_SANDBOX_ENDPOINT_NOT_FOUND);
+        output_1.default.exitError(new cliError_1.default('not_found', texts_1.ERR_SANDBOX_ENDPOINT_NOT_FOUND, texts_1.HINT_SANDBOX_ENDPOINT_LIST));
     }
     const updatedEndpoints = endpoints.filter((ep) => ep.name !== endpointName);
-    const confirmed = await output_1.default.confirmDestructive(options.force, (0, texts_1.TXT_SANDBOX_ENDPOINT_DELETE_CONFIRM)(identifier, endpointName));
+    const json = options.format === 'json';
+    const confirmed = await output_1.default.confirmDestructive(options.force, (0, texts_1.TXT_SANDBOX_ENDPOINT_DELETE_CONFIRM)(identifier, endpointName), json);
     if (!confirmed)
-        output_1.default.exitNormal();
-    await client.updateSandbox(workspace, sandboxId, {
+        output_1.default.exitResult(json, { deleted: null });
+    const result = await client.updateSandbox(workspace, sandboxId, {
         endpoints: updatedEndpoints,
     });
-    output_1.default.exitSuccess((0, texts_1.TXT_SANDBOX_ENDPOINT_DELETED)(endpointName));
+    output_1.default.exitResult(json, result, (0, texts_1.TXT_SANDBOX_ENDPOINT_DELETED)(endpointName));
 });
 exports.default = commandSandboxEndpointDelete;

package/distTs/src/command/sandbox/endpoint/get.js

@@ -3,11 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const cliError_1 = __importDefault(require("../../../cliError"));
 const utils_1 = require("../../../utils");
 const texts_1 = require("../../../texts");
 const output_1 = __importDefault(require("../../../output"));
 const input_1 = __importDefault(require("../../../input"));
-const commandSandboxEndpointGet = (0, utils_1.newCommand)('get', texts_1.DESC_COMMAND_SANDBOX_ENDPOINT_GET, { examples: texts_1.EXAMPLE_SANDBOX_ENDPOINT_GET });
+const commandSandboxEndpointGet = (0, utils_1.newCommand)('get', texts_1.DESC_COMMAND_SANDBOX_ENDPOINT_GET, { requiredScopes: [utils_1.REST_API_SCOPE.SANDBOX_READ], examples: texts_1.EXAMPLE_SANDBOX_ENDPOINT_GET });
 (0, utils_1.sandboxScopeOptions)(commandSandboxEndpointGet);
 commandSandboxEndpointGet.option('--format <text|json>', texts_1.OPTION_FORMAT);
 commandSandboxEndpointGet.argument('<identifier>', texts_1.OPTION_SANDBOX_IDENTIFIER);
@@ -20,7 +21,7 @@ commandSandboxEndpointGet.action(async (identifier, endpointName, options) => {
     const endpoints = sandbox.endpoints || [];
     const endpoint = endpoints.find((ep) => ep.name === endpointName);
     if (!endpoint) {
-        output_1.default.exitError(texts_1.ERR_SANDBOX_ENDPOINT_NOT_FOUND);
+        output_1.default.exitError(new cliError_1.default('not_found', texts_1.ERR_SANDBOX_ENDPOINT_NOT_FOUND, texts_1.HINT_SANDBOX_ENDPOINT_LIST));
     }
     if (options.format === 'json') {
         output_1.default.json(endpoint);