From 7e353dbeb383b2402c0ebd61d6accbcff572ebf5 Mon Sep 17 00:00:00 2001
From: Benjamin Toby <devops@tben.me>
Date: Fri, 2 Oct 2026 07:20:55 +0100
Subject: [PATCH] Error handling bugfix: pass #2

---
 dist/functions/server/watcher-esbuild-ctx.js  | 11 ++++++-----
 .../server/web-pages/grab-page-component.js   |  1 -
 src/functions/server/watcher-esbuild-ctx.ts   | 19 +++++++++----------
 .../server/web-pages/grab-page-component.tsx  |  1 -
 4 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/dist/functions/server/watcher-esbuild-ctx.js b/dist/functions/server/watcher-esbuild-ctx.js
index a94ecad..d07b4ac 100644
--- a/dist/functions/server/watcher-esbuild-ctx.js
+++ b/dist/functions/server/watcher-esbuild-ctx.js
@@ -162,11 +162,12 @@ export default async function watcherEsbuildCTX() {
             });
         }
         catch (error) {
-            logBuildErrorsOnce([
-                {
-                    text: `Watcher rebuild failed: ${error?.message || String(error)}`,
-                },
-            ], (line) => log.error(line));
+            // A "Build failed with N errors" rejection is the same
+            // failure the tracker's onEnd already reported (deduped).
+            const msg = String(error?.message || error || "");
+            if (!msg.startsWith("Build failed with")) {
+                logBuildErrorsOnce([{ text: `Watcher rebuild failed: ${msg}` }], (line) => log.error(line));
+            }
         }
         finally {
             if (owns_recompile) {
diff --git a/dist/functions/server/web-pages/grab-page-component.js b/dist/functions/server/web-pages/grab-page-component.js
index a93fe0f..4d4c476 100644
--- a/dist/functions/server/web-pages/grab-page-component.js
+++ b/dist/functions/server/web-pages/grab-page-component.js
@@ -77,7 +77,6 @@ export default async function grabPageComponent(params) {
             }
             if (!bundledMap?.path) {
                 const errMsg = `No Bundled File Path for this request path!`;
-                log.error(errMsg);
                 throw new Error(errMsg);
             }
         }
diff --git a/src/functions/server/watcher-esbuild-ctx.ts b/src/functions/server/watcher-esbuild-ctx.ts
index 5742d14..07e246c 100644
--- a/src/functions/server/watcher-esbuild-ctx.ts
+++ b/src/functions/server/watcher-esbuild-ctx.ts
@@ -207,16 +207,15 @@ export default async function watcherEsbuildCTX() {
                     msg: `${type} ${action}: ${filename}. Rebuilding ...`,
                 });
             } catch (error: any) {
-                logBuildErrorsOnce(
-                    [
-                        {
-                            text: `Watcher rebuild failed: ${
-                                error?.message || String(error)
-                            }`,
-                        },
-                    ],
-                    (line) => log.error(line),
-                );
+                // A "Build failed with N errors" rejection is the same
+                // failure the tracker's onEnd already reported (deduped).
+                const msg = String(error?.message || error || "");
+                if (!msg.startsWith("Build failed with")) {
+                    logBuildErrorsOnce(
+                        [{ text: `Watcher rebuild failed: ${msg}` }],
+                        (line) => log.error(line),
+                    );
+                }
             } finally {
                 if (owns_recompile) {
                     global.BUNEXT_RECOMPILING = false;
diff --git a/src/functions/server/web-pages/grab-page-component.tsx b/src/functions/server/web-pages/grab-page-component.tsx
index 2cc7cda..538ec05 100644
--- a/src/functions/server/web-pages/grab-page-component.tsx
+++ b/src/functions/server/web-pages/grab-page-component.tsx
@@ -131,7 +131,6 @@ export default async function grabPageComponent(
 
             if (!bundledMap?.path) {
                 const errMsg = `No Bundled File Path for this request path!`;
-                log.error(errMsg);
                 throw new Error(errMsg);
             }
         }