inflight-cli 1.1.4 → 2.0.0

package/dist/lib/vercel.js

@@ -1,68 +1,112 @@
-import { execSync, spawnSync, spawn } from "child_process";
+import { execSync, spawn, exec } from "child_process";
 import { existsSync, readFileSync } from "fs";
 import { join } from "path";
-import { homedir } from "os";
-/**
- * Returns the vercel command to use — the installed CLI if available,
- * otherwise falls back to npx so users don't need a global install.
- */
-function getVercelCmd() {
+import { homedir, platform } from "os";
+import { promisify } from "util";
+const execAsync = promisify(exec);
+// --- Vercel CLI management ---
+/** Checks if the Vercel CLI is installed globally. */
+function hasVercelCli() {
     try {
         execSync("vercel --version", { stdio: "pipe" });
-        return { cmd: "vercel", args: [] };
+        return true;
     }
     catch {
-        return { cmd: "npx", args: ["--yes", "vercel"] };
+        return false;
     }
 }
-/** Reads the auth token saved by the Vercel CLI after login. */
-function getVercelAuthToken() {
-    const candidates = [
-        join(homedir(), "Library", "Application Support", "com.vercel.cli", "auth.json"), // macOS
-        join(homedir(), ".local", "share", "com.vercel.cli", "auth.json"), // Linux
-        join(homedir(), ".config", "vercel", "auth.json"), // older versions
-    ];
-    for (const p of candidates) {
-        if (existsSync(p)) {
-            try {
-                const data = JSON.parse(readFileSync(p, "utf-8"));
-                return data.token ?? null;
-            }
-            catch {
-                continue;
-            }
-        }
+/** Ensures the Vercel CLI is available — installs globally if missing. */
+export async function ensureVercelCli(log) {
+    if (hasVercelCli())
+        return true;
+    log?.("Installing Vercel CLI...");
+    try {
+        await execAsync("npm install -g vercel");
+        return true;
+    }
+    catch {
+        return false;
     }
-    return null;
 }
-export function isVercelLoggedIn() {
-    return getVercelAuthToken() !== null;
+/** Returns the Vercel CLI config directory for the current platform. */
+function getVercelConfigDir() {
+    if (platform() === "darwin") {
+        return join(homedir(), "Library", "Application Support", "com.vercel.cli");
+    }
+    if (platform() === "win32") {
+        return join(process.env.LOCALAPPDATA ?? join(homedir(), "AppData", "Local"), "com.vercel.cli");
+    }
+    return join(homedir(), ".local", "share", "com.vercel.cli");
 }
-export function isVercelLinked(cwd) {
-    return existsSync(join(cwd, ".vercel", "project.json"));
+/** Reads the Vercel CLI auth file. */
+function readVercelAuth() {
+    const authPath = join(getVercelConfigDir(), "auth.json");
+    if (!existsSync(authPath))
+        return null;
+    try {
+        const data = JSON.parse(readFileSync(authPath, "utf-8"));
+        return data.token ? data : null;
+    }
+    catch {
+        return null;
+    }
 }
-/** Opens browser-based Vercel login — suppresses CLI output, browser opens automatically. */
-export function vercelLogin() {
-    const { cmd, args } = getVercelCmd();
-    const result = spawnSync(cmd, [...args, "login"], { stdio: "pipe" });
-    return result.status === 0;
+/**
+ * Gets a valid Vercel token. Refreshes silently via `vercel whoami` if expired.
+ * Does NOT prompt for login — returns null if no valid token available.
+ */
+export function getVercelToken() {
+    const auth = readVercelAuth();
+    if (!auth)
+        return null;
+    // Token still valid
+    if (auth.expiresAt > Date.now() / 1000) {
+        return auth.token;
+    }
+    // Token expired — try silent refresh
+    try {
+        execSync("vercel whoami", { stdio: "pipe" });
+        const refreshed = readVercelAuth();
+        if (refreshed && refreshed.expiresAt > Date.now() / 1000) {
+            return refreshed.token;
+        }
+    }
+    catch {
+        // Refresh failed
+    }
+    return null;
 }
-/** Links the directory to a specific Vercel project silently. */
-export function vercelLink(cwd, projectId) {
-    const { cmd, args } = getVercelCmd();
-    return new Promise((resolve) => {
-        const child = spawn(cmd, [...args, "link", "--yes", "--project", projectId], {
-            stdio: "pipe",
-            cwd,
+/**
+ * Ensures a valid Vercel auth token is available.
+ * Checks existing token → refreshes if expired → opens browser login if needed.
+ * For interactive commands only.
+ */
+export async function ensureVercelAuth() {
+    // Try existing/refreshed token first
+    const existing = getVercelToken();
+    if (existing)
+        return existing;
+    // Need browser login — capture output to suppress Vercel's default messages
+    const ok = await new Promise((resolve) => {
+        const child = spawn("vercel", ["login"], { stdio: "pipe" });
+        child.stdout?.on("data", (data) => {
+            const text = data.toString();
+            // Only show the verification URL
+            const urlMatch = text.match(/(https:\/\/vercel\.com\/oauth\/device\S*)/);
+            if (urlMatch) {
+                process.stdout.write(`  Visit ${urlMatch[1]}\n`);
+            }
         });
         child.on("close", (code) => resolve(code === 0));
         child.on("error", () => resolve(false));
     });
+    if (!ok)
+        return null;
+    const auth = readVercelAuth();
+    return auth?.token ?? null;
 }
-export async function getVercelTeams() {
-    const token = getVercelAuthToken();
-    if (!token)
-        return [];
+// --- API calls (all take token + IDs explicitly) ---
+export async function getVercelTeams(token) {
     const res = await fetch("https://api.vercel.com/v2/teams", {
         headers: { Authorization: `Bearer ${token}` },
     });
@@ -71,10 +115,7 @@ export async function getVercelTeams() {
     const data = (await res.json());
     return data.teams;
 }
-export async function getVercelProjects(teamId) {
-    const token = getVercelAuthToken();
-    if (!token)
-        return [];
+export async function getVercelProjects(token, teamId) {
     const params = new URLSearchParams({ teamId, limit: "100" });
     const res = await fetch(`https://api.vercel.com/v10/projects?${params}`, {
         headers: { Authorization: `Bearer ${token}` },
@@ -84,32 +125,16 @@ export async function getVercelProjects(teamId) {
     const data = (await res.json());
     return data.projects;
 }
-/** Reads the project + team IDs from `.vercel/project.json`. */
-function getVercelProjectConfig(cwd) {
-    const configPath = join(cwd, ".vercel", "project.json");
-    if (!existsSync(configPath))
-        return null;
-    try {
-        return JSON.parse(readFileSync(configPath, "utf-8"));
-    }
-    catch {
-        return null;
-    }
-}
 /**
  * Fetches the branch alias URL (stable, auto-updates with each push).
  * Returns null if no deployment exists for this branch.
  */
-export async function getBranchAliasUrl(cwd, branch) {
+export async function getBranchAliasUrl(token, teamId, projectId, branch) {
     if (!branch)
         return null;
-    const token = getVercelAuthToken();
-    const project = getVercelProjectConfig(cwd);
-    if (!token || !project)
-        return null;
     const params = new URLSearchParams({
-        projectId: project.projectId,
-        teamId: project.orgId,
+        projectId,
+        teamId,
         limit: "1",
         state: "READY",
         branch,
@@ -124,30 +149,28 @@ export async function getBranchAliasUrl(cwd, branch) {
     if (!deploy)
         return null;
     // Fetch the automatic alias for this deployment
-    const aliasParams = new URLSearchParams({ teamId: project.orgId });
+    const aliasParams = new URLSearchParams({ teamId });
     const aliasRes = await fetch(`https://api.vercel.com/v13/deployments/${deploy.uid}?${aliasParams}`, {
         headers: { Authorization: `Bearer ${token}` },
     });
     if (!aliasRes.ok)
         return null;
     const aliasData = (await aliasRes.json());
-    const alias = aliasData.automaticAliases?.[0];
-    return alias ?? null;
+    return aliasData.automaticAliases?.[0] ?? null;
 }
 /**
- * Fetches recent deployments for the project.
+ * Fetches recent deployments for a project.
  */
-export async function getRecentDeployments(cwd, limit = 10) {
-    const token = getVercelAuthToken();
-    const project = getVercelProjectConfig(cwd);
-    if (!token || !project)
-        return [];
+export async function getRecentDeployments(token, teamId, projectId, opts) {
     const params = new URLSearchParams({
-        projectId: project.projectId,
-        teamId: project.orgId,
-        limit: String(limit),
+        projectId,
+        teamId,
+        limit: String(opts?.limit ?? 10),
         state: "READY",
     });
+    if (opts?.branch) {
+        params.set("branch", opts.branch);
+    }
     const res = await fetch(`https://api.vercel.com/v6/deployments?${params}`, {
         headers: { Authorization: `Bearer ${token}` },
     });
@@ -157,7 +180,8 @@ export async function getRecentDeployments(cwd, limit = 10) {
     return data.deployments.map((d) => ({
         url: d.url,
         branch: d.meta?.githubCommitRef ?? d.meta?.gitlabCommitRef ?? d.meta?.bitbucketCommitRef ?? null,
-        commitSha: (d.meta?.githubCommitSha ?? d.meta?.gitlabCommitSha ?? d.meta?.bitbucketCommitSha ?? null)?.slice(0, 7) ?? null,
+        commitSha: (d.meta?.githubCommitSha ?? d.meta?.gitlabCommitSha ?? d.meta?.bitbucketCommitSha ?? null)?.slice(0, 7) ??
+            null,
         commitMessage: d.meta?.githubCommitMessage ?? d.meta?.gitlabCommitMessage ?? d.meta?.bitbucketCommitMessage ?? null,
         createdAt: d.created,
     }));

package/dist/providers/vercel.d.ts

@@ -1,2 +1,8 @@
 import type { GitInfo } from "../lib/git.js";
+import type { VercelConfig } from "../lib/config.js";
+/**
+ * Interactive team/project picker. Saves selection to global config.
+ * Reused by both `inflight vercel` and the share flow.
+ */
+export declare function pickVercelProject(token: string): Promise<VercelConfig | null>;
 export declare function resolveVercelUrl(cwd: string, gitInfo: GitInfo): Promise<string | null>;

package/dist/providers/vercel.js

@@ -1,64 +1,76 @@
 import * as p from "@clack/prompts";
 import pc from "picocolors";
-import { isVercelLoggedIn, isVercelLinked, vercelLogin, vercelLink, getVercelTeams, getVercelProjects, getBranchAliasUrl, getRecentDeployments, } from "../lib/vercel.js";
-export async function resolveVercelUrl(cwd, gitInfo) {
-    const spinner = p.spinner();
-    // Ensure logged in
-    const loggedIn = isVercelLoggedIn();
-    if (!loggedIn) {
-        p.log.info("Opening browser to log in to Vercel...");
-        const ok = vercelLogin();
-        if (!ok) {
-            p.log.error("Vercel login failed.");
-            process.exit(1);
-        }
+import { readVercelConfig, writeVercelConfig } from "../lib/config.js";
+import { ensureVercelCli, ensureVercelAuth, getVercelTeams, getVercelProjects, getBranchAliasUrl, getRecentDeployments, } from "../lib/vercel.js";
+/**
+ * Interactive team/project picker. Saves selection to global config.
+ * Reused by both `inflight vercel` and the share flow.
+ */
+export async function pickVercelProject(token) {
+    const teams = await getVercelTeams(token);
+    if (teams.length === 0) {
+        p.log.error("No Vercel teams found.");
+        return null;
     }
-    // Ensure project is linked
-    const linked = isVercelLinked(cwd);
-    if (!linked) {
-        const teams = await getVercelTeams();
-        if (teams.length === 0) {
-            p.log.error("No Vercel teams found.");
-            process.exit(1);
-        }
-        let teamId;
-        if (teams.length === 1) {
-            teamId = teams[0].id;
-        }
-        else {
-            const selectedTeam = await p.select({
-                message: "Select a Vercel team",
-                options: teams.map((t) => ({ value: t.id, label: t.name })),
-            });
-            if (p.isCancel(selectedTeam)) {
-                p.cancel("Cancelled.");
-                process.exit(0);
-            }
-            teamId = selectedTeam;
-        }
-        const projects = await getVercelProjects(teamId);
-        if (projects.length === 0) {
-            p.log.error("No Vercel projects found.");
-            process.exit(1);
-        }
-        const selectedProject = await p.select({
-            message: "Select a Vercel project",
-            options: projects.map((proj) => ({ value: proj.id, label: proj.name })),
+    let teamId;
+    let teamName;
+    if (teams.length === 1) {
+        teamId = teams[0].id;
+        teamName = teams[0].name;
+    }
+    else {
+        const selected = await p.select({
+            message: "Select a Vercel team",
+            options: teams.map((t) => ({ value: t.id, label: t.name })),
         });
-        if (p.isCancel(selectedProject)) {
+        if (p.isCancel(selected)) {
             p.cancel("Cancelled.");
-            process.exit(0);
-        }
-        spinner.start("Linking to Vercel project...");
-        const ok = await vercelLink(cwd, selectedProject);
-        spinner.stop(ok ? "Linked to Vercel project" : "");
-        if (!ok) {
-            p.log.error("Vercel link failed.");
-            process.exit(1);
+            return null;
         }
+        teamId = selected;
+        teamName = teams.find((t) => t.id === teamId)?.name ?? teamId;
+    }
+    const projects = await getVercelProjects(token, teamId);
+    if (projects.length === 0) {
+        p.log.error("No Vercel projects found for this team.");
+        return null;
+    }
+    const selectedProject = await p.select({
+        message: "Select a Vercel project",
+        options: projects.map((proj) => ({ value: proj.id, label: proj.name })),
+    });
+    if (p.isCancel(selectedProject)) {
+        p.cancel("Cancelled.");
+        return null;
+    }
+    const projectId = selectedProject;
+    const projectName = projects.find((proj) => proj.id === projectId)?.name ?? projectId;
+    const config = { teamId, teamName, projectId, projectName };
+    writeVercelConfig(config);
+    return config;
+}
+export async function resolveVercelUrl(cwd, gitInfo) {
+    // Ensure Vercel CLI is installed (only logs if installing)
+    const cliOk = await ensureVercelCli((msg) => p.log.step(msg));
+    if (!cliOk) {
+        p.log.error("Failed to install Vercel CLI. Install manually: " + pc.cyan("npm install -g vercel"));
+        return null;
+    }
+    // Ensure auth
+    const token = await ensureVercelAuth();
+    if (!token) {
+        p.log.error("Vercel login failed.");
+        return null;
+    }
+    // Get or pick Vercel project
+    let config = readVercelConfig();
+    if (!config) {
+        config = await pickVercelProject(token);
+        if (!config)
+            return null;
     }
     // Fetch branch alias
-    const branchAlias = await getBranchAliasUrl(cwd, gitInfo.branch);
+    const branchAlias = await getBranchAliasUrl(token, config.teamId, config.projectId, gitInfo.branch);
     if (branchAlias) {
         p.log.info(`Branch preview (auto-updates with each push):\n  → ${pc.cyan(branchAlias)}`);
         const choice = await p.select({
@@ -78,8 +90,8 @@ export async function resolveVercelUrl(cwd, gitInfo) {
         if (choice === "manual")
             return null;
     }
-    // Show recent deployments (either user chose "recent" or no branch alias found)
-    const recent = await getRecentDeployments(cwd);
+    // Show recent deployments
+    const recent = await getRecentDeployments(token, config.teamId, config.projectId);
     if (recent.length === 0) {
         p.log.warn("No deployments found. Paste a URL instead.");
         return null;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "inflight-cli",
-	"version": "1.1.4",
+	"version": "2.0.0",
 	"description": "Get feedback directly on your staging URL",
 	"bin": {
 		"inflight": "dist/index.js"
@@ -14,7 +14,8 @@
 	"homepage": "https://www.inflight.co",
 	"scripts": {
 		"build": "tsc && chmod +x dist/index.js",
-		"dev": "tsx src/index.ts"
+		"dev": "tsx src/index.ts",
+		"prepublishOnly": "npm run build"
 	},
 	"dependencies": {
 		"@clack/prompts": "^0.8.2",