@skrr-ai/cli 0.1.24 → 0.1.26

package/dist/commands/machines/dedicated/destroy.js

@@ -1,13 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@oclif/core");
-const base_command_1 = require("../../../base-command");
+const dedicated_lease_command_1 = require("../../../lib/dedicated-lease-command");
 const dedicated_machines_1 = require("../../../lib/dedicated-machines");
-class DedicatedMachinesDestroy extends base_command_1.BaseCommand {
-    static description = 'Destroy a Dedicated Runtime lease. Retention class standard/extended archives the lease and keeps the workspace volume; destroy an archived lease to purge storage.';
+class DedicatedMachinesDestroy extends dedicated_lease_command_1.DedicatedLeaseCommand {
+    static description = 'Destroy a Dedicated Runtime lease. Retention class standard/extended archives the lease and keeps the workspace volume; destroy an archived lease, or pass --purge-storage, to delete it.';
     static examples = [
         '<%= config.bin %> machines dedicated destroy <lease-id>',
-        '<%= config.bin %> machines dedicated destroy <lease-id> --json',
+        '<%= config.bin %> machines dedicated destroy <lease-id> --retain-storage --wait',
+        '<%= config.bin %> machines dedicated destroy <lease-id> --purge-storage --yes --json',
     ];
     static args = {
         lease: core_1.Args.string({
@@ -23,34 +24,50 @@ class DedicatedMachinesDestroy extends base_command_1.BaseCommand {
             exclusive: ['purge-storage'],
         }),
         'purge-storage': core_1.Flags.boolean({
-            description: 'Permanently delete the workspace volume',
+            description: 'Permanently delete the workspace volume. Asks first unless --yes.',
             exclusive: ['retain-storage'],
         }),
+        yes: core_1.Flags.boolean({
+            char: 'y',
+            description: 'Skip the confirmation a destroy that deletes the workspace asks for',
+            default: false,
+        }),
+        ...dedicated_lease_command_1.dedicatedWaitFlags,
     };
     async run() {
         this.requireAuth();
         const { args, flags } = await this.parse(DedicatedMachinesDestroy);
-        let response;
-        try {
-            response = await (0, dedicated_machines_1.destroyDedicatedRuntime)(args.lease, {
-                retentionIntent: flags['purge-storage']
-                    ? 'purge'
-                    : flags['retain-storage']
-                        ? 'retain'
-                        : undefined,
-            });
-        }
-        catch (err) {
-            const message = (0, dedicated_machines_1.formatDedicatedRuntimeApiError)(err);
-            if (message)
-                this.error(message, { exit: 1 });
-            this.handleApiError(err);
+        // Only a destroy that DELETES the workspace asks, and that is not only
+        // `--purge-storage`: the server also purges when the lease is already
+        // archived, or when its retention class is `none` (or unset)
+        // — `resolveDestroyRetention`. A retained destroy can still be purged later,
+        // so it does not ask. This mirrors the server's rule only to decide whether
+        // to PROMPT; the server still decides what happens.
+        let willPurge = Boolean(flags['purge-storage']);
+        if (!willPurge && !flags.yes) {
+            const current = await this.callDedicated(() => (0, dedicated_machines_1.getDedicatedRuntime)(args.lease, this.scopeFrom(flags)));
+            const lease = current?.lease;
+            willPurge =
+                lease?.state === 'archived' ||
+                    (!flags['retain-storage'] && (lease?.storage?.retentionClass || 'none') === 'none');
         }
-        if (flags.json) {
-            this.log(JSON.stringify(response, null, 2));
-            return;
+        if (willPurge && !flags.yes) {
+            if (!process.stdin.isTTY) {
+                this.error('This destroy deletes the workspace volume permanently. Pass --yes to confirm when not at a terminal.', { exit: 2 });
+            }
+            const confirmed = await this.confirm(`Permanently delete the workspace of ${args.lease}? Files, sign-ins and repositories on it cannot be recovered. [y/N] `);
+            if (!confirmed) {
+                this.log('Aborted.');
+                this.exit(1);
+            }
         }
-        this.log(`Dedicated Runtime ${(0, dedicated_machines_1.dedicatedLeaseId)(response?.lease)} ${(0, dedicated_machines_1.dedicatedLeaseState)(response?.lease)}.`);
+        let retentionIntent;
+        if (flags['purge-storage'])
+            retentionIntent = 'purge';
+        else if (flags['retain-storage'])
+            retentionIntent = 'retain';
+        const response = await this.callDedicated(() => (0, dedicated_machines_1.destroyDedicatedRuntime)(args.lease, { ...this.scopeFrom(flags), retentionIntent }));
+        await this.reportLeaseAction(response, flags, { kind: 'destroyed' }, 'Destroying');
     }
 }
 exports.default = DedicatedMachinesDestroy;

package/dist/commands/machines/dedicated/exec.d.ts

@@ -0,0 +1,28 @@
+import { BaseCommand } from '../../../base-command';
+/**
+ * `skrr machines dedicated exec` — the Run Command half of EC2 parity.
+ *
+ * There is deliberately no `shell` beside it. A loop that sends one line at a
+ * time through exec is not a terminal: no TTY, no job control, no prompts a
+ * program can ask, no state between lines (`cd` does not stick). Hosted
+ * Machine's `connect` is that loop and has to say so in its own docs. The honest
+ * interactive surface is the terminal in the web app, which runs a real
+ * pseudo-terminal on the machine through the same daemon.
+ */
+export default class DedicatedMachinesExec extends BaseCommand {
+    static description: string;
+    static strict: boolean;
+    static examples: string[];
+    static usage: string;
+    static args: {
+        id: import("@oclif/core/lib/interfaces").Arg<string, Record<string, unknown>>;
+    };
+    static flags: {
+        command: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        cwd: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        timeout: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        workspace: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        json: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+    };
+    run(): Promise<void>;
+}

package/dist/commands/machines/dedicated/exec.js

@@ -0,0 +1,105 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const core_1 = require("@oclif/core");
+const base_command_1 = require("../../../base-command");
+const shell_quote_1 = require("../../../lib/shell-quote");
+const hosted_machines_1 = require("../../../lib/hosted-machines");
+const dedicated_machines_1 = require("../../../lib/dedicated-machines");
+const exec_1 = require("../hosted/exec");
+/**
+ * `skrr machines dedicated exec` — the Run Command half of EC2 parity.
+ *
+ * There is deliberately no `shell` beside it. A loop that sends one line at a
+ * time through exec is not a terminal: no TTY, no job control, no prompts a
+ * program can ask, no state between lines (`cd` does not stick). Hosted
+ * Machine's `connect` is that loop and has to say so in its own docs. The honest
+ * interactive surface is the terminal in the web app, which runs a real
+ * pseudo-terminal on the machine through the same daemon.
+ */
+class DedicatedMachinesExec extends base_command_1.BaseCommand {
+    static description = 'Run one command on a Dedicated Runtime machine and return its output and exit code';
+    static strict = false;
+    static examples = [
+        '<%= config.bin %> machines dedicated exec <lease-id> -- git -C repos/app status',
+        '<%= config.bin %> machines dedicated exec <lease-id> --cwd repos/app --timeout 5m -- npm test',
+        '<%= config.bin %> machines dedicated exec <lease-id> --command "ls -la user-data" --json',
+    ];
+    static usage = 'machines dedicated exec <lease-id> [flags] -- <command...>';
+    static args = {
+        id: core_1.Args.string({
+            description: 'Dedicated Runtime lease id',
+            required: true,
+            ignoreStdin: true,
+        }),
+    };
+    static flags = {
+        command: core_1.Flags.string({
+            description: 'Command to run as one shell string, instead of trailing argv',
+        }),
+        cwd: core_1.Flags.string({
+            description: 'Working directory, relative to /workspace (for example repos/app)',
+        }),
+        timeout: core_1.Flags.string({
+            description: `How long to let it run, such as 30s or 5m (default 2m, max ${dedicated_machines_1.DEDICATED_EXEC_MAX_TIMEOUT_MS / 60000}m). The process group is killed at the deadline.`,
+        }),
+        workspace: core_1.Flags.string({ description: 'Workspace scope' }),
+        json: core_1.Flags.boolean({ description: 'Output the result as JSON' }),
+    };
+    async run() {
+        this.requireAuth();
+        // Same argv contract as `machines hosted exec`: everything after the FIRST
+        // `--` is the remote argv, taken from the raw line so a second `--` survives.
+        const { head, tail } = (0, exec_1.splitExecArgv)(this.argv);
+        const { argv, flags } = await this.parse(DedicatedMachinesExec, head);
+        const raw = argv;
+        const id = raw[0];
+        const command = flags.command || (0, shell_quote_1.shellQuoteArgv)(tail ?? raw.slice(1));
+        if (!id) {
+            this.error('Lease id is required.', { exit: 2 });
+        }
+        if (!command.trim()) {
+            this.error('Command is required. Use --command or pass it after --.', { exit: 2 });
+        }
+        let timeoutMs;
+        try {
+            timeoutMs = (0, hosted_machines_1.parseDurationMs)(flags.timeout, '--timeout');
+        }
+        catch (err) {
+            this.error(err.message, { exit: 2 });
+        }
+        if (timeoutMs !== undefined && timeoutMs > dedicated_machines_1.DEDICATED_EXEC_MAX_TIMEOUT_MS) {
+            this.error(`--timeout is at most ${dedicated_machines_1.DEDICATED_EXEC_MAX_TIMEOUT_MS / 60000}m. For longer work, start it in the background (nohup … &) or give it to an agent.`, { exit: 2 });
+        }
+        let result;
+        try {
+            result = await (0, dedicated_machines_1.execDedicatedRuntime)(id, { command, ...(flags.cwd ? { cwd: flags.cwd } : {}), ...(timeoutMs ? { timeoutMs } : {}) }, { workspaceId: flags.workspace });
+        }
+        catch (err) {
+            const message = (0, dedicated_machines_1.formatDedicatedRuntimeApiError)(err);
+            if (message)
+                this.error(message, { exit: 1, code: (0, dedicated_machines_1.dedicatedRuntimeApiErrorCode)(err) });
+            this.handleApiError(err);
+        }
+        if (flags.json) {
+            this.log(JSON.stringify(result, null, 2));
+        }
+        else {
+            if (result.stdout)
+                process.stdout.write(result.stdout);
+            // About the invocation, not the command's output — stderr, so a caller
+            // piping stdout reads only what the machine printed.
+            if (result.truncated) {
+                process.stderr.write('\n[output truncated at 1 MB]\n');
+            }
+            if (result.timedOut) {
+                process.stderr.write(`\n[timed out after ${Math.round(result.durationMs / 1000)}s; the process group was killed]\n`);
+            }
+        }
+        // Mirror the remote exit status so `exec … && next` composes like a local
+        // command. A timeout has no status of its own; 124 is what `timeout(1)` uses.
+        const exitCode = result.timedOut ? 124 : (result.exitCode ?? 1);
+        if (exitCode !== 0)
+            this.exit(exitCode);
+    }
+}
+exports.default = DedicatedMachinesExec;

package/dist/commands/machines/dedicated/grow.d.ts

@@ -1,12 +1,16 @@
-import { BaseCommand } from '../../../base-command';
-export default class DedicatedMachinesGrow extends BaseCommand {
+import { DedicatedLeaseCommand } from '../../../lib/dedicated-lease-command';
+export default class DedicatedMachinesGrow extends DedicatedLeaseCommand {
     static description: string;
     static examples: string[];
     static args: {
         lease: import("@oclif/core/lib/interfaces").Arg<string, Record<string, unknown>>;
     };
     static flags: {
+        wait: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        timeout: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        interval: import("@oclif/core/lib/interfaces").OptionFlag<number | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
         'storage-gb': import("@oclif/core/lib/interfaces").OptionFlag<number, import("@oclif/core/lib/interfaces").CustomOptions>;
+        'request-id': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
         json: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };
     run(): Promise<void>;

package/dist/commands/machines/dedicated/grow.js

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@oclif/core");
-const base_command_1 = require("../../../base-command");
+const dedicated_lease_command_1 = require("../../../lib/dedicated-lease-command");
 const dedicated_machines_1 = require("../../../lib/dedicated-machines");
-class DedicatedMachinesGrow extends base_command_1.BaseCommand {
-    static description = 'Increase Dedicated Runtime workspace storage. Shrink is unsupported.';
+class DedicatedMachinesGrow extends dedicated_lease_command_1.DedicatedLeaseCommand {
+    static description = 'Increase Dedicated Runtime workspace storage. Shrink is unsupported, and growth is permanent for the life of the volume.';
     static examples = [
         '<%= config.bin %> machines dedicated grow <lease-id> --storage-gb 200',
-        '<%= config.bin %> machines dedicated grow <lease-id> --storage-gb 200 --json',
+        '<%= config.bin %> machines dedicated grow <lease-id> --storage-gb 200 --wait --json',
     ];
     static args = {
         lease: core_1.Args.string({
@@ -21,26 +21,21 @@ class DedicatedMachinesGrow extends base_command_1.BaseCommand {
             description: 'New workspace size in GiB. Must be larger than the current size.',
             required: true,
         }),
+        'request-id': core_1.Flags.string({
+            description: 'Idempotency key. Reuse it to safely retry the same grow request.',
+        }),
         json: core_1.Flags.boolean({ description: 'Output as JSON' }),
+        ...dedicated_lease_command_1.dedicatedWaitFlags,
     };
     async run() {
         this.requireAuth();
         const { args, flags } = await this.parse(DedicatedMachinesGrow);
-        let response;
-        try {
-            response = await (0, dedicated_machines_1.growDedicatedRuntime)(args.lease, flags['storage-gb']);
-        }
-        catch (err) {
-            const message = (0, dedicated_machines_1.formatDedicatedRuntimeApiError)(err);
-            if (message)
-                this.error(message, { exit: 1 });
-            this.handleApiError(err);
-        }
-        if (flags.json) {
-            this.log(JSON.stringify(response, null, 2));
-            return;
-        }
-        this.log(`Dedicated Runtime ${(0, dedicated_machines_1.dedicatedLeaseId)(response?.lease)} ${(0, dedicated_machines_1.dedicatedLeaseState)(response?.lease)}.`);
+        const response = await this.callDedicated(() => (0, dedicated_machines_1.growDedicatedRuntime)(args.lease, flags['storage-gb'], {
+            ...this.scopeFrom(flags),
+            ...(flags['request-id'] ? { requestId: flags['request-id'] } : {}),
+        }));
+        // A grow never changes the lease state, so --wait watches the size itself.
+        await this.reportLeaseAction(response, flags, { kind: 'grown', storageGb: flags['storage-gb'] }, 'Growing');
     }
 }
 exports.default = DedicatedMachinesGrow;

package/dist/commands/machines/dedicated/health-check.d.ts

@@ -1,5 +1,5 @@
-import { BaseCommand } from '../../../base-command';
-export default class DedicatedMachinesHealthCheck extends BaseCommand {
+import { DedicatedLeaseCommand } from '../../../lib/dedicated-lease-command';
+export default class DedicatedMachinesHealthCheck extends DedicatedLeaseCommand {
     static description: string;
     static examples: string[];
     static args: {

package/dist/commands/machines/dedicated/health-check.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@oclif/core");
-const base_command_1 = require("../../../base-command");
+const dedicated_lease_command_1 = require("../../../lib/dedicated-lease-command");
 const dedicated_machines_1 = require("../../../lib/dedicated-machines");
-class DedicatedMachinesHealthCheck extends base_command_1.BaseCommand {
-    static description = 'Health-check a Dedicated Runtime lease';
+class DedicatedMachinesHealthCheck extends dedicated_lease_command_1.DedicatedLeaseCommand {
+    static description = 'Ask the control plane to re-observe a Dedicated Runtime (compute, volume, daemon heartbeat) and print what it found';
     static examples = [
         '<%= config.bin %> machines dedicated health-check <lease-id>',
         '<%= config.bin %> machines dedicated health-check <lease-id> --json',
@@ -22,21 +22,23 @@ class DedicatedMachinesHealthCheck extends base_command_1.BaseCommand {
     async run() {
         this.requireAuth();
         const { args, flags } = await this.parse(DedicatedMachinesHealthCheck);
-        let response;
-        try {
-            response = await (0, dedicated_machines_1.performDedicatedLeaseAction)(args.lease, 'health-check');
-        }
-        catch (err) {
-            const message = (0, dedicated_machines_1.formatDedicatedRuntimeApiError)(err);
-            if (message)
-                this.error(message, { exit: 1 });
-            this.handleApiError(err);
-        }
+        const response = await this.callDedicated(() => (0, dedicated_machines_1.performDedicatedLeaseAction)(args.lease, 'health-check', this.scopeFrom(flags)));
         if (flags.json) {
             this.log(JSON.stringify(response, null, 2));
             return;
         }
-        this.log(`Dedicated Runtime ${(0, dedicated_machines_1.dedicatedLeaseId)(response?.lease)} ${(0, dedicated_machines_1.dedicatedLeaseState)(response?.lease)}.`);
+        const lease = response?.lease;
+        if (!lease) {
+            this.log(`Dedicated Runtime ${args.lease} ${(0, dedicated_machines_1.dedicatedLeaseState)(lease)}.`);
+            return;
+        }
+        // A health check exists to answer "can it take work, and if not why" — the
+        // one-line state it used to print could not say either.
+        for (const line of (0, dedicated_machines_1.describeDedicatedLease)(lease))
+            this.log(line);
+        if (lease.health?.reasons?.includes('dedicated_runtime_provider_blind')) {
+            this.log('\nThe provider could not be read just now. That is not the same as the machine being gone; check again shortly.');
+        }
     }
 }
 exports.default = DedicatedMachinesHealthCheck;

package/dist/commands/machines/dedicated/incident-close.d.ts

@@ -1,5 +1,5 @@
-import { BaseCommand } from '../../../base-command';
-export default class DedicatedMachinesIncidentClose extends BaseCommand {
+import { DedicatedLeaseCommand } from '../../../lib/dedicated-lease-command';
+export default class DedicatedMachinesIncidentClose extends DedicatedLeaseCommand {
     static description: string;
     static examples: string[];
     static args: {
@@ -7,6 +7,7 @@ export default class DedicatedMachinesIncidentClose extends BaseCommand {
     };
     static flags: {
         json: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        'request-id': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
     };
     run(): Promise<void>;
 }

package/dist/commands/machines/dedicated/incident-close.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@oclif/core");
-const base_command_1 = require("../../../base-command");
+const dedicated_lease_command_1 = require("../../../lib/dedicated-lease-command");
 const dedicated_machines_1 = require("../../../lib/dedicated-machines");
-class DedicatedMachinesIncidentClose extends base_command_1.BaseCommand {
-    static description = 'Close a Dedicated Runtime AZ-recovery incident hold. Does not delete the workspace.';
+class DedicatedMachinesIncidentClose extends dedicated_lease_command_1.DedicatedLeaseCommand {
+    static description = 'Close a Dedicated Runtime AZ-recovery incident hold, releasing the held failed source volume. Does not touch the live workspace.';
     static examples = [
         '<%= config.bin %> machines dedicated incident-close <lease-id>',
         '<%= config.bin %> machines dedicated incident-close <lease-id> --json',
@@ -18,25 +18,22 @@ class DedicatedMachinesIncidentClose extends base_command_1.BaseCommand {
     };
     static flags = {
         json: core_1.Flags.boolean({ description: 'Output as JSON' }),
+        'request-id': core_1.Flags.string({
+            description: 'Idempotency key. Reuse it to safely retry the same close.',
+        }),
     };
     async run() {
         this.requireAuth();
         const { args, flags } = await this.parse(DedicatedMachinesIncidentClose);
-        let response;
-        try {
-            response = await (0, dedicated_machines_1.closeDedicatedRuntimeIncidentHold)(args.lease);
-        }
-        catch (err) {
-            const message = (0, dedicated_machines_1.formatDedicatedRuntimeApiError)(err);
-            if (message)
-                this.error(message, { exit: 1 });
-            this.handleApiError(err);
-        }
+        const response = await this.callDedicated(() => (0, dedicated_machines_1.closeDedicatedRuntimeIncidentHold)(args.lease, {
+            ...this.scopeFrom(flags),
+            ...(flags['request-id'] ? { requestId: flags['request-id'] } : {}),
+        }));
         if (flags.json) {
             this.log(JSON.stringify(response, null, 2));
             return;
         }
-        this.log(`Dedicated Runtime ${(0, dedicated_machines_1.dedicatedLeaseId)(response?.lease)} ${(0, dedicated_machines_1.dedicatedLeaseState)(response?.lease)}.`);
+        this.log(`Dedicated Runtime ${(0, dedicated_machines_1.dedicatedLeaseId)(response?.lease)} ${(0, dedicated_machines_1.dedicatedLeaseState)(response?.lease)}; incident hold ${response?.lease?.recovery?.incidentHold?.status ?? 'closed'}.`);
     }
 }
 exports.default = DedicatedMachinesIncidentClose;

package/dist/commands/machines/dedicated/index.js

@@ -9,31 +9,52 @@ class DedicatedMachines extends core_1.Command {
     // — was invisible until a restart lost their work.
     static description = 'A private VM with a durable workspace — files survive restart, running processes do not';
     static examples = [
+        '<%= config.bin %> machines dedicated catalog',
+        '<%= config.bin %> machines dedicated create --name dev-box --size-preset standard --spending-limit-cents 20000 --wait',
         '<%= config.bin %> machines dedicated list',
         '<%= config.bin %> machines dedicated show <lease-id>',
-        '<%= config.bin %> machines dedicated create --name dev-box --size-preset standard --spending-limit-cents 20000',
-        '<%= config.bin %> machines dedicated stop <lease-id>',
-        '<%= config.bin %> machines dedicated start <lease-id>',
+        '<%= config.bin %> machines dedicated attach <lease-id> --agent <agent-id>',
+        '<%= config.bin %> machines dedicated terminal <lease-id>',
+        '<%= config.bin %> machines dedicated sign-in <lease-id> github',
+        '<%= config.bin %> machines dedicated exec <lease-id> -- git -C repos/app status',
+        '<%= config.bin %> machines dedicated cp ./notes.md <lease-id>:user-data/notes.md',
+        '<%= config.bin %> machines dedicated stop <lease-id> --wait',
+        '<%= config.bin %> machines dedicated start <lease-id> --wait',
         '<%= config.bin %> machines dedicated restart <lease-id>',
-        '<%= config.bin %> machines dedicated snapshot <lease-id>',
+        '<%= config.bin %> machines dedicated snapshot <lease-id> --wait',
         '<%= config.bin %> machines dedicated grow <lease-id> --storage-gb 200',
-        '<%= config.bin %> machines dedicated incident-close <lease-id>',
+        '<%= config.bin %> machines dedicated spending-limit <lease-id> --cents 30000',
         '<%= config.bin %> machines dedicated health-check <lease-id>',
+        '<%= config.bin %> machines dedicated incident-close <lease-id>',
         '<%= config.bin %> machines dedicated destroy <lease-id>',
     ];
     async run() {
+        const rows = [
+            ['catalog', 'sizes, storage bounds and prices create accepts'],
+            ['create', 'request a Dedicated Runtime'],
+            ['list', 'list Dedicated Runtime leases'],
+            ['show', 'state, size, spend, health and engines of one lease'],
+            ['attach', 'pin an agent so its work runs on the machine'],
+            ['terminal', 'open an interactive shell on the machine'],
+            ['sign-in', 'sign in to GitHub CLI, Claude Code or Codex there'],
+            ['exec', 'run one command; output and exit code'],
+            ['cp', 'copy a file to or from the machine'],
+            ['start', 'start a stopped runtime'],
+            ['stop', 'stop compute and keep the disk'],
+            ['restart', 'restart the instance; files stay'],
+            ['snapshot', 'create a recovery point'],
+            ['grow', 'increase workspace storage; shrink is unsupported'],
+            ['spending-limit', 'change the monthly spending cap'],
+            ['health-check', 'probe daemon and disk liveness'],
+            ['incident-close', 'close AZ-recovery evidence hold'],
+            ['destroy', 'stop compute; keep or purge the workspace disk'],
+        ];
         this.log('skrr Dedicated Runtime commands:');
-        this.log('  skrr machines dedicated list          list Dedicated Runtime leases');
-        this.log('  skrr machines dedicated show          show one Dedicated Runtime lease');
-        this.log('  skrr machines dedicated create        request a Dedicated Runtime');
-        this.log('  skrr machines dedicated start         start a stopped runtime');
-        this.log('  skrr machines dedicated stop          stop compute and keep the disk');
-        this.log('  skrr machines dedicated restart       restart the instance; files stay');
-        this.log('  skrr machines dedicated snapshot      create a recovery point');
-        this.log('  skrr machines dedicated grow          increase workspace storage; shrink is unsupported');
-        this.log('  skrr machines dedicated incident-close close AZ-recovery evidence hold');
-        this.log('  skrr machines dedicated health-check  probe daemon and disk liveness');
-        this.log('  skrr machines dedicated destroy       stop compute; keep or purge the workspace disk');
+        for (const [name, summary] of rows) {
+            this.log(`  skrr machines dedicated ${name.padEnd(15)} ${summary}`);
+        }
+        this.log('');
+        this.log('Lifecycle commands take --wait; every command takes --workspace for a workspace machine.');
     }
 }
 exports.default = DedicatedMachines;

package/dist/commands/machines/dedicated/list.d.ts

@@ -1,5 +1,5 @@
-import { BaseCommand } from '../../../base-command';
-export default class DedicatedMachinesList extends BaseCommand {
+import { DedicatedLeaseCommand } from '../../../lib/dedicated-lease-command';
+export default class DedicatedMachinesList extends DedicatedLeaseCommand {
     static description: string;
     static examples: string[];
     static flags: {

package/dist/commands/machines/dedicated/list.js

@@ -1,14 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@oclif/core");
-const base_command_1 = require("../../../base-command");
+const dedicated_lease_command_1 = require("../../../lib/dedicated-lease-command");
 const format_1 = require("../../../lib/format");
 const dedicated_machines_1 = require("../../../lib/dedicated-machines");
-class DedicatedMachinesList extends base_command_1.BaseCommand {
+class DedicatedMachinesList extends dedicated_lease_command_1.DedicatedLeaseCommand {
     static description = 'List Dedicated Runtime leases';
     static examples = [
         '<%= config.bin %> machines dedicated list',
-        '<%= config.bin %> machines dedicated list --json',
+        '<%= config.bin %> machines dedicated list --state stopped',
+        '<%= config.bin %> machines dedicated list --workspace <workspace-id> --json',
     ];
     static flags = {
         json: core_1.Flags.boolean({ description: 'Output as JSON' }),
@@ -18,38 +19,48 @@ class DedicatedMachinesList extends base_command_1.BaseCommand {
     async run() {
         this.requireAuth();
         const { flags } = await this.parse(DedicatedMachinesList);
-        let response;
-        try {
-            response = await (0, dedicated_machines_1.listDedicatedRuntimes)({
-                limit: flags.limit,
-                state: flags.state,
-            });
-        }
-        catch (err) {
-            const message = (0, dedicated_machines_1.formatDedicatedRuntimeApiError)(err);
-            if (message)
-                this.error(message, { exit: 1 });
-            this.handleApiError(err);
-        }
+        const response = await this.callDedicated(() => (0, dedicated_machines_1.listDedicatedRuntimes)({
+            limit: flags.limit,
+            state: flags.state,
+            ...this.scopeFrom(flags),
+        }));
         if (flags.json) {
             this.log(JSON.stringify(response, null, 2));
             return;
         }
         const leases = response?.leases ?? [];
         if (leases.length === 0) {
-            this.log('No Dedicated Runtime leases.');
+            // An empty filtered list and an empty account are different facts, and a
+            // scope that sees nothing is the usual reason a machine "disappeared".
+            this.log(flags.state
+                ? `No Dedicated Runtime leases in state "${flags.state}".`
+                : 'No Dedicated Runtime leases.');
+            if (!flags.workspace) {
+                this.log('Machines created in a workspace are listed with --workspace <id>.');
+            }
             return;
         }
         (0, format_1.renderTable)(leases.map((lease) => ({
             id: (0, format_1.formatCell)((0, dedicated_machines_1.dedicatedLeaseId)(lease)),
             status: (0, format_1.formatCell)((0, dedicated_machines_1.dedicatedLeaseState)(lease)),
             name: (0, format_1.formatCell)((0, dedicated_machines_1.dedicatedLeaseDisplayName)(lease)),
+            size: (0, format_1.formatCell)([
+                lease.resources?.sizePreset,
+                lease.resources?.storageGb ? `${lease.resources.storageGb}G` : '',
+            ]
+                .filter(Boolean)
+                .join(' ') || '-'),
+            spend: (0, format_1.formatCell)(lease.billing
+                ? `${(0, dedicated_machines_1.formatUsdCents)(lease.billing.currentMonthSpendCents)}/${(0, dedicated_machines_1.formatUsdCents)(lease.billing.monthlySpendLimitCents)}${lease.billing.spendingLimitExceeded ? ' OVER' : ''}`
+                : '-'),
             retention: (0, format_1.formatCell)(lease.storage?.retentionClass || '-'),
             backup: (0, format_1.formatCell)(lease.storage?.lastBackupAt || '-'),
         })), [
             { key: 'id', header: 'ID' },
             { key: 'status', header: 'STATUS' },
             { key: 'name', header: 'NAME', maxWidth: 28 },
+            { key: 'size', header: 'SIZE', maxWidth: 18 },
+            { key: 'spend', header: 'MONTH/CAP', maxWidth: 24 },
             { key: 'retention', header: 'RETENTION', maxWidth: 14 },
             { key: 'backup', header: 'LAST BACKUP', maxWidth: 24 },
         ], (line) => this.log(line));

package/dist/commands/machines/dedicated/restart.d.ts

@@ -1,11 +1,14 @@
-import { BaseCommand } from '../../../base-command';
-export default class DedicatedMachinesRestart extends BaseCommand {
+import { DedicatedLeaseCommand } from '../../../lib/dedicated-lease-command';
+export default class DedicatedMachinesRestart extends DedicatedLeaseCommand {
     static description: string;
     static examples: string[];
     static args: {
         lease: import("@oclif/core/lib/interfaces").Arg<string, Record<string, unknown>>;
     };
     static flags: {
+        wait: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        timeout: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        interval: import("@oclif/core/lib/interfaces").OptionFlag<number | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
         json: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };
     run(): Promise<void>;