inflight-cli 2.1.0 → 2.1.2

package/README.md

@@ -16,8 +16,7 @@ That's it. The CLI installs globally, logs you in, adds the widget to your proje
 | --------------------- | -------------------------------- |
 | `inflight setup`      | Set up Inflight in your project  |
 | `inflight share`      | Share a staging URL for feedback |
-| `inflight vercel`     | Change your Vercel project       |
-| `inflight workspaces` | Change your Inflight workspace   |
+| `inflight workspace`  | Get or set your active workspace |
 | `inflight login`      | Log in to your Inflight account  |
 | `inflight logout`     | Log out of your Inflight account |
 

package/dist/commands/setup.js

@@ -55,7 +55,7 @@ export async function setupCommand() {
     const existingWorkspace = existingConfig ? workspaces.find((w) => w.id === existingConfig.workspaceId) : null;
     if (existingWorkspace) {
         workspaceId = existingWorkspace.id;
-        p.log.success(`Workspace: ${pc.bold(existingWorkspace.name)} ${pc.dim("(change anytime with inflight workspaces)")}`);
+        p.log.success(`Workspace: ${pc.bold(existingWorkspace.name)} ${pc.dim("(change anytime with inflight workspace)")}`);
     }
     else if (workspaces.length === 0) {
         p.log.error("No workspaces found. Create one at " + pc.cyan("inflight.co") + " first.");
@@ -67,7 +67,7 @@ export async function setupCommand() {
     }
     else {
         const selected = await p.select({
-            message: "Select a workspace " + pc.dim("(change anytime with inflight workspaces)"),
+            message: "Select a workspace " + pc.dim("(change anytime with inflight workspace)"),
             options: workspaces.map((w) => ({ value: w.id, label: w.name })),
         });
         if (p.isCancel(selected)) {
@@ -182,5 +182,5 @@ export async function setupCommand() {
     // ── Done ──
     p.log.success(pc.green("Setup complete!") + " Run " + pc.cyan("inflight share") + " anytime to share your staging URL.");
     // ── Step 6: Share ──
-    await shareCommand({ workspace: workspaceId });
+    await shareCommand();
 }

package/dist/commands/share.d.ts

@@ -1,6 +1,5 @@
 export interface ShareOptions {
     url?: string;
-    workspace?: string;
     json?: boolean;
 }
 export declare function shareCommand(opts?: ShareOptions): Promise<void>;

package/dist/commands/share.js

@@ -7,6 +7,7 @@ import { providers } from "../providers/index.js";
 import { apiGetMe, apiCreateVersion } from "../lib/api.js";
 export async function shareCommand(opts = {}) {
     const cwd = process.cwd();
+    // ── Step 1: Auth ──
     const auth = readGlobalAuth();
     if (!auth) {
         if (opts.json) {
@@ -18,15 +19,69 @@ export async function shareCommand(opts = {}) {
         process.exit(1);
     }
     const gitInfo = getGitInfo(cwd);
-    // ── Fast path: all inputs provided (agent / scripting) ──
-    if (opts.url && opts.workspace) {
+    // ── Step 2: Resolve workspace ──
+    const me = await apiGetMe(auth.apiKey).catch((e) => {
+        if (opts.json) {
+            console.log(JSON.stringify({ error: "api_error", message: e.message }));
+        }
+        else {
+            p.log.error(e.message);
+        }
+        process.exit(1);
+    });
+    const workspaces = me.workspaces;
+    let workspaceId;
+    const savedConfig = readWorkspaceConfig();
+    const savedWorkspace = savedConfig ? workspaces.find((w) => w.id === savedConfig.workspaceId) : null;
+    if (savedWorkspace) {
+        workspaceId = savedWorkspace.id;
+    }
+    else if (workspaces.length === 0) {
+        if (opts.json) {
+            console.log(JSON.stringify({
+                error: "no_workspaces",
+                message: "No workspaces found. Create one at inflight.co first.",
+            }));
+        }
+        else {
+            p.log.error("No workspaces found. Create one at " + pc.cyan("inflight.co") + " first.");
+        }
+        process.exit(1);
+    }
+    else if (workspaces.length === 1) {
+        workspaceId = workspaces[0].id;
+        if (!opts.json)
+            p.log.success(`Workspace: ${pc.bold(workspaces[0].name)}`);
+    }
+    else {
+        if (opts.json) {
+            console.log(JSON.stringify({
+                error: "no_workspace_set",
+                message: "Multiple workspaces found. Run 'inflight workspace --set=ID' first.",
+                workspaces: workspaces.map((w) => ({ id: w.id, name: w.name })),
+            }));
+            process.exit(1);
+        }
+        const selected = await p.select({
+            message: "Select a workspace " + pc.dim("(change anytime with inflight workspace)"),
+            options: workspaces.map((w) => ({ value: w.id, label: w.name })),
+        });
+        if (p.isCancel(selected)) {
+            p.cancel("Cancelled.");
+            process.exit(0);
+        }
+        workspaceId = selected;
+    }
+    writeWorkspaceConfig({ workspaceId });
+    // ── Fast path: URL provided (agent / scripting) ──
+    if (opts.url) {
         let stagingUrl = opts.url;
         if (!stagingUrl.startsWith("http")) {
             stagingUrl = `https://${stagingUrl}`;
         }
         const result = await apiCreateVersion({
             apiKey: auth.apiKey,
-            workspaceId: opts.workspace,
+            workspaceId,
             stagingUrl,
             gitInfo,
         }).catch((e) => {
@@ -48,39 +103,6 @@ export async function shareCommand(opts = {}) {
         await open(stagingUrl);
         return;
     }
-    // ── Interactive path: prompt for missing inputs ──
-    // Resolve workspace
-    let workspaceId = opts.workspace ?? readWorkspaceConfig()?.workspaceId;
-    if (!workspaceId) {
-        const me = await apiGetMe(auth.apiKey).catch((e) => {
-            p.log.error(e.message);
-            process.exit(1);
-        });
-        if (me.workspaces.length === 0) {
-            p.log.error("No workspaces found. Create one at " + pc.cyan("inflight.co") + " first.");
-            process.exit(1);
-        }
-        else if (me.workspaces.length === 1) {
-            workspaceId = me.workspaces[0].id;
-            p.log.info(`Workspace: ${pc.bold(me.workspaces[0].name)}`);
-        }
-        else {
-            const selected = await p.select({
-                message: "Select a workspace " + pc.dim("(change anytime with inflight workspaces)"),
-                options: me.workspaces.map((w) => ({ value: w.id, label: w.name })),
-            });
-            if (p.isCancel(selected)) {
-                p.cancel("Cancelled.");
-                process.exit(0);
-            }
-            workspaceId = selected;
-        }
-        writeWorkspaceConfig({ workspaceId });
-    }
-    if (!workspaceId) {
-        p.log.error("No workspace configured. Run " + pc.cyan("inflight workspaces") + " or " + pc.cyan("inflight setup") + ".");
-        process.exit(1);
-    }
     // Resolve staging URL
     const providerChoice = await p.select({
         message: "Where is your staging URL hosted?",

package/dist/commands/vercel.js

@@ -1,128 +1,65 @@
-import * as p from "@clack/prompts";
-import pc from "picocolors";
-import { readVercelConfig, writeVercelConfig } from "../lib/config.js";
-import { ensureVercelCli, ensureVercelAuth, getVercelToken, getVercelTeams, getVercelProjects, getRecentDeployments, getBranchAlias, } from "../lib/vercel.js";
-import { pickVercelProject } from "../providers/vercel.js";
+import { readVercelConfig } from "../lib/config.js";
+import { getGitInfo, parseGitRepo, getGitRoot } from "../lib/git.js";
+import { getVercelToken, getRecentDeployments, getBranchAlias, readLocalVercelProject, fetchAllProjectsWithLinks, matchProjectsByRepo, } from "../lib/vercel.js";
 // --- Action handlers ---
-async function vercelSetup(opts) {
-    // Fast path: non-interactive set (for agents)
-    if (opts.team && opts.project) {
-        const token = requireVercelToken();
-        const teams = await getVercelTeams(token);
-        const team = teams.find((t) => t.id === opts.team);
-        if (!team) {
-            const msg = `Team '${opts.team}' not found. Available: ${teams.map((t) => `${t.name} (${t.id})`).join(", ")}`;
-            if (opts.json) {
-                console.log(JSON.stringify({ error: "team_not_found", message: msg }));
-            }
-            else {
-                p.log.error(msg);
-            }
-            process.exit(1);
-        }
-        const projects = await getVercelProjects(token, opts.team);
-        const project = projects.find((proj) => proj.id === opts.project);
-        if (!project) {
-            const msg = `Project '${opts.project}' not found on team '${team.name}'.`;
-            if (opts.json) {
-                console.log(JSON.stringify({ error: "project_not_found", message: msg }));
-            }
-            else {
-                p.log.error(msg);
-            }
-            process.exit(1);
-        }
-        writeVercelConfig({ teamId: team.id, teamName: team.name, projectId: project.id, projectName: project.name });
-        if (opts.json) {
-            console.log(JSON.stringify({
-                saved: true,
-                teamId: team.id,
-                teamName: team.name,
-                projectId: project.id,
-                projectName: project.name,
-            }));
-        }
-        else {
-            p.log.success(`Saved! Using ${pc.bold(project.name)} on ${pc.bold(team.name)}.`);
-        }
-        return;
-    }
-    // Interactive path
-    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"));
-        process.exit(1);
-    }
-    p.log.step("Checking Vercel authentication...");
-    const token = await ensureVercelAuth();
-    if (!token) {
-        p.log.error("Vercel login failed.");
-        process.exit(1);
-    }
-    const current = readVercelConfig();
-    if (current) {
-        p.log.info(`Current: ${pc.bold(current.projectName)} on ${pc.bold(current.teamName)}`);
-    }
-    const config = await pickVercelProject(token);
-    if (!config)
-        process.exit(1);
-    p.log.success(`Saved! ${pc.cyan("inflight share")} will now use ${pc.bold(config.projectName)} on ${pc.bold(config.teamName)}.`);
-}
-async function listTeams() {
-    const token = requireVercelToken();
-    const teams = await getVercelTeams(token);
-    console.log(JSON.stringify(teams));
-}
-async function listProjects(opts) {
+async function listProjects() {
     const token = requireVercelToken();
-    const projects = await getVercelProjects(token, opts.team);
-    console.log(JSON.stringify(projects));
+    const projects = await fetchAllProjectsWithLinks(token);
+    console.log(JSON.stringify(projects.map((p) => ({ id: p.id, name: p.name, teamId: p.teamId, teamName: p.teamName }))));
 }
-async function listDeployments(opts) {
+/**
+ * Resolves teamId + projectId for subcommands.
+ * Priority: explicit flags → .vercel/project.json → git remote match → saved global config → error
+ */
+async function resolveProject(opts) {
+    if (opts.team && opts.project) {
+        return { teamId: opts.team, projectId: opts.project };
+    }
     const token = requireVercelToken();
-    let teamId = opts.team;
-    let projectId = opts.project;
-    if (!teamId || !projectId) {
-        const config = readVercelConfig();
-        if (!config) {
-            console.log(JSON.stringify({
-                error: "vercel_not_configured",
-                message: "No Vercel project configured. Run 'inflight vercel --team=TEAM_ID --project=PROJECT_ID --json' first.",
-            }));
-            process.exit(1);
+    const cwd = process.cwd();
+    const gitRoot = getGitRoot(cwd);
+    if (gitRoot) {
+        const local = readLocalVercelProject(gitRoot);
+        if (local)
+            return { teamId: local.orgId, projectId: local.projectId };
+    }
+    const gitInfo = getGitInfo(cwd);
+    if (gitInfo.remoteUrl) {
+        const gitRepo = parseGitRepo(gitInfo.remoteUrl);
+        if (gitRepo) {
+            try {
+                const allProjects = await fetchAllProjectsWithLinks(token);
+                const matches = matchProjectsByRepo(allProjects, gitRepo.owner, gitRepo.name);
+                if (matches.length === 1) {
+                    return { teamId: matches[0].teamId, projectId: matches[0].id };
+                }
+            }
+            catch { }
         }
-        teamId = teamId ?? config.teamId;
-        projectId = projectId ?? config.projectId;
     }
-    const deployments = await getRecentDeployments(token, teamId, projectId, {
-        limit: parseInt(opts.limit ?? "10"),
-        branch: opts.branch,
-    });
-    console.log(JSON.stringify(deployments));
+    const config = readVercelConfig();
+    if (config)
+        return { teamId: config.teamId, projectId: config.projectId };
+    console.log(JSON.stringify({
+        error: "vercel_not_configured",
+        message: "Could not auto-detect Vercel project. Run 'inflight vercel projects' to list available projects, then pass --team and --project to 'inflight vercel deployments'.",
+    }));
+    process.exit(1);
 }
-async function branchUrl(opts) {
+async function listDeployments(opts) {
     const token = requireVercelToken();
-    let teamId = opts.team;
-    let projectId = opts.project;
-    if (!teamId || !projectId) {
-        const config = readVercelConfig();
-        if (!config) {
-            console.log(JSON.stringify({
-                error: "vercel_not_configured",
-                message: "No Vercel project configured. Run 'inflight vercel --team=TEAM_ID --project=PROJECT_ID --json' first.",
-            }));
-            process.exit(1);
-        }
-        teamId = teamId ?? config.teamId;
-        projectId = projectId ?? config.projectId;
-    }
-    const alias = await getBranchAlias(token, teamId, projectId, opts.branch);
-    if (alias) {
-        console.log(JSON.stringify({ url: alias.url, state: alias.state, branch: opts.branch }));
-    }
-    else {
-        console.log(JSON.stringify({ url: null, branch: opts.branch, message: "No deployment found for this branch." }));
-    }
+    const { teamId, projectId } = await resolveProject(opts);
+    const cwd = process.cwd();
+    const gitInfo = getGitInfo(cwd);
+    const currentBranch = gitInfo.branch;
+    const [deployments, branchAlias] = await Promise.all([
+        getRecentDeployments(token, teamId, projectId),
+        currentBranch ? getBranchAlias(token, teamId, projectId, currentBranch) : Promise.resolve(null),
+    ]);
+    console.log(JSON.stringify({
+        branchAlias: branchAlias ? { url: branchAlias.url, state: branchAlias.state, branch: currentBranch } : null,
+        deployments,
+    }));
 }
 /** Gets token silently, exits with JSON error if unavailable. */
 function requireVercelToken() {
@@ -130,7 +67,7 @@ function requireVercelToken() {
     if (!token) {
         console.log(JSON.stringify({
             error: "vercel_not_authenticated",
-            message: "Vercel auth expired or missing. Run 'inflight vercel' or 'vercel login' first.",
+            message: "Vercel auth expired or missing. Run 'vercel login' first.",
         }));
         process.exit(1);
     }
@@ -138,33 +75,12 @@ function requireVercelToken() {
 }
 // --- Command registration ---
 export function registerVercelCommand(program) {
-    const vercel = program
-        .command("vercel")
-        .description("Set up or change your Vercel project")
-        .passThroughOptions()
-        .option("--team <id>", "Vercel team ID (non-interactive)")
-        .option("--project <id>", "Vercel project ID (non-interactive)")
-        .option("--json", "Output as JSON (non-interactive)")
-        .action(vercelSetup);
-    vercel.command("teams").description("List Vercel teams (JSON)").action(listTeams);
-    vercel
-        .command("projects")
-        .description("List projects for a Vercel team (JSON)")
-        .requiredOption("--team <id>", "Vercel team ID")
-        .action(listProjects);
-    vercel
-        .command("branch-url")
-        .description("Get the stable branch preview URL (JSON)")
-        .requiredOption("--branch <name>", "Git branch name")
-        .option("--team <id>", "Vercel team ID (reads from saved config if omitted)")
-        .option("--project <id>", "Vercel project ID (reads from saved config if omitted)")
-        .action(branchUrl);
+    const vercel = program.command("vercel").description("Vercel integration commands");
+    vercel.command("projects").description("List all Vercel projects (JSON)").action(listProjects);
     vercel
         .command("deployments")
-        .description("List recent deployments (JSON)")
-        .option("--team <id>", "Vercel team ID (reads from saved config if omitted)")
-        .option("--project <id>", "Vercel project ID (reads from saved config if omitted)")
-        .option("--branch <name>", "Filter by git branch")
-        .option("--limit <n>", "Number of deployments", "10")
+        .description("List recent deployments + branch alias (JSON)")
+        .option("--team <id>", "Vercel team ID (auto-detected if omitted)")
+        .option("--project <id>", "Vercel project ID (auto-detected if omitted)")
         .action(listDeployments);
 }

package/dist/commands/workspace.d.ts

@@ -0,0 +1,4 @@
+export declare function workspaceCommand(opts: {
+    json?: boolean;
+    set?: string;
+}): Promise<void>;

package/dist/commands/workspace.js

@@ -0,0 +1,85 @@
+import * as p from "@clack/prompts";
+import pc from "picocolors";
+import { readGlobalAuth, readWorkspaceConfig, writeWorkspaceConfig } from "../lib/config.js";
+import { apiGetMe } from "../lib/api.js";
+export async function workspaceCommand(opts) {
+    const auth = readGlobalAuth();
+    if (!auth) {
+        if (opts.json) {
+            console.log(JSON.stringify({ error: "not_authenticated", message: "Not logged in. Run inflight login first." }));
+            process.exit(1);
+        }
+        p.log.error("Not logged in. Run " + pc.cyan("inflight login") + " first.");
+        process.exit(1);
+    }
+    // ── Fetch workspaces ──
+    const me = await apiGetMe(auth.apiKey).catch((e) => {
+        if (opts.json) {
+            console.log(JSON.stringify({ error: "api_error", message: e.message }));
+            process.exit(1);
+        }
+        p.log.error(e.message);
+        process.exit(1);
+    });
+    const workspaces = me.workspaces;
+    // ── Set active workspace ──
+    if (opts.set) {
+        const workspace = workspaces.find((w) => w.id === opts.set);
+        if (!workspace) {
+            const msg = `Workspace '${opts.set}' not found.`;
+            if (opts.json) {
+                console.log(JSON.stringify({
+                    error: "workspace_not_found",
+                    message: msg,
+                    available: workspaces.map((w) => ({ id: w.id, name: w.name })),
+                }));
+            }
+            else {
+                p.log.error(msg);
+            }
+            process.exit(1);
+        }
+        writeWorkspaceConfig({ workspaceId: workspace.id });
+        if (opts.json) {
+            console.log(JSON.stringify({ success: true, active: workspace.id, name: workspace.name }));
+        }
+        else {
+            p.outro(pc.green(`Workspace set to ${pc.bold(workspace.name)}`));
+        }
+        return;
+    }
+    // ── JSON mode: list + active ──
+    if (opts.json) {
+        const active = readWorkspaceConfig()?.workspaceId ?? null;
+        console.log(JSON.stringify({ active, workspaces }));
+        return;
+    }
+    // ── Interactive mode: select workspace ──
+    if (workspaces.length === 0) {
+        p.log.error("No workspaces found. Create one at inflight.co");
+        process.exit(1);
+    }
+    const currentWorkspaceId = readWorkspaceConfig()?.workspaceId;
+    if (currentWorkspaceId) {
+        const currentWs = workspaces.find((w) => w.id === currentWorkspaceId);
+        if (currentWs) {
+            p.log.info(`Current workspace: ${pc.bold(currentWs.name)}`);
+        }
+    }
+    const selected = await p.select({
+        message: "Select a workspace",
+        options: workspaces.map((w) => ({
+            value: w.id,
+            label: w.name,
+            hint: currentWorkspaceId === w.id ? "current" : undefined,
+        })),
+    });
+    if (p.isCancel(selected)) {
+        p.cancel("Cancelled.");
+        process.exit(0);
+    }
+    const workspaceId = selected;
+    writeWorkspaceConfig({ workspaceId });
+    const name = workspaces.find((w) => w.id === workspaceId)?.name ?? workspaceId;
+    p.outro(pc.green(`Workspace set to ${pc.bold(name)}`));
+}

package/dist/index.js

@@ -5,36 +5,32 @@ import { loginCommand } from "./commands/login.js";
 import { shareCommand } from "./commands/share.js";
 import { logoutCommand } from "./commands/logout.js";
 import { resetCommand } from "./commands/reset.js";
-import { workspacesCommand } from "./commands/workspaces.js";
+import { workspaceCommand } from "./commands/workspace.js";
 import { registerVercelCommand } from "./commands/vercel.js";
 import { setupCommand } from "./commands/setup.js";
 import pkg from "../package.json" with { type: "json" };
 const { version } = pkg;
-updateNotifier({ pkg }).notify();
+updateNotifier({ pkg, updateCheckInterval: 1000 * 60 * 60 }).notify();
 const program = new Command();
-program.name("inflight").description("Get feedback directly on your staging URL").version(version).enablePositionalOptions();
+program
+    .name("inflight")
+    .description("Get feedback directly on your staging URL")
+    .version(version)
+    .enablePositionalOptions();
 program.command("setup").description("Set up Inflight in your project").action(setupCommand);
 program.command("login").description("Authenticate with your Inflight account").action(loginCommand);
 program
     .command("share")
     .description("Get feedback on your staging URL")
     .option("--url <url>", "Staging URL (skips provider selection)")
-    .option("--workspace <id>", "Workspace ID (skips workspace selection)")
     .option("--json", "Output result as JSON")
     .action((opts) => shareCommand(opts));
-// program
-// 	.command("preview")
-// 	.description("Preview a live component from your code")
-// 	.option("-m, --message <message>", "Pre-fill the intent prompt")
-// 	.option("--scope <mode>", "Skip scope prompt: branch, uncommitted, staged")
-// 	.option("--no-open", "Don't open result in browser")
-// 	.action((opts) => previewCommand(opts));
 program
-    .command("workspaces")
-    .description("List, select, or set your workspaces")
+    .command("workspace")
+    .description("Get or set your active workspace")
     .option("--json", "Output as JSON")
     .option("--set <id>", "Set the active workspace")
-    .action((opts) => workspacesCommand(opts));
+    .action((opts) => workspaceCommand(opts));
 registerVercelCommand(program);
 program.command("logout").description("Disconnect your Inflight account").action(logoutCommand);
 program.command("reset").description("Clear all Inflight auth and config").action(resetCommand);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "inflight-cli",
-	"version": "2.1.0",
+	"version": "2.1.2",
 	"description": "Get feedback directly on your staging URL",
 	"bin": {
 		"inflight": "dist/index.js",