akanjs 3.0.0-beta.20 → 3.0.0-beta.21

package/client/storage.ts

@@ -1,48 +1,77 @@
 import { getEnv } from "akanjs/base";
-import { type CapacitorPreferencesModule, loadCapacitorPreferences } from "./capacitor";
 
-type Preferences = CapacitorPreferencesModule["Preferences"];
+type NativeModule = typeof import("./native");
 
-const inStorage = async <T>(native: (preferences: Preferences) => Promise<T>, local: () => T) => {
+interface ClientStore {
+  get(key: string): Promise<string | null>;
+  set(key: string, value: string): Promise<void>;
+  remove(key: string): Promise<void>;
+}
+
+const localStore: ClientStore = {
+  get: async (key) => localStorage.getItem(key),
+  set: async (key, value) => localStorage.setItem(key, value),
+  remove: async (key) => localStorage.removeItem(key),
+};
+
+const nativeApp = async (): Promise<NativeModule | null> => {
+  const native = await import("./native");
+  return native.isNativeApp() ? native : null;
+};
+
+const inClient = async <T>(
+  run: (store: ClientStore) => Promise<T>,
+  nativeStore: (native: NativeModule) => ClientStore,
+) => {
   const env = getEnv();
   if (env.side === "server") return;
-  if (env.renderMode === "ssr") return local();
-  try {
-    const { Preferences } = await loadCapacitorPreferences();
-    return await native(Preferences);
-  } catch {
-    return local();
-  }
+  const native = env.renderMode === "csr" ? await nativeApp() : null;
+  return await run(native ? nativeStore(native) : localStore);
 };
 
-export const storage = {
-  getItem: (key: string) =>
-    inStorage(
-      async (preferences) => (await preferences.get({ key })).value,
-      () => localStorage.getItem(key),
-    ),
-  setItem: (key: string, value: string) =>
-    inStorage(
-      async (preferences) => {
-        await preferences.set({ key, value });
-      },
-      () => {
-        localStorage.setItem(key, value);
-      },
-    ),
-  removeItem: async (key: string) => {
-    const env = getEnv();
-    if (env.side === "server") return;
-    if (env.renderMode === "ssr") {
-      localStorage.removeItem(key);
-      return;
-    }
-    try {
-      const { Preferences } = await loadCapacitorPreferences();
-      return await Preferences.remove({ key });
-    } catch {
-      localStorage.removeItem(key);
-      return;
-    }
+const preferencesOf = ({ preferences }: NativeModule): ClientStore => ({
+  get: async (key) => (await preferences.get({ key })).value,
+  set: (key, value) => preferences.set({ key, value }),
+  remove: (key) => preferences.remove({ key }),
+});
+
+const installMarkerKey = "akan:installed";
+let freshInstall: Promise<void> | null = null;
+const clearedOnReinstall = (native: NativeModule) =>
+  (freshInstall ??= (async () => {
+    if ((await native.preferences.get({ key: installMarkerKey })).value) return;
+    await native.secureStorage.clear();
+    await native.preferences.set({ key: installMarkerKey, value: "1" });
+  })().catch((error: unknown) => {
+    freshInstall = null;
+    throw error;
+  }));
+
+const secureStorageOf = (native: NativeModule): ClientStore => ({
+  get: async (key) => {
+    await clearedOnReinstall(native);
+    return (await native.secureStorage.get({ key })).value;
+  },
+  set: async (key, value) => {
+    await clearedOnReinstall(native);
+    await native.secureStorage.set({ key, value });
   },
+  remove: async (key) => {
+    await clearedOnReinstall(native);
+    await native.secureStorage.remove({ key });
+  },
+});
+
+/** Client key-value storage: the shell's preferences in a native app, localStorage in a browser. */
+export const storage = {
+  getItem: (key: string) => inClient((store) => store.get(key), preferencesOf),
+  setItem: (key: string, value: string) => inClient((store) => store.set(key, value), preferencesOf),
+  removeItem: (key: string) => inClient((store) => store.remove(key), preferencesOf),
+};
+
+/** Tokens: the OS credential store in a native app; a browser has none, so localStorage there. */
+export const secretStorage = {
+  getItem: (key: string) => inClient((store) => store.get(key), secureStorageOf),
+  setItem: (key: string, value: string) => inClient((store) => store.set(key, value), secureStorageOf),
+  removeItem: (key: string) => inClient((store) => store.remove(key), secureStorageOf),
 };

package/fetch/client/fetchClient.ts

@@ -1,4 +1,4 @@
-import { getEnv, getWsPrefix, PrimitiveRegistry, type PromiseOrObject } from "akanjs/base";
+import { getApiPrefix, getEnv, getWsPrefix, PrimitiveRegistry, type PromiseOrObject } from "akanjs/base";
 import {
   capitalize,
   type FetchPolicy,
@@ -278,6 +278,12 @@ export class FetchClient {
     }
     return this.jwt ? { Authorization: `Bearer ${this.jwt}` } : {};
   }
+  #baseUrlOf(endpoint: SerializedEndpoint, origin?: string) {
+    if (endpoint.globalPrefix !== false) return origin;
+    const base = (origin ?? this.origin).replace(/\/$/, "");
+    const apiPrefix = getApiPrefix();
+    return base.endsWith(apiPrefix) ? base.slice(0, -apiPrefix.length) : base;
+  }
   #makeHttpFn(key: string, endpoint: SerializedEndpoint, prefix?: string) {
     const argLength = endpoint.args.length;
     const serializerMap = this.#makeArgSerializer(endpoint.args);
@@ -294,7 +300,7 @@ export class FetchClient {
         return async (...argData: unknown[]) => {
           const { option, argMap, url } = requestOf(argData);
           const headers = this.#makeAuthHeaders(option);
-          const baseUrl = option?.origin;
+          const baseUrl = this.#baseUrlOf(endpoint, option?.origin);
           const timeout = option?.timeout ?? endpoint.timeout;
           
           const requestQuery = () => this.http.get(url, { headers, baseUrl, timeout });
@@ -313,7 +319,7 @@ export class FetchClient {
           const body = HttpClient.makeBody(bodyArgs, uploadArgs, argMap);
           const response = await this.http.send(endpoint.method ?? "POST", url, body, {
             headers: this.#makeAuthHeaders(option),
-            baseUrl: option?.origin,
+            baseUrl: this.#baseUrlOf(endpoint, option?.origin),
             timeout: option?.timeout ?? endpoint.timeout,
           });
           return parseReturn(response, { crystalize: option?.crystalize ?? true });
@@ -540,7 +546,10 @@ export class FetchClient {
           formData.append(fields.type, refName);
           if (parentId) formData.append(fields.parentId, parentId);
           const url = FetchClient.makeHttpUrl(cap.endpointKey, endpoint, cap.prefix, new Map());
-          return await this.http.post(url, formData, { headers: this.#makeAuthHeaders(option) });
+          return await this.http.post(url, formData, {
+            headers: this.#makeAuthHeaders(option),
+            baseUrl: this.#baseUrlOf(endpoint),
+          });
         }) as FetchHandler,
     );
   }

package/index.ts

@@ -39,7 +39,7 @@ export interface AkanRouteConfig {
   domains: AkanRouteDomains;
 }
 
-/** `ssr`: the RSC/SSR renderer with its bundles and RSC worker; `csr`: the SPA shell Capacitor ships and `/__csr` serves. */
+/** `ssr`: the RSC/SSR renderer with its bundles and RSC worker; `csr`: the SPA shell the native apps ship and `/__csr` serves. */
 export interface AkanWebConfig {
   ssr: boolean;
   csr: boolean;
@@ -82,47 +82,61 @@ export interface AkanMobileTargetDeepLinks {
   };
 }
 
-export interface AkanMobileTargetFiles {
-  ios?: Record<string, string>;
-  android?: Record<string, string>;
-}
+/**
+ * Files copied into the app, keyed by where they land: `ios/<path>` (the app bundle), `android/res/<type>/<file>` or
+ * `android/assets/<path>`. The value is the source, relative to the app folder.
+ */
+export type AkanMobileTargetFiles = Record<string, string>;
+
+export type AkanNativeValue = string | number | boolean | AkanNativeValue[] | { [key: string]: AkanNativeValue };
 
-export interface AkanCapacitorLikeConfig {
-  plugins?: Record<string, unknown>;
-  android?: Record<string, unknown>;
-  ios?: Record<string, unknown>;
-  [key: string]: unknown;
+export interface AkanMobileNativeConfig {
+  /** Native runtime plugins beyond the ones the permissions bring, by builtin id (`"iap"`) or absolute folder. */
+  plugins?: string[];
+  ios?: {
+    infoPlist?: Record<string, AkanNativeValue>;
+    entitlements?: Record<string, AkanNativeValue>;
+  };
+  android?: {
+    /** XML at the `<manifest>` level; `${applicationId}` is replaced. */
+    manifest?: string[];
+    /** XML inside `<application>`. */
+    application?: string[];
+    /** XML inside the app's activity. */
+    activity?: string[];
+    /** The Firebase project's google-services.json, relative to the app folder, for FCM push on Android. */
+    googleServices?: string;
+  };
 }
 
-export interface AkanMobileTargetConfig extends AkanCapacitorLikeConfig {
+export interface AkanMobileTargetConfig {
   name: string;
   basePath?: string;
   indexPath?: string;
   appName: string;
   appId: string;
+  /** Executables, archives and the Swift module; letters, digits, `.`, `_` and `-`. Default: the app's folder name. */
+  fileName?: string;
   version: string;
   buildNum: number;
   assets?: AkanMobileTargetAssets;
   permissions?: MobilePermission[];
   deepLinks?: AkanMobileTargetDeepLinks;
   files?: AkanMobileTargetFiles;
+  native?: AkanMobileNativeConfig;
 }
 
-export interface AkanMobileConfig extends AkanCapacitorLikeConfig {
+export interface AkanMobileConfig {
   appName: string;
   appId: string;
+  fileName?: string;
   version: string;
   buildNum: number;
+  files?: AkanMobileTargetFiles;
+  native?: AkanMobileNativeConfig;
   targets: Record<string, AkanMobileTargetConfig>;
 }
 
-export interface PluginRuntimeContext {
-  readonly appName: string;
-  readonly mobile: AkanMobileConfig;
-  /** True when any mobile target declares the given permission. */
-  hasMobilePermission(permission: MobilePermission): boolean;
-}
-
 export interface AkanScanInfo {
   /** Transitive lib dependencies of the app (or direct deps of a lib). */
   getLibs(): string[];
@@ -159,38 +173,25 @@ export interface AkanSyncContext {
   readEnvClient(): Promise<Record<string, unknown> | null>;
 }
 
-export interface AkanNativeContext {
-  readonly appPath: string;
-  readonly executor: AkanExecutor;
-  readonly target: AkanMobileTargetConfig;
-  readonly operation: "local" | "release";
-  readonly env: MobileEnv;
-  /** Set NS-prefixed usage descriptions in the iOS Info.plist (Debug + Release). */
-  setIosUsageDescriptions(descriptions: Record<string, string>): Promise<void>;
-  /** Merge raw key/values into the iOS Info.plist (Debug + Release). */
-  updateIosInfoPlist(values: Record<string, unknown>): Promise<void>;
-  /** Contribute entries to the iOS entitlements file (merged, then written once per prepare). */
-  addIosEntitlements(entitlements: Record<string, string | string[]>): void;
-  /** Transform `ios/App/App/AppDelegate.swift` in place (no-op when the file is absent). */
-  editIosAppDelegate(transform: (content: string) => string): Promise<void>;
-  /** Add `uses-permission` entries to the Android manifest (without the `android.permission.` prefix). */
-  addAndroidPermissions(permissions: string[]): void;
-  /** Add `uses-feature` entries to the Android manifest. */
-  addAndroidFeatures(features: string[]): void;
-}
-
-export interface AkanPluginCapacitorConfig {
-  /** Mobile permission that activates this plugin's native config (reuses the existing permission model). */
-  permission?: MobilePermission;
-  configureNative?: (ctx: AkanNativeContext) => Promise<void>;
+/** What a plugin adds to a mobile app whose target asks for its permission; the native build merges every one. */
+export interface AkanPluginNativeConfig {
+  permission: MobilePermission;
+  /** Native runtime plugins, by builtin id (`"camera"`). */
+  plugins?: string[];
+  /** iOS usage texts by description name (`cameraUsageDescription`); `$(PRODUCT_NAME)` becomes the app name. */
+  usageDescriptions?: Record<string, string>;
+  infoPlist?: Record<string, AkanNativeValue>;
+  entitlements?: Record<string, AkanNativeValue>;
+  /** `uses-permission` names, without the `android.permission.` prefix. */
+  androidPermissions?: string[];
+  /** `uses-feature` names, declared as not required. */
+  androidFeatures?: string[];
 }
 
 /** Read live by the CLI at build time; it carries functions, so it stays out of the serializable config results. */
 export interface AkanPlugin {
   name: string;
-  /** Runtime npm packages this plugin needs; installed on demand by the CLI (e.g. firebase for push). */
-  runtimePackages?: (ctx: PluginRuntimeContext) => string[];
-  capacitor?: AkanPluginCapacitorConfig;
+  native?: AkanPluginNativeConfig;
   /** Build-time asset generation (e.g. `public/firebase-messaging-sw.js`). */
   syncAssets?: (ctx: AkanSyncContext) => Promise<void>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "akanjs",
-  "version": "3.0.0-beta.20",
+  "version": "3.0.0-beta.21",
   "sourceType": "module",
   "type": "module",
   "publishConfig": {
@@ -90,15 +90,10 @@
       "import": "./client/index.ts",
       "default": "./client/index.ts"
     },
-    "./client/capacitor": {
-      "types": "./types/client/capacitor.d.ts",
-      "import": "./client/capacitor.ts",
-      "default": "./client/capacitor.ts"
-    },
-    "./capacitor.base.config": {
-      "types": "./types/capacitor.base.config.d.ts",
-      "import": "./capacitor.base.config.ts",
-      "default": "./capacitor.base.config.ts"
+    "./client/native": {
+      "types": "./types/client/native.d.ts",
+      "import": "./client/native.ts",
+      "default": "./client/native.ts"
     },
     "./webkit": {
       "types": "./types/webkit/index.d.ts",
@@ -217,32 +212,13 @@
     "tailwind-variants": "^3.3.0"
   },
   "peerDependencies": {
-    "@capacitor-community/contacts": "^7.2.0",
-    "@capacitor/android": "^8.3.4",
-    "@capacitor/app": "^8.1.0",
-    "@capacitor/assets": "^3.0.5",
-    "@capacitor/browser": "^8.0.3",
-    "@capacitor/camera": "^8.2.0",
-    "@capacitor/cli": "^8.3.4",
-    "@capacitor/core": "^8.3.4",
-    "@capacitor/device": "^8.0.2",
-    "@capacitor/geolocation": "^8.2.0",
-    "@capacitor/haptics": "^8.0.2",
-    "@capacitor/inappbrowser": "^4.0.1",
-    "@capacitor/ios": "^8.3.4",
-    "@capacitor/keyboard": "^8.0.3",
-    "@capacitor/preferences": "^8.0.1",
-    "@capacitor/push-notifications": "^8.1.1",
-    "@capgo/capacitor-updater": "^8.46.1",
     "@happy-dom/global-registrator": "^20.11.2",
     "@libsql/client": "^0.17.3",
     "@playwright/test": "^1.60.0",
     "@react-spring/web": "^10.1.0",
     "@use-gesture/react": "^10.3.1",
     "bullmq": "^5.76.10",
-    "capacitor-plugin-safe-area": "^5.0.0",
     "chance": "^1.1.13",
-    "cordova-plugin-purchase": "^13.16.0",
     "firebase": "^12.13.0",
     "happy-dom": "^20.11.2",
     "ioredis": "^5.10.1",
@@ -259,57 +235,6 @@
     "typescript": "^6.0.3"
   },
   "peerDependenciesMeta": {
-    "@capacitor-community/contacts": {
-      "optional": true
-    },
-    "@capacitor/android": {
-      "optional": true
-    },
-    "@capacitor/app": {
-      "optional": true
-    },
-    "@capacitor/assets": {
-      "optional": true
-    },
-    "@capacitor/browser": {
-      "optional": true
-    },
-    "@capacitor/camera": {
-      "optional": true
-    },
-    "@capacitor/cli": {
-      "optional": true
-    },
-    "@capacitor/core": {
-      "optional": true
-    },
-    "@capacitor/device": {
-      "optional": true
-    },
-    "@capacitor/geolocation": {
-      "optional": true
-    },
-    "@capacitor/haptics": {
-      "optional": true
-    },
-    "@capacitor/inappbrowser": {
-      "optional": true
-    },
-    "@capacitor/ios": {
-      "optional": true
-    },
-    "@capacitor/keyboard": {
-      "optional": true
-    },
-    "@capacitor/preferences": {
-      "optional": true
-    },
-    "@capacitor/push-notifications": {
-      "optional": true
-    },
-    "@capgo/capacitor-updater": {
-      "optional": true
-    },
     "@happy-dom/global-registrator": {
       "optional": true
     },
@@ -328,15 +253,9 @@
     "bullmq": {
       "optional": true
     },
-    "capacitor-plugin-safe-area": {
-      "optional": true
-    },
     "chance": {
       "optional": true
     },
-    "cordova-plugin-purchase": {
-      "optional": true
-    },
     "firebase": {
       "optional": true
     },
@@ -382,7 +301,7 @@
   },
   "devDependencies": {
     "@biomejs/biome": "2.5.12",
-    "@types/bun": "^1.4.0"
+    "@types/bun": "^1.4.2"
   },
   "bun": {
     "platform": "bun"

package/server/devtools/signalSerializer.ts

@@ -214,8 +214,7 @@ export class SignalSerializer {
   }
 
   static #httpPath(key: string, info: EndpointInfo, defaultPrefix: string | undefined, apiPrefix: string): string {
-    const servicePrefix = SignalResolver.resolveServicePrefix(info.signalOption.prefix, defaultPrefix);
-    return ApiRouter.applyGlobalPrefix(apiPrefix, `${servicePrefix}${info.getPath(key)}`, info.signalOption);
+    return ApiRouter.applyGlobalPrefix(apiPrefix, info.getRoutePath(key, defaultPrefix), info.signalOption);
   }
 
   static #serializeInternals(

package/server/hmr/devHmrController.ts

@@ -73,6 +73,7 @@ export function devBuildStatusToHmrMessage(
 }
 
 export interface DevHmrControllerOptions {
+  artifactDir: string;
   renderState: RenderState;
   rsc: RscWorker;
   seedIndex: RouteSeedIndex;
@@ -81,6 +82,7 @@ export interface DevHmrControllerOptions {
 
 export class DevHmrController {
   readonly #logger = new Logger("DevHmrController");
+  readonly #artifactDir: string;
   readonly #renderState: RenderState;
   readonly #rsc: RscWorker;
   readonly #seedIndex: RouteSeedIndex;
@@ -98,13 +100,14 @@ export class DevHmrController {
   readonly #dirty = new Set<Exclude<ChangeKind, "ignore">>();
   readonly #dirtyFiles = new Set<string>();
   readonly #buildStatusByPhase = new Map<DevBuildStatus["phase"], DevBuildStatus>();
-  readonly #graphSeeds: string[];
+  #graphSeeds: string[];
 
-  constructor({ renderState, rsc, seedIndex, upgradeHmrWs }: DevHmrControllerOptions) {
+  constructor({ artifactDir, renderState, rsc, seedIndex, upgradeHmrWs }: DevHmrControllerOptions) {
+    this.#artifactDir = artifactDir;
     this.#renderState = renderState;
     this.#rsc = rsc;
     this.#seedIndex = seedIndex;
-    this.#graphSeeds = [...new Set([...seedIndex.globalLayoutFiles, ...seedIndex.entries.flatMap((e) => e.seeds)])];
+    this.#graphSeeds = DevHmrController.#graphSeedsOf(seedIndex);
     this.#upgradeHmrWs = upgradeHmrWs;
     this.#builderRpc = this.#createBuilderRpc();
     this.routeCache = this.#createRouteCache();
@@ -213,16 +216,16 @@ export class DevHmrController {
       onPagesUpdated: async ({ bundlePath, buildId, generation, changedFiles }) => {
         const started = Date.now();
         const files = changedFiles ?? [];
+        const routeTreeChanged = await this.#reloadSeedIndex();
         const runtimeMetadataChanged = files.some(isAkanRuntimeMetadataFile);
-        const staleClientEntries = runtimeMetadataChanged ? new Set<string>() : this.#staleClientEntriesForFiles(files);
-        const routeIds = runtimeMetadataChanged ? undefined : this.#routeIdsForFiles(files, staleClientEntries);
-        const fastRefreshCandidate = !runtimeMetadataChanged && this.#isFastRefreshCandidate(files);
+        const clearAll = routeTreeChanged || runtimeMetadataChanged;
+        const staleClientEntries = clearAll ? new Set<string>() : this.#staleClientEntriesForFiles(files);
+        const routeIds = clearAll ? undefined : this.#routeIdsForFiles(files, staleClientEntries);
+        const fastRefreshCandidate = !clearAll && this.#isFastRefreshCandidate(files);
         this.#logger.verbose(
-          `[SSR] pages-updated bundlePath=${bundlePath} buildId=${buildId} generation=${generation ?? "(unknown)"} files=${files.length} routes=${routeIds?.length ?? 0} fastRefresh=${fastRefreshCandidate} staleEntries=${staleClientEntries.size} runtimeMetadata=${runtimeMetadataChanged}`,
+          `[SSR] pages-updated bundlePath=${bundlePath} buildId=${buildId} generation=${generation ?? "(unknown)"} files=${files.length} routes=${routeIds?.length ?? 0} fastRefresh=${fastRefreshCandidate} staleEntries=${staleClientEntries.size} runtimeMetadata=${runtimeMetadataChanged} routeTree=${routeTreeChanged}`,
         );
-        const dropped = this.#invalidateRoutes(files, routeIds, staleClientEntries, {
-          forceClear: runtimeMetadataChanged,
-        });
+        const dropped = this.#invalidateRoutes(files, routeIds, staleClientEntries, { forceClear: clearAll });
         this.#renderState.buildId = buildId;
         const manifest = this.routeCache.snapshot();
         const reloadStarted = Date.now();
@@ -233,7 +236,7 @@ export class DevHmrController {
           pagesBundlePath: bundlePath,
         });
         this.#logger.verbose(`[SSR] rsc reload buildId=${buildId} in ${Date.now() - reloadStarted}ms`);
-        const shouldReload = runtimeMetadataChanged || this.#shouldFullReloadForFiles(files, routeIds);
+        const shouldReload = clearAll || this.#shouldFullReloadForFiles(files, routeIds);
         if (shouldReload) this.#hub.broadcast({ type: "reload", buildId });
         else if (fastRefreshCandidate)
           this.#hub.broadcast({ type: "client-refresh", buildId, generation, changedFiles, routeIds });
@@ -245,6 +248,21 @@ export class DevHmrController {
     });
   }
 
+  async #reloadSeedIndex(): Promise<boolean> {
+    const next = await RouteSeedIndexStore.load(this.#artifactDir).catch((err: unknown) => {
+      this.#logger.warn(`[hmr] route seed index unreadable; keeping the boot one: ${String(err)}`);
+      return null;
+    });
+    if (!next || JSON.stringify(next) === JSON.stringify(this.#seedIndex)) return false;
+    Object.assign(this.#seedIndex, next);
+    this.#graphSeeds = DevHmrController.#graphSeedsOf(next);
+    return true;
+  }
+
+  static #graphSeedsOf(seedIndex: RouteSeedIndex): string[] {
+    return [...new Set([...seedIndex.globalLayoutFiles, ...seedIndex.entries.flatMap((e) => e.seeds)])];
+  }
+
   #recordBuildStatus(status: DevBuildStatus): void {
     const previous = this.#buildStatusByPhase.get(status.phase);
     this.#buildStatusByPhase.set(status.phase, status);

package/server/resolver/signal.resolver.ts

@@ -595,8 +595,7 @@ export class SignalResolver {
     const wsRoutes: WebsocketRoutes = {};
     const defaultPrefix = endpointCls.srv.cnst?.refName;
     Object.entries(endpointMeta).forEach(([key, endpointInfo]) => {
-      const servicePrefix = SignalResolver.resolveServicePrefix(endpointInfo.signalOption.prefix, defaultPrefix);
-      const path = `${servicePrefix}${endpointInfo.getPath(key)}`;
+      const path = endpointInfo.getRoutePath(key, defaultPrefix);
       if (endpointInfo.signalOption.globalPrefix !== undefined) {
         routeOptions[path] = { globalPrefix: endpointInfo.signalOption.globalPrefix };
       }
@@ -728,14 +727,6 @@ export class SignalResolver {
     return { routes, wsRoutes, routeOptions };
   }
 
-  static resolveServicePrefix(prefix: false | string | undefined, defaultPrefix?: string): string {
-    if (prefix === false || prefix === "") return "";
-    const resolved = prefix ?? defaultPrefix;
-    if (!resolved) return "";
-    const trimmed = resolved.trim().replace(/^\/+|\/+$/g, "");
-    return trimmed ? `/${trimmed}` : "";
-  }
-
   static #selectCache = new WeakMap<Cls, Record<string, true>>();
   static #selectForConstant(constant: Cls): Record<string, true> | undefined {
     const cached = SignalResolver.#selectCache.get(constant);

package/server/routeTreeBuilder.ts

@@ -184,7 +184,7 @@ export class RouteTreeBuilder {
     parentLayouts: RouteRender[] = [],
     parentPaths: string[] = [],
     parentHead?: ResolveHead,
-    parentOverrides: RouteRender[] = [],
+    parentRootRenders: RouteRender[] = [],
   ): PathRoute[] {
     const parentPath = parentPaths.filter((p) => p !== "/").join("");
     const currentPathSegment = /^\/\(.*\)$/.test(route.path) ? "" : route.path;
@@ -192,13 +192,12 @@ export class RouteTreeBuilder {
     const routePath = parentPath + currentPathSegment;
     const pathSegments = [...parentPaths, ...(currentPathSegment ? [currentPathSegment] : [])];
     const currentRootLayout = isRoot && route.renderLayout ? route.renderLayout : null;
-    const currentLayout = !isRoot && route.renderLayout ? route.renderLayout : null;
 
     const currentOverrideRenders = route.renderOverrides ? [route.renderOverrides] : [];
-    const overrideRenders = [...parentOverrides, ...currentOverrideRenders];
+    const nodeRenders = [...currentOverrideRenders, ...(route.renderLayout ? [route.renderLayout] : [])];
     const rootLayoutStack = [...parentRootLayouts, ...(currentRootLayout ? [currentRootLayout] : [])];
-    const renderRootLayouts = [...overrideRenders, ...rootLayoutStack];
-    const renderLayouts = [...parentLayouts, ...(currentLayout ? [currentLayout] : [])];
+    const renderRootLayouts = isRoot ? [...parentRootRenders, ...nodeRenders] : parentRootRenders;
+    const renderLayouts = isRoot ? parentLayouts : [...parentLayouts, ...nodeRenders];
     if (route.renderLayout) {
       this.#fallbackRoutes.push({
         path: routePath,
@@ -208,11 +207,9 @@ export class RouteTreeBuilder {
       });
     }
     const routeHead = RouteTreeBuilder.#composeHeadResolvers(route.renderLayout?.resolveHead, parentHead);
-    const pageRenderRootLayouts =
-      route.pageIncludesOwnLayout === false && currentRootLayout
-        ? [...overrideRenders, ...parentRootLayouts]
-        : renderRootLayouts;
-    const pageRenderLayouts = route.pageIncludesOwnLayout === false && currentLayout ? parentLayouts : renderLayouts;
+    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
@@ -231,7 +228,7 @@ export class RouteTreeBuilder {
         : []),
       ...(route.children.size
         ? [...route.children.values()].flatMap((child) =>
-            this.#getPathRoutes(child, rootLayoutStack, renderLayouts, pathSegments, routeHead, overrideRenders),
+            this.#getPathRoutes(child, rootLayoutStack, renderLayouts, pathSegments, routeHead, renderRootLayouts),
           )
         : []),
     ];

package/server/routing/apiRouter.ts

@@ -1,7 +1,7 @@
 import { dayjs } from "akanjs/base";
 import { type Logger, websocketAuthContract, websocketHeartbeatContract } from "akanjs/common";
 import type { InjectRegistry, LiveRegistry } from "akanjs/service";
-import { isExceptionLike, SignalContext, SignalFailure, type WebsocketReqData } from "akanjs/signal";
+import { CrossSiteGuard, isExceptionLike, SignalContext, SignalFailure, type WebsocketReqData } from "akanjs/signal";
 import { compressResponse } from "../contentEncoding";
 import type { HmrWsData, HmrWsHub } from "../hmr/wsHub";
 import { copyBunRequestFields, type WebProxyRunner } from "../proxy";
@@ -58,7 +58,10 @@ export class ApiRouter {
   }: ApiRouteInputs): NonNullHttpRoutes {
     const endpointEntries = Object.entries(routes ?? {}).map(
       ([p, handler]) =>
-        [ApiRouter.applyGlobalPrefix(prefix, p, routeOptions?.[p]), ApiRouter.#compressRoute(handler)] as const,
+        [
+          ApiRouter.applyGlobalPrefix(prefix, p, routeOptions?.[p]),
+          ApiRouter.#corsRoute(ApiRouter.#compressRoute(handler)),
+        ] as const,
     );
     const builtinEntries = Object.entries(builtinRoutes ?? {}).map(
       ([path, handler]) => [path, ApiRouter.#compressRoute(handler)] as const,
@@ -213,6 +216,16 @@ export class ApiRouter {
     });
   }
 
+  static #corsRoute(route: RouteValue): RouteValue {
+    if (!route || typeof route !== "object" || route instanceof Response || "OPTIONS" in route) return route;
+    const methods = Object.keys(route);
+    const answered = ApiRouter.#mapRoute(route, (handler) => async (req) => {
+      const response = await handler(req);
+      return response ? CrossSiteGuard.withCors(req, response) : response;
+    });
+    return { ...(answered as object), OPTIONS: (req: Request) => CrossSiteGuard.preflight(req, methods) } as RouteValue;
+  }
+
   static #mapRoute(route: RouteValue, wrap: (handler: RouteHandler) => RouteHandler): RouteValue {
     if (typeof route === "function") return wrap(route as RouteHandler) as RouteValue;
     if (route instanceof Response) return wrap(() => route) as RouteValue;