@skrr-ai/cli 0.1.26 → 0.1.28

package/dist/base-command.js

@@ -38,6 +38,7 @@ const refresh_1 = require("./lib/refresh");
 const auth_storage_1 = require("./lib/auth-storage");
 const update_check_1 = require("./lib/update-check");
 const web_url_1 = require("./lib/web-url");
+const edge_error_page_1 = require("./lib/edge-error-page");
 const delegated_cli_1 = require("./lib/delegated-cli");
 const tasks_1 = require("./lib/tasks");
 function assigneePayloadNeedsResolution(payload) {
@@ -887,6 +888,30 @@ class BaseCommand extends core_1.Command {
                     retryable: true,
                 });
             }
+            else if ((e.status === 403 || e.status === 504) &&
+                !body &&
+                (0, edge_error_page_1.describeEdgeErrorPage)({ status: e.status, body: e.body, method: e.method })) {
+                // An HTML page in place of the API's JSON: the edge answered, not the
+                // API (OSK-8700, OSK-8705). A WAF 403 is a content match that the same
+                // request will hit again, not "transient" and not a permission; an edge
+                // 504 is a request the API may still be carrying out, not proof of an
+                // outage. 502/503 pages keep the outage branch below, which is what
+                // they usually are and which records the incident.
+                const edge = (0, edge_error_page_1.describeEdgeErrorPage)({
+                    status: e.status,
+                    body: e.body,
+                    method: e.method,
+                    host: this.cliConfig?.baseURL,
+                });
+                this.failWithCliError({
+                    message: say(edge.message),
+                    code: edge.code,
+                    status: e.status,
+                    exit: e.status === 403 ? 3 : 5,
+                    retryable: edge.retryable,
+                    ...(edge.requestId ? { details: { edgeRequestId: edge.requestId } } : {}),
+                });
+            }
             else if (e.status === 403) {
                 // A 403 WITH a body is the API deciding; it says why, and we relay it.
                 //

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

@@ -30,7 +30,7 @@ class DedicatedMachinesAttach extends dedicated_lease_command_1.DedicatedLeaseCo
     ];
     static args = {
         lease: core_1.Args.string({
-            description: 'Dedicated Runtime lease id',
+            description: dedicated_lease_command_1.DEDICATED_LEASE_ARG_DESCRIPTION,
             required: true,
             ignoreStdin: true,
         }),
@@ -50,7 +50,8 @@ class DedicatedMachinesAttach extends dedicated_lease_command_1.DedicatedLeaseCo
     async run() {
         this.requireAuth();
         const { args, flags } = await this.parse(DedicatedMachinesAttach);
-        const response = await this.callDedicated(() => (0, dedicated_machines_1.getDedicatedRuntime)(args.lease, this.scopeFrom(flags)));
+        const leaseId = await this.resolveLeaseArg(args.lease);
+        const response = await this.callDedicated(() => (0, dedicated_machines_1.getDedicatedRuntime)(leaseId, this.scopeFrom(flags)));
         const lease = response?.lease;
         if (!lease)
             this.error('Dedicated Runtime lease not found.', { exit: 1 });
@@ -61,7 +62,7 @@ class DedicatedMachinesAttach extends dedicated_lease_command_1.DedicatedLeaseCo
         }
         const { harness } = selection;
         if (!flags.json) {
-            process.stderr.write(`Attaching ${harness.provider} on ${args.lease} (harness ${harness._id}, ${harness.status || 'status unknown'}).\n` +
+            process.stderr.write(`Attaching ${harness.provider} on ${leaseId} (harness ${harness._id}, ${harness.status || 'status unknown'}).\n` +
                 'Everything the agent runs there acts as you: it shares the machine’s sign-ins and your skrr login.\n');
         }
         await attach_harness_1.default.run([

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

@@ -0,0 +1,19 @@
+import { DedicatedLeaseCommand } from '../../../lib/dedicated-lease-command';
+/**
+ * `skrr machines dedicated current` — which Dedicated Runtime am I running on?
+ *
+ * An agent working on the machine is the caller most likely to need its own
+ * lease — to snapshot before something risky, read the spend against the cap,
+ * or stop the machine when the work is done — and nothing in its environment
+ * names it. Every lease command also accepts `self`; this prints the answer so a
+ * script can hold it.
+ */
+export default class DedicatedMachinesCurrent extends DedicatedLeaseCommand {
+    static description: string;
+    static examples: string[];
+    static flags: {
+        id: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        json: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+    };
+    run(): Promise<void>;
+}

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

@@ -0,0 +1,49 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const core_1 = require("@oclif/core");
+const dedicated_lease_command_1 = require("../../../lib/dedicated-lease-command");
+const dedicated_machines_1 = require("../../../lib/dedicated-machines");
+const harnesses_1 = require("../../../lib/harnesses");
+/**
+ * `skrr machines dedicated current` — which Dedicated Runtime am I running on?
+ *
+ * An agent working on the machine is the caller most likely to need its own
+ * lease — to snapshot before something risky, read the spend against the cap,
+ * or stop the machine when the work is done — and nothing in its environment
+ * names it. Every lease command also accepts `self`; this prints the answer so a
+ * script can hold it.
+ */
+class DedicatedMachinesCurrent extends dedicated_lease_command_1.DedicatedLeaseCommand {
+    static description = 'Show the Dedicated Runtime this command is running on (every lease command also accepts `self`)';
+    static examples = [
+        '<%= config.bin %> machines dedicated current',
+        '<%= config.bin %> machines dedicated current --id',
+        '<%= config.bin %> machines dedicated snapshot self --wait',
+    ];
+    static flags = {
+        id: core_1.Flags.boolean({ description: 'Print only the lease id', exclusive: ['json'] }),
+        json: core_1.Flags.boolean({ description: 'Output as JSON' }),
+    };
+    async run() {
+        this.requireAuth();
+        const { flags } = await this.parse(DedicatedMachinesCurrent);
+        const leaseId = await this.resolveLeaseArg(dedicated_lease_command_1.DEDICATED_SELF_LEASE);
+        if (flags.id) {
+            this.log(leaseId);
+            return;
+        }
+        const response = await this.callDedicated(() => (0, dedicated_machines_1.getDedicatedRuntime)(leaseId));
+        if (flags.json) {
+            this.log(JSON.stringify(response, null, 2));
+            return;
+        }
+        const lease = response?.lease;
+        if (!lease) {
+            this.error(`Dedicated Runtime ${leaseId} is not visible to this login.`, { exit: 1 });
+        }
+        const listed = await this.callDedicated(() => (0, harnesses_1.listHarnesses)());
+        for (const line of (0, dedicated_machines_1.describeDedicatedLease)(lease, listed?.harnesses ?? []))
+            this.log(line);
+    }
+}
+exports.default = DedicatedMachinesCurrent;

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

@@ -12,7 +12,7 @@ class DedicatedMachinesDestroy extends dedicated_lease_command_1.DedicatedLeaseC
     ];
     static args = {
         lease: core_1.Args.string({
-            description: 'Dedicated Runtime lease id',
+            description: dedicated_lease_command_1.DEDICATED_LEASE_ARG_DESCRIPTION,
             required: true,
             ignoreStdin: true,
         }),
@@ -24,7 +24,7 @@ class DedicatedMachinesDestroy extends dedicated_lease_command_1.DedicatedLeaseC
             exclusive: ['purge-storage'],
         }),
         'purge-storage': core_1.Flags.boolean({
-            description: 'Permanently delete the workspace volume. Asks first unless --yes.',
+            description: 'Delete the workspace volume. It can be restored into a new machine for 7 days (`restore`), then every copy is deleted. Asks first unless --yes.',
             exclusive: ['retain-storage'],
         }),
         yes: core_1.Flags.boolean({
@@ -37,6 +37,7 @@ class DedicatedMachinesDestroy extends dedicated_lease_command_1.DedicatedLeaseC
     async run() {
         this.requireAuth();
         const { args, flags } = await this.parse(DedicatedMachinesDestroy);
+        const leaseId = await this.resolveLeaseArg(args.lease);
         // 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)
@@ -45,7 +46,7 @@ class DedicatedMachinesDestroy extends dedicated_lease_command_1.DedicatedLeaseC
         // 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 current = await this.callDedicated(() => (0, dedicated_machines_1.getDedicatedRuntime)(leaseId, this.scopeFrom(flags)));
             const lease = current?.lease;
             willPurge =
                 lease?.state === 'archived' ||
@@ -53,9 +54,9 @@ class DedicatedMachinesDestroy extends dedicated_lease_command_1.DedicatedLeaseC
         }
         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 });
+                this.error('This destroy deletes the workspace volume. 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] `);
+            const confirmed = await this.confirm(`Delete the workspace of ${leaseId}? You can restore it into a new machine for 7 days; after that its files, sign-ins and repositories are gone for good. [y/N] `);
             if (!confirmed) {
                 this.log('Aborted.');
                 this.exit(1);
@@ -66,7 +67,7 @@ class DedicatedMachinesDestroy extends dedicated_lease_command_1.DedicatedLeaseC
             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 }));
+        const response = await this.callDedicated(() => (0, dedicated_machines_1.destroyDedicatedRuntime)(leaseId, { ...this.scopeFrom(flags), retentionIntent }));
         await this.reportLeaseAction(response, flags, { kind: 'destroyed' }, 'Destroying');
     }
 }

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

@@ -8,6 +8,9 @@ import { BaseCommand } from '../../../base-command';
  * 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.
+ *
+ * The command is started and then observed (`lib/dedicated-exec.ts`), so it can
+ * run for its whole timeout whatever sits between the CLI and the API.
  */
 export default class DedicatedMachinesExec extends BaseCommand {
     static description: string;
@@ -21,6 +24,7 @@ export default class DedicatedMachinesExec extends BaseCommand {
         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>;
+        'request-id': 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>;
     };

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

@@ -5,6 +5,7 @@ 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 dedicated_exec_1 = require("../../../lib/dedicated-exec");
 const exec_1 = require("../hosted/exec");
 /**
  * `skrr machines dedicated exec` — the Run Command half of EC2 parity.
@@ -15,6 +16,9 @@ const exec_1 = require("../hosted/exec");
  * 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.
+ *
+ * The command is started and then observed (`lib/dedicated-exec.ts`), so it can
+ * run for its whole timeout whatever sits between the CLI and the API.
  */
 class DedicatedMachinesExec extends base_command_1.BaseCommand {
     static description = 'Run one command on a Dedicated Runtime machine and return its output and exit code';
@@ -23,6 +27,7 @@ class DedicatedMachinesExec extends base_command_1.BaseCommand {
         '<%= 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',
+        '<%= config.bin %> machines dedicated exec <lease-id> --request-id deploy-42 -- ./deploy.sh',
     ];
     static usage = 'machines dedicated exec <lease-id> [flags] -- <command...>';
     static args = {
@@ -42,6 +47,9 @@ class DedicatedMachinesExec extends base_command_1.BaseCommand {
         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.`,
         }),
+        'request-id': core_1.Flags.string({
+            description: 'Idempotency key for this command. Repeating the invocation with the same id returns the run it already started (and its output, for 5 minutes after it ends) instead of running it again. Letters, digits and . _ : / - only.',
+        }),
         workspace: core_1.Flags.string({ description: 'Workspace scope' }),
         json: core_1.Flags.boolean({ description: 'Output the result as JSON' }),
     };
@@ -60,6 +68,10 @@ class DedicatedMachinesExec extends base_command_1.BaseCommand {
         if (!command.trim()) {
             this.error('Command is required. Use --command or pass it after --.', { exit: 2 });
         }
+        const requestId = flags['request-id'];
+        if (requestId !== undefined && !dedicated_exec_1.EXEC_REQUEST_ID_PATTERN.test(requestId)) {
+            this.error('--request-id must be 1-200 characters of letters, digits and . _ : / - (it is sent as an idempotency key).', { exit: 2 });
+        }
         let timeoutMs;
         try {
             timeoutMs = (0, hosted_machines_1.parseDurationMs)(flags.timeout, '--timeout');
@@ -72,9 +84,14 @@ class DedicatedMachinesExec extends base_command_1.BaseCommand {
         }
         let result;
         try {
-            result = await (0, dedicated_machines_1.execDedicatedRuntime)(id, { command, ...(flags.cwd ? { cwd: flags.cwd } : {}), ...(timeoutMs ? { timeoutMs } : {}) }, { workspaceId: flags.workspace });
+            result = await (0, dedicated_exec_1.runDedicatedExec)(id, { command, ...(flags.cwd ? { cwd: flags.cwd } : {}), ...(timeoutMs ? { timeoutMs } : {}) }, { workspaceId: flags.workspace, ...(requestId ? { requestId } : {}) });
         }
         catch (err) {
+            if (err instanceof dedicated_exec_1.DedicatedExecContactLostError ||
+                err instanceof dedicated_exec_1.DedicatedExecStartUnconfirmedError ||
+                err instanceof dedicated_exec_1.DedicatedExecIdempotencyUnsupportedError) {
+                this.error(err.message, { exit: 1, code: err.code });
+            }
             const message = (0, dedicated_machines_1.formatDedicatedRuntimeApiError)(err);
             if (message)
                 this.error(message, { exit: 1, code: (0, dedicated_machines_1.dedicatedRuntimeApiErrorCode)(err) });
@@ -89,7 +106,7 @@ class DedicatedMachinesExec extends base_command_1.BaseCommand {
             // 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');
+                process.stderr.write(`\n${(0, dedicated_exec_1.describeTruncation)(result)}\n`);
             }
             if (result.timedOut) {
                 process.stderr.write(`\n[timed out after ${Math.round(result.durationMs / 1000)}s; the process group was killed]\n`);

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

@@ -11,7 +11,7 @@ class DedicatedMachinesGrow extends dedicated_lease_command_1.DedicatedLeaseComm
     ];
     static args = {
         lease: core_1.Args.string({
-            description: 'Dedicated Runtime lease id',
+            description: dedicated_lease_command_1.DEDICATED_LEASE_ARG_DESCRIPTION,
             required: true,
             ignoreStdin: true,
         }),
@@ -30,7 +30,8 @@ class DedicatedMachinesGrow extends dedicated_lease_command_1.DedicatedLeaseComm
     async run() {
         this.requireAuth();
         const { args, flags } = await this.parse(DedicatedMachinesGrow);
-        const response = await this.callDedicated(() => (0, dedicated_machines_1.growDedicatedRuntime)(args.lease, flags['storage-gb'], {
+        const leaseId = await this.resolveLeaseArg(args.lease);
+        const response = await this.callDedicated(() => (0, dedicated_machines_1.growDedicatedRuntime)(leaseId, flags['storage-gb'], {
             ...this.scopeFrom(flags),
             ...(flags['request-id'] ? { requestId: flags['request-id'] } : {}),
         }));

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

@@ -11,7 +11,7 @@ class DedicatedMachinesHealthCheck extends dedicated_lease_command_1.DedicatedLe
     ];
     static args = {
         lease: core_1.Args.string({
-            description: 'Dedicated Runtime lease id',
+            description: dedicated_lease_command_1.DEDICATED_LEASE_ARG_DESCRIPTION,
             required: true,
             ignoreStdin: true,
         }),
@@ -22,14 +22,15 @@ class DedicatedMachinesHealthCheck extends dedicated_lease_command_1.DedicatedLe
     async run() {
         this.requireAuth();
         const { args, flags } = await this.parse(DedicatedMachinesHealthCheck);
-        const response = await this.callDedicated(() => (0, dedicated_machines_1.performDedicatedLeaseAction)(args.lease, 'health-check', this.scopeFrom(flags)));
+        const leaseId = await this.resolveLeaseArg(args.lease);
+        const response = await this.callDedicated(() => (0, dedicated_machines_1.performDedicatedLeaseAction)(leaseId, 'health-check', this.scopeFrom(flags)));
         if (flags.json) {
             this.log(JSON.stringify(response, null, 2));
             return;
         }
         const lease = response?.lease;
         if (!lease) {
-            this.log(`Dedicated Runtime ${args.lease} ${(0, dedicated_machines_1.dedicatedLeaseState)(lease)}.`);
+            this.log(`Dedicated Runtime ${leaseId} ${(0, dedicated_machines_1.dedicatedLeaseState)(lease)}.`);
             return;
         }
         // A health check exists to answer "can it take work, and if not why" — the

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

@@ -11,7 +11,7 @@ class DedicatedMachinesIncidentClose extends dedicated_lease_command_1.Dedicated
     ];
     static args = {
         lease: core_1.Args.string({
-            description: 'Dedicated Runtime lease id',
+            description: dedicated_lease_command_1.DEDICATED_LEASE_ARG_DESCRIPTION,
             required: true,
             ignoreStdin: true,
         }),
@@ -25,7 +25,8 @@ class DedicatedMachinesIncidentClose extends dedicated_lease_command_1.Dedicated
     async run() {
         this.requireAuth();
         const { args, flags } = await this.parse(DedicatedMachinesIncidentClose);
-        const response = await this.callDedicated(() => (0, dedicated_machines_1.closeDedicatedRuntimeIncidentHold)(args.lease, {
+        const leaseId = await this.resolveLeaseArg(args.lease);
+        const response = await this.callDedicated(() => (0, dedicated_machines_1.closeDedicatedRuntimeIncidentHold)(leaseId, {
             ...this.scopeFrom(flags),
             ...(flags['request-id'] ? { requestId: flags['request-id'] } : {}),
         }));

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

@@ -13,6 +13,7 @@ class DedicatedMachines extends core_1.Command {
         '<%= 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 snapshot self --wait',
         '<%= 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',
@@ -34,6 +35,7 @@ class DedicatedMachines extends core_1.Command {
             ['create', 'request a Dedicated Runtime'],
             ['list', 'list Dedicated Runtime leases'],
             ['show', 'state, size, spend, health and engines of one lease'],
+            ['current', 'the lease of the machine this runs on (or pass `self`)'],
             ['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'],

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

@@ -12,7 +12,7 @@ class DedicatedMachinesRestart extends dedicated_lease_command_1.DedicatedLeaseC
     ];
     static args = {
         lease: core_1.Args.string({
-            description: 'Dedicated Runtime lease id',
+            description: dedicated_lease_command_1.DEDICATED_LEASE_ARG_DESCRIPTION,
             required: true,
             ignoreStdin: true,
         }),
@@ -24,7 +24,8 @@ class DedicatedMachinesRestart extends dedicated_lease_command_1.DedicatedLeaseC
     async run() {
         this.requireAuth();
         const { args, flags } = await this.parse(DedicatedMachinesRestart);
-        const response = await this.callDedicated(() => (0, dedicated_machines_1.performDedicatedLeaseAction)(args.lease, 'restart', this.scopeFrom(flags)));
+        const leaseId = await this.resolveLeaseArg(args.lease);
+        const response = await this.callDedicated(() => (0, dedicated_machines_1.performDedicatedLeaseAction)(leaseId, 'restart', this.scopeFrom(flags)));
         await this.reportLeaseAction(response, flags, { kind: 'running' }, 'Restarting');
     }
 }

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

@@ -0,0 +1,26 @@
+import { DedicatedLeaseCommand } from '../../../lib/dedicated-lease-command';
+/**
+ * `skrr machines dedicated restore` — bring back a deleted Dedicated Runtime.
+ *
+ * Deleting a workspace keeps one final recovery point for a window (seven days
+ * by default), because whoever deleted it may have been an agent acting with
+ * the owner's authority. This builds a NEW machine from that point, with the
+ * deleted one's files; the deleted lease stays deleted.
+ */
+export default class DedicatedMachinesRestore 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>;
+        name: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        'spending-limit-cents': import("@oclif/core/lib/interfaces").OptionFlag<number | undefined, 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/restore.js

@@ -0,0 +1,64 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const core_1 = require("@oclif/core");
+const node_crypto_1 = require("node:crypto");
+const dedicated_lease_command_1 = require("../../../lib/dedicated-lease-command");
+const dedicated_machines_1 = require("../../../lib/dedicated-machines");
+/**
+ * `skrr machines dedicated restore` — bring back a deleted Dedicated Runtime.
+ *
+ * Deleting a workspace keeps one final recovery point for a window (seven days
+ * by default), because whoever deleted it may have been an agent acting with
+ * the owner's authority. This builds a NEW machine from that point, with the
+ * deleted one's files; the deleted lease stays deleted.
+ */
+class DedicatedMachinesRestore extends dedicated_lease_command_1.DedicatedLeaseCommand {
+    static description = 'Restore a deleted Dedicated Runtime into a new machine, from the recovery point its deletion kept. Only inside the recovery window, and once.';
+    static examples = [
+        '<%= config.bin %> machines dedicated restore <deleted-lease-id>',
+        '<%= config.bin %> machines dedicated restore <deleted-lease-id> --name research-box --wait',
+    ];
+    static args = {
+        lease: core_1.Args.string({
+            description: 'The deleted Dedicated Runtime lease id (see `machines dedicated show`)',
+            required: true,
+            ignoreStdin: true,
+        }),
+    };
+    static flags = {
+        name: core_1.Flags.string({
+            description: 'Display name for the new machine (defaults to the deleted one, "(restored)")',
+        }),
+        'spending-limit-cents': core_1.Flags.integer({
+            description: "Monthly spending cap for the new machine (defaults to the deleted machine's)",
+            min: 1,
+        }),
+        'request-id': core_1.Flags.string({
+            description: 'Idempotency key. Reuse it to safely retry the same restore.',
+        }),
+        json: core_1.Flags.boolean({ description: 'Output as JSON' }),
+        ...dedicated_lease_command_1.dedicatedWaitFlags,
+    };
+    async run() {
+        this.requireAuth();
+        const { args, flags } = await this.parse(DedicatedMachinesRestore);
+        const requestId = flags['request-id'] || `dedicated-restore:${Date.now()}:${(0, node_crypto_1.randomBytes)(6).toString('hex')}`;
+        const response = await this.callDedicated(() => (0, dedicated_machines_1.restoreDeletedDedicatedRuntime)(args.lease, {
+            ...this.scopeFrom(flags),
+            requestId,
+            ...(flags.name ? { displayName: flags.name } : {}),
+            ...(flags['spending-limit-cents'] !== undefined
+                ? { monthlySpendingLimitCents: flags['spending-limit-cents'] }
+                : {}),
+        }));
+        if (!flags.json) {
+            const lease = response?.lease;
+            this.log(`Restoring ${args.lease} into ${(0, dedicated_machines_1.dedicatedLeaseDisplayName)(lease)} (${(0, dedicated_machines_1.dedicatedLeaseId)(lease) || 'unknown'}).`);
+            if (flags.wait && !flags['request-id']) {
+                process.stderr.write(`Request id ${requestId} (reuse it with --request-id to retry safely)\n`);
+            }
+        }
+        await this.reportLeaseAction(response, flags, { kind: 'running' }, 'Restoring');
+    }
+}
+exports.default = DedicatedMachinesRestore;

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

@@ -13,7 +13,7 @@ class DedicatedMachinesShow extends dedicated_lease_command_1.DedicatedLeaseComm
     static args = {
         lease: core_1.Args.string({
             ignoreStdin: true,
-            description: 'Dedicated Runtime lease id',
+            description: dedicated_lease_command_1.DEDICATED_LEASE_ARG_DESCRIPTION,
             required: true,
         }),
     };
@@ -23,7 +23,8 @@ class DedicatedMachinesShow extends dedicated_lease_command_1.DedicatedLeaseComm
     async run() {
         this.requireAuth();
         const { args, flags } = await this.parse(DedicatedMachinesShow);
-        const response = await this.callDedicated(() => (0, dedicated_machines_1.getDedicatedRuntime)(args.lease, this.scopeFrom(flags)));
+        const leaseId = await this.resolveLeaseArg(args.lease);
+        const response = await this.callDedicated(() => (0, dedicated_machines_1.getDedicatedRuntime)(leaseId, this.scopeFrom(flags)));
         const lease = response?.lease;
         if (!lease) {
             this.error('Dedicated Runtime lease not found.', { exit: 1 });

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

@@ -12,7 +12,7 @@ class DedicatedMachinesSnapshot extends dedicated_lease_command_1.DedicatedLease
     ];
     static args = {
         lease: core_1.Args.string({
-            description: 'Dedicated Runtime lease id',
+            description: dedicated_lease_command_1.DEDICATED_LEASE_ARG_DESCRIPTION,
             required: true,
             ignoreStdin: true,
         }),
@@ -24,7 +24,8 @@ class DedicatedMachinesSnapshot extends dedicated_lease_command_1.DedicatedLease
     async run() {
         this.requireAuth();
         const { args, flags } = await this.parse(DedicatedMachinesSnapshot);
-        const response = await this.callDedicated(() => (0, dedicated_machines_1.performDedicatedLeaseAction)(args.lease, 'snapshot', this.scopeFrom(flags)));
+        const leaseId = await this.resolveLeaseArg(args.lease);
+        const response = await this.callDedicated(() => (0, dedicated_machines_1.performDedicatedLeaseAction)(leaseId, 'snapshot', this.scopeFrom(flags)));
         // A snapshot returns the lease to the state it left, so the state cannot say
         // whether it worked. The recovery point's timestamp can: the 202 carries the
         // previous one, and success is a newer one.

package/dist/commands/machines/dedicated/spending-limit.js

@@ -20,7 +20,7 @@ class DedicatedMachinesSpendingLimit extends dedicated_lease_command_1.Dedicated
     ];
     static args = {
         lease: core_1.Args.string({
-            description: 'Dedicated Runtime lease id',
+            description: dedicated_lease_command_1.DEDICATED_LEASE_ARG_DESCRIPTION,
             required: true,
             ignoreStdin: true,
         }),
@@ -36,13 +36,14 @@ class DedicatedMachinesSpendingLimit extends dedicated_lease_command_1.Dedicated
     async run() {
         this.requireAuth();
         const { args, flags } = await this.parse(DedicatedMachinesSpendingLimit);
-        const response = await this.callDedicated(() => (0, dedicated_machines_1.setDedicatedRuntimeSpendingLimit)(args.lease, flags.cents, this.scopeFrom(flags)));
+        const leaseId = await this.resolveLeaseArg(args.lease);
+        const response = await this.callDedicated(() => (0, dedicated_machines_1.setDedicatedRuntimeSpendingLimit)(leaseId, flags.cents, this.scopeFrom(flags)));
         if (flags.json) {
             this.log(JSON.stringify(response, null, 2));
             return;
         }
         const lease = response?.lease;
-        this.log(`Dedicated Runtime ${(0, dedicated_machines_1.dedicatedLeaseId)(lease) || args.lease} spending cap updated.`);
+        this.log(`Dedicated Runtime ${(0, dedicated_machines_1.dedicatedLeaseId)(lease) || leaseId} spending cap updated.`);
         if (lease)
             this.log(`  ${(0, dedicated_machines_1.dedicatedSpendSummary)(lease)}`);
     }

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

@@ -12,7 +12,7 @@ class DedicatedMachinesStart extends dedicated_lease_command_1.DedicatedLeaseCom
     ];
     static args = {
         lease: core_1.Args.string({
-            description: 'Dedicated Runtime lease id',
+            description: dedicated_lease_command_1.DEDICATED_LEASE_ARG_DESCRIPTION,
             required: true,
             ignoreStdin: true,
         }),
@@ -24,7 +24,8 @@ class DedicatedMachinesStart extends dedicated_lease_command_1.DedicatedLeaseCom
     async run() {
         this.requireAuth();
         const { args, flags } = await this.parse(DedicatedMachinesStart);
-        const response = await this.callDedicated(() => (0, dedicated_machines_1.performDedicatedLeaseAction)(args.lease, 'start', this.scopeFrom(flags)));
+        const leaseId = await this.resolveLeaseArg(args.lease);
+        const response = await this.callDedicated(() => (0, dedicated_machines_1.performDedicatedLeaseAction)(leaseId, 'start', this.scopeFrom(flags)));
         await this.reportLeaseAction(response, flags, { kind: 'running' }, 'Starting');
     }
 }

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

@@ -12,7 +12,7 @@ class DedicatedMachinesStop extends dedicated_lease_command_1.DedicatedLeaseComm
     ];
     static args = {
         lease: core_1.Args.string({
-            description: 'Dedicated Runtime lease id',
+            description: dedicated_lease_command_1.DEDICATED_LEASE_ARG_DESCRIPTION,
             required: true,
             ignoreStdin: true,
         }),
@@ -24,7 +24,8 @@ class DedicatedMachinesStop extends dedicated_lease_command_1.DedicatedLeaseComm
     async run() {
         this.requireAuth();
         const { args, flags } = await this.parse(DedicatedMachinesStop);
-        const response = await this.callDedicated(() => (0, dedicated_machines_1.performDedicatedLeaseAction)(args.lease, 'stop', this.scopeFrom(flags)));
+        const leaseId = await this.resolveLeaseArg(args.lease);
+        const response = await this.callDedicated(() => (0, dedicated_machines_1.performDedicatedLeaseAction)(leaseId, 'stop', this.scopeFrom(flags)));
         await this.reportLeaseAction(response, flags, { kind: 'stopped' }, 'Stopping');
     }
 }