@junejs/server 0.0.21 → 0.0.24

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@junejs/server",
-  "version": "0.0.21",
+  "version": "0.0.24",
   "description": "June host adapters + dev server. Host-coupled; depends on the pure @junejs/core contract layer.",
   "type": "module",
   "license": "MIT",
@@ -30,8 +30,8 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@junejs/core": "0.0.21",
-    "@junejs/db": "0.0.21",
+    "@junejs/core": "0.0.24",
+    "@junejs/db": "0.0.24",
     "marked": "^18.0.5",
     "rolldown": "^1.1.0",
     "lightningcss": "^1.27.0"

package/src/app.ts

@@ -18,8 +18,9 @@ import { resolveAgent, resolveSpeculationRules, type JuneConfig } from "@junejs/
 import type { DocumentConfig } from "@junejs/core/document";
 import { runWithTrace, type RequestTrace } from "@junejs/core/instrumentation";
 
-import { findExtraFile, listRoutes, matchRouteTree, resolveNotFound, routeFiles, type SegmentMatch } from "./router";
-import { createPipeline, type ExtraHandler, type LayoutComponent, type Pipeline, type Resolved } from "./pipeline";
+import { findMiddlewareFile, isResourceFile, listRoutes, matchRouteTree, resolveNotFound, routeFiles, type SegmentMatch } from "./router";
+import { createPipeline, type ExtraHandler, type LayoutComponent, type Pipeline, type Resolved, type ResourceHandler } from "./pipeline";
+import { resolveBoundary } from "./segment";
 import { memoizeResources } from "./resources";
 import { findClientEntry, bundleClientToString, CLIENT_SCRIPT_URL } from "./client-bundle";
 import { findGlobalCss, processCssCached, STYLES_URL } from "./css";
@@ -39,15 +40,25 @@ export type JuneApp = {
   earlyHints(): string[];
 };
 
-// Import a layout file's default export as a layout component (memoized).
-const layoutCache = new Map<string, LayoutComponent>();
-async function loadLayout(file: string): Promise<LayoutComponent | null> {
+// Import a layout file's default export as a layout component (memoized), plus
+// its static `segmentBoundary` flag — read from the module export WITHOUT
+// rendering the component, which is what lets the server slice the chain for a
+// segment-scoped fragment without paying the shell's render cost.
+type LoadedLayout = { component: LayoutComponent; boundary: boolean };
+const layoutCache = new Map<string, LoadedLayout | null>();
+async function loadLayout(file: string): Promise<LoadedLayout | null> {
   const cached = layoutCache.get(file);
-  if (cached) return cached;
-  const mod = (await import(pathToFileURL(file).href)) as { default?: LayoutComponent };
-  if (typeof mod.default !== "function") return null;
-  layoutCache.set(file, mod.default);
-  return mod.default;
+  if (cached !== undefined) return cached;
+  const mod = (await import(pathToFileURL(file).href)) as {
+    default?: LayoutComponent;
+    segmentBoundary?: unknown;
+  };
+  const result: LoadedLayout | null =
+    typeof mod.default === "function"
+      ? { component: mod.default, boundary: mod.segmentBoundary === true }
+      : null;
+  layoutCache.set(file, result);
+  return result;
 }
 
 // The nearest loading.tsx up the segment chain (deepest wins) → the streaming
@@ -64,14 +75,20 @@ async function nearestLoading(segments: SegmentMatch[]): Promise<React.Component
   return mod.default;
 }
 
-async function loadChain(segments: SegmentMatch[]): Promise<LayoutComponent[]> {
-  const chain: LayoutComponent[] = [];
+// The layout chain (root→leaf) plus the segment boundary, via the shared
+// resolver (the one place the deepest-wins rule + shell key live, so dev and the
+// frozen manifest can't drift).
+async function loadChain(
+  segments: SegmentMatch[],
+): Promise<{ chain: LayoutComponent[]; boundaryIndex: number | null; boundaryKey: string | null }> {
+  const items = [];
   for (const seg of segments) {
     if (!seg.layout) continue;
     const L = await loadLayout(seg.layout);
-    if (L) chain.push(L);
+    items.push({ file: seg.layout, entry: L?.component ?? null, boundary: !!L?.boundary });
   }
-  return chain;
+  const { chain, boundaryIndex, key } = resolveBoundary(items);
+  return { chain, boundaryIndex, boundaryKey: key };
 }
 
 export function createApp({ appDir: appDirInput, config = {} }: CreateAppOptions): JuneApp {
@@ -140,7 +157,7 @@ export function createApp({ appDir: appDirInput, config = {} }: CreateAppOptions
       }
     }
     let extra: ExtraHandler | undefined;
-    const extraFile = findExtraFile(appDir);
+    const extraFile = findMiddlewareFile(appDir);
     if (extraFile) {
       const mod = (await import(pathToFileURL(extraFile).href)) as { default?: unknown };
       if (typeof mod.default === "function") extra = mod.default as ExtraHandler;
@@ -149,22 +166,32 @@ export function createApp({ appDir: appDirInput, config = {} }: CreateAppOptions
       extra,
       docConfig,
       agent,
+      i18n: config.i18n,
       routeList: routePaths,
       earlyHints: config.earlyHints,
       resources,
       notFoundComponent,
-      resolve: async (pathname): Promise<Resolved | null> => {
+      resolve: async (pathname) => {
         const match = await matchRouteTree(appDir, pathname, { pageConvention: true });
         if (!match) return null;
         const mod = await import(pathToFileURL(match.file).href);
+        // Resource route (route.*): the default export is the Response handler.
+        if (isResourceFile(match.file)) {
+          const handler = (mod as { default?: unknown }).default;
+          if (typeof handler !== "function") return null;
+          return { handler: handler as ResourceHandler, params: match.params };
+        }
         const def = routeFromModule(mod);
         if (!def) return null;
+        const { chain, boundaryIndex, boundaryKey } = await loadChain(match.segments);
         return {
           def,
           params: match.params,
-          chain: await loadChain(match.segments),
+          chain,
+          boundaryIndex,
+          boundaryKey,
           loading: await nearestLoading(match.segments),
-        };
+        } satisfies Resolved;
       },
     });
   }

package/src/build.ts

@@ -31,8 +31,9 @@ import { workers, type JuneAdapter, type ResourcePlan } from "./adapter";
 import type { DocumentConfig } from "@junejs/core/document";
 import { collection } from "./content";
 import { createWorker, type WorkerManifest } from "./worker";
-import { findExtraFile } from "./router";
-import type { ExtraHandler, LayoutComponent, LoadingComponent } from "./pipeline";
+import { findMiddlewareFile } from "./router";
+import { resolveBoundary } from "./segment";
+import type { ExtraHandler, LayoutComponent, LoadingComponent, ResourceHandler } from "./pipeline";
 import { findClientEntry, bundleClientToFile, CLIENT_SCRIPT_URL } from "./client-bundle";
 import { cssTargets, findGlobalCss, minifyCss, processCss, STYLES_URL } from "./css";
 import { buildModuleCss, rolldownCssModulesPlugin, registerCssModules } from "./css-modules";
@@ -51,6 +52,7 @@ type RouteEntry = {
   path: string;
   file: string;
   dynamic: boolean;
+  resource?: boolean; // a route.* resource route (raw-Response handler), not a page
   layouts: string[];
   loading?: string; // nearest loading.tsx up the tree → streaming Suspense fallback
 };
@@ -87,7 +89,9 @@ export async function scanRoutes(
     }
     const ext = e.name.match(/\.[^.]+$/)?.[0] ?? "";
     if (!ROUTE_EXTS.includes(ext)) continue;
-    if (!PAGE_BASENAMES.has(basename(e.name, ext))) continue;
+    const base = basename(e.name, ext);
+    const resource = base === "route";
+    if (!PAGE_BASENAMES.has(base) && !resource) continue;
     const relDir = relative(appDir, dir);
     const segments = relDir === "" ? [] : relDir.split(sep).filter((s) => !isRouteGroup(s));
     const path = "/" + segments.join("/");
@@ -95,6 +99,7 @@ export async function scanRoutes(
       path: path === "/" ? "/" : path,
       file: full,
       dynamic: /\[.+\]/.test(path),
+      resource,
       layouts: chain,
       loading: nearestLoading,
     });
@@ -138,6 +143,7 @@ export async function generateContent(appRoot: string): Promise<string[]> {
 export async function freezeConfig(appRoot: string): Promise<{
   document: DocumentConfig;
   agent: WorkerManifest["agent"];
+  i18n: WorkerManifest["i18n"];
   earlyHints: string[];
   buildExternal: string[];
 }> {
@@ -159,14 +165,24 @@ export async function freezeConfig(appRoot: string): Promise<{
       styles: hasCss ? STYLES_URL : null,
     },
     agent: resolveAgent(cfg.agent),
+    // Pass i18n through as-is: the in-process buildManifest keeps a resolveLocale
+    // hook (parity test), and the codegen JSON.stringify below drops the function
+    // (worker hook support is the codegen pass — see the manifest field comment).
+    i18n: cfg.i18n,
     earlyHints: cfg.earlyHints ?? [],
     buildExternal: cfg.build?.external ?? [],
   };
 }
 
-async function importLayout(file: string): Promise<LayoutComponent | null> {
-  const mod = (await import(pathToFileURL(file).href)) as { default?: LayoutComponent };
-  return typeof mod.default === "function" ? mod.default : null;
+type ImportedLayout = { component: LayoutComponent; boundary: boolean };
+async function importLayout(file: string): Promise<ImportedLayout | null> {
+  const mod = (await import(pathToFileURL(file).href)) as {
+    default?: LayoutComponent;
+    segmentBoundary?: unknown;
+  };
+  return typeof mod.default === "function"
+    ? { component: mod.default, boundary: mod.segmentBoundary === true }
+    : null;
 }
 
 // The FREEZE, in-process: import route modules + layouts, build the manifest a
@@ -177,34 +193,53 @@ export async function buildManifest(appRoot: string): Promise<WorkerManifest> {
   const frozen = await freezeConfig(appRoot);
   const scanned = (await scanRoutes(appDir)).sort((a, b) => a.path.localeCompare(b.path));
 
-  const layoutCache = new Map<string, LayoutComponent | null>();
-  const componentsFor = async (files: string[]): Promise<LayoutComponent[]> => {
-    const chain: LayoutComponent[] = [];
+  const layoutCache = new Map<string, ImportedLayout | null>();
+  const loadCached = async (f: string): Promise<ImportedLayout | null> => {
+    if (!layoutCache.has(f)) layoutCache.set(f, await importLayout(f));
+    return layoutCache.get(f) ?? null;
+  };
+  // The chain (root→leaf) + boundary index + shell key, via the SHARED resolver
+  // (the one place the deepest-wins rule lives), so the frozen manifest and the
+  // dev resolver can't drift — the parity contract.
+  const componentsFor = async (
+    files: string[],
+  ): Promise<{ chain: LayoutComponent[]; boundaryIndex: number | null; key: string | null }> => {
+    const items = [];
     for (const f of files) {
-      if (!layoutCache.has(f)) layoutCache.set(f, await importLayout(f));
-      const c = layoutCache.get(f) ?? null;
-      if (c) chain.push(c);
+      const c = await loadCached(f);
+      items.push({ file: f, entry: c?.component ?? null, boundary: !!c?.boundary });
     }
-    return chain;
+    return resolveBoundary(items);
   };
 
   const loadingCache = new Map<string, LoadingComponent | null>();
   const loadingFor = async (file?: string): Promise<LoadingComponent | undefined> => {
     if (!file) return undefined;
-    if (!loadingCache.has(file)) loadingCache.set(file, await importLayout(file) as LoadingComponent | null);
+    if (!loadingCache.has(file)) {
+      const loaded = await importLayout(file);
+      loadingCache.set(file, loaded ? (loaded.component as LoadingComponent) : null);
+    }
     return loadingCache.get(file) ?? undefined;
   };
 
   const routes: Record<string, BrandedRoute> = {};
   const dynamicRoutes: Array<{ pattern: string; def: BrandedRoute }> = [];
+  const resourceRoutes: Array<{ pattern: string; handler: ResourceHandler }> = [];
   const layoutChains: Record<string, LayoutComponent[]> = {};
+  const layoutBoundaries: Record<string, { index: number; key: string }> = {};
   const loadings: Record<string, LoadingComponent> = {};
 
   for (const r of scanned) {
     const mod = await import(pathToFileURL(r.file).href);
+    // Resource route (route.*): the default export is the Response handler.
+    if (r.resource) {
+      const handler = (mod as { default?: unknown }).default;
+      if (typeof handler === "function") resourceRoutes.push({ pattern: r.path, handler: handler as ResourceHandler });
+      continue;
+    }
     const def = routeFromModule(mod);
     if (!def) continue;
-    const chain = await componentsFor(r.layouts);
+    const { chain, boundaryIndex, key } = await componentsFor(r.layouts);
     const loading = await loadingFor(r.loading);
     if (r.dynamic) {
       dynamicRoutes.push({ pattern: r.path, def });
@@ -213,11 +248,12 @@ export async function buildManifest(appRoot: string): Promise<WorkerManifest> {
       routes[r.path] = def;
       layoutChains[r.path] = chain;
     }
+    if (boundaryIndex !== null && key !== null) layoutBoundaries[r.path] = { index: boundaryIndex, key };
     if (loading) loadings[r.path] = loading;
   }
 
   let extra: ExtraHandler | undefined;
-  const extraFile = findExtraFile(appDir);
+  const extraFile = findMiddlewareFile(appDir);
   if (extraFile) {
     const mod = (await import(pathToFileURL(extraFile).href)) as { default?: unknown };
     if (typeof mod.default === "function") extra = mod.default as ExtraHandler;
@@ -226,10 +262,13 @@ export async function buildManifest(appRoot: string): Promise<WorkerManifest> {
   return {
     routes,
     dynamicRoutes,
+    resourceRoutes,
     layoutChains,
+    layoutBoundaries,
     loadings,
     document: frozen.document,
     agent: frozen.agent,
+    i18n: frozen.i18n,
     earlyHints: frozen.earlyHints,
     extra,
   };
@@ -256,6 +295,15 @@ export async function juneBuild(
   if (routes.length === 0) throw new Error(`no page.* routes found under ${appDir}`);
 
   const frozen = await freezeConfig(appRoot);
+  // The locales table freezes into the worker as data; a resolveLocale hook is a
+  // function and won't survive JSON codegen. URL-pinned resolution + the built-in
+  // negotiation chain still work in the worker — only the hook is dev-only for now.
+  if (frozen.i18n?.resolveLocale) {
+    console.warn(
+      "[june build] i18n.resolveLocale is not yet wired into the built worker " +
+        "(URL-pinned + built-in negotiation work; the hook runs in dev only).",
+    );
+  }
   // The deploy adapter packages the portable build for its target (default:
   // built-in workers()). It contributes the entry's export wrapper + emits the
   // deploy config.
@@ -348,17 +396,54 @@ export async function juneBuild(
     }
     return id;
   };
+  // `segmentBoundary` is a STATIC export, so read each layout module here (no
+  // render) to know its boundary flag AND whether it loads at all — codegen then
+  // FILTERS null layouts and computes the boundary index/key through the SAME
+  // shared resolver the dev/manifest paths use, so all three agree by
+  // construction (not by a fragile "indices happen to line up" assumption).
+  const layoutInfo = new Map<string, ImportedLayout | null>();
+  for (const f of new Set(routes.flatMap((r) => (r.resource ? [] : r.layouts)))) {
+    layoutInfo.set(f, await importLayout(f));
+  }
   const chains: string[] = [];
+  const boundaries: string[] = [];
   const loadings: string[] = [];
+  const resources: string[] = [];
   routes.forEach((r, i) => {
+    // Resource route (route.*): the default export IS the handler — import it
+    // directly (no routeFromModule, no layout chain).
+    if (r.resource) {
+      imports.push(`import h${i} from ${JSON.stringify(importPath(genDir, r.file))};`);
+      resources.push(`    { pattern: ${JSON.stringify(r.path)}, handler: h${i} },`);
+      return;
+    }
     imports.push(`import * as r${i} from ${JSON.stringify(importPath(genDir, r.file))};`);
     if (r.dynamic) dynamics.push(`    { pattern: ${JSON.stringify(r.path)}, def: routeFromModule(r${i}) },`);
     else statics.push(`    ${JSON.stringify(r.path)}: routeFromModule(r${i}),`);
-    chains.push(`    ${JSON.stringify(r.path)}: [${r.layouts.map(layoutId).join(", ")}],`);
+    // entry = the emitted layout id (null layouts filtered out, so layoutId — and
+    // its import — is only emitted for real layouts), matching the runtime chain.
+    const { chain, boundaryIndex, key } = resolveBoundary(
+      r.layouts.map((f) => {
+        const info = layoutInfo.get(f) ?? null;
+        return { file: f, entry: info ? layoutId(f) : null, boundary: !!info?.boundary };
+      }),
+    );
+    chains.push(`    ${JSON.stringify(r.path)}: [${chain.join(", ")}],`);
+    if (boundaryIndex !== null && key !== null) {
+      boundaries.push(`    ${JSON.stringify(r.path)}: { index: ${boundaryIndex}, key: ${JSON.stringify(key)} },`);
+    }
     if (r.loading) loadings.push(`    ${JSON.stringify(r.path)}: ${loadingId(r.loading)},`);
   });
-
-  const builtExtraFile = findExtraFile(appDir);
+  const resourceRoutesField = resources.length
+    ? `\n  resourceRoutes: [\n${resources.join("\n")}\n  ],`
+    : "";
+  // Only emitted when some route declares a boundary, so boundary-less bundles
+  // stay byte-identical (additive manifest field, like resources).
+  const layoutBoundariesField = boundaries.length
+    ? `\n  layoutBoundaries: {\n${boundaries.join("\n")}\n  },`
+    : "";
+
+  const builtExtraFile = findMiddlewareFile(appDir);
   if (builtExtraFile) {
     imports.push(`import extra from ${JSON.stringify(importPath(genDir, builtExtraFile))};`);
   }
@@ -418,15 +503,15 @@ ${statics.join("\n")}
   },
   dynamicRoutes: [
 ${dynamics.join("\n")}
-  ],
+  ],${resourceRoutesField}
   layoutChains: {
 ${chains.join("\n")}
-  },
+  },${layoutBoundariesField}
   loadings: {
 ${loadings.join("\n")}
   },
   document: ${JSON.stringify(frozen.document, null, 2).replace(/\n/g, "\n  ")},
-  agent: ${JSON.stringify(frozen.agent)},
+  agent: ${JSON.stringify(frozen.agent)},${frozen.i18n ? `\n  i18n: ${JSON.stringify(frozen.i18n)},` : ""}
   earlyHints: ${JSON.stringify(frozen.earlyHints)},${builtExtraFile ? "\n  extra," : ""}${resourcesField}
 });
 
@@ -487,10 +572,11 @@ ${adapterEntry.wrap("pipeline")}
     const def = manifest.routes[r.path];
     if (!def || !def.prerender) continue;
     const stem = r.path === "/" ? "index" : r.path.slice(1);
-    // The homepage's projection requests are `/.md` / `/.json` (negotiate strips
-    // the ext back to `/`); withAssets serves them for `Accept: text/markdown`.
-    const mdReq = r.path === "/" ? "/.md" : `${r.path}.md`;
-    const jsonReq = r.path === "/" ? "/.json" : `${r.path}.json`;
+    // The homepage's projection requests are `/index.md` / `/index.json` (negotiate
+    // treats `/index` as the alias for `/`); these become the `index.md` /
+    // `index.json` assets the worker serves at the same intuitive paths.
+    const mdReq = r.path === "/" ? "/index.md" : `${r.path}.md`;
+    const jsonReq = r.path === "/" ? "/index.json" : `${r.path}.json`;
     const targets: Array<[string, string]> = [
       [r.path, `${stem}.html`],
       [mdReq, `${stem}.md`],

package/src/dev-reload.ts

@@ -18,6 +18,7 @@ const SCRIPT_PATH = "/__june/reload.js";
 const RELOAD_JS = `// june dev live-reload: reconnect-after-drop → reload; "css" event → hot-swap
 (() => {
   let dropped = false;
+  let es;
   const swapCss = () => {
     document.querySelectorAll('link[rel="stylesheet"]').forEach((old) => {
       const u = new URL(old.href);
@@ -33,7 +34,7 @@ const RELOAD_JS = `// june dev live-reload: reconnect-after-drop → reload; "cs
     });
   };
   const connect = () => {
-    const es = new EventSource(${JSON.stringify(EVENTS_PATH)});
+    es = new EventSource(${JSON.stringify(EVENTS_PATH)});
     es.addEventListener("open", () => {
       if (dropped) {
         // push-HMR: morph the freshly-restarted page in place (state survives);
@@ -58,6 +59,11 @@ const RELOAD_JS = `// june dev live-reload: reconnect-after-drop → reload; "cs
       }
     });
   };
+  // Release the SSE on navigation. In MPA mode every click is a full reload that
+  // opens a fresh EventSource; without this the old connection lingers and, since
+  // each held SSE consumes one of the browser's ~6 HTTP/1.1 slots per host, rapid
+  // navigation saturates them — further page loads stall (pending) / 503.
+  addEventListener("pagehide", () => { try { es && es.close(); } catch (e) {} });
   connect();
 })();
 `;

package/src/index.ts

@@ -50,6 +50,21 @@ export {
 } from "./router";
 export { installAsyncContext } from "./instrumentation";
 export { negotiate, type Negotiated } from "./negotiate";
+// Locale routing (Layer 1). The pure host-resolution layer lives in @junejs/core;
+// re-exported here so apps build locale links with `localeHref` off the ONE handle.
+export {
+  localeHref,
+  resolveRequestLocale,
+  matchPinnedLocale,
+  negotiateLocale,
+  parseAcceptLanguage,
+  localeDir,
+  dirForLang,
+  LOCALE_COOKIE,
+  type I18nConfig,
+  type LocaleConfig,
+  type LocaleMatch,
+} from "@junejs/core/i18n";
 export {
   createPipeline,
   type Pipeline,

package/src/negotiate.ts

@@ -11,7 +11,7 @@ import type { RenderTarget } from "@junejs/core/route";
 // The fragment media type + title header are the client-router wire protocol —
 // defined once in @junejs/core so the browser router and this negotiator share
 // the exact strings. Re-exported so existing server-side importers are unaffected.
-export { FRAGMENT_ACCEPT, TITLE_HEADER } from "@junejs/core/nav-protocol";
+export { FRAGMENT_ACCEPT, TITLE_HEADER, SEGMENT_HEADER } from "@junejs/core/nav-protocol";
 
 const EXT_TARGET: Record<string, RenderTarget> = {
   ".json": "json",
@@ -31,8 +31,13 @@ export type Negotiated = {
   speculative: boolean;
 };
 
-export function negotiate(url: URL, request: Request): Negotiated {
-  let pathname = url.pathname;
+// `basePath` overrides the pathname to negotiate (defaults to url.pathname). The
+// i18n step strips the locale prefix off the FRONT of url.pathname first and
+// passes the remainder here, so extension/Accept negotiation runs on the route
+// path, not the locale-prefixed one. url.pathname stays the raw request path.
+export function negotiate(url: URL, request: Request, basePath?: string): Negotiated {
+  const original = basePath ?? url.pathname;
+  let pathname = original;
   let target: RenderTarget | null = null;
 
   for (const [ext, t] of Object.entries(EXT_TARGET)) {
@@ -43,6 +48,19 @@ export function negotiate(url: URL, request: Request): Negotiated {
     }
   }
 
+  // "/index" is the conventional alias for the home route "/": the home page's
+  // projections live at the intuitive `/index.md` / `/index.json` (and plain
+  // `/index` serves the home view), matching the build's `index.md` / `index.json`
+  // assets.
+  if (pathname === "/index") {
+    pathname = "/";
+  } else if (target && pathname === "/") {
+    // A bare projection on the root — `/.md`, `/.json` — is NOT a real URL (the
+    // home surface is `/index.md`). Stripping the extension collapses it to "/",
+    // so steer it back to the literal path: no route matches → 404.
+    pathname = original;
+  }
+
   if (!target) {
     const accept = request.headers.get("accept") ?? "";
     for (const [re, t] of ACCEPT_TARGET) {

package/src/pipeline.ts

@@ -37,9 +37,29 @@ import { mcpHandler, mcpTools } from "@junejs/core/mcp";
 
 import { ensureScope, runInScope } from "@junejs/db";
 import type { AgentConfig } from "@junejs/core/config";
+import {
+  LOCALE_COOKIE,
+  localeDir,
+  matchPinnedLocale,
+  negotiateLocale,
+  type I18nConfig,
+} from "@junejs/core/i18n";
 import type { Resources } from "@junejs/core/resources";
 
-import { negotiate, TITLE_HEADER } from "./negotiate";
+import { negotiate, TITLE_HEADER, SEGMENT_HEADER } from "./negotiate";
+
+// Minimal Cookie-header read for the locale negotiation chain (no dependency on
+// an auth/cookie integration — i18n must stand alone).
+function readCookie(request: Request, name: string): string | undefined {
+  const header = request.headers.get("cookie");
+  if (!header) return undefined;
+  for (const part of header.split(";")) {
+    const eq = part.indexOf("=");
+    if (eq === -1) continue;
+    if (part.slice(0, eq).trim() === name) return decodeURIComponent(part.slice(eq + 1).trim());
+  }
+  return undefined;
+}
 
 export type LayoutComponent = React.ComponentType<{ children: React.ReactNode }>;
 export type LoadingComponent = React.ComponentType;
@@ -54,15 +74,39 @@ export type Resolved = {
   // into streaming Suspense: the shell + this fallback flush before load()
   // resolves, then the view streams in.
   loading?: React.ComponentType;
+  // Segment-scoped fragments: the index in `chain` of the boundary layout (the
+  // one exporting `segmentBoundary` and rendering <JuneOutlet>), deepest wins.
+  // A soft-nav fragment then renders only chain.slice(boundaryIndex + 1) — the
+  // boundary layout's own markup (the persistent shell) is NOT re-rendered.
+  // null/undefined → whole-chain fragment (the default). Full documents always
+  // render the whole chain regardless, so a hard load is unaffected.
+  boundaryIndex?: number | null;
+  // The shell's identity key (which boundary layout owns it). Stamped on
+  // [data-june-root] (full load) and sent as the SEGMENT_HEADER (fragment) so the
+  // client morphs a fragment only into the shell it belongs to. Set iff boundaryIndex is.
+  boundaryKey?: string | null;
 };
 
+// A RESOURCE route (app/**/route.*): a handler returning a raw Response — binary,
+// custom content-type, webhook — resolved by the SAME matcher (params from the
+// path), so it lives in the route table instead of a hand-rolled url branch.
+export type ResourceHandler = (
+  request: Request,
+  ctx: RouteContext,
+) => Response | Promise<Response>;
+export type ResolvedResource = { handler: ResourceHandler; params: Record<string, string> };
+
 // The one thing dev and worker do differently: turn a clean pathname into a
 // matched route. Dev walks the filesystem; the worker reads the frozen manifest.
-export type RouteResolver = (pathname: string) => Promise<Resolved | null>;
+// A match is either a page (Resolved) or a resource route (ResolvedResource).
+export type RouteResolver = (pathname: string) => Promise<Resolved | ResolvedResource | null>;
 
 export type PipelineConfig = {
   docConfig: DocumentConfig;
   agent: AgentConfig;
+  // Locale routing config (june.config.ts `i18n`). Absent → no locale handling:
+  // the resolution step below never runs and ctx.locale stays undefined.
+  i18n?: I18nConfig;
   // The route list for discovery surfaces (sitemap / llms.txt). Async so dev can
   // re-scan the filesystem; the worker returns a frozen array.
   routeList: () => Promise<string[]> | string[];
@@ -80,10 +124,18 @@ export type PipelineConfig = {
   extra?: ExtraHandler;
 };
 
-export type ExtraHandler = (
+// app/_middleware.* default export. Runs after the agent surface, before route
+// resolution; return null to pass through, a Response to short-circuit.
+//   ⚠ Don't authorize here — authorization is the single defineAction
+//     run(input, ctx) gate; a check here is a second, ungoverned path.
+//   ⚠ It runs BEFORE routes, so over-broad url matching shadows a page. For a
+//     custom endpoint (binary, webhook) prefer a route.* resource route.
+export type MiddlewareHandler = (
   request: Request,
   url: URL,
 ) => Promise<Response | null> | Response | null;
+/** @deprecated the former name (app/_extra); use {@link MiddlewareHandler}. */
+export type ExtraHandler = MiddlewareHandler;
 
 export type Pipeline = { fetch(request: Request): Promise<Response> };
 
@@ -153,11 +205,22 @@ export function createPipeline(cfg: PipelineConfig): Pipeline {
     return headers;
   }
 
+  // The document language + writing direction for one render. lang = the resolved
+  // locale (ctx.locale) when i18n is on, else the site.lang floor, else "en"; dir
+  // derives from it (a LocaleConfig.dir override wins). LTR → dir undefined, so
+  // single-locale pages stay byte-identical.
+  function langDir(locale: string | undefined): { lang: string; dir?: "ltr" | "rtl" } {
+    const lang = locale ?? docConfig.site.lang ?? "en";
+    return { lang, dir: localeDir(lang, cfg.i18n) };
+  }
+
   async function renderDocument(
     node: React.ReactNode,
     metadata: Metadata | undefined,
     status: number,
     chain: LayoutComponent[],
+    locale?: string,
+    boundaryKey?: string | null,
   ): Promise<Response> {
     // Wrap root→leaf: chain[0] is outermost.
     const wrapped = chain.reduceRight<React.ReactNode>(
@@ -165,7 +228,13 @@ export function createPipeline(cfg: PipelineConfig): Pipeline {
       node,
     );
     const stream = await renderToReadableStream(
-      React.createElement(Document, { config: docConfigForRender(), metadata, children: wrapped }),
+      React.createElement(Document, {
+        config: docConfigForRender(),
+        metadata,
+        children: wrapped,
+        shellKey: boundaryKey, // stamps data-june-shell on [data-june-root]
+        ...langDir(locale),
+      }),
     );
     await stream.allReady; // fully resolved markup (no streamed Suspense fallbacks)
     // React 19 emits <!DOCTYPE html> itself for an <html> root — don't prepend a
@@ -183,8 +252,20 @@ export function createPipeline(cfg: PipelineConfig): Pipeline {
     node: React.ReactNode,
     metadata: Metadata | undefined,
     chain: LayoutComponent[],
+    boundaryIndex?: number | null,
+    boundaryKey?: string | null,
   ): Promise<Response> {
-    const wrapped = chain.reduceRight<React.ReactNode>(
+    // ONE gate: a fragment is segment-scoped iff it has both a boundary index AND
+    // a shell key. They always travel together (resolveBoundary returns both or
+    // neither), but tying the content-slice and the header to a single flag means
+    // a content-only body can never go out without its key (which would wipe the
+    // shell) nor a key without a content-only body.
+    const segmented = typeof boundaryIndex === "number" && boundaryKey != null;
+    // Segment-scoped renders ONLY the chain below the boundary layout (its
+    // children = the <JuneOutlet> contents on a full load), so the boundary
+    // layout's shell markup is never produced. Whole-chain wraps the entire chain.
+    const inside = segmented ? chain.slice(boundaryIndex! + 1) : chain;
+    const wrapped = inside.reduceRight<React.ReactNode>(
       (acc, L) => React.createElement(L, null, acc),
       node,
     );
@@ -194,6 +275,9 @@ export function createPipeline(cfg: PipelineConfig): Pipeline {
     const headers = new Headers({ "content-type": "text/html; charset=utf-8" });
     const title = typeof metadata?.title === "string" ? metadata.title : undefined;
     if (title) headers.set(TITLE_HEADER, title);
+    // The shell key tells the client which shell this content-only fragment is
+    // for; it morphs the outlet only when that matches the mounted shell.
+    if (segmented) headers.set(SEGMENT_HEADER, boundaryKey!);
     return new Response(html, { status: 200, headers });
   }
 
@@ -215,7 +299,7 @@ export function createPipeline(cfg: PipelineConfig): Pipeline {
     loadPromise: Promise<unknown>,
     ctx: RouteContext,
   ): Promise<Response> {
-    const { def, chain, loading: Loading } = resolved;
+    const { def, chain, loading: Loading, boundaryKey } = resolved;
     const leaf = React.createElement(StreamedView, { loadPromise, def, ctx });
     const boundary = React.createElement(
       Suspense,
@@ -228,7 +312,13 @@ export function createPipeline(cfg: PipelineConfig): Pipeline {
     );
     const metadata = typeof def.metadata === "object" ? def.metadata : undefined;
     const stream = await renderToReadableStream(
-      React.createElement(Document, { config: docConfigForRender(), metadata, children: wrapped }),
+      React.createElement(Document, {
+        config: docConfigForRender(),
+        metadata,
+        children: wrapped,
+        shellKey: boundaryKey, // stamps data-june-shell on [data-june-root]
+        ...langDir(ctx.locale),
+      }),
       { onError: (e: unknown) => console.error("[june] streaming render error:", e) },
     );
     // NO allReady — return the live stream (shell first). React 19 streams the
@@ -236,7 +326,11 @@ export function createPipeline(cfg: PipelineConfig): Pipeline {
     return new Response(stream, { status: 200, headers: htmlHeaders() });
   }
 
-  function notFoundResponse(target: RenderTarget, pathname: string): Promise<Response> | Response {
+  function notFoundResponse(
+    target: RenderTarget,
+    pathname: string,
+    locale?: string,
+  ): Promise<Response> | Response {
     // Data clients get a JSON 404; humans get the rendered NotFound document.
     return target !== "view"
       ? Response.json({ error: "Not Found", path: pathname }, { status: 404 })
@@ -245,6 +339,7 @@ export function createPipeline(cfg: PipelineConfig): Pipeline {
           { title: "Not found", robots: "noindex" },
           404,
           [],
+          locale,
         );
   }
 
@@ -275,15 +370,15 @@ export function createPipeline(cfg: PipelineConfig): Pipeline {
     data: unknown,
     ctx: RouteContext,
   ): Promise<Response> {
-    const { def, chain } = resolved;
+    const { def, chain, boundaryIndex, boundaryKey } = resolved;
     // A projection declared `false` is disabled → 404 (and absent from discovery).
     // "fragment" isn't a declarable projection (it's the view rendered without the
     // shell), so it's never disabled — exclude it from the check.
     if (target !== "fragment" && def[target] === false) {
-      return notFoundResponse(target, ctx.url.pathname);
+      return notFoundResponse(target, ctx.url.pathname, ctx.locale);
     }
 
-    const res = await renderTarget(target, def, data, ctx, chain);
+    const res = await renderTarget(target, def, data, ctx, chain, boundaryIndex, boundaryKey);
     // Every projection here is chosen by the Accept header at the SAME url (a full
     // page, its fragment, its .md and .json all live at the clean path). Without
     // Vary, a shared/browser cache can hand a soft-nav fragment to a real page
@@ -299,6 +394,8 @@ export function createPipeline(cfg: PipelineConfig): Pipeline {
     data: unknown,
     ctx: RouteContext,
     chain: LayoutComponent[],
+    boundaryIndex?: number | null,
+    boundaryKey?: string | null,
   ): Promise<Response> {
     if (target === "md") return renderMarkdown(def, data, ctx);
     if (target === "json") {
@@ -308,8 +405,11 @@ export function createPipeline(cfg: PipelineConfig): Pipeline {
     }
     const node = provideLoaderData(data, def.view ? def.view(data, ctx) : null);
     const meta = resolveMeta(def, data, ctx);
-    if (target === "fragment") return renderFragment(node, meta, chain);
-    return renderDocument(node, meta, 200, chain);
+    // Only the fragment projection narrows to a segment; the full document always
+    // renders the whole chain (a hard load of the URL is never segment-scoped) —
+    // but it stamps the shell key so the client knows which shell is mounted.
+    if (target === "fragment") return renderFragment(node, meta, chain, boundaryIndex, boundaryKey);
+    return renderDocument(node, meta, 200, chain, ctx.locale, boundaryKey);
   }
 
   async function discovery(url: URL): Promise<Response | null> {
@@ -365,10 +465,35 @@ export function createPipeline(cfg: PipelineConfig): Pipeline {
         return letterFavicon(docConfig.site.name);
       }
 
+      // --- locale resolution (before routing) ------------------------------
+      // host/path → locale, stripping the locale prefix off the front so the
+      // router matches the bare route path. Only runs when `i18n` is configured.
+      let locale: string | undefined;
+      let routeBase = url.pathname;
+      if (cfg.i18n) {
+        const pinned = matchPinnedLocale(cfg.i18n, url.host, url.pathname);
+        if (pinned) {
+          locale = pinned.locale;
+          routeBase = pinned.pathname;
+        } else {
+          // Ambiguous (bare path on the default origin): the resolveLocale hook
+          // gets first say, then the built-in chain. The hook runs ONLY here —
+          // never when the URL already pinned the locale.
+          const override = cfg.i18n.resolveLocale?.({ url, headers: request.headers });
+          locale =
+            override && cfg.i18n.locales[override]
+              ? override
+              : negotiateLocale(cfg.i18n, {
+                  acceptLanguage: request.headers.get("accept-language"),
+                  cookie: readCookie(request, LOCALE_COOKIE),
+                });
+        }
+      }
+
       // --- routes ----------------------------------------------------------
-      const { target, pathname, speculative } = negotiate(url, request);
+      const { target, pathname, speculative } = negotiate(url, request, routeBase);
       const resolved = await cfg.resolve(pathname);
-      if (!resolved) return notFoundResponse(target, pathname);
+      if (!resolved) return notFoundResponse(target, pathname, locale);
 
       // ctx is identity/request only; db/kv/blob are ambient (read from the
       // request scope this whole handler runs inside — see runInScope below).
@@ -377,8 +502,13 @@ export function createPipeline(cfg: PipelineConfig): Pipeline {
         url,
         params: resolved.params,
         target,
+        locale,
         speculative,
       };
+
+      // Resource route (route.*): a raw-Response handler — no projection, no doc
+      // shell. It's matched like any route, so it can't shadow a page.
+      if ("handler" in resolved) return resolved.handler(request, ctx);
       // Streaming Suspense: a view request on a route with loading.tsx AND
       // static metadata flushes the shell + fallback before load() resolves.
       // (data-derived metadata can't stream — the <head> needs the title.)
@@ -394,7 +524,7 @@ export function createPipeline(cfg: PipelineConfig): Pipeline {
         data = resolved.def.load ? await resolved.def.load(ctx) : undefined;
       } catch {
         // unknown slug etc. → 404 (segment error boundaries are a later milestone)
-        return notFoundResponse(target, pathname);
+        return notFoundResponse(target, pathname, locale);
       }
       return renderProjection(resolved, target, data, ctx);
   }

package/src/router.ts

@@ -31,14 +31,27 @@ export type RouteTreeMatch = {
 
 const routeExtensions = new Set([".tsx", ".jsx", ".ts", ".js"]);
 
-// app/_extra.* — the pre-route escape hatch (a `_` file, so never a route).
-// Dev and the build look it up through this ONE helper so the conventions
-// cannot drift.
-export function findExtraFile(appDir: string): string | null {
+// app/_middleware.* — the pre-route middleware seam (a `_` file, so never a
+// route): runs after the agent surface, before route resolution. Return null to
+// pass; return a Response to short-circuit. Two cautions (see MiddlewareHandler):
+// don't authorize here (that's the single run(input, ctx) gate), and because it
+// runs BEFORE routes, over-broad matching can shadow a page. For a custom
+// endpoint (binary, webhook), prefer a route.* resource route instead.
+// `_extra` is the deprecated former name (warned + still honored for one cycle).
+// Dev and the build look it up through this ONE helper so the conventions can't
+// drift.
+export function findMiddlewareFile(appDir: string): string | null {
   for (const ext of routeExtensions) {
-    const f = join(appDir, `_extra${ext}`);
+    const f = join(appDir, `_middleware${ext}`);
     if (existsSync(f)) return f;
   }
+  for (const ext of routeExtensions) {
+    const f = join(appDir, `_extra${ext}`);
+    if (existsSync(f)) {
+      console.warn("[june] app/_extra is deprecated — rename it to app/_middleware.");
+      return f;
+    }
+  }
   return null;
 }
 
@@ -58,6 +71,14 @@ function isPageFile(file: string) {
   return base === "page" || base === "index";
 }
 
+// app/**/route.* — a RESOURCE route: a handler returning a raw Response (binary,
+// custom content-type, webhook), not a React page. It's a first-class route (in
+// the route table, params from the path, resolved by the SAME matcher), so it
+// can't shadow pages by accident and doesn't need hand-rolled url matching.
+export function isResourceFile(file: string): boolean {
+  return baseName(file) === "route";
+}
+
 // Special (never-a-route) files that shape the segment tree.
 const SPECIAL_FILES = new Set(["layout", "loading", "error", "not-found"]);
 
@@ -118,7 +139,7 @@ function routePath(appDir: string, file: string) {
   // Route groups shape the filesystem, not the URL.
   const parts = withoutExtension.split("/").filter((p) => !isRouteGroup(p));
 
-  if (parts.at(-1) === "page" || parts.at(-1) === "index") {
+  if (parts.at(-1) === "page" || parts.at(-1) === "index" || parts.at(-1) === "route") {
     parts.pop();
   }
 
@@ -146,9 +167,12 @@ export async function matchRouteTree(
     const entries = await listDir(dir);
     const segments = [...chain, segmentAt(dir, entries)];
 
-    // Terminal: URL consumed → find the page in this dir.
+    // Terminal: URL consumed → find the page (or resource route) in this dir.
     if (rest.length === 0) {
-      const page = fileFor(entries, dir, "page") ?? fileFor(entries, dir, "index");
+      const page =
+        fileFor(entries, dir, "page") ??
+        fileFor(entries, dir, "index") ??
+        fileFor(entries, dir, "route");
       if (page) return { file: page, params, segments };
     } else if (!options.pageConvention) {
       // Legacy flat convention: a non-special leaf FILE names the final segment
@@ -251,17 +275,19 @@ export async function routeFiles(
     if (!routeExtensions.has(file.match(/\.[^.]+$/)?.[0] ?? "")) return false;
     if (isSpecialFile(file)) return false;
     if (file.split(sep).some((p) => p.startsWith("_"))) return false;
-    if (options.pageConvention && !isPageFile(file)) return false;
+    if (options.pageConvention && !isPageFile(file) && !isResourceFile(file)) return false;
     return true;
   });
 }
 
-// All route paths under appDir (for sitemap / llms.txt / api-catalog).
+// All PAGE route paths under appDir (for sitemap / llms.txt / api-catalog).
+// Resource routes (route.*) are excluded — they're machine endpoints (og images,
+// webhooks), not pages, so they don't belong in the human/agent sitemap.
 export async function listRoutes(
   appDir: string,
   options: MatchOptions = {},
 ): Promise<string[]> {
-  const files = await routeFiles(appDir, options);
+  const files = (await routeFiles(appDir, options)).filter((file) => !isResourceFile(file));
   return [...new Set(files.map((file) => routePath(appDir, file)))].sort();
 }
 

package/src/segment.ts

@@ -0,0 +1,60 @@
+// Segment-boundary resolution — the ONE place the "deepest segmentBoundary wins"
+// rule lives, shared by the dev resolver (app.ts), the build manifest, and the
+// codegen (build.ts). Single-sourcing it keeps dev / frozen-manifest / deployed
+// worker from drifting on the exact invariant the feature depends on.
+//
+// HOST-ONLY (uses node:crypto): runs in the dev server and at build time, never
+// in the worker request path — the worker reads the frozen key from the manifest.
+import { createHash } from "node:crypto";
+
+export const boundaryWarning = (file: string): string =>
+  `[june] multiple segmentBoundary layouts in one chain (${file}); using the deepest.`;
+
+// A stable key identifying a boundary layout (its persistent shell). Same file →
+// same key (a shell shared across routes); different file → different key (a
+// distinct shell), so the client can tell whether a soft-nav fragment belongs to
+// the shell currently mounted and hard-navigate when it doesn't. Consistency is
+// only needed WITHIN one running instance (dev server OR deployed worker), since
+// the key is compared between an outlet's host marker and a response header both
+// produced by that same instance — dev and prod need not agree.
+//
+// Memoized: the dev resolver runs per request, and the key is a pure function of
+// the path. 16 hex chars (64 bits) makes a same-instance collision between two
+// boundary layouts — which would morph one shell's content into another — beyond
+// reach without inflating the wire marker.
+const keyCache = new Map<string, string>();
+export function boundaryKey(file: string): string {
+  let key = keyCache.get(file);
+  if (key === undefined) {
+    key = createHash("sha256").update(file).digest("hex").slice(0, 16);
+    keyCache.set(file, key);
+  }
+  return key;
+}
+
+// Build the layout chain (root→leaf, null entries filtered) and locate the
+// boundary: the DEEPEST entry flagged `boundary`. The index is into the FILTERED
+// chain — every consumer filters identically, so the index always matches the
+// chain the worker actually renders. Generic over the entry type so codegen can
+// pass layout-id strings where dev/build pass component functions.
+export function resolveBoundary<C>(
+  items: Array<{ file: string; entry: C | null; boundary: boolean }>,
+): { chain: C[]; boundaryIndex: number | null; key: string | null } {
+  const chain: C[] = [];
+  let boundaryIndex: number | null = null;
+  let boundaryFile: string | null = null;
+  for (const it of items) {
+    if (it.entry == null) continue; // dropped layout — filtered consistently everywhere
+    if (it.boundary) {
+      if (boundaryIndex !== null) console.warn(boundaryWarning(it.file));
+      boundaryIndex = chain.length;
+      boundaryFile = it.file;
+    }
+    chain.push(it.entry);
+  }
+  return {
+    chain,
+    boundaryIndex,
+    key: boundaryFile === null ? null : boundaryKey(boundaryFile),
+  };
+}

package/src/worker.ts

@@ -14,22 +14,35 @@ import type React from "react";
 import type { BrandedRoute } from "@junejs/core/route";
 import type { AgentConfig } from "@junejs/core/config";
 import type { DocumentConfig } from "@junejs/core/document";
+import type { I18nConfig } from "@junejs/core/i18n";
 import type { Resources } from "@junejs/core/resources";
 
-import { createPipeline, type ExtraHandler, type LayoutComponent, type LoadingComponent, type Resolved } from "./pipeline";
+import { createPipeline, type ExtraHandler, type LayoutComponent, type LoadingComponent, type Resolved, type ResolvedResource, type ResourceHandler } from "./pipeline";
 
 export type WorkerManifest = {
   // Static paths → route definitions ("/", "/users", ...).
   routes: Record<string, BrandedRoute>;
   // Dynamic patterns in file-route syntax ("/posts/[slug]", "/docs/[...path]").
   dynamicRoutes?: Array<{ pattern: string; def: BrandedRoute }>;
+  // Resource routes (app/**/route.*): a raw-Response handler keyed by its pattern
+  // (static or dynamic). Matched after pages, so a page never gets shadowed.
+  resourceRoutes?: Array<{ pattern: string; handler: ResourceHandler }>;
   // Layout chains (root→leaf) keyed by route path / dynamic pattern. The build
   // freezes the same chain the dev server loads from app/layout.* files.
   layoutChains?: Record<string, LayoutComponent[]>;
+  // Segment boundary per route: the chain index of the deepest layout exporting
+  // `segmentBoundary` (renders <JuneOutlet>) plus the shell's identity `key`.
+  // Routes without one are absent → whole-chain fragment (the default). Frozen
+  // statically by the build.
+  layoutBoundaries?: Record<string, { index: number; key: string }>;
   // Nearest loading.tsx per route path → streaming Suspense fallback.
   loadings?: Record<string, LoadingComponent>;
   document: DocumentConfig;
   agent: AgentConfig;
+  // Locale routing config, frozen from june.config.ts `i18n`. The locales table
+  // is plain data; a `resolveLocale` hook survives the in-process freeze (parity
+  // test) but not JSON codegen — worker hook support lands with the codegen pass.
+  i18n?: I18nConfig;
   // Preload Link values (config earlyHints + auto font hints), frozen at build.
   earlyHints?: string[];
   htmlCacheControl?: string;
@@ -93,6 +106,11 @@ export function createWorker(
     def: d.def,
     pattern: d.pattern,
   }));
+  const resources = (manifest.resourceRoutes ?? []).map((r) => ({
+    ...compilePattern(r.pattern),
+    handler: r.handler,
+    pattern: r.pattern,
+  }));
   const routeList = [
     ...Object.keys(manifest.routes),
     ...(manifest.dynamicRoutes ?? []).map((d) => d.pattern),
@@ -100,6 +118,8 @@ export function createWorker(
 
   const chainFor = (key: string): LayoutComponent[] => manifest.layoutChains?.[key] ?? [];
   const loadingFor = (key: string): LoadingComponent | undefined => manifest.loadings?.[key];
+  const boundaryFor = (key: string): { index: number; key: string } | null =>
+    manifest.layoutBoundaries?.[key] ?? null;
 
   // The worker's env (D1/KV/R2 bindings) arrives per fetch and is stable across
   // requests in an isolate; we capture the latest and hand it to the env-aware
@@ -110,16 +130,26 @@ export function createWorker(
   const pipeline = createPipeline({
     docConfig: manifest.document,
     agent: manifest.agent,
+    i18n: manifest.i18n,
     routeList: () => routeList,
     earlyHints: manifest.earlyHints,
     htmlCacheControl: manifest.htmlCacheControl,
     notFoundComponent: manifest.notFound,
     extra: manifest.extra,
     resources: provider ? () => provider(currentEnv) : undefined,
-    resolve: async (pathname): Promise<Resolved | null> => {
+    resolve: async (pathname): Promise<Resolved | ResolvedResource | null> => {
       const staticDef = manifest.routes[pathname];
-      if (staticDef)
-        return { def: staticDef, params: {}, chain: chainFor(pathname), loading: loadingFor(pathname) };
+      if (staticDef) {
+        const b = boundaryFor(pathname);
+        return {
+          def: staticDef,
+          params: {},
+          chain: chainFor(pathname),
+          boundaryIndex: b?.index ?? null,
+          boundaryKey: b?.key ?? null,
+          loading: loadingFor(pathname),
+        };
+      }
       for (const d of dynamic) {
         const m = pathname.match(d.regex);
         if (m) {
@@ -131,7 +161,28 @@ export function createWorker(
               return v === undefined ? [] : [[n, decodeURIComponent(v)]];
             }),
           );
-          return { def: d.def, params, chain: chainFor(d.pattern), loading: loadingFor(d.pattern) };
+          const b = boundaryFor(d.pattern);
+          return {
+            def: d.def,
+            params,
+            chain: chainFor(d.pattern),
+            boundaryIndex: b?.index ?? null,
+            boundaryKey: b?.key ?? null,
+            loading: loadingFor(d.pattern),
+          };
+        }
+      }
+      // Resource routes after pages (so a page is never shadowed by one).
+      for (const r of resources) {
+        const m = pathname.match(r.regex);
+        if (m) {
+          const params = Object.fromEntries(
+            r.names.flatMap((n, i) => {
+              const v = m[i + 1];
+              return v === undefined ? [] : [[n, decodeURIComponent(v)]];
+            }),
+          );
+          return { handler: r.handler, params };
         }
       }
       return null;