@shardflux/cli 0.19.0 → 0.20.0

package/dist/main.js

@@ -10,6 +10,7 @@
  *   (step-up, password change, TOTP change) is saved at once; a saved session the API rejects (401) is removed.
  * Every credential the command loaded is redacted from what it prints on failure.
  */
+import { aboutWait } from "./filesystem-commands.js";
 import { homedir, hostname } from 'node:os';
 import { statSync } from 'node:fs';
 import { SDK_VERSION, Shardflux, ShardfluxAccount, isSessionToken } from '@shardflux/sdk';
@@ -34,6 +35,7 @@ import { NPM_CLIENTS, npmLatestAll, npmRegistry, withRegistryLatest } from "./re
 import { AuthConfigError, EXIT, ExecutionPendingError, InterruptedError, UsageError, describeError, exitCodeFor, ownHint, redact } from "./errors.js";
 import { errorText, feedbackCommand, json, time } from "./format.js";
 import { HANDLERS } from "./handlers.js";
+import { SETUP_VM_ENV, setupGuard } from "./machine-setup.js";
 import { makeFetch } from "./http.js";
 import { Input } from "./input.js";
 import { TimingRecorder, notices, timingJson, timingText } from "./timing.js";
@@ -112,6 +114,12 @@ function hintFor(info, cred, file, command = '') {
         if (quota)
             return quota;
     }
+    // 0.20.0+: builds past the plan's slots queue; only a full queue is refused (429, Retry-After).
+    if (info.code === 'rate_limited' && reasonOf(info) === 'template_build_queue_full') {
+        const queued = typeof info.details?.queued === 'number' ? info.details.queued : undefined;
+        const retry = info.retry_after_seconds ?? (typeof info.details?.retry_after_seconds === 'number' ? info.details.retry_after_seconds : undefined);
+        return `${queued ?? 'Several'} build${queued === 1 ? '' : 's'} already wait for your plan's build slots; nothing was started. Run the same command again${retry ? ` in ${aboutWait(retry)}` : ' when one finishes'}`;
+    }
     const policyHint = spendPolicyHint(info);
     if (policyHint)
         return policyHint;
@@ -678,7 +686,7 @@ export async function run(argv, io, opts = {}) {
         // `shard update` brings the app in itself; `shard update --check` (the menu bar of an app before 0.3.2 runs it every
         // 6 hours) is how such an app learns of a newer one with no action from the person.
         const updating = command === 'update' && parsed.values.check !== true;
-        if (opts.runtime && !updating && !['menubar', 'device-helper'].includes(parsed.command.path[0])) {
+        if (opts.runtime && !updating && !io.env[SETUP_VM_ENV] && !['menubar', 'device-helper'].includes(parsed.command.path[0])) {
             refreshMenubarInBackground({ dir: store.dir, home: io.env.HOME || homedir(), runtime: opts.runtime, env: { ...process.env, ...io.env } });
         }
         // The update check runs next to the command (not for `version`, which reports it itself).
@@ -712,11 +720,15 @@ export async function run(argv, io, opts = {}) {
         io.stdout.write(setupGuideText(agentSetupGuide(ctx)));
         return EXIT.ok;
     }
+    // The machine setup agent's own shard (0.20.0+): only exec, writes from standard input and reads on its machine VM.
+    const refused = setupGuard(io.env, command, parsed.values, parsed.positionals);
+    if (refused)
+        return report(new UsageError(refused));
     const handler = parsed.command.path[0] === 'acp' ? (ctx) => parsed.values.login === true ? runAcpLogin(ctx) : runAcp(ctx) : parsed.command.path[0] === 'device-helper' ? (ctx) => runDeviceHelper(ctx, { service: parsed.values.service === true }) : command === 'menubar refresh' ? runMenubarRefresh : parsed.command === PROJECT_COMMAND ? launchProjectCommand : parsed.command === ONBOARDING_COMMAND ? async (ctx, values) => await tryLinuxDesktop(ctx) ? 0 : terminalOnboarding(ctx, values, { startHelper }) : parsed.command === CENTER_COMMAND ? commandCenter : HANDLERS[parsed.command.path.join(' ')];
     if (!handler)
         return report(new UsageError(`unknown command "${parsed.command.path.join(' ')}"`));
     // Long-running helpers other programs start (an editor, launchd, the menu bar) skip the per-command housekeeping.
-    if (!['acp', 'device-helper'].includes(parsed.command.path[0]) && command !== 'menubar refresh' && command !== 'cli-proxy forward') {
+    if (!['acp', 'device-helper'].includes(parsed.command.path[0]) && command !== 'menubar refresh' && command !== 'cli-proxy forward' && !io.env[SETUP_VM_ENV]) {
         // An updated shard restarts this computer's CLIProxyAPI forwarder on itself (a no-op unless the version changed).
         await refreshForwarderAgent(io.env, ctx.store.dir).catch(() => false);
         await housekeeping(ctx);

package/dist/seed-phases.d.ts

@@ -21,9 +21,12 @@ export declare function startPhase(phase: StartPhase): void;
  * write to. A file the launcher already removed is not created again.
  */
 export declare function privateProgressFile(file: string): boolean;
-/** Atomic: a sibling written exclusively (O_EXCL never follows a link), then renamed over the file. Never throws. */
+/**
+ * Atomic: a sibling written exclusively (O_EXCL never follows a link), then renamed over the file. Never throws. The
+ * start's phases and `shard machine setup`'s (0.20.0+) use the same one-line document.
+ */
 export declare function writeProgress(file: string, doc: {
-    phase: StartPhase;
+    phase: string;
     line: string;
 }): boolean;
 export {};

package/dist/seed-phases.js

@@ -57,7 +57,10 @@ export function privateProgressFile(file) {
         return false;
     }
 }
-/** Atomic: a sibling written exclusively (O_EXCL never follows a link), then renamed over the file. Never throws. */
+/**
+ * Atomic: a sibling written exclusively (O_EXCL never follows a link), then renamed over the file. Never throws. The
+ * start's phases and `shard machine setup`'s (0.20.0+) use the same one-line document.
+ */
 export function writeProgress(file, doc) {
     if (!privateProgressFile(file))
         return false;

package/dist/terminal-onboarding.d.ts

@@ -6,6 +6,8 @@ export interface OnboardingDeps {
     report?: typeof onboardingReport;
     startHelper?: () => void;
     loginCodex?: (ctx: Ctx) => Promise<void>;
+    /** Right after the Agents step (0.20.0+): `shard machine setup --from-this-computer --if-needed`, detached. */
+    startMachineSetup?: (ctx: Ctx) => boolean;
 }
 /** Linux's first run orchestrates the same auth, setup and live inspection used by the Mac onboarding. */
 export declare function terminalOnboarding(ctx: Ctx, values: Values, deps?: OnboardingDeps): Promise<number>;

package/dist/terminal-onboarding.js

@@ -6,6 +6,7 @@ import { foundApps, onboardingReport, parseApps } from "./onboarding.js";
 import { requireTermsAcceptance, showLegalNotice } from "./legal.js";
 import { json } from "./format.js";
 import { UsageError } from "./errors.js";
+import { startMachineSetupInBackground } from "./machine-setup.js";
 const handlers = { ...ACCOUNT_HANDLERS, ...AGENT_CREDENTIAL_HANDLERS, ...CODEX_CLOUD_HANDLERS };
 async function loginCodex(ctx) {
     const child = spawn('codex', ['login', ...(!ctx.io.env.DISPLAY && !ctx.io.env.WAYLAND_DISPLAY ? ['--device-auth'] : [])], { env: ctx.io.env, stdio: 'inherit', signal: ctx.signal });
@@ -61,11 +62,15 @@ export async function terminalOnboarding(ctx, values, deps = {}) {
         }
     }
     state = await report(ctx, inspect);
+    // The machine sets itself up from this computer in the background; it never holds the onboarding back.
+    const settingUp = state.ready && (deps.startMachineSetup ?? startMachineSetupInBackground)(ctx);
     if (ctx.json)
         ctx.io.stdout.write(json({ onboarding: state, next: 'shard ./' }));
     else {
         for (const c of state.connections.filter(c => c.id === 'account' || c.picked))
             ctx.io.stdout.write(`${c.id}: ${c.fact}${c.action?.command && c.state !== 'verified' ? ` Run ${c.action.command.join(' ')}.` : ''}\n`);
+        if (settingUp)
+            ctx.io.stdout.write('Your agent is setting up your cloud machine from this computer in the background (shard machine setup --status).\n');
         if (state.ready)
             ctx.io.stdout.write('Ready. Run shard ./ in your project.\n');
         else

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shardflux/cli",
-  "version": "0.19.0",
+  "version": "0.20.0",
   "type": "module",
   "description": "shard: the Shardflux command line. Create an account, sign in, set up keys and billing, then open, run commands in, move files to, suspend, resume and fork serverless agent workspaces.",
   "license": "Apache-2.0",
@@ -47,7 +47,7 @@
     "smol-toml": "1.9.0",
     "snappyjs": "0.7.0",
     "yaml": "2.9.1",
-    "@shardflux/sdk": "^0.25.0"
+    "@shardflux/sdk": "^0.25.1"
   },
   "devDependencies": {
     "@eslint/js": "10.0.1",
@@ -58,9 +58,9 @@
     "typescript-eslint": "8.70.1"
   },
   "optionalDependencies": {
-    "@shardflux/desktop-linux-x64": "0.1.2",
-    "@shardflux/desktop-linux-arm64": "0.1.2",
-    "@shardflux/menubar-darwin": "^0.7.0"
+    "@shardflux/desktop-linux-x64": "0.1.5",
+    "@shardflux/desktop-linux-arm64": "0.1.5",
+    "@shardflux/menubar-darwin": "^0.8.0"
   },
   "scripts": {
     "build": "node scripts/build.mjs",