vibefast-cli 1.3.0 → 1.3.1

package/dist/commands/add.js

@@ -7,7 +7,7 @@ import { fetchRecipe, downloadZip } from "../core/http.js";
 import { addEntry, getEntry } from "../core/journal.js";
 import { copyTree, readFileContent, exists, } from "../core/fsx.js";
 import { hasEnvKey } from "../core/env.js";
-import { insertEnvSnippets, insertNavLinkNative, insertNavLinkWeb, ENV_BUILD_TIME_ENV_END, ENV_BUILD_TIME_ENV_START, ENV_BUILD_TIME_SCHEMA_END, ENV_BUILD_TIME_SCHEMA_START, ENV_CLIENT_ENV_END, ENV_CLIENT_ENV_START, ENV_CLIENT_SCHEMA_END, ENV_CLIENT_SCHEMA_START, ENV_CONSTANTS_END, ENV_CONSTANTS_START, } from "../core/codemod.js";
+import { insertEnvSnippets, insertMarkedSnippets, insertNavLinkNative, insertNavLinkWeb, insertScreenKit, ENV_BUILD_TIME_ENV_END, ENV_BUILD_TIME_ENV_START, ENV_BUILD_TIME_SCHEMA_END, ENV_BUILD_TIME_SCHEMA_START, ENV_CLIENT_ENV_END, ENV_CLIENT_ENV_START, ENV_CLIENT_SCHEMA_END, ENV_CLIENT_SCHEMA_START, ENV_CONSTANTS_END, ENV_CONSTANTS_START, TELEMETRY_IMPORTS_END, TELEMETRY_IMPORTS_START, TELEMETRY_WRAPS_END, TELEMETRY_WRAPS_START, LAYOUT_COMPONENTS_END, LAYOUT_COMPONENTS_START, LAYOUT_IMPORTS_END, LAYOUT_IMPORTS_START, } from "../core/codemod.js";
 import { join, resolve, relative } from "path";
 import { ensureWithinBase } from "../core/pathGuard.js";
 import { extractZipSafe } from "../core/archive.js";
@@ -15,7 +15,6 @@ import { hashFiles } from "../core/hash.js";
 import { promptYesNo } from "../core/prompt.js";
 import { detectTarget, detectBackendType } from "../core/detect.js";
 import { withSpinner } from "../core/spinner.js";
-import { getBundledRecipeZipPath } from "../core/recipes.js";
 import { tmpdir } from "os";
 import { randomUUID } from "crypto";
 import { appendManualSteps } from "../core/manualSteps.js";
@@ -71,6 +70,30 @@ export const addCommand = new Command("add")
         process.stdin.setMaxListeners(50);
         process.stdout.setMaxListeners(50);
         const paths = await getPaths();
+        const ensured = new Set();
+        const ensureScreenKitsCore = async () => {
+            const coreName = "screen-kits";
+            if (ensured.has(coreName))
+                return;
+            let target = options.target;
+            if (!target) {
+                const detected = await detectTarget(paths.cwd);
+                if (detected) {
+                    target = detected;
+                }
+            }
+            if (!target) {
+                log.error("Could not auto-detect target (native/web)");
+                log.info("Please specify with --target native or --target web");
+                process.exit(1);
+            }
+            const existing = await getEntry(paths.journalFile, coreName, target);
+            if (!existing) {
+                log.info("Installing Screen Kits hub...");
+                await installFeature(coreName, options, paths);
+            }
+            ensured.add(coreName);
+        };
         // Interactive mode if no feature specified
         if (!feature) {
             const { RECIPES, getRecipesByCategory, formatCategory, getCategories } = await import("../core/recipes.js");
@@ -103,6 +126,9 @@ export const addCommand = new Command("add")
                 outro("No items selected");
                 return;
             }
+            if (selectedRecipes.some((r) => r.startsWith("screen-kits-"))) {
+                await ensureScreenKitsCore();
+            }
             // Install each selected recipe
             for (const recipeName of selectedRecipes) {
                 log.plain("");
@@ -130,6 +156,9 @@ export const addCommand = new Command("add")
                 outro("No items selected");
                 return;
             }
+            if (selectedRecipes.some((r) => r.startsWith("screen-kits-"))) {
+                await ensureScreenKitsCore();
+            }
             // Install each selected recipe
             for (const recipeName of selectedRecipes) {
                 log.plain("");
@@ -139,6 +168,9 @@ export const addCommand = new Command("add")
             outro("✨ Installation complete!");
             return;
         }
+        if (feature.startsWith("screen-kits-")) {
+            await ensureScreenKitsCore();
+        }
         // Install single feature
         await installFeature(feature, options, paths);
     }
@@ -172,18 +204,13 @@ export async function installFeature(feature, options, paths) {
         // Detect backend type for recipe selection
         const backend = await detectBackendType(paths.cwd);
         log.info(`Target: ${target}, Backend: ${backend}`);
-        // For Supabase projects, try feature-supabase recipe first
-        // This allows backend-specific recipes while maintaining backwards compatibility
+        // For Supabase projects, try feature-supabase recipe first, then fall back to base
         let recipeName = feature;
+        const recipeCandidates = backend === "supabase"
+            ? [`${feature}-supabase`, feature]
+            : [feature];
         if (backend === "supabase") {
-            // Check if supabase-specific bundled recipe exists
-            const supabaseRecipe = `${feature}-supabase`;
-            const supabaseZipPath = await getBundledRecipeZipPath(supabaseRecipe);
-            if (supabaseZipPath) {
-                recipeName = supabaseRecipe;
-                log.info(`Using Supabase-specific recipe: ${recipeName}`);
-            }
-            // Otherwise fall back to base recipe (which may work for both backends)
+            log.info(`Preferring Supabase-specific recipe: ${recipeCandidates[0]}`);
         }
         // Check auth
         const token = await getToken();
@@ -213,107 +240,121 @@ export async function installFeature(feature, options, paths) {
         if (options.dryRun) {
             log.info("[DRY RUN] No changes will be made");
         }
-        // Fetch recipe
+        // Fetch recipe (try candidates in order)
         const device = await getDeviceInfo();
-        const response = await withSpinner(`Fetching ${recipeName} for ${target}...`, async () => {
-            return await fetchRecipe({
-                token,
-                device,
-                feature: recipeName,
-                target,
-                starter: { name: config.name, version: config.version },
+        let response = null;
+        for (let i = 0; i < recipeCandidates.length; i++) {
+            const candidate = recipeCandidates[i];
+            const candidateResponse = await withSpinner(`Fetching ${candidate} for ${target}...`, async () => {
+                return await fetchRecipe({
+                    token,
+                    device,
+                    feature: candidate,
+                    target,
+                    starter: { name: config.name, version: config.version },
+                });
+            }, {
+                successText: `✓ Recipe fetched`,
             });
-        }, {
-            successText: `✓ Recipe fetched`,
-        });
+            const ok = candidateResponse.ok &&
+                (candidateResponse.signedUrl || candidateResponse.zipData);
+            if (ok) {
+                response = candidateResponse;
+                recipeName = candidate;
+                break;
+            }
+            const errorText = `${candidateResponse.error || ""} ${candidateResponse.message || ""}`.toLowerCase();
+            const isNotFound = errorText.includes("not found") || errorText.includes("404");
+            if (isNotFound && i < recipeCandidates.length - 1) {
+                log.warn(`⚠ ${candidate} not available. Trying ${recipeCandidates[i + 1]}...`);
+                continue;
+            }
+            response = candidateResponse;
+            recipeName = candidate;
+            break;
+        }
+        if (!response) {
+            log.error("Failed to fetch recipe");
+            process.exit(1);
+        }
         let zipPath = null;
         let extractDir = null;
         if (!response.ok || (!response.signedUrl && !response.zipData)) {
-            // Remote fetch failed; try bundled fallback
             const error = response.error || "Unknown error";
             const message = response.message || "";
-            const localZip = await getBundledRecipeZipPath(recipeName);
-            if (localZip) {
-                log.info(`Remote recipe unavailable (${error}). Using bundled recipe.`);
-                zipPath = localZip;
+            log.plain("");
+            // User-friendly error messages
+            if (error.includes("Invalid") ||
+                error.includes("token") ||
+                error.includes("license")) {
+                log.plain("❌ Invalid or expired license key");
+                log.plain("");
+                log.info("Your license key may be:");
+                log.plain("  • Incorrect or mistyped");
+                log.plain("  • Expired");
+                log.plain("  • Revoked");
+                log.plain("");
+                log.info("To fix this:");
+                log.plain("  1. Check your license key from your purchase receipt");
+                log.plain("  2. Run: vf logout");
+                log.plain("  3. Run: vf login --token YOUR_CORRECT_TOKEN");
+                log.plain("");
+                log.info("Need help? Contact support@vibefast.pro");
             }
-            else {
+            else if (error.includes("Device limit") ||
+                error.includes("device") ||
+                message.includes("device")) {
+                log.plain("❌ Device limit reached");
                 log.plain("");
-                // User-friendly error messages
-                if (error.includes("Invalid") ||
-                    error.includes("token") ||
-                    error.includes("license")) {
-                    log.plain("❌ Invalid or expired license key");
-                    log.plain("");
-                    log.info("Your license key may be:");
-                    log.plain("  • Incorrect or mistyped");
-                    log.plain("  • Expired");
-                    log.plain("  • Revoked");
-                    log.plain("");
-                    log.info("To fix this:");
-                    log.plain("  1. Check your license key from your purchase receipt");
-                    log.plain("  2. Run: vf logout");
-                    log.plain("  3. Run: vf login --token YOUR_CORRECT_TOKEN");
-                    log.plain("");
-                    log.info("Need help? Contact support@vibefast.pro");
-                }
-                else if (error.includes("Device limit") ||
-                    error.includes("device") ||
-                    message.includes("device")) {
-                    log.plain("❌ Device limit reached");
-                    log.plain("");
-                    log.info("You have reached the maximum number of devices for your license");
-                    log.plain("");
-                    log.info("To fix this:");
-                    log.plain("  1. Run: vf devices");
-                    log.plain("  2. Deactivate an unused device: vf devices --deactivate <device-id>");
-                    log.plain("  3. Try again: vf add " + feature);
-                    log.plain("");
-                    if (message) {
-                        log.plain(`Details: ${message}`);
-                        log.plain("");
-                    }
-                }
-                else if (error.includes("Network") || error.includes("connect")) {
-                    log.plain("❌ Network error");
-                    log.plain("");
-                    log.info("Could not connect to VibeFast servers");
-                    log.plain("");
-                    log.info("Please check:");
-                    log.plain("  • Your internet connection");
-                    log.plain("  • Firewall settings");
-                    log.plain("  • VPN configuration");
+                log.info("You have reached the maximum number of devices for your license");
+                log.plain("");
+                log.info("To fix this:");
+                log.plain("  1. Run: vf devices");
+                log.plain("  2. Deactivate an unused device: vf devices --deactivate <device-id>");
+                log.plain("  3. Try again: vf add " + feature);
+                log.plain("");
+                if (message) {
+                    log.plain(`Details: ${message}`);
                     log.plain("");
-                    if (message) {
-                        log.plain(`Details: ${message}`);
-                        log.plain("");
-                    }
                 }
-                else if (error.includes("not found") || error.includes("404")) {
-                    log.plain("❌ Feature not found");
-                    log.plain("");
-                    log.info(`The feature "${feature}" does not exist or is not available for ${target}`);
-                    log.plain("");
-                    log.info("To see available features:");
-                    log.plain("  vf list");
+            }
+            else if (error.includes("Network") || error.includes("connect")) {
+                log.plain("❌ Network error");
+                log.plain("");
+                log.info("Could not connect to VibeFast servers");
+                log.plain("");
+                log.info("Please check:");
+                log.plain("  • Your internet connection");
+                log.plain("  • Firewall settings");
+                log.plain("  • VPN configuration");
+                log.plain("");
+                if (message) {
+                    log.plain(`Details: ${message}`);
                     log.plain("");
                 }
-                else {
-                    // Generic error
-                    log.plain(`❌ ${error}`);
-                    if (message) {
-                        log.plain("");
-                        log.plain(`Details: ${message}`);
-                    }
+            }
+            else if (error.includes("not found") || error.includes("404")) {
+                log.plain("❌ Feature not found");
+                log.plain("");
+                log.info(`The feature "${feature}" does not exist or is not available for ${target}`);
+                log.plain("");
+                log.info("To see available features:");
+                log.plain("  vf list");
+                log.plain("");
+            }
+            else {
+                // Generic error
+                log.plain(`❌ ${error}`);
+                if (message) {
                     log.plain("");
-                    log.info("If this problem persists, contact support@vibefast.pro");
+                    log.plain(`Details: ${message}`);
                 }
                 log.plain("");
-                process.exit(1);
+                log.info("If this problem persists, contact support@vibefast.pro");
             }
+            log.plain("");
+            process.exit(1);
         }
-        const fallbackZip = await getBundledRecipeZipPath(recipeName);
-        let attemptedFallback = false;
         let installedManifest = null;
         let installedEnvGroups = [];
         let installedEnvAttention = [];
@@ -321,29 +362,22 @@ export async function installFeature(feature, options, paths) {
         let installedNavInserted = false;
         let installedNavHref;
         let installedNavLabel;
-        // Everything below runs inside a retry loop so we can fall back to bundled recipes
+        // Install recipe
         retry_install: while (true) {
             try {
-                // Download and extract (or use bundled zip)
-                if (!zipPath) {
-                    const result = await withSpinner("Downloading and extracting recipe...", async () => {
-                        const zip = response.zipData
-                            ? await downloadZip(response.zipData, true)
-                            : await downloadZip(response.signedUrl);
-                        const dir = join(tmpdir(), "vibefast", randomUUID());
-                        await extractZipSafe(zip, dir);
-                        return { zipPath: zip, extractDir: dir };
-                    }, {
-                        successText: "✓ Recipe downloaded",
-                    });
-                    zipPath = result.zipPath;
-                    extractDir = result.extractDir;
-                }
-                else {
-                    // Bundled zip path - extract to temp location
-                    extractDir = join(tmpdir(), "vibefast", randomUUID());
-                    await extractZipSafe(zipPath, extractDir);
-                }
+                // Download and extract recipe
+                const result = await withSpinner("Downloading and extracting recipe...", async () => {
+                    const zip = response.zipData
+                        ? await downloadZip(response.zipData, true)
+                        : await downloadZip(response.signedUrl);
+                    const dir = join(tmpdir(), "vibefast", randomUUID());
+                    await extractZipSafe(zip, dir);
+                    return { zipPath: zip, extractDir: dir };
+                }, {
+                    successText: "✓ Recipe downloaded",
+                });
+                zipPath = result.zipPath;
+                extractDir = result.extractDir;
                 // Locate manifest (some archives may nest recipe.json)
                 const findManifest = async (dir) => {
                     const entries = await import("fs/promises").then((m) => m.readdir(dir, { withFileTypes: true }));
@@ -502,6 +536,21 @@ export async function installFeature(feature, options, paths) {
                         log.info("Navigation link already exists");
                     }
                 }
+                // Insert screen kit entry (if provided)
+                let screenKitInserted = false;
+                let screenKitId;
+                if (manifest.screenKit) {
+                    log.info("Registering screen kit...");
+                    const screenKitsFile = join(paths.nativeDir, "src", "features", "screen-kits", "types.ts");
+                    screenKitId = manifest.screenKit.id;
+                    screenKitInserted = await insertScreenKit(screenKitsFile, manifest.screenKit, { dryRun: options.dryRun });
+                    if (screenKitInserted) {
+                        log.success("Screen kit registered");
+                    }
+                    else {
+                        log.info("Screen kit already registered");
+                    }
+                }
                 // Hash files and update journal
                 if (!options.dryRun) {
                     log.info("Computing file hashes...");
@@ -524,6 +573,7 @@ export async function installFeature(feature, options, paths) {
                             version: manifest.version,
                             manualSteps: manifest.manualSteps,
                             env: manifest.env,
+                            screenKitId,
                         },
                     });
                 }
@@ -535,20 +585,12 @@ export async function installFeature(feature, options, paths) {
                 installedNavInserted = navInserted;
                 installedNavHref = navHref;
                 installedNavLabel = navLabel;
+                // screen kit insertion is recorded in journal only
                 log.success(`${manifest.name} installed successfully!`);
                 log.info(`Files added: ${copiedFiles.length}`);
                 break retry_install;
             }
             catch (err) {
-                // Don't retry for nav marker errors - bundled recipe will have same problem
-                const isNavMarkerError = err.message?.includes("Missing navigation markers");
-                if (!attemptedFallback && fallbackZip && !isNavMarkerError) {
-                    attemptedFallback = true;
-                    zipPath = fallbackZip;
-                    extractDir = null;
-                    log.warn(`⚠ Encountered error "${err.message}". Retrying with bundled recipe...`);
-                    continue retry_install;
-                }
                 throw err;
             }
         }
@@ -598,6 +640,9 @@ export async function installFeature(feature, options, paths) {
                                 if (result.error) {
                                     throw result.error;
                                 }
+                                if (result.status !== 0) {
+                                    throw new Error(`Expo install exited with code ${result.status}`);
+                                }
                             }
                             catch (err) {
                                 log.warn("⚠ Expo install reported an error (packages may still be installed). Verify dependencies and app.config.ts plugin additions.");
@@ -651,6 +696,9 @@ export async function installFeature(feature, options, paths) {
                         if (result.error) {
                             throw result.error;
                         }
+                        if (result.status !== 0) {
+                            throw new Error(`${pkgManager} install exited with code ${result.status}`);
+                        }
                     }, {
                         successText: "✓ Packages installed",
                     });
@@ -679,6 +727,12 @@ export async function installFeature(feature, options, paths) {
         if (installedManifest?.configuration?.env) {
             await applyEnvConfiguration(paths, installedManifest.configuration.env, options);
         }
+        if (installedManifest?.name === "posthog") {
+            await applyPosthogIntegration(paths, options);
+        }
+        if (installedManifest?.name === "sentry") {
+            await applySentryIntegration(paths, options);
+        }
         // Apply api-client exports injection
         if (installedManifest?.configuration?.apiClient) {
             await applyApiClientConfiguration(paths, installedManifest.configuration.apiClient, options);
@@ -716,6 +770,13 @@ export async function installFeature(feature, options, paths) {
                             completedSteps.push(step.title);
                         }
                     }
+                    else if (lowerTitle.includes("download vosk")) {
+                        const modelPath = join(paths.cwd, "apps", "native", "assets", "vosk-model", "model-en-us");
+                        if (await exists(modelPath)) {
+                            alreadyDone = true;
+                            completedSteps.push(step.title);
+                        }
+                    }
                     else if (step.file === ".gitignore") {
                         if (content.includes("assets/vosk-model/model-en-us")) {
                             alreadyDone = true;
@@ -787,6 +848,13 @@ export async function installFeature(feature, options, paths) {
                             }
                         }
                     }
+                    else if (featureName === "wake-word" &&
+                        step.title.toLowerCase().includes("download vosk")) {
+                        const modelPath = join(paths.cwd, "apps", "native", "assets", "vosk-model", "model-en-us");
+                        if (await exists(modelPath)) {
+                            alreadyDone = true;
+                        }
+                    }
                     else if (featureName === "wake-word" &&
                         step.file === ".gitignore") {
                         const filePath = join(paths.cwd, step.file);
@@ -930,6 +998,84 @@ async function applyEnvConfiguration(paths, envConfig, options) {
         }
     }
 }
+const POSTHOG_IMPORT_BLOCK = [
+    "// @vibefast:posthog:import:start",
+    "import { AnalyticsProvider } from './posthog-provider';",
+    "// @vibefast:posthog:import:end",
+].join("\n");
+const POSTHOG_WRAP_BLOCK = [
+    "  // @vibefast:posthog:wrap:start",
+    "  content = <AnalyticsProvider>{content}</AnalyticsProvider>;",
+    "  // @vibefast:posthog:wrap:end",
+].join("\n");
+const POSTHOG_LAYOUT_IMPORT_BLOCK = [
+    "// @vibefast:posthog:layout-import:start",
+    "import { NavigationTracker } from '@/components/analytics/navigation-tracker';",
+    "// @vibefast:posthog:layout-import:end",
+].join("\n");
+const POSTHOG_LAYOUT_COMPONENT_BLOCK = [
+    "      {/* @vibefast:posthog:layout:start */}",
+    "      <NavigationTracker />",
+    "      {/* @vibefast:posthog:layout:end */}",
+].join("\n");
+const SENTRY_IMPORT_BLOCK = [
+    "// @vibefast:sentry:import:start",
+    "import { SentryProvider } from './sentry-provider';",
+    "// @vibefast:sentry:import:end",
+].join("\n");
+const SENTRY_WRAP_BLOCK = [
+    "  // @vibefast:sentry:wrap:start",
+    "  content = <SentryProvider>{content}</SentryProvider>;",
+    "  // @vibefast:sentry:wrap:end",
+].join("\n");
+async function applyPosthogIntegration(paths, options) {
+    const telemetryProviderPath = join(paths.nativeDir, "src", "providers", "telemetry-provider.tsx");
+    const layoutPath = join(paths.nativeDir, "src", "app", "_layout.tsx");
+    const suffix = options.dryRun ? " (dry run)" : "";
+    if (!(await exists(telemetryProviderPath))) {
+        throw new Error("TelemetryProvider not found. Please update your starter or add src/providers/telemetry-provider.tsx before installing PostHog.");
+    }
+    if (!(await exists(layoutPath))) {
+        throw new Error("App layout file not found. Expected src/app/_layout.tsx for PostHog integration.");
+    }
+    if (await exists(telemetryProviderPath)) {
+        const insertedImport = await insertMarkedSnippets(telemetryProviderPath, TELEMETRY_IMPORTS_START, TELEMETRY_IMPORTS_END, [POSTHOG_IMPORT_BLOCK], options);
+        if (insertedImport) {
+            log.info(`Updated telemetry provider imports${suffix}.`);
+        }
+        const insertedWrap = await insertMarkedSnippets(telemetryProviderPath, TELEMETRY_WRAPS_START, TELEMETRY_WRAPS_END, [POSTHOG_WRAP_BLOCK], options);
+        if (insertedWrap) {
+            log.info(`Updated telemetry provider wrappers${suffix}.`);
+        }
+    }
+    if (await exists(layoutPath)) {
+        const insertedImport = await insertMarkedSnippets(layoutPath, LAYOUT_IMPORTS_START, LAYOUT_IMPORTS_END, [POSTHOG_LAYOUT_IMPORT_BLOCK], options);
+        if (insertedImport) {
+            log.info(`Updated layout imports${suffix}.`);
+        }
+        const insertedComponent = await insertMarkedSnippets(layoutPath, LAYOUT_COMPONENTS_START, LAYOUT_COMPONENTS_END, [POSTHOG_LAYOUT_COMPONENT_BLOCK], options);
+        if (insertedComponent) {
+            log.info(`Updated layout components${suffix}.`);
+        }
+    }
+}
+async function applySentryIntegration(paths, options) {
+    const telemetryProviderPath = join(paths.nativeDir, "src", "providers", "telemetry-provider.tsx");
+    const suffix = options.dryRun ? " (dry run)" : "";
+    if (!(await exists(telemetryProviderPath))) {
+        throw new Error("TelemetryProvider not found. Please update your starter or add src/providers/telemetry-provider.tsx before installing Sentry.");
+    }
+    if (await exists(telemetryProviderPath)) {
+        const insertedImport = await insertMarkedSnippets(telemetryProviderPath, TELEMETRY_IMPORTS_START, TELEMETRY_IMPORTS_END, [SENTRY_IMPORT_BLOCK], options);
+        if (insertedImport) {
+            log.info(`Updated telemetry provider imports${suffix}.`);
+        }
+        const insertedWrap = await insertMarkedSnippets(telemetryProviderPath, TELEMETRY_WRAPS_START, TELEMETRY_WRAPS_END, [SENTRY_WRAP_BLOCK], options);
+        if (insertedWrap) {
+            log.info(`Updated telemetry provider wrappers${suffix}.`);
+        }
+    }
+}
 const API_CLIENT_EXPORTS_START = "// --- @vibefast:api-client:exports:start ---";
 const API_CLIENT_EXPORTS_END = "// --- @vibefast:api-client:exports:end ---";
 const BACKEND_EXPORTS_START = "// --- @vibefast:backend:exports:start ---";