veryfront 0.1.72 → 0.1.73

package/esm/src/server/services/rendering/ssr.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ssr.service.d.ts","sourceRoot":"","sources":["../../../../../src/src/server/services/rendering/ssr.service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,2BAA2B,CAAC;AACrD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAEL,KAAK,eAAe,EAErB,MAAM,kCAAkC,CAAC;AAmB1C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAItE,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,cAAc,CAAC,UAAU,CAAC,CAAC;IACpC,WAAW,EAAE,OAAO,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,aAAa,EAAE,UAAU,GAAG,OAAO,CAAC;IACpC,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,SAAS,CAAC,EAAE,WAAW,GAAG,YAAY,GAAG,cAAc,GAAG,SAAS,CAAC;IACpE,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC;IACzB,GAAG,EAAE,GAAG,CAAC;IACT,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,OAAO,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,OAAO,CAAC;IACf,UAAU,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,WAAW,YAAY;IAC3B,YAAY,EAAE,OAAO,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,qBAAa,UAAU;IACrB,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAA0B;gBAEzC,OAAO,CAAC,EAAE;QAAE,SAAS,CAAC,EAAE,eAAe,CAAC,MAAM,CAAC,CAAA;KAAE;IAI7D,mBAAmB,IAAI,YAAY;IAW7B,WAAW,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,eAAe,CAAC;IAI1D,UAAU,CAAC,GAAG,EAAE,cAAc,EAAE,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,eAAe,CAAC;IAiG1F,OAAO,CAAC,iBAAiB;IAqFzB,0BAA0B,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe;CAS1D"}
+{"version":3,"file":"ssr.service.d.ts","sourceRoot":"","sources":["../../../../../src/src/server/services/rendering/ssr.service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,2BAA2B,CAAC;AACrD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAEL,KAAK,eAAe,EAErB,MAAM,kCAAkC,CAAC;AAmB1C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAItE,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,cAAc,CAAC,UAAU,CAAC,CAAC;IACpC,WAAW,EAAE,OAAO,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,aAAa,EAAE,UAAU,GAAG,OAAO,CAAC;IACpC,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,SAAS,CAAC,EAAE,WAAW,GAAG,YAAY,GAAG,cAAc,GAAG,SAAS,CAAC;IACpE,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC;IACzB,GAAG,EAAE,GAAG,CAAC;IACT,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,OAAO,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,OAAO,CAAC;IACf,UAAU,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,WAAW,YAAY;IAC3B,YAAY,EAAE,OAAO,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,qBAAa,UAAU;IACrB,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAA0B;gBAEzC,OAAO,CAAC,EAAE;QAAE,SAAS,CAAC,EAAE,eAAe,CAAC,MAAM,CAAC,CAAA;KAAE;IAI7D,mBAAmB,IAAI,YAAY;IAW7B,WAAW,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,eAAe,CAAC;IAI1D,UAAU,CAAC,GAAG,EAAE,cAAc,EAAE,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,eAAe,CAAC;IAiG1F,OAAO,CAAC,iBAAiB;IA4FzB,0BAA0B,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe;CAS1D"}

package/esm/src/server/services/rendering/ssr.service.js

@@ -6,7 +6,7 @@ import { VeryfrontError } from "../../../errors/index.js";
 import { getColorSchemeFromRequest } from "../../../security/http/client-hints.js";
 import { endRenderSession, startRenderSession, } from "../../../transforms/mdx/esm-module-loader/module-fetcher/index.js";
 import { getErrorCollector } from "../../../observability/error-collector.js";
-import { ErrorOverlay } from "../../dev-server/error-overlay/index.js";
+import { ErrorOverlay, parseErrorLocation } from "../../dev-server/error-overlay/index.js";
 import { ErrorPages } from "../../utils/error-html.js";
 import { HTTP_INTERNAL_SERVER_ERROR, HTTP_NOT_FOUND, HTTP_OK, HTTP_UNAVAILABLE, } from "../../../utils/constants/index.js";
 const logger = serverLogger.component("ssr-service");
@@ -150,9 +150,16 @@ export class SSRService {
                 url: request.url,
                 slug,
             });
+            const sourceFile = errorObj.sourceFile;
+            const location = sourceFile ? parseErrorLocation(errorObj, sourceFile) : {};
             return {
                 status: HTTP_INTERNAL_SERVER_ERROR,
-                html: ErrorOverlay.createHTML({ error: errorObj, type: "runtime" }),
+                html: ErrorOverlay.createHTML({
+                    error: errorObj,
+                    type: "runtime",
+                    ...(sourceFile ? { file: sourceFile } : {}),
+                    ...location,
+                }, ctx.projectSlug),
                 isStreaming: false,
                 cacheStrategy: "no-cache",
                 error: errorObj,

package/esm/src/server/utils/error-html.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"error-html.d.ts","sourceRoot":"","sources":["../../../../src/src/server/utils/error-html.ts"],"names":[],"mappings":"AAAA,UAAU,gBAAgB;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,gDAAgD;IAChD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,sDAAsD;IACtD,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,gBAAgB,GAAG,MAAM,CAQnE;AAuFD,eAAO,MAAM,UAAU;wBACD,MAAM,GAAG,MAAM;0BAUb,MAAM,GAAG,MAAM;kBAQvB,MAAM;sBAQF,MAAM;CAOzB,CAAC"}
+{"version":3,"file":"error-html.d.ts","sourceRoot":"","sources":["../../../../src/src/server/utils/error-html.ts"],"names":[],"mappings":"AAEA,UAAU,gBAAgB;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,gDAAgD;IAChD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,sDAAsD;IACtD,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,gBAAgB,GAAG,MAAM,CAQnE;AA4GD,eAAO,MAAM,UAAU;wBACD,MAAM,GAAG,MAAM;0BAUb,MAAM,GAAG,MAAM;kBAQvB,MAAM;sBAQF,MAAM;CAOzB,CAAC"}

package/esm/src/server/utils/error-html.js

@@ -1,3 +1,4 @@
+import { escapeHTML } from "../../html/html-escape.js";
 export function generateErrorHtml(options) {
     const { statusCode, title, message, pathname, minimal } = options;
     if (minimal) {
@@ -6,13 +7,16 @@ export function generateErrorHtml(options) {
     return generateStyledErrorHtml(statusCode, title, message);
 }
 function generateStyledErrorHtml(statusCode, title, message) {
+    const errorMessage = title === "Not Found" ? `Page not found: ${message}` : message;
+    // 4xx = warning (routing/config issue), 5xx = error (something broke)
+    const errorType = statusCode >= 500 ? "error" : "warning";
     return `<!DOCTYPE html>
 <html lang="en">
 <head>
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width">
   <link rel="icon" type="image/png" href="https://cdn.veryfront.com/images/veryfront-favicon.png">
-  <title>${statusCode} ${title} — Veryfront</title>
+  <title>${statusCode} ${escapeHTML(title)} — Veryfront</title>
   <style>
     :root {
       --bg: #ffffff;
@@ -61,9 +65,25 @@ function generateStyledErrorHtml(statusCode, title, message) {
 </head>
 <body>
   <div class="container">
-    <h1 class="title">${title}</h1>
-    <p class="message">${message}</p>
+    <h1 class="title">${escapeHTML(title)}</h1>
+    <p class="message">${escapeHTML(message)}</p>
   </div>
+  <script>
+    if (window.parent !== window) {
+      try {
+        window.parent.postMessage({
+          action: 'appUpdated',
+          isInitialLoad: true,
+          hasError: true,
+          url: window.location.href,
+          errors: [{
+            type: '${errorType}',
+            message: ${JSON.stringify(errorMessage).replace(/</g, "\\u003c")}
+          }]
+        }, '*');
+      } catch (e) { /* postMessage may fail in cross-origin iframes */ }
+    }
+  </script>
 </body>
 </html>`;
 }
@@ -74,11 +94,11 @@ function generateMinimalErrorHtml(statusCode, title, message, pathname) {
 <head>
   <meta charset="utf-8"/>
   <meta name="viewport" content="width=device-width, initial-scale=1"/>
-  <title>${statusCode} ${title}</title>
+  <title>${statusCode} ${escapeHTML(title)}</title>
 </head>
 <body>
-  <h1>${statusCode} ${title}</h1>
-  <p>${fullMessage}</p>
+  <h1>${statusCode} ${escapeHTML(title)}</h1>
+  <p>${escapeHTML(fullMessage)}</p>
 </body>
 </html>`;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "veryfront",
-  "version": "0.1.72",
+  "version": "0.1.73",
   "description": "The simplest way to build AI-powered apps",
   "keywords": [
     "react",

package/src/deno.js

@@ -1,6 +1,6 @@
 export default {
   "name": "veryfront",
-  "version": "0.1.72",
+  "version": "0.1.73",
   "license": "Apache-2.0",
   "nodeModulesDir": "auto",
   "exclude": [

package/src/src/html/html-shell-generator.ts

@@ -208,6 +208,14 @@ async function generateHTMLShellPartsImpl(
 
   const nonceAttr = nonce ? ` nonce="${nonce}"` : "";
 
+  // Expose project slug for runtime error overlay "Fix in Veryfront" button
+  const overlaySlug = options.projectId || meta.slug;
+  const slugForOverlay = useDevScripts && overlaySlug
+    ? `<script${nonceAttr}>window.__VF_PROJECT_SLUG__=${
+      JSON.stringify(overlaySlug).replace(/</g, "\\u003c")
+    };</script>`
+    : "";
+
   const hydrationErrorSuppression = useDevScripts ? "" : `<script${nonceAttr}>
 (function(){
   var origError = console.error;
@@ -303,6 +311,7 @@ async function generateHTMLShellPartsImpl(
   ${linkTags}
   ${styleTags}
   ${modeStyles}
+  ${slugForOverlay}
 </head>
 <body${bodyClass ? ` class="${bodyClass}"` : ""} suppressHydrationWarning>
   <div ${rootAttributes}>`;

package/src/src/rendering/orchestrator/pipeline.ts

@@ -391,191 +391,205 @@ export class RenderPipeline {
           );
           timing.pageResolve = Math.round(performance.now() - pageResolveStart);
 
-          const skipLayouts = isDotPath(slug, pageInfo.entity.path);
-
-          const layoutCollectStart = performance.now();
-          const layoutResult = skipLayouts ? EMPTY_LAYOUT_RESULT : await withSpan(
-            "render.collect_layouts",
-            () => this.config.layoutOrchestrator.collectLayouts(pageInfo),
-            { "render.slug": slug },
+          const sourceFile = extractRelativePathShared(
+            pageInfo.entity.path,
+            this.config.projectDir,
           );
-          timing.layoutCollect = Math.round(performance.now() - layoutCollectStart);
-
-          const layoutPreloadPromise = !skipLayouts && layoutResult.nestedLayouts.length > 0
-            ? this.config.layoutOrchestrator.preloadLayoutModules(layoutResult.nestedLayouts)
-            : Promise.resolve();
-
-          let dataFetchingProps: Record<string, unknown> | undefined;
-          let resolvedParams: Record<string, string | string[]> = options?.params
-            ? { ...options.params }
-            : {};
-          let layoutDataMap = new Map<string, Record<string, unknown>>();
-
-          const dataFetchStart = performance.now();
-          if (options?.request && options?.url) {
-            await withSpan(
-              "render.data_fetching",
-              async () => {
-                try {
-                  const dataResolution = await this.resolveDataFetching(
-                    slug,
-                    pageInfo.entity.path,
-                    layoutResult.nestedLayouts,
-                    options,
-                  );
-                  resolvedParams = dataResolution.params;
-                  dataFetchingProps = Object.keys(dataResolution.pageProps).length > 0
-                    ? dataResolution.pageProps
-                    : undefined;
-                  layoutDataMap = dataResolution.layoutProps;
-                } catch (error) {
-                  if (error instanceof VeryfrontError) throw error;
-
-                  renderPageLog.error("Data fetching error", {
-                    slug,
-                    error: error instanceof Error ? error.message : String(error),
-                  });
-                  throw error;
-                }
-              },
+
+          try {
+            const skipLayouts = isDotPath(slug, pageInfo.entity.path);
+
+            const layoutCollectStart = performance.now();
+            const layoutResult = skipLayouts ? EMPTY_LAYOUT_RESULT : await withSpan(
+              "render.collect_layouts",
+              () => this.config.layoutOrchestrator.collectLayouts(pageInfo),
               { "render.slug": slug },
             );
-          }
-          timing.dataFetch = Math.round(performance.now() - dataFetchStart);
-
-          const hasResolvedParams = Object.keys(resolvedParams).length > 0;
-          const mergedOptions = (dataFetchingProps || hasResolvedParams)
-            ? {
-              ...options,
-              ...(hasResolvedParams ? { params: resolvedParams } : {}),
-              ...(dataFetchingProps ? { props: { ...options?.props, ...dataFetchingProps } } : {}),
+            timing.layoutCollect = Math.round(performance.now() - layoutCollectStart);
+
+            const layoutPreloadPromise = !skipLayouts && layoutResult.nestedLayouts.length > 0
+              ? this.config.layoutOrchestrator.preloadLayoutModules(layoutResult.nestedLayouts)
+              : Promise.resolve();
+
+            let dataFetchingProps: Record<string, unknown> | undefined;
+            let resolvedParams: Record<string, string | string[]> = options?.params
+              ? { ...options.params }
+              : {};
+            let layoutDataMap = new Map<string, Record<string, unknown>>();
+
+            const dataFetchStart = performance.now();
+            if (options?.request && options?.url) {
+              await withSpan(
+                "render.data_fetching",
+                async () => {
+                  try {
+                    const dataResolution = await this.resolveDataFetching(
+                      slug,
+                      pageInfo.entity.path,
+                      layoutResult.nestedLayouts,
+                      options,
+                    );
+                    resolvedParams = dataResolution.params;
+                    dataFetchingProps = Object.keys(dataResolution.pageProps).length > 0
+                      ? dataResolution.pageProps
+                      : undefined;
+                    layoutDataMap = dataResolution.layoutProps;
+                  } catch (error) {
+                    if (error instanceof VeryfrontError) throw error;
+
+                    renderPageLog.error("Data fetching error", {
+                      slug,
+                      error: error instanceof Error ? error.message : String(error),
+                    });
+                    throw error;
+                  }
+                },
+                { "render.slug": slug },
+              );
             }
-            : options;
-
-          const bundlePrepStart = performance.now();
-          const pageBundleResult = await withSpan(
-            "render.prepare_bundles",
-            () =>
-              this.config.pageRenderer.preparePageBundles(
-                pageInfo,
-                slug,
-                cacheResult?.cachedModule,
-                mergedOptions,
-              ),
-            { "render.slug": slug },
-          );
-          timing.bundlePrep = Math.round(performance.now() - bundlePrepStart);
+            timing.dataFetch = Math.round(performance.now() - dataFetchStart);
+
+            const hasResolvedParams = Object.keys(resolvedParams).length > 0;
+            const mergedOptions = (dataFetchingProps || hasResolvedParams)
+              ? {
+                ...options,
+                ...(hasResolvedParams ? { params: resolvedParams } : {}),
+                ...(dataFetchingProps
+                  ? { props: { ...options?.props, ...dataFetchingProps } }
+                  : {}),
+              }
+              : options;
+
+            const bundlePrepStart = performance.now();
+            const pageBundleResult = await withSpan(
+              "render.prepare_bundles",
+              () =>
+                this.config.pageRenderer.preparePageBundles(
+                  pageInfo,
+                  slug,
+                  cacheResult?.cachedModule,
+                  mergedOptions,
+                ),
+              { "render.slug": slug },
+            );
+            timing.bundlePrep = Math.round(performance.now() - bundlePrepStart);
 
-          if (pageBundleResult.scriptResult) return pageBundleResult.scriptResult;
+            if (pageBundleResult.scriptResult) return pageBundleResult.scriptResult;
 
-          if (!pageBundleResult.pageElement || !pageBundleResult.pageBundle) {
-            throw RENDER_ERROR.create({
-              detail: "Failed to prepare page bundle",
-              context: { slug },
-            });
-          }
+            if (!pageBundleResult.pageElement || !pageBundleResult.pageBundle) {
+              throw RENDER_ERROR.create({
+                detail: "Failed to prepare page bundle",
+                context: { slug },
+              });
+            }
 
-          const { pageElement, pageBundle } = pageBundleResult;
-
-          const mergedFrontmatter = {
-            ...pageInfo.entity.frontmatter,
-            ...(pageBundle as MdxBundle).frontmatter,
-          };
-
-          const headings = (pageBundle as PageBundle).headings || [];
-
-          await layoutPreloadPromise;
-
-          const layoutApplyStart = performance.now();
-          const wrappedElement = await withSpan(
-            "render.apply_layouts",
-            () =>
-              this.config.layoutOrchestrator.applyLayoutsAndWrappers(
-                pageElement,
-                pageInfo,
-                layoutResult.layoutBundle,
-                layoutResult.nestedLayouts,
-                layoutDataMap,
-                options?.url,
-                mergedFrontmatter,
-                headings,
-                options?.projectSlug,
-              ),
-            { "render.slug": slug, "render.layout_count": layoutResult.nestedLayouts.length },
-          );
-          timing.layoutApply = Math.round(performance.now() - layoutApplyStart);
-
-          // Snapshot CSS imports collected during module loading (before SSR rendering).
-          // These are passed to the HTML generator to be included in the output.
-          const collectedCSSImports = getCSSImports();
-
-          const ssrStart = performance.now();
-          const ssrResult = await withSpan(
-            "render.ssr",
-            () =>
-              withTimeoutThrow(
-                this.config.ssrOrchestrator.performSSRRendering(
-                  wrappedElement,
-                  {
-                    pageInfo,
-                    pageBundle,
-                    layoutBundle: layoutResult.layoutBundle,
-                    nestedLayouts: layoutResult.nestedLayouts,
-                    collectedMetadata: pageBundleResult.collectedMetadata,
-                    slug,
-                    cssImports: collectedCSSImports,
-                  },
-                  mergedOptions,
+            const { pageElement, pageBundle } = pageBundleResult;
+
+            const mergedFrontmatter = {
+              ...pageInfo.entity.frontmatter,
+              ...(pageBundle as MdxBundle).frontmatter,
+            };
+
+            const headings = (pageBundle as PageBundle).headings || [];
+
+            await layoutPreloadPromise;
+
+            const layoutApplyStart = performance.now();
+            const wrappedElement = await withSpan(
+              "render.apply_layouts",
+              () =>
+                this.config.layoutOrchestrator.applyLayoutsAndWrappers(
+                  pageElement,
+                  pageInfo,
+                  layoutResult.layoutBundle,
+                  layoutResult.nestedLayouts,
+                  layoutDataMap,
+                  options?.url,
+                  mergedFrontmatter,
+                  headings,
+                  options?.projectSlug,
                 ),
-                SSR_RENDER_TIMEOUT_MS,
-                `SSR rendering for ${slug}`,
-              ),
-            { "render.slug": slug, "render.delivery": mergedOptions?.delivery || "full" },
-          );
-          timing.ssr = Math.round(performance.now() - ssrStart);
+              { "render.slug": slug, "render.layout_count": layoutResult.nestedLayouts.length },
+            );
+            timing.layoutApply = Math.round(performance.now() - layoutApplyStart);
+
+            // Snapshot CSS imports collected during module loading (before SSR rendering).
+            // These are passed to the HTML generator to be included in the output.
+            const collectedCSSImports = getCSSImports();
+
+            const ssrStart = performance.now();
+            const ssrResult = await withSpan(
+              "render.ssr",
+              () =>
+                withTimeoutThrow(
+                  this.config.ssrOrchestrator.performSSRRendering(
+                    wrappedElement,
+                    {
+                      pageInfo,
+                      pageBundle,
+                      layoutBundle: layoutResult.layoutBundle,
+                      nestedLayouts: layoutResult.nestedLayouts,
+                      collectedMetadata: pageBundleResult.collectedMetadata,
+                      slug,
+                      cssImports: collectedCSSImports,
+                    },
+                    mergedOptions,
+                  ),
+                  SSR_RENDER_TIMEOUT_MS,
+                  `SSR rendering for ${slug}`,
+                ),
+              { "render.slug": slug, "render.delivery": mergedOptions?.delivery || "full" },
+            );
+            timing.ssr = Math.round(performance.now() - ssrStart);
 
-          if (collectedCSSImports.length > 0) {
-            renderPipelineLog.debug("CSS imports collected for HTML generation", {
-              slug,
-              count: collectedCSSImports.length,
-              paths: collectedCSSImports.map((p) => p.split("/").pop()),
-            });
-          }
+            if (collectedCSSImports.length > 0) {
+              renderPipelineLog.debug("CSS imports collected for HTML generation", {
+                slug,
+                count: collectedCSSImports.length,
+                paths: collectedCSSImports.map((p) => p.split("/").pop()),
+              });
+            }
 
-          const pageModule = pageBundleResult.clientModuleCode && pageBundleResult.pageModuleType
-            ? {
-              slug,
-              code: pageBundleResult.clientModuleCode,
-              type: pageBundleResult.pageModuleType,
+            const pageModule = pageBundleResult.clientModuleCode && pageBundleResult.pageModuleType
+              ? {
+                slug,
+                code: pageBundleResult.clientModuleCode,
+                type: pageBundleResult.pageModuleType,
+              }
+              : undefined;
+
+            const result: RenderResult = {
+              html: ssrResult.fullHtml,
+              frontmatter: (pageBundleResult.pageBundle as MdxBundle).frontmatter || {},
+              headings: pageBundleResult.pageBundle.headings || [],
+              nodeMap: pageBundleResult.pageBundle.nodeMap,
+              stream: ssrResult.finalStream,
+              ssrHash: ssrResult.ssrHash,
+              ...(pageModule ? { pageModule } : {}),
+            };
+
+            if (shouldCache && !options?.skipCachePersist) {
+              void this.config.cacheCoordinator.persistResult(result, slug, cacheKey).catch(
+                (error) => {
+                  renderPipelineLog.error("Cache persist failed", {
+                    slug,
+                    error: error instanceof Error ? error.message : String(error),
+                    stack: error instanceof Error ? error.stack : undefined,
+                  });
+                },
+              );
             }
-            : undefined;
-
-          const result: RenderResult = {
-            html: ssrResult.fullHtml,
-            frontmatter: (pageBundleResult.pageBundle as MdxBundle).frontmatter || {},
-            headings: pageBundleResult.pageBundle.headings || [],
-            nodeMap: pageBundleResult.pageBundle.nodeMap,
-            stream: ssrResult.finalStream,
-            ssrHash: ssrResult.ssrHash,
-            ...(pageModule ? { pageModule } : {}),
-          };
-
-          if (shouldCache && !options?.skipCachePersist) {
-            void this.config.cacheCoordinator.persistResult(result, slug, cacheKey).catch(
-              (error) => {
-                renderPipelineLog.error("Cache persist failed", {
-                  slug,
-                  error: error instanceof Error ? error.message : String(error),
-                  stack: error instanceof Error ? error.stack : undefined,
-                });
-              },
-            );
-          }
 
-          timing.total = Math.round(performance.now() - pipelineStartTime);
-          renderPipelineLog.debug("Complete", { slug, timing });
+            timing.total = Math.round(performance.now() - pipelineStartTime);
+            renderPipelineLog.debug("Complete", { slug, timing });
 
-          return result;
+            return result;
+          } catch (error) {
+            if (error instanceof Error) {
+              (error as Error & { sourceFile?: string }).sourceFile = sourceFile;
+            }
+            throw error;
+          }
         });
         return result;
       },

package/src/src/server/dev-server/error-overlay/error-formatter.ts

@@ -53,6 +53,27 @@ export function getSuggestion(error: Error): string | undefined {
   return undefined;
 }
 
+export function parseErrorLocation(
+  error: Error,
+  file: string,
+): { line?: number; column?: number } {
+  if (!error.stack || !file) return {};
+
+  const lines = error.stack.split("\n");
+
+  // First try to match the known source file
+  for (const stackLine of lines) {
+    if (!stackLine.includes(file)) continue;
+
+    const match = stackLine.match(/:(\d+):(\d+)\)?$/);
+    if (match) {
+      return { line: Number(match[1]), column: Number(match[2]) };
+    }
+  }
+
+  return {};
+}
+
 export function formatErrorType(type: ErrorType): string {
   const firstChar = type[0];
   if (!firstChar) return "";