@jami-studio/core 0.92.31 → 0.92.33

package/dist/deploy/build.js

@@ -421,19 +421,19 @@ export const CLOUDFLARE_WORKER_NODE_BUILTIN_STUB_MODULES = {
         "export const createRequire = () => globalThis.require ?? ((specifier) => { throw new Error('Cannot require: ' + specifier); });",
     ]),
     net: cloudflareNodeBuiltinStubSource("net", ["Socket", "connect", "createConnection", "createServer", "isIP"], [
-        `export const isIP = (value) => {
-  const input = String(value ?? "");
-  const ipv4Parts = input.split(".");
-  if (
-    ipv4Parts.length === 4 &&
-    ipv4Parts.every((part) => /^\\d{1,3}$/.test(part) && Number(part) >= 0 && Number(part) <= 255)
-  ) {
-    return 4;
-  }
-  if (input.includes(":") && /^[0-9A-Fa-f:.]+$/.test(input)) {
-    return 6;
-  }
-  return 0;
+        `export const isIP = (value) => {
+  const input = String(value ?? "");
+  const ipv4Parts = input.split(".");
+  if (
+    ipv4Parts.length === 4 &&
+    ipv4Parts.every((part) => /^\\d{1,3}$/.test(part) && Number(part) >= 0 && Number(part) <= 255)
+  ) {
+    return 4;
+  }
+  if (input.includes(":") && /^[0-9A-Fa-f:.]+$/.test(input)) {
+    return 6;
+  }
+  return 0;
 };`,
     ]),
     os: cloudflareNodeBuiltinStubSource("os", [
@@ -522,15 +522,108 @@ export const CLOUDFLARE_WORKER_NODE_BUILTIN_STUB_MODULES = {
  * unified workspace deployments. Must stay dependency-free beyond core's
  * lean `global-scope` subpath so nothing registry-touching evaluates before
  * the scope id is set (ESM evaluates imports depth-first in order).
+ *
+ * Two kinds of baked env, split deliberately (issue-49 regression lesson):
+ *
+ * - `envDefaults` — workspace-IDENTICAL keys (the workspace-apps manifest,
+ *   the workspace flag). These are safe as `process.env` DEFAULTS even
+ *   though the unified worker shares one `process.env` across all apps,
+ *   because every app bakes the same value. Runtime bindings still win
+ *   (defaults only fill absent keys; the per-request bindings copy assigns
+ *   binding keys on top).
+ *
+ * - `moduleGraphEnvDefaults` — PER-APP keys (app id, base path, audience,
+ *   public/protected route lists). These must NEVER touch the shared
+ *   `process.env`: the first app's scope-init would win and poison every
+ *   sibling (observed live: all apps stripped paths against dispatch's
+ *   base path and 401'd framework routes). They are stored per module
+ *   graph via `setModuleGraphEnvDefaults`, and env readers fall back to
+ *   `getModuleGraphEnvDefault`.
+ *
+ * workerd has no filesystem and no ambient build env, so without this the
+ * runtime falls back as if the app were standalone — agent discovery
+ * targets builtin hosted prod URLs (ask_app "internal error") and per-app
+ * route access/audience declarations never apply. The Netlify preset bakes
+ * the same keys in its generated function entry (`setBasePathEnv`), where
+ * per-function isolation makes plain env safe.
  */
-export function generateScopeInitSource(appScopeId) {
-    return `// AUTO-GENERATED by @agent-native/core deploy build
-// Scope globalThis-pinned framework registries to this app's module graph.
-// Evaluated FIRST in the worker entry's import graph so the scope is set
-// before any registry module initializes. See core shared/global-scope.
-import { setGlobalScopeId } from "@agent-native/core/global-scope";
-setGlobalScopeId(${JSON.stringify(appScopeId)});
-`;
+export function generateScopeInitSource(appScopeId, envDefaults, moduleGraphEnvDefaults) {
+    const sharedEntries = Object.entries(envDefaults ?? {}).filter(([, value]) => typeof value === "string" && value !== "");
+    const perAppEntries = Object.entries(moduleGraphEnvDefaults ?? {}).filter(([, value]) => typeof value === "string" && value !== "");
+    const envBlock = sharedEntries.length
+        ? `
+// Baked workspace-identical env defaults (runtime bindings still win).
+{
+  const processRef = (globalThis.process ??= { env: {} });
+  processRef.env ??= {};
+  const defaults = ${JSON.stringify(Object.fromEntries(sharedEntries))};
+  for (const key of Object.keys(defaults)) {
+    if (processRef.env[key] === undefined) processRef.env[key] = defaults[key];
+  }
+}
+`
+        : "";
+    const moduleGraphBlock = perAppEntries.length
+        ? `setModuleGraphEnvDefaults(${JSON.stringify(Object.fromEntries(perAppEntries))});
+`
+        : "";
+    return `// AUTO-GENERATED by @agent-native/core deploy build
+// Scope globalThis-pinned framework registries to this app's module graph.
+// Evaluated FIRST in the worker entry's import graph so the scope is set
+// before any registry module initializes. See core shared/global-scope.
+import { setGlobalScopeId${perAppEntries.length ? ", setModuleGraphEnvDefaults" : ""} } from "@agent-native/core/global-scope";
+setGlobalScopeId(${JSON.stringify(appScopeId)});
+${moduleGraphBlock}${envBlock}`;
+}
+/**
+ * Snapshot the workspace-IDENTICAL env keys that must survive into the edge
+ * runtime as shared `process.env` defaults. Per-app keys deliberately live
+ * in `workspaceAppModuleGraphEnvDefaultsFromBuildEnv` instead — see
+ * `generateScopeInitSource`.
+ */
+export function workspaceEnvDefaultsFromBuildEnv(env = process.env) {
+    if (env.AGENT_NATIVE_WORKSPACE !== "1")
+        return {};
+    const keys = [
+        "AGENT_NATIVE_WORKSPACE",
+        "AGENT_NATIVE_WORKSPACE_APPS_JSON",
+        "VITE_AGENT_NATIVE_WORKSPACE",
+        "VITE_AGENT_NATIVE_WORKSPACE_APPS_JSON",
+    ];
+    const defaults = {};
+    for (const key of keys) {
+        const value = env[key];
+        if (typeof value === "string" && value !== "")
+            defaults[key] = value;
+    }
+    return defaults;
+}
+/**
+ * Snapshot the PER-APP workspace env keys for this app's module graph.
+ * Delivered via `setModuleGraphEnvDefaults` (never shared `process.env`).
+ */
+export function workspaceAppModuleGraphEnvDefaultsFromBuildEnv(env = process.env) {
+    if (env.AGENT_NATIVE_WORKSPACE !== "1")
+        return {};
+    const keys = [
+        "AGENT_NATIVE_WORKSPACE_APP_ID",
+        "APP_BASE_PATH",
+        "AGENT_NATIVE_WORKSPACE_APP_AUDIENCE",
+        "AGENT_NATIVE_WORKSPACE_APP_PUBLIC_PATHS",
+        "AGENT_NATIVE_WORKSPACE_APP_PROTECTED_PATHS",
+        "VITE_AGENT_NATIVE_WORKSPACE_APP_ID",
+        "VITE_APP_BASE_PATH",
+        "VITE_AGENT_NATIVE_WORKSPACE_APP_AUDIENCE",
+        "VITE_AGENT_NATIVE_WORKSPACE_APP_PUBLIC_PATHS",
+        "VITE_AGENT_NATIVE_WORKSPACE_APP_PROTECTED_PATHS",
+    ];
+    const defaults = {};
+    for (const key of keys) {
+        const value = env[key];
+        if (typeof value === "string" && value !== "")
+            defaults[key] = value;
+    }
+    return defaults;
 }
 /**
  * Derive the workspace app id from a mounted app base path ("/assets" →
@@ -562,16 +655,16 @@ function isNodeOnlyPlugin(filePath) {
 }
 export function generateProvidedPluginsNitroPluginSource(pluginStems) {
     const stems = [...new Set(pluginStems.filter(Boolean))].sort();
-    return `// AUTO-GENERATED by @agent-native/core deploy build
-import { markDefaultPluginProvided } from "${EDGE_SERVER_ENTRYPOINT}";
-
-const pluginStems = ${JSON.stringify(stems)};
-
-export default function markBuildDiscoveredPlugins(nitroApp) {
-  for (const stem of pluginStems) {
-    markDefaultPluginProvided(nitroApp, stem);
-  }
-}
+    return `// AUTO-GENERATED by @agent-native/core deploy build
+import { markDefaultPluginProvided } from "${EDGE_SERVER_ENTRYPOINT}";
+
+const pluginStems = ${JSON.stringify(stems)};
+
+export default function markBuildDiscoveredPlugins(nitroApp) {
+  for (const stem of pluginStems) {
+    markDefaultPluginProvided(nitroApp, stem);
+  }
+}
 `;
 }
 async function writeProvidedPluginsNitroPlugin() {
@@ -624,20 +717,20 @@ export function generateWorkerEntry(routes, pluginPaths, defaultPluginStems = []
         routeImports.push(`import ${varName} from ${JSON.stringify(r.absPath)};`);
         routeRegistrations.push(`  app.on(${JSON.stringify(r.method.toUpperCase())}, ${JSON.stringify(r.route)}, ${varName});`);
         if (r.method.toLowerCase() === "get") {
-            routeRegistrations.push(`  app.on("HEAD", ${JSON.stringify(r.route)}, defineEventHandler(async (event) => {
-    const originalReq = event.req;
-    event.req = requestWithMethod(event.req, "GET");
-    try {
-      const result = await ${varName}(event);
-      const response = result instanceof Response ? result : toResponse(result, event);
-      return new Response(null, {
-        status: response.status,
-        statusText: response.statusText,
-        headers: response.headers,
-      });
-    } finally {
-      event.req = originalReq;
-    }
+            routeRegistrations.push(`  app.on("HEAD", ${JSON.stringify(r.route)}, defineEventHandler(async (event) => {
+    const originalReq = event.req;
+    event.req = requestWithMethod(event.req, "GET");
+    try {
+      const result = await ${varName}(event);
+      const response = result instanceof Response ? result : toResponse(result, event);
+      return new Response(null, {
+        status: response.status,
+        statusText: response.statusText,
+        headers: response.headers,
+      });
+    } finally {
+      event.req = originalReq;
+    }
   }));`);
         }
     }
@@ -650,15 +743,15 @@ export function generateWorkerEntry(routes, pluginPaths, defaultPluginStems = []
         actionImports.push(`import ${varName} from ${JSON.stringify(a.absPath)};`);
         // Mirror the runtime mount (action-routes.ts): `path = http?.path ?? name`.
         const routePath = `/_agent-native/actions/${a.path ?? a.name}`;
-        actionRegistrations.push(`  app.on(${JSON.stringify(a.method.toUpperCase())}, ${JSON.stringify(routePath)}, defineEventHandler(async (event) => {
-    const params = ${a.method === "get" ? "parseActionSearchParams(event.url.searchParams)" : "(await readBody(event)) ?? {}"};
-    try {
-      const result = await ${varName}.run(params, { caller: "http" });
-      if (typeof result === "string") { try { return JSON.parse(result); } catch { return result; } }
-      return result;
-    } catch (err) {
-      return new Response(JSON.stringify({ error: err?.message || "Action failed" }), { status: err?.message?.startsWith("Invalid action parameters") ? 400 : 500, headers: { "Content-Type": "application/json" } });
-    }
+        actionRegistrations.push(`  app.on(${JSON.stringify(a.method.toUpperCase())}, ${JSON.stringify(routePath)}, defineEventHandler(async (event) => {
+    const params = ${a.method === "get" ? "parseActionSearchParams(event.url.searchParams)" : "(await readBody(event)) ?? {}"};
+    try {
+      const result = await ${varName}.run(params, { caller: "http" });
+      if (typeof result === "string") { try { return JSON.parse(result); } catch { return result; } }
+      return result;
+    } catch (err) {
+      return new Response(JSON.stringify({ error: err?.message || "Action failed" }), { status: err?.message?.startsWith("Invalid action parameters") ? 400 : 500, headers: { "Content-Type": "application/json" } });
+    }
   }));`);
     }
     // Filter out Node-only plugins
@@ -670,8 +763,8 @@ export function generateWorkerEntry(routes, pluginPaths, defaultPluginStems = []
         const varName = `plugin_${i}`;
         providedPluginStems.add(path.basename(edgePlugins[i], path.extname(edgePlugins[i])));
         pluginImports.push(`import ${varName} from ${JSON.stringify(edgePlugins[i])};`);
-        pluginCalls.push(`  if (typeof ${varName} === "function") {
-    await ${varName}(nitroApp);
+        pluginCalls.push(`  if (typeof ${varName} === "function") {
+    await ${varName}(nitroApp);
   }`);
     }
     // Auto-mounted default plugins (for slots the template doesn't override
@@ -694,8 +787,8 @@ export function generateWorkerEntry(routes, pluginPaths, defaultPluginStems = []
                 continue;
             pluginImports.push(`import { ${defaultExportName} as ${varName} } from "${EDGE_SERVER_ENTRYPOINT}";`);
         }
-        pluginCalls.push(`  if (typeof ${varName} === "function") {
-    await ${varName}(nitroApp);
+        pluginCalls.push(`  if (typeof ${varName} === "function") {
+    await ${varName}(nitroApp);
   }`);
     }
     const generatedPluginMarks = providedPluginStems.size > 0
@@ -709,523 +802,523 @@ export function generateWorkerEntry(routes, pluginPaths, defaultPluginStems = []
     if (generatedPluginMarks.length > 0) {
         pluginImports.unshift(`import { markDefaultPluginProvided as markGeneratedPluginProvided } from "${EDGE_SERVER_ENTRYPOINT}";`);
     }
-    return `
-// Auto-generated worker entry point for ${preset}
-${appScopeId ? 'import "./_scope-init.js";\n' : ""}import { H3, defineEventHandler, readBody, toResponse } from "h3";
-${includeReactRouterSsr ? 'import { createRequestHandler } from "react-router";' : ""}
-${includeReactRouterSsr ? 'import * as serverBuild from "./server-build.js";' : ""}
-
-function normalizeAppBasePath(value) {
-  if (!value || value === "/") return "";
-  const trimmed = String(value).trim();
-  if (!trimmed || trimmed === "/") return "";
-  return "/" + trimmed.replace(/^\\/+/, "").replace(/\\/+$/, "");
-}
-
-function getAppBasePath() {
-  const builtAppBasePath = ${JSON.stringify(builtAppBasePath)};
-  return normalizeAppBasePath(
-    globalThis.process?.env?.VITE_APP_BASE_PATH ||
-      globalThis.process?.env?.APP_BASE_PATH ||
-      builtAppBasePath,
-  );
-}
-
-function stripAppBasePath(pathname) {
-  const basePath = getAppBasePath();
-  if (!basePath) return pathname;
-  if (pathname === basePath) return "/";
-  if (pathname.startsWith(basePath + "/")) {
-    return pathname.slice(basePath.length) || "/";
-  }
-  return pathname;
-}
-
-function parseActionSearchParams(searchParams) {
-  const params = {};
-  for (const [rawKey, value] of searchParams.entries()) {
-    const isArrayKey = rawKey.endsWith("[]");
-    // The core client serializes arrays as key[]=value so one-item arrays
-    // survive GET action parsing in generated worker deployments.
-    const key = isArrayKey ? rawKey.slice(0, -2) : rawKey;
-    const current = params[key];
-    if (current === undefined) {
-      params[key] = isArrayKey ? [value] : value;
-    } else if (Array.isArray(current)) {
-      current.push(value);
-    } else {
-      params[key] = [current, value];
-    }
-  }
-  return params;
-}
-
-function isApiPath(pathname) {
-  return pathname === "/api" || pathname.startsWith("/api/");
-}
-
-function isFrameworkPath(pathname) {
-  return (
-    pathname === "/_agent-native" || pathname.startsWith("/_agent-native/")
-  );
-}
-
-function requestWithMountedApiPrefixStripped(request) {
-  const basePath = getAppBasePath();
-  if (!basePath) return request;
-  const url = new URL(request.url);
-  const strippedPathname = stripAppBasePath(url.pathname);
-  if (strippedPathname === url.pathname) {
-    return request;
-  }
-  if (!isApiPath(strippedPathname) && !isFrameworkPath(strippedPathname)) {
-    return request;
-  }
-  url.pathname = strippedPathname;
-  return new Request(url, request);
-}
-
-function prefixMountedPath(path, basePath) {
-  if (!basePath || !path.startsWith("/") || path.startsWith("//")) return path;
-  if (path === basePath || path.startsWith(basePath + "/")) return path;
-  return basePath + path;
-}
-
-function prefixMountedHtml(html, basePath) {
-  if (!basePath) return html;
-  return html
-    .replace(
-      /\\b(href|src|action|formaction|poster)=(["'])(\\/(?!\\/)[^"']*)\\2/g,
-      (_match, attr, quote, path) =>
-        attr + "=" + quote + prefixMountedPath(path, basePath) + quote,
-    )
-    .replace(/url\\((["']?)(\\/(?!\\/)[^)'" ]+)\\1\\)/g, (_match, quote, path) => {
-      const q = quote || "";
-      return "url(" + q + prefixMountedPath(path, basePath) + q + ")";
-    });
-}
-
-function firstNonEmpty() {
-  for (const value of arguments) {
-    const trimmed = typeof value === "string" ? value.trim() : "";
-    if (trimmed) return trimmed;
-  }
-}
-
-function getSentryClientConfigScript() {
-  const env = globalThis.process?.env || {};
-  const key = firstNonEmpty(env.SENTRY_CLIENT_KEY, env.VITE_SENTRY_CLIENT_KEY);
-  const projectId = firstNonEmpty(
-    env.SENTRY_PROJECT_ID,
-    env.VITE_SENTRY_PROJECT_ID,
-  );
-  const host = firstNonEmpty(
-    env.SENTRY_INGEST_HOST,
-    env.VITE_SENTRY_INGEST_HOST,
-  );
-  const dsn =
-    firstNonEmpty(
-      env.SENTRY_CLIENT_DSN,
-      env.VITE_SENTRY_CLIENT_DSN,
-      env.VITE_SENTRY_DSN,
-      env.SENTRY_DSN,
-    ) || (key && projectId && host ? "https://" + key + "@" + host + "/" + projectId : undefined);
-  if (!dsn) return null;
-  const config = {
-    sentryDsn: dsn,
-    sentryEnvironment:
-      firstNonEmpty(
-        env.SENTRY_ENVIRONMENT,
-        env.NETLIFY_CONTEXT,
-        env.VERCEL_ENV,
-        env.NODE_ENV,
-      ) || "production",
-  };
-  return (
-    '<script data-agent-native-sentry-config>' +
-    'window.__AGENT_NATIVE_CONFIG__=Object.assign({},window.__AGENT_NATIVE_CONFIG__,' +
-    JSON.stringify(config) +
-    ");</script>"
-  );
-}
-
-function injectHeadScript(html, script) {
-  if (!script) return html;
-  const headCloseIdx = html.indexOf("</head>");
-  if (headCloseIdx === -1) return html;
-  return html.slice(0, headCloseIdx) + script + html.slice(headCloseIdx);
-}
-
-const DEFAULT_SSR_CACHE_CONTROL = ${JSON.stringify(DEFAULT_SSR_CACHE_CONTROL)};
-const DEFAULT_SSR_CDN_CACHE_CONTROL = ${JSON.stringify(DEFAULT_SSR_CDN_CACHE_CONTROL)};
-const DEFAULT_SSR_NETLIFY_CDN_CACHE_CONTROL = ${JSON.stringify(DEFAULT_SSR_NETLIFY_CDN_CACHE_CONTROL)};
-const DEFAULT_SPECULATION_RULES_PATH = ${JSON.stringify(DEFAULT_SPECULATION_RULES_PATH)};
-const IMMUTABLE_ASSET_CACHE_CONTROL = ${JSON.stringify(IMMUTABLE_ASSET_CACHE_CONTROL)};
-const IMMUTABLE_ASSET_PATHS = new Set(${JSON.stringify([...new Set(immutableAssetPaths)].sort())});
-const AGENT_NATIVE_SOCIAL_IMAGE_PATH = ${JSON.stringify(AGENT_NATIVE_SOCIAL_IMAGE_PATH)};
-const AGENT_NATIVE_SOCIAL_IMAGE_CACHE_BUSTER = ${JSON.stringify(AGENT_NATIVE_SOCIAL_IMAGE_CACHE_BUSTER)};
-const AGENT_NATIVE_SOCIAL_IMAGE_ALT = ${JSON.stringify(AGENT_NATIVE_SOCIAL_IMAGE_ALT)};
-const AGENT_NATIVE_SOCIAL_IMAGE_TYPE = ${JSON.stringify(AGENT_NATIVE_SOCIAL_IMAGE_TYPE)};
-const AGENT_NATIVE_SOCIAL_IMAGE_WIDTH = ${JSON.stringify(AGENT_NATIVE_SOCIAL_IMAGE_WIDTH)};
-const AGENT_NATIVE_SOCIAL_IMAGE_HEIGHT = ${JSON.stringify(AGENT_NATIVE_SOCIAL_IMAGE_HEIGHT)};
-const OG_IMAGE_META_RE = /<meta\\b(?=[^>]*\\bproperty=(["'])og:image\\1)[^>]*>/i;
-const TWITTER_CARD_META_RE = /<meta\\b(?=[^>]*\\bname=(["'])twitter:card\\1)[^>]*>/i;
-const TWITTER_IMAGE_META_RE = /<meta\\b(?=[^>]*\\bname=(["'])twitter:image\\1)[^>]*>/i;
-
-function withAgentNativeSocialImageCacheBuster(image) {
-  const separator = image.includes("?") ? "&" : "?";
-  return image + separator + "v=" + encodeURIComponent(AGENT_NATIVE_SOCIAL_IMAGE_CACHE_BUSTER);
-}
-
-function defaultSocialImageUrl(request, basePath) {
-  return withAgentNativeSocialImageCacheBuster(
-    new URL(prefixMountedPath(AGENT_NATIVE_SOCIAL_IMAGE_PATH, basePath), request.url).toString()
-  );
-}
-
-function injectDefaultSocialImageMeta(html, imageUrl) {
-  const headCloseIdx = html.indexOf("</head>");
-  if (headCloseIdx === -1) return html;
-
-  const hasAnySocialImage =
-    OG_IMAGE_META_RE.test(html) || TWITTER_IMAGE_META_RE.test(html);
-  const tags = [];
-
-  if (!hasAnySocialImage) {
-    tags.push('<meta property="og:image" content="' + imageUrl + '">');
-    tags.push('<meta property="og:image:secure_url" content="' + imageUrl + '">');
-    tags.push('<meta property="og:image:type" content="' + AGENT_NATIVE_SOCIAL_IMAGE_TYPE + '">');
-    tags.push('<meta property="og:image:width" content="' + AGENT_NATIVE_SOCIAL_IMAGE_WIDTH + '">');
-    tags.push('<meta property="og:image:height" content="' + AGENT_NATIVE_SOCIAL_IMAGE_HEIGHT + '">');
-    tags.push('<meta property="og:image:alt" content="' + AGENT_NATIVE_SOCIAL_IMAGE_ALT + '">');
-  }
-  if (!TWITTER_CARD_META_RE.test(html)) {
-    tags.push('<meta name="twitter:card" content="summary_large_image">');
-  }
-  if (!hasAnySocialImage) {
-    tags.push('<meta name="twitter:image" content="' + imageUrl + '">');
-    tags.push('<meta name="twitter:image:alt" content="' + AGENT_NATIVE_SOCIAL_IMAGE_ALT + '">');
-  }
-
-  if (tags.length === 0) return html;
-  return html.slice(0, headCloseIdx) + tags.join("") + html.slice(headCloseIdx);
-}
-
-function isSsrHtmlOrDataResponse(headers, status, pathname) {
-  if (status < 200 || status >= 400) return false;
-  const contentType = (headers.get("content-type") || "").toLowerCase();
-  if (contentType.includes("text/html")) return true;
-  return pathname.endsWith(".data") && contentType.includes("text/x-script");
-}
-
-/**
- * Apply the SSR cache policy to the response headers.
- *
- * SSR IS A PUBLIC, HARD-CDN-CACHED SHELL — SERVED IDENTICALLY TO EVERYONE.
- * Every SSR HTML / React Router .data response gets the same public
- * stale-while-revalidate policy for ALL visitors, authenticated or not. The SSR
- * output is impersonal (the handler never reads the request's session/cookies),
- * so it is safe to hard-cache one shared copy at the edge. Do NOT reintroduce
- * per-user / cookie-based cache variation here (no private, no no-store, no
- * "authenticated then don't cache" branch) — that makes every logged-in
- * visitor's pages uncacheable. Per-user state is resolved client-side instead.
- */
-function applyDefaultSsrCacheHeader(headers, status, pathname) {
-  if (!isSsrHtmlOrDataResponse(headers, status, pathname)) return;
-
-  headers.set("cache-control", DEFAULT_SSR_CACHE_CONTROL);
-  headers.set("cdn-cache-control", DEFAULT_SSR_CDN_CACHE_CONTROL);
-  // Netlify function responses are dynamic by default and can otherwise show
-  // Cache-Status fwd=bypass even with Cache-Control: public. Keep this
-  // Netlify-specific header so SSR HTML/.data are served from the shared
-  // durable CDN cache instead of stampeding origin — for every visitor.
-  headers.set("netlify-cdn-cache-control", DEFAULT_SSR_NETLIFY_CDN_CACHE_CONTROL);
-}
-
-function applyDefaultSpeculationRulesHeader(headers, status, basePath) {
-  if (status < 200 || status >= 400) return;
-  if (headers.has("speculation-rules")) return;
-
-  const contentType = (headers.get("content-type") || "").toLowerCase();
-  if (!contentType.includes("text/html")) return;
-
-  // Cloudflare Speed Brain injects Speculation-Rules when origin omits this
-  // header. Those browser prefetches carry Sec-Purpose: prefetch and
-  // Cloudflare can return 503 before the request reaches origin. Publish an
-  // explicit no-op ruleset by default; apps can still provide their own header.
-  headers.set("speculation-rules", '"' + prefixMountedPath(DEFAULT_SPECULATION_RULES_PATH, basePath) + '"');
-}
-function isImmutableAssetRequest(request) {
-  const pathname = stripAppBasePath(new URL(request.url).pathname);
-  return IMMUTABLE_ASSET_PATHS.has(pathname);
-}
-
-function applyImmutableAssetCacheHeaders(response, request) {
-  if (!isImmutableAssetRequest(request)) return response;
-  if (!((response.status >= 200 && response.status < 300) || response.status === 304)) {
-    return response;
-  }
-  const headers = new Headers(response.headers);
-  headers.set("Cache-Control", IMMUTABLE_ASSET_CACHE_CONTROL);
-  headers.set("CDN-Cache-Control", IMMUTABLE_ASSET_CACHE_CONTROL);
-  headers.set("Netlify-CDN-Cache-Control", IMMUTABLE_ASSET_CACHE_CONTROL);
-  return new Response(response.body, {
-    status: response.status,
-    statusText: response.statusText,
-    headers,
-  });
-}
-
-async function rewriteMountedResponse(response, basePath, pathname, request) {
-  const sentryClientConfigScript = getSentryClientConfigScript();
-  const headers = new Headers(response.headers);
-  applyDefaultSsrCacheHeader(headers, response.status, pathname);
-  applyDefaultSpeculationRulesHeader(headers, response.status, basePath);
-
-  const location = headers.get("location");
-  if (location?.startsWith("/") && !location.startsWith("//")) {
-    headers.set("location", prefixMountedPath(location, basePath));
-  }
-
-  const contentType = headers.get("content-type") || "";
-  if (!contentType.toLowerCase().includes("text/html") || !response.body) {
-    return new Response(response.body, {
-      status: response.status,
-      statusText: response.statusText,
-      headers,
-    });
-  }
-
-  const html = await response.text();
-  headers.delete("content-length");
-  return new Response(
-    injectHeadScript(
-      injectDefaultSocialImageMeta(
-        prefixMountedHtml(html, basePath),
-        defaultSocialImageUrl(request, basePath),
-      ),
-      sentryClientConfigScript,
-    ),
-    {
-      status: response.status,
-      statusText: response.statusText,
-      headers,
-    },
-  );
-}
-
-function requestWithMethod(request, method) {
-  return new Request(request.url, {
-    method,
-    headers: request.headers,
-    signal: request.signal,
-  });
-}
-
-function requestWithPathname(request, pathname) {
-  const url = new URL(request.url);
-  if (url.pathname === pathname) return request;
-  url.pathname = pathname;
-  return new Request(url, request);
-}
-
-function isStaticAppShellRequest(request) {
-  if (request.method !== "GET" && request.method !== "HEAD") return false;
-  const p = stripAppBasePath(new URL(request.url).pathname);
-  if (
-    p.startsWith("/.well-known/") ||
-    p.startsWith("/_agent-native/") ||
-    isApiPath(p) ||
-    p === "/favicon.ico" ||
-    p === "/favicon.png" ||
-    /\\.\\w+$/.test(p)
-  ) {
-    return false;
-  }
-  return true;
-}
-
-async function fetchStaticAppShell(request, env) {
-  if (!env?.ASSETS || !isStaticAppShellRequest(request)) return null;
-  const basePath = getAppBasePath();
-  const p = stripAppBasePath(new URL(request.url).pathname);
-  // Workspace deployments serve each app's static files under its base path
-  // (/dispatch/index.html on the unified origin) — an unprefixed
-  // "/index.html" 404s against the shared ASSETS binding and authed deep
-  // links (e.g. /dispatch/overview) leaked h3's JSON 404 instead of the SPA
-  // shell. Try the base-path-prefixed shell first, fall back to the root
-  // shell for single-app deployments.
-  let response;
-  try {
-    if (basePath) {
-      response = await env.ASSETS.fetch(
-        requestWithPathname(
-          requestWithMethod(request, "GET"),
-          basePath + "/index.html",
-        ),
-      );
-    }
-    if (!response || response.status === 404) {
-      response = await env.ASSETS.fetch(
-        requestWithPathname(requestWithMethod(request, "GET"), "/index.html"),
-      );
-    }
-  } catch {
-    return null;
-  }
-  if (response.status === 404) return null;
-  if (request.method === "HEAD") {
-    return rewriteMountedResponse(
-      new Response(null, {
-        status: response.status,
-        statusText: response.statusText,
-        headers: response.headers,
-      }),
-      basePath,
-      p,
-      request,
-    );
-  }
-  return rewriteMountedResponse(response, basePath, p, request);
-}
-
-// API route handlers
-${routeImports.join("\n")}
-
-// Action handlers (auto-discovered from actions/)
-${actionImports.join("\n")}
-
-// Server plugins
-${pluginImports.join("\n")}
-
-let _handler;
-
-async function getHandler() {
-  if (_handler) return _handler;
-
-  const app = new H3();
-
-  // Build a fake nitroApp surface so framework plugins (which expect
-  // \`nitroApp.h3["~middleware"]\`) can register routes via getH3App().
-  const noop = () => {};
-  const nitroApp = {
-    h3: app,
-    hooks: { hook: noop, callHook: noop, hookOnce: noop },
-    captureError: noop,
-  };
-
-  // CORS — applied as global middleware via .use(handler)
-  app.use(defineEventHandler((event) => {
-    if (event.req.method === "OPTIONS") {
-      return new Response(null, {
-        status: 204,
-        headers: {
-          "Access-Control-Allow-Origin": "*",
-          "Access-Control-Allow-Methods": "GET,HEAD,POST,PUT,PATCH,DELETE,OPTIONS",
-          "Access-Control-Allow-Headers": "Content-Type,Authorization,X-Requested-With,X-Request-Source,X-Agent-Native-CSRF,X-User-Timezone,X-Agent-Native-Tool-Bridge,X-Agent-Native-Tool-Id,X-Agent-Native-Frontend,X-Agent-Native-Embed-Target",
-        },
-      });
-    }
-  }));
-
-  // Run plugins — they call getH3App(nitroApp).use(path, handler) which
-  // pushes path-prefix middleware onto app["~middleware"].
-  // Pre-mark every build-time plugin slot before any plugin awaits the runtime
-  // default bootstrap. Bundled serverless workers often lack server/plugins/
-  // on disk, so runtime discovery would otherwise auto-mount duplicate
-  // framework defaults before later custom plugins get a chance to mark
-  // themselves as provided.
-${generatedPluginMarks.map((stem) => `  markGeneratedPluginProvided(nitroApp, ${JSON.stringify(stem)});`).join("\n")}
-${pluginCalls.join("\n")}
-
-  // Register API routes
-${routeRegistrations.join("\n")}
-
-  // Register action routes (/_agent-native/actions/*)
-${actionRegistrations.join("\n")}
-
+    return `
+// Auto-generated worker entry point for ${preset}
+${appScopeId ? 'import "./_scope-init.js";\n' : ""}import { H3, defineEventHandler, readBody, toResponse } from "h3";
+${includeReactRouterSsr ? 'import { createRequestHandler } from "react-router";' : ""}
+${includeReactRouterSsr ? 'import * as serverBuild from "./server-build.js";' : ""}
+
+function normalizeAppBasePath(value) {
+  if (!value || value === "/") return "";
+  const trimmed = String(value).trim();
+  if (!trimmed || trimmed === "/") return "";
+  return "/" + trimmed.replace(/^\\/+/, "").replace(/\\/+$/, "");
+}
+
+function getAppBasePath() {
+  const builtAppBasePath = ${JSON.stringify(builtAppBasePath)};
+  return normalizeAppBasePath(
+    globalThis.process?.env?.VITE_APP_BASE_PATH ||
+      globalThis.process?.env?.APP_BASE_PATH ||
+      builtAppBasePath,
+  );
+}
+
+function stripAppBasePath(pathname) {
+  const basePath = getAppBasePath();
+  if (!basePath) return pathname;
+  if (pathname === basePath) return "/";
+  if (pathname.startsWith(basePath + "/")) {
+    return pathname.slice(basePath.length) || "/";
+  }
+  return pathname;
+}
+
+function parseActionSearchParams(searchParams) {
+  const params = {};
+  for (const [rawKey, value] of searchParams.entries()) {
+    const isArrayKey = rawKey.endsWith("[]");
+    // The core client serializes arrays as key[]=value so one-item arrays
+    // survive GET action parsing in generated worker deployments.
+    const key = isArrayKey ? rawKey.slice(0, -2) : rawKey;
+    const current = params[key];
+    if (current === undefined) {
+      params[key] = isArrayKey ? [value] : value;
+    } else if (Array.isArray(current)) {
+      current.push(value);
+    } else {
+      params[key] = [current, value];
+    }
+  }
+  return params;
+}
+
+function isApiPath(pathname) {
+  return pathname === "/api" || pathname.startsWith("/api/");
+}
+
+function isFrameworkPath(pathname) {
+  return (
+    pathname === "/_agent-native" || pathname.startsWith("/_agent-native/")
+  );
+}
+
+function requestWithMountedApiPrefixStripped(request) {
+  const basePath = getAppBasePath();
+  if (!basePath) return request;
+  const url = new URL(request.url);
+  const strippedPathname = stripAppBasePath(url.pathname);
+  if (strippedPathname === url.pathname) {
+    return request;
+  }
+  if (!isApiPath(strippedPathname) && !isFrameworkPath(strippedPathname)) {
+    return request;
+  }
+  url.pathname = strippedPathname;
+  return new Request(url, request);
+}
+
+function prefixMountedPath(path, basePath) {
+  if (!basePath || !path.startsWith("/") || path.startsWith("//")) return path;
+  if (path === basePath || path.startsWith(basePath + "/")) return path;
+  return basePath + path;
+}
+
+function prefixMountedHtml(html, basePath) {
+  if (!basePath) return html;
+  return html
+    .replace(
+      /\\b(href|src|action|formaction|poster)=(["'])(\\/(?!\\/)[^"']*)\\2/g,
+      (_match, attr, quote, path) =>
+        attr + "=" + quote + prefixMountedPath(path, basePath) + quote,
+    )
+    .replace(/url\\((["']?)(\\/(?!\\/)[^)'" ]+)\\1\\)/g, (_match, quote, path) => {
+      const q = quote || "";
+      return "url(" + q + prefixMountedPath(path, basePath) + q + ")";
+    });
+}
+
+function firstNonEmpty() {
+  for (const value of arguments) {
+    const trimmed = typeof value === "string" ? value.trim() : "";
+    if (trimmed) return trimmed;
+  }
+}
+
+function getSentryClientConfigScript() {
+  const env = globalThis.process?.env || {};
+  const key = firstNonEmpty(env.SENTRY_CLIENT_KEY, env.VITE_SENTRY_CLIENT_KEY);
+  const projectId = firstNonEmpty(
+    env.SENTRY_PROJECT_ID,
+    env.VITE_SENTRY_PROJECT_ID,
+  );
+  const host = firstNonEmpty(
+    env.SENTRY_INGEST_HOST,
+    env.VITE_SENTRY_INGEST_HOST,
+  );
+  const dsn =
+    firstNonEmpty(
+      env.SENTRY_CLIENT_DSN,
+      env.VITE_SENTRY_CLIENT_DSN,
+      env.VITE_SENTRY_DSN,
+      env.SENTRY_DSN,
+    ) || (key && projectId && host ? "https://" + key + "@" + host + "/" + projectId : undefined);
+  if (!dsn) return null;
+  const config = {
+    sentryDsn: dsn,
+    sentryEnvironment:
+      firstNonEmpty(
+        env.SENTRY_ENVIRONMENT,
+        env.NETLIFY_CONTEXT,
+        env.VERCEL_ENV,
+        env.NODE_ENV,
+      ) || "production",
+  };
+  return (
+    '<script data-agent-native-sentry-config>' +
+    'window.__AGENT_NATIVE_CONFIG__=Object.assign({},window.__AGENT_NATIVE_CONFIG__,' +
+    JSON.stringify(config) +
+    ");</script>"
+  );
+}
+
+function injectHeadScript(html, script) {
+  if (!script) return html;
+  const headCloseIdx = html.indexOf("</head>");
+  if (headCloseIdx === -1) return html;
+  return html.slice(0, headCloseIdx) + script + html.slice(headCloseIdx);
+}
+
+const DEFAULT_SSR_CACHE_CONTROL = ${JSON.stringify(DEFAULT_SSR_CACHE_CONTROL)};
+const DEFAULT_SSR_CDN_CACHE_CONTROL = ${JSON.stringify(DEFAULT_SSR_CDN_CACHE_CONTROL)};
+const DEFAULT_SSR_NETLIFY_CDN_CACHE_CONTROL = ${JSON.stringify(DEFAULT_SSR_NETLIFY_CDN_CACHE_CONTROL)};
+const DEFAULT_SPECULATION_RULES_PATH = ${JSON.stringify(DEFAULT_SPECULATION_RULES_PATH)};
+const IMMUTABLE_ASSET_CACHE_CONTROL = ${JSON.stringify(IMMUTABLE_ASSET_CACHE_CONTROL)};
+const IMMUTABLE_ASSET_PATHS = new Set(${JSON.stringify([...new Set(immutableAssetPaths)].sort())});
+const AGENT_NATIVE_SOCIAL_IMAGE_PATH = ${JSON.stringify(AGENT_NATIVE_SOCIAL_IMAGE_PATH)};
+const AGENT_NATIVE_SOCIAL_IMAGE_CACHE_BUSTER = ${JSON.stringify(AGENT_NATIVE_SOCIAL_IMAGE_CACHE_BUSTER)};
+const AGENT_NATIVE_SOCIAL_IMAGE_ALT = ${JSON.stringify(AGENT_NATIVE_SOCIAL_IMAGE_ALT)};
+const AGENT_NATIVE_SOCIAL_IMAGE_TYPE = ${JSON.stringify(AGENT_NATIVE_SOCIAL_IMAGE_TYPE)};
+const AGENT_NATIVE_SOCIAL_IMAGE_WIDTH = ${JSON.stringify(AGENT_NATIVE_SOCIAL_IMAGE_WIDTH)};
+const AGENT_NATIVE_SOCIAL_IMAGE_HEIGHT = ${JSON.stringify(AGENT_NATIVE_SOCIAL_IMAGE_HEIGHT)};
+const OG_IMAGE_META_RE = /<meta\\b(?=[^>]*\\bproperty=(["'])og:image\\1)[^>]*>/i;
+const TWITTER_CARD_META_RE = /<meta\\b(?=[^>]*\\bname=(["'])twitter:card\\1)[^>]*>/i;
+const TWITTER_IMAGE_META_RE = /<meta\\b(?=[^>]*\\bname=(["'])twitter:image\\1)[^>]*>/i;
+
+function withAgentNativeSocialImageCacheBuster(image) {
+  const separator = image.includes("?") ? "&" : "?";
+  return image + separator + "v=" + encodeURIComponent(AGENT_NATIVE_SOCIAL_IMAGE_CACHE_BUSTER);
+}
+
+function defaultSocialImageUrl(request, basePath) {
+  return withAgentNativeSocialImageCacheBuster(
+    new URL(prefixMountedPath(AGENT_NATIVE_SOCIAL_IMAGE_PATH, basePath), request.url).toString()
+  );
+}
+
+function injectDefaultSocialImageMeta(html, imageUrl) {
+  const headCloseIdx = html.indexOf("</head>");
+  if (headCloseIdx === -1) return html;
+
+  const hasAnySocialImage =
+    OG_IMAGE_META_RE.test(html) || TWITTER_IMAGE_META_RE.test(html);
+  const tags = [];
+
+  if (!hasAnySocialImage) {
+    tags.push('<meta property="og:image" content="' + imageUrl + '">');
+    tags.push('<meta property="og:image:secure_url" content="' + imageUrl + '">');
+    tags.push('<meta property="og:image:type" content="' + AGENT_NATIVE_SOCIAL_IMAGE_TYPE + '">');
+    tags.push('<meta property="og:image:width" content="' + AGENT_NATIVE_SOCIAL_IMAGE_WIDTH + '">');
+    tags.push('<meta property="og:image:height" content="' + AGENT_NATIVE_SOCIAL_IMAGE_HEIGHT + '">');
+    tags.push('<meta property="og:image:alt" content="' + AGENT_NATIVE_SOCIAL_IMAGE_ALT + '">');
+  }
+  if (!TWITTER_CARD_META_RE.test(html)) {
+    tags.push('<meta name="twitter:card" content="summary_large_image">');
+  }
+  if (!hasAnySocialImage) {
+    tags.push('<meta name="twitter:image" content="' + imageUrl + '">');
+    tags.push('<meta name="twitter:image:alt" content="' + AGENT_NATIVE_SOCIAL_IMAGE_ALT + '">');
+  }
+
+  if (tags.length === 0) return html;
+  return html.slice(0, headCloseIdx) + tags.join("") + html.slice(headCloseIdx);
+}
+
+function isSsrHtmlOrDataResponse(headers, status, pathname) {
+  if (status < 200 || status >= 400) return false;
+  const contentType = (headers.get("content-type") || "").toLowerCase();
+  if (contentType.includes("text/html")) return true;
+  return pathname.endsWith(".data") && contentType.includes("text/x-script");
+}
+
+/**
+ * Apply the SSR cache policy to the response headers.
+ *
+ * SSR IS A PUBLIC, HARD-CDN-CACHED SHELL — SERVED IDENTICALLY TO EVERYONE.
+ * Every SSR HTML / React Router .data response gets the same public
+ * stale-while-revalidate policy for ALL visitors, authenticated or not. The SSR
+ * output is impersonal (the handler never reads the request's session/cookies),
+ * so it is safe to hard-cache one shared copy at the edge. Do NOT reintroduce
+ * per-user / cookie-based cache variation here (no private, no no-store, no
+ * "authenticated then don't cache" branch) — that makes every logged-in
+ * visitor's pages uncacheable. Per-user state is resolved client-side instead.
+ */
+function applyDefaultSsrCacheHeader(headers, status, pathname) {
+  if (!isSsrHtmlOrDataResponse(headers, status, pathname)) return;
+
+  headers.set("cache-control", DEFAULT_SSR_CACHE_CONTROL);
+  headers.set("cdn-cache-control", DEFAULT_SSR_CDN_CACHE_CONTROL);
+  // Netlify function responses are dynamic by default and can otherwise show
+  // Cache-Status fwd=bypass even with Cache-Control: public. Keep this
+  // Netlify-specific header so SSR HTML/.data are served from the shared
+  // durable CDN cache instead of stampeding origin — for every visitor.
+  headers.set("netlify-cdn-cache-control", DEFAULT_SSR_NETLIFY_CDN_CACHE_CONTROL);
+}
+
+function applyDefaultSpeculationRulesHeader(headers, status, basePath) {
+  if (status < 200 || status >= 400) return;
+  if (headers.has("speculation-rules")) return;
+
+  const contentType = (headers.get("content-type") || "").toLowerCase();
+  if (!contentType.includes("text/html")) return;
+
+  // Cloudflare Speed Brain injects Speculation-Rules when origin omits this
+  // header. Those browser prefetches carry Sec-Purpose: prefetch and
+  // Cloudflare can return 503 before the request reaches origin. Publish an
+  // explicit no-op ruleset by default; apps can still provide their own header.
+  headers.set("speculation-rules", '"' + prefixMountedPath(DEFAULT_SPECULATION_RULES_PATH, basePath) + '"');
+}
+function isImmutableAssetRequest(request) {
+  const pathname = stripAppBasePath(new URL(request.url).pathname);
+  return IMMUTABLE_ASSET_PATHS.has(pathname);
+}
+
+function applyImmutableAssetCacheHeaders(response, request) {
+  if (!isImmutableAssetRequest(request)) return response;
+  if (!((response.status >= 200 && response.status < 300) || response.status === 304)) {
+    return response;
+  }
+  const headers = new Headers(response.headers);
+  headers.set("Cache-Control", IMMUTABLE_ASSET_CACHE_CONTROL);
+  headers.set("CDN-Cache-Control", IMMUTABLE_ASSET_CACHE_CONTROL);
+  headers.set("Netlify-CDN-Cache-Control", IMMUTABLE_ASSET_CACHE_CONTROL);
+  return new Response(response.body, {
+    status: response.status,
+    statusText: response.statusText,
+    headers,
+  });
+}
+
+async function rewriteMountedResponse(response, basePath, pathname, request) {
+  const sentryClientConfigScript = getSentryClientConfigScript();
+  const headers = new Headers(response.headers);
+  applyDefaultSsrCacheHeader(headers, response.status, pathname);
+  applyDefaultSpeculationRulesHeader(headers, response.status, basePath);
+
+  const location = headers.get("location");
+  if (location?.startsWith("/") && !location.startsWith("//")) {
+    headers.set("location", prefixMountedPath(location, basePath));
+  }
+
+  const contentType = headers.get("content-type") || "";
+  if (!contentType.toLowerCase().includes("text/html") || !response.body) {
+    return new Response(response.body, {
+      status: response.status,
+      statusText: response.statusText,
+      headers,
+    });
+  }
+
+  const html = await response.text();
+  headers.delete("content-length");
+  return new Response(
+    injectHeadScript(
+      injectDefaultSocialImageMeta(
+        prefixMountedHtml(html, basePath),
+        defaultSocialImageUrl(request, basePath),
+      ),
+      sentryClientConfigScript,
+    ),
+    {
+      status: response.status,
+      statusText: response.statusText,
+      headers,
+    },
+  );
+}
+
+function requestWithMethod(request, method) {
+  return new Request(request.url, {
+    method,
+    headers: request.headers,
+    signal: request.signal,
+  });
+}
+
+function requestWithPathname(request, pathname) {
+  const url = new URL(request.url);
+  if (url.pathname === pathname) return request;
+  url.pathname = pathname;
+  return new Request(url, request);
+}
+
+function isStaticAppShellRequest(request) {
+  if (request.method !== "GET" && request.method !== "HEAD") return false;
+  const p = stripAppBasePath(new URL(request.url).pathname);
+  if (
+    p.startsWith("/.well-known/") ||
+    p.startsWith("/_agent-native/") ||
+    isApiPath(p) ||
+    p === "/favicon.ico" ||
+    p === "/favicon.png" ||
+    /\\.\\w+$/.test(p)
+  ) {
+    return false;
+  }
+  return true;
+}
+
+async function fetchStaticAppShell(request, env) {
+  if (!env?.ASSETS || !isStaticAppShellRequest(request)) return null;
+  const basePath = getAppBasePath();
+  const p = stripAppBasePath(new URL(request.url).pathname);
+  // Workspace deployments serve each app's static files under its base path
+  // (/dispatch/index.html on the unified origin) — an unprefixed
+  // "/index.html" 404s against the shared ASSETS binding and authed deep
+  // links (e.g. /dispatch/overview) leaked h3's JSON 404 instead of the SPA
+  // shell. Try the base-path-prefixed shell first, fall back to the root
+  // shell for single-app deployments.
+  let response;
+  try {
+    if (basePath) {
+      response = await env.ASSETS.fetch(
+        requestWithPathname(
+          requestWithMethod(request, "GET"),
+          basePath + "/index.html",
+        ),
+      );
+    }
+    if (!response || response.status === 404) {
+      response = await env.ASSETS.fetch(
+        requestWithPathname(requestWithMethod(request, "GET"), "/index.html"),
+      );
+    }
+  } catch {
+    return null;
+  }
+  if (response.status === 404) return null;
+  if (request.method === "HEAD") {
+    return rewriteMountedResponse(
+      new Response(null, {
+        status: response.status,
+        statusText: response.statusText,
+        headers: response.headers,
+      }),
+      basePath,
+      p,
+      request,
+    );
+  }
+  return rewriteMountedResponse(response, basePath, p, request);
+}
+
+// API route handlers
+${routeImports.join("\n")}
+
+// Action handlers (auto-discovered from actions/)
+${actionImports.join("\n")}
+
+// Server plugins
+${pluginImports.join("\n")}
+
+let _handler;
+
+async function getHandler() {
+  if (_handler) return _handler;
+
+  const app = new H3();
+
+  // Build a fake nitroApp surface so framework plugins (which expect
+  // \`nitroApp.h3["~middleware"]\`) can register routes via getH3App().
+  const noop = () => {};
+  const nitroApp = {
+    h3: app,
+    hooks: { hook: noop, callHook: noop, hookOnce: noop },
+    captureError: noop,
+  };
+
+  // CORS — applied as global middleware via .use(handler)
+  app.use(defineEventHandler((event) => {
+    if (event.req.method === "OPTIONS") {
+      return new Response(null, {
+        status: 204,
+        headers: {
+          "Access-Control-Allow-Origin": "*",
+          "Access-Control-Allow-Methods": "GET,HEAD,POST,PUT,PATCH,DELETE,OPTIONS",
+          "Access-Control-Allow-Headers": "Content-Type,Authorization,X-Requested-With,X-Request-Source,X-Agent-Native-CSRF,X-User-Timezone,X-Agent-Native-Tool-Bridge,X-Agent-Native-Tool-Id,X-Agent-Native-Frontend,X-Agent-Native-Embed-Target",
+        },
+      });
+    }
+  }));
+
+  // Run plugins — they call getH3App(nitroApp).use(path, handler) which
+  // pushes path-prefix middleware onto app["~middleware"].
+  // Pre-mark every build-time plugin slot before any plugin awaits the runtime
+  // default bootstrap. Bundled serverless workers often lack server/plugins/
+  // on disk, so runtime discovery would otherwise auto-mount duplicate
+  // framework defaults before later custom plugins get a chance to mark
+  // themselves as provided.
+${generatedPluginMarks.map((stem) => `  markGeneratedPluginProvided(nitroApp, ${JSON.stringify(stem)});`).join("\n")}
+${pluginCalls.join("\n")}
+
+  // Register API routes
+${routeRegistrations.join("\n")}
+
+  // Register action routes (/_agent-native/actions/*)
+${actionRegistrations.join("\n")}
+
 ${includeReactRouterSsr
-        ? `  // SSR catch-all for React Router
-  const rrHandler = createRequestHandler(() => serverBuild);
-  app.all("/**", defineEventHandler(async (event) => {
-    const basePath = getAppBasePath();
-    const p = stripAppBasePath(new URL(event.req.url).pathname);
-    if (
-      p.startsWith("/.well-known/") ||
-      p.startsWith("/_agent-native/") ||
-      isApiPath(p) ||
-      p === "/favicon.ico" ||
-      p === "/favicon.png" ||
-      (/\\.\\w+$/.test(p) && !p.endsWith(".data"))
-    ) {
-      return new Response(null, { status: 404 });
-    }
-    const request = requestWithPathname(event.req, p);
-    if (event.req.method === "HEAD") {
-      const getRequest = requestWithMethod(request, "GET");
-      const response = await rrHandler(getRequest);
-      return rewriteMountedResponse(
-        new Response(null, {
-          status: response.status,
-          statusText: response.statusText,
-          headers: response.headers,
-        }),
-        basePath,
-        p,
-        getRequest
-      );
-    }
-    return rewriteMountedResponse(await rrHandler(request), basePath, p, request);
+        ? `  // SSR catch-all for React Router
+  const rrHandler = createRequestHandler(() => serverBuild);
+  app.all("/**", defineEventHandler(async (event) => {
+    const basePath = getAppBasePath();
+    const p = stripAppBasePath(new URL(event.req.url).pathname);
+    if (
+      p.startsWith("/.well-known/") ||
+      p.startsWith("/_agent-native/") ||
+      isApiPath(p) ||
+      p === "/favicon.ico" ||
+      p === "/favicon.png" ||
+      (/\\.\\w+$/.test(p) && !p.endsWith(".data"))
+    ) {
+      return new Response(null, { status: 404 });
+    }
+    const request = requestWithPathname(event.req, p);
+    if (event.req.method === "HEAD") {
+      const getRequest = requestWithMethod(request, "GET");
+      const response = await rrHandler(getRequest);
+      return rewriteMountedResponse(
+        new Response(null, {
+          status: response.status,
+          statusText: response.statusText,
+          headers: response.headers,
+        }),
+        basePath,
+        p,
+        getRequest
+      );
+    }
+    return rewriteMountedResponse(await rrHandler(request), basePath, p, request);
   }));`
-        : ""}
-
-  _handler = app.fetch.bind(app);
-  return _handler;
-}
-
-export default {
-  async fetch(request, env, ctx) {
-    // Expose env and ctx bindings globally for compatibility
-    if (ctx) globalThis.__cf_ctx = ctx;
-    if (env) {
-      globalThis.process = globalThis.process || { env: {} };
-      globalThis.process.env = globalThis.process.env || {};
-      // Expose D1/KV/R2 bindings on globalThis.__cf_env for the db layer
-      globalThis.__cf_env = env;
-      for (const [key, value] of Object.entries(env)) {
-        if (typeof value === "string") {
-          globalThis.process.env[key] = value;
-        }
-      }
-    }
-
-    // Try serving static assets first (CF Pages advanced mode).
-    // Only attempt this for GET/HEAD — the ASSETS binding is a static file
-    // server and returns 405 for any other method, which would short-circuit
-    // API calls (PUT/POST/DELETE to /_agent-native/*) before they reach our
-    // h3 middleware.
-    if (env?.ASSETS && (request.method === "GET" || request.method === "HEAD")) {
-      try {
-        const assetResponse = await env.ASSETS.fetch(request);
-        if (assetResponse.status !== 404) {
-          return applyImmutableAssetCacheHeaders(assetResponse, request);
-        }
-      } catch {
-        // Asset fetch failed — fall through to SSR
-      }
-    }
-
-    const handler = await getHandler();
-    const response = await handler(requestWithMountedApiPrefixStripped(request));
+        : ""}
+
+  _handler = app.fetch.bind(app);
+  return _handler;
+}
+
+export default {
+  async fetch(request, env, ctx) {
+    // Expose env and ctx bindings globally for compatibility
+    if (ctx) globalThis.__cf_ctx = ctx;
+    if (env) {
+      globalThis.process = globalThis.process || { env: {} };
+      globalThis.process.env = globalThis.process.env || {};
+      // Expose D1/KV/R2 bindings on globalThis.__cf_env for the db layer
+      globalThis.__cf_env = env;
+      for (const [key, value] of Object.entries(env)) {
+        if (typeof value === "string") {
+          globalThis.process.env[key] = value;
+        }
+      }
+    }
+
+    // Try serving static assets first (CF Pages advanced mode).
+    // Only attempt this for GET/HEAD — the ASSETS binding is a static file
+    // server and returns 405 for any other method, which would short-circuit
+    // API calls (PUT/POST/DELETE to /_agent-native/*) before they reach our
+    // h3 middleware.
+    if (env?.ASSETS && (request.method === "GET" || request.method === "HEAD")) {
+      try {
+        const assetResponse = await env.ASSETS.fetch(request);
+        if (assetResponse.status !== 404) {
+          return applyImmutableAssetCacheHeaders(assetResponse, request);
+        }
+      } catch {
+        // Asset fetch failed — fall through to SSR
+      }
+    }
+
+    const handler = await getHandler();
+    const response = await handler(requestWithMountedApiPrefixStripped(request));
 ${includeReactRouterSsr
         ? "    return response;"
-        : `    if (response.status === 404) {
-      const shellResponse = await fetchStaticAppShell(request, env);
-      if (shellResponse) return shellResponse;
-    }
-    return response;`}
-  }
-};
+        : `    if (response.status === 404) {
+      const shellResponse = await fetchStaticAppShell(request, env);
+      if (shellResponse) return shellResponse;
+    }
+    return response;`}
+  }
+};
 `;
 }
 function escapeHtmlAttribute(value) {
@@ -1377,35 +1470,35 @@ function writeCloudflarePagesStaticShell({ serverDir, distDir, tmpDir, }) {
     const outFile = path.join(distDir, "index.html");
     const renderScript = path.join(tmpDir, "render-cloudflare-static-shell.mjs");
     const basePath = normalizeConfiguredAppBasePath();
-    fs.writeFileSync(renderScript, `
-import fs from "node:fs";
-import { createRequire } from "node:module";
-import { pathToFileURL } from "node:url";
-
-const cwd = ${JSON.stringify(cwd)};
-const serverEntry = ${JSON.stringify(serverEntry)};
-const outFile = ${JSON.stringify(outFile)};
-const basePath = ${JSON.stringify(basePath)};
-
-const requireFromApp = createRequire(cwd + "/package.json");
-const reactRouterEntry = requireFromApp.resolve("react-router");
-const { createRequestHandler } = await import(pathToFileURL(reactRouterEntry).href);
-const serverBuild = await import(pathToFileURL(serverEntry).href);
-const handler = createRequestHandler(serverBuild, "production");
-const pathname = basePath ? basePath + "/" : "/";
-const response = await handler(
-  new Request(new URL(pathname, "https://agent-native.local"), {
-    headers: { "X-React-Router-SPA-Mode": "yes" },
-  }),
-);
-const html = await response.text();
-
-if (!html || !html.includes("__reactRouterContext") || !html.includes("entry.client")) {
-  throw new Error("React Router did not render a usable Cloudflare Pages static shell");
-}
-
-fs.writeFileSync(outFile, html);
-process.exit(0);
+    fs.writeFileSync(renderScript, `
+import fs from "node:fs";
+import { createRequire } from "node:module";
+import { pathToFileURL } from "node:url";
+
+const cwd = ${JSON.stringify(cwd)};
+const serverEntry = ${JSON.stringify(serverEntry)};
+const outFile = ${JSON.stringify(outFile)};
+const basePath = ${JSON.stringify(basePath)};
+
+const requireFromApp = createRequire(cwd + "/package.json");
+const reactRouterEntry = requireFromApp.resolve("react-router");
+const { createRequestHandler } = await import(pathToFileURL(reactRouterEntry).href);
+const serverBuild = await import(pathToFileURL(serverEntry).href);
+const handler = createRequestHandler(serverBuild, "production");
+const pathname = basePath ? basePath + "/" : "/";
+const response = await handler(
+  new Request(new URL(pathname, "https://agent-native.local"), {
+    headers: { "X-React-Router-SPA-Mode": "yes" },
+  }),
+);
+const html = await response.text();
+
+if (!html || !html.includes("__reactRouterContext") || !html.includes("entry.client")) {
+  throw new Error("React Router did not render a usable Cloudflare Pages static shell");
+}
+
+fs.writeFileSync(outFile, html);
+process.exit(0);
 `);
     try {
         execFileSync(process.execPath, [renderScript], {
@@ -1506,7 +1599,7 @@ async function buildCloudflarePages() {
     const tmpEntry = path.join(tmpDir, "index.js");
     fs.writeFileSync(tmpEntry, adjustedEntry);
     if (appScopeId) {
-        fs.writeFileSync(path.join(tmpDir, "_scope-init.js"), generateScopeInitSource(appScopeId));
+        fs.writeFileSync(path.join(tmpDir, "_scope-init.js"), generateScopeInitSource(appScopeId, workspaceEnvDefaultsFromBuildEnv(), workspaceAppModuleGraphEnvDefaultsFromBuildEnv()));
     }
     if (includeReactRouterSsr) {
         copyDir(serverDir, path.join(tmpDir, "server"));
@@ -2191,76 +2284,76 @@ export function emitSingleTemplateNetlifyBackgroundFunction(projectCwd) {
     // copied bundle does NOT re-register the catch-all `config.path`.
     fs.rmSync(path.join(dest, "server.mjs"), { force: true });
     const processRunPath = JSON.stringify(AGENT_CHAT_PROCESS_RUN_PATH);
-    const entry = `// Mark this isolate as the durable background runtime BEFORE the handler
-// bundle is imported, so isInBackgroundFunctionRuntime() reliably returns true
-// in this function. The deployed Lambda name is NOT guaranteed to end in
-// "-background" (Netlify may mangle/prefix it), so we cannot depend on
-// AWS_LAMBDA_FUNCTION_NAME alone. A globalThis flag (NOT process.env) avoids the
-// no-env-mutation guard and carries no cross-request state — it is a static,
-// set-once isolate marker read back by isInBackgroundFunctionRuntime().
-globalThis.__AGENT_NATIVE_BACKGROUND_RUNTIME__ = true;
-
-// The framework route the Nitro router dispatches to (the _process-run plugin).
-const PROCESS_RUN_PATH = ${processRunPath};
-
-let cachedHandler;
-
-// Netlify v2 invokes this as (request, context). The Nitro netlify handler is a
-// Web-standard \`async (Request) => Response\` (see nitro/presets/netlify/runtime).
-// This function declares NO custom \`config.path\`, so it is reached at its
-// DEFAULT url (/.netlify/functions/${backgroundName}). The Nitro router only
-// knows the framework route, so we REWRITE the incoming pathname to
-// PROCESS_RUN_PATH before delegating. Method, ALL headers (the HMAC
-// Authorization: Bearer MUST survive — the plugin verifies it) and the body are
-// preserved by cloning the incoming Request with only its URL pathname set.
-export default async function handler(request, context) {
-  try {
-    cachedHandler ??= (await import("./main.mjs")).default;
-    const url = new URL(request.url);
-    url.pathname = PROCESS_RUN_PATH;
-    // Read the body once and pass it through. GET/HEAD have no body.
-    const method = request.method || "POST";
-    const hasBody = method !== "GET" && method !== "HEAD";
-    const body = hasBody ? await request.text() : undefined;
-    const rewritten = new Request(url.toString(), {
-      method,
-      headers: request.headers,
-      body,
-    });
-    // Netlify Functions v2 invokes the handler as (request, context); the Nitro
-    // netlify handler accepts (request[, context]). Pass context through so a
-    // handler that uses it (e.g. waitUntil) does not trip over an undefined arg
-    // before it ever routes the request.
-    return await cachedHandler(rewritten, context);
-  } catch (err) {
-    // Netlify already returned 202 for this background invocation and DISCARDS
-    // this return, so a throw here is otherwise INVISIBLE — it would only surface
-    // downstream as the reaper's "worker never claimed the run". Log it loudly
-    // for the function log; the FOREGROUND circuit-breaker (production-agent.ts)
-    // is what recovers the run by executing it inline when no worker claims.
-    console.error(
-      "[agent-background] wrapper failed before reaching the route:",
-      (err && err.stack) || err,
-    );
-    throw err;
-  }
-}
-
-export const config = {
-  name: "agent background handler",
-  generator: "agent-native build",
-  // background: true makes Netlify invoke this ASYNCHRONOUSLY (immediate HTTP
-  // 202 ack) with the 15-minute budget (Netlify docs:
-  // build/functions/background-functions + build/functions/api). We declare NO
-  // custom path, so the function keeps its DEFAULT url
-  // /.netlify/functions/${backgroundName}; the Nitro \`server\` /* catch-all
-  // already excludes /.netlify/* so that default url is never shadowed by the
-  // synchronous function. The foreground dispatches to that default url.
-  background: true,
-  nodeBundler: "none",
-  includedFiles: ["**"],
-  preferStatic: false,
-};
+    const entry = `// Mark this isolate as the durable background runtime BEFORE the handler
+// bundle is imported, so isInBackgroundFunctionRuntime() reliably returns true
+// in this function. The deployed Lambda name is NOT guaranteed to end in
+// "-background" (Netlify may mangle/prefix it), so we cannot depend on
+// AWS_LAMBDA_FUNCTION_NAME alone. A globalThis flag (NOT process.env) avoids the
+// no-env-mutation guard and carries no cross-request state — it is a static,
+// set-once isolate marker read back by isInBackgroundFunctionRuntime().
+globalThis.__AGENT_NATIVE_BACKGROUND_RUNTIME__ = true;
+
+// The framework route the Nitro router dispatches to (the _process-run plugin).
+const PROCESS_RUN_PATH = ${processRunPath};
+
+let cachedHandler;
+
+// Netlify v2 invokes this as (request, context). The Nitro netlify handler is a
+// Web-standard \`async (Request) => Response\` (see nitro/presets/netlify/runtime).
+// This function declares NO custom \`config.path\`, so it is reached at its
+// DEFAULT url (/.netlify/functions/${backgroundName}). The Nitro router only
+// knows the framework route, so we REWRITE the incoming pathname to
+// PROCESS_RUN_PATH before delegating. Method, ALL headers (the HMAC
+// Authorization: Bearer MUST survive — the plugin verifies it) and the body are
+// preserved by cloning the incoming Request with only its URL pathname set.
+export default async function handler(request, context) {
+  try {
+    cachedHandler ??= (await import("./main.mjs")).default;
+    const url = new URL(request.url);
+    url.pathname = PROCESS_RUN_PATH;
+    // Read the body once and pass it through. GET/HEAD have no body.
+    const method = request.method || "POST";
+    const hasBody = method !== "GET" && method !== "HEAD";
+    const body = hasBody ? await request.text() : undefined;
+    const rewritten = new Request(url.toString(), {
+      method,
+      headers: request.headers,
+      body,
+    });
+    // Netlify Functions v2 invokes the handler as (request, context); the Nitro
+    // netlify handler accepts (request[, context]). Pass context through so a
+    // handler that uses it (e.g. waitUntil) does not trip over an undefined arg
+    // before it ever routes the request.
+    return await cachedHandler(rewritten, context);
+  } catch (err) {
+    // Netlify already returned 202 for this background invocation and DISCARDS
+    // this return, so a throw here is otherwise INVISIBLE — it would only surface
+    // downstream as the reaper's "worker never claimed the run". Log it loudly
+    // for the function log; the FOREGROUND circuit-breaker (production-agent.ts)
+    // is what recovers the run by executing it inline when no worker claims.
+    console.error(
+      "[agent-background] wrapper failed before reaching the route:",
+      (err && err.stack) || err,
+    );
+    throw err;
+  }
+}
+
+export const config = {
+  name: "agent background handler",
+  generator: "agent-native build",
+  // background: true makes Netlify invoke this ASYNCHRONOUSLY (immediate HTTP
+  // 202 ack) with the 15-minute budget (Netlify docs:
+  // build/functions/background-functions + build/functions/api). We declare NO
+  // custom path, so the function keeps its DEFAULT url
+  // /.netlify/functions/${backgroundName}; the Nitro \`server\` /* catch-all
+  // already excludes /.netlify/* so that default url is never shadowed by the
+  // synchronous function. The foreground dispatches to that default url.
+  background: true,
+  nodeBundler: "none",
+  includedFiles: ["**"],
+  preferStatic: false,
+};
 `;
     fs.writeFileSync(path.join(dest, `${backgroundName}.mjs`), entry);
     console.log(`[build] Emitted durable-background function "${backgroundName}" into the ` +
@@ -2984,11 +3077,11 @@ async function buildWithNitro() {
         : null;
     const agentsBundleModuleSource = () => {
         const bundle = readAgentsBundleFromFs(cwd, nitroWorkspaceSource);
-        return `// AUTO-GENERATED by @agent-native/core deploy build (Nitro virtual)
-// Contains the inlined AGENTS.md + .agents/skills/ content from the template,
-// merged with the workspace core's AGENTS.md + skills/ when present.
-const bundle = ${JSON.stringify(bundle)};
-export default bundle;
+        return `// AUTO-GENERATED by @agent-native/core deploy build (Nitro virtual)
+// Contains the inlined AGENTS.md + .agents/skills/ content from the template,
+// merged with the workspace core's AGENTS.md + skills/ when present.
+const bundle = ${JSON.stringify(bundle)};
+export default bundle;
 `;
     };
     // Path aliases used by templates (mirrors tsconfig + Vite config). Nitro