veryfront 0.1.71 → 0.1.73

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/bootstrap.ts

@@ -278,7 +278,12 @@ function validateProductionEnvironment(_adapter: RuntimeAdapter): void {
       );
     }
 
-    if (!controlPlanePublicKey) {
+    if (!controlPlanePublicKey && nodeEnv === "development") {
+      logger.warn(
+        "[Bootstrap:Prod] CHANNEL_DISPATCH_SIGNING_PUBLIC_KEY is not set. " +
+          "Channel dispatch verification will be unavailable (local dev mode).",
+      );
+    } else if (!controlPlanePublicKey) {
       logger.error(
         "[Bootstrap:Prod] CRITICAL: CHANNEL_DISPATCH_SIGNING_PUBLIC_KEY is not set in proxy mode. " +
           "Hosted runtimes cannot verify control-plane requests without it.",

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 "";

package/src/src/server/dev-server/error-overlay/html-template.ts

@@ -10,6 +10,13 @@ const WS_RECONNECT_MAX_DELAY_MS = 5_000;
 /** Maximum number of WebSocket reconnection attempts before giving up */
 const WS_MAX_RECONNECT_ATTEMPTS = 10;
 
+/** JSON.stringify that escapes `<` to prevent `</script>` breaking inline scripts */
+function jsonForScript(value: unknown): string {
+  const json = JSON.stringify(value);
+  // JSON.stringify(undefined) returns undefined (not a string)
+  return json === undefined ? "undefined" : json.replace(/</g, "\\u003c");
+}
+
 export function generateRuntimeScript(): string {
   return `
     // Veryfront Error Overlay Runtime
@@ -110,21 +117,76 @@ export function generateRuntimeScript(): string {
             </div>
 
             <button type="button" onclick="document.getElementById('veryfront-error-overlay').remove()" style="
-              background: #333;
-              border: 1px solid #555;
-              color: #ccc;
-              padding: 8px 16px;
-              border-radius: 4px;
+              background: #fff;
+              border: none;
+              color: #000;
+              padding: 10px 20px;
+              border-radius: 9999px;
               cursor: pointer;
               font-family: inherit;
             ">
               Dismiss
             </button>
+            \${window.__VF_PROJECT_SLUG__ ? \`
+            <button type="button" id="vf-fix-btn-runtime" style="
+              background: transparent;
+              border: 1px solid rgba(255, 255, 255, 0.2);
+              color: rgba(255, 255, 255, 0.7);
+              padding: 10px 20px;
+              border-radius: 9999px;
+              cursor: pointer;
+              font-family: inherit;
+              margin-left: 8px;
+            ">
+              Fix in Veryfront
+            </button>
+            \` : ''}
           </div>
         </div>
       \`;
 
       document.body.appendChild(overlay);
+
+      // Notify Studio of runtime error
+      if (window.parent !== window) {
+        try {
+          window.parent.postMessage({
+            action: 'runtimeError',
+            url: window.location.href,
+            hasError: true,
+            errors: [{
+              type: 'error',
+              message: (errorInfo.error && errorInfo.error.message) || 'Unknown error',
+              file: errorInfo.file ? String(errorInfo.file) : undefined,
+              line: errorInfo.line ? Number(errorInfo.line) : undefined,
+              column: errorInfo.column ? Number(errorInfo.column) : undefined
+            }]
+          }, '*');
+        } catch (e) { /* postMessage may fail */ }
+      }
+
+      if (window.__VF_PROJECT_SLUG__) {
+        var fixBtn = document.getElementById('vf-fix-btn-runtime');
+        if (fixBtn) {
+          fixBtn.addEventListener('click', function() {
+            var rawName = (errorInfo.error && errorInfo.error.name) || 'Error';
+            var rawMessage = (errorInfo.error && errorInfo.error.message) || 'Unknown error';
+            var rawFile = errorInfo.file ? String(errorInfo.file) : null;
+            var rawLine = errorInfo.line ? String(errorInfo.line) : null;
+            var rawColumn = errorInfo.column ? String(errorInfo.column) : null;
+            var loc = rawFile ? rawFile + (rawLine ? ':' + rawLine : '') + (rawColumn ? ':' + rawColumn : '') : null;
+            var bt = String.fromCharCode(96);
+            var prompt = 'Find and fix the following error' +
+              (loc ? ' in ' + bt + loc + bt : '') +
+              '\\n\\n' + bt + rawMessage + bt;
+            if (window.parent !== window) {
+              window.parent.postMessage({ action: 'chatMessage', prompt: prompt }, '*');
+            } else {
+              window.open('https://veryfront.com/projects/' + window.__VF_PROJECT_SLUG__ + '?prompt=' + encodeURIComponent(prompt));
+            }
+          });
+        }
+      }
     };
 
     window.addEventListener('error', (event) => {
@@ -146,7 +208,11 @@ export function generateRuntimeScript(): string {
   `;
 }
 
-export function generateErrorHTML(errorInfo: ErrorInfo, suggestion?: string): string {
+export function generateErrorHTML(
+  errorInfo: ErrorInfo,
+  suggestion?: string,
+  projectSlug?: string,
+): string {
   const errorType = escapeHtml(formatErrorType(errorInfo.type));
   const errorName = escapeHtml(errorInfo.error.name);
   const errorMessage = escapeHtml(errorInfo.error.message);
@@ -182,6 +248,10 @@ export function generateErrorHTML(errorInfo: ErrorInfo, suggestion?: string): st
     `
     : "";
 
+  const fixButtonHtml = projectSlug
+    ? `<button type="button" id="vf-fix-btn" class="btn btn-fix">Fix in Veryfront</button>`
+    : "";
+
   return `
 <!DOCTYPE html>
 <html>
@@ -253,6 +323,32 @@ export function generateErrorHTML(errorInfo: ErrorInfo, suggestion?: string): st
       overflow-x: auto;
       font-size: 12px;
     }
+    .btn {
+      padding: 10px 20px;
+      border-radius: 9999px;
+      cursor: pointer;
+      font-family: inherit;
+      font-size: 14px;
+      border: none;
+    }
+    .btn-dismiss {
+      background: #fff;
+      color: #000;
+    }
+    .btn-dismiss:hover {
+      background: #e5e5e5;
+    }
+    .btn-fix {
+      background: transparent;
+      color: rgba(255, 255, 255, 0.7);
+      border: 1px solid rgba(255, 255, 255, 0.2);
+      margin-left: 8px;
+    }
+    .btn-fix:hover {
+      background: rgba(255, 255, 255, 0.1);
+      color: #fff;
+      border-color: rgba(255, 255, 255, 0.4);
+    }
   </style>
 </head>
 <body>
@@ -267,8 +363,36 @@ export function generateErrorHTML(errorInfo: ErrorInfo, suggestion?: string): st
       ${suggestionSection}
       ${stackSection}
     </div>
+    ${fixButtonHtml}
   </div>
-  <script>
+  <script>${
+    projectSlug
+      ? `
+    (function() {
+      var slug = ${jsonForScript(projectSlug)};
+      var errorName = ${jsonForScript(errorInfo.error.name)};
+      var errorMessage = ${jsonForScript(errorInfo.error.message)};
+      var errorFile = ${jsonForScript(errorInfo.file ?? null)};
+      var errorLine = ${jsonForScript(errorInfo.line ?? null)};
+      var errorColumn = ${jsonForScript(errorInfo.column ?? null)};
+      var btn = document.getElementById('vf-fix-btn');
+      if (btn) {
+        btn.addEventListener('click', function() {
+          var loc = errorFile ? errorFile + (errorLine ? ':' + errorLine : '') + (errorColumn ? ':' + errorColumn : '') : null;
+          var bt = String.fromCharCode(96);
+          var prompt = 'Find and fix the following error' +
+            (loc ? ' in ' + bt + loc + bt : '') +
+            '\\n\\n' + bt + errorMessage + bt;
+          if (window.parent !== window) {
+            window.parent.postMessage({ action: 'chatMessage', prompt: prompt }, '*');
+          } else {
+            window.open('https://veryfront.com/projects/' + slug + '?prompt=' + encodeURIComponent(prompt));
+          }
+        });
+      }
+    })();`
+      : ""
+  }
     // Notify Studio (parent) that page has loaded with an error
     // This hides the loading spinner in Studio's preview iframe
     if (window.parent !== window) {
@@ -277,7 +401,14 @@ export function generateErrorHTML(errorInfo: ErrorInfo, suggestion?: string): st
           action: 'appUpdated',
           isInitialLoad: true,
           hasError: true,
-          url: window.location.href
+          url: window.location.href,
+          errors: [{
+            type: 'error',
+            message: ${jsonForScript(errorInfo.error.message)},
+            file: ${jsonForScript(errorInfo.file || undefined)},
+            line: ${errorInfo.line ? String(errorInfo.line) : "undefined"},
+            column: ${errorInfo.column ? String(errorInfo.column) : "undefined"}
+          }]
         }, '*');
       } catch (e) { /* postMessage may fail in cross-origin iframes */ }
     }

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

@@ -10,6 +10,7 @@ export {
   type ErrorType,
   formatErrorType,
   getSuggestion,
+  parseErrorLocation,
 } from "./error-formatter.js";
 export { generateErrorHTML, generateRuntimeScript } from "./html-template.js";
 export {

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

@@ -4,10 +4,11 @@ import { generateErrorHTML, generateRuntimeScript } from "./html-template.js";
 export const ErrorOverlay = {
   getRuntime: generateRuntimeScript,
   getSuggestion,
-  createHTML(errorInfo: ErrorInfo): string {
+  createHTML(errorInfo: ErrorInfo, projectSlug?: string): string {
     return generateErrorHTML(
       errorInfo,
       errorInfo.suggestion ?? getSuggestion(errorInfo.error),
+      projectSlug,
     );
   },
 };

package/src/src/server/dev-server/request-handler.ts

@@ -10,7 +10,7 @@ import {
 import type { RuntimeAdapter } from "../../platform/adapters/base.js";
 import type { VeryfrontConfig } from "../../config/index.js";
 import { clearConfigCache } from "../../config/index.js";
-import { ErrorOverlay } from "./error-overlay/index.js";
+import { ErrorOverlay, parseErrorLocation } from "./error-overlay/index.js";
 import { createResponseBuilder } from "../../security/index.js";
 import { resetApiHandler } from "../handlers/request/api/pages-api-handler.js";
 import { clearLayoutDiscoveryCache } from "../../rendering/layouts/index.js";
@@ -169,11 +169,15 @@ export class RequestHandler {
     const err = error as Error;
     getErrorCollector().addRuntimeError(err.message, err.stack, { source: "request-handler" });
 
+    const sourceFile = (err as Error & { sourceFile?: string }).sourceFile;
+    const location = sourceFile ? parseErrorLocation(err, sourceFile) : {};
     return new dntShim.Response(
       ErrorOverlay.createHTML({
         type: "runtime",
         error: err,
-      }),
+        ...(sourceFile ? { file: sourceFile } : {}),
+        ...location,
+      }, this.defaultProjectSlug),
       {
         status: HTTP_SERVER_ERROR,
         headers: { "content-type": "text/html; charset=utf-8" },