vercel-vm-factory 0.15.8 → 0.17.8

package/README.md

@@ -29,7 +29,7 @@ Run without flags for prompts:
 npx vercel-vm-factory create
 ```
 
-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`.
+The prompt walks through VM image, Vercel team, project, shell, optional preinstalled tools, and authentication. Teams are loaded from `vercel teams list --format json`; choose `Default` to use the current Vercel CLI scope. 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:
 
@@ -47,7 +47,7 @@ Common flags:
 - `--shell /bin/bash|/bin/zsh|/bin/sh`
 - `--tools nodejs,codex,claude-code`
 - `--project NAME`
-- `--scope TEAM_SLUG`
+- `--scope TEAM_SLUG` to skip team selection
 - `--auth-mode basic|github|both|none`
 - `--dry-run`
 
@@ -57,7 +57,7 @@ The generated project contains only `Dockerfile.vercel`.
 
 CLI mapping:
 
-- Vercel Team -> `--scope TEAM_SLUG` when needed; omit it to use the CLI default scope
+- Vercel Team -> loaded from `vercel teams list --format json`; `--scope TEAM_SLUG` skips the selector
 - Project Name -> `--project x-shell`
 - Application Preset -> patched through Vercel API as `framework=container`
 - Root Directory -> generated project directory

package/config.mjs

@@ -0,0 +1,21 @@
+export const defaultWsShellImage = "ghcr.io/v1xingyue/ws-shell:v1.8.alpine";
+
+export const vmImages = {
+  alpine: "alpine:3.23",
+  ubuntu: "ubuntu:24.04",
+  debian: "debian:13-slim",
+};
+
+export const shells = ["/bin/bash", "/bin/zsh", "/bin/sh"];
+
+export const toolChoices = {
+  nodejs: "Node.js + npm",
+  codex: "OpenAI Codex CLI",
+  "claude-code": "Claude Code",
+};
+
+export const codeDefaults = {
+  "vm-image": "alpine",
+  from: defaultWsShellImage,
+  shell: "/bin/sh",
+};

package/deploy-vm.mjs

@@ -6,32 +6,21 @@ import { homedir } from "node:os";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
 import * as p from "@clack/prompts";
-
-const defaultWsShellImage = "ghcr.io/v1xingyue/ws-shell:v1.8.alpine";
-
-const vmImages = {
-  alpine: "alpine:3.23",
-  ubuntu: "ubuntu:24.04",
-  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",
-};
+import {
+  codeDefaults,
+  defaultWsShellImage,
+  shells,
+  toolChoices,
+  vmImages,
+} from "./config.mjs";
 
 const { command, args } = parseCommand(process.argv.slice(2));
-const scriptRoot = path.dirname(fileURLToPath(import.meta.url));
+const scriptFile = fileURLToPath(import.meta.url);
+const scriptRoot = path.dirname(scriptFile);
 const workspaceRoot = process.cwd();
 const stateRoot = path.join(homedir(), ".vercel-vm-factory");
 const defaultsPath = path.join(stateRoot, "defaults.json");
 const legacyDefaultsPath = path.join(scriptRoot, ".defaults.json");
-const codeDefaults = {
-  "vm-image": "alpine",
-  from: defaultWsShellImage,
-  shell: "/bin/sh",
-};
 const packagedDefaults = {
   ...(await readDefaults(legacyDefaultsPath)),
   ...codeDefaults,
@@ -86,11 +75,7 @@ async function main() {
     args["vm-image"] ?? args.base ?? defaults["vm-image"] ?? "alpine",
   );
   const vmImage = vmImages[vmImageName] ?? vmImageName;
-  const scope = await optionalValue(
-    "scope",
-    "Vercel team/scope",
-    defaults.scope,
-  );
+  const scope = await chooseVercelScope(defaults.scope);
   const project = await value(
     "project",
     "Vercel project name",
@@ -153,7 +138,7 @@ async function main() {
   if (usesGitHubAuth(authMode)) printOAuthGuide(oauthRedirectUrl);
 
   const authUsername = usesBasicAuth(authMode)
-    ? await secret(
+    ? await value(
         "auth-user",
         "Basic auth username",
         process.env.AUTH_USERNAME ?? defaults["auth-user"],
@@ -355,10 +340,7 @@ async function doctor() {
   printKeyValue("shell", defaults.shell || "/bin/sh");
   printKeyValue("tools", defaults.tools || "none");
   printKeyValue("auth mode", defaults["auth-mode"] || "not set");
-  printKeyValue(
-    "auth user",
-    defaults["auth-user"] ? mask(defaults["auth-user"]) : "not set",
-  );
+  printKeyValue("auth user", defaults["auth-user"] || "not set");
   printKeyValue(
     "auth password",
     defaults["auth-password"] ? mask(defaults["auth-password"]) : "not set",
@@ -494,17 +476,6 @@ async function secret(name, question, fallback) {
   return answer || fallback || "";
 }
 
-async function optionalValue(name, question, fallback) {
-  if (args[name] !== undefined) return args[name];
-  if (!input.isTTY) return "";
-
-  const answer = await askText(
-    question,
-    fallback ? `${fallback}; Enter to skip` : "skip",
-  );
-  return answer;
-}
-
 function defaultAuthMode() {
   if (args["auth-mode"]) return args["auth-mode"];
   const hasBasic = Boolean(
@@ -622,6 +593,62 @@ async function chooseTools(fallback) {
   return selected.join(",");
 }
 
+async function chooseVercelScope(fallback) {
+  if (args.scope !== undefined) return args.scope;
+  if (!input.isTTY) return fallback || "";
+
+  const teams = await getVercelTeams();
+  const options = [
+    { value: "", label: "Default", hint: "current Vercel CLI scope" },
+    ...teams.map((team) => ({
+      value: team.slug,
+      label: team.name || team.slug,
+      hint: team.slug,
+    })),
+  ];
+
+  return promptResult(
+    p.select({
+      message: "Vercel team",
+      initialValue: teams.some((team) => team.slug === fallback)
+        ? fallback
+        : "",
+      options,
+    }),
+  );
+}
+
+async function getVercelTeams() {
+  try {
+    const commandArgs = ["teams", "list", "--format", "json"];
+    if (args.token) commandArgs.push("--token", args.token);
+    const text = await runCapture("vercel", commandArgs);
+    return extractVercelTeams(text);
+  } catch {
+    warn("could not load Vercel teams; using default scope");
+    return [];
+  }
+}
+
+function extractVercelTeams(text) {
+  const start = text.indexOf("[");
+  const end = text.lastIndexOf("]");
+  if (start === -1 || end === -1 || end < start) return [];
+
+  try {
+    const data = JSON.parse(text.slice(start, end + 1));
+    const teams = Array.isArray(data) ? data : data.teams || [];
+    return teams
+      .map((team) => ({
+        name: team.name || team.slug || "",
+        slug: team.slug || "",
+      }))
+      .filter((team) => team.slug);
+  } catch {
+    return [];
+  }
+}
+
 function parseTools(value) {
   const names = Object.keys(toolChoices);
   const selected = String(value || "")
@@ -648,7 +675,7 @@ async function readDefaults(file) {
 async function syncDefaults() {
   const current = await readDefaults(defaultsPath);
   const codeMtime = Math.max(
-    await readMtime(import.meta.filename),
+    await readMtime(scriptFile),
     await readMtime(legacyDefaultsPath),
   );
   const homeMtime = await readMtime(defaultsPath);
@@ -876,26 +903,25 @@ function printKeyValue(key, value) {
 }
 
 async function askText(question, fallback = "") {
-  return String(
-    await promptResult(
-      p.text({
-        message: question,
-        placeholder: fallback || undefined,
-      }),
-    ),
-  ).trim();
+  const answer = await promptResult(
+    p.text({
+      message: question,
+      initialValue: fallback || undefined,
+      placeholder: fallback || undefined,
+    }),
+  );
+  return answer === undefined ? "" : String(answer).trim();
 }
 
 async function askSecret(question, fallback = "") {
-  return String(
-    await promptResult(
-      p.password({
-        message: question,
-        mask: "*",
-        placeholder: fallback || undefined,
-      }),
-    ),
-  ).trim();
+  const answer = await promptResult(
+    p.password({
+      message: question,
+      mask: "*",
+      placeholder: fallback || undefined,
+    }),
+  );
+  return answer === undefined ? "" : String(answer).trim();
 }
 
 async function promptResult(resultPromise) {
@@ -935,7 +961,7 @@ Options:
   --vm-image NAME      alpine, ubuntu, debian, or a custom VM image
   --base NAME          Alias for --vm-image
   --project NAME       Vercel project name
-  --scope SLUG         Optional Vercel team/user scope slug
+  --scope SLUG         Vercel team/user scope slug; skips team selector
   --from IMAGE         Source image for /app/bin/wsterm
   --shell PATH         /bin/bash, /bin/zsh, or /bin/sh
   --tools LIST         nodejs,codex,claude-code

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vercel-vm-factory",
-  "version": "0.15.8",
+  "version": "0.17.8",
   "description": "Create Vercel Container deployments for ws-shell from selectable VM images.",
   "license": "MIT",
   "type": "module",
@@ -9,6 +9,7 @@
   },
   "files": [
     "bin/",
+    "config.mjs",
     "deploy-vm.mjs",
     "README.md"
   ],