@base44-preview/vite-plugin 1.0.37-pr.121.de0cee3 → 1.0.38-pr.121.f18ee18

package/dist/injections/sandbox-build-error-notifier.js.map

@@ -1 +1 @@
-{"version":3,"file":"sandbox-build-error-notifier.js","sourceRoot":"","sources":["../../src/injections/sandbox-build-error-notifier.ts"],"names":[],"mappings":"AAAA,qCAAqC;AAErC,wEAAwE;AACxE,+EAA+E;AAC/E,qEAAqE;AACrE,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;IACpB,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,YAAY,EAAE,CAAC,OAA0C,EAAE,EAAE;QAC9E,MAAM,GAAG,GAAG,OAAO,EAAE,GAAG,IAAI,EAAE,CAAC;QAC/B,MAAM,OAAO,GAAG,OAAO,GAAG,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,aAAa,CAAC;QAC9E,MAAM,KAAK,GAAG,OAAO,GAAG,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;QACpE,MAAM,GAAG,GAAG,GAAG,CAAC,GAAoE,CAAC;QACrF,MAAM,IAAI,GAAG,GAAG,EAAE,IAAI,IAAI,CAAC,OAAO,GAAG,CAAC,EAAE,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QAC5E,MAAM,KAAK,GAAG,IAAI,IAAI,GAAG,EAAE,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,IAAI,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;QAC1F,MAAM,OAAO,GAAG,CAAC,KAAK,EAAE,OAAO,GAAG,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,EAAE,KAAK,CAAC;aAClF,MAAM,CAAC,OAAO,CAAC;aACf,IAAI,CAAC,IAAI,CAAC,CAAC;QACd,MAAM,CAAC,MAAM,EAAE,WAAW,CACxB;YACE,IAAI,EAAE,WAAW;YACjB,KAAK,EAAE;gBACL,KAAK,EAAE,OAAO;gBACd,OAAO,EAAE,OAAO,IAAI,SAAS;gBAC7B,aAAa,EAAE,SAAS;gBACxB,aAAa,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,GAAG,EAAE;gBACtE,KAAK;aACN;SACF,EACD,GAAG,CACJ,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAED,OAAO,EAAE,CAAC"}
+{"version":3,"file":"sandbox-build-error-notifier.js","sourceRoot":"","sources":["../../src/injections/sandbox-build-error-notifier.ts"],"names":[],"mappings":"AAAA,qCAAqC;AAQrC,MAAM,UAAU,gBAAgB,CAAC,OAA0B,EAAE,MAAc,MAAM;IAC/E,MAAM,GAAG,GAAG,OAAO,EAAE,GAAG,IAAI,EAAE,CAAC;IAC/B,MAAM,OAAO,GAAG,OAAO,GAAG,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,aAAa,CAAC;IAC9E,MAAM,KAAK,GAAG,OAAO,GAAG,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;IACpE,MAAM,GAAG,GAAG,GAAG,CAAC,GAAoE,CAAC;IACrF,MAAM,IAAI,GAAG,GAAG,EAAE,IAAI,IAAI,CAAC,OAAO,GAAG,CAAC,EAAE,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IAC5E,MAAM,KAAK,GAAG,IAAI,IAAI,GAAG,EAAE,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,IAAI,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;IAC1F,MAAM,OAAO,GAAG,CAAC,KAAK,EAAE,OAAO,GAAG,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,EAAE,KAAK,CAAC;SAClF,MAAM,CAAC,OAAO,CAAC;SACf,IAAI,CAAC,IAAI,CAAC,CAAC;IACd,GAAG,CAAC,MAAM,EAAE,WAAW,CACrB;QACE,IAAI,EAAE,WAAW;QACjB,KAAK,EAAE;YACL,KAAK,EAAE,OAAO;YACd,OAAO,EAAE,OAAO,IAAI,SAAS;YAC7B,aAAa,EAAE,SAAS;YACxB,aAAa,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,GAAG,EAAE;YACtE,KAAK;SACN;KACF,EACD,GAAG,CACJ,CAAC;AACJ,CAAC;AAED,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;IACpB,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,YAAY,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,gBAAgB,CAAC,OAA4B,CAAC,CAAC,CAAC;AAChG,CAAC"}

package/dist/injections/sandbox-hmr-socket-relay.d.ts

@@ -1,2 +1,7 @@
+type HotEvents = {
+    on: (event: string, cb: (payload?: unknown) => unknown) => void;
+};
+export declare const PREVIEW_FE_VERSION_PARAM = "previewFE_version";
+export declare function attachHmrSocketRelay(hot: HotEvents, win?: Window): void;
 export {};
 //# sourceMappingURL=sandbox-hmr-socket-relay.d.ts.map

package/dist/injections/sandbox-hmr-socket-relay.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sandbox-hmr-socket-relay.d.ts","sourceRoot":"","sources":["../../src/injections/sandbox-hmr-socket-relay.ts"],"names":[],"mappings":"AAyBA,OAAO,EAAE,CAAC"}
+{"version":3,"file":"sandbox-hmr-socket-relay.d.ts","sourceRoot":"","sources":["../../src/injections/sandbox-hmr-socket-relay.ts"],"names":[],"mappings":"AAQA,KAAK,SAAS,GAAG;IACf,EAAE,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,OAAO,KAAK,OAAO,KAAK,IAAI,CAAC;CACjE,CAAC;AAIF,eAAO,MAAM,wBAAwB,sBAAsB,CAAC;AAE5D,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,SAAS,EAAE,GAAG,GAAE,MAAe,QAkBxE"}

package/dist/injections/sandbox-hmr-socket-relay.js

@@ -1,24 +1,28 @@
 /// <reference types="vite/client" />
-// The preview proxy's bridge watches the HMR socket by importing /@vite/client,
-// which bundled dev mode does not serve. This module ships inside the bundle and
-// reports the same events; the bridge skips its own attach when it sees the flag.
-window.__base44_bundled_dev__ = true;
-if (import.meta.hot && window.self !== window.top) {
-    const previewFEVersion = Number(new URLSearchParams(window.location.search).get("previewFE_version")) || 0;
-    import.meta.hot.on("vite:ws:connect", () => {
-        window.parent?.postMessage({ type: "SANDBOX_WS_CONNECT" }, "*");
+// Query param the editor adds to the preview URL when it can swap in a fresh
+// iframe on a full reload (mirrors builder_bridge_inject.py in base44-dev/apper).
+export const PREVIEW_FE_VERSION_PARAM = "previewFE_version";
+export function attachHmrSocketRelay(hot, win = window) {
+    win.__base44_bundled_dev__ = true;
+    if (win.self === win.top)
+        return;
+    const previewFEVersion = Number(new URLSearchParams(win.location.search).get(PREVIEW_FE_VERSION_PARAM)) || 0;
+    hot.on("vite:ws:connect", () => {
+        win.parent?.postMessage({ type: "SANDBOX_WS_CONNECT" }, "*");
     });
-    import.meta.hot.on("vite:ws:disconnect", () => {
-        window.parent?.postMessage({ type: "SANDBOX_WS_DISCONNECT" }, "*");
+    hot.on("vite:ws:disconnect", () => {
+        win.parent?.postMessage({ type: "SANDBOX_WS_DISCONNECT" }, "*");
     });
-    // Vite awaits these listeners before reloading; a pending promise lets the
-    // editor swap in a fresh iframe instead of reloading in place.
-    import.meta.hot.on("vite:beforeFullReload", () => {
-        window.parent?.postMessage({ type: "sandbox:beforeFullReload" }, "*");
-        if (previewFEVersion > 0)
-            return new Promise(() => { });
-        return undefined;
+    // Vite's bundled client awaits `vite:beforeFullReload` listeners before it
+    // reloads (verified against vite 8.2 bundledDevClient), so a never-settling
+    // promise holds the reload and lets the editor swap in a fresh iframe instead.
+    hot.on("vite:beforeFullReload", () => {
+        win.parent?.postMessage({ type: "sandbox:beforeFullReload" }, "*");
+        return previewFEVersion > 0 ? new Promise(() => { }) : undefined;
     });
 }
-export {};
+// The socket opens asynchronously, after the whole bundle has evaluated, so the
+// listeners above are always registered before the first connect event.
+if (import.meta.hot)
+    attachHmrSocketRelay(import.meta.hot);
 //# sourceMappingURL=sandbox-hmr-socket-relay.js.map

package/dist/injections/sandbox-hmr-socket-relay.js.map

@@ -1 +1 @@
-{"version":3,"file":"sandbox-hmr-socket-relay.js","sourceRoot":"","sources":["../../src/injections/sandbox-hmr-socket-relay.ts"],"names":[],"mappings":"AAAA,qCAAqC;AAErC,gFAAgF;AAChF,iFAAiF;AACjF,kFAAkF;AACjF,MAA6C,CAAC,sBAAsB,GAAG,IAAI,CAAC;AAE7E,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,MAAM,CAAC,IAAI,KAAK,MAAM,CAAC,GAAG,EAAE,CAAC;IAClD,MAAM,gBAAgB,GACpB,MAAM,CAAC,IAAI,eAAe,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC,IAAI,CAAC,CAAC;IACpF,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,iBAAiB,EAAE,GAAG,EAAE;QACzC,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,EAAE,IAAI,EAAE,oBAAoB,EAAE,EAAE,GAAG,CAAC,CAAC;IAClE,CAAC,CAAC,CAAC;IACH,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,oBAAoB,EAAE,GAAG,EAAE;QAC5C,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,EAAE,IAAI,EAAE,uBAAuB,EAAE,EAAE,GAAG,CAAC,CAAC;IACrE,CAAC,CAAC,CAAC;IACH,2EAA2E;IAC3E,+DAA+D;IAC/D,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,uBAAuB,EAAE,GAAG,EAAE;QAC/C,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,EAAE,IAAI,EAAE,0BAA0B,EAAE,EAAE,GAAG,CAAC,CAAC;QACtE,IAAI,gBAAgB,GAAG,CAAC;YAAE,OAAO,IAAI,OAAO,CAAO,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QAC7D,OAAO,SAAS,CAAC;IACnB,CAAC,CAAC,CAAC;AACL,CAAC;AAED,OAAO,EAAE,CAAC"}
+{"version":3,"file":"sandbox-hmr-socket-relay.js","sourceRoot":"","sources":["../../src/injections/sandbox-hmr-socket-relay.ts"],"names":[],"mappings":"AAAA,qCAAqC;AAYrC,6EAA6E;AAC7E,kFAAkF;AAClF,MAAM,CAAC,MAAM,wBAAwB,GAAG,mBAAmB,CAAC;AAE5D,MAAM,UAAU,oBAAoB,CAAC,GAAc,EAAE,MAAc,MAAM;IACtE,GAA0C,CAAC,sBAAsB,GAAG,IAAI,CAAC;IAC1E,IAAI,GAAG,CAAC,IAAI,KAAK,GAAG,CAAC,GAAG;QAAE,OAAO;IACjC,MAAM,gBAAgB,GACpB,MAAM,CAAC,IAAI,eAAe,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC,IAAI,CAAC,CAAC;IACtF,GAAG,CAAC,EAAE,CAAC,iBAAiB,EAAE,GAAG,EAAE;QAC7B,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,EAAE,IAAI,EAAE,oBAAoB,EAAE,EAAE,GAAG,CAAC,CAAC;IAC/D,CAAC,CAAC,CAAC;IACH,GAAG,CAAC,EAAE,CAAC,oBAAoB,EAAE,GAAG,EAAE;QAChC,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,EAAE,IAAI,EAAE,uBAAuB,EAAE,EAAE,GAAG,CAAC,CAAC;IAClE,CAAC,CAAC,CAAC;IACH,2EAA2E;IAC3E,4EAA4E;IAC5E,+EAA+E;IAC/E,GAAG,CAAC,EAAE,CAAC,uBAAuB,EAAE,GAAG,EAAE;QACnC,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,EAAE,IAAI,EAAE,0BAA0B,EAAE,EAAE,GAAG,CAAC,CAAC;QACnE,OAAO,gBAAgB,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,OAAO,CAAO,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IACxE,CAAC,CAAC,CAAC;AACL,CAAC;AAED,gFAAgF;AAChF,wEAAwE;AACxE,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG;IAAE,oBAAoB,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@base44-preview/vite-plugin",
-  "version": "1.0.37-pr.121.de0cee3",
+  "version": "1.0.38-pr.121.f18ee18",
   "description": "The Vite plugin for base44 based applications",
   "type": "module",
   "license": "MIT",

package/src/base44-runtime-plugin.ts

@@ -0,0 +1,103 @@
+import type { Plugin } from "vite";
+
+/**
+ * Serves `base44:runtime` to full-stack server routes, so a route reads secrets
+ * and schedules background work with the SAME import a backend function uses:
+ *
+ *   import { secrets, waitUntil } from "base44:runtime";
+ *
+ * WHY A BUILD-TIME VIRTUAL MODULE. The Workers runtime cannot resolve a custom
+ * scheme: the legacy module registry special-cases only `node:` / `cloudflare:` /
+ * `workerd:`, and the new registry (`new_module_registry`) explicitly rejects a
+ * bundle module whose name carries a non-`file:` scheme. Import maps are not
+ * supported either. So `base44:runtime` has to be resolved before upload — there
+ * is no runtime path to it, and no amount of wrapping the deployed entry creates
+ * one.
+ *
+ * WHY NO ASYNCLOCALSTORAGE / NO WRAPPER ENTRY. Cloudflare now ships both
+ * primitives ambiently from `cloudflare:workers` (`env` since 2025-03-17,
+ * `waitUntil` since 2025-08-08), backed by workerd's own AsyncContextFrame and
+ * IoContext. The backend-function bundler predates that and threads a context
+ * through `globalThis.Base44` because it owns the generated entry; here the
+ * framework owns the entry, and borrowing the platform's ambient accessors means
+ * we never have to.
+ */
+
+const SPECIFIER = "base44:runtime";
+// Rollup convention: a resolved virtual id starts with NUL so no other plugin
+// (and no filesystem lookup) tries to claim it.
+const RESOLVED = "\0base44:runtime";
+
+// Reserved so a route importing it fails with an explanation instead of a bare
+// "failed to resolve import". Actors are never imported — they live in the app's
+// actors directory, in server routes exactly as in backend functions.
+const ACTORS_REASON =
+  "Actors are defined in the app's actors directory, not imported into a route.";
+
+function unsupportedReason(id: string): string | null {
+  if (id === "base44:runtime/actors") return ACTORS_REASON;
+  return null;
+}
+
+/**
+ * `cloudflare:workers` stays external — workerd provides it, and Nitro's
+ * cloudflare preset already treats `cloudflare:*` that way.
+ *
+ * There is deliberately no separate dev body. Nitro's `cloudflareDev` preset
+ * (aliased for `cloudflare-module`, which is what these apps build with) sets
+ * `devServer.runner: "miniflare"`, so dev runs in workerd too and the same
+ * import resolves there. A `process.env` fallback would buy nothing and cost a
+ * dev/prod behaviour split — the shape that makes background work silently
+ * vanish locally while working in production. If someone overrides the runner
+ * away from workerd, this fails loudly at resolution rather than quietly
+ * serving a different value.
+ *
+ * `waitUntil` is WRAPPED rather than re-exported: ours returns the promise so it
+ * composes (`infra/base44-userapp-bundler/src/runtime/index.ts` in apper),
+ * Cloudflare's returns void. A bare re-export would make `const p = waitUntil(x)`
+ * work in a backend function and silently yield `undefined` here — one specifier
+ * with two behaviours is the exact failure this module exists to prevent.
+ */
+const RUNTIME_MODULE = `
+import { env, waitUntil as cfWaitUntil } from "cloudflare:workers";
+
+export function waitUntil(promise) {
+  cfWaitUntil(promise);
+  return promise;
+}
+
+export const secrets = {
+  get(name) {
+    const value = env[name];
+    return typeof value === "string" ? value : undefined;
+  },
+};
+`;
+
+export function base44RuntimePlugin(): Plugin {
+  return {
+    name: "base44-runtime",
+    // Ahead of Vite's own resolution so the bare `base44:` specifier is never
+    // mistaken for a URL protocol.
+    enforce: "pre",
+
+    resolveId(id) {
+      const reason = unsupportedReason(id);
+      if (reason) {
+        this.error(`"${id}" is not available in server routes. ${reason}`);
+      }
+      if (id !== SPECIFIER) return null;
+
+      // `cloudflare:workers` has no browser equivalent, so a client-side import
+      // would bundle a module that cannot run. Fail with the reason instead.
+      if (this.environment?.name === "client") {
+        this.error(`"${SPECIFIER}" is server-only. Move this import into a server route.`);
+      }
+      return RESOLVED;
+    },
+
+    load(id) {
+      return id === RESOLVED ? RUNTIME_MODULE : null;
+    },
+  };
+}

package/src/build-status-plugin.ts

@@ -1,4 +1,4 @@
-import type { Connect, Plugin, ViteDevServer } from "vite";
+import type { Connect, Logger, Plugin, ViteDevServer } from "vite";
 import type { ServerResponse } from "http";
 import { isBundledDev } from "./bundled-dev.js";
 
@@ -21,11 +21,11 @@ import { isBundledDev } from "./bundled-dev.js";
  * The status is always reported in the body with HTTP `200`, even on error:
  * a `500` here would trip the preview proxy's own error path.
  *
- * Cold-start caveat: errors thrown before any client has connected are not
- * sent over the HMR channel, so a boot-time transform failure may briefly
- * read `ok: true`. That window is covered server-side by the existing
- * dev_server_error_classifier. This endpoint reports post-load
- * HMR / compile errors.
+ * Cold-start caveat (middleware dev server): errors thrown before any client
+ * has connected are not sent over the HMR channel, so a boot-time transform
+ * failure may briefly read `ok: true`. That window is covered server-side by
+ * the existing dev_server_error_classifier. Under bundled dev the build hooks
+ * and logger below observe boot failures too.
  */
 
 const ENDPOINT = "/__build_status";
@@ -37,6 +37,18 @@ const MAX_FRAME = 2000;
 
 type SendChannel = { send: (...args: unknown[]) => void };
 
+const PATCHED = Symbol.for("base44.buildStatus.loggerPatched");
+type PatchableLogger = Omit<Logger, "error"> & {
+  error: Logger["error"] & { [PATCHED]?: boolean };
+};
+
+// Plugin hooks run once per environment in bundled dev; only the client's
+// build is the preview. Older Vite has no `this.environment`.
+function isClientEnvironment(ctx: unknown): boolean {
+  const name = (ctx as { environment?: { name?: string } } | undefined)?.environment?.name;
+  return name === undefined || name === "client";
+}
+
 const LOOPBACK_ADDRESSES = new Set([
   "127.0.0.1",
   "::1",
@@ -131,29 +143,41 @@ export function buildStatusPlugin(): Plugin {
     configResolved(config) {
       bundled = isBundledDev(config);
     },
-    // Bundled dev runs the rolldown build hooks on every rebuild; a build that
-    // reaches generateBundle superseded whatever error was recorded before.
+    // Bundled dev runs the rolldown build hooks on every rebuild of the client
+    // environment; a build that reaches generateBundle superseded whatever error
+    // was recorded before. Other environments' builds say nothing about the preview.
     buildEnd(error) {
-      if (bundled && error) lastError = error;
+      if (bundled && error && isClientEnvironment(this)) lastError = error;
     },
     generateBundle() {
-      if (bundled) lastError = null;
+      if (bundled && isClientEnvironment(this)) lastError = null;
     },
     configureServer(server: ViteDevServer) {
-      try {
-        if (bundled) {
-          // Bundled dev reports build failures through the environment logger
-          // (`{ error }` option) and per-client sends, never the broadcast
-          // channel patched below.
-          const logger = server.environments.client.logger;
-          const origError = logger.error.bind(logger);
-          logger.error = (msg, options) => {
-            if (options?.error) lastError = options.error;
-            return origError(msg, options);
-          };
+      if (bundled) {
+        // Bundled dev reports build failures through the environment logger
+        // (`{ error }` option) and per-client sends, never the broadcast
+        // channel patched below. Any logged `{ error }` counts until the next
+        // successful build: the fail-safe direction for a health endpoint.
+        // Kept out of the endpoint's try so a logger surprise never unmounts it.
+        try {
+          const logger = server.environments.client.logger as PatchableLogger;
+          if (!logger.error[PATCHED]) {
+            const origError = logger.error.bind(logger);
+            const patched: PatchableLogger["error"] = (msg, options) => {
+              if (options?.error) lastError = options.error;
+              return origError(msg, options);
+            };
+            patched[PATCHED] = true;
+            logger.error = patched;
+          }
+        } catch {
+          // Build failures then surface only via buildEnd; the endpoint still mounts.
         }
+      }
+      try {
         // Observe the HMR channel: an `error` payload records the last
-        // error; a successful `update` / `full-reload` clears it.
+        // error; a successful `update` / `full-reload` clears it. Left on in
+        // bundled dev too: nothing is broadcast there, so it is inert.
         const ch = (server.hot ?? server.ws) as unknown as SendChannel | undefined;
         if (ch && typeof ch.send === "function") {
           const orig = ch.send.bind(ch);

package/src/bundled-dev.ts

@@ -9,5 +9,5 @@
 export function isBundledDev(config: unknown): boolean {
   const experimental = (config as { experimental?: { bundledDev?: unknown } } | undefined)
     ?.experimental;
-  return experimental?.bundledDev === true;
+  return Boolean(experimental?.bundledDev);
 }

package/src/error-overlay-plugin.ts

@@ -17,6 +17,17 @@ export function errorOverlayPlugin() {
     // Vite's overlay off and let sandbox-build-error-notifier forward the error.
     config: (config) =>
       isBundledDev(config) ? { server: { hmr: { overlay: false } } } : null,
+    // `config` sees only the user config; a later plugin or CLI flag can still
+    // turn bundled dev on, leaving Vite's overlay up next to the notifier.
+    configResolved(config) {
+      const hmr = config.server.hmr;
+      if (isBundledDev(config) && hmr !== false && (hmr === true || hmr?.overlay !== false)) {
+        console.warn(
+          "[error-overlay] Bundled dev mode is on but server.hmr.overlay is not false — " +
+            "Vite's own overlay will show alongside the app_error sent to the parent."
+        );
+      }
+    },
     transform(code, id, opts = {}) {
       if (opts?.ssr) return;
 

package/src/html-injections-plugin.ts

@@ -1,13 +1,14 @@
 import { createReadStream, existsSync, statSync } from "node:fs";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
-import type { Plugin, HtmlTagDescriptor, ViteDevServer } from "vite";
+import type { ServerResponse } from "node:http";
+import type { Connect, Plugin, HtmlTagDescriptor, ViteDevServer } from "vite";
 import { loadEnv } from "vite";
 import { isBundledDev } from "./bundled-dev.js";
 
 type Injection = {
-  /** Script src path for dev mode (served from node_modules) */
-  src?: string;
+  /** Script path under this package's dist/, served from node_modules in dev. */
+  file?: string;
   injectTo: "head" | "body";
   mode: "dev" | "production";
   /** Inline content for production builds (src paths don't work in built output) */
@@ -50,36 +51,42 @@ if (window.self === window.top) {
 `;
 
 const DIST_URL_PREFIX = "/node_modules/@base44/vite-plugin/dist";
+/**
+ * Bundled dev resolves module-script `src` through the bundler instead of the
+ * dev server, so a node_modules URL would break on any non-flat install. These
+ * ids are mapped onto the plugin's own dist tree by `resolveId` below.
+ */
+export const BUNDLED_INJECTION_PREFIX = "virtual:base44-vite-plugin/";
 
 const INJECTIONS: Record<string, Injection> = {
   unhandledErrors: {
-    src: `${DIST_URL_PREFIX}/injections/unhandled-errors-handlers.js`,
+    file: "injections/unhandled-errors-handlers.js",
     injectTo: "head",
     mode: "dev",
   },
   sandboxMount: {
-    src: `${DIST_URL_PREFIX}/injections/sandbox-mount-observer.js`,
+    file: "injections/sandbox-mount-observer.js",
     injectTo: "body",
     mode: "dev",
   },
   hmrNotifier: {
-    src: `${DIST_URL_PREFIX}/injections/sandbox-hmr-notifier.js`,
+    file: "injections/sandbox-hmr-notifier.js",
     injectTo: "head",
     mode: "dev",
   },
   navigationNotifier: {
-    src: `${DIST_URL_PREFIX}/injections/navigation-notifier.js`,
+    file: "injections/navigation-notifier.js",
     injectTo: "head",
     mode: "dev",
   },
   buildErrorNotifier: {
-    src: `${DIST_URL_PREFIX}/injections/sandbox-build-error-notifier.js`,
+    file: "injections/sandbox-build-error-notifier.js",
     injectTo: "head",
     mode: "dev",
     bundledOnly: true,
   },
   hmrSocketRelay: {
-    src: `${DIST_URL_PREFIX}/injections/sandbox-hmr-socket-relay.js`,
+    file: "injections/sandbox-hmr-socket-relay.js",
     injectTo: "head",
     mode: "dev",
     bundledOnly: true,
@@ -99,6 +106,12 @@ const CONTENT_TYPES: Record<string, string> = {
 
 /** This file lives in dist/ once built, so its directory is the served root. */
 export const PLUGIN_DIST_DIR = path.dirname(fileURLToPath(import.meta.url));
+const VISUAL_EDIT_AGENT_FILE = "statics/index.mjs";
+
+export function resolveBundledInjection(id: string, distDir = PLUGIN_DIST_DIR): string | undefined {
+  if (!id.startsWith(BUNDLED_INJECTION_PREFIX)) return undefined;
+  return path.join(distDir, id.slice(BUNDLED_INJECTION_PREFIX.length));
+}
 
 /**
  * Bundled dev mounts no static/transform middleware, so the visual-edit agent's
@@ -106,14 +119,16 @@ export const PLUGIN_DIST_DIR = path.dirname(fileURLToPath(import.meta.url));
  * fallback and receive index.html. Serve the plugin's own dist tree instead.
  */
 export function serveDistMiddleware(distDir: string) {
-  return (
-    req: { url?: string | undefined },
-    res: { statusCode: number; setHeader: (k: string, v: string) => void; end: (b?: string) => void },
-    next: (err?: unknown) => void
-  ) => {
+  return (req: Connect.IncomingMessage, res: ServerResponse, next: Connect.NextFunction) => {
     const url = (req.url ?? "").split("?")[0] ?? "";
     if (!url.startsWith(`${DIST_URL_PREFIX}/`)) return next();
-    const relative = decodeURIComponent(url.slice(DIST_URL_PREFIX.length + 1));
+    if (req.method !== "GET" && req.method !== "HEAD") return next();
+    let relative: string;
+    try {
+      relative = decodeURIComponent(url.slice(DIST_URL_PREFIX.length + 1));
+    } catch {
+      return next();
+    }
     const filePath = path.resolve(distDir, relative);
     const type = CONTENT_TYPES[path.extname(filePath)];
     if (
@@ -127,7 +142,8 @@ export function serveDistMiddleware(distDir: string) {
     res.statusCode = 200;
     res.setHeader("Content-Type", type);
     res.setHeader("Cache-Control", "no-store");
-    createReadStream(filePath).pipe(res as unknown as NodeJS.WritableStream);
+    // Headers are already out, so a read failure can only end the response.
+    createReadStream(filePath).on("error", () => res.end()).pipe(res);
   };
 }
 
@@ -142,6 +158,9 @@ export function htmlInjectionsPlugin({
   visualEditAgent: boolean;
   analyticsTracker: boolean;
 }): Plugin[] {
+  // The two bundled-only scripts stand in for things that are unconditional in
+  // the middleware server (the error overlay swap and the preview bridge's
+  // `/@vite/client` import), so they do not follow the opt-in toggles.
   const enabledInjections: Record<string, boolean> = {
     unhandledErrors: true,
     sandboxMount: true,
@@ -152,6 +171,8 @@ export function htmlInjectionsPlugin({
     analyticsTracker,
   };
 
+  // Written by `dev.configResolved`; the three plugins below are always
+  // registered together and read this shared state.
   let resolvedEnv: Record<string, string> = {};
   let isServe = false;
   let bundled = false;
@@ -178,9 +199,12 @@ export function htmlInjectionsPlugin({
             injectTo: injection.injectTo,
           };
         }
+        const src = bundled
+          ? `${BUNDLED_INJECTION_PREFIX}${injection.file}`
+          : `${DIST_URL_PREFIX}/${injection.file}`;
         return {
           tag: "script",
-          attrs: { src: injection.src, type: "module" },
+          attrs: { src, type: "module" },
           injectTo: injection.injectTo,
         };
       });
@@ -221,6 +245,12 @@ export function htmlInjectionsPlugin({
     },
     configureServer(server: ViteDevServer) {
       if (!bundled) return;
+      if (visualEditAgent && !existsSync(path.join(PLUGIN_DIST_DIR, VISUAL_EDIT_AGENT_FILE))) {
+        console.warn(
+          `[html-injections] ${VISUAL_EDIT_AGENT_FILE} not found under ${PLUGIN_DIST_DIR}; ` +
+            "the visual edit agent will not load in bundled dev mode."
+        );
+      }
       server.middlewares.use(serveDistMiddleware(PLUGIN_DIST_DIR));
     },
     transformIndexHtml: {
@@ -236,6 +266,9 @@ export function htmlInjectionsPlugin({
   // injecting after its own HTML processing, exactly as before.
   const devBundled: Plugin = {
     name: "html-injections-bundled",
+    resolveId(id) {
+      return resolveBundledInjection(id);
+    },
     transformIndexHtml: {
       order: "pre",
       handler() {

package/src/index.ts

@@ -6,6 +6,7 @@ import { visualEditPlugin } from "./visual-edit-plugin.js";
 import { filterPackagesInProject } from "./utils.js";
 import { htmlInjectionsPlugin } from "./html-injections-plugin.js";
 import { buildStatusPlugin } from "./build-status-plugin.js";
+import { base44RuntimePlugin } from "./base44-runtime-plugin.js";
 
 const isRunningInSandbox = !!process.env.MODAL_SANDBOX_ID;
 
@@ -288,5 +289,10 @@ export default function vitePlugin(
     ...(process.env.BASE44_BUILD_STATUS_ENABLED === "1"
       ? [buildStatusPlugin()]
       : []),
+    // Serves `base44:runtime` to full-stack server routes. Unconditional: it
+    // only claims the `base44:` specifiers, so an app with no server dir never
+    // notices it. Ordering comes from its own `enforce: "pre"`, not from its
+    // position here — several tests index this array from the front.
+    base44RuntimePlugin(),
   ];
 }

package/src/injections/sandbox-build-error-notifier.ts

@@ -3,31 +3,34 @@
 // Bundled dev mode keeps Vite's own client, so the ErrorOverlay swap in
 // error-overlay-plugin never runs. The overlay is disabled server-side instead
 // and build errors are forwarded here in the same `app_error` shape.
-if (import.meta.hot) {
-  import.meta.hot.on("vite:error", (payload: { err?: Record<string, unknown> }) => {
-    const err = payload?.err ?? {};
-    const message = typeof err.message === "string" ? err.message : "Build error";
-    const stack = typeof err.stack === "string" ? err.stack : undefined;
-    const loc = err.loc as { file?: string; line?: number; column?: number } | undefined;
-    const file = loc?.file ?? (typeof err.id === "string" ? err.id : undefined);
-    const where = file && loc?.line != null ? `${file}:${loc.line}:${loc.column ?? 0}` : file;
-    const details = [where, typeof err.frame === "string" ? err.frame : undefined, stack]
-      .filter(Boolean)
-      .join("\n");
-    window.parent?.postMessage(
-      {
-        type: "app_error",
-        error: {
-          title: message,
-          details: details || undefined,
-          componentName: undefined,
-          originalError: { message, stack, plugin: err.plugin, id: err.id, loc },
-          stack,
-        },
+
+type BuildErrorPayload = { err?: Record<string, unknown> } | undefined;
+
+export function reportBuildError(payload: BuildErrorPayload, win: Window = window) {
+  const err = payload?.err ?? {};
+  const message = typeof err.message === "string" ? err.message : "Build error";
+  const stack = typeof err.stack === "string" ? err.stack : undefined;
+  const loc = err.loc as { file?: string; line?: number; column?: number } | undefined;
+  const file = loc?.file ?? (typeof err.id === "string" ? err.id : undefined);
+  const where = file && loc?.line != null ? `${file}:${loc.line}:${loc.column ?? 0}` : file;
+  const details = [where, typeof err.frame === "string" ? err.frame : undefined, stack]
+    .filter(Boolean)
+    .join("\n");
+  win.parent?.postMessage(
+    {
+      type: "app_error",
+      error: {
+        title: message,
+        details: details || undefined,
+        componentName: undefined,
+        originalError: { message, stack, plugin: err.plugin, id: err.id, loc },
+        stack,
       },
-      "*"
-    );
-  });
+    },
+    "*"
+  );
 }
 
-export {};
+if (import.meta.hot) {
+  import.meta.hot.on("vite:error", (payload) => reportBuildError(payload as BuildErrorPayload));
+}

package/src/injections/sandbox-hmr-socket-relay.ts

@@ -2,25 +2,38 @@
 
 // The preview proxy's bridge watches the HMR socket by importing /@vite/client,
 // which bundled dev mode does not serve. This module ships inside the bundle and
-// reports the same events; the bridge skips its own attach when it sees the flag.
-(window as unknown as Record<string, unknown>).__base44_bundled_dev__ = true;
+// reports the same events. The flag below is set only once the bundle runs, so
+// the bridge (builder_bridge_inject.py) polls it for a while after its import
+// fails before reporting the socket as unreachable.
 
-if (import.meta.hot && window.self !== window.top) {
+type HotEvents = {
+  on: (event: string, cb: (payload?: unknown) => unknown) => void;
+};
+
+// Query param the editor adds to the preview URL when it can swap in a fresh
+// iframe on a full reload (mirrors builder_bridge_inject.py in base44-dev/apper).
+export const PREVIEW_FE_VERSION_PARAM = "previewFE_version";
+
+export function attachHmrSocketRelay(hot: HotEvents, win: Window = window) {
+  (win as unknown as Record<string, unknown>).__base44_bundled_dev__ = true;
+  if (win.self === win.top) return;
   const previewFEVersion =
-    Number(new URLSearchParams(window.location.search).get("previewFE_version")) || 0;
-  import.meta.hot.on("vite:ws:connect", () => {
-    window.parent?.postMessage({ type: "SANDBOX_WS_CONNECT" }, "*");
+    Number(new URLSearchParams(win.location.search).get(PREVIEW_FE_VERSION_PARAM)) || 0;
+  hot.on("vite:ws:connect", () => {
+    win.parent?.postMessage({ type: "SANDBOX_WS_CONNECT" }, "*");
   });
-  import.meta.hot.on("vite:ws:disconnect", () => {
-    window.parent?.postMessage({ type: "SANDBOX_WS_DISCONNECT" }, "*");
+  hot.on("vite:ws:disconnect", () => {
+    win.parent?.postMessage({ type: "SANDBOX_WS_DISCONNECT" }, "*");
   });
-  // Vite awaits these listeners before reloading; a pending promise lets the
-  // editor swap in a fresh iframe instead of reloading in place.
-  import.meta.hot.on("vite:beforeFullReload", () => {
-    window.parent?.postMessage({ type: "sandbox:beforeFullReload" }, "*");
-    if (previewFEVersion > 0) return new Promise<void>(() => {});
-    return undefined;
+  // Vite's bundled client awaits `vite:beforeFullReload` listeners before it
+  // reloads (verified against vite 8.2 bundledDevClient), so a never-settling
+  // promise holds the reload and lets the editor swap in a fresh iframe instead.
+  hot.on("vite:beforeFullReload", () => {
+    win.parent?.postMessage({ type: "sandbox:beforeFullReload" }, "*");
+    return previewFEVersion > 0 ? new Promise<void>(() => {}) : undefined;
   });
 }
 
-export {};
+// The socket opens asynchronously, after the whole bundle has evaluated, so the
+// listeners above are always registered before the first connect event.
+if (import.meta.hot) attachHmrSocketRelay(import.meta.hot);