akanjs 3.0.0-beta.26 → 3.0.0-beta.27

package/client/csrTypes.ts

@@ -174,6 +174,8 @@ export interface Route {
   path: string;
   renderPage?: RouteRender;
   renderLayout?: RouteRender;
+  /** `renderLayout` is a generated `__root_layout`: a root boundary the page generator found. */
+  isRootLayout?: boolean;
   /** Synthetic layout render from a `_overrides.tsx` at this node; wraps the subtree in a UI-override provider. */
   renderOverrides?: RouteRender;
   pageIncludesOwnLayout?: boolean;

package/client/device.ts

@@ -15,14 +15,13 @@ let debugSeq = 0;
 
 const isFrameDebugEnabled = () => {
   if (typeof window === "undefined") return false;
-  const windowWithTarget = window as typeof window & { __AKAN_MOBILE_TARGET__?: unknown };
-  const search = new URLSearchParams(window.location.search);
-  return (
-    Boolean(windowWithTarget.__AKAN_MOBILE_TARGET__) ||
-    search.has("akanMobileTarget") ||
-    search.get("akanFrameDebug") === "1" ||
-    window.localStorage.getItem("akan:debug:frame") === "1"
-  );
+  if (new URLSearchParams(window.location.search).get("akanFrameDebug") === "1") return true;
+  try {
+    return window.localStorage.getItem("akan:debug:frame") === "1";
+  } catch {
+    
+    return false;
+  }
 };
 
 export function debugFrame(event: string, payload: DebugPayload = {}) {
@@ -33,7 +32,8 @@ export function debugFrame(event: string, payload: DebugPayload = {}) {
     now: Math.round(performance.now()),
     ...payload,
   };
-  console.info(`[akan:frame:${debugSessionId}:${debugSeq}] ${event}`, details, JSON.stringify(details));
+  
+  console.debug(`[akan:frame:${debugSessionId}:${debugSeq}] ${event}`, details);
 }
 
 interface DeviceInitOption {

package/common/Logger.ts

@@ -77,6 +77,15 @@ const colorizeMap: { [key in LogLevel]: (text: string) => string } = {
   error: clc.red,
 };
 
+const consoleMethodMap = {
+  trace: "debug",
+  verbose: "debug",
+  debug: "debug",
+  info: "info",
+  warn: "warn",
+  error: "error",
+} as const satisfies { [key in LogLevel]: "debug" | "info" | "warn" | "error" };
+
 const ansiPattern = new RegExp(`${String.fromCharCode(27)}\\[[0-?]*[ -/]*[@-~]`, "g");
 
 const redactedAttrKey = /password|passwd|token|jwt|authorization|cookie|secret|api[-_]?key|private[-_]?key/i;
@@ -332,7 +341,22 @@ export class Logger {
     if (!Logger.consoleOutput) return;
     if (typeof window === "undefined")
       (process[entry.stream] as unknown as NodeJS.WriteStream | undefined)?.write(entry.message);
-    else console.log(entry.message);
+    else Logger.#writeBrowserConsole(entry.record, entry.message);
+  }
+
+  static #writeBrowserConsole(record: LogRecord, rendered: string) {
+    const level = record.level ?? "info";
+    const context = record.context ? `[${record.context}] ` : "";
+    const attrs = record.attrs ? ` ${Logger.formatAttrs(record.attrs)}` : "";
+    const text = Logger.#inNativeShell()
+      ? `[${record.name}] ${context}${record.message}${attrs}`
+      : rendered.replace(/\n+$/, "");
+    
+    console[consoleMethodMap[level]](text);
+  }
+  static #inNativeShell() {
+    const platform = (globalThis as { __AKAN_NATIVE__?: { platform?: string } }).__AKAN_NATIVE__?.platform;
+    return platform !== undefined && platform !== "web";
   }
   static #write(name: string | undefined, message: string, context: string, logLevel: LogLevel, attrs?: LogAttrs) {
     const stream = logLevel === "error" ? "stderr" : "stdout";
@@ -367,7 +391,7 @@ export class Logger {
     if (!Logger.consoleOutput) return;
     if (typeof window === "undefined" && method !== "console" && (process as unknown as NodeJS.Process | undefined))
       process[stream].write(msg);
-    else console[outputStream === "error" ? "error" : "log"](msg.trim());
+    else console[outputStream === "error" ? "error" : Logger.#inNativeShell() ? "debug" : "log"](msg.trim());
   }
   static {
     if (envValue("AKAN_PUBLIC_LOG_LEVEL") === "log" && typeof window === "undefined")

package/common/RouteLayering.ts

@@ -0,0 +1,52 @@
+interface LayeredRoute<Render> {
+  /** The tree segment: `/`, `/:lang`, `/(group)`, `/foo`. */
+  path: string;
+  renderLayout?: Render;
+  /** A generated `__root_layout`: one of the root boundaries the page generator found. */
+  isRootLayout?: boolean;
+  renderOverrides?: Render;
+  /** `false` for a named page file, which sits beside its directory's layout rather than under it. */
+  pageIncludesOwnLayout?: boolean;
+}
+
+export interface RouteLayer<Render> {
+  /** The URL pattern down to this node; a route group adds nothing to it. */
+  path: string;
+  pathSegments: string[];
+  isRoot: boolean;
+  /** The root layout above or at this node, overrides left out: once there is one, nothing below is a root. */
+  rootLayouts: Render[];
+  renderRootLayouts: Render[];
+  renderLayouts: Render[];
+  /** What a page file at this node renders inside: without this node's layout for a named page file. */
+  pageRenderRootLayouts: Render[];
+  pageRenderLayouts: Render[];
+}
+
+export class RouteLayering {
+  static readonly #group = /^\/\(.*\)$/;
+
+  static of<Render>(route: LayeredRoute<Render>, parent: RouteLayer<Render> | null): RouteLayer<Render> {
+    const parentSegments = parent?.pathSegments ?? [];
+    const parentRootLayouts = parent?.rootLayouts ?? [];
+    const parentRootRenders = parent?.renderRootLayouts ?? [];
+    const parentLayouts = parent?.renderLayouts ?? [];
+    const segment = RouteLayering.#group.test(route.path) ? "" : route.path;
+    const path = parentSegments.filter((part) => part !== "/").join("") + segment;
+    const isRoot = parentRootLayouts.length === 0 && (route.isRootLayout === true || !route.renderLayout);
+    const overrideRenders = route.renderOverrides ? [route.renderOverrides] : [];
+
+    const nodeRenders = [...overrideRenders, ...(route.renderLayout ? [route.renderLayout] : [])];
+    const pageNodeRenders = route.pageIncludesOwnLayout === false ? overrideRenders : nodeRenders;
+    return {
+      path,
+      pathSegments: [...parentSegments, ...(segment ? [segment] : [])],
+      isRoot,
+      rootLayouts: isRoot && route.renderLayout ? [...parentRootLayouts, route.renderLayout] : parentRootLayouts,
+      renderRootLayouts: isRoot ? [...parentRootRenders, ...nodeRenders] : parentRootRenders,
+      renderLayouts: isRoot ? parentLayouts : [...parentLayouts, ...nodeRenders],
+      pageRenderRootLayouts: isRoot ? [...parentRootRenders, ...pageNodeRenders] : parentRootRenders,
+      pageRenderLayouts: isRoot ? parentLayouts : [...parentLayouts, ...pageNodeRenders],
+    };
+  }
+}

package/common/index.ts

@@ -128,6 +128,7 @@ export {
 export { deepObjectify, objectify, plainFieldsOf } from "./objectify";
 export { pathGet, pathGetLoose, pathSet, toPathSegments } from "./objectPath";
 export { formatPhone, isPhoneNumber } from "./phone";
+export { type RouteLayer, RouteLayering } from "./RouteLayering";
 export { randomPick, randomPicks } from "./randomPick";
 export { hostFromRequest, isJsonContentType, originFromRequest } from "./requestOrigin";
 export { RestClient, type RestClientOptions, type RestRequestOptions } from "./restClient";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "akanjs",
-  "version": "3.0.0-beta.26",
+  "version": "3.0.0-beta.27",
   "sourceType": "module",
   "type": "module",
   "publishConfig": {

package/server/routeTreeBuilder.ts

@@ -15,8 +15,9 @@ import {
   getRouteExports,
   Logger,
   matchRoutePattern,
-  parseBasePaths,
   parseRouteModuleKey,
+  type RouteLayer,
+  RouteLayering,
   routeSegmentToTreePath,
 } from "akanjs/common";
 import { createElement } from "react";
@@ -54,15 +55,12 @@ export class RouteTreeBuilder {
   };
 
   readonly #context: PagesContext;
-  readonly #baseLayoutPaths: string[];
   readonly #routeMap = new Map<string, Route>();
   readonly #pagePatterns: { key: string; pattern: string }[] = [];
   readonly #fallbackRoutes: LayoutFallbackRoute[] = [];
 
   constructor(context: PagesContext) {
     this.#context = context;
-    const basePaths = process.env.AKAN_PUBLIC_BASE_PATHS ? parseBasePaths(process.env.AKAN_PUBLIC_BASE_PATHS) : null;
-    this.#baseLayoutPaths = ["/", "/:lang", ...(basePaths?.map((bp) => `/:lang/${bp}`) ?? [])];
     this.#routeMap.set("/", { path: "/", children: new Map() });
   }
 
@@ -169,7 +167,7 @@ export class RouteTreeBuilder {
     targetRouteMap.set(targetPath, {
       ...(targetRouteMap.get(targetPath) ?? { path: targetPath, children: new Map<string, Route>() }),
       ...(parsed.kind === "layout"
-        ? { renderLayout: routeRender }
+        ? { renderLayout: routeRender, isRootLayout: parsed.isInternalRootLayout }
         : {
             renderPage: routeRender,
             pageIncludesOwnLayout: parsed.leaf === "_index",
@@ -178,48 +176,27 @@ export class RouteTreeBuilder {
     } as Route);
   }
 
-  #getPathRoutes(
-    route: Route,
-    parentRootLayouts: RouteRender[] = [],
-    parentLayouts: RouteRender[] = [],
-    parentPaths: string[] = [],
-    parentHead?: ResolveHead,
-    parentRootRenders: RouteRender[] = [],
-  ): PathRoute[] {
-    const parentPath = parentPaths.filter((p) => p !== "/").join("");
-    const currentPathSegment = /^\/\(.*\)$/.test(route.path) ? "" : route.path;
-    const isRoot = this.#baseLayoutPaths.includes(parentPath + currentPathSegment) && parentRootLayouts.length < 2;
-    const routePath = parentPath + currentPathSegment;
-    const pathSegments = [...parentPaths, ...(currentPathSegment ? [currentPathSegment] : [])];
-    const currentRootLayout = isRoot && route.renderLayout ? route.renderLayout : null;
-
-    const currentOverrideRenders = route.renderOverrides ? [route.renderOverrides] : [];
-    const nodeRenders = [...currentOverrideRenders, ...(route.renderLayout ? [route.renderLayout] : [])];
-    const rootLayoutStack = [...parentRootLayouts, ...(currentRootLayout ? [currentRootLayout] : [])];
-    const renderRootLayouts = isRoot ? [...parentRootRenders, ...nodeRenders] : parentRootRenders;
-    const renderLayouts = isRoot ? parentLayouts : [...parentLayouts, ...nodeRenders];
+  #getPathRoutes(route: Route, parent: RouteLayer<RouteRender> | null = null, parentHead?: ResolveHead): PathRoute[] {
+    const layer = RouteLayering.of(route, parent);
     if (route.renderLayout) {
       this.#fallbackRoutes.push({
-        path: routePath,
-        pathSegments,
-        renderRootLayouts,
-        renderLayouts,
+        path: layer.path,
+        pathSegments: layer.pathSegments,
+        renderRootLayouts: layer.renderRootLayouts,
+        renderLayouts: layer.renderLayouts,
       });
     }
     const routeHead = RouteTreeBuilder.#composeHeadResolvers(route.renderLayout?.resolveHead, parentHead);
-    const pageNodeRenders = route.pageIncludesOwnLayout === false ? currentOverrideRenders : nodeRenders;
-    const pageRenderRootLayouts = isRoot ? [...parentRootRenders, ...pageNodeRenders] : parentRootRenders;
-    const pageRenderLayouts = isRoot ? parentLayouts : [...parentLayouts, ...pageNodeRenders];
     const pageHead = route.pageIncludesOwnLayout === false ? parentHead : routeHead;
     return [
       ...(route.renderPage
         ? [
             {
-              path: routePath,
-              pathSegments,
+              path: layer.path,
+              pathSegments: layer.pathSegments,
               renderPage: route.renderPage,
-              renderRootLayouts: pageRenderRootLayouts,
-              renderLayouts: pageRenderLayouts,
+              renderRootLayouts: layer.pageRenderRootLayouts,
+              renderLayouts: layer.pageRenderLayouts,
               resolveHead: RouteTreeBuilder.#composeHeadResolvers(route.renderPage.resolveHead, pageHead),
               isSpecialRoute: route.isSpecialRoute,
               pageState: route.pageState ?? defaultPageState,
@@ -227,9 +204,7 @@ export class RouteTreeBuilder {
           ]
         : []),
       ...(route.children.size
-        ? [...route.children.values()].flatMap((child) =>
-            this.#getPathRoutes(child, rootLayoutStack, renderLayouts, pathSegments, routeHead, renderRootLayouts),
-          )
+        ? [...route.children.values()].flatMap((child) => this.#getPathRoutes(child, layer, routeHead))
         : []),
     ];
   }

package/types/client/csrTypes.d.ts

@@ -171,6 +171,8 @@ export interface Route {
     path: string;
     renderPage?: RouteRender;
     renderLayout?: RouteRender;
+    /** `renderLayout` is a generated `__root_layout`: a root boundary the page generator found. */
+    isRootLayout?: boolean;
     /** Synthetic layout render from a `_overrides.tsx` at this node; wraps the subtree in a UI-override provider. */
     renderOverrides?: RouteRender;
     pageIncludesOwnLayout?: boolean;

package/types/common/RouteLayering.d.ts

@@ -0,0 +1,28 @@
+interface LayeredRoute<Render> {
+    /** The tree segment: `/`, `/:lang`, `/(group)`, `/foo`. */
+    path: string;
+    renderLayout?: Render;
+    /** A generated `__root_layout`: one of the root boundaries the page generator found. */
+    isRootLayout?: boolean;
+    renderOverrides?: Render;
+    /** `false` for a named page file, which sits beside its directory's layout rather than under it. */
+    pageIncludesOwnLayout?: boolean;
+}
+export interface RouteLayer<Render> {
+    /** The URL pattern down to this node; a route group adds nothing to it. */
+    path: string;
+    pathSegments: string[];
+    isRoot: boolean;
+    /** The root layout above or at this node, overrides left out: once there is one, nothing below is a root. */
+    rootLayouts: Render[];
+    renderRootLayouts: Render[];
+    renderLayouts: Render[];
+    /** What a page file at this node renders inside: without this node's layout for a named page file. */
+    pageRenderRootLayouts: Render[];
+    pageRenderLayouts: Render[];
+}
+export declare class RouteLayering {
+    #private;
+    static of<Render>(route: LayeredRoute<Render>, parent: RouteLayer<Render> | null): RouteLayer<Render>;
+}
+export {};

package/types/common/index.d.ts

@@ -29,6 +29,7 @@ export { isMcpDescribableArg, type McpExposureEndpoint, type McpExposureOption,
 export { deepObjectify, objectify, plainFieldsOf } from "./objectify.d.ts";
 export { pathGet, pathGetLoose, pathSet, toPathSegments } from "./objectPath.d.ts";
 export { formatPhone, isPhoneNumber } from "./phone.d.ts";
+export { type RouteLayer, RouteLayering } from "./RouteLayering.d.ts";
 export { randomPick, randomPicks } from "./randomPick.d.ts";
 export { hostFromRequest, isJsonContentType, originFromRequest } from "./requestOrigin.d.ts";
 export { RestClient, type RestClientOptions, type RestRequestOptions } from "./restClient.d.ts";

package/vendor/@akanjs/native/native/android/src/com/akanjs/runtime/AkanNativeActivity.kt

@@ -396,13 +396,15 @@ class AkanNativeActivity : Activity(), AkanNativePluginContext.Host {
 
     private inner class ChromeClient : WebChromeClient() {
         override fun onConsoleMessage(message: ConsoleMessage): Boolean { // WV-3
+            // A dev page forwards its console through the bridge once its runtime is up; this copy covers the rest.
+            if (bridge.consoleForwarded) return true
             val priority = when (message.messageLevel()) {
                 ConsoleMessage.MessageLevel.ERROR -> Log.ERROR
                 ConsoleMessage.MessageLevel.WARNING -> Log.WARN
                 ConsoleMessage.MessageLevel.DEBUG -> Log.DEBUG
                 else -> Log.INFO
             }
-            Log.println(priority, "AkanNativeConsole", message.message())
+            Log.println(priority, "AkanNativeConsole", message.message().trimEnd('\n'))
             return true
         }
 

package/vendor/@akanjs/native/native/android/src/com/akanjs/runtime/AkanNativeBridge.kt

@@ -53,6 +53,8 @@ class AkanNativeBridge(private val webView: WebView) {
 
     /** Dev builds: the self-test's \$host methods. */
     var dev = false
+    /** The page's runtime forwards its console here (a dev build's `$console` attach), so the WebView's copy is spare. */
+    @Volatile var consoleForwarded = false
 
     /** Dev builds: \$host.hang calls still open, and how many were cancelled. */
     private val hanging = ArrayList<AkanNativeCall>()
@@ -207,6 +209,7 @@ class AkanNativeBridge(private val webView: WebView) {
         if (pluginId == "\$bridge") return bridgeOp(call, doc)
         doc.running[id] = java.lang.ref.WeakReference(call)
         call.document = doc
+        if (pluginId == "\$console") return console(call)
         if (pluginId == "\$host") return host(call)
         val plugin = plugins[pluginId] ?: return call.reject(AkanNativeErrorCode.NOT_FOUND, "plugin $pluginId is not registered")
         // L2: an undeclared method or event never reaches the plugin, whatever its code handles.
@@ -333,6 +336,22 @@ class AkanNativeBridge(private val webView: WebView) {
         JSONObject().put("v", 1).put("id", id).put("ok", false).put("error", JSONObject().put("code", code).put("message", message))
 
     /** Shell built-ins the page runtime calls. Dev builds only: the self-test's bridge checks. */
+    /** dev builds: the page console at its own priority (WV-3), through the bridge as on iOS and the desktop. */
+    private fun console(call: AkanNativeCall) {
+        if (!dev) return call.reject(AkanNativeErrorCode.NOT_FOUND, "plugin \$console is not registered")
+        consoleForwarded = true
+        if (call.method != "attach") {
+            val priority = when (call.method) {
+                "error" -> Log.ERROR
+                "warn" -> Log.WARN
+                "trace", "verbose", "debug" -> Log.DEBUG
+                else -> Log.INFO
+            }
+            Log.println(priority, "AkanNativeConsole", (call.string("message") ?: "").trimEnd('\n'))
+        }
+        call.resolve()
+    }
+
     private fun host(call: AkanNativeCall) {
         // AkanNativeFeatures.DEV is a constant: release builds (false) lose these methods and what only they
         // reach (AkanNativeVectors) in R8 (architecture review stage 6).

package/vendor/@akanjs/native/native/ios/Sources/AkanNativeShell.swift

@@ -13,10 +13,20 @@ enum AkanNativeLog {
         logger.info("\(text, privacy: .public)")
     }
 
+    /// One `[page<+> <level>]` tag per line, the desktop host's grammar, which the akan CLI reads the level back from;
+    /// os_log takes the page's level too, so `log stream` and Console.app filter on it.
     static func page(_ level: String, _ text: String) {
-        print("[page \(level)] \(text)")
+        let lines = text.replacingOccurrences(of: "\\n+$", with: "", options: .regularExpression)
+            .components(separatedBy: "\n")
+        print(lines.enumerated().map { "[page\($0.offset == 0 ? "" : "+") \(level)] \($0.element)" }.joined(separator: "\n"))
         fflush(stdout)
-        logger.info("[page \(level, privacy: .public)] \(text, privacy: .public)")
+        let message = lines.joined(separator: "\n")
+        switch level {
+        case "error": logger.error("\(message, privacy: .public)")
+        case "warn": logger.warning("\(message, privacy: .public)")
+        case "trace", "verbose", "debug": logger.debug("\(message, privacy: .public)")
+        default: logger.info("\(message, privacy: .public)")
+        }
     }
 }
 

package/vendor/@akanjs/native/packages/core/src/runtime.ts

@@ -93,7 +93,7 @@ export function runtime(): Runtime {
     };
     if (rt.transport) w.addEventListener?.("pageshow", (e) => e.persisted && w.location?.reload());
     
-    if (boot.dev && rt.transport && boot.platform !== "android") forwardConsole(rt);
+    if (boot.dev && rt.transport) forwardConsole(boot.platform);
   }
   return g.__runtime as Runtime;
 }
@@ -102,7 +102,7 @@ export function runtime(): Runtime {
  * Dev builds on native hosts: mirror console output and uncaught errors to the host,
  * which prints them next to its own logs (WV-3).
  */
-function forwardConsole(_rt: Runtime): void {
+function forwardConsole(platform: AkanNativeBoot["platform"]): void {
 
   const g = akanNativeGlobal() as { __consolePatched?: boolean };
   if (g.__consolePatched) return;
@@ -110,13 +110,32 @@ function forwardConsole(_rt: Runtime): void {
   const c = globalThis.console as unknown as Record<string, (...args: unknown[]) => void>;
   const format = (value: unknown): string => {
     if (typeof value === "string") return value;
-    if (value instanceof Error) return value.stack ?? `${value.name}: ${value.message}`;
+    
+    if (value instanceof Error) {
+      const head = `${value.name}: ${value.message}`;
+      return value.stack?.startsWith(head) ? value.stack : `${head}${value.stack ? `\n${value.stack}` : ""}`;
+    }
     try {
       return JSON.stringify(value) ?? String(value);
     } catch {
       return String(value);
     }
   };
+  
+  const render = (args: unknown[]): string => {
+    const [first, ...rest] = args;
+    if (typeof first !== "string" || !/%[sdifoOc]/.test(first)) return args.map(format).join(" ");
+    const text = first.replace(/%([sdifoOc%])/g, (match, spec: string) => {
+      if (spec === "%") return "%";
+      if (rest.length === 0) return match;
+      const value = rest.shift();
+      if (spec === "c") return "";
+      if (spec === "d" || spec === "i") return String(Number.parseInt(String(value), 10));
+      if (spec === "f") return String(Number(value));
+      return format(value);
+    });
+    return [text, ...rest.map(format)].join(" ");
+  };
   const send = (level: string, args: unknown[]) => {
     const rt = akanNativeGlobal().__runtime as Runtime | undefined;
     if (!rt?.transport || !rt.boot.dev) return;
@@ -125,10 +144,12 @@ function forwardConsole(_rt: Runtime): void {
       id: ++rt.nextId,
       plugin: CONSOLE_PLUGIN,
       method: level,
-      args: { message: args.map(format).join(" ") },
+      args: { message: render(args).replace(/\n+$/, "") },
     };
     rt.transport.send(request).catch(() => {});
   };
+  
+  if (platform === "android") send("attach", []);
   for (const level of ["log", "info", "warn", "error", "debug"]) {
     const original = c[level]!.bind(globalThis.console);
     c[level] = (...args: unknown[]) => {
@@ -137,7 +158,7 @@ function forwardConsole(_rt: Runtime): void {
     };
   }
   const w = globalThis as { addEventListener?: (type: string, fn: (e: any) => void) => void };
-  w.addEventListener?.("error", (e) => send("error", [`uncaught: ${e.error?.stack ?? e.message}`]));
+  w.addEventListener?.("error", (e) => send("error", ["uncaught:", e.error ?? e.message]));
   w.addEventListener?.("unhandledrejection", (e) => send("error", ["unhandled rejection:", e.reason]));
 }
 

package/vendor/@akanjs/native/packages/desktop/src/host.ts

@@ -132,10 +132,12 @@ export function startHost(plugins: DesktopPlugin[]): void {
         emitJs(window, `window.__AKAN_NATIVE__&&window.__AKAN_NATIVE__.receive(${JSON.stringify(message)})`);
       },
       builtins: {
-        
+
         [CONSOLE_PLUGIN](req, window) {
-          const line = `[page${window === 1 ? "" : ` ${window}`} ${req.method}] ${(req.args as { message?: string } | undefined)?.message ?? ""}`;
-          (req.method === "error" || req.method === "warn" ? console.error : console.info)(line);
+          const message = (req.args as { message?: string } | undefined)?.message ?? "";
+          const scope = window === 1 ? "" : `#${window}`;
+          const lines = message.replace(/\n+$/, "").split("\n");
+          console.info(lines.map((line, i) => `[page${i === 0 ? "" : "+"}${scope} ${req.method}] ${line}`).join("\n"));
         },
         
         async [HOST_PLUGIN](req, window, signal) {

package/webkit/CsrRouteTable.ts

@@ -19,6 +19,8 @@ import {
   getRouteExports,
   Logger,
   parseRouteModuleKey,
+  type RouteLayer,
+  RouteLayering,
   routeSegmentToTreePath,
 } from "akanjs/common";
 
@@ -94,7 +96,6 @@ export class CsrRouteTable {
 
   async #build(context: CsrRouteContext): Promise<CsrRoutes> {
     const { device, basePaths, currentBasePath } = this.#options;
-    const baseLayoutPaths = ["/", "/:lang", ...(currentBasePath ? [`/:lang/${currentBasePath}`] : [])];
     const otherBasePaths = basePaths?.filter((path) => path !== currentBasePath) ?? [];
     const pages: { [key: string]: RouteModule } = {};
     const asyncDefaultMap: { [key: string]: boolean | undefined } = {};
@@ -168,7 +169,11 @@ export class CsrRouteTable {
       targetRouteMap.set(targetPath, {
         ...(targetRouteMap.get(targetPath) ?? { path: targetPath, children: new Map<string, Route>() }),
         ...(parsed.kind === "layout"
-          ? { renderLayout: routeRender, layoutPageConfig: (page as RouteModuleWithConfig).pageConfig }
+          ? {
+              renderLayout: routeRender,
+              isRootLayout: parsed.isInternalRootLayout,
+              layoutPageConfig: (page as RouteModuleWithConfig).pageConfig,
+            }
           : {
               renderPage: routeRender,
               pageIncludesOwnLayout: parsed.leaf === "_index",
@@ -181,38 +186,15 @@ export class CsrRouteTable {
     assertUniqueRoutePatterns(pagePatterns);
     const getPathRoutes = (
       route: Route,
-      parentRootLayouts: RouteRender[] = [],
-      parentLayouts: RouteRender[] = [],
-      parentPaths: string[] = [],
+      parent: RouteLayer<RouteRender> | null = null,
       parentPageConfigChain: PageConfig[] = [],
-      parentRootRenders: RouteRender[] = [],
     ): PathRoute[] => {
-      const parentPath = parentPaths.filter((path) => path !== "/").join("");
-      const isRouteGroup = /^\/\(.*\)$/.test(route.path);
-      const currentPathSegment = isRouteGroup ? "" : route.path;
-      const path = parentPath + currentPathSegment;
-      const isRoot = !isRouteGroup && baseLayoutPaths.includes(path);
-      const pathSegments = [...parentPaths, ...(currentPathSegment ? [currentPathSegment] : [])];
-      const currentRootLayout = isRoot && route.renderLayout ? route.renderLayout : null;
-      const currentLayout = !isRoot && route.renderLayout ? route.renderLayout : null;
+      const layer = RouteLayering.of(route, parent);
+      const { path, pathSegments } = layer;
       const currentLayoutConfig = route.renderLayout && route.layoutPageConfig ? route.layoutPageConfig : null;
-      
-      const currentOverrideRenders = route.renderOverrides ? [route.renderOverrides] : [];
-      const nodeRenders = [...currentOverrideRenders, ...(route.renderLayout ? [route.renderLayout] : [])];
-      const rootLayoutStack = [...parentRootLayouts, ...(currentRootLayout ? [currentRootLayout] : [])];
-      const renderRootLayouts = isRoot ? [...parentRootRenders, ...nodeRenders] : parentRootRenders;
-      const renderLayouts = isRoot ? parentLayouts : [...parentLayouts, ...nodeRenders];
-      const pageConfigChain = [
-        ...parentPageConfigChain,
-        ...(currentRootLayout || currentLayout ? (currentLayoutConfig ? [currentLayoutConfig] : []) : []),
-      ];
-      const pageNodeRenders = route.pageIncludesOwnLayout === false ? currentOverrideRenders : nodeRenders;
-      const pageRenderRootLayouts = isRoot ? [...parentRootRenders, ...pageNodeRenders] : parentRootRenders;
-      const pageRenderLayouts = isRoot ? parentLayouts : [...parentLayouts, ...pageNodeRenders];
+      const pageConfigChain = [...parentPageConfigChain, ...(currentLayoutConfig ? [currentLayoutConfig] : [])];
       const pageRenderConfigChain =
-        route.pageIncludesOwnLayout === false && (currentRootLayout || currentLayout)
-          ? parentPageConfigChain
-          : pageConfigChain;
+        route.pageIncludesOwnLayout === false && route.renderLayout ? parentPageConfigChain : pageConfigChain;
       const ownPageConfig = route.renderPage && route.pageConfig ? route.pageConfig : null;
       const finalPageConfigChain = [...pageRenderConfigChain, ...(ownPageConfig ? [ownPageConfig] : [])];
       const pageState = resolvePageState({
@@ -230,8 +212,8 @@ export class CsrRouteTable {
                 path,
                 pathSegments,
                 renderPage: route.renderPage,
-                renderRootLayouts: pageRenderRootLayouts,
-                renderLayouts: pageRenderLayouts,
+                renderRootLayouts: layer.pageRenderRootLayouts,
+                renderLayouts: layer.pageRenderLayouts,
                 isSpecialRoute: route.isSpecialRoute,
                 pageState: route.pageState ?? pageState,
                 pageConfigChain: finalPageConfigChain,
@@ -240,9 +222,7 @@ export class CsrRouteTable {
             ]
           : []),
         ...(route.children.size
-          ? [...route.children.values()].flatMap((child) =>
-              getPathRoutes(child, rootLayoutStack, renderLayouts, pathSegments, pageConfigChain, renderRootLayouts),
-            )
+          ? [...route.children.values()].flatMap((child) => getPathRoutes(child, layer, pageConfigChain))
           : []),
       ];
     };

package/webkit/bootCsr.tsx

@@ -45,16 +45,19 @@ export const bootCsr = async (context: CsrRouteContext) => {
     const { pathRoutes, routeGuide } = useSyncExternalStore(table.subscribe, table.snapshot);
     const csrValues = useCsrValues(routeGuide, pathRoutes);
     const { location } = csrValues;
+
+    if (location.pathRoute.renderRootLayouts.length === 0)
+      throw new Error(
+        `[csr] no root layout for ${location.pathRoute.path}: the route table put none of its layouts at the root`,
+      );
     return (
       <csrContext.Provider value={csrValues}>
-        {location.pathRoute.renderRootLayouts.length > 0 ? (
-          <RenderLayer
-            renders={location.pathRoute.renderRootLayouts}
-            index={0}
-            params={location.params}
-            searchParams={location.searchParams}
-          />
-        ) : null}
+        <RenderLayer
+          renders={location.pathRoute.renderRootLayouts}
+          index={0}
+          params={location.params}
+          searchParams={location.searchParams}
+        />
       </csrContext.Provider>
     );
   };