@newly/cli 0.1.106 → 0.1.108

package/dist/commands/run-cloud.js

@@ -99,7 +99,7 @@ export function consumeSimulatorLogSse(raw) {
 function writeSimulatorLogEntry(entry, json) {
     console.log(json ? JSON.stringify(entry) : entry.message);
 }
-function parseLabels(labels) {
+function parseTags(labels) {
     const out = {};
     for (const raw of labels ?? []) {
         const idx = raw.indexOf('=');
@@ -307,7 +307,7 @@ async function createSimulatorSession(platform, opts) {
         model: opts.model,
         region: opts.region,
         displayName: opts.displayName,
-        labels: parseLabels(opts.label),
+        tags: parseTags(opts.label),
         installAssets,
         inactivityTimeout: opts.inactivityTimeout,
         hardTimeout: opts.hardTimeout,

package/dist/commands/sandbox.js

@@ -263,6 +263,33 @@ function secretSelector(opts) {
 function collectRepeatable(value, previous) {
     return [...previous, value];
 }
+export function parseTagPairs(values) {
+    return values.map((raw) => {
+        const at = raw.indexOf('=');
+        if (at <= 0) {
+            throw new Error(`--tag must be key=value (got ${JSON.stringify(raw)})`);
+        }
+        return [raw.slice(0, at), raw.slice(at + 1)];
+    });
+}
+export async function resolveSandboxByTag(api, tags) {
+    if (tags.length === 0) {
+        throw new Error('Provide a sandbox id, or --tag key=value to find one.');
+    }
+    const query = new URLSearchParams();
+    for (const [key, value] of parseTagPairs(tags))
+        query.append('tag', `${key}:${value}`);
+    const data = await api.get(`/run-cloud/sandboxes?${query}`);
+    const items = data?.items ?? [];
+    if (items.length === 0) {
+        throw new Error(`No sandbox matches ${tags.join(' ')}.`);
+    }
+    if (items.length > 1) {
+        const listed = items.map((s) => `  ${s.id}${s.name ? `  ${s.name}` : ''}`).join('\n');
+        throw new Error(`${items.length} sandboxes match ${tags.join(' ')} — narrow it, or pass an id:\n${listed}`);
+    }
+    return items[0].id;
+}
 export function registerSandbox(program) {
     const sandbox = program.command('sandbox').description('Spawn and control microVM sandboxes');
     const defaultHelp = new Help();
@@ -362,12 +389,16 @@ export function registerSandbox(program) {
         .command('list')
         .description('List sandboxes')
         .option('--state <state>', 'filter by state')
-        .option('--name <name>', 'filter by name (exact)')).action((opts) => run(async () => {
+        .option('--name <name>', 'filter by name (exact)')
+        .option('--tag <key=value>', 'filter by tag; repeatable, and a sandbox must carry every one', collectRepeatable, [])).action((opts) => run(async () => {
         const query = new URLSearchParams();
         if (opts.state)
             query.set('state', opts.state);
         if (opts.name)
             query.set('name', opts.name);
+        for (const [key, value] of parseTagPairs(opts.tag ?? [])) {
+            query.append('tag', `${key}:${value}`);
+        }
         const qs = query.size ? `?${query}` : '';
         const api = runCloudApi();
         const [data, boxes] = await Promise.all([
@@ -384,6 +415,23 @@ export function registerSandbox(program) {
         else
             console.log(renderSandboxList(items));
     }));
+    withOutput(sandbox
+        .command('tag')
+        .description('Set or remove tags on a sandbox')
+        .argument('<id>', 'sandbox id')
+        .argument('<pairs...>', 'key=value to set, or key= to remove')).action((id, pairs, opts) => run(async () => {
+        const tags = Object.fromEntries(parseTagPairs(pairs).map(([key, value]) => [key, value === '' ? null : value]));
+        const updated = await runCloudApi().patch(`/run-cloud/sandboxes/${encodeURIComponent(id)}/tags`, { tags });
+        if (opts.json)
+            printJson(updated);
+        else {
+            const applied = (updated?.tags ?? {});
+            const entries = Object.entries(applied);
+            console.log(entries.length === 0
+                ? `${id} now has no tags`
+                : `${id}\n${entries.map(([k, v]) => `  ${k}=${v}`).join('\n')}`);
+        }
+    }));
     withOutput(sandbox
         .command('get')
         .description('Inspect a sandbox, including its public hostname when exposed')
@@ -497,15 +545,17 @@ export function registerSandbox(program) {
     sandbox
         .command('shell')
         .description('Open an interactive shell (resumes paused sandboxes)')
-        .argument('<id>', 'sandbox id')
-        .action((id) => run(async () => {
+        .argument('[id]', 'sandbox id; omit when using --tag')
+        .option('--tag <key=value>', 'find the sandbox by tag instead of id; repeatable, must match exactly one', collectRepeatable, [])
+        .action((id, opts) => run(async () => {
         const credentials = requireCredentials();
         const api = new ApiClient(credentials.apiUrl, credentials.token);
-        await prepareSandboxShell(api, id);
+        const sandboxId = id ?? (await resolveSandboxByTag(api, opts.tag ?? []));
+        await prepareSandboxShell(api, sandboxId);
         process.exitCode = await runSandboxShell({
             apiUrl: credentials.apiUrl,
             token: credentials.token,
-            sandboxId: id,
+            sandboxId,
         });
     }));
     for (const lifecycle of [

package/dist/version.js

@@ -1 +1 @@
-export const CLI_VERSION = '0.1.106';
+export const CLI_VERSION = '0.1.108';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@newly/cli",
-  "version": "0.1.106",
+  "version": "0.1.108",
   "description": "Develop, provision, and deploy Newly backends from your terminal",
   "license": "UNLICENSED",
   "type": "module",