vercel-vm-factory 0.8.8 → 0.10.8

package/README.md

@@ -6,6 +6,7 @@ Create a tiny Vercel Container deployment: copy `wsterm` from `ghcr.io/v1xingyue
 npx vercel-vm-factory create \
   --vm-image ubuntu \
   --shell /bin/bash \
+  --tools nodejs,codex \
   --project ws-shell-ubuntu \
   --auth-mode basic \
   --auth-user admin \
@@ -28,7 +29,7 @@ Run without flags for prompts:
 npx vercel-vm-factory create
 ```
 
-The prompt asks for authentication first: `basic`, `github`, `both`, or `none`, then only asks for the fields that mode needs.
+The prompt walks through VM image, project, shell, optional preinstalled tools, and authentication. For list prompts, enter either names or numbers; tool choices can be comma-separated, for example `1,3` or `nodejs,claude-code`.
 
 Check local setup:
 
@@ -40,6 +41,16 @@ The script checks `vercel --version` and `vercel whoami`; if you are not logged
 
 Use `--help` to show all flags.
 
+Common flags:
+
+- `--vm-image alpine|ubuntu|debian|IMAGE`
+- `--shell /bin/bash|/bin/zsh|/bin/sh`
+- `--tools nodejs,codex,claude-code`
+- `--project NAME`
+- `--scope TEAM_SLUG`
+- `--auth-mode basic|github|both|none`
+- `--dry-run`
+
 Entered auth values are reused from `~/.vercel-vm-factory/defaults.json`; press Enter to keep the placeholder value or skip an empty one.
 
 The generated project contains only `Dockerfile.vercel`.
@@ -63,7 +74,30 @@ Shell options:
 - `/bin/zsh`
 - `/bin/sh`
 
-Choosing bash or zsh adds the matching package to the generated Dockerfile when the VM image does not already include it.
+Choosing bash or zsh adds the matching package to the generated Dockerfile when the VM image does not already include it. Choosing zsh also installs oh-my-zsh.
+
+Generated shell setup examples:
+
+- Alpine + `/bin/zsh`: installs `zsh curl git`, installs oh-my-zsh unattended, and writes `/root/.zshrc`.
+- Ubuntu/Debian + `/bin/bash`: installs `bash` with `apt-get`.
+- `/bin/sh`: no extra shell package is installed.
+
+The generated Dockerfile sets `HOME=/root` and `SHELL` to the selected shell path.
+
+Preinstall tools:
+
+- `nodejs`
+- `codex`
+- `claude-code`
+
+Choosing codex or claude-code also installs Node.js/npm.
+
+Generated tool setup examples:
+
+- `--tools nodejs`: installs `nodejs npm`
+- `--tools codex`: installs `nodejs npm`, then `npm install -g @openai/codex`
+- `--tools claude-code`: installs `nodejs npm`, then `npm install -g @anthropic-ai/claude-code`
+- `--tools codex,claude-code`: installs both CLIs
 
 Custom VM image:
 

package/deploy-vm.mjs

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
 import { mkdir, readFile, rm, stat, writeFile } from "node:fs/promises";
 import { spawn } from "node:child_process";
-import { createInterface } from "node:readline/promises";
 import { stdin as input, stdout as output } from "node:process";
 import { homedir } from "node:os";
 import path from "node:path";
+import * as p from "@clack/prompts";
 
 const defaultWsShellImage = "ghcr.io/v1xingyue/ws-shell:v1.8.alpine";
 
@@ -14,6 +14,11 @@ const vmImages = {
   debian: "debian:13-slim",
 };
 const shells = ["/bin/bash", "/bin/zsh", "/bin/sh"];
+const toolChoices = {
+  nodejs: "Node.js + npm",
+  codex: "OpenAI Codex CLI",
+  "claude-code": "Claude Code",
+};
 
 const { command, args } = parseCommand(process.argv.slice(2));
 const scriptRoot = path.resolve(import.meta.dirname);
@@ -96,6 +101,7 @@ async function main() {
     defaults.from ??
     defaultWsShellImage;
   const shell = await chooseShell(args.shell ?? defaults.shell ?? "/bin/sh");
+  const tools = await chooseTools(args.tools ?? defaults.tools ?? "");
   const prod = args.prod !== "false";
   const dryRun = Boolean(args["dry-run"]);
   const skipLink = Boolean(args["skip-link"]);
@@ -115,6 +121,7 @@ async function main() {
   );
   const dockerfile = makeDockerfile({
     shell,
+    tools,
     vmImage,
     vmImageName,
     wsShellImage,
@@ -130,6 +137,7 @@ async function main() {
     scope: scope || "default",
     source: wsShellImage,
     shell,
+    tools: tools || "none",
     auth: authMode,
     ...(usesGitHubAuth(authMode) ? { callback: oauthRedirectUrl } : {}),
     dockerfile: path.join(appDir, "Dockerfile.vercel"),
@@ -186,6 +194,7 @@ async function main() {
     project,
     from: wsShellImage,
     shell,
+    tools,
     "auth-mode": authMode,
     "auth-user": authUsername,
     "auth-password": authPassword,
@@ -285,15 +294,14 @@ async function installVercelCli() {
     );
 
   const install = await choosePackageInstall();
-  const answer = (
-    await askText(
-      `Vercel CLI is not installed. Install with ${install.command} ${install.args.join(" ")}?`,
-      "N",
-    )
-  ).toLowerCase();
+  const answer = await promptResult(
+    p.confirm({
+      message: `Vercel CLI is not installed. Install with ${install.command} ${install.args.join(" ")}?`,
+      initialValue: false,
+    }),
+  );
 
-  if (answer !== "y" && answer !== "yes")
-    throw new Error("Vercel CLI is required. Exiting.");
+  if (!answer) throw new Error("Vercel CLI is required. Exiting.");
 
   step(`Installing Vercel CLI with ${install.command}`);
   await runNoUrl(install.command, install.args);
@@ -330,6 +338,7 @@ async function doctor() {
   printKeyValue("scope", defaults.scope || "not set");
   printKeyValue("source image", defaults.from || defaultWsShellImage);
   printKeyValue("shell", defaults.shell || "/bin/sh");
+  printKeyValue("tools", defaults.tools || "none");
   printKeyValue("auth mode", defaults["auth-mode"] || "not set");
   printKeyValue(
     "auth user",
@@ -353,43 +362,98 @@ async function doctor() {
   );
 }
 
-function makeDockerfile({ shell, vmImage, vmImageName, wsShellImage }) {
+function makeDockerfile({ shell, tools, vmImage, vmImageName, wsShellImage }) {
   const shellInstall = makeShellInstall({ shell, vmImageName });
+  const ohMyZshInstall =
+    path.basename(shell) === "zsh"
+      ? `RUN RUNZSH=no CHSH=no KEEP_ZSHRC=no sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" "" --unattended \\
+    && printf '%s\\n' \\
+      'export ZSH="$HOME/.oh-my-zsh"' \\
+      'ZSH_THEME="robbyrussell"' \\
+      'plugins=(git)' \\
+      'source "$ZSH/oh-my-zsh.sh"' \\
+      > /root/.zshrc`
+      : "";
+  const toolInstall = makeToolInstall({ tools, vmImageName });
+  const shellSetup = [shellInstall, ohMyZshInstall, toolInstall]
+    .filter(Boolean)
+    .join("\n");
   return `ARG WS_SHELL_IMAGE=${wsShellImage}
 ARG VM_IMAGE=${vmImage}
 
 FROM \${WS_SHELL_IMAGE} AS ws-shell
 FROM \${VM_IMAGE} AS vm
-${shellInstall ? `\n${shellInstall}\n` : ""}
+${shellSetup ? `\n${shellSetup}\n` : ""}
 # wsterm already embeds the web UI; runtime config comes from environment variables.
 COPY --from=ws-shell /app/bin/wsterm /app/bin/wsterm
 
 WORKDIR /app
 ENV ENABLE_SSL=false
+ENV HOME=/root
+ENV SHELL=${shell}
 EXPOSE 80
 CMD ["/app/bin/wsterm","-bind",":80","-fork","${shell}"]
 `;
 }
 
+function makeToolInstall({ tools, vmImageName }) {
+  const selected = new Set(parseTools(tools));
+  if (selected.has("codex") || selected.has("claude-code"))
+    selected.add("nodejs");
+  if (!selected.size) return "";
+
+  const packages = [];
+  if (selected.has("nodejs")) packages.push("nodejs", "npm");
+  const npmPackages = [];
+  if (selected.has("codex")) npmPackages.push("@openai/codex");
+  if (selected.has("claude-code")) npmPackages.push("@anthropic-ai/claude-code");
+
+  const installNode =
+    packages.length && vmImageName === "alpine"
+      ? `RUN apk add --no-cache ${packages.join(" ")}`
+      : packages.length && (vmImageName === "ubuntu" || vmImageName === "debian")
+        ? `RUN apt-get update \\
+    && apt-get install -y --no-install-recommends ${packages.join(" ")} \\
+    && rm -rf /var/lib/apt/lists/*`
+        : packages.length
+          ? `RUN if command -v apk >/dev/null 2>&1; then \\
+      apk add --no-cache ${packages.join(" ")}; \\
+    elif command -v apt-get >/dev/null 2>&1; then \\
+      apt-get update \\
+      && apt-get install -y --no-install-recommends ${packages.join(" ")} \\
+      && rm -rf /var/lib/apt/lists/*; \\
+    else \\
+      echo "Cannot install nodejs/npm: unsupported VM image package manager" >&2; \\
+      exit 1; \\
+    fi`
+          : "";
+
+  const installCli = npmPackages.length
+    ? `RUN npm install -g ${npmPackages.join(" ")}`
+    : "";
+  return [installNode, installCli].filter(Boolean).join("\n");
+}
+
 function makeShellInstall({ shell, vmImageName }) {
   const packageName = path.basename(shell);
   if (packageName === "sh") return "";
+  const packages = packageName === "zsh" ? "zsh curl git" : packageName;
 
   if (vmImageName === "alpine")
-    return `RUN apk add --no-cache ${packageName}`;
+    return `RUN apk add --no-cache ${packages}`;
 
   if (vmImageName === "ubuntu" || vmImageName === "debian")
     return `RUN apt-get update \\
-    && apt-get install -y --no-install-recommends ${packageName} \\
+    && apt-get install -y --no-install-recommends ${packages} \\
     && rm -rf /var/lib/apt/lists/*`;
 
   return `RUN if command -v ${shell} >/dev/null 2>&1; then \\
       true; \\
     elif command -v apk >/dev/null 2>&1; then \\
-      apk add --no-cache ${packageName}; \\
+      apk add --no-cache ${packages}; \\
     elif command -v apt-get >/dev/null 2>&1; then \\
       apt-get update \\
-      && apt-get install -y --no-install-recommends ${packageName} \\
+      && apt-get install -y --no-install-recommends ${packages} \\
       && rm -rf /var/lib/apt/lists/*; \\
     else \\
       echo "Cannot install ${packageName}: unsupported VM image package manager" >&2; \\
@@ -411,7 +475,7 @@ async function secret(name, question, fallback) {
   if (!input.isTTY) return fallback || "";
 
   const placeholder = fallback ? mask(fallback) : "skip";
-  const answer = await askText(question, placeholder);
+  const answer = await askSecret(question, placeholder);
   return answer || fallback || "";
 }
 
@@ -456,22 +520,18 @@ async function chooseAuthMode(fallback) {
   }
   if (!input.isTTY) return modes.has(fallback) ? fallback : "basic";
 
-  printChoices("Authentication", [
-    ["1", "basic", "username/password"],
-    ["2", "github", "GitHub OAuth"],
-    ["3", "both", "basic + GitHub OAuth"],
-    ["4", "none", "no app auth"],
-  ]);
-
-  const answer = await askText("Authentication", fallback);
-
-  if (!answer) return modes.has(fallback) ? fallback : "basic";
-  if (modes.has(answer)) return answer;
-  if (answer === "1") return "basic";
-  if (answer === "2") return "github";
-  if (answer === "3") return "both";
-  if (answer === "4") return "none";
-  throw new Error("Authentication must be basic, github, both, or none");
+  return promptResult(
+    p.select({
+      message: "Authentication",
+      initialValue: modes.has(fallback) ? fallback : "basic",
+      options: [
+        { value: "basic", label: "Basic", hint: "username/password" },
+        { value: "github", label: "GitHub OAuth" },
+        { value: "both", label: "Basic + GitHub OAuth" },
+        { value: "none", label: "None", hint: "no app auth" },
+      ],
+    }),
+  );
 }
 
 function usesBasicAuth(mode) {
@@ -488,25 +548,23 @@ async function chooseVmImage(fallback) {
   if (!input.isTTY) return fallback;
 
   const names = Object.keys(vmImages);
-  printChoices(
-    "VM image",
-    names.map((name, index) => [
-      String(index + 1),
-      name,
-      vmImages[name],
-    ]).concat([["4", "custom", "enter a full image name"]]),
+  const answer = await promptResult(
+    p.select({
+      message: "VM image",
+      initialValue: vmImages[fallback] ? fallback : "custom",
+      options: names
+        .map((name) => ({ value: name, label: name, hint: vmImages[name] }))
+        .concat([
+          { value: "custom", label: "Custom", hint: "enter a full image name" },
+        ]),
+    }),
   );
 
-  const answer = await askText("VM image", fallback);
-
-  if (!answer) return fallback;
-  if (vmImages[answer]) return answer;
-  if (/^[1-3]$/.test(answer)) return names[Number(answer) - 1];
-  if (answer === "4")
+  if (answer === "custom")
     return value(
       "custom-vm-image",
       "Custom VM image",
-      defaults["custom-vm-image"],
+      vmImages[fallback] ? defaults["custom-vm-image"] : fallback,
     );
   return answer;
 }
@@ -515,21 +573,53 @@ async function chooseShell(fallback) {
   if (args.shell) return args.shell;
   if (!input.isTTY) return fallback;
 
-  printChoices(
-    "Shell",
-    shells.map((shell, index) => [
-      String(index + 1),
-      shell,
-      index === shells.length - 1 ? "default" : "",
-    ]),
+  return promptResult(
+    p.select({
+      message: "Shell",
+      initialValue: shells.includes(fallback) ? fallback : "/bin/sh",
+      options: shells.map((shell, index) => ({
+        value: shell,
+        label: shell,
+        hint: index === shells.length - 1 ? "default" : undefined,
+      })),
+    }),
   );
+}
 
-  const answer = await askText("Shell", fallback);
+async function chooseTools(fallback) {
+  if (args.tools !== undefined) return parseTools(args.tools).join(",");
+  if (!input.isTTY) return parseTools(fallback).join(",");
+
+  const names = Object.keys(toolChoices);
+  const selected = await promptResult(
+    p.multiselect({
+      message: "Preinstall tools",
+      required: false,
+      initialValues: parseTools(fallback),
+      options: names.map((name) => ({
+        value: name,
+        label: name,
+        hint: toolChoices[name],
+      })),
+    }),
+  );
 
-  if (!answer) return fallback;
-  if (shells.includes(answer)) return answer;
-  if (/^[1-3]$/.test(answer)) return shells[Number(answer) - 1];
-  return answer;
+  return selected.join(",");
+}
+
+function parseTools(value) {
+  const names = Object.keys(toolChoices);
+  const selected = String(value || "")
+    .split(",")
+    .map((item) => item.trim())
+    .filter(Boolean)
+    .flatMap((item) => {
+      if (item === "0" || item === "none") return [];
+      if (/^[1-3]$/.test(item)) return [names[Number(item) - 1]];
+      return [item];
+    })
+    .filter((item) => names.includes(item));
+  return [...new Set(selected)];
 }
 
 async function readDefaults(file) {
@@ -689,6 +779,10 @@ function findLastUrl(text) {
 }
 
 function printHeader() {
+  if (input.isTTY) {
+    p.intro("Vercel VM Factory");
+    return;
+  }
   console.log("");
   console.log(color.cyan(" __     ____  __   _____           _                   "));
   console.log(color.cyan(" \\ \\   / /  \\/  | |  ___|_ _  ___| |_ ___  _ __ _   _ "));
@@ -740,25 +834,35 @@ function printKeyValue(key, value) {
 }
 
 async function askText(question, fallback = "") {
-  const suffix = fallback ? color.dim(` [${fallback}]`) : "";
-  const rl = createInterface({ input, output });
-  const answer = (
-    await rl.question(
-      `${color.cyan("?")} ${color.bold(question)}${suffix}\n${color.dim("> ")} `,
-    )
+  return String(
+    await promptResult(
+      p.text({
+        message: question,
+        placeholder: fallback || undefined,
+      }),
+    ),
   ).trim();
-  rl.close();
-  return answer;
 }
 
-function printChoices(title, choices) {
-  console.log("");
-  console.log(color.bold(title));
-  for (const [key, label, detail] of choices) {
-    const hint = detail ? ` ${color.dim(detail)}` : "";
-    console.log(`  ${color.cyan(key)}  ${label}${hint}`);
+async function askSecret(question, fallback = "") {
+  return String(
+    await promptResult(
+      p.password({
+        message: question,
+        mask: "*",
+        placeholder: fallback || undefined,
+      }),
+    ),
+  ).trim();
+}
+
+async function promptResult(resultPromise) {
+  const result = await resultPromise;
+  if (p.isCancel(result)) {
+    p.cancel("Operation cancelled.");
+    process.exit(0);
   }
-  console.log("");
+  return result;
 }
 
 function step(text) {
@@ -792,6 +896,7 @@ Options:
   --scope SLUG         Optional Vercel team/user scope slug
   --from IMAGE         Source image for /app/bin/wsterm
   --shell PATH         /bin/bash, /bin/zsh, or /bin/sh
+  --tools LIST         nodejs,codex,claude-code
   --auth-mode MODE     basic, github, both, or none
   --auth-user VALUE    Username/password auth user
   --auth-password VAL  Username/password auth password

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vercel-vm-factory",
-  "version": "0.8.8",
+  "version": "0.10.8",
   "description": "Create Vercel Container deployments for ws-shell from selectable VM images.",
   "license": "MIT",
   "type": "module",
@@ -12,6 +12,9 @@
     "deploy-vm.mjs",
     "README.md"
   ],
+  "dependencies": {
+    "@clack/prompts": "^0.11.0"
+  },
   "scripts": {
     "deploy": "node deploy-vm.mjs create",
     "doctor": "node deploy-vm.mjs doctor",