bdy 1.25.5-stage → 1.25.7-dev

package/distTs/src/command/pipeline/run/status.js

@@ -6,17 +6,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../../../utils");
 const texts_1 = require("../../../texts");
 const input_1 = __importDefault(require("../../../input"));
-const output_1 = __importDefault(require("../../../output"));
+const execution_1 = require("./execution");
 const commandPipelineRunStatus = (0, utils_1.newCommand)('status', texts_1.DESC_COMMAND_PIPELINE_RUN_STATUS, {
     requiredScopes: [utils_1.REST_API_SCOPE.PIPELINE_READ],
     examples: texts_1.EXAMPLE_PIPELINE_RUN_STATUS,
-    helpText: texts_1.HELP_PIPELINE_RUN_JSONL,
+    helpText: texts_1.HELP_PIPELINE_RUN_STATUS,
 });
 commandPipelineRunStatus.option('-w, --workspace <domain>', texts_1.OPTION_REST_API_WORKSPACE);
 commandPipelineRunStatus.option('-p, --project <name>', texts_1.OPTION_REST_API_PROJECT);
 commandPipelineRunStatus.option('-n, --no-wait', texts_1.OPTION_PIPELINE_RUN_NO_WAIT);
 commandPipelineRunStatus.option('--no-follow', texts_1.OPTION_PIPELINE_RUN_NO_FOLLOW);
-commandPipelineRunStatus.option('--format <text|jsonl>', texts_1.OPTION_FORMAT_JSONL);
+commandPipelineRunStatus.option('--exit-code', texts_1.OPTION_EXEC_EXIT_CODE);
+commandPipelineRunStatus.option('--format <text|jsonl>', texts_1.OPTION_EXEC_FORMAT_JSONL);
 commandPipelineRunStatus.argument('<identifier>', texts_1.OPTION_PIPELINE_IDENTIFIER);
 commandPipelineRunStatus.argument('<run-id>', texts_1.OPTION_PIPELINE_RUN_ID);
 commandPipelineRunStatus.action(async (identifier, runId, options) => {
@@ -24,17 +25,8 @@ commandPipelineRunStatus.action(async (identifier, runId, options) => {
     const project = input_1.default.restApiProject(options.project);
     const client = input_1.default.restApiTokenClient();
     const rid = input_1.default.pipelineRunId(runId);
-    const data = await client.getPipelineByIdentifier(workspace, project, identifier);
-    if (!data || !data.domain) {
-        output_1.default.exitError(texts_1.ERR_WORKSPACE_NOT_FOUND);
-    }
-    if (!data.project_identifier) {
-        output_1.default.exitError(texts_1.ERR_PROJECT_NOT_FOUND);
-    }
-    if (!data.pipeline_id) {
-        output_1.default.exitError(texts_1.ERR_PIPELINE_NOT_FOUND);
-    }
+    const pipelineId = await (0, execution_1.resolvePipelineId)(client, workspace, project, identifier);
     const OutputPipeline = require('../../../output/pipeline').default;
-    await OutputPipeline.runStatus(client, workspace, project, identifier, data.pipeline_id, rid, !options.wait, !options.follow, options.format === 'jsonl');
+    await OutputPipeline.runStatus(client, workspace, project, identifier, pipelineId, rid, !options.wait, !options.follow, options.format === 'jsonl', !!options.exitCode);
 });
 exports.default = commandPipelineRunStatus;

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

@@ -10,6 +10,7 @@ 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);
+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);

package/distTs/src/command/register.js

@@ -8,6 +8,7 @@ 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);
+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);

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

@@ -18,7 +18,8 @@ commandSandboxExecCommand.option('--runtime <runtime>', texts_1.OPTION_SANDBOX_R
 commandSandboxExecCommand.option('--wait', texts_1.OPTION_SANDBOX_WAIT);
 commandSandboxExecCommand.argument('<identifier>', texts_1.OPTION_SANDBOX_IDENTIFIER);
 commandSandboxExecCommand.argument('<command>');
-commandSandboxExecCommand.option('--format <text|jsonl>', texts_1.OPTION_FORMAT_JSONL);
+commandSandboxExecCommand.option('--format <text|jsonl>', texts_1.OPTION_EXEC_FORMAT_JSONL);
+commandSandboxExecCommand.option('--exit-code', texts_1.OPTION_EXEC_EXIT_CODE);
 commandSandboxExecCommand.action(async (identifier, command, options) => {
     output_1.default.handleSignals();
     const workspace = input_1.default.restApiWorkspace(options.workspace);
@@ -35,13 +36,17 @@ commandSandboxExecCommand.action(async (identifier, command, options) => {
     else {
         output_1.default.gray((0, texts_1.TXT_SANDBOX_EXEC_ID)(cmdResult.id));
     }
+    if (options.exitCode)
+        (0, utils_1.executionExitCode)(cmdResult.status);
     if (!options.wait) {
+        if (options.exitCode)
+            (0, finishExec_1.finishSandboxCommand)(cmdResult, identifier, cmdResult.id, options.format === 'jsonl', true, true);
         if (options.format === 'jsonl')
             output_1.default.exitNormal();
         output_1.default.exitSuccess((0, texts_1.TXT_SANDBOX_EXEC_BACKGROUND)(identifier, cmdResult.id));
     }
     else {
-        await (0, finishExec_1.finishExec)(client, workspace, sandboxId, identifier, cmdResult.id, true, options.format === 'jsonl');
+        await (0, finishExec_1.finishExec)(client, workspace, sandboxId, identifier, cmdResult.id, true, options.format === 'jsonl', !!options.exitCode);
     }
 });
 exports.default = commandSandboxExecCommand;

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

@@ -13,12 +13,13 @@ const commandSandboxExecLogs = (0, utils_1.newCommand)('logs', texts_1.DESC_COMM
 commandSandboxExecLogs.option('--wait', texts_1.OPTION_SANDBOX_WAIT);
 commandSandboxExecLogs.argument('<identifier>', texts_1.OPTION_SANDBOX_IDENTIFIER);
 commandSandboxExecLogs.argument('<command-id>', texts_1.OPTION_SANDBOX_COMMAND_ID);
-commandSandboxExecLogs.option('--format <text|jsonl>', texts_1.OPTION_FORMAT_JSONL);
+commandSandboxExecLogs.option('--format <text|jsonl>', texts_1.OPTION_EXEC_FORMAT_JSONL);
+commandSandboxExecLogs.option('--exit-code', texts_1.OPTION_EXEC_EXIT_CODE);
 commandSandboxExecLogs.action(async (identifier, commandId, options) => {
     output_1.default.handleSignals();
     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 (0, finishExec_1.finishExec)(client, workspace, sandboxId, identifier, commandId, !!options.wait, options.format === 'jsonl');
+    await (0, finishExec_1.finishExec)(client, workspace, sandboxId, identifier, commandId, !!options.wait, options.format === 'jsonl', !!options.exitCode);
 });
 exports.default = commandSandboxExecLogs;

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

@@ -7,16 +7,18 @@ const utils_1 = require("../../../utils");
 const texts_1 = require("../../../texts");
 const input_1 = __importDefault(require("../../../input"));
 const output_1 = __importDefault(require("../../../output"));
-const commandSandboxExecStatus = (0, utils_1.newCommand)('status', texts_1.DESC_COMMAND_SANDBOX_EXEC_STATUS, { examples: texts_1.EXAMPLE_SANDBOX_EXEC_STATUS });
+const commandSandboxExecStatus = (0, utils_1.newCommand)('status', texts_1.DESC_COMMAND_SANDBOX_EXEC_STATUS, { examples: texts_1.EXAMPLE_SANDBOX_EXEC_STATUS, helpText: texts_1.HELP_SANDBOX_EXEC_STATUS });
 (0, utils_1.sandboxScopeOptions)(commandSandboxExecStatus);
-commandSandboxExecStatus.option('--format <text|json>', texts_1.OPTION_FORMAT);
+commandSandboxExecStatus.option('--format <text|json>', texts_1.OPTION_EXEC_FORMAT_JSON);
 commandSandboxExecStatus.argument('<identifier>', texts_1.OPTION_SANDBOX_IDENTIFIER);
 commandSandboxExecStatus.argument('<command-id>', texts_1.OPTION_SANDBOX_COMMAND_ID);
+commandSandboxExecStatus.option('--exit-code', texts_1.OPTION_EXEC_EXIT_CODE);
 commandSandboxExecStatus.action(async (identifier, commandId, 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 cmd = await client.getSandboxCommand(workspace, sandboxId, commandId);
+    const code = options.exitCode ? (0, utils_1.executionExitCode)(cmd.status) : undefined;
     if (options.format === 'json') {
         output_1.default.json(cmd);
     }
@@ -34,6 +36,8 @@ commandSandboxExecStatus.action(async (identifier, commandId, options) => {
         ];
         output_1.default.table(data);
     }
+    if (code !== undefined)
+        output_1.default.exitCode(code);
     output_1.default.exitNormal();
 });
 exports.default = commandSandboxExecStatus;

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

@@ -4,31 +4,48 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.finishExec = finishExec;
+exports.finishSandboxCommand = finishSandboxCommand;
 const output_1 = __importDefault(require("../../output"));
 const utils_1 = require("../../utils");
 const texts_1 = require("../../texts");
-async function finishExec(client, workspace, sandboxId, identifier, commandId, follow, jsonl) {
+async function finishExec(client, workspace, sandboxId, identifier, commandId, follow, jsonl, semanticExitCode = false) {
     const body = await client.streamSandboxCommandLogs(workspace, sandboxId, commandId, follow);
     await output_1.default.streamCommandLogs(body, jsonl);
     const cmdExit = await client.getSandboxCommand(workspace, sandboxId, commandId);
+    finishSandboxCommand(cmdExit, identifier, commandId, jsonl, semanticExitCode);
+}
+/** Shared final record and process status, including commands started without --wait. */
+function finishSandboxCommand(cmdExit, identifier, commandId, jsonl, semanticExitCode, background = false) {
+    const code = semanticExitCode ? (0, utils_1.executionExitCode)(cmdExit.status) : undefined;
     if (jsonl) {
         output_1.default.json({
             type: 'exit',
             status: cmdExit.status,
             exit_code: cmdExit.exit_code ?? null,
+            ...(semanticExitCode ? { code } : {}),
         });
+        if (code !== undefined)
+            output_1.default.exitCode(code);
         if ([utils_1.SANDBOX_EXEC_STATUS.SUCCESSFUL, utils_1.SANDBOX_EXEC_STATUS.INPROGRESS].includes(cmdExit.status)) {
             output_1.default.exitNormal();
         }
         output_1.default.exitCode(1);
     }
+    if (background) {
+        output_1.default.normal(output_1.default.getGreenColor((0, texts_1.TXT_SANDBOX_EXEC_BACKGROUND)(identifier, commandId)));
+        output_1.default.exitCode(code ?? 0);
+    }
     if (cmdExit.status === utils_1.SANDBOX_EXEC_STATUS.SUCCESSFUL) {
         output_1.default.exitSuccess((0, texts_1.TXT_SANDBOX_EXEC_SUCCESS)(identifier, commandId));
     }
     else if (cmdExit.status === utils_1.SANDBOX_EXEC_STATUS.INPROGRESS) {
+        if (code !== undefined) {
+            output_1.default.normal((0, texts_1.TXT_SANDBOX_EXEC_INPROGRESS)(identifier, commandId));
+            output_1.default.exitCode(code);
+        }
         output_1.default.exitNormal((0, texts_1.TXT_SANDBOX_EXEC_INPROGRESS)(identifier, commandId));
     }
     else {
-        output_1.default.exitError((0, texts_1.TXT_SANDBOX_EXEC_FAILED)(identifier, commandId));
+        output_1.default.exitError((0, texts_1.TXT_SANDBOX_EXEC_FAILED)(identifier, commandId), 1);
     }
 }

package/distTs/src/command/target/exec/command.js

@@ -10,7 +10,7 @@ const output_1 = __importDefault(require("../../../output"));
 const input_1 = __importDefault(require("../../../input"));
 const scope_1 = require("../scope");
 const EXEC_WAIT_MS = 10000;
-const commandTargetExecCommand = (0, utils_1.newCommand)('command', texts_1.DESC_COMMAND_TARGET_EXEC_COMMAND, { examples: texts_1.EXAMPLE_TARGET_EXEC_COMMAND });
+const commandTargetExecCommand = (0, utils_1.newCommand)('command', texts_1.DESC_COMMAND_TARGET_EXEC_COMMAND, { examples: texts_1.EXAMPLE_TARGET_EXEC_COMMAND, helpText: texts_1.HELP_TARGET_EXEC_COMMAND });
 commandTargetExecCommand.alias('cmd');
 commandTargetExecCommand.option('-w, --workspace <domain>', texts_1.OPTION_REST_API_WORKSPACE);
 commandTargetExecCommand.option('-p, --project <name>', texts_1.OPTION_REST_API_PROJECT);
@@ -18,9 +18,10 @@ commandTargetExecCommand.option('--pipeline <identifier>', texts_1.OPTION_TARGET
 commandTargetExecCommand.option('--environment <identifier>', texts_1.OPTION_TARGET_ENVIRONMENT);
 commandTargetExecCommand.option('--async', texts_1.OPTION_TARGET_EXEC_ASYNC);
 commandTargetExecCommand.option('--file <path>', texts_1.OPTION_TARGET_EXEC_FILE);
-commandTargetExecCommand.option('--format <text|json>', texts_1.OPTION_FORMAT);
+commandTargetExecCommand.option('--format <text|json>', texts_1.OPTION_EXEC_FORMAT_JSON);
 commandTargetExecCommand.argument('<identifier>', texts_1.OPTION_TARGET_IDENTIFIER);
 commandTargetExecCommand.argument('[command]', texts_1.OPTION_TARGET_EXEC_COMMAND);
+commandTargetExecCommand.option('--exit-code', texts_1.OPTION_EXEC_EXIT_CODE);
 commandTargetExecCommand.action(async (identifier, command, options) => {
     output_1.default.handleSignals();
     if (options.file && command !== undefined) {
@@ -47,26 +48,38 @@ commandTargetExecCommand.action(async (identifier, command, options) => {
     });
     const execId = exec.execution_id;
     const json = options.format === 'json';
-    if (options.async) {
-        if (json) {
-            output_1.default.json(exec);
-        }
-        else {
+    // Preserve the execution id before status validation can fail.
+    if (!json) {
+        if (options.async) {
             output_1.default.note((0, texts_1.TXT_TARGET_EXEC_BACKGROUND)(execId));
             output_1.default.data(execId);
         }
+        else {
+            output_1.default.note((0, texts_1.TXT_TARGET_EXEC_ID)(execId));
+        }
+    }
+    const recoveryHint = (0, texts_1.TXT_TARGET_EXEC_RECOVERY)(execId);
+    let code = options.exitCode
+        ? (0, utils_1.executionExitCode)(exec.status, recoveryHint)
+        : undefined;
+    if (options.async) {
+        if (json)
+            output_1.default.json(exec);
+        if (code !== undefined)
+            output_1.default.exitCode(code);
         output_1.default.exitNormal();
     }
     if (json) {
         while (exec.status === utils_1.TARGET_EXEC_STATUS.INPROGRESS) {
             exec = await client.getTargetExec(workspace, execId, EXEC_WAIT_MS);
+            if (options.exitCode)
+                code = (0, utils_1.executionExitCode)(exec.status, recoveryHint);
         }
         const log = [];
         await (0, scope_1.forwardExecLog)(client, workspace, execId, 0, (lines) => log.push(...lines));
         output_1.default.json({ ...exec, log });
-        output_1.default.exitCode(exec.status === utils_1.TARGET_EXEC_STATUS.SUCCESSFUL ? 0 : 1);
+        output_1.default.exitCode(code ?? (exec.status === utils_1.TARGET_EXEC_STATUS.SUCCESSFUL ? 0 : 1));
     }
-    output_1.default.note((0, texts_1.TXT_TARGET_EXEC_ID)(execId));
     let offset = 0;
     let truncated = false;
     // bytes_out from the status long-poll tells whether there is anything
@@ -80,6 +93,8 @@ commandTargetExecCommand.action(async (identifier, command, options) => {
     };
     while (exec.status === utils_1.TARGET_EXEC_STATUS.INPROGRESS) {
         exec = await client.getTargetExec(workspace, execId, EXEC_WAIT_MS);
+        if (options.exitCode)
+            (0, utils_1.executionExitCode)(exec.status, recoveryHint);
         if (exec.bytes_out !== loggedBytes)
             await drainLog();
     }
@@ -95,6 +110,6 @@ commandTargetExecCommand.action(async (identifier, command, options) => {
     }
     output_1.default.exitError(exec.status === utils_1.TARGET_EXEC_STATUS.CANCELLED
         ? (0, texts_1.TXT_TARGET_EXEC_CANCELLED)(execId)
-        : (0, texts_1.TXT_TARGET_EXEC_FAILED)(execId, exec.failure_reason));
+        : (0, texts_1.TXT_TARGET_EXEC_FAILED)(execId, exec.failure_reason), 1);
 });
 exports.default = commandTargetExecCommand;

package/distTs/src/command/target/exec/logs.js

@@ -13,7 +13,8 @@ commandTargetExecLogs.option('-w, --workspace <domain>', texts_1.OPTION_REST_API
 commandTargetExecLogs.option('--offset <n>', texts_1.OPTION_TARGET_EXEC_LOG_OFFSET);
 commandTargetExecLogs.option('--limit <n>', texts_1.OPTION_TARGET_EXEC_LOG_LIMIT);
 commandTargetExecLogs.argument('<exec-id>', texts_1.OPTION_TARGET_EXEC_ID);
-commandTargetExecLogs.option('--format <text|jsonl>', texts_1.OPTION_FORMAT_JSONL);
+commandTargetExecLogs.option('--format <text|jsonl>', texts_1.OPTION_EXEC_FORMAT_JSONL);
+commandTargetExecLogs.option('--exit-code', texts_1.OPTION_EXEC_EXIT_CODE);
 commandTargetExecLogs.action(async (execId, options) => {
     const workspace = input_1.default.restApiWorkspace(options.workspace);
     const client = input_1.default.restApiTokenClient();
@@ -24,14 +25,19 @@ commandTargetExecLogs.action(async (execId, options) => {
         : undefined, limit);
     if (truncated)
         output_1.default.noteWarning(texts_1.WARN_TARGET_EXEC_TRUNCATED);
-    if (options.format === 'jsonl') {
+    if (options.format === 'jsonl' || options.exitCode) {
         const exec = await client.getTargetExec(workspace, execId);
-        output_1.default.json({
-            type: 'exit',
-            status: exec.status,
-            exit_code: exec.exit_code ?? null,
-            truncated,
-        });
+        const code = options.exitCode ? (0, utils_1.executionExitCode)(exec.status) : undefined;
+        if (options.format === 'jsonl')
+            output_1.default.json({
+                type: 'exit',
+                status: exec.status,
+                exit_code: exec.exit_code ?? null,
+                truncated,
+                ...(options.exitCode ? { code } : {}),
+            });
+        if (code !== undefined)
+            output_1.default.exitCode(code);
         output_1.default.exitNormal();
     }
     output_1.default.exitNormal();

package/distTs/src/command/target/exec/status.js

@@ -7,14 +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 commandTargetExecStatus = (0, utils_1.newCommand)('status', texts_1.DESC_COMMAND_TARGET_EXEC_STATUS, { examples: texts_1.EXAMPLE_TARGET_EXEC_STATUS });
+const commandTargetExecStatus = (0, utils_1.newCommand)('status', texts_1.DESC_COMMAND_TARGET_EXEC_STATUS, { examples: texts_1.EXAMPLE_TARGET_EXEC_STATUS, helpText: texts_1.HELP_TARGET_EXEC_STATUS });
 commandTargetExecStatus.option('-w, --workspace <domain>', texts_1.OPTION_REST_API_WORKSPACE);
-commandTargetExecStatus.option('--format <text|json>', texts_1.OPTION_FORMAT);
+commandTargetExecStatus.option('--format <text|json>', texts_1.OPTION_EXEC_FORMAT_JSON);
 commandTargetExecStatus.argument('<exec-id>', texts_1.OPTION_TARGET_EXEC_ID);
+commandTargetExecStatus.option('--exit-code', texts_1.OPTION_EXEC_EXIT_CODE);
 commandTargetExecStatus.action(async (execId, options) => {
     const workspace = input_1.default.restApiWorkspace(options.workspace);
     const client = input_1.default.restApiTokenClient();
     const exec = await client.getTargetExec(workspace, execId);
+    const code = options.exitCode ? (0, utils_1.executionExitCode)(exec.status) : undefined;
     if (options.format === 'json') {
         output_1.default.json(exec);
     }
@@ -38,6 +40,8 @@ commandTargetExecStatus.action(async (execId, options) => {
         ];
         output_1.default.table(data);
     }
+    if (code !== undefined)
+        output_1.default.exitCode(code);
     output_1.default.exitNormal();
 });
 exports.default = commandTargetExecStatus;

package/distTs/src/command/target/scope.js

@@ -7,6 +7,7 @@ exports.resolveTargetScope = exports.targetScopeOf = exports.targetAddressOf = e
 const utils_1 = require("../../utils");
 const texts_1 = require("../../texts");
 const output_1 = __importDefault(require("../../output"));
+const cliError_1 = __importDefault(require("../../cliError"));
 const input_1 = __importDefault(require("../../input"));
 // Shared resolve preamble for commands taking a target identifier: line
 // context from flags/env -> /identifiers -> hash id, exiting on a miss.
@@ -30,7 +31,7 @@ const resolveTargetId = async (client, workspace, identifier, options, strictLin
         resolved = await client.getTargetByIdentifier(workspace, identifier);
     }
     if (!resolved.target_id) {
-        output_1.default.exitError(texts_1.ERR_TARGET_NOT_FOUND);
+        throw new cliError_1.default('not_found', texts_1.ERR_TARGET_NOT_FOUND);
     }
     if (strictLine) {
         const requested = options.pipeline
@@ -49,7 +50,7 @@ const resolveTargetId = async (client, workspace, identifier, options, strictLin
                     : (0, exports.targetScopeOf)(target) === utils_1.TARGET_SCOPE.PROJECT &&
                         target.project?.name === resolved.project_identifier;
             if (!matches) {
-                output_1.default.exitError(texts_1.ERR_TARGET_NOT_FOUND);
+                throw new cliError_1.default('not_found', texts_1.ERR_TARGET_NOT_FOUND);
             }
         }
     }

package/distTs/src/command/whoami.js

@@ -5,16 +5,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../utils");
 const texts_1 = require("../texts");
-const cfg_1 = __importDefault(require("../tunnel/cfg"));
 const output_1 = __importDefault(require("../output"));
 const input_1 = __importDefault(require("../input"));
-const cfg_2 = __importDefault(require("../project/cfg"));
+const cfg_1 = __importDefault(require("../project/cfg"));
 const commandWhoami = (0, utils_1.newCommand)('whoami', texts_1.DESC_COMMAND_WHOAMI);
 commandWhoami.option('--format <text|json>', texts_1.OPTION_FORMAT);
 commandWhoami.action(async (options) => {
-    const workspace = cfg_1.default.getWorkspace();
-    const localWorkspace = cfg_2.default.getWorkspace();
-    const localProject = cfg_2.default.getProject();
+    const { workspace, project, localWorkspace } = input_1.default.accountScope();
     const client = input_1.default.restApiTokenClient();
     const user = await client.getInvoker();
     if (!user) {
@@ -30,12 +27,12 @@ commandWhoami.action(async (options) => {
     else {
         obj.Workspace = !workspace ? texts_1.TXT_WHOAMI_NO_WORKSPACE : workspace;
     }
-    if (localProject) {
-        obj.Project = localProject;
+    if (project) {
+        obj.Project = project;
     }
-    const vtSuite = cfg_2.default.getVtSuite();
-    const utSuite = cfg_2.default.getUtSuite();
-    const crawlSuite = cfg_2.default.getCrawlSuite();
+    const vtSuite = cfg_1.default.getVtSuite();
+    const utSuite = cfg_1.default.getUtSuite();
+    const crawlSuite = cfg_1.default.getCrawlSuite();
     if (vtSuite) {
         obj['Visual test suite'] = vtSuite;
     }

package/distTs/src/command/workspace/get.js

@@ -3,13 +3,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const cfg_1 = __importDefault(require("../../tunnel/cfg"));
+const input_1 = __importDefault(require("../../input"));
 const output_1 = __importDefault(require("../../output"));
 const texts_1 = require("../../texts");
 const utils_1 = require("../../utils");
 const commandWorkspaceGet = (0, utils_1.newCommand)('get', texts_1.DESC_COMMAND_WORKSPACE_GET);
 commandWorkspaceGet.action(async () => {
-    const workspace = cfg_1.default.getWorkspace();
+    const { workspace } = input_1.default.accountScope();
     if (!workspace) {
         output_1.default.exitError(texts_1.TXT_WORKSPACE_NONE);
     }

package/distTs/src/command/workspace/set.js

@@ -9,6 +9,7 @@ const texts_1 = require("../../texts");
 const utils_1 = require("../../utils");
 const input_1 = __importDefault(require("../../input"));
 const commandWorkspaceSet = (0, utils_1.newCommand)('set', texts_1.DESC_COMMAND_WORKSPACE_SET);
+commandWorkspaceSet.usesDefaultContext = true;
 commandWorkspaceSet.argument('[workspace]', texts_1.ARG_COMMAND_WORKSPACE);
 commandWorkspaceSet.action(async (workspaceDomain) => {
     output_1.default.handleSignals();