@akanjs/cli 3.0.0-beta.20 → 3.0.0-beta.22

package/{index-9d9bgcx4.js → index-ga6hygxr.js}

@@ -4,9 +4,324 @@ import {
   FileSys2
 } from "./index-5b6tavv3.js";
 
-// pkgs/@akanjs/devkit/codegenLock.ts
-import { mkdir, open, readFile, rm, stat } from "fs/promises";
+// pkgs/@akanjs/devkit/artifact/implicitRootLayout.ts
+import { readdir, rm } from "fs/promises";
+import path2 from "path";
+
+// pkgs/@akanjs/devkit/transforms/asyncDefaultExportDetector.ts
+import fs from "fs";
 import path from "path";
+
+class AsyncDefaultExportDetector {
+  static #typescriptLoad;
+  static #loadTypescript() {
+    AsyncDefaultExportDetector.#typescriptLoad ??= import("typescript").then((mod) => mod.default ?? mod);
+    return AsyncDefaultExportDetector.#typescriptLoad;
+  }
+  static async detect(moduleAbsPath) {
+    try {
+      const typescript = await AsyncDefaultExportDetector.#loadTypescript();
+      const source = fs.readFileSync(path.resolve(moduleAbsPath), "utf8");
+      const sourceFile = typescript.createSourceFile(moduleAbsPath, source, typescript.ScriptTarget.Latest, true, /\.[tj]sx$/.test(moduleAbsPath) ? typescript.ScriptKind.TSX : typescript.ScriptKind.TS);
+      return new AsyncDefaultExportDetector(typescript).detectInSourceFile(sourceFile);
+    } catch {
+      return false;
+    }
+  }
+  #ts;
+  constructor(typescript) {
+    this.#ts = typescript;
+  }
+  detectInSourceFile(sourceFile) {
+    const ts = this.#ts;
+    const asyncBindings = new Map;
+    let defaultIdentifier = null;
+    for (const statement of sourceFile.statements) {
+      if (ts.isFunctionDeclaration(statement)) {
+        if (this.#hasModifier(statement, ts.SyntaxKind.DefaultKeyword)) {
+          return this.#hasModifier(statement, ts.SyntaxKind.AsyncKeyword);
+        }
+        if (statement.name) {
+          asyncBindings.set(statement.name.text, this.#hasModifier(statement, ts.SyntaxKind.AsyncKeyword));
+        }
+        continue;
+      }
+      if (ts.isVariableStatement(statement)) {
+        for (const declaration of statement.declarationList.declarations) {
+          if (!ts.isIdentifier(declaration.name))
+            continue;
+          asyncBindings.set(declaration.name.text, this.#isAsyncFunctionExpression(declaration.initializer));
+        }
+        continue;
+      }
+      if (ts.isExportAssignment(statement)) {
+        if (this.#isAsyncFunctionExpression(statement.expression))
+          return true;
+        if (ts.isCallExpression(statement.expression))
+          return true;
+        if (ts.isIdentifier(statement.expression))
+          defaultIdentifier = statement.expression.text;
+        continue;
+      }
+      if (ts.isExportDeclaration(statement) && statement.exportClause && ts.isNamedExports(statement.exportClause)) {
+        for (const specifier of statement.exportClause.elements) {
+          if (specifier.name.text !== "default")
+            continue;
+          defaultIdentifier = specifier.propertyName?.text ?? specifier.name.text;
+        }
+      }
+    }
+    return defaultIdentifier ? asyncBindings.get(defaultIdentifier) === true : false;
+  }
+  #hasModifier(node, kind) {
+    const ts = this.#ts;
+    return ts.canHaveModifiers(node) && (ts.getModifiers(node)?.some((modifier) => modifier.kind === kind) ?? false);
+  }
+  #isAsyncFunctionExpression(node) {
+    const ts = this.#ts;
+    return Boolean(node && (ts.isArrowFunction(node) || ts.isFunctionExpression(node)) && this.#hasModifier(node, ts.SyntaxKind.AsyncKeyword));
+  }
+}
+
+// pkgs/@akanjs/devkit/artifact/implicitRootLayout.ts
+var LAYOUT_KEY_RE = /^\.\/(.+\/)?_layout\.(tsx|ts|jsx|js)$/;
+var IMPLICIT_LAYOUT_DIR = path2.join(".akan", "generated", "root-layouts");
+var IMPLICIT_DICT_DIR = path2.join(".akan", "generated", "dict");
+var IMPLICIT_OVERRIDES_DIR = path2.join(".akan", "generated", "overrides");
+var OVERRIDES_KEY_RE = /^\.\/(.+\/)?_overrides\.(tsx|ts|jsx|js)$/;
+var importSpecifier = (fromAbsPath, toAbsPath) => {
+  const rel = path2.relative(path2.dirname(fromAbsPath), toAbsPath).split(path2.sep).join("/");
+  return rel.startsWith(".") ? rel : `./${rel}`;
+};
+async function writeGeneratedOverridesLayoutFile(opts) {
+  const filename = `${opts.key.replace(/^\.\//, "").replace(/[^a-zA-Z0-9]+/g, "_")}.tsx`;
+  const absPath = path2.join(path2.resolve(opts.appCwdPath), IMPLICIT_OVERRIDES_DIR, filename);
+  const source = `"use client";
+import { UiOverrideProvider } from "akanjs/ui";
+import { createElement, type ReactNode } from "react";
+import value from ${JSON.stringify(importSpecifier(absPath, opts.userAbsPath))};
+
+export default function AkanUiOverridesLayout({ children }: { children?: ReactNode }) {
+  return createElement(UiOverrideProvider, { value }, children);
+}
+`;
+  await Bun.write(absPath, source);
+  return absPath;
+}
+async function pruneGeneratedFiles(dirAbsPath, keepAbsPaths) {
+  const keep = new Set(keepAbsPaths);
+  const names = await readdir(dirAbsPath).catch(() => []);
+  await Promise.all(names.map((name) => path2.join(dirAbsPath, name)).filter((absPath) => !keep.has(absPath)).map((absPath) => rm(absPath, { force: true })));
+}
+function getRootBoundarySegments(key) {
+  const match = LAYOUT_KEY_RE.exec(key);
+  if (!match)
+    return null;
+  const prefix = match[1]?.replace(/\/$/, "");
+  if (!prefix)
+    return [];
+  return prefix.split("/").filter(Boolean);
+}
+function implicitRootLayoutKey(segments) {
+  return `./${[...segments, "__root_layout"].join("/")}.tsx`;
+}
+function implicitRootLayoutAbsPath(appCwdPath, segments) {
+  const filename = segments.length ? `${segments.join("__")}__root_layout.tsx` : "__root_layout.tsx";
+  return path2.join(path2.resolve(appCwdPath), IMPLICIT_LAYOUT_DIR, filename);
+}
+function isRootBoundarySegments(segments, basePaths) {
+  const firstVisibleIndex = segments.findIndex((segment) => !/^\(.+\)$/.test(segment));
+  if (firstVisibleIndex === -1)
+    return segments.length <= 1;
+  if (segments.slice(firstVisibleIndex + 1).some((segment) => /^\(.+\)$/.test(segment)))
+    return false;
+  const visible = segments.slice(firstVisibleIndex);
+  const allowedBasePaths = new Set([...basePaths].map((basePath) => basePath.trim()).filter(Boolean));
+  return visible.length === 1 && (firstVisibleIndex > 0 || allowedBasePaths.has(visible[0] ?? ""));
+}
+function findRootBoundaries(pageKeys, appCwdPath, basePaths) {
+  const boundaries = new Map;
+  for (const key of pageKeys) {
+    const segments = getRootBoundarySegments(key);
+    if (!segments)
+      continue;
+    if (!isRootBoundarySegments(segments, basePaths))
+      continue;
+    const id = segments.join("/");
+    boundaries.set(id, {
+      sourceKey: key,
+      sourceAbsPath: path2.resolve(appCwdPath, "page", key.replace(/^\.\//, "")),
+      segments
+    });
+  }
+  if (boundaries.size === 0)
+    boundaries.set("", { sourceKey: null, sourceAbsPath: null, segments: [] });
+  return [...boundaries.values()].sort((a, b) => a.segments.join("/").localeCompare(b.segments.join("/")));
+}
+function hasAncestorRootBoundary(boundary, boundaries) {
+  return boundaries.some((candidate) => candidate !== boundary && candidate.segments.length < boundary.segments.length && candidate.segments.every((segment, index) => boundary.segments[index] === segment));
+}
+function findExplicitRootLayoutAbsPath(pageKeys, appCwdPath) {
+  const rootLayoutKey = pageKeys.find((key) => {
+    const segments = getRootBoundarySegments(key);
+    return segments !== null && segments.length === 0;
+  });
+  return rootLayoutKey ? path2.resolve(appCwdPath, "page", rootLayoutKey.replace(/^\.\//, "")) : null;
+}
+async function assertEnvClientConvention(appCwdPath, appName) {
+  const envPath = path2.join(appCwdPath, "env", "env.client.ts");
+  if (!await Bun.file(envPath).exists()) {
+    throw new Error(`[route-convention] app "${appName}" must provide env/env.client.ts exporting "env" for generated System.Provider`);
+  }
+}
+async function writeGeneratedDictionaryMacroFile(appCwdPath, appName) {
+  const absPath = path2.join(path2.resolve(appCwdPath), IMPLICIT_DICT_DIR, "useDict.ts");
+  await Bun.write(absPath, `import { getAllDictionary } from "@apps/${appName}/lib/dict" with { type: "macro" };
+
+export const allDictionary = getAllDictionary();
+`);
+  return absPath;
+}
+async function writeGeneratedRootLayoutFile(opts) {
+  await assertEnvClientConvention(opts.appCwdPath, opts.appName);
+  const dictMacroAbsPath = opts.includeSystemProvider ? await writeGeneratedDictionaryMacroFile(opts.appCwdPath, opts.appName) : null;
+  const absPath = implicitRootLayoutAbsPath(opts.appCwdPath, opts.boundary.segments);
+  const dictMacroSpecifier = dictMacroAbsPath ? importSpecifier(absPath, dictMacroAbsPath) : null;
+  const sourceSpecifier = opts.boundary.sourceAbsPath ? importSpecifier(absPath, opts.boundary.sourceAbsPath) : null;
+  const inheritedSourceAbsPath = opts.rootSourceAbsPath && opts.rootSourceAbsPath !== opts.boundary.sourceAbsPath ? opts.rootSourceAbsPath : null;
+  const inheritedSourceSpecifier = inheritedSourceAbsPath ? importSpecifier(absPath, inheritedSourceAbsPath) : null;
+  const clientImport = opts.includeStInit ? `import { st } from "@apps/${opts.appName}/client";
+void st;
+` : `import "@apps/${opts.appName}/client";
+`;
+  const inheritedLabel = inheritedSourceAbsPath ? path2.relative(opts.appCwdPath, inheritedSourceAbsPath) : "";
+  const inheritedImport = inheritedSourceSpecifier ? `import * as inheritedModule from ${JSON.stringify(inheritedSourceSpecifier)};
+const inheritedLayout = resolveRouteModule(inheritedModule as never, ${JSON.stringify(inheritedLabel)}).module as LayoutModule;
+` : `const inheritedLayout: LayoutModule = {};
+`;
+  const prefix = opts.boundary.segments.find((segment) => !/^\(.+\)$/.test(segment)) ?? null;
+  const userLabel = opts.boundary.sourceAbsPath ? path2.relative(opts.appCwdPath, opts.boundary.sourceAbsPath) : "";
+  const userImport = sourceSpecifier ? `import * as userModule from ${JSON.stringify(sourceSpecifier)};
+const userLayout = resolveRouteModule(userModule as never, ${JSON.stringify(userLabel)}).module as LayoutModule;
+const UserLayout = userLayout.default as (props: LayoutProps) => ReactNode | Promise<ReactNode>;
+` : `const UserLayout = ({ children }: LayoutProps) => children;
+const userLayout: LayoutModule = {};
+`;
+  const isAsyncUserLayout = opts.boundary.sourceAbsPath ? await AsyncDefaultExportDetector.detect(opts.boundary.sourceAbsPath) : false;
+  const userLayoutElement = "<UserLayout params={params} searchParams={searchParams}>{children}</UserLayout>";
+  const layoutSignature = isAsyncUserLayout ? "export default async function GeneratedLayout" : "export default function GeneratedLayout";
+  const layoutBinding = isAsyncUserLayout ? `  const layout =
+    process.env.AKAN_PUBLIC_RENDER_ENV === "csr"
+      ? await UserLayout({ params, searchParams, children })
+      : ${userLayoutElement};
+` : "";
+  const layoutChild = isAsyncUserLayout ? "{layout}" : userLayoutElement;
+  const layoutReturn = isAsyncUserLayout ? "layout" : userLayoutElement;
+  const layoutExports = `export async function generateHead(props: PageProps) {
+  if (userLayout.generateHead) return userLayout.generateHead(props);
+  if (userLayout.head !== undefined) return userLayout.head;
+  if (inheritedLayout.generateHead) return inheritedLayout.generateHead(props);
+  return inheritedLayout.head;
+}
+
+export const NotFound = userLayout.NotFound ?? inheritedLayout.NotFound;
+export const Error = userLayout.Error ?? inheritedLayout.Error;
+export const pageConfig = userLayout.pageConfig ?? inheritedLayout.pageConfig;
+
+${layoutSignature}({ children, params, searchParams }: LayoutProps) {
+${layoutBinding}  return `;
+  const source = opts.includeSystemProvider ? `import type { LayoutModule, LayoutProps, PageProps } from "akanjs/client";
+import { loadFonts, resolveRouteModule } from "akanjs/client";
+import type { ReactNode } from "react";
+import { System } from "akanjs/ui";
+import { env } from "@apps/${opts.appName}/env/env.client";
+import { allDictionary } from ${JSON.stringify(dictMacroSpecifier)};
+${clientImport}${inheritedImport}${userImport}
+const userFonts = userLayout.fonts ?? inheritedLayout.fonts ?? [];
+const defaultFonts = userFonts.filter((font) => font.default);
+if (defaultFonts.length > 1) throw new Error("[route-convention] only one default font is allowed per root layout");
+const defaultFont = defaultFonts[0];
+const defaultFontClassName = defaultFont ? (defaultFont.className ?? \`font-\${defaultFont.name}\`) : undefined;
+
+${layoutExports}(
+    <System.Provider
+      of={GeneratedLayout as never}
+      appName=${JSON.stringify(opts.appName)}
+      ${prefix ? `prefix=${JSON.stringify(prefix)}
+      ` : ""}params={params}
+      manifest={userLayout.manifest ?? inheritedLayout.manifest}
+      env={env}
+      theme={userLayout.theme ?? inheritedLayout.theme}
+      fonts={loadFonts(userFonts)}
+      className={defaultFontClassName}
+      layoutStyle={userLayout.layoutStyle ?? inheritedLayout.layoutStyle}
+      reconnect={userLayout.reconnect ?? inheritedLayout.reconnect ?? false}
+      wsConnect={userLayout.wsConnect ?? inheritedLayout.wsConnect ?? true}
+      allDictionary={process.env.AKAN_PUBLIC_RENDER_ENV === "ssr" ? allDictionary : undefined}
+    >
+      ${layoutChild}
+    </System.Provider>
+  );
+}
+` : `import type { LayoutModule, LayoutProps, PageProps } from "akanjs/client";
+import { resolveRouteModule } from "akanjs/client";
+import type { ReactNode } from "react";
+${inheritedImport}${userImport}
+${layoutExports}${layoutReturn};
+}
+`;
+  await Bun.write(absPath, source);
+  return absPath;
+}
+async function resolveSsrPageEntries(opts) {
+  const absPageDir = path2.resolve(opts.appCwdPath, "page");
+  const hasSt = await Bun.file(path2.join(opts.appCwdPath, "lib", "st.ts")).exists();
+  const basePaths = opts.basePaths ?? [];
+  const rootSourceAbsPath = findExplicitRootLayoutAbsPath(opts.pageKeys, opts.appCwdPath);
+  const rootBoundaries = findRootBoundaries(opts.pageKeys, opts.appCwdPath, basePaths);
+  const rootLayoutKeys = new Set(opts.pageKeys.filter((key) => {
+    const segments = getRootBoundarySegments(key);
+    return segments !== null && isRootBoundarySegments(segments, basePaths);
+  }));
+  const base = await Promise.all(opts.pageKeys.filter((key) => !rootLayoutKeys.has(key)).map(async (key) => {
+    const userAbsPath = path2.resolve(absPageDir, key);
+    if (OVERRIDES_KEY_RE.test(key)) {
+      const moduleAbsPath = await writeGeneratedOverridesLayoutFile({
+        appCwdPath: opts.appCwdPath,
+        key,
+        userAbsPath
+      });
+      return { key, moduleAbsPath, seedAbsPaths: [userAbsPath] };
+    }
+    return { key, moduleAbsPath: userAbsPath };
+  }));
+  const generated = await Promise.all(rootBoundaries.map(async (boundary) => ({
+    key: implicitRootLayoutKey(boundary.segments),
+    moduleAbsPath: await writeGeneratedRootLayoutFile({
+      appCwdPath: opts.appCwdPath,
+      appName: opts.appName,
+      boundary,
+      rootSourceAbsPath,
+      includeStInit: hasSt && boundary.segments.length === 0,
+      includeSystemProvider: !hasAncestorRootBoundary(boundary, rootBoundaries)
+    }),
+    seedAbsPaths: [...new Set([boundary.sourceAbsPath, rootSourceAbsPath].filter((absPath) => absPath !== null))]
+  })));
+  const appCwdAbsPath = path2.resolve(opts.appCwdPath);
+  await Promise.all([
+    pruneGeneratedFiles(path2.join(appCwdAbsPath, IMPLICIT_OVERRIDES_DIR), base.filter(({ key }) => OVERRIDES_KEY_RE.test(key)).map(({ moduleAbsPath }) => moduleAbsPath)),
+    pruneGeneratedFiles(path2.join(appCwdAbsPath, IMPLICIT_LAYOUT_DIR), generated.map(({ moduleAbsPath }) => moduleAbsPath))
+  ]);
+  return [...base, ...generated].sort((a, b) => a.key.localeCompare(b.key));
+}
+async function resolveSsrPageEntriesForApp(app, pageKeys) {
+  const config = await app.getConfig();
+  return resolveSsrPageEntries({ appCwdPath: app.cwdPath, appName: app.name, pageKeys, basePaths: config.basePaths });
+}
+
+// pkgs/@akanjs/devkit/codegenLock.ts
+import { mkdir, open, readFile, rm as rm2, stat } from "fs/promises";
+import path3 from "path";
 import { Logger } from "akanjs/common";
 
 class CodegenLock {
@@ -17,7 +332,7 @@ class CodegenLock {
   static #logger = new Logger("CodegenLock");
   static #queue = Promise.resolve();
   static pathIn(workspaceRoot) {
-    return path.join(workspaceRoot, "local", ".akan", CodegenLock.fileName);
+    return path3.join(workspaceRoot, "local", ".akan", CodegenLock.fileName);
   }
   static async run(workspaceRoot, label, fn) {
     const ahead = CodegenLock.#queue;
@@ -47,7 +362,7 @@ class CodegenLock {
   }
   static async#withFileLock(workspaceRoot, label, fn) {
     const lockPath = CodegenLock.pathIn(workspaceRoot);
-    await mkdir(path.dirname(lockPath), { recursive: true }).catch(() => {
+    await mkdir(path3.dirname(lockPath), { recursive: true }).catch(() => {
       return;
     });
     const held = await CodegenLock.#acquire(lockPath, label);
@@ -55,7 +370,7 @@ class CodegenLock {
       return await fn();
     } finally {
       if (held)
-        await rm(lockPath, { force: true }).catch(() => {
+        await rm2(lockPath, { force: true }).catch(() => {
           return;
         });
     }
@@ -92,7 +407,7 @@ class CodegenLock {
         return false;
     } else if (Date.now() - info.mtimeMs < CodegenLock.unknownHolderStaleMs)
       return false;
-    await rm(lockPath, { force: true }).catch(() => {
+    await rm2(lockPath, { force: true }).catch(() => {
       return;
     });
     return true;
@@ -354,8 +669,8 @@ ${CLAUDE_COMMENT_RULE}
 `;
 
 // pkgs/@akanjs/devkit/akanConfig/akanConfig.ts
-import fs from "fs";
-import path2 from "path";
+import fs2 from "fs";
+import path4 from "path";
 import { fileURLToPath } from "url";
 import { DatabaseModes, normalizeRoutePrefix } from "akanjs/base";
 import { resolveAkanI18nConfig } from "akanjs/common";
@@ -374,17 +689,6 @@ var DEFAULT_OPTIMIZE_IMPORTS = [
 var WORKSPACE_BARREL_FACETS = ["ui", "webkit", "common", "client", "server"];
 var DEFAULT_DOCKER_IMAGE = "oven/bun:1-slim";
 var SSR_RUNTIME_PACKAGES = ["react", "react-dom", "react-server-dom-webpack"];
-var MOBILE_RUNTIME_PACKAGES = [
-  "@capacitor/cli",
-  "@capacitor/core",
-  "@capacitor/ios",
-  "@capacitor/android",
-  "@capacitor/assets"
-];
-var MOBILE_APP_CAPACITOR_PLUGINS = [
-  ..."app browser camera core device geolocation haptics inappbrowser keyboard preferences push-notifications".split(" ").map((name) => `@capacitor/${name}`),
-  "capacitor-plugin-safe-area"
-];
 var DEFAULT_AKAN_IMAGE_CONFIG = {
   deviceSizes: [640, 750, 828, 1080, 1200, 1920, 2048, 3840],
   imageSizes: [32, 48, 64, 96, 128, 256, 384],
@@ -530,7 +834,7 @@ class AkanAppConfig {
   #resolveWebConfig(web) {
     const resolved = typeof web === "object" ? { ssr: true, csr: web.csr } : { ssr: web ?? true, csr: web ?? true };
     if (!resolved.csr && this.hasMobileConfig)
-      throw new Error(`apps/${this.app.name}/akan.config.ts turns the CSR bundle off but declares mobile targets; the Capacitor build ships that bundle. Drop the mobile section or leave CSR on.`);
+      throw new Error(`apps/${this.app.name}/akan.config.ts turns the CSR bundle off but declares mobile targets; the mobile apps ship that bundle. Drop the mobile section or leave CSR on.`);
     return resolved;
   }
   #resolveMobileConfig(mobile) {
@@ -539,57 +843,113 @@ class AkanAppConfig {
       indexPath: _indexPath,
       ...rawMobile
     } = mobile ?? {};
+    const configPath = `apps/${this.app.name}/akan.config.ts`;
+    AkanAppConfig.#assertMobileKeys(rawMobile, AkanAppConfig.#mobileKeys, "mobile", configPath);
     const appName = rawMobile.appName ?? this.app.name;
     const appId = rawMobile.appId ?? deriveDefaultAppId(this.baseDevEnv.repoName, this.app.name);
     const version = rawMobile.version ?? "0.0.1";
     const buildNum = rawMobile.buildNum ?? 1;
+    const files = AkanAppConfig.#resolveMobileFiles(rawMobile.files, "mobile", configPath);
+    const native = rawMobile.native;
     const defaultTargetName = this.#defaultMobileTargetName(rawTargets);
     const targetEntries = Object.entries(rawTargets ?? {
       [defaultTargetName]: {}
     });
     const targets = Object.fromEntries(targetEntries.map(([name, rawTarget]) => {
-      const target = rawTarget;
+      const target = rawTarget ?? {};
+      const where = `mobile.targets.${name}`;
+      AkanAppConfig.#assertMobileKeys(target, AkanAppConfig.#targetKeys, where, configPath);
       const fallbackBasePath = !rawTargets && this.basePaths.has(name) ? name : undefined;
       const basePath = (target.basePath ?? fallbackBasePath)?.replace(/^\/+|\/+$/g, "") || undefined;
       const indexPath = normalizeIndexPath(target.indexPath);
       const deepLinks = normalizeDeepLinks(target.deepLinks);
       if (basePath && !this.basePaths.has(basePath)) {
-        throw new Error(`Mobile target '${name}' uses unknown basePath '${basePath}' in apps/${this.app.name}/akan.config.ts`);
+        throw new Error(`Mobile target '${name}' uses unknown basePath '${basePath}' in ${configPath}`);
       }
+      const targetFiles = AkanAppConfig.#resolveMobileFiles(target.files, where, configPath);
+      const fileName = target.fileName ?? rawMobile.fileName;
       const resolved = {
-        ...rawMobile,
-        ...target,
         name,
         basePath,
         indexPath,
         deepLinks,
         appName: target.appName ?? appName,
         appId: target.appId ?? appId,
+        ...fileName ? { fileName } : {},
         version: target.version ?? version,
         buildNum: target.buildNum ?? buildNum,
-        plugins: {
-          ...rawMobile.plugins,
-          ...target.plugins
-        },
-        android: {
-          ...rawMobile.android,
-          ...target.android
-        },
-        ios: {
-          ...rawMobile.ios,
-          ...target.ios
-        }
+        ...target.assets ? { assets: target.assets } : {},
+        ...target.permissions ? { permissions: target.permissions } : {},
+        ...files || targetFiles ? { files: { ...files, ...targetFiles } } : {},
+        ...native || target.native ? { native: AkanAppConfig.#mergeNative(native, target.native) } : {}
       };
       return [name, resolved];
     }));
     return {
-      ...rawMobile,
       appName,
       appId,
+      ...rawMobile.fileName ? { fileName: rawMobile.fileName } : {},
       version,
       buildNum,
-      targets,
-      plugins: rawMobile.plugins
+      ...files ? { files } : {},
+      ...native ? { native } : {},
+      targets
+    };
+  }
+  static #mobileKeys = ["appName", "appId", "fileName", "version", "buildNum", "files", "native"];
+  static #targetKeys = [
+    "basePath",
+    "indexPath",
+    "appName",
+    "appId",
+    "fileName",
+    "version",
+    "buildNum",
+    "assets",
+    "permissions",
+    "deepLinks",
+    "files",
+    "native"
+  ];
+  static #assertMobileKeys(section, known, where, configPath) {
+    for (const key of Object.keys(section)) {
+      if (known.includes(key))
+        continue;
+      if (key === "plugins" || key === "ios" || key === "android")
+        throw new Error(`${where}.${key} in ${configPath} is a Capacitor setting. The native runtime reads native.plugins, native.ios.{infoPlist,entitlements} and native.android.{manifest,application,activity,googleServices} instead.`);
+      throw new Error(`${where}.${key} in ${configPath} is not a mobile setting. Known: ${known.join(", ")}.`);
+    }
+  }
+  static #fileTargetPattern = /^(?:ios\/.+|android\/res\/[^/]+\/[^/]+|android\/assets\/.+)$/;
+  static #resolveMobileFiles(files, where, configPath) {
+    if (!files)
+      return;
+    for (const [to, from] of Object.entries(files)) {
+      if (typeof from !== "string")
+        throw new Error(`${where}.files in ${configPath} maps where a file lands to its source now, e.g. { "android/res/raw/chime.mp3": "assets/chime.mp3" }. google-services.json goes to native.android.googleServices, and GoogleService-Info.plist is no longer needed.`);
+      if (!AkanAppConfig.#fileTargetPattern.test(to))
+        throw new Error(`${where}.files["${to}"] in ${configPath} must land under ios/<path>, android/res/<type>/<file> or android/assets/<path>.`);
+    }
+    return files;
+  }
+  static #mergeNative(base, override) {
+    const plugins = [...new Set([...base?.plugins ?? [], ...override?.plugins ?? []])];
+    const ios = { ...base?.ios, ...override?.ios };
+    const android = {
+      ...base?.android,
+      ...override?.android
+    };
+    for (const key of ["manifest", "application", "activity"]) {
+      const merged = [...base?.android?.[key] ?? [], ...override?.android?.[key] ?? []];
+      if (merged.length)
+        android[key] = merged;
+      else
+        delete android[key];
+    }
+    return {
+      ...plugins.length ? { plugins } : {},
+      ...Object.keys(ios).length ? { ios } : {},
+      ...Object.keys(android).length ? { android } : {}
     };
   }
   #defaultMobileTargetName(rawTargets) {
@@ -695,7 +1055,7 @@ CMD [${command.map((c) => `"${c}"`).join(",")}]`;
   static async from(app, { bustImportCache = false } = {}) {
     const [configImp, baseDevEnv, libs, rootPackageJson] = await Promise.all([
       AkanAppConfig.importConfigModule(app.cwdPath, { bustImportCache }),
-      WorkspaceExecutor.getBaseDevEnv(path2.join(app.workspace.workspaceRoot, ".env")),
+      WorkspaceExecutor.getBaseDevEnv(path4.join(app.workspace.workspaceRoot, ".env")),
       app.workspace.getLibs(),
       app.workspace.getPackageJson()
     ]);
@@ -736,429 +1096,116 @@ CMD [${command.map((c) => `"${c}"`).join(",")}]`;
     ];
   }
   getDatabaseModeRuntimePackages(databaseMode) {
-    return [...DatabaseModes.drivers[databaseMode]];
-  }
-  getMissingDatabaseModeDependencySpecs(databaseMode) {
-    return this.#getMissingDependencySpecs(this.getDatabaseModeRuntimePackages(databaseMode));
-  }
-  resolveDatabaseMode() {
-    return DatabaseModes.resolve({
-      requested: process.env.AKAN_DATABASE_MODE,
-      declared: this.database.modes.join(","),
-      local: true
-    });
-  }
-  static #database(app, config) {
-    const declared = config?.database?.modes?.filter((mode) => !!mode);
-    const modes = declared?.length ? declared : ["single"];
-    return { modes: DatabaseModes.parseList(modes.join(","), `database.modes in apps/${app.name}/akan.config.ts`) };
-  }
-  getMobileRuntimePackages() {
-    return [...new Set([...MOBILE_RUNTIME_PACKAGES, ...MOBILE_APP_CAPACITOR_PLUGINS])];
-  }
-  getMissingMobileDependencySpecs() {
-    return this.#getMissingDependencySpecs(this.getMobileRuntimePackages());
-  }
-  getMobileAppCapacitorPlugins() {
-    return [...MOBILE_APP_CAPACITOR_PLUGINS];
-  }
-  #getMissingDependencySpecs(libs) {
-    const rootDependencies = {
-      ...this.rootPackageJson.dependencies,
-      ...this.rootPackageJson.devDependencies
-    };
-    return libs.filter((lib) => !rootDependencies[lib]).map((lib) => `${lib}@${this.#resolveProductionDependencyVersion(lib)}`);
-  }
-  get akanVersion() {
-    return getAkanPackageJson().version;
-  }
-  getProductionPackageJson(data = {}) {
-    return {
-      name: this.app.name,
-      description: this.app.name,
-      version: "1.0.0",
-      main: "./main.js",
-      dependencies: Object.fromEntries([...new Set(this.#getProductionRuntimePackages())].map((lib) => [
-        lib,
-        this.#resolveProductionDependencyVersion(lib)
-      ])),
-      ...data
-    };
-  }
-}
-var akanPackageJson = null;
-function getAkanPackageJson() {
-  if (akanPackageJson)
-    return akanPackageJson;
-  const sourceDir = path2.dirname(fileURLToPath(import.meta.url));
-  const packageJsonPaths = [
-    path2.join(sourceDir, "../../../akanjs/package.json"),
-    path2.join(process.cwd(), "pkgs/akanjs/package.json"),
-    path2.join(path2.dirname(Bun.main), "node_modules/akanjs/package.json")
-  ];
-  try {
-    packageJsonPaths.unshift(Bun.resolveSync("akanjs/package.json", sourceDir));
-  } catch {}
-  for (const packageJsonPath of packageJsonPaths) {
-    try {
-      akanPackageJson = JSON.parse(fs.readFileSync(packageJsonPath, "utf8"));
-      return akanPackageJson;
-    } catch {}
-  }
-  akanPackageJson = {
-    name: "akanjs",
-    version: "0.0.0",
-    description: "akanjs",
-    dependencies: {}
-  };
-  return akanPackageJson;
-}
-function mergeImageConfig(config = {}) {
-  return {
-    ...DEFAULT_AKAN_IMAGE_CONFIG,
-    ...config,
-    deviceSizes: config.deviceSizes ?? DEFAULT_AKAN_IMAGE_CONFIG.deviceSizes,
-    imageSizes: config.imageSizes ?? DEFAULT_AKAN_IMAGE_CONFIG.imageSizes,
-    formats: config.formats ?? DEFAULT_AKAN_IMAGE_CONFIG.formats,
-    qualities: config.qualities ?? DEFAULT_AKAN_IMAGE_CONFIG.qualities,
-    remotePatterns: config.remotePatterns ?? DEFAULT_AKAN_IMAGE_CONFIG.remotePatterns,
-    localPatterns: config.localPatterns ?? DEFAULT_AKAN_IMAGE_CONFIG.localPatterns
-  };
-}
-
-class AkanLibConfig {
-  lib;
-  externalLibs;
-  docker;
-  assets;
-  plugins;
-  constructor(lib, config, plugins = []) {
-    this.lib = lib;
-    this.externalLibs = config?.externalLibs ?? [];
-    this.docker = { preRuns: config?.docker?.preRuns ?? [], postRuns: config?.docker?.postRuns ?? [] };
-    this.assets = { keepFonts: normalizeKeepFonts(config?.assets?.keepFonts) };
-    this.plugins = plugins;
-  }
-  static async from(lib, { bustImportCache = false } = {}) {
-    const configImp = await AkanAppConfig.importConfigModule(lib.cwdPath, { bustImportCache });
-    const resolved = typeof configImp === "function" ? configImp(lib) : configImp;
-    const { plugins, ...config } = resolved ?? {};
-    return new AkanLibConfig(lib, config, plugins ?? []);
-  }
-}
-//! need to refactor
-var shiftBuildNum = async (app, delta) => {
-  const { buildNum } = (await AkanAppConfig.from(app)).mobile;
-  const akanConfigPath = path2.join(app.cwdPath, "akan.config.ts");
-  const akanConfig = fs.readFileSync(akanConfigPath, "utf8");
-  fs.writeFileSync(akanConfigPath, akanConfig.replace(`buildNum: ${buildNum}`, `buildNum: ${buildNum + delta}`));
-};
-var increaseBuildNum = async (app) => await shiftBuildNum(app, 1);
-var decreaseBuildNum = async (app) => await shiftBuildNum(app, -1);
-// pkgs/@akanjs/devkit/artifact/implicitRootLayout.ts
-import path4 from "path";
-
-// pkgs/@akanjs/devkit/transforms/asyncDefaultExportDetector.ts
-import fs2 from "fs";
-import path3 from "path";
-
-class AsyncDefaultExportDetector {
-  static #typescriptLoad;
-  static #loadTypescript() {
-    AsyncDefaultExportDetector.#typescriptLoad ??= import("typescript").then((mod) => mod.default ?? mod);
-    return AsyncDefaultExportDetector.#typescriptLoad;
-  }
-  static async detect(moduleAbsPath) {
-    try {
-      const typescript = await AsyncDefaultExportDetector.#loadTypescript();
-      const source = fs2.readFileSync(path3.resolve(moduleAbsPath), "utf8");
-      const sourceFile = typescript.createSourceFile(moduleAbsPath, source, typescript.ScriptTarget.Latest, true, /\.[tj]sx$/.test(moduleAbsPath) ? typescript.ScriptKind.TSX : typescript.ScriptKind.TS);
-      return new AsyncDefaultExportDetector(typescript).detectInSourceFile(sourceFile);
-    } catch {
-      return false;
-    }
-  }
-  #ts;
-  constructor(typescript) {
-    this.#ts = typescript;
-  }
-  detectInSourceFile(sourceFile) {
-    const ts = this.#ts;
-    const asyncBindings = new Map;
-    let defaultIdentifier = null;
-    for (const statement of sourceFile.statements) {
-      if (ts.isFunctionDeclaration(statement)) {
-        if (this.#hasModifier(statement, ts.SyntaxKind.DefaultKeyword)) {
-          return this.#hasModifier(statement, ts.SyntaxKind.AsyncKeyword);
-        }
-        if (statement.name) {
-          asyncBindings.set(statement.name.text, this.#hasModifier(statement, ts.SyntaxKind.AsyncKeyword));
-        }
-        continue;
-      }
-      if (ts.isVariableStatement(statement)) {
-        for (const declaration of statement.declarationList.declarations) {
-          if (!ts.isIdentifier(declaration.name))
-            continue;
-          asyncBindings.set(declaration.name.text, this.#isAsyncFunctionExpression(declaration.initializer));
-        }
-        continue;
-      }
-      if (ts.isExportAssignment(statement)) {
-        if (this.#isAsyncFunctionExpression(statement.expression))
-          return true;
-        if (ts.isCallExpression(statement.expression))
-          return true;
-        if (ts.isIdentifier(statement.expression))
-          defaultIdentifier = statement.expression.text;
-        continue;
-      }
-      if (ts.isExportDeclaration(statement) && statement.exportClause && ts.isNamedExports(statement.exportClause)) {
-        for (const specifier of statement.exportClause.elements) {
-          if (specifier.name.text !== "default")
-            continue;
-          defaultIdentifier = specifier.propertyName?.text ?? specifier.name.text;
-        }
-      }
-    }
-    return defaultIdentifier ? asyncBindings.get(defaultIdentifier) === true : false;
-  }
-  #hasModifier(node, kind) {
-    const ts = this.#ts;
-    return ts.canHaveModifiers(node) && (ts.getModifiers(node)?.some((modifier) => modifier.kind === kind) ?? false);
-  }
-  #isAsyncFunctionExpression(node) {
-    const ts = this.#ts;
-    return Boolean(node && (ts.isArrowFunction(node) || ts.isFunctionExpression(node)) && this.#hasModifier(node, ts.SyntaxKind.AsyncKeyword));
-  }
-}
-
-// pkgs/@akanjs/devkit/artifact/implicitRootLayout.ts
-var LAYOUT_KEY_RE = /^\.\/(.+\/)?_layout\.(tsx|ts|jsx|js)$/;
-var IMPLICIT_LAYOUT_DIR = path4.join(".akan", "generated", "root-layouts");
-var IMPLICIT_DICT_DIR = path4.join(".akan", "generated", "dict");
-var IMPLICIT_OVERRIDES_DIR = path4.join(".akan", "generated", "overrides");
-var OVERRIDES_KEY_RE = /^\.\/(.+\/)?_overrides\.(tsx|ts|jsx|js)$/;
-var importSpecifier = (fromAbsPath, toAbsPath) => {
-  const rel = path4.relative(path4.dirname(fromAbsPath), toAbsPath).split(path4.sep).join("/");
-  return rel.startsWith(".") ? rel : `./${rel}`;
-};
-async function writeGeneratedOverridesLayoutFile(opts) {
-  const filename = `${opts.key.replace(/^\.\//, "").replace(/[^a-zA-Z0-9]+/g, "_")}.tsx`;
-  const absPath = path4.join(path4.resolve(opts.appCwdPath), IMPLICIT_OVERRIDES_DIR, filename);
-  const source = `"use client";
-import { UiOverrideProvider } from "akanjs/ui";
-import { createElement, type ReactNode } from "react";
-import value from ${JSON.stringify(importSpecifier(absPath, opts.userAbsPath))};
-
-export default function AkanUiOverridesLayout({ children }: { children?: ReactNode }) {
-  return createElement(UiOverrideProvider, { value }, children);
-}
-`;
-  await Bun.write(absPath, source);
-  return absPath;
-}
-function getRootBoundarySegments(key) {
-  const match = LAYOUT_KEY_RE.exec(key);
-  if (!match)
-    return null;
-  const prefix = match[1]?.replace(/\/$/, "");
-  if (!prefix)
-    return [];
-  return prefix.split("/").filter(Boolean);
-}
-function implicitRootLayoutKey(segments) {
-  return `./${[...segments, "__root_layout"].join("/")}.tsx`;
-}
-function implicitRootLayoutAbsPath(appCwdPath, segments) {
-  const filename = segments.length ? `${segments.join("__")}__root_layout.tsx` : "__root_layout.tsx";
-  return path4.join(path4.resolve(appCwdPath), IMPLICIT_LAYOUT_DIR, filename);
-}
-function isRootBoundarySegments(segments, basePaths) {
-  const firstVisibleIndex = segments.findIndex((segment) => !/^\(.+\)$/.test(segment));
-  if (firstVisibleIndex === -1)
-    return segments.length <= 1;
-  if (segments.slice(firstVisibleIndex + 1).some((segment) => /^\(.+\)$/.test(segment)))
-    return false;
-  const visible = segments.slice(firstVisibleIndex);
-  const allowedBasePaths = new Set([...basePaths].map((basePath) => basePath.trim()).filter(Boolean));
-  return visible.length === 1 && (firstVisibleIndex > 0 || allowedBasePaths.has(visible[0] ?? ""));
-}
-function findRootBoundaries(pageKeys, appCwdPath, basePaths) {
-  const boundaries = new Map;
-  for (const key of pageKeys) {
-    const segments = getRootBoundarySegments(key);
-    if (!segments)
-      continue;
-    if (!isRootBoundarySegments(segments, basePaths))
-      continue;
-    const id = segments.join("/");
-    boundaries.set(id, {
-      sourceKey: key,
-      sourceAbsPath: path4.resolve(appCwdPath, "page", key.replace(/^\.\//, "")),
-      segments
+    return [...DatabaseModes.drivers[databaseMode]];
+  }
+  getMissingDatabaseModeDependencySpecs(databaseMode) {
+    return this.#getMissingDependencySpecs(this.getDatabaseModeRuntimePackages(databaseMode));
+  }
+  resolveDatabaseMode() {
+    return DatabaseModes.resolve({
+      requested: process.env.AKAN_DATABASE_MODE,
+      declared: this.database.modes.join(","),
+      local: true
     });
   }
-  if (boundaries.size === 0)
-    boundaries.set("", { sourceKey: null, sourceAbsPath: null, segments: [] });
-  return [...boundaries.values()].sort((a, b) => a.segments.join("/").localeCompare(b.segments.join("/")));
-}
-function hasAncestorRootBoundary(boundary, boundaries) {
-  return boundaries.some((candidate) => candidate !== boundary && candidate.segments.length < boundary.segments.length && candidate.segments.every((segment, index) => boundary.segments[index] === segment));
-}
-function findExplicitRootLayoutAbsPath(pageKeys, appCwdPath) {
-  const rootLayoutKey = pageKeys.find((key) => {
-    const segments = getRootBoundarySegments(key);
-    return segments !== null && segments.length === 0;
-  });
-  return rootLayoutKey ? path4.resolve(appCwdPath, "page", rootLayoutKey.replace(/^\.\//, "")) : null;
-}
-async function assertEnvClientConvention(appCwdPath, appName) {
-  const envPath = path4.join(appCwdPath, "env", "env.client.ts");
-  if (!await Bun.file(envPath).exists()) {
-    throw new Error(`[route-convention] app "${appName}" must provide env/env.client.ts exporting "env" for generated System.Provider`);
+  static #database(app, config) {
+    const declared = config?.database?.modes?.filter((mode) => !!mode);
+    const modes = declared?.length ? declared : ["single"];
+    return { modes: DatabaseModes.parseList(modes.join(","), `database.modes in apps/${app.name}/akan.config.ts`) };
+  }
+  #getMissingDependencySpecs(libs) {
+    const rootDependencies = {
+      ...this.rootPackageJson.dependencies,
+      ...this.rootPackageJson.devDependencies
+    };
+    return libs.filter((lib) => !rootDependencies[lib]).map((lib) => `${lib}@${this.#resolveProductionDependencyVersion(lib)}`);
+  }
+  get akanVersion() {
+    return getAkanPackageJson().version;
+  }
+  getProductionPackageJson(data = {}) {
+    return {
+      name: this.app.name,
+      description: this.app.name,
+      version: "1.0.0",
+      main: "./main.js",
+      dependencies: Object.fromEntries([...new Set(this.#getProductionRuntimePackages())].map((lib) => [
+        lib,
+        this.#resolveProductionDependencyVersion(lib)
+      ])),
+      ...data
+    };
   }
 }
-async function writeGeneratedDictionaryMacroFile(appCwdPath, appName) {
-  const absPath = path4.join(path4.resolve(appCwdPath), IMPLICIT_DICT_DIR, "useDict.ts");
-  await Bun.write(absPath, `import { getAllDictionary } from "@apps/${appName}/lib/dict" with { type: "macro" };
-
-export const allDictionary = getAllDictionary();
-`);
-  return absPath;
+var akanPackageJson = null;
+function getAkanPackageJson() {
+  if (akanPackageJson)
+    return akanPackageJson;
+  const sourceDir = path4.dirname(fileURLToPath(import.meta.url));
+  const packageJsonPaths = [
+    path4.join(sourceDir, "../../../akanjs/package.json"),
+    path4.join(process.cwd(), "pkgs/akanjs/package.json"),
+    path4.join(path4.dirname(Bun.main), "node_modules/akanjs/package.json")
+  ];
+  try {
+    packageJsonPaths.unshift(Bun.resolveSync("akanjs/package.json", sourceDir));
+  } catch {}
+  for (const packageJsonPath of packageJsonPaths) {
+    try {
+      akanPackageJson = JSON.parse(fs2.readFileSync(packageJsonPath, "utf8"));
+      return akanPackageJson;
+    } catch {}
+  }
+  akanPackageJson = {
+    name: "akanjs",
+    version: "0.0.0",
+    description: "akanjs",
+    dependencies: {}
+  };
+  return akanPackageJson;
 }
-async function writeGeneratedRootLayoutFile(opts) {
-  await assertEnvClientConvention(opts.appCwdPath, opts.appName);
-  const dictMacroAbsPath = opts.includeSystemProvider ? await writeGeneratedDictionaryMacroFile(opts.appCwdPath, opts.appName) : null;
-  const absPath = implicitRootLayoutAbsPath(opts.appCwdPath, opts.boundary.segments);
-  const dictMacroSpecifier = dictMacroAbsPath ? importSpecifier(absPath, dictMacroAbsPath) : null;
-  const sourceSpecifier = opts.boundary.sourceAbsPath ? importSpecifier(absPath, opts.boundary.sourceAbsPath) : null;
-  const inheritedSourceAbsPath = opts.rootSourceAbsPath && opts.rootSourceAbsPath !== opts.boundary.sourceAbsPath ? opts.rootSourceAbsPath : null;
-  const inheritedSourceSpecifier = inheritedSourceAbsPath ? importSpecifier(absPath, inheritedSourceAbsPath) : null;
-  const clientImport = opts.includeStInit ? `import { st } from "@apps/${opts.appName}/client";
-void st;
-` : `import "@apps/${opts.appName}/client";
-`;
-  const inheritedLabel = inheritedSourceAbsPath ? path4.relative(opts.appCwdPath, inheritedSourceAbsPath) : "";
-  const inheritedImport = inheritedSourceSpecifier ? `import * as inheritedModule from ${JSON.stringify(inheritedSourceSpecifier)};
-const inheritedLayout = resolveRouteModule(inheritedModule as never, ${JSON.stringify(inheritedLabel)}).module as LayoutModule;
-` : `const inheritedLayout: LayoutModule = {};
-`;
-  const prefix = opts.boundary.segments.find((segment) => !/^\(.+\)$/.test(segment)) ?? null;
-  const userLabel = opts.boundary.sourceAbsPath ? path4.relative(opts.appCwdPath, opts.boundary.sourceAbsPath) : "";
-  const userImport = sourceSpecifier ? `import * as userModule from ${JSON.stringify(sourceSpecifier)};
-const userLayout = resolveRouteModule(userModule as never, ${JSON.stringify(userLabel)}).module as LayoutModule;
-const UserLayout = userLayout.default as (props: LayoutProps) => ReactNode | Promise<ReactNode>;
-` : `const UserLayout = ({ children }: LayoutProps) => children;
-const userLayout: LayoutModule = {};
-`;
-  const isAsyncUserLayout = opts.boundary.sourceAbsPath ? await AsyncDefaultExportDetector.detect(opts.boundary.sourceAbsPath) : false;
-  const userLayoutElement = "<UserLayout params={params} searchParams={searchParams}>{children}</UserLayout>";
-  const layoutSignature = isAsyncUserLayout ? "export default async function GeneratedLayout" : "export default function GeneratedLayout";
-  const layoutBinding = isAsyncUserLayout ? `  const layout =
-    process.env.AKAN_PUBLIC_RENDER_ENV === "csr"
-      ? await UserLayout({ params, searchParams, children })
-      : ${userLayoutElement};
-` : "";
-  const layoutChild = isAsyncUserLayout ? "{layout}" : userLayoutElement;
-  const layoutReturn = isAsyncUserLayout ? "layout" : userLayoutElement;
-  const layoutExports = `export async function generateHead(props: PageProps) {
-  if (userLayout.generateHead) return userLayout.generateHead(props);
-  if (userLayout.head !== undefined) return userLayout.head;
-  if (inheritedLayout.generateHead) return inheritedLayout.generateHead(props);
-  return inheritedLayout.head;
+function mergeImageConfig(config = {}) {
+  return {
+    ...DEFAULT_AKAN_IMAGE_CONFIG,
+    ...config,
+    deviceSizes: config.deviceSizes ?? DEFAULT_AKAN_IMAGE_CONFIG.deviceSizes,
+    imageSizes: config.imageSizes ?? DEFAULT_AKAN_IMAGE_CONFIG.imageSizes,
+    formats: config.formats ?? DEFAULT_AKAN_IMAGE_CONFIG.formats,
+    qualities: config.qualities ?? DEFAULT_AKAN_IMAGE_CONFIG.qualities,
+    remotePatterns: config.remotePatterns ?? DEFAULT_AKAN_IMAGE_CONFIG.remotePatterns,
+    localPatterns: config.localPatterns ?? DEFAULT_AKAN_IMAGE_CONFIG.localPatterns
+  };
 }
 
-export const NotFound = userLayout.NotFound ?? inheritedLayout.NotFound;
-export const Error = userLayout.Error ?? inheritedLayout.Error;
-export const pageConfig = userLayout.pageConfig ?? inheritedLayout.pageConfig;
-
-${layoutSignature}({ children, params, searchParams }: LayoutProps) {
-${layoutBinding}  return `;
-  const source = opts.includeSystemProvider ? `import type { LayoutModule, LayoutProps, PageProps } from "akanjs/client";
-import { loadFonts, resolveRouteModule } from "akanjs/client";
-import type { ReactNode } from "react";
-import { System } from "akanjs/ui";
-import { env } from "@apps/${opts.appName}/env/env.client";
-import { allDictionary } from ${JSON.stringify(dictMacroSpecifier)};
-${clientImport}${inheritedImport}${userImport}
-const userFonts = userLayout.fonts ?? inheritedLayout.fonts ?? [];
-const defaultFonts = userFonts.filter((font) => font.default);
-if (defaultFonts.length > 1) throw new Error("[route-convention] only one default font is allowed per root layout");
-const defaultFont = defaultFonts[0];
-const defaultFontClassName = defaultFont ? (defaultFont.className ?? \`font-\${defaultFont.name}\`) : undefined;
-
-${layoutExports}(
-    <System.Provider
-      of={GeneratedLayout as never}
-      appName=${JSON.stringify(opts.appName)}
-      ${prefix ? `prefix=${JSON.stringify(prefix)}
-      ` : ""}params={params}
-      manifest={userLayout.manifest ?? inheritedLayout.manifest}
-      env={env}
-      theme={userLayout.theme ?? inheritedLayout.theme}
-      fonts={loadFonts(userFonts)}
-      className={defaultFontClassName}
-      layoutStyle={userLayout.layoutStyle ?? inheritedLayout.layoutStyle}
-      reconnect={userLayout.reconnect ?? inheritedLayout.reconnect ?? false}
-      wsConnect={userLayout.wsConnect ?? inheritedLayout.wsConnect ?? true}
-      allDictionary={process.env.AKAN_PUBLIC_RENDER_ENV === "ssr" ? allDictionary : undefined}
-    >
-      ${layoutChild}
-    </System.Provider>
-  );
-}
-` : `import type { LayoutModule, LayoutProps, PageProps } from "akanjs/client";
-import { resolveRouteModule } from "akanjs/client";
-import type { ReactNode } from "react";
-${inheritedImport}${userImport}
-${layoutExports}${layoutReturn};
-}
-`;
-  await Bun.write(absPath, source);
-  return absPath;
-}
-async function resolveSsrPageEntries(opts) {
-  const absPageDir = path4.resolve(opts.appCwdPath, "page");
-  const hasSt = await Bun.file(path4.join(opts.appCwdPath, "lib", "st.ts")).exists();
-  const basePaths = opts.basePaths ?? [];
-  const rootSourceAbsPath = findExplicitRootLayoutAbsPath(opts.pageKeys, opts.appCwdPath);
-  const rootBoundaries = findRootBoundaries(opts.pageKeys, opts.appCwdPath, basePaths);
-  const rootLayoutKeys = new Set(opts.pageKeys.filter((key) => {
-    const segments = getRootBoundarySegments(key);
-    return segments !== null && isRootBoundarySegments(segments, basePaths);
-  }));
-  const base = await Promise.all(opts.pageKeys.filter((key) => !rootLayoutKeys.has(key)).map(async (key) => {
-    const userAbsPath = path4.resolve(absPageDir, key);
-    if (OVERRIDES_KEY_RE.test(key)) {
-      const moduleAbsPath = await writeGeneratedOverridesLayoutFile({
-        appCwdPath: opts.appCwdPath,
-        key,
-        userAbsPath
-      });
-      return { key, moduleAbsPath, seedAbsPaths: [userAbsPath] };
-    }
-    return { key, moduleAbsPath: userAbsPath };
-  }));
-  const generated = await Promise.all(rootBoundaries.map(async (boundary) => ({
-    key: implicitRootLayoutKey(boundary.segments),
-    moduleAbsPath: await writeGeneratedRootLayoutFile({
-      appCwdPath: opts.appCwdPath,
-      appName: opts.appName,
-      boundary,
-      rootSourceAbsPath,
-      includeStInit: hasSt && boundary.segments.length === 0,
-      includeSystemProvider: !hasAncestorRootBoundary(boundary, rootBoundaries)
-    }),
-    seedAbsPaths: [...new Set([boundary.sourceAbsPath, rootSourceAbsPath].filter((absPath) => absPath !== null))]
-  })));
-  return [...base, ...generated].sort((a, b) => a.key.localeCompare(b.key));
-}
-async function resolveSsrPageEntriesForApp(app, pageKeys) {
-  const config = await app.getConfig();
-  return resolveSsrPageEntries({ appCwdPath: app.cwdPath, appName: app.name, pageKeys, basePaths: config.basePaths });
+class AkanLibConfig {
+  lib;
+  externalLibs;
+  docker;
+  assets;
+  plugins;
+  constructor(lib, config, plugins = []) {
+    this.lib = lib;
+    this.externalLibs = config?.externalLibs ?? [];
+    this.docker = { preRuns: config?.docker?.preRuns ?? [], postRuns: config?.docker?.postRuns ?? [] };
+    this.assets = { keepFonts: normalizeKeepFonts(config?.assets?.keepFonts) };
+    this.plugins = plugins;
+  }
+  static async from(lib, { bustImportCache = false } = {}) {
+    const configImp = await AkanAppConfig.importConfigModule(lib.cwdPath, { bustImportCache });
+    const resolved = typeof configImp === "function" ? configImp(lib) : configImp;
+    const { plugins, ...config } = resolved ?? {};
+    return new AkanLibConfig(lib, config, plugins ?? []);
+  }
 }
-
+//! need to refactor
+var shiftBuildNum = async (app, delta) => {
+  const { buildNum } = (await AkanAppConfig.from(app)).mobile;
+  const akanConfigPath = path4.join(app.cwdPath, "akan.config.ts");
+  const akanConfig = fs2.readFileSync(akanConfigPath, "utf8");
+  fs2.writeFileSync(akanConfigPath, akanConfig.replace(`buildNum: ${buildNum}`, `buildNum: ${buildNum + delta}`));
+};
+var increaseBuildNum = async (app) => await shiftBuildNum(app, 1);
+var decreaseBuildNum = async (app) => await shiftBuildNum(app, -1);
 // pkgs/@akanjs/devkit/linter.ts
 import { spawn } from "child_process";
 import { existsSync, readFileSync } from "fs";
@@ -1512,7 +1559,6 @@ var resolveRepoName = (workspaceRoot) => {
 };
 
 // pkgs/@akanjs/devkit/scanInfo.ts
-import { rm as rm2 } from "fs/promises";
 import path7 from "path";
 
 // pkgs/@akanjs/devkit/workspaceLayout.ts
@@ -1521,7 +1567,6 @@ var appRootAllowedFiles = new Set([
   "CLAUDE.md",
   "akan.app.json",
   "akan.config.ts",
-  "capacitor.config.ts",
   "client.ts",
   "main.ts",
   "package.json",
@@ -1531,12 +1576,9 @@ var appRootAllowedFiles = new Set([
 ]);
 var appRootAllowedDirs = new Set([
   ".akan",
-  "android",
   "common",
   "env",
-  "ios",
   "lib",
-  "mobile",
   "page",
   "plugin",
   "private",
@@ -1588,6 +1630,15 @@ var libFacetRootAllowedFiles = new Set([
 ]);
 var libFacetRootTestPattern = /^[A-Za-z][A-Za-z0-9_-]*\.signal\.(test|spec)\.(ts|tsx)$/;
 var isAllowedLibFacetRootFile = (filename) => libFacetRootAllowedFiles.has(filename) || libFacetRootTestPattern.test(filename);
+var retiredAppRootEntries = new Set([
+  "android",
+  "ios",
+  "mobile",
+  "capacitor.config.ts",
+  "capacitor.config.js",
+  "capacitor.config.json"
+]);
+var rootEntryHintOf = (type, name) => type === "app" && retiredAppRootEntries.has(name) ? "a Capacitor-era entry; the native runtime generates its projects under .akan/mobile/<target>, so delete it" : null;
 var isScannedRootEntry = (type, name) => !name.startsWith(".") || rootAllowedDirs[type].has(name);
 
 // pkgs/@akanjs/devkit/scanInfo.ts
@@ -1605,7 +1656,6 @@ var serviceFileTypes = [
 var databaseFileTypes = ["constant", "dictionary", "document", ...serviceFileTypes.slice(1)];
 var uiFileTypes = new Set(["template", "unit", "util", "view", "zone"]);
 var fileTypeOf = (filename) => databaseFileTypes.find((type) => filename.endsWith(uiFileTypes.has(type) ? `.${type[0].toUpperCase()}${type.slice(1)}.tsx` : `.${type}.ts`));
-var generatedRootCapacitorConfigFiles = ["capacitor.config.js", "capacitor.config.json"];
 var internalLibDirs = new Set(["__lib", "__scalar"]);
 var moduleNonUiFileTypes = {
   database: new Set(["constant", "dictionary", "document", "service", "signal", "store"]),
@@ -1619,17 +1669,11 @@ var moduleUiFileTypes = {
 };
 var createDependencyScanner = async (exec) => (await import("./dependencyScanner-ye2e6pdz.js")).TypeScriptDependencyScanner.from(exec);
 var getScanPath = (exec, relativePath) => path7.posix.join(`${exec.type}s`, exec.name, relativePath.split(path7.sep).join("/"));
-async function clearGeneratedRootCapacitorConfigs(exec) {
-  if (exec.type !== "app")
-    return;
-  await Promise.all(generatedRootCapacitorConfigFiles.map((filename) => rm2(exec.getPath(filename), { force: true })));
-}
 var getModuleNameFromPath = (kind, modulePath) => {
   const dirname = path7.basename(modulePath);
   return kind === "service" ? dirname.replace(/^_+/, "") : dirname;
 };
 async function assertScanConvention(exec, libRoot) {
-  await clearGeneratedRootCapacitorConfigs(exec);
   const violations = [];
   const addViolation = (relativePath, reason) => {
     violations.push(`${getScanPath(exec, relativePath)}: ${reason}`);
@@ -1639,10 +1683,10 @@ async function assertScanConvention(exec, libRoot) {
   const { files, dirs } = await exec.getFilesAndDirs(".");
   for (const filename of files)
     if (!allowedRootFiles.has(filename))
-      addViolation(filename, `unsupported ${exec.type} root file`);
+      addViolation(filename, rootEntryHintOf(exec.type, filename) ?? `unsupported ${exec.type} root file`);
   for (const dirname of dirs)
     if (!allowedRootDirs.has(dirname))
-      addViolation(dirname, `unsupported ${exec.type} root folder`);
+      addViolation(dirname, rootEntryHintOf(exec.type, dirname) ?? `unsupported ${exec.type} root folder`);
   if (exec.type === "lib")
     for (const { relativePath, reason } of await exec.getPageConventionViolations())
       addViolation(relativePath, reason);
@@ -3203,16 +3247,6 @@ class AppExecutor extends SysExecutor {
       return true;
     });
   }
-  async getPluginRuntimePackages() {
-    const plugins = await this.collectPlugins();
-    const appConfig = await this.getConfig();
-    const ctx = {
-      appName: this.name,
-      mobile: appConfig.mobile,
-      hasMobilePermission: (permission) => Object.values(appConfig.mobile.targets).some((target) => target.permissions?.includes(permission) ?? false)
-    };
-    return [...new Set(plugins.flatMap((plugin) => plugin.runtimePackages?.(ctx) ?? []))];
-  }
   async increaseBuildNum() {
     await increaseBuildNum(this);
   }
@@ -3368,4 +3402,4 @@ class ModuleExecutor extends Executor {
   }
 }
 
-export { AGENT_BLOCK_START, AGENT_BLOCK_END, stampBlockVersion, extractBlockVersion, readDevkitVersion, upsertAgentBlock, extractAgentBlock, renderRecipeEntries, collectScopeRecipeSources, renderScopeAgentBlock, CLAUDE_COMMENT_RULE, AsyncDefaultExportDetector, resolveSsrPageEntriesForApp, CodegenLock, Linter, rootAllowedFiles, rootAllowedDirs, isAllowedLibFacetRootFile, isScannedRootEntry, AppInfo, Spinner, CommandExecutionError, Executor, WorkspaceExecutor, SysExecutor, AppExecutor, LibExecutor, PkgExecutor, ModuleExecutor };
+export { AGENT_BLOCK_START, AGENT_BLOCK_END, stampBlockVersion, extractBlockVersion, readDevkitVersion, upsertAgentBlock, extractAgentBlock, renderRecipeEntries, collectScopeRecipeSources, renderScopeAgentBlock, CLAUDE_COMMENT_RULE, AsyncDefaultExportDetector, resolveSsrPageEntriesForApp, CodegenLock, Linter, rootAllowedFiles, rootAllowedDirs, isAllowedLibFacetRootFile, rootEntryHintOf, isScannedRootEntry, AppInfo, Spinner, Executor, WorkspaceExecutor, SysExecutor, AppExecutor, LibExecutor, PkgExecutor, ModuleExecutor };