vercel-vm-factory 0.7.8 → 0.9.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,6 +74,29 @@ 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 zsh also installs oh-my-zsh.
+
+Generated shell setup examples:
+
+- Alpine + `/bin/zsh`: installs `zsh curl git`, then installs oh-my-zsh unattended.
+- Ubuntu/Debian + `/bin/bash`: installs `bash` with `apt-get`.
+- `/bin/sh`: no extra shell package is installed.
+
+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:
 
 ```bash

package/deploy-vm.mjs

@@ -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"]);
@@ -113,7 +119,13 @@ async function main() {
     ".generated",
     project,
   );
-  const dockerfile = makeDockerfile({ shell, vmImage, wsShellImage });
+  const dockerfile = makeDockerfile({
+    shell,
+    tools,
+    vmImage,
+    vmImageName,
+    wsShellImage,
+  });
 
   await rm(appDir, { recursive: true, force: true });
   await mkdir(appDir, { recursive: true });
@@ -125,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"),
@@ -181,6 +194,7 @@ async function main() {
     project,
     from: wsShellImage,
     shell,
+    tools,
     "auth-mode": authMode,
     "auth-user": authUsername,
     "auth-password": authPassword,
@@ -325,6 +339,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",
@@ -348,13 +363,22 @@ async function doctor() {
   );
 }
 
-function makeDockerfile({ shell, vmImage, 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=yes sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" "" --unattended`
+      : "";
+  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
-
+${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
 
@@ -365,6 +389,71 @@ 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 ${packages}`;
+
+  if (vmImageName === "ubuntu" || vmImageName === "debian")
+    return `RUN apt-get update \\
+    && 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 ${packages}; \\
+    elif command -v apt-get >/dev/null 2>&1; then \\
+      apt-get update \\
+      && 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; \\
+      exit 1; \\
+    fi`;
+}
+
 async function value(name, question, fallback) {
   const current = args[name] ?? fallback;
   if (args[name]) return args[name];
@@ -500,6 +589,39 @@ async function chooseShell(fallback) {
   return answer;
 }
 
+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);
+  printChoices(
+    "Preinstall tools",
+    names.map((name, index) => [
+      String(index + 1),
+      name,
+      toolChoices[name],
+    ]).concat([["0", "none", "default"]]),
+  );
+
+  const answer = await askText("Tools (comma separated)", fallback || "none");
+  return parseTools(answer || fallback).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) {
   try {
     return JSON.parse(await readFile(file, "utf8"));
@@ -760,6 +882,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.7.8",
+  "version": "0.9.8",
   "description": "Create Vercel Container deployments for ws-shell from selectable VM images.",
   "license": "MIT",
   "type": "module",