bdy 1.23.17-dev → 1.23.18-dev

package/distTs/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bdy",
   "preferGlobal": false,
-  "version": "1.23.17-dev",
+  "version": "1.23.18-dev",
   "type": "commonjs",
   "license": "MIT",
   "homepage": "https://buddy.works/docs/cli",

package/distTs/src/api/client.js

@@ -384,7 +384,7 @@ class ApiClient {
     async getTunnelToken(workspace, project) {
         const query = {};
         if (project)
-            query.project_name = encodeURIComponent(project);
+            query.project_name = project;
         return await this.request({
             method: 'GET',
             path: `/workspaces/${encodeURIComponent(workspace)}/tunnels/token`,
@@ -791,17 +791,27 @@ class ApiClient {
     }
     // Sandbox methods
     async createSandbox(workspace, project, body) {
+        const query = {};
+        if (project)
+            query.project_name = project;
         return await this.request({
             method: 'POST',
-            path: `/workspaces/${encodeURIComponent(workspace)}/sandboxes?project_name=${encodeURIComponent(project)}`,
+            path: `/workspaces/${encodeURIComponent(workspace)}/sandboxes`,
+            query,
             body,
             parseResponseBody: true,
         });
     }
-    async createSandboxByYaml(workspace, project, body) {
+    async createSandboxByYaml(workspace, project, body, environmentId) {
+        const query = {};
+        if (project)
+            query.project_name = project;
+        if (environmentId)
+            query.environment_id = environmentId;
         return await this.request({
             method: 'POST',
-            path: `/workspaces/${encodeURIComponent(workspace)}/sandboxes/yaml?project_name=${encodeURIComponent(project)}`,
+            path: `/workspaces/${encodeURIComponent(workspace)}/sandboxes/yaml`,
+            query,
             body,
             parseResponseBody: true,
         });
@@ -822,7 +832,10 @@ class ApiClient {
         });
     }
     async sandboxDownloadFile(workspace, sandboxId, remotePath) {
-        const encodedRemotePath = remotePath.split('/').map(encodeURIComponent).join('/');
+        const encodedRemotePath = remotePath
+            .split('/')
+            .map(encodeURIComponent)
+            .join('/');
         return await this.request({
             method: 'GET',
             path: `/workspaces/${encodeURIComponent(workspace)}/sandboxes/${encodeURIComponent(sandboxId)}/download${encodedRemotePath}`,
@@ -837,7 +850,10 @@ class ApiClient {
         const formData = new undici_1.FormData();
         const file = await node_fs_1.default.openAsBlob(localPath);
         formData.set('file', file);
-        const encodedRemotePath = remotePath.split('/').map(encodeURIComponent).join('/');
+        const encodedRemotePath = remotePath
+            .split('/')
+            .map(encodeURIComponent)
+            .join('/');
         return await this.request({
             method: 'POST',
             path: `/workspaces/${encodeURIComponent(workspace)}/sandboxes/${encodeURIComponent(sandboxId)}/content/upload${encodedRemotePath}`,
@@ -846,13 +862,34 @@ class ApiClient {
             parseResponseBody: true,
         });
     }
-    async listSandboxes(workspace, project) {
+    /**
+     * With no filter the endpoint returns workspace-scoped sandboxes only - it is
+     * not a workspace-wide listing, so a project- or environment-scoped sandbox is
+     * reachable only through its own filter.
+     */
+    async listSandboxes(workspace, project, environmentId) {
+        const query = {};
+        if (project)
+            query.project_name = project;
+        if (environmentId)
+            query.environment_id = environmentId;
         return await this.request({
             method: 'GET',
-            path: `/workspaces/${encodeURIComponent(workspace)}/sandboxes?project_name=${encodeURIComponent(project)}`,
+            path: `/workspaces/${encodeURIComponent(workspace)}/sandboxes`,
+            query,
             parseResponseBody: true,
         });
     }
+    /**
+     * Resolve an identifier to an id by listing its scope, for the scopes
+     * `/identifiers?sandbox=` cannot answer (it resolves project-scoped sandboxes
+     * only, and needs `project` to do it).
+     */
+    async findSandboxByIdentifier(workspace, identifier, project, environmentId) {
+        const result = await this.listSandboxes(workspace, project, environmentId);
+        const sandboxes = result.sandboxes || [];
+        return sandboxes.find((s) => s.identifier === identifier)?.id;
+    }
     async getSandbox(workspace, sandboxId) {
         return await this.request({
             method: 'GET',
@@ -1062,10 +1099,12 @@ class ApiClient {
             parseResponseBody: true,
         });
     }
-    async listProjectSnapshots(workspace, project) {
+    async listSnapshots(workspace, project, environmentId) {
         const query = {};
         if (project)
-            query.project_name = encodeURIComponent(project);
+            query.project_name = project;
+        if (environmentId)
+            query.environment_id = environmentId;
         return await this.request({
             method: 'GET',
             path: `/workspaces/${encodeURIComponent(workspace)}/sandboxes/snapshots`,

package/distTs/src/command/environment/delete.js

@@ -7,7 +7,6 @@ const utils_1 = require("../../utils");
 const texts_1 = require("../../texts");
 const output_1 = __importDefault(require("../../output"));
 const input_1 = __importDefault(require("../../input"));
-const resolve_1 = require("./resolve");
 const commandEnvironmentDelete = (0, utils_1.newCommand)('delete', texts_1.DESC_COMMAND_ENVIRONMENT_DELETE);
 commandEnvironmentDelete.alias('rm');
 commandEnvironmentDelete.option('-w, --workspace <domain>', texts_1.OPTION_REST_API_WORKSPACE);
@@ -18,7 +17,7 @@ commandEnvironmentDelete.addHelpText('after', `\nEXAMPLES:${texts_1.EXAMPLE_ENVI
 commandEnvironmentDelete.action(async (identifier, options) => {
     const workspace = input_1.default.restApiWorkspace(options.workspace);
     const client = input_1.default.restApiTokenClient();
-    const environment_id = await (0, resolve_1.resolveEnvironmentId)(client, workspace, identifier, options, 
+    const environment_id = await input_1.default.environmentId(client, workspace, identifier, options, 
     /* strictProject */ true);
     const confirmed = options.force ||
         (await output_1.default.confirm((0, texts_1.TXT_ENVIRONMENT_DELETE_CONFIRM)(identifier)));

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

@@ -7,7 +7,6 @@ const utils_1 = require("../../utils");
 const texts_1 = require("../../texts");
 const output_1 = __importDefault(require("../../output"));
 const input_1 = __importDefault(require("../../input"));
-const resolve_1 = require("./resolve");
 const commandEnvironmentGet = (0, utils_1.newCommand)('get', texts_1.DESC_COMMAND_ENVIRONMENT_GET);
 commandEnvironmentGet.option('-w, --workspace <domain>', texts_1.OPTION_REST_API_WORKSPACE);
 commandEnvironmentGet.option('-p, --project <name>', texts_1.OPTION_REST_API_PROJECT);
@@ -17,7 +16,7 @@ commandEnvironmentGet.addHelpText('after', `\nEXAMPLES:${texts_1.EXAMPLE_ENVIRON
 commandEnvironmentGet.action(async (identifier, options) => {
     const workspace = input_1.default.restApiWorkspace(options.workspace);
     const client = input_1.default.restApiTokenClient();
-    const environment_id = await (0, resolve_1.resolveEnvironmentId)(client, workspace, identifier, options);
+    const environment_id = await input_1.default.environmentId(client, workspace, identifier, options);
     const environment = await client.getEnvironment(workspace, environment_id);
     if (options.format === 'json') {
         output_1.default.json(environment);

package/distTs/src/command/environment/update.js

@@ -7,7 +7,6 @@ const utils_1 = require("../../utils");
 const texts_1 = require("../../texts");
 const input_1 = __importDefault(require("../../input"));
 const output_1 = __importDefault(require("../../output"));
-const resolve_1 = require("./resolve");
 const commandEnvironmentUpdate = (0, utils_1.newCommand)('update', texts_1.DESC_COMMAND_ENVIRONMENT_UPDATE);
 commandEnvironmentUpdate.alias('edit');
 commandEnvironmentUpdate.option('-w, --workspace <domain>', texts_1.OPTION_REST_API_WORKSPACE);
@@ -52,7 +51,7 @@ commandEnvironmentUpdate.action(async (identifier, options) => {
         output_1.default.exitError(texts_1.ERR_COMMAND_NO_UPDATE);
     }
     const client = input_1.default.restApiTokenClient();
-    const environment_id = await (0, resolve_1.resolveEnvironmentId)(client, workspace, identifier, options, 
+    const environment_id = await input_1.default.environmentId(client, workspace, identifier, options, 
     /* strictProject */ true);
     const result = await client.updateEnvironment(workspace, environment_id, body);
     output_1.default.exitSuccess((0, texts_1.TXT_ENVIRONMENT_UPDATED)(result.identifier, result.html_url));

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

@@ -8,23 +8,18 @@ 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);
-commandSandboxAppAdd.option('-w, --workspace <domain>', texts_1.OPTION_REST_API_WORKSPACE);
-commandSandboxAppAdd.option('-p, --project <name>', texts_1.OPTION_REST_API_PROJECT);
+(0, utils_1.sandboxScopeOptions)(commandSandboxAppAdd);
 commandSandboxAppAdd.argument('<identifier>', texts_1.OPTION_SANDBOX_IDENTIFIER);
 commandSandboxAppAdd.argument('<app-command>', texts_1.OPTION_SANDBOX_APP_COMMAND);
 commandSandboxAppAdd.addHelpText('after', `\nEXAMPLES:${texts_1.EXAMPLE_SANDBOX_APP_ADD}`);
 commandSandboxAppAdd.action(async (identifier, app, options) => {
     const workspace = input_1.default.restApiWorkspace(options.workspace);
-    const project = input_1.default.restApiProject(options.project);
     const client = input_1.default.restApiTokenClient();
-    const { sandbox_id } = await client.getSandboxByIdentifier(workspace, project, identifier);
-    if (!sandbox_id) {
-        output_1.default.exitError(texts_1.ERR_SANDBOX_NOT_FOUND);
-    }
-    const sandbox = await client.getSandbox(workspace, sandbox_id);
+    const sandboxId = await input_1.default.sandboxId(client, workspace, options, identifier);
+    const sandbox = await client.getSandbox(workspace, sandboxId);
     const apps = sandbox.apps || [];
     apps.push(app);
-    await client.updateSandbox(workspace, sandbox_id, {
+    await client.updateSandbox(workspace, sandboxId, {
         apps,
     });
     output_1.default.exitSuccess(texts_1.TXT_SANDBOX_APP_ADDED);

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

@@ -9,20 +9,15 @@ 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);
 commandSandboxAppList.alias('ls');
-commandSandboxAppList.option('-w, --workspace <domain>', texts_1.OPTION_REST_API_WORKSPACE);
-commandSandboxAppList.option('-p, --project <name>', texts_1.OPTION_REST_API_PROJECT);
+(0, utils_1.sandboxScopeOptions)(commandSandboxAppList);
 commandSandboxAppList.option('--format <text|json>', texts_1.OPTION_FORMAT);
 commandSandboxAppList.argument('<identifier>', texts_1.OPTION_SANDBOX_IDENTIFIER);
 commandSandboxAppList.addHelpText('after', `\nEXAMPLES:${texts_1.EXAMPLE_SANDBOX_APP_LIST}`);
 commandSandboxAppList.action(async (identifier, options) => {
     const workspace = input_1.default.restApiWorkspace(options.workspace);
-    const project = input_1.default.restApiProject(options.project);
     const client = input_1.default.restApiTokenClient();
-    const { sandbox_id } = await client.getSandboxByIdentifier(workspace, project, identifier);
-    if (!sandbox_id) {
-        output_1.default.exitError(texts_1.ERR_SANDBOX_NOT_FOUND);
-    }
-    const sandbox = await client.getSandbox(workspace, sandbox_id);
+    const sandboxId = await input_1.default.sandboxId(client, workspace, options, identifier);
+    const sandbox = await client.getSandbox(workspace, sandboxId);
     // A sandbox with no apps has the field omitted altogether.
     const apps = sandbox.apps || [];
     if (options.format === 'json') {

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

@@ -9,8 +9,7 @@ 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);
 commandSandboxAppLogs.hideVersionUpdate = true;
-commandSandboxAppLogs.option('-w, --workspace <domain>', texts_1.OPTION_REST_API_WORKSPACE);
-commandSandboxAppLogs.option('-p, --project <name>', texts_1.OPTION_REST_API_PROJECT);
+(0, utils_1.sandboxScopeOptions)(commandSandboxAppLogs);
 commandSandboxAppLogs.option('-l, --limit <lines>', texts_1.OPTION_SANDBOX_LOGS_LIMIT);
 commandSandboxAppLogs.argument('<identifier>', texts_1.OPTION_SANDBOX_IDENTIFIER);
 commandSandboxAppLogs.argument('<app-id>', texts_1.OPTION_SANDBOX_APP_ID);
@@ -31,13 +30,9 @@ const fetchLogsWithLimit = async (client, workspace, sandboxId, appId, limit) =>
 };
 commandSandboxAppLogs.action(async (identifier, appId, options) => {
     const workspace = input_1.default.restApiWorkspace(options.workspace);
-    const project = input_1.default.restApiProject(options.project);
     const client = input_1.default.restApiTokenClient();
-    const { sandbox_id } = await client.getSandboxByIdentifier(workspace, project, identifier);
-    if (!sandbox_id) {
-        output_1.default.exitError(texts_1.ERR_SANDBOX_NOT_FOUND);
-    }
-    const logs = await fetchLogsWithLimit(client, workspace, sandbox_id, appId, options.limit || 100);
+    const sandboxId = await input_1.default.sandboxId(client, workspace, options, identifier);
+    const logs = await fetchLogsWithLimit(client, workspace, sandboxId, appId, options.limit || 100);
     output_1.default.exitNormal(logs);
 });
 exports.default = commandSandboxAppLogs;

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

@@ -9,22 +9,17 @@ 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);
 commandSandboxAppRemove.alias('rm');
-commandSandboxAppRemove.option('-w, --workspace <domain>', texts_1.OPTION_REST_API_WORKSPACE);
-commandSandboxAppRemove.option('-p, --project <name>', texts_1.OPTION_REST_API_PROJECT);
+(0, utils_1.sandboxScopeOptions)(commandSandboxAppRemove);
 commandSandboxAppRemove.argument('<identifier>', texts_1.OPTION_SANDBOX_IDENTIFIER);
 commandSandboxAppRemove.argument('<app-id>', texts_1.OPTION_SANDBOX_APP_ID);
 commandSandboxAppRemove.addHelpText('after', `\nEXAMPLES:${texts_1.EXAMPLE_SANDBOX_APP_REMOVE}`);
 commandSandboxAppRemove.action(async (identifier, appId, options) => {
     const workspace = input_1.default.restApiWorkspace(options.workspace);
-    const project = input_1.default.restApiProject(options.project);
     const client = input_1.default.restApiTokenClient();
-    const { sandbox_id } = await client.getSandboxByIdentifier(workspace, project, identifier);
-    if (!sandbox_id) {
-        output_1.default.exitError(texts_1.ERR_SANDBOX_NOT_FOUND);
-    }
-    const sandbox = await client.getSandbox(workspace, sandbox_id);
+    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, sandbox_id, {
+    await client.updateSandbox(workspace, sandboxId, {
         apps,
     });
     output_1.default.exitSuccess(texts_1.TXT_SANDBOX_APP_REMOVED);

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

@@ -8,20 +8,15 @@ 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);
-commandSandboxAppStart.option('-w, --workspace <domain>', texts_1.OPTION_REST_API_WORKSPACE);
-commandSandboxAppStart.option('-p, --project <name>', texts_1.OPTION_REST_API_PROJECT);
+(0, utils_1.sandboxScopeOptions)(commandSandboxAppStart);
 commandSandboxAppStart.argument('<identifier>', texts_1.OPTION_SANDBOX_IDENTIFIER);
 commandSandboxAppStart.argument('<app-id>', texts_1.OPTION_SANDBOX_APP_ID);
 commandSandboxAppStart.addHelpText('after', `\nEXAMPLES:${texts_1.EXAMPLE_SANDBOX_APP_START}`);
 commandSandboxAppStart.action(async (identifier, appId, options) => {
     const workspace = input_1.default.restApiWorkspace(options.workspace);
-    const project = input_1.default.restApiProject(options.project);
     const client = input_1.default.restApiTokenClient();
-    const { sandbox_id } = await client.getSandboxByIdentifier(workspace, project, identifier);
-    if (!sandbox_id) {
-        output_1.default.exitError(texts_1.ERR_SANDBOX_NOT_FOUND);
-    }
-    await client.startSandboxApp(workspace, sandbox_id, appId);
+    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);
 });
 exports.default = commandSandboxAppStart;

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

@@ -8,21 +8,16 @@ 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);
-commandSandboxAppStatus.option('-w, --workspace <domain>', texts_1.OPTION_REST_API_WORKSPACE);
-commandSandboxAppStatus.option('-p, --project <name>', texts_1.OPTION_REST_API_PROJECT);
+(0, utils_1.sandboxScopeOptions)(commandSandboxAppStatus);
 commandSandboxAppStatus.option('--format <text|json>', texts_1.OPTION_FORMAT);
 commandSandboxAppStatus.argument('<identifier>', texts_1.OPTION_SANDBOX_IDENTIFIER);
 commandSandboxAppStatus.argument('<app-id>', texts_1.OPTION_SANDBOX_APP_ID);
 commandSandboxAppStatus.addHelpText('after', `\nEXAMPLES:${texts_1.EXAMPLE_SANDBOX_APP_STATUS}`);
 commandSandboxAppStatus.action(async (identifier, appId, options) => {
     const workspace = input_1.default.restApiWorkspace(options.workspace);
-    const project = input_1.default.restApiProject(options.project);
     const client = input_1.default.restApiTokenClient();
-    const { sandbox_id } = await client.getSandboxByIdentifier(workspace, project, identifier);
-    if (!sandbox_id) {
-        output_1.default.exitError(texts_1.ERR_SANDBOX_NOT_FOUND);
-    }
-    const { apps, } = await client.getSandbox(workspace, sandbox_id);
+    const sandboxId = await input_1.default.sandboxId(client, workspace, options, identifier);
+    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);

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

@@ -8,20 +8,15 @@ 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);
-commandSandboxAppStop.option('-w, --workspace <domain>', texts_1.OPTION_REST_API_WORKSPACE);
-commandSandboxAppStop.option('-p, --project <name>', texts_1.OPTION_REST_API_PROJECT);
+(0, utils_1.sandboxScopeOptions)(commandSandboxAppStop);
 commandSandboxAppStop.argument('<identifier>', texts_1.OPTION_SANDBOX_IDENTIFIER);
 commandSandboxAppStop.argument('<app-id>', texts_1.OPTION_SANDBOX_APP_ID);
 commandSandboxAppStop.addHelpText('after', `\nEXAMPLES:${texts_1.EXAMPLE_SANDBOX_APP_STOP}`);
 commandSandboxAppStop.action(async (identifier, appId, options) => {
     const workspace = input_1.default.restApiWorkspace(options.workspace);
-    const project = input_1.default.restApiProject(options.project);
     const client = input_1.default.restApiTokenClient();
-    const { sandbox_id } = await client.getSandboxByIdentifier(workspace, project, identifier);
-    if (!sandbox_id) {
-        output_1.default.exitError(texts_1.ERR_SANDBOX_NOT_FOUND);
-    }
-    await client.stopSandboxApp(workspace, sandbox_id, appId);
+    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);
 });
 exports.default = commandSandboxAppStop;

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

@@ -12,8 +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);
-commandSandboxCp.option('-w, --workspace <domain>', texts_1.OPTION_REST_API_WORKSPACE);
-commandSandboxCp.option('-p, --project <name>', texts_1.OPTION_REST_API_PROJECT);
+(0, utils_1.sandboxScopeOptions)(commandSandboxCp);
 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);
@@ -21,21 +20,18 @@ commandSandboxCp.option('--ignore <patterns...>', texts_1.OPTION_SANDBOX_CP_IGNO
 commandSandboxCp.argument('<source>', texts_1.OPTION_SANDBOX_CP_SOURCE);
 commandSandboxCp.argument('<destination>', texts_1.OPTION_SANDBOX_CP_DEST);
 commandSandboxCp.addHelpText('after', texts_1.EXAMPLE_SANDBOX_CP);
-const upload = async (client, workspace, project, source, destination, ignore, userName) => {
+const upload = async (client, workspace, options, source, destination, ignore, userName) => {
     const { fdir } = require('fdir');
     const { sourcePath, sourceStats } = input_1.default.restApiSandboxUploadSourcePath(source);
     const { identifier, remotePath, isRemoteDir } = input_1.default.restApiSandboxUploadDestinationPath(destination);
-    const { sandbox_id } = await client.getSandboxByIdentifier(workspace, project, identifier);
-    if (!sandbox_id) {
-        output_1.default.exitError(texts_1.ERR_SANDBOX_NOT_FOUND);
-    }
+    const sandboxId = await input_1.default.sandboxId(client, workspace, options, identifier);
     const isIgnored = ignore.length ? (0, picomatch_1.default)(ignore, { dot: true }) : null;
     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));
         const remoteFile = isRemoteDir ? (0, path_1.join)(remotePath, name) : remotePath;
-        await client.sandboxUploadFile(workspace, sandbox_id, remoteFile, sourcePath, userName);
+        await client.sandboxUploadFile(workspace, sandboxId, remoteFile, sourcePath, userName);
         output_1.default.exitSuccess((0, texts_1.TXT_SANDBOX_CP_DONE)(1));
     }
     else if (sourceStats.isDirectory()) {
@@ -57,7 +53,7 @@ const upload = async (client, workspace, project, source, destination, ignore, u
             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));
-            await client.sandboxUploadFile(workspace, sandbox_id, remoteFile, localFile, userName);
+            await client.sandboxUploadFile(workspace, sandboxId, remoteFile, localFile, userName);
         }
         output_1.default.exitSuccess((0, texts_1.TXT_SANDBOX_CP_DONE)(files.length));
     }
@@ -65,18 +61,15 @@ const upload = async (client, workspace, project, source, destination, ignore, u
         output_1.default.exitError((0, texts_1.ERR_SANDBOX_CP_SOURCE_NOT_FOUND)(source));
     }
 };
-const download = async (client, workspace, project, source, destination, merge, replace) => {
+const download = async (client, workspace, options, source, destination, merge, replace) => {
     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 { sandbox_id } = await client.getSandboxByIdentifier(workspace, project, identifier);
-    if (!sandbox_id) {
-        output_1.default.exitError(texts_1.ERR_SANDBOX_NOT_FOUND);
-    }
+    const sandboxId = await input_1.default.sandboxId(client, workspace, options, identifier);
     output_1.default.normal(texts_1.TXT_SANDBOX_CP_DOWNLOAD, false);
-    const { body, headers } = await client.sandboxDownloadFile(workspace, sandbox_id, sourcePath);
+    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) {
@@ -121,14 +114,13 @@ const download = async (client, workspace, project, source, destination, merge,
 };
 commandSandboxCp.action(async (source, destination, options) => {
     const workspace = input_1.default.restApiWorkspace(options.workspace);
-    const project = input_1.default.restApiProject(options.project);
     const client = input_1.default.restApiTokenClient();
     const isUpload = input_1.default.restApiSandboxIsUpload(destination);
     if (isUpload) {
-        await upload(client, workspace, project, source, destination, options.ignore || [], options.user);
+        await upload(client, workspace, options, source, destination, options.ignore || [], options.user);
     }
     else {
-        await download(client, workspace, project, source, destination, !!options.merge, !!options.replace);
+        await download(client, workspace, options, source, destination, !!options.merge, !!options.replace);
     }
 });
 exports.default = commandSandboxCp;

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

@@ -7,6 +7,7 @@ const utils_1 = require("../../utils");
 const texts_1 = require("../../texts");
 const output_1 = __importDefault(require("../../output"));
 const input_1 = __importDefault(require("../../input"));
+const distro_1 = require("../../types/distro");
 const VALID_RESOURCES = [
     '1x2',
     '2x4',
@@ -23,8 +24,7 @@ const VALID_RESOURCES = [
 ];
 const commandSandboxCreate = (0, utils_1.newCommand)('create', texts_1.DESC_COMMAND_SANDBOX_CREATE);
 commandSandboxCreate.alias('add');
-commandSandboxCreate.option('-w, --workspace <domain>', texts_1.OPTION_REST_API_WORKSPACE);
-commandSandboxCreate.option('-p, --project <name>', texts_1.OPTION_REST_API_PROJECT);
+(0, utils_1.sandboxScopeOptions)(commandSandboxCreate);
 commandSandboxCreate.option('-n, --name <name>', texts_1.OPTION_SANDBOX_NAME);
 commandSandboxCreate.option('--note <note>', texts_1.OPTION_SANDBOX_NOTE);
 commandSandboxCreate.option('--agent-note <note>', texts_1.OPTION_SANDBOX_AGENT_NOTE);
@@ -53,11 +53,24 @@ commandSandboxCreate.addHelpText('after', `\nEXAMPLES:${texts_1.EXAMPLE_SANDBOX_
 commandSandboxCreate.action(async (options) => {
     const humanId = require('human-id').default;
     const workspace = input_1.default.restApiWorkspace(options.workspace);
-    const project = input_1.default.restApiProject(options.project);
+    const project = input_1.default.restApiProject(options.project, true);
+    const scope = input_1.default.scope(project, options.scope, options.environment, true);
     const client = input_1.default.restApiTokenClient();
     if (options.resources && !VALID_RESOURCES.includes(options.resources)) {
         output_1.default.exitError((0, texts_1.ERR_SANDBOX_INVALID_RESOURCES)(options.resources));
     }
+    // A snapshot brings its own OS, so the two are alternatives - saying both is
+    // a mistake worth reporting rather than silently dropping --os.
+    if (options.snapshot && options.os) {
+        output_1.default.exitError(texts_1.ERR_SANDBOX_SNAPSHOT_OS_CONFLICT);
+    }
+    // An `environment` key inside a YAML definition is ignored by the API, so both
+    // paths carry the environment the same way: the YAML endpoint as
+    // `?environment_id=`, the JSON one in the body.
+    let environmentId = null;
+    if (scope === distro_1.SCOPE.ENVIRONMENT) {
+        environmentId = await input_1.default.environmentId(client, workspace, options.environment, options);
+    }
     let result;
     if (options.yaml) {
         const yaml = input_1.default.restApiYaml(options.yaml);
@@ -65,7 +78,7 @@ commandSandboxCreate.action(async (options) => {
             yaml: Buffer.from(yaml, 'utf8').toString('base64'),
         };
         output_1.default.normal((0, texts_1.TXT_SANDBOX_CREATING)());
-        result = await client.createSandboxByYaml(workspace, project, body);
+        result = await client.createSandboxByYaml(workspace, scope === distro_1.SCOPE.PROJECT ? project : null, body, environmentId);
     }
     else {
         const timestamp = Date.now().toString(36);
@@ -79,8 +92,15 @@ commandSandboxCreate.action(async (options) => {
         if (options.fetch) {
             body.fetch = input_1.default.sandboxFetch(options.fetch);
         }
+        if (environmentId) {
+            body.environment = {
+                id: environmentId,
+            };
+        }
         if (options.snapshot) {
-            const snapshotsResult = await client.listProjectSnapshots(workspace, project);
+            // The snapshot has to come from the scope the sandbox is created in, so
+            // the listing filter mirrors the create call below.
+            const snapshotsResult = await client.listSnapshots(workspace, scope === distro_1.SCOPE.PROJECT ? project : null, environmentId);
             const snapshots = snapshotsResult.snapshots || [];
             const foundSnapshot = snapshots.find((s) => s.name === options.snapshot);
             if (!foundSnapshot) {
@@ -123,7 +143,7 @@ commandSandboxCreate.action(async (options) => {
             body.app_dir = options.appDir;
         }
         output_1.default.normal((0, texts_1.TXT_SANDBOX_CREATING)(body.name, body.identifier));
-        result = await client.createSandbox(workspace, project, body);
+        result = await client.createSandbox(workspace, scope === distro_1.SCOPE.PROJECT ? project : null, body);
     }
     const sandboxId = result.id;
     if (options.waitForRunning) {

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

@@ -9,23 +9,18 @@ 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);
 commandSandboxDestroy.aliases(['delete', 'rm']);
-commandSandboxDestroy.option('-w, --workspace <domain>', texts_1.OPTION_REST_API_WORKSPACE);
-commandSandboxDestroy.option('-p, --project <name>', texts_1.OPTION_REST_API_PROJECT);
+(0, utils_1.sandboxScopeOptions)(commandSandboxDestroy);
 commandSandboxDestroy.option('-f, --force', texts_1.OPTION_CONFIRM_FORCE);
 commandSandboxDestroy.argument('<identifier>', texts_1.OPTION_SANDBOX_IDENTIFIER);
 commandSandboxDestroy.action(async (identifier, options) => {
     const workspace = input_1.default.restApiWorkspace(options.workspace);
-    const project = input_1.default.restApiProject(options.project);
     const client = input_1.default.restApiTokenClient();
-    const { sandbox_id } = await client.getSandboxByIdentifier(workspace, project, identifier);
-    if (!sandbox_id) {
-        output_1.default.exitError(texts_1.ERR_SANDBOX_NOT_FOUND);
-    }
+    const sandboxId = await input_1.default.sandboxId(client, workspace, options, identifier);
     const confirmed = options.force ||
         (await output_1.default.confirm((0, texts_1.TXT_SANDBOX_DESTROY_CONFIRM)(identifier)));
     if (!confirmed)
         output_1.default.exitNormal();
-    await client.deleteSandbox(workspace, sandbox_id);
+    await client.deleteSandbox(workspace, sandboxId);
     output_1.default.exitSuccess((0, texts_1.TXT_SANDBOX_DESTROYED)(identifier));
 });
 exports.default = commandSandboxDestroy;

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

@@ -19,13 +19,9 @@ commandSandboxEndpointAdd.action(async (identifier, options) => {
         options.name = name;
     }
     const workspace = input_1.default.restApiWorkspace(options.workspace);
-    const project = input_1.default.restApiProject(options.project);
     const client = input_1.default.restApiTokenClient();
-    const { sandbox_id } = await client.getSandboxByIdentifier(workspace, project, identifier);
-    if (!sandbox_id) {
-        output_1.default.exitError(texts_1.ERR_SANDBOX_NOT_FOUND);
-    }
-    const sandbox = await client.getSandbox(workspace, sandbox_id);
+    const sandboxId = await input_1.default.sandboxId(client, workspace, options, identifier);
+    const sandbox = await client.getSandbox(workspace, sandboxId);
     const endpoints = sandbox.endpoints || [];
     const existing = endpoints.find((ep) => ep.name === name);
     if (existing) {
@@ -33,7 +29,7 @@ commandSandboxEndpointAdd.action(async (identifier, options) => {
     }
     const endpoint = input_1.default.prepareSandboxEndpoint(options);
     const updatedEndpoints = [...endpoints, endpoint];
-    const updatedSandbox = await client.updateSandbox(workspace, sandbox_id, {
+    const updatedSandbox = await client.updateSandbox(workspace, sandboxId, {
         endpoints: updatedEndpoints,
     });
     const addedEndpoint = (updatedSandbox.endpoints || []).find((ep) => ep.name === name);

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

@@ -9,21 +9,16 @@ 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);
 commandSandboxEndpointDelete.alias('rm');
-commandSandboxEndpointDelete.option('-w, --workspace <domain>', texts_1.OPTION_REST_API_WORKSPACE);
-commandSandboxEndpointDelete.option('-p, --project <name>', texts_1.OPTION_REST_API_PROJECT);
+(0, utils_1.sandboxScopeOptions)(commandSandboxEndpointDelete);
 commandSandboxEndpointDelete.option('-f, --force', texts_1.OPTION_CONFIRM_FORCE);
 commandSandboxEndpointDelete.argument('<identifier>', texts_1.OPTION_SANDBOX_IDENTIFIER);
 commandSandboxEndpointDelete.argument('<endpoint-name>', texts_1.OPTION_SANDBOX_ENDPOINT_NAME_ARG);
 commandSandboxEndpointDelete.addHelpText('after', `\nEXAMPLES:${texts_1.EXAMPLE_SANDBOX_ENDPOINT_DELETE}`);
 commandSandboxEndpointDelete.action(async (identifier, endpointName, options) => {
     const workspace = input_1.default.restApiWorkspace(options.workspace);
-    const project = input_1.default.restApiProject(options.project);
     const client = input_1.default.restApiTokenClient();
-    const { sandbox_id } = await client.getSandboxByIdentifier(workspace, project, identifier);
-    if (!sandbox_id) {
-        output_1.default.exitError(texts_1.ERR_SANDBOX_NOT_FOUND);
-    }
-    const sandbox = await client.getSandbox(workspace, sandbox_id);
+    const sandboxId = await input_1.default.sandboxId(client, workspace, options, identifier);
+    const sandbox = await client.getSandbox(workspace, sandboxId);
     const endpoints = sandbox.endpoints || [];
     const endpointIndex = endpoints.findIndex((ep) => ep.name === endpointName);
     if (endpointIndex === -1) {
@@ -34,7 +29,7 @@ commandSandboxEndpointDelete.action(async (identifier, endpointName, options) =>
         (await output_1.default.confirm((0, texts_1.TXT_SANDBOX_ENDPOINT_DELETE_CONFIRM)(identifier, endpointName)));
     if (!confirmed)
         output_1.default.exitNormal();
-    await client.updateSandbox(workspace, sandbox_id, {
+    await client.updateSandbox(workspace, sandboxId, {
         endpoints: updatedEndpoints,
     });
     output_1.default.exitSuccess((0, texts_1.TXT_SANDBOX_ENDPOINT_DELETED)(endpointName));