@lizard-build/cli 4.0.35 → 4.0.37

package/src/commands/login.ts

@@ -66,7 +66,7 @@ export function accountInstruction(state: AccountState, sub: Subscription | null
     case "not_owner":
       return (
         "This account deploys on its workspace owner's plan. Do NOT start or change a subscription: only the owner can." +
-        (sub?.plan === "none" ? " Deploys stay blocked until the owner starts Pro." : "")
+        (sub?.plan === "none" ? " Sandboxes and deploys stay blocked until the owner starts Pro." : "")
       );
     case "enterprise":
       return "Enterprise plan, invoiced monthly. Nothing to set up.";
@@ -84,12 +84,12 @@ export function accountInstruction(state: AccountState, sub: Subscription | null
       return "Pro is active. Do NOT open billing or start a subscription.";
     case "trial_available":
       return (
-        `No plan yet, and deploys need one. Offer the user the ${sub?.trial.days}-day Pro trial with ${usd(sub?.trial.creditCents ?? 0)} in credits: ` +
+        `No plan yet, and sandboxes and deploys need one. Offer the user the ${sub?.trial.days}-day Pro trial with ${usd(sub?.trial.creditCents ?? 0)} in credits: ` +
         `no charge today, then ${price}/month, taxes included. ${start}`
       );
     case "subscription_required":
       return (
-        "No plan yet, and deploys need one. This account has had its trial, so do NOT promise one. " +
+        "No plan yet, and sandboxes and deploys need one. This account has had its trial, so do NOT promise one. " +
         `Pro is ${price}/month, taxes included, with ${usd(sub?.includedCents ?? 1900)} in credits each month. ${start}`
       );
     case "checkout_unavailable":
@@ -97,16 +97,33 @@ export function accountInstruction(state: AccountState, sub: Subscription | null
   }
 }
 
-/** Commands an agent can run next. */
+/** Commands an agent can run next. Sandboxes first; both they and deploys live in a project. */
 export function nextSteps(linked: boolean): Array<{ command: string; why: string }> {
   return [
     {
       command: "lizard skills get core",
       why: "The guide to every command, matched to this CLI version. Read it before running others.",
     },
-    ...(linked ? [] : [{ command: "lizard init", why: "Create a project and link the current folder to it." }]),
-    { command: "lizard up", why: linked ? "Deploy the linked folder." : "Deploy the folder once it is linked." },
+    ...(linked
+      ? []
+      : [{ command: "lizard init", why: "Create a project and link the current folder to it. Sandboxes and deploys both need one." }]),
+    {
+      command: "lizard sandbox create",
+      why: "Start a sandbox in the project, then run commands in it with `lizard sandbox exec <id> -- <cmd>`.",
+    },
+    { command: "lizard up", why: "Or deploy the linked folder." },
+  ];
+}
+
+/** The same steps for a person, as aligned lines for the closing note. */
+export function nextStepsNote(linked: boolean): string {
+  const rows: Array<[string, string]> = [
+    ...(linked ? [] : ([["lizard init", "Create a project and link this folder"]] as Array<[string, string]>)),
+    ["lizard sandbox create", linked ? "Start a sandbox in this project" : "Start a sandbox in it"],
+    ["lizard up", "Or deploy this folder"],
   ];
+  const width = Math.max(...rows.map(([cmd]) => cmd.length)) + 3;
+  return rows.map(([cmd, why]) => chalk.cyan(cmd) + " ".repeat(width - cmd.length) + why).join("\n");
 }
 
 async function fetchSubscription(): Promise<Subscription | null> {
@@ -169,7 +186,7 @@ async function offerPlan(canAsk: boolean): Promise<void> {
   const offer = trial
     ? `Pro trial: ${sub.trial.days} days with ${usd(sub.trial.creditCents ?? 0)} in credits. No charge today, then ${usd(sub.priceCents)}/month, taxes included.`
     : `Pro: ${usd(sub.priceCents)}/month, taxes included, with ${usd(sub.includedCents)} in credits each month.`;
-  p.log.info(`No plan yet. Deploys need one.\n${offer}`);
+  p.log.info(`No plan yet. Sandboxes and deploys need one.\n${offer}`);
 
   const go = canAsk ? await p.confirm({ message: trial ? "Start the trial now?" : "Start Pro now?" }) : false;
   if (p.isCancel(go) || !go) {
@@ -204,14 +221,7 @@ async function loginInteractive(flag?: AuthProvider): Promise<void> {
 
   await offerPlan(canAsk);
 
-  const linked = Boolean(getProjectLink());
-  p.note(
-    (linked
-      ? [`${chalk.cyan("lizard up")}     Deploy this folder`]
-      : [`${chalk.cyan("lizard init")}   Create a project and link this folder`, `${chalk.cyan("lizard up")}     Deploy it`]
-    ).join("\n"),
-    "Next",
-  );
+  p.note(nextStepsNote(Boolean(getProjectLink())), "Next");
   p.outro("You're all set");
 }
 

package/src/commands/restart.ts

@@ -57,6 +57,9 @@ export function registerRestart(program: Command) {
         }
       }
 
+      // `ps` takes no service argument: it lists every service in the project.
+      const psHint = `lizard ps${opts.project ? ` --project ${opts.project}` : ""}`;
+
       const timeoutSeconds = parseInt(opts.timeout, 10);
       if (!(timeoutSeconds > 0)) {
         fail(`--timeout must be a positive number of seconds, got ${JSON.stringify(opts.timeout)}`, 1, "INVALID_ARGUMENT");
@@ -104,7 +107,7 @@ export function registerRestart(program: Command) {
           printJSON({ id, status: "restarting" });
         } else {
           success("Restart started");
-          info(chalk.dim(`  Check status: lizard ps ${id}`));
+          info(chalk.dim(`  Check status: ${psHint}`));
         }
         return;
       }
@@ -138,7 +141,7 @@ export function registerRestart(program: Command) {
       } else if (finalStatus) {
         error("Restart failed");
       } else {
-        info(chalk.dim("Still restarting — check status with: lizard ps " + id));
+        info(chalk.dim(`Still restarting — check status with: ${psHint}`));
       }
     });
 }

package/src/commands/ssh.ts

@@ -11,7 +11,7 @@ import * as http from "node:http";
 export function registerSSH(program: Command) {
   program
     .command("ssh")
-    .description("Execute a command inside a running service container")
+    .description("Execute a command inside a running service container (disabled: the API answers 403 \"Shell access to services is disabled\"; for sandboxes use `lizard sandbox ssh`)")
     .argument("[cmd...]", "Command and args to run inside the container (required; pass after `--` to stop flag parsing, e.g. `-- ls -la /app`)")
     .option("-s, --service <id>", "Service name or ID")
     .option("-p, --project <id>", "Project name, slug, or ID")

package/src/commands/upgrade.ts

@@ -1,7 +1,14 @@
 import chalk from "chalk";
 import { Command } from "commander";
 import { info, success, isJSONMode, printJSON } from "../lib/format.js";
-import { CURRENT_VERSION, getLatestVersion, selfUpdate, isStandaloneBinary } from "../lib/updater.js";
+import {
+  CURRENT_VERSION,
+  canSelfUpdate,
+  getLatestVersion,
+  installerCommand,
+  isStandaloneBinary,
+  selfUpdate,
+} from "../lib/updater.js";
 
 export function registerUpgrade(program: Command) {
   program
@@ -87,21 +94,40 @@ export function registerUpgrade(program: Command) {
         return;
       }
 
+      // No binary to swap in (the Windows build): say so and fail, instead of
+      // reporting an upgrade that never happened.
+      if (!canSelfUpdate()) {
+        throw notInstalled(`v${latest} is available, but this copy of Lizard CLI can't update itself.`);
+      }
+
       info(`Upgrading v${CURRENT_VERSION} → ${chalk.green("v" + latest)}...`);
 
+      let upgraded: boolean;
       try {
-        await selfUpdate((msg) => info(chalk.dim(msg)));
-        if (isJSONMode()) {
-          printJSON({
-            previousVersion: CURRENT_VERSION,
-            latestVersion: latest,
-            upgraded: true,
-          });
-        } else {
-          success(`Upgraded to v${latest}`);
-        }
+        upgraded = await selfUpdate((msg) => info(chalk.dim(msg)));
       } catch (e: any) {
         throw new Error(`Upgrade failed: ${e.message}`);
       }
+      if (!upgraded) {
+        throw notInstalled(`Nothing was replaced: v${CURRENT_VERSION} is still installed.`);
+      }
+      if (isJSONMode()) {
+        printJSON({
+          previousVersion: CURRENT_VERSION,
+          latestVersion: latest,
+          upgraded: true,
+        });
+      } else {
+        success(`Upgraded to v${latest}`);
+      }
     });
 }
+
+/** Exit 1 with the installer command that does the upgrade instead. */
+function notInstalled(reason: string): Error {
+  const shell = process.platform === "win32" ? " in PowerShell" : "";
+  return Object.assign(
+    new Error(`${reason} Re-run the installer${shell}:\n  ${installerCommand()}`),
+    { code: "UPGRADE_NOT_INSTALLED" },
+  );
+}

package/src/lib/updater.ts

@@ -5,7 +5,7 @@ import { join, dirname } from "node:path";
 import os from "node:os";
 import { spawn } from "node:child_process";
 
-export const CURRENT_VERSION = "4.0.35";
+export const CURRENT_VERSION = "4.0.37";
 const RELEASES_API = "https://api.github.com/repos/lizard-build/lizard-cli/releases/latest";
 const RELEASE_BASE = "https://github.com/lizard-build/lizard-cli/releases/latest/download";
 
@@ -22,6 +22,22 @@ function getBinaryName(): string | null {
   return null;
 }
 
+/**
+ * True when selfUpdate() has a release asset to swap in for this platform.
+ * False on Windows: a running .exe can't be replaced in place, so the
+ * PowerShell installer does the update there.
+ */
+export function canSelfUpdate(): boolean {
+  return getBinaryName() !== null;
+}
+
+/** The installer that puts the latest standalone binary over this one. */
+export function installerCommand(): string {
+  return process.platform === "win32"
+    ? "irm https://lizard.build/api/cli/install.ps1 | iex"
+    : "curl -fsSL https://lizard.build/install.sh | bash";
+}
+
 /**
  * True only when running as the Bun-compiled standalone binary. Under
  * npm/node, `process.execPath` is the *node* executable — self-update would

package/test/unit/login.test.ts

@@ -4,7 +4,7 @@ import * as os from "node:os";
 import * as path from "node:path";
 import { Command } from "commander";
 import { Readable } from "node:stream";
-import { registerLogin, accountState, accountInstruction, nextSteps, readTokenFromStdin } from "../../src/commands/login.js";
+import { registerLogin, accountState, accountInstruction, nextSteps, nextStepsNote, readTokenFromStdin } from "../../src/commands/login.js";
 import { authUrlFor, providerFlag, pendingPayload } from "../../src/lib/signin.js";
 import type { Subscription } from "../../src/commands/billing.js";
 import { requireAuth } from "../../src/lib/auth.js";
@@ -184,9 +184,22 @@ describe("account state", () => {
     );
   });
 
+  test("the closing note leads with sandboxes, aligned in two columns", () => {
+    const plain = (t: string) => t.replace(/\x1b\[[0-9;]*m/g, "");
+    expect(plain(nextStepsNote(false)).split("\n")).toEqual([
+      "lizard init             Create a project and link this folder",
+      "lizard sandbox create   Start a sandbox in it",
+      "lizard up               Or deploy this folder",
+    ]);
+    expect(plain(nextStepsNote(true)).split("\n")).toEqual([
+      "lizard sandbox create   Start a sandbox in this project",
+      "lizard up               Or deploy this folder",
+    ]);
+  });
+
   test("an unlinked folder gets lizard init before lizard up", () => {
-    expect(nextSteps(false).map((s) => s.command)).toEqual(["lizard skills get core", "lizard init", "lizard up"]);
-    expect(nextSteps(true).map((s) => s.command)).toEqual(["lizard skills get core", "lizard up"]);
+    expect(nextSteps(false).map((s) => s.command)).toEqual(["lizard skills get core", "lizard init", "lizard sandbox create", "lizard up"]);
+    expect(nextSteps(true).map((s) => s.command)).toEqual(["lizard skills get core", "lizard sandbox create", "lizard up"]);
   });
 });