@vistagenic/vista 0.2.10 → 0.2.13

package/bin/vista.js

@@ -1,33 +1,128 @@
 #!/usr/bin/env node
-
+
+const fs = require('fs');
+const path = require('path');
+
 const command = process.argv[2];
 const flags = process.argv.slice(3);
 
-if (command === 'g' || command === 'generate') {
-  const { runGenerateCommand } = require('../dist/bin/generate');
-  runGenerateCommand(flags).then((code) => {
-    if (code !== 0) process.exit(code);
-  });
-  return;
+function getFlagValue(flag) {
+  const index = flags.indexOf(flag);
+  if (index !== -1) {
+    const next = flags[index + 1];
+    if (next && !next.startsWith('-')) return next;
+  }
+
+  const inline = flags.find((value) => value.startsWith(`${flag}=`));
+  if (inline) return inline.slice(flag.length + 1);
+  return undefined;
 }
 
-// RSC is the default mode (like Next.js App Router)
-// Use --legacy to fall back to traditional SSR mode
+function normalizeEngineVariant(raw) {
+  const value = String(raw || '')
+    .trim()
+    .toLowerCase();
+
+  if (!value) return null;
+  if (value === 'default' || value === 'webpack') return 'default';
+  if (value === 'flashpack') return 'flashpack';
+  return null;
+}
+
+function forceRuntimeEnv(mode) {
+  if (mode === 'development') {
+    process.env.NODE_ENV = 'development';
+    return;
+  }
+  process.env.NODE_ENV = 'production';
+}
+
+if (command === 'g' || command === 'generate') {
+  const { runGenerateCommand } = require('../dist/bin/generate');
+  runGenerateCommand(flags).then((code) => {
+    if (code !== 0) process.exit(code);
+  });
+  return;
+}
+
 const useLegacy = flags.includes('--legacy') || process.env.VISTA_LEGACY === 'true';
 const useRSC = !useLegacy;
+const explicitFlashpack = flags.includes('--flashpack');
+const explicitDefaultEngine = flags.includes('--default-engine') || flags.includes('--webpack');
+const explicitEngineFlag = getFlagValue('--engine');
+const explicitEngineVariant = normalizeEngineVariant(explicitEngineFlag);
+
+if (explicitEngineFlag && !explicitEngineVariant) {
+  console.error(
+    `Unsupported engine "${explicitEngineFlag}". Use "default" or "flashpack" (legacy alias: webpack).`
+  );
+  process.exit(1);
+}
+
+if (
+  (explicitFlashpack && explicitDefaultEngine) ||
+  (explicitEngineVariant && (explicitFlashpack || explicitDefaultEngine))
+) {
+  console.error('Use only one engine selector: --engine, --flashpack, or --default-engine/--webpack.');
+  process.exit(1);
+}
+
+const envEngineVariant = normalizeEngineVariant(
+  process.env.VISTA_ENGINE_VARIANT ||
+    process.env.VISTA_ENGINE ||
+    (process.env.VISTA_FLASHPACK === 'true' ? 'flashpack' : '')
+);
+
+let configEngineVariant = null;
+try {
+  const { loadConfig } = require('../dist/config');
+  const projectConfig = loadConfig(process.cwd());
+  const fromConfig =
+    typeof projectConfig?.engine === 'string'
+      ? projectConfig.engine
+      : projectConfig?.engine && typeof projectConfig.engine === 'object'
+        ? projectConfig.engine.variant
+        : '';
+  configEngineVariant = normalizeEngineVariant(fromConfig);
+} catch {
+  // Best effort only; keep CLI resilient if config loading fails.
+}
+
+const forcedByFlag = explicitEngineVariant || (explicitFlashpack ? 'flashpack' : null) || (explicitDefaultEngine ? 'default' : null);
+const engineVariant = forcedByFlag || envEngineVariant || configEngineVariant || 'default';
+process.env.VISTA_ENGINE = engineVariant;
+process.env.VISTA_ENGINE_VARIANT = engineVariant;
+process.env.VISTA_FLASHPACK = engineVariant === 'flashpack' ? 'true' : 'false';
 
 // Mark startup time for "Ready in Xms" display
 const { markStartTime } = require('../dist/server/logger');
 markStartTime();
 
-if (command === 'dev') {
-  if (useRSC) {
-    // RSC Mode (default) - True React Server Components Architecture
-    const { buildRSC } = require('../dist/bin/build-rsc');
-    const { startRSCServer } = require('../dist/server/rsc-engine');
-
-    buildRSC(true)
-      .then(({ clientCompiler }) => {
+if (command === 'dev') {
+  forceRuntimeEnv('development');
+  if (useRSC) {
+    console.log(`[vista] Engine: ${process.env.VISTA_ENGINE}`);
+    const useFlashpack = process.env.VISTA_ENGINE === 'flashpack';
+    if (useFlashpack) {
+      const { runFlashpackEngineCommand } = require('../dist/flashpack/command');
+      runFlashpackEngineCommand('dev', {
+        cwd: process.cwd(),
+        port: process.env.PORT || 3003,
+      }).catch((err) => {
+        console.error('Flashpack dev failed:', err);
+        process.exit(1);
+      });
+      return;
+    }
+    const { buildRSC } = useFlashpack
+      ? require('../dist/bin/build-rsc-flashpack')
+      : require('../dist/bin/build-rsc');
+    const { startRSCServer } = useFlashpack
+      ? require('../dist/server/rsc-engine-flashpack')
+      : require('../dist/server/rsc-engine');
+
+    buildRSC(true)
+      .then(({ clientCompiler }) => {
         startRSCServer({
           port: process.env.PORT || 3003,
           compiler: clientCompiler,
@@ -51,12 +146,31 @@ if (command === 'dev') {
         process.exit(1);
       });
   }
-} else if (command === 'build') {
-  if (useRSC) {
-    // RSC Production Build (default)
-    const { buildRSC } = require('../dist/bin/build-rsc');
-
-    buildRSC(false)
+} else if (command === 'build') {
+  forceRuntimeEnv('production');
+  if (useRSC) {
+    console.log(`[vista] Engine: ${process.env.VISTA_ENGINE}`);
+    const useFlashpack = process.env.VISTA_ENGINE === 'flashpack';
+    if (useFlashpack) {
+      const { runFlashpackEngineCommand } = require('../dist/flashpack/command');
+      runFlashpackEngineCommand('build', {
+        cwd: process.cwd(),
+      })
+        .then(() => {
+          console.log('');
+          console.log('Production build complete!');
+        })
+        .catch((err) => {
+          console.error('Flashpack build failed:', err);
+          process.exit(1);
+        });
+      return;
+    }
+    const { buildRSC } = useFlashpack
+      ? require('../dist/bin/build-rsc-flashpack')
+      : require('../dist/bin/build-rsc');
+
+    buildRSC(false)
       .then(() => {
         console.log('');
         console.log('Production build complete!');
@@ -78,11 +192,39 @@ if (command === 'dev') {
         process.exit(1);
       });
   }
-} else if (command === 'start') {
-  if (useRSC) {
-    const { startRSCServer } = require('../dist/server/rsc-engine');
-    startRSCServer({ port: process.env.PORT || 3003 });
-  } else {
+} else if (command === 'start') {
+  forceRuntimeEnv('production');
+  if (useRSC) {
+    console.log(`[vista] Engine: ${process.env.VISTA_ENGINE}`);
+    if (process.env.VISTA_ENGINE === 'flashpack') {
+      const { runFlashpackEngineCommand } = require('../dist/flashpack/command');
+      runFlashpackEngineCommand('start', {
+        cwd: process.cwd(),
+        port: process.env.PORT || 3003,
+      }).catch((err) => {
+        console.error('Flashpack start failed:', err);
+        process.exit(1);
+      });
+      return;
+    }
+    const standaloneServerPath = path.join(process.cwd(), '.vista', 'standalone', 'server.js');
+    if (fs.existsSync(standaloneServerPath)) {
+      const standalone = require(standaloneServerPath);
+      const startStandaloneServer =
+        standalone.startStandaloneServer || standalone.default || standalone;
+      startStandaloneServer({
+        port: process.env.PORT || 3003,
+        engine: process.env.VISTA_ENGINE,
+      });
+      return;
+    }
+
+    const useFlashpack = process.env.VISTA_ENGINE === 'flashpack';
+    const { startRSCServer } = useFlashpack
+      ? require('../dist/server/rsc-engine-flashpack')
+      : require('../dist/server/rsc-engine');
+    startRSCServer({ port: process.env.PORT || 3003 });
+  } else {
     const { startServer } = require('../dist/server/engine');
     startServer(process.env.PORT || 3003);
   }
@@ -93,18 +235,23 @@ if (command === 'dev') {
   console.log('Usage: vista <command> [options]');
   console.log('');
   console.log('Commands:');
-  console.log('  dev     Start development server with HMR');
-  console.log('  build   Create production build');
-  console.log('  start   Start production server');
-  console.log('  g       Generate typed API scaffolds (api-init, router, procedure)');
-  console.log('');
+  console.log('  dev     Start development server with HMR');
+  console.log('  build   Create production build');
+  console.log('  start   Start production server');
+  console.log('  g       Generate typed API scaffolds (api-init, router, procedure)');
+  console.log('');
   console.log('Options:');
   console.log('  --legacy   Use traditional SSR mode (instead of RSC)');
+  console.log('  --engine <default|flashpack>   Select engine variant');
+  console.log('  --flashpack   Use Rust-first Flashpack engine path');
+  console.log('  --default-engine   Force default engine path');
+  console.log('  --webpack   Alias of --default-engine');
   console.log('');
   console.log('Examples:');
   console.log('  vista dev            # Start dev server (RSC mode)');
   console.log('  vista dev --legacy   # Start dev server with legacy SSR');
+  console.log('  vista dev --flashpack   # Start dev server with Flashpack mode');
   console.log('  vista build          # Production build with RSC');
-  console.log('  vista g api-init     # Generate typed API starter files');
-  console.log('');
-}
+  console.log('  vista g api-init     # Generate typed API starter files');
+  console.log('');
+}

package/dist/bin/build-rsc-flashpack.d.ts

@@ -0,0 +1,4 @@
+import { buildRSC as buildRSCCore } from './build-rsc';
+export declare function buildRSCFlashpack(watch?: boolean): ReturnType<typeof buildRSCCore>;
+export declare const buildRSC: typeof buildRSCFlashpack;
+export default buildRSCFlashpack;

package/dist/bin/build-rsc-flashpack.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildRSC = void 0;
+exports.buildRSCFlashpack = buildRSCFlashpack;
+const build_rsc_1 = require("./build-rsc");
+const runtime_1 = require("../flashpack/runtime");
+function resolveMode(watch) {
+    if (watch)
+        return 'development';
+    return process.env.NODE_ENV === 'development' ? 'development' : 'production';
+}
+async function buildRSCFlashpack(watch = false) {
+    const cwd = process.cwd();
+    const mode = resolveMode(watch);
+    const strict = process.env.VISTA_FLASHPACK_STRICT !== 'false';
+    const phase = watch ? 'dev' : 'build';
+    const prepared = (0, runtime_1.prepareFlashpackRuntime)({
+        cwd,
+        phase,
+        mode,
+        allowFallback: !strict,
+    });
+    if (process.env.VISTA_DEBUG) {
+        console.log(`[flashpack] runtime prepared (rust=${prepared.rustPipelineUsed ? 'on' : 'fallback'}) at ${prepared.flashDir}`);
+    }
+    return (0, build_rsc_1.buildRSC)(watch);
+}
+exports.buildRSC = buildRSCFlashpack;
+exports.default = buildRSCFlashpack;

package/dist/bin/build-rsc.js

@@ -29,6 +29,8 @@ const structure_log_1 = require("../server/structure-log");
 const devtools_indicator_snippet_1 = require("./devtools-indicator-snippet");
 const dev_error_overlay_snippet_1 = require("./dev-error-overlay-snippet");
 const deploy_output_1 = require("./deploy-output");
+const module_boundary_validator_1 = require("../server/module-boundary-validator");
+const standalone_1 = require("../build/standalone");
 const _debug = !!process.env.VISTA_DEBUG;
 /**
  * Run PostCSS for CSS compilation
@@ -150,11 +152,25 @@ function reportDevRuntimeError(title: string, error: unknown): void {
   var indicator = (window as any).__VISTA_DEVTOOLS_INDICATOR__;
   var overlay = (window as any).__VISTA_DEV_ERROR_OVERLAY__;
   var message = buildRuntimeMessage(title, error);
+  var canRestoreFromIndicator = false;
+  if (indicator && indicator.hidden !== true && typeof indicator.setError === 'function') {
+    canRestoreFromIndicator = true;
+    if (typeof indicator.ensureAttached === 'function') {
+      try {
+        canRestoreFromIndicator = indicator.ensureAttached() !== false;
+      } catch {
+        canRestoreFromIndicator = false;
+      }
+    }
+  }
   if (indicator && typeof indicator.setError === 'function') {
     indicator.setError(title, 1);
   }
   if (overlay && typeof overlay.capture === 'function') {
     overlay.capture([message]);
+    if (!canRestoreFromIndicator && typeof overlay.show === 'function') {
+      overlay.show([message]);
+    }
     return;
   }
   if (overlay && typeof overlay.show === 'function') {
@@ -229,7 +245,7 @@ ${isDev
       if (indicator && typeof indicator.pulse === 'function') {
         indicator.pulse('hmr', 460);
       }
-      setTimeout(() => window.location.reload(), 180);
+      setTimeout(() => window.location.reload(), 80);
     } else {
       try {
         const msg = JSON.parse(e.data);
@@ -296,7 +312,11 @@ async function buildRSC(watch = false) {
     // Pre-build Structure Validation
     // ========================================================================
     const vistaConfig = (0, config_1.loadConfig)(cwd);
+    const engineVariant = (0, config_1.resolveAndApplyEngineVariant)(vistaConfig);
     const structureConfig = (0, config_1.resolveStructureValidationConfig)(vistaConfig);
+    const cacheComponentsConfig = (0, config_1.resolveCacheComponentsConfig)(vistaConfig);
+    if (_debug)
+        console.log(`[vista:build] Engine variant: ${engineVariant}`);
     if (structureConfig.enabled) {
         const result = (0, structure_validator_1.validateAppStructure)({ cwd });
         (0, structure_log_1.logValidationResult)(result, structureConfig.logLevel);
@@ -356,25 +376,25 @@ async function buildRSC(watch = false) {
             console.log('');
         }
         // Check for errors (using client hooks without 'use client')
-        const scanErrors = [
-            ...scanResult.errors,
-            ...(componentsScanResult?.errors || []).map((error) => ({
-                ...error,
-                file: `components/${error.file}`,
-            })),
-        ];
+        const scanErrors = (0, module_boundary_validator_1.validateModuleBoundaries)({
+            appDir,
+            extraRoots: fs_1.default.existsSync(componentsDir) ? [componentsDir] : [],
+            cacheComponentsEnabled: cacheComponentsConfig.enabled,
+        }).issues;
         if (scanErrors.length > 0) {
-            console.log('\x1b[41m\x1b[37m ERROR \x1b[0m \x1b[31mServer Component Violations\x1b[0m');
+            console.log('\x1b[41m\x1b[37m ERROR \x1b[0m \x1b[31mServer/Segment Violations\x1b[0m');
             console.log('');
             for (const error of scanErrors) {
-                console.log(`\x1b[31m✗\x1b[0m ${error.file}`);
-                console.log(`  Using: \x1b[33m${error.hooks.slice(0, 3).join(', ')}\x1b[0m in a Server Component`);
-                console.log('');
-                console.log(`  \x1b[36mTo fix:\x1b[0m Add \x1b[33m'use client'\x1b[0m at the top of the file`);
+                console.log(`\x1b[31m✗\x1b[0m ${path_1.default.relative(cwd, error.filePath)}`);
+                console.log(`  ${error.message}`);
                 console.log('');
+                if (error.fix) {
+                    console.log(`  \x1b[36mTo fix:\x1b[0m ${error.fix}`);
+                    console.log('');
+                }
             }
             if (!watch) {
-                console.log('\x1b[31mBuild failed due to Server Component violations.\x1b[0m');
+                console.log('\x1b[31mBuild failed due to server/segment violations.\x1b[0m');
                 process.exit(1);
             }
         }
@@ -410,6 +430,11 @@ async function buildRSC(watch = false) {
         pagePath: route.pagePath,
         type: route.type,
     })));
+    (0, manifest_1.writeReservedVistaArtifacts)(vistaDirs.root, {
+        buildId,
+        engineVariant,
+        imagesConfig: vistaConfig.images,
+    });
     // Generate client entry
     generateRSCClientEntry(cwd, vistaDirs.root, watch);
     // Create webpack configs
@@ -418,6 +443,7 @@ async function buildRSC(watch = false) {
         isDev: watch,
         vistaDirs,
         buildId,
+        engineVariant,
         clientReferenceFiles,
     };
     // Build CSS
@@ -432,7 +458,9 @@ async function buildRSC(watch = false) {
         // plugin ran will skip the parser hook entirely, causing empty Flight
         // manifests.  Clearing on every dev-start is the safest approach –
         // first-compile is ~1s longer but guarantees correct manifests.
-        const cacheDir = path_1.default.join(vistaDirs.root, 'cache');
+        const cacheDir = engineVariant === 'flashpack'
+            ? path_1.default.join(cwd, constants_1.FLASH_DIR, 'cache', 'webpack')
+            : path_1.default.join(vistaDirs.root, 'cache');
         if (fs_1.default.existsSync(cacheDir)) {
             fs_1.default.rmSync(cacheDir, { recursive: true, force: true });
             if (_debug)
@@ -556,11 +584,19 @@ async function buildRSC(watch = false) {
         const prerenderManifestPath = path_1.default.join(vistaDirs.root, 'prerender-manifest.json');
         fs_1.default.writeFileSync(prerenderManifestPath, JSON.stringify(ssgResult.manifest, null, 2));
         console.log('[Vista JS RSC] Wrote prerender-manifest.json');
+        (0, standalone_1.generateStandaloneOutput)({
+            cwd,
+            vistaDir: vistaDirs.root,
+            buildId,
+            serverManifest,
+            debug: _debug,
+        });
         (0, deploy_output_1.generateDeploymentOutputs)({
             cwd,
             vistaDir: vistaDirs.root,
             debug: _debug,
         });
+        (0, manifest_1.pruneEmptyVistaDirectories)(vistaDirs.root);
         console.log('');
         console.log('╔══════════════════════════════════════════════════════════════╗');
         console.log('║                    Build Complete! 🎉                        ║');
@@ -569,7 +605,16 @@ async function buildRSC(watch = false) {
         console.log('  Output directory: .vista/');
         console.log('    ├── server/     (Server-side bundle - NEVER sent to client)');
         console.log('    ├── static/     (Client assets - only client components)');
-        console.log('    └── cache/      (Build cache for faster rebuilds)');
+        if (engineVariant === 'flashpack') {
+            console.log('    └── cache/      (metadata bridge to the active Flashpack cache)');
+            console.log('  Flashpack directory: .flash/');
+            console.log('    ├── cache/      (Flashpack runtime cache)');
+            console.log('    ├── graph/      (Rust pipeline graph snapshots)');
+            console.log('    └── logs/       (Flashpack phase logs)');
+        }
+        else {
+            console.log('    └── cache/      (Build cache for faster rebuilds)');
+        }
         console.log('');
         return { serverCompiler: null, clientCompiler: null };
     }

package/dist/bin/build.js

@@ -18,6 +18,7 @@ const structure_log_1 = require("../server/structure-log");
 const devtools_indicator_snippet_1 = require("./devtools-indicator-snippet");
 const dev_error_overlay_snippet_1 = require("./dev-error-overlay-snippet");
 const deploy_output_1 = require("./deploy-output");
+const module_boundary_validator_1 = require("../server/module-boundary-validator");
 const _debug = !!process.env.VISTA_DEBUG;
 // Helper to run PostCSS
 function runPostCSS(cwd, vistaDir) {
@@ -222,7 +223,7 @@ sse.onmessage = (event) => {
         if (indicator && typeof indicator.pulse === 'function') {
             indicator.pulse('hmr', 460);
         }
-        setTimeout(() => window.location.reload(), 180);
+        setTimeout(() => window.location.reload(), 80);
         return;
     }
     
@@ -272,7 +273,11 @@ async function buildClient(watch = false, onRebuild) {
     // Pre-build Structure Validation
     // ========================================================================
     const vistaConfig = (0, config_1.loadConfig)(cwd);
+    const engineVariant = (0, config_1.resolveAndApplyEngineVariant)(vistaConfig);
     const structureConfig = (0, config_1.resolveStructureValidationConfig)(vistaConfig);
+    const cacheComponentsConfig = (0, config_1.resolveCacheComponentsConfig)(vistaConfig);
+    if (_debug)
+        console.log(`[vista:build] Engine variant: ${engineVariant}`);
     if (structureConfig.enabled) {
         const result = (0, structure_validator_1.validateAppStructure)({ cwd });
         (0, structure_log_1.logValidationResult)(result, structureConfig.logLevel);
@@ -306,20 +311,27 @@ async function buildClient(watch = false, onRebuild) {
                 console.log(`  - ${c.relativePath}`);
             });
         }
-        // Check for server component errors (using client hooks without 'use client')
-        if (scanResult.errors.length > 0) {
+        const moduleBoundaryIssues = (0, module_boundary_validator_1.validateModuleBoundaries)({
+            appDir,
+            extraRoots: fs_1.default.existsSync(componentsDir) ? [componentsDir] : [],
+            cacheComponentsEnabled: cacheComponentsConfig.enabled,
+        }).issues;
+        if (moduleBoundaryIssues.length > 0) {
             console.log('');
-            console.log('\x1b[41m\x1b[37m ERROR \x1b[0m \x1b[31mServer Component Error\x1b[0m');
+            console.log('\x1b[41m\x1b[37m ERROR \x1b[0m \x1b[31mServer/Segment Validation Error\x1b[0m');
             console.log('');
-            for (const error of scanResult.errors) {
-                console.log(`\x1b[31m✗\x1b[0m ${error.file}`);
-                console.log(`  You're importing a component that needs \x1b[33m${error.hooks.slice(0, 3).join(', ')}\x1b[0m.`);
-                console.log(`  These only work in a Client Component.`);
-                console.log('');
-                console.log(`  \x1b[36mTo fix:\x1b[0m Add \x1b[33m'use client'\x1b[0m at the top of your file:`);
-                console.log('');
-                console.log(`    \x1b[32m'use client';\x1b[0m`);
+            for (const issue of moduleBoundaryIssues) {
+                console.log(`\x1b[31m✗\x1b[0m ${path_1.default.relative(cwd, issue.filePath)}`);
+                console.log(`  ${issue.message}`);
                 console.log('');
+                if (issue.fix) {
+                    console.log(`  \x1b[36mTo fix:\x1b[0m ${issue.fix}`);
+                    console.log('');
+                }
+            }
+            if (!watch) {
+                console.log('\x1b[31mBuild failed due to server/segment violations.\x1b[0m');
+                process.exit(1);
             }
         }
     }
@@ -355,10 +367,20 @@ async function buildClient(watch = false, onRebuild) {
         (0, manifest_1.writeCanonicalVistaArtifacts)(cwd, vistaDir, buildId, []);
         console.warn(`[vista:build] Failed to derive route artifacts: ${error.message}`);
     }
+    (0, manifest_1.writeReservedVistaArtifacts)(vistaDir, {
+        buildId,
+        engineVariant,
+        imagesConfig: vistaConfig.images,
+    });
     // Generate client entry - TRUE RSC: only client components
     generateClientEntry(cwd, vistaDir, clientComponents, watch);
     // Create Webpack config
-    const config = (0, webpack_config_1.createWebpackConfig)({ cwd, isDev: watch });
+    const config = (0, webpack_config_1.createWebpackConfig)({
+        cwd,
+        isDev: watch,
+        engineVariant,
+        cacheComponentsEnabled: cacheComponentsConfig.enabled,
+    });
     // Create Webpack compiler
     exports.compiler = compiler = (0, webpack_1.default)(config);
     if (watch) {
@@ -424,6 +446,7 @@ async function buildClient(watch = false, onRebuild) {
                     vistaDir,
                     debug: _debug,
                 });
+                (0, manifest_1.pruneEmptyVistaDirectories)(vistaDir);
                 compiler.close((closeErr) => {
                     if (closeErr)
                         console.error('Error closing compiler:', closeErr);

package/dist/bin/devtools-indicator-snippet.js

@@ -343,6 +343,36 @@ function getDevToolsIndicatorBootstrapSource(bootSessionId) {
       };
     }
 
+    document.addEventListener('vista:ppr-shell', function () {
+      pulse('ppr-shell', 420);
+    });
+    document.addEventListener('vista:ppr-resume', function (event) {
+      var detail = event && event.detail && typeof event.detail === 'object' ? event.detail : {};
+      begin('ppr-' + (detail.mode || 'resume'));
+    });
+    document.addEventListener('vista:ppr-complete', function (event) {
+      var detail = event && event.detail && typeof event.detail === 'object' ? event.detail : {};
+      pulse('ppr-' + (detail.mode || 'complete'), 520);
+      clearError();
+      setRoute();
+    });
+    document.addEventListener('vista:ppr-error', function (event) {
+      var detail = event && event.detail && typeof event.detail === 'object' ? event.detail : {};
+      setError(detail.message || 'ppr-resume', 1);
+    });
+    document.addEventListener('vista:rsc-resume-start', function () {
+      begin('flight-resume');
+    });
+    document.addEventListener('vista:rsc-resume-complete', function () {
+      pulse('flight-ready', 480);
+      clearError();
+      setRoute();
+    });
+    document.addEventListener('vista:rsc-resume-error', function (event) {
+      var detail = event && event.detail && typeof event.detail === 'object' ? event.detail : {};
+      setError(detail.message || 'flight-resume', 1);
+    });
+
     setRoute();
     setState(false, 'idle');
 

package/dist/bin/file-scanner.d.ts

@@ -13,7 +13,7 @@
  */
 export interface RouteNode {
     segment: string;
-    kind: 'static' | 'dynamic' | 'catch-all' | 'optional-catch-all' | 'group';
+    kind: 'static' | 'dynamic' | 'catch-all' | 'optional-catch-all' | 'group' | 'parallel' | 'interception';
     indexPath?: string;
     layoutPath?: string;
     loadingPath?: string;

package/dist/bin/file-scanner.js

@@ -116,8 +116,16 @@ function classifySegment(segment) {
         return 'optional-catch-all';
     if (segment.startsWith('[...'))
         return 'catch-all';
+    if (segment.startsWith('(.)') ||
+        segment.startsWith('(..)') ||
+        segment.startsWith('(..)(..)') ||
+        segment.startsWith('(...)')) {
+        return 'interception';
+    }
     if (segment.startsWith('(') && segment.endsWith(')'))
         return 'group';
+    if (segment.startsWith('@'))
+        return 'parallel';
     if (segment.startsWith('['))
         return 'dynamic';
     return 'static';

package/dist/bin/flashpack-runner.d.ts

@@ -0,0 +1 @@
+export {};