inflight-cli 2.6.0 → 2.8.0

package/dist/commands/login.js

@@ -3,47 +3,74 @@ import pc from "picocolors";
 import { readGlobalAuth, writeGlobalAuth } from "../lib/config.js";
 import { apiGetMe } from "../lib/api.js";
 import { API_URL, WEB_URL } from "../lib/env.js";
+import { isAgent, agentError } from "../lib/agent.js";
 const POLL_INTERVAL_MS = 2000;
 const POLL_TIMEOUT_MS = 5 * 60 * 1000;
 export async function loginCommand() {
     const existingAuth = readGlobalAuth();
     if (existingAuth) {
-        const spinner = p.spinner();
-        spinner.start("Checking existing session...");
-        const me = await apiGetMe(existingAuth.apiKey).catch(() => null);
-        if (me?.email) {
-            spinner.stop(pc.green(`✓ Logged in as ${pc.bold(me.email)}`));
-            return;
+        if (!isAgent) {
+            const spinner = p.spinner();
+            spinner.start("Checking existing session...");
+            const me = await apiGetMe(existingAuth.apiKey).catch(() => null);
+            if (me?.email) {
+                spinner.stop(pc.green(`✓ Logged in as ${pc.bold(me.email)}`));
+                return;
+            }
+            spinner.stop("Session expired — re-authenticating...");
+        }
+        else {
+            const me = await apiGetMe(existingAuth.apiKey).catch(() => null);
+            if (me?.email)
+                return;
         }
-        spinner.stop("Session expired — re-authenticating...");
     }
     const sessionId = crypto.randomUUID();
     const authUrl = `${WEB_URL}/cli/connect?session_id=${sessionId}`;
-    p.log.info("Opening browser to authenticate with Inflight...");
-    p.log.info(`Opening ${pc.cyan(authUrl)}`);
+    if (!isAgent) {
+        p.log.info("Opening browser to authenticate with Inflight...");
+        p.log.info(`Opening ${pc.cyan(authUrl)}`);
+    }
     const { default: open } = await import("open");
     await open(authUrl);
-    const spinner = p.spinner();
-    spinner.start("Waiting for browser authentication...");
-    const apiKey = await pollForApiKey(sessionId);
-    if (!apiKey) {
-        spinner.stop("Authentication timed out.");
-        p.log.error("No response after 5 minutes. Please try again.");
-        process.exit(1);
+    if (!isAgent) {
+        const spinner = p.spinner();
+        spinner.start("Waiting for login");
+        const apiKey = await pollForApiKey(sessionId);
+        if (!apiKey) {
+            spinner.stop("Authentication timed out.");
+            p.log.error("No response after 5 minutes. Please try again.");
+            process.exit(1);
+        }
+        spinner.message("Validating...");
+        const me = await apiGetMe(apiKey).catch((e) => {
+            spinner.stop("Validation failed.");
+            p.log.error(e.message);
+            process.exit(1);
+        });
+        if (!me.email) {
+            spinner.stop("Validation failed.");
+            p.log.error("No email associated with this account.");
+            process.exit(1);
+        }
+        writeGlobalAuth({ apiKey });
+        spinner.stop(pc.green(`✓ Logged in as ${pc.bold(me.email)}`));
     }
-    spinner.message("Validating...");
-    const me = await apiGetMe(apiKey).catch((e) => {
-        spinner.stop("Validation failed.");
-        p.log.error(e.message);
-        process.exit(1);
-    });
-    if (!me.email) {
-        spinner.stop("Validation failed.");
-        p.log.error("No email associated with this account. Please sign up at inflight.co first.");
-        process.exit(1);
+    else {
+        const apiKey = await pollForApiKey(sessionId);
+        if (!apiKey) {
+            agentError({
+                type: "auth_timeout",
+                message: "Authentication timed out. Approve the browser prompt and try again.",
+                suggestion: "inflight login",
+            });
+        }
+        const me = await apiGetMe(apiKey).catch(() => null);
+        if (!me?.email) {
+            agentError({ type: "auth_failed", message: "Could not validate account." });
+        }
+        writeGlobalAuth({ apiKey });
     }
-    writeGlobalAuth({ apiKey });
-    spinner.stop(pc.green(`✓ Logged in as ${pc.bold(me.email)}`));
 }
 async function pollForApiKey(sessionId) {
     const deadline = Date.now() + POLL_TIMEOUT_MS;
@@ -55,14 +82,10 @@ async function pollForApiKey(sessionId) {
                 if (api_key)
                     return api_key;
             }
-            // 404 = not ready yet, keep polling
-            // 500+ = server error, stop
             if (res.status >= 500)
                 return null;
         }
-        catch {
-            // Network error (offline, DNS, etc.) — keep polling
-        }
+        catch { }
         await new Promise((r) => setTimeout(r, POLL_INTERVAL_MS));
     }
     return null;

package/dist/commands/setup.d.ts

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

package/dist/commands/setup.js

@@ -1,13 +1,14 @@
 import * as p from "@clack/prompts";
 import pc from "picocolors";
 import { execSync } from "child_process";
-import { readGlobalAuth, readWorkspaceConfig, writeWorkspaceConfig } from "../lib/config.js";
+import { readGlobalAuth, writeWorkspaceConfig } from "../lib/config.js";
 import { apiGetMe, apiDetectWidgetLocation } from "../lib/api.js";
 import { loginCommand } from "./login.js";
 import { shareCommand } from "./share.js";
 import { gatherProjectContext, insertWidgetScript } from "../lib/framework.js";
 import { isGitRepo } from "../lib/git.js";
-import { installSkill } from "../lib/skill.js";
+import { isAgent, agentSuccess, agentError } from "../lib/agent.js";
+import { resolveWorkspace } from "../lib/resolve-workspace.js";
 function execSyncErrorDetail(err) {
     if (err !== null && typeof err === "object" && "stderr" in err) {
         const b = err.stderr;
@@ -22,72 +23,81 @@ function execSyncErrorDetail(err) {
     }
     return "";
 }
-export async function setupCommand() {
+export async function setupCommand(opts = {}) {
     const cwd = process.cwd();
-    // ── Step 1: Install agent skill ──
-    p.log.step("Installing agent skill...");
-    await installSkill();
-    // ── Step 2: Authenticate ──
+    // ── Pre-flight: warn if not a git repo ──
+    if (!isGitRepo(cwd) && !isAgent) {
+        p.log.warn("This directory is not a git repository.\n" +
+            "  Inflight works best inside a git repo so it can track branches and commits.");
+    }
+    // ── Step 1: Authenticate ──
     let auth = readGlobalAuth();
+    const alreadyLoggedIn = !!auth;
     if (!auth) {
         await loginCommand();
         auth = readGlobalAuth();
         if (!auth) {
+            if (isAgent)
+                agentError({ type: "auth_failed", message: "Login failed." });
             p.log.error("Login failed.");
             process.exit(1);
         }
     }
-    else {
-        const me = await apiGetMe(auth.apiKey).catch(() => null);
-        if (me?.email) {
-            p.log.success(`Logged in as ${pc.bold(me.email)}`);
-        }
-    }
     // ── Step 3: Resolve workspace ──
     const me = await apiGetMe(auth.apiKey).catch((e) => {
+        if (isAgent)
+            agentError({ type: "api_error", message: e.message });
         p.log.error(e.message);
         process.exit(1);
     });
-    const workspaces = me.workspaces;
-    let workspaceId;
-    // Check if a workspace is already configured and still valid
-    const existingConfig = readWorkspaceConfig();
-    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 workspace)")}`);
-    }
-    else if (workspaces.length === 0) {
-        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;
-        p.log.success(`Workspace: ${pc.bold(workspaces[0].name)}`);
-    }
-    else {
-        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;
+    if (!isAgent && alreadyLoggedIn && me.email) {
+        p.log.success(`Logged in as ${pc.bold(me.email)}`);
     }
+    const workspaceId = await resolveWorkspace(me.workspaces, {
+        explicitId: opts.workspace,
+        commandForNext: "inflight setup",
+    });
     writeWorkspaceConfig({ workspaceId });
-    const widgetId = workspaces.find((w) => w.id === workspaceId)?.widgetId;
+    if (!isAgent) {
+        const wsName = me.workspaces.find((w) => w.id === workspaceId)?.name;
+        if (wsName)
+            p.log.success(`Workspace: ${pc.bold(wsName)} ${pc.dim("(change anytime with inflight workspace)")}`);
+    }
+    const widgetId = me.workspaces.find((w) => w.id === workspaceId)?.widgetId;
     if (!widgetId) {
+        if (isAgent)
+            agentError({ type: "no_widget_id", message: "Could not find widget ID for this workspace." });
         p.log.error("Could not find widget ID for this workspace.");
         process.exit(1);
     }
+    // ── Agent mode: return JSON with instructions and exit ──
+    if (isAgent) {
+        const context = gatherProjectContext(cwd);
+        const alreadyHasWidget = Object.values(context.fileContents).some((c) => c.includes("inflight.co/widget.js"));
+        const scriptTag = `<script src="https://www.inflight.co/widget.js" data-workspace="${widgetId}" async></script>`;
+        const nextSteps = alreadyHasWidget
+            ? ["Widget already installed. Run `inflight share` to share your staging URL."]
+            : [
+                "Insert the scriptTag into the project's root layout file, just before </body> (or as the last child of <body> in JSX/TSX files).",
+                "Common locations: app/layout.tsx (Next.js), index.html (Vite/CRA), app/root.tsx (Remix), src/app.html (SvelteKit).",
+                "Commit and push the change so it's included in the next deployment.",
+                "Then run `inflight share` to share the staging URL for feedback.",
+            ];
+        agentSuccess({
+            workspaceId,
+            workspaceName: me.workspaces.find((w) => w.id === workspaceId)?.name ?? null,
+            widgetId,
+            scriptTag,
+            alreadyInstalled: alreadyHasWidget,
+            nextSteps,
+        });
+    }
     // ── Step 4: Add widget script tag ──
     const hasWidget = (fileContents) => Object.values(fileContents).some((c) => c.includes("inflight.co/widget.js"));
     const context = gatherProjectContext(cwd);
     const alreadyHasWidget = hasWidget(context.fileContents);
     if (alreadyHasWidget) {
-        // Already present — move on silently
+        p.log.success("Widget script tag already installed!");
     }
     else {
         const spinner = p.spinner();
@@ -113,33 +123,36 @@ export async function setupCommand() {
                 spinner.stop("Could not auto-detect where to add the widget.");
             }
         }
-        catch {
+        catch (e) {
             spinner.stop("Could not analyze your project.");
+            if (e instanceof Error)
+                p.log.message(pc.dim(e.message));
         }
         if (!inserted) {
-            p.log.message(`Add this snippet to your root HTML layout, just before ${pc.cyan("</body>")}:\n\n` +
-                pc.dim(`  <script src="https://www.inflight.co/widget.js" data-workspace="${widgetId}" async></script>`));
-            const waited = await p.text({
-                message: "Press enter when you've added it",
-                defaultValue: "",
-                placeholder: "",
+            const scriptTag = `<script src="https://www.inflight.co/widget.js" data-workspace="${widgetId}" async></script>`;
+            const agentPrompt = `Add the Inflight widget to this project. Insert this script tag into the root layout file, just before </body> (or as the last child of <body> in JSX): ${scriptTag}`;
+            p.log.message(`Paste this into your AI agent (Cursor, Claude Code, etc.):\n\n` + pc.dim(`  ${agentPrompt}`));
+            const added = await p.confirm({
+                message: "Have you added the script tag?",
             });
-            if (p.isCancel(waited)) {
+            if (p.isCancel(added)) {
                 p.cancel("Cancelled.");
                 process.exit(0);
             }
-            // Re-scan to check if user added the widget manually
-            const rescan = gatherProjectContext(cwd);
-            if (!hasWidget(rescan.fileContents)) {
-                const skip = await p.confirm({
-                    message: "Widget script not detected. Continue anyway?",
-                    initialValue: false,
-                });
-                if (p.isCancel(skip) || !skip) {
-                    p.cancel("Add the widget script and run setup again.");
-                    process.exit(0);
+            if (added) {
+                // Re-scan to verify
+                const rescan = gatherProjectContext(cwd);
+                if (!hasWidget(rescan.fileContents)) {
+                    p.log.warn("Widget script not found in your project files.\n" +
+                        "  Make sure the snippet is saved and includes " +
+                        pc.cyan("inflight.co/widget.js") +
+                        ".");
                 }
             }
+            else {
+                p.log.info("No worries — add the snippet later and run " + pc.cyan("inflight setup") + " again.");
+                process.exit(0);
+            }
         }
     }
     // ── Step 5: Commit and push (only files containing the widget script) ──
@@ -174,8 +187,8 @@ export async function setupCommand() {
                 catch (err) {
                     const detail = execSyncErrorDetail(err);
                     p.log.warn(detail
-                        ? `Commit or push failed:\n${pc.dim(detail)}\n\nPush manually before sharing.`
-                        : "Commit or push failed. Push manually before sharing.");
+                        ? `Push failed:\n${pc.dim(detail)}\n\nPaste the error above into your AI agent to fix it, or run ${pc.cyan("git push")} manually.`
+                        : `Push failed. Run ${pc.cyan("git push")} manually or ask your AI agent for help.`);
                 }
             }
             else {

package/dist/commands/share.d.ts

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