@skrr-ai/cli 0.1.28 → 0.1.29

package/dist/commands/inbox/index.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.listenForFollowStop = listenForFollowStop;
 const core_1 = require("@oclif/core");
 const socket_io_client_1 = require("socket.io-client");
 const data_provider_1 = require("@skrr-ai/data-provider");
@@ -7,6 +8,33 @@ const base_command_1 = require("../../base-command");
 const inbox_1 = require("../../lib/inbox");
 const format_1 = require("../../lib/format");
 const agentic_stream_1 = require("../../lib/agentic-stream");
+/**
+ * Stop `--follow` on Ctrl-C or SIGTERM, and end with the status a shell
+ * reports for that signal (130 / 143).
+ *
+ * The listener only started running with OSK-8708 — auth-core's lock handler
+ * used to exit the process first, with 130 for SIGINT. Now the follow loop
+ * stops and the command returns normally, which on its own would report
+ * success (0) for an interrupted follow and change what a script reads.
+ */
+function listenForFollowStop(proc = process) {
+    let stopped = false;
+    const stopOn = (status) => () => {
+        stopped = true;
+        proc.exitCode = status;
+    };
+    const onSigint = stopOn(130);
+    const onSigterm = stopOn(143);
+    proc.once('SIGINT', onSigint);
+    proc.once('SIGTERM', onSigterm);
+    return {
+        stopped: () => stopped,
+        dispose: () => {
+            proc.removeListener('SIGINT', onSigint);
+            proc.removeListener('SIGTERM', onSigterm);
+        },
+    };
+}
 /**
  * `skrr inbox` / `skrr inbox --follow` — what have my agents said to me?
  *
@@ -157,12 +185,7 @@ class Inbox extends base_command_1.BaseCommand {
      */
     async follow(flags) {
         const cursors = new Map();
-        let stopped = false;
-        const stop = () => {
-            stopped = true;
-        };
-        process.once('SIGINT', stop);
-        process.once('SIGTERM', stop);
+        const stop = listenForFollowStop();
         const emit = (message) => {
             if (flags.json) {
                 this.log(JSON.stringify(message));
@@ -184,7 +207,7 @@ class Inbox extends base_command_1.BaseCommand {
                 return;
             }
             for (const dm of dms) {
-                if (stopped)
+                if (stop.stopped())
                     break;
                 const seen = cursors.get(dm.conversationId);
                 // Skip the fetch entirely when the DM has not advanced. Without this,
@@ -233,7 +256,11 @@ class Inbox extends base_command_1.BaseCommand {
         });
         const received = new Set();
         socket.on('agent:user_message', (event) => {
-            if (stopped || !event.agentId || !event.conversationId || !event.createdAt || !event.text)
+            if (stop.stopped() ||
+                !event.agentId ||
+                !event.conversationId ||
+                !event.createdAt ||
+                !event.text)
                 return;
             if (flags.agent && event.agentId !== flags.agent)
                 return;
@@ -251,20 +278,25 @@ class Inbox extends base_command_1.BaseCommand {
             if (!flags.json)
                 this.warn(`inbox push disconnected: ${error.message}`);
         });
-        await sync(true);
-        if (!flags.json) {
-            const label = flags.agent ? `agent ${flags.agent}` : 'all agents';
-            this.log(`— watching ${label}, authenticated push with cursor backfill (Ctrl-C to stop) —`);
+        try {
+            await sync(true);
+            if (!flags.json) {
+                const label = flags.agent ? `agent ${flags.agent}` : 'all agents';
+                this.log(`— watching ${label}, authenticated push with cursor backfill (Ctrl-C to stop) —`);
+            }
+            while (!stop.stopped()) {
+                // Socket.IO reconnects independently. This low-frequency reconciliation
+                // also covers an older server that has not yet emitted the live event.
+                await sleep((0, inbox_1.clampInterval)(flags.interval) * 1000, stop.stopped);
+                if (!socket.connected)
+                    await sync(false);
+            }
         }
-        while (!stopped) {
-            // Socket.IO reconnects independently. This low-frequency reconciliation
-            // also covers an older server that has not yet emitted the live event.
-            await sleep((0, inbox_1.clampInterval)(flags.interval) * 1000, () => stopped);
-            if (!socket.connected)
-                await sync(false);
+        finally {
+            socket.removeAllListeners();
+            socket.disconnect();
+            stop.dispose();
         }
-        socket.removeAllListeners();
-        socket.disconnect();
     }
 }
 exports.default = Inbox;

package/dist/commands/instructions/install.d.ts

@@ -14,4 +14,16 @@ export default class InstructionsInstall extends BaseCommand {
         json: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };
     run(): Promise<void>;
+    /**
+     * The daemon the targets are created on, by the rule every daemon-picking
+     * command shares (`lib/daemon-target.ts`, OSK-8759).
+     *
+     * On a Dedicated Runtime guest that is the guest's own daemon, and unlike an
+     * engine install it is not refused: the API accepts any daemon with a live
+     * daemon session on the account (`ManagedInstructions.requireOwnedDaemon`),
+     * and the guest daemon reconciles a project target by writing its files as the
+     * workload (`daemon/src/managed-instructions/sync.ts`). Off a guest the rule is
+     * the one this command always had — the only daemon online, or `--daemon`.
+     */
+    private resolveDaemon;
 }

package/dist/commands/instructions/install.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@oclif/core");
 const data_provider_1 = require("@skrr-ai/data-provider");
 const base_command_1 = require("../../base-command");
+const daemon_target_1 = require("../../lib/daemon-target");
 const prompt_1 = require("../../lib/prompt");
 class InstructionsInstall extends base_command_1.BaseCommand {
     static description = 'Opt in a daemon target to ongoing managed instruction reconciliation';
@@ -14,7 +15,9 @@ class InstructionsInstall extends base_command_1.BaseCommand {
             description: 'Instruction ID (the id `skrr instructions list` prints)',
             required: true,
         }),
-        daemon: core_1.Flags.string({ description: 'Daemon ID; inferred when exactly one daemon is online' }),
+        daemon: core_1.Flags.string({
+            description: 'Daemon ID; defaults to this machine on a Dedicated Runtime, otherwise inferred when exactly one daemon is online',
+        }),
         provider: core_1.Flags.string({
             description: 'Provider to manage (repeatable)',
             options: ['claude', 'codex', 'sky-code'],
@@ -86,19 +89,7 @@ class InstructionsInstall extends base_command_1.BaseCommand {
         const confirmed = await (0, prompt_1.confirmDestructive)(`Authorize continuous ${flags.provider.join(', ')} reconciliation on this target?${teamWarning}`, flags.yes);
         if (!confirmed)
             return this.log('Aborted.');
-        let daemonId = flags.daemon;
-        if (!daemonId) {
-            try {
-                const daemons = await data_provider_1.dataService.getDaemons();
-                if (daemons.active.length !== 1) {
-                    this.error('Pass --daemon when zero or multiple daemons are online', { exit: 2 });
-                }
-                daemonId = daemons.active[0].daemonId;
-            }
-            catch (error) {
-                this.handleApiError(error);
-            }
-        }
+        const daemonId = await this.resolveDaemon(flags.daemon);
         const results = [];
         try {
             for (const provider of flags.provider) {
@@ -124,5 +115,59 @@ class InstructionsInstall extends base_command_1.BaseCommand {
             this.log(`Install queued: ${result.target.provider} ${result.target.scope}${result.target.projectPath ? ` ${result.target.projectPath}` : ''} (${result.target.id})`);
         }
     }
+    /**
+     * The daemon the targets are created on, by the rule every daemon-picking
+     * command shares (`lib/daemon-target.ts`, OSK-8759).
+     *
+     * On a Dedicated Runtime guest that is the guest's own daemon, and unlike an
+     * engine install it is not refused: the API accepts any daemon with a live
+     * daemon session on the account (`ManagedInstructions.requireOwnedDaemon`),
+     * and the guest daemon reconciles a project target by writing its files as the
+     * workload (`daemon/src/managed-instructions/sync.ts`). Off a guest the rule is
+     * the one this command always had — the only daemon online, or `--daemon`.
+     */
+    async resolveDaemon(explicit) {
+        let target;
+        try {
+            target = await (0, daemon_target_1.resolveDaemonTarget)({
+                explicit,
+                local: (0, daemon_target_1.localMachine)({ baseURL: this.cliConfig?.baseURL }),
+                // ONLINE daemons, as before — not the registered list `skrr code install`
+                // reads: a target is reconciled by a connected daemon.
+                listActiveDaemons: async () => (await data_provider_1.dataService.getDaemons()).active.map((daemon) => ({
+                    id: daemon.daemonId,
+                    ...(daemon.deviceName ? { name: daemon.deviceName } : {}),
+                })),
+            });
+        }
+        catch (error) {
+            this.handleApiError(error);
+        }
+        if (target.kind === 'daemon')
+            return target.daemonId;
+        if (target.kind === 'this-machine') {
+            if (target.daemonId)
+                return target.daemonId;
+            // A guest whose daemon has published no id this process can read: it is
+            // stopped, or the operator narrowed the CLI surface. Naming another machine
+            // would be a guess, and the account list is exactly the wrong one.
+            this.failWithCliError({
+                message: "This machine's daemon has not published its id, so it cannot be targeted by default " +
+                    `(it may be stopped). Pass --daemon with its id from \`${this.config.bin} list-daemons\`.`,
+                code: 'LOCAL_DAEMON_UNPUBLISHED',
+                exit: 1,
+                retryable: false,
+            });
+        }
+        // Exactly as this refusal has always reached a user: it was raised inside the
+        // listing's try, so `handleApiError` rendered it as `CLI_ERROR`, exit 1 —
+        // not the `exit: 2` its `this.error` asked for. Kept, so a laptop sees no change.
+        this.failWithCliError({
+            message: 'Pass --daemon when zero or multiple daemons are online',
+            code: 'CLI_ERROR',
+            exit: 1,
+            retryable: false,
+        });
+    }
 }
 exports.default = InstructionsInstall;

package/dist/commands/login.js

@@ -9,6 +9,7 @@ const daemon_setup_1 = require("../lib/daemon-setup");
 const config_1 = require("../lib/config");
 const keychain_1 = require("../lib/keychain");
 const login_1 = require("../lib/login");
+const device_code_1 = require("../lib/device-code");
 const api_fetch_1 = require("../lib/api-fetch");
 const auth_storage_1 = require("../lib/auth-storage");
 /**
@@ -220,6 +221,11 @@ class Login extends base_command_1.BaseCommand {
                 }
             }
             catch (err) {
+                // Ctrl-C while waiting for device-code approval: a person's decision,
+                // not a failure, and 130 as a shell reports an interrupt.
+                if (err instanceof device_code_1.DeviceCodeLoginCancelledError) {
+                    this.error(err.message, { exit: err.exitCode, code: err.code });
+                }
                 // Everything structured in login.ts throws Error; surface the
                 // message through the standard handler.
                 this.handleApiError(err);

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

@@ -40,7 +40,7 @@ class DedicatedMachinesAttach extends dedicated_lease_command_1.DedicatedLeaseCo
             description: 'Agent to attach. Inside an agent session it defaults to that agent (OVERSKY_SESSION_AGENT_ID).',
         }),
         engine: core_1.Flags.string({
-            description: 'Which engine row to attach when the machine registered several (claude, codex, sky-code, oversky). Required only when it is ambiguous.',
+            description: 'Which engine row to attach when the machine registered several (claude, codex, sky-code). Required only when it is ambiguous.',
         }),
         'rebind-tasks': core_1.Flags.boolean({
             description: 'Publish the updated agent release and move dormant assigned task pins to it. Running and finished tasks are never changed.',

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

@@ -8,6 +8,7 @@ import { BaseCommand } from '../../../base-command';
  * half-written.
  */
 export default class DedicatedMachinesCp extends BaseCommand {
+    static summary: string;
     static description: string;
     static examples: string[];
     static args: {

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

@@ -4,6 +4,7 @@ const core_1 = require("@oclif/core");
 const base_command_1 = require("../../../base-command");
 const dedicated_machines_1 = require("../../../lib/dedicated-machines");
 const dedicated_copy_1 = require("../../../lib/dedicated-copy");
+const LIMIT_MIB = dedicated_machines_1.DEDICATED_FILE_MAX_BYTES / (1024 * 1024);
 /**
  * `skrr machines dedicated cp` — copy ONE file to or from a Dedicated Runtime.
  *
@@ -13,9 +14,26 @@ const dedicated_copy_1 = require("../../../lib/dedicated-copy");
  * half-written.
  */
 class DedicatedMachinesCp extends base_command_1.BaseCommand {
-    static description = 'Copy a file to or from a Dedicated Runtime machine';
+    static summary = 'Copy a file to or from a Dedicated Runtime machine';
+    // What the copy accepts, in the help read before trying it (OSK-8714).
+    static description = [
+        `One file of at most ${LIMIT_MIB} MiB, in either direction; exactly one side is <lease-id>:<path>. ` +
+            'Push anything larger through Git or object storage.',
+        'On the machine a path is relative to /workspace (/workspace/... works too) and must be inside ' +
+            'repos/ or user-data/: the rest of the workspace belongs to the runtime. A path that leads ' +
+            'outside the workspace through a symbolic link is refused, and so is a name that holds ' +
+            'credentials (.env, keys, .ssh/, .npmrc, .git/config and the like). A missing directory on the ' +
+            'machine is created.',
+        'As with cp and scp, a destination that ends in / or is an existing directory receives the file ' +
+            'under its source name.',
+        'Neither side is left half-written: the file is staged beside its destination and renamed into ' +
+            'place at the end. A file that changes while it is copied is refused, not spliced. Ctrl-C removes ' +
+            'the partial copy and exits 130 (143 for SIGTERM, 129 when the terminal closes). Progress is ' +
+            'shown on a terminal, but not with --json or under CI.',
+    ].join('\n\n');
     static examples = [
         '<%= config.bin %> machines dedicated cp ./dist/app.tar.gz rtl_abc123:repos/app/app.tar.gz',
+        '<%= config.bin %> machines dedicated cp ./notes.md rtl_abc123:user-data/',
         '<%= config.bin %> machines dedicated cp rtl_abc123:repos/app/coverage/report.html ./report.html',
     ];
     // `ignoreStdin: true` on both, per the CLI's own hygiene rule: without it oclif
@@ -23,12 +41,12 @@ class DedicatedMachinesCp extends base_command_1.BaseCommand {
     // typed with one argument hangs on a pipe instead of saying what it needs.
     static args = {
         source: core_1.Args.string({
-            description: 'Local path, or <lease-id>:<path> on the machine',
+            description: 'Local path, or <lease-id>:<path> on the machine (relative to /workspace, inside repos/ or user-data/)',
             required: true,
             ignoreStdin: true,
         }),
         destination: core_1.Args.string({
-            description: 'Local path, or <lease-id>:<path> on the machine',
+            description: 'Local path, or <lease-id>:<path> on the machine; a directory (or a path ending in /) receives the file under its own name',
             required: true,
             ignoreStdin: true,
         }),
@@ -48,24 +66,60 @@ class DedicatedMachinesCp extends base_command_1.BaseCommand {
             this.error(err.message, { exit: 2 });
         }
         const scope = { workspaceId: flags.workspace };
+        // Progress is drawn on stderr, for a person at a terminal: never into a
+        // --json document, and never into a CI log as a stream of carriage returns.
+        const progress = !flags.json && process.stderr.isTTY && !(0, dedicated_copy_1.isContinuousIntegration)()
+            ? (0, dedicated_copy_1.createCopyProgress)({
+                label: plan.direction === 'upload' ? 'Uploading' : 'Downloading',
+                write: (text) => process.stderr.write(text),
+            })
+            : null;
+        const onProgress = progress ? progress.update : undefined;
+        // Ctrl-C, SIGTERM and a closed terminal cancel the copy, which removes its
+        // partial before it rejects. An ordinary listener: the auth lock's handler
+        // defers to it, and exits the process itself on a second signal.
+        const interrupt = (0, dedicated_copy_1.listenForCopyInterrupt)();
         let result;
         try {
+            const { signal } = interrupt;
             result =
                 plan.direction === 'upload'
-                    ? await (0, dedicated_copy_1.uploadToDedicatedRuntime)(plan.localPath, plan.leaseId, plan.remotePath, scope)
-                    : await (0, dedicated_copy_1.downloadFromDedicatedRuntime)(plan.leaseId, plan.remotePath, plan.localPath, scope);
+                    ? await (0, dedicated_copy_1.uploadToDedicatedRuntime)(plan.localPath, plan.leaseId, plan.remotePath, scope, {
+                        signal,
+                        onProgress,
+                    })
+                    : await (0, dedicated_copy_1.downloadFromDedicatedRuntime)(plan.leaseId, plan.remotePath, plan.localPath, scope, { signal, onProgress });
         }
-        catch (err) {
+        catch (thrown) {
+            progress?.clear();
+            // Whatever the loop threw on its way out, a signal is why it stopped.
+            const interruptedBy = interrupt.interruptedBy();
+            const err = interruptedBy ? new dedicated_copy_1.DedicatedCopyCancelledError(interruptedBy) : thrown;
+            if (err instanceof dedicated_copy_1.DedicatedCopyCancelledError) {
+                this.error(plan.direction === 'upload'
+                    ? `${err.message} ${plan.leaseId}:${plan.remotePath} was not replaced; the partial copy staged beside it is removed now or, if the machine could not be reached, by a later upload into that directory.`
+                    : `${err.message} Nothing was written to ${plan.localPath}.`, { exit: err.exitCode, code: err.code });
+            }
+            // Refusals the CLI makes itself carry the code the server gives the same
+            // cause, so a script branches on one code whichever side noticed.
+            if (err instanceof dedicated_copy_1.DedicatedCopyError) {
+                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) });
-            // A local failure (missing file, too large, changed mid-copy) is ours to
-            // explain; an API failure without a readable body goes to the shared path.
+            // Any other local failure (a destination that cannot be written, say) is
+            // ours to explain; an API failure without a readable body goes to the
+            // shared path.
             if (err instanceof Error && typeof err.status !== 'number') {
-                this.error(err.message, { exit: 1 });
+                this.error(err.message, { exit: 1, code: 'DEDICATED_RUNTIME_FILE_TRANSFER_FAILED' });
             }
             this.handleApiError(err);
         }
+        finally {
+            interrupt.dispose();
+        }
+        progress?.clear();
         if (flags.json) {
             this.log(JSON.stringify({ direction: plan.direction, ...result }, null, 2));
             return;

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

@@ -12,7 +12,7 @@ export default class DedicatedMachinesCreate extends DedicatedLeaseCommand {
         'storage-gb': import("@oclif/core/lib/interfaces").OptionFlag<number | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
         'retention-class': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
         'backup-profile': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
-        'spending-limit-cents': import("@oclif/core/lib/interfaces").OptionFlag<number, import("@oclif/core/lib/interfaces").CustomOptions>;
+        'spending-limit-cents': import("@oclif/core/lib/interfaces").OptionFlag<number | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
         repository: 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>;
         'request-id': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;

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

@@ -7,6 +7,7 @@ const dedicated_machines_1 = require("../../../lib/dedicated-machines");
 class DedicatedMachinesCreate extends dedicated_lease_command_1.DedicatedLeaseCommand {
     static description = 'Request a Dedicated Runtime lease. See `machines dedicated catalog` for sizes, storage bounds and prices.';
     static examples = [
+        '<%= config.bin %> machines dedicated create --name dev-box --size-preset standard',
         '<%= config.bin %> machines dedicated create --name dev-box --size-preset standard --spending-limit-cents 20000',
         '<%= config.bin %> machines dedicated create --name dev-box --size-preset standard --spending-limit-cents 20000 --repository acme/app --wait --json',
     ];
@@ -38,9 +39,13 @@ class DedicatedMachinesCreate extends dedicated_lease_command_1.DedicatedLeaseCo
         'backup-profile': core_1.Flags.string({
             description: 'crash-consistent (AWS Backup) or application-consistent (guest fsfreeze while the daemon is reachable; scheduled DLM when that plan is enabled). Defaults to the product catalog value.',
         }),
+        // Not required, and no client-side value either. Every lease has a cap:
+        // when create names none, the server applies the product's default cap,
+        // the "default monthly cap" `machines dedicated catalog` shows. Marking the
+        // flag required contradicted that catalog line (OSK-8691), and restating
+        // the default here would be the `--storage-gb` bug above.
         'spending-limit-cents': core_1.Flags.integer({
-            description: 'Monthly spending limit in cents. Required; change it later with `machines dedicated spending-limit`.',
-            required: true,
+            description: "Monthly spending cap in cents. Omit it to take the product's default cap (see `machines dedicated catalog`); change it later with `machines dedicated spending-limit`.",
         }),
         repository: core_1.Flags.string({
             description: 'Default GitHub repository (owner/repo) for git credentials on the machine. Requires the GitHub App installed for it; a clone of another repository the App covers still works.',

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

@@ -1,4 +1,25 @@
 import { BaseCommand } from '../../../base-command';
+/**
+ * The command string to send, or why the invocation is ambiguous.
+ *
+ * `--command` is one shell string; the words after the lease id are argv,
+ * quoted one by one. Either way of giving it used to drop words without a word
+ * (OSK-8703): `exec <lease> --command 'echo A' -- echo B` ran `echo A` and exited
+ * 0, and words between the lease id and `--` were discarded in favour of the
+ * words after it. Both are refused, because only the caller knows which part
+ * they meant.
+ */
+export declare function resolveDedicatedExecCommand(input: {
+    commandFlag: string | undefined;
+    /** Everything after the first `--`, or null when none was typed. */
+    tail: string[] | null;
+    /** Positional words after the lease id, before any `--`. */
+    positional: string[];
+}): {
+    command: string;
+} | {
+    error: string;
+};
 /**
  * `skrr machines dedicated exec` — the Run Command half of EC2 parity.
  *
@@ -13,12 +34,13 @@ import { BaseCommand } from '../../../base-command';
  * run for its whole timeout whatever sits between the CLI and the API.
  */
 export default class DedicatedMachinesExec extends BaseCommand {
+    static summary: string;
     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>>;
+        command: import("@oclif/core/lib/interfaces").Arg<string[] | undefined, Record<string, unknown>>;
     };
     static flags: {
         command: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;

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

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveDedicatedExecCommand = resolveDedicatedExecCommand;
 const core_1 = require("@oclif/core");
 const base_command_1 = require("../../../base-command");
 const shell_quote_1 = require("../../../lib/shell-quote");
@@ -7,6 +8,35 @@ 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");
+/**
+ * The command string to send, or why the invocation is ambiguous.
+ *
+ * `--command` is one shell string; the words after the lease id are argv,
+ * quoted one by one. Either way of giving it used to drop words without a word
+ * (OSK-8703): `exec <lease> --command 'echo A' -- echo B` ran `echo A` and exited
+ * 0, and words between the lease id and `--` were discarded in favour of the
+ * words after it. Both are refused, because only the caller knows which part
+ * they meant.
+ */
+function resolveDedicatedExecCommand(input) {
+    const { commandFlag, tail, positional } = input;
+    const argv = [...positional, ...(tail ?? [])];
+    if (commandFlag !== undefined) {
+        if (argv.length > 0) {
+            return {
+                error: "Give the command once: --command '<shell string>', or the words after --, not both " +
+                    `(${(0, shell_quote_1.shellQuoteArgv)(argv)} would not have run).`,
+            };
+        }
+        return { command: commandFlag };
+    }
+    if (tail !== null && tail.length > 0 && positional.length > 0) {
+        return {
+            error: `Put the whole command after --: ${(0, shell_quote_1.shellQuoteArgv)(positional)} came before it and would not have run.`,
+        };
+    }
+    return { command: (0, shell_quote_1.shellQuoteArgv)(argv) };
+}
 /**
  * `skrr machines dedicated exec` — the Run Command half of EC2 parity.
  *
@@ -21,8 +51,21 @@ const exec_1 = require("../hosted/exec");
  * 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';
-    static strict = false;
+    static summary = 'Run one command on a Dedicated Runtime machine and return its output and exit code';
+    // What a script depends on, in the help a script author reads (OSK-8703).
+    static description = [
+        'Runs the command once, as the workload user, in /workspace or --cwd, through a shell with no TTY. ' +
+            'Give it after -- as words (each one quoted for you), or as one shell string with --command; not both. ' +
+            'The agent shell policy does not apply. A start whose answer is lost is followed up under the same ' +
+            'request id, never run a second time.',
+        "Exit status: the command's own exit code, and 124 when --timeout passes (its process group is killed; " +
+            'what it printed before then is still shown). When skrr refuses or cannot reach the machine it exits 1 ' +
+            '(2 for a usage mistake) and prints a Code: line on stderr.',
+        'Output: stdout and stderr together. Each keeps its own order, but they are read as two streams, so a ' +
+            "line from one can land before a line the other printed first; use --command '{ ...; } 2>&1' when that " +
+            'order matters. The machine returns at most 1 MB and the last 256 KiB of it is kept; when output was ' +
+            'cut, stderr says how much.',
+    ].join('\n\n');
     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',
@@ -30,16 +73,26 @@ class DedicatedMachinesExec extends base_command_1.BaseCommand {
         '<%= config.bin %> machines dedicated exec <lease-id> --request-id deploy-42 -- ./deploy.sh',
     ];
     static usage = 'machines dedicated exec <lease-id> [flags] -- <command...>';
+    // The words after the lease id are a declared VARIADIC argument, not a
+    // `strict = false` command: oclif renders every argument of a non-strict
+    // command as variadic, so help read `ID...` — "one or more lease ids" — for a
+    // command that takes exactly one (OSK-8703).
     static args = {
         id: core_1.Args.string({
             description: 'Dedicated Runtime lease id',
             required: true,
             ignoreStdin: true,
         }),
+        command: core_1.Args.string({
+            description: 'The command and its arguments, after --',
+            multiple: true,
+            required: false,
+            ignoreStdin: true,
+        }),
     };
     static flags = {
         command: core_1.Flags.string({
-            description: 'Command to run as one shell string, instead of trailing argv',
+            description: 'Command to run as one shell string, instead of the words after --',
         }),
         cwd: core_1.Flags.string({
             description: 'Working directory, relative to /workspace (for example repos/app)',
@@ -58,13 +111,20 @@ class DedicatedMachinesExec extends base_command_1.BaseCommand {
         // 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));
+        const { args, flags } = await this.parse(DedicatedMachinesExec, head);
+        const id = args.id;
         if (!id) {
             this.error('Lease id is required.', { exit: 2 });
         }
+        const resolved = resolveDedicatedExecCommand({
+            commandFlag: flags.command,
+            tail,
+            positional: args.command ?? [],
+        });
+        if ('error' in resolved) {
+            this.error(resolved.error, { exit: 2 });
+        }
+        const { command } = resolved;
         if (!command.trim()) {
             this.error('Command is required. Use --command or pass it after --.', { exit: 2 });
         }

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

@@ -22,6 +22,7 @@ class DedicatedMachines extends core_1.Command {
         '<%= 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 update-image <lease-id> --wait',
         '<%= config.bin %> machines dedicated snapshot <lease-id> --wait',
         '<%= config.bin %> machines dedicated grow <lease-id> --storage-gb 200',
         '<%= config.bin %> machines dedicated spending-limit <lease-id> --cents 30000',
@@ -44,6 +45,7 @@ class DedicatedMachines extends core_1.Command {
             ['start', 'start a stopped runtime'],
             ['stop', 'stop compute and keep the disk'],
             ['restart', 'restart the instance; files stay'],
+            ['update-image', 'move onto the current root image now; files stay'],
             ['snapshot', 'create a recovery point'],
             ['grow', 'increase workspace storage; shrink is unsupported'],
             ['spending-limit', 'change the monthly spending cap'],

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

@@ -6,6 +6,12 @@ import { DedicatedLeaseCommand } from '../../../lib/dedicated-lease-command';
  * 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.
+ *
+ * It also restores a workspace whose unpaid deletion was STOPPED after its
+ * machine was already shut down (`deletion: withheld`): the files were kept in
+ * the archived lease, and no start path exists for a machine that is gone, so a
+ * new machine is built from the same final recovery point. That one has no
+ * window.
  */
 export default class DedicatedMachinesRestore extends DedicatedLeaseCommand {
     static description: string;

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

@@ -11,9 +11,15 @@ const dedicated_machines_1 = require("../../../lib/dedicated-machines");
  * 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.
+ *
+ * It also restores a workspace whose unpaid deletion was STOPPED after its
+ * machine was already shut down (`deletion: withheld`): the files were kept in
+ * the archived lease, and no start path exists for a machine that is gone, so a
+ * new machine is built from the same final recovery point. That one has no
+ * window.
  */
 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 description = 'Restore a deleted Dedicated Runtime into a new machine, from the recovery point its deletion kept: inside the recovery window, or at any time for one whose deletion was stopped after its machine was shut down. Once.';
     static examples = [
         '<%= config.bin %> machines dedicated restore <deleted-lease-id>',
         '<%= config.bin %> machines dedicated restore <deleted-lease-id> --name research-box --wait',