@akanjs/cli 3.0.0-beta.29 → 3.0.0-beta.30

package/{index-1hs6jrys.js → index-kb16nzyt.js}

@@ -2,18 +2,18 @@
 import {
   binPlatforms,
   Executor
-} from "./index-r8gp8zk3.js";
+} from "./index-n3jk2501.js";
 
 // pkgs/@akanjs/devkit/mobile/mobileTarget.ts
 var trimSlashes = (value) => value.replace(/^\/+|\/+$/g, "");
 var getMobileTargets = async (app) => {
   const config = await app.getConfig();
-  return Object.entries(config.mobile.targets).map(([name, target]) => ({ name, config: target }));
+  return Object.entries(config.native.targets).map(([name, target]) => ({ name, config: target }));
 };
-var isTemplateOnly = ({ basePaths, mobile }) => basePaths.size > 0 && Object.values(mobile.targets).every((target) => !target.basePath);
+var isTemplateOnly = ({ basePaths, native }) => basePaths.size > 0 && Object.values(native.targets).every((target) => !target.basePath);
 var getMobileTargetChoices = async (app) => {
   const config = await app.getConfig();
-  const targetNames = Object.keys(config.mobile.targets);
+  const targetNames = Object.keys(config.native.targets);
   if (targetNames.length > 0 && !isTemplateOnly(config))
     return targetNames;
   return [...config.basePaths];
@@ -35,17 +35,17 @@ var resolveMobileTargets = async (app, selection) => {
   const config = await app.getConfig();
   const targets = await getMobileTargets(app);
   if (targets.length === 0)
-    throw new Error(`No mobile targets configured for ${app.name}`);
+    throw new Error(`No native targets configured for ${app.name}`);
   if (!selection && targets.length === 1 && !isTemplateOnly(config))
     return targets;
   if (!selection) {
     const choices = await getMobileTargetChoices(app);
     if (choices.length === 1)
       return resolveMobileTargets(app, choices[0]);
-    throw new Error(`Multiple mobile targets found for ${app.name}. Pass --target <${choices.join("|")}|all>.`);
+    throw new Error(`Multiple native targets found for ${app.name}. Pass --target <${choices.join("|")}|all>.`);
   }
   if (selection === "all") {
-    if (Object.keys(config.mobile.targets).length > 1)
+    if (Object.keys(config.native.targets).length > 1)
       return targets;
     const basePaths = [...config.basePaths];
     if (basePaths.length > 1 || isTemplateOnly(config)) {
@@ -63,14 +63,14 @@ var resolveMobileTargets = async (app, selection) => {
   if (basePathTarget && config.basePaths.has(trimSlashes(selection)))
     return [basePathTarget];
   const choices = await getMobileTargetChoices(app);
-  throw new Error(`Mobile target '${selection}' was not found. Available: ${choices.join(", ")}`);
+  throw new Error(`Native target '${selection}' was not found. Available: ${choices.join(", ")}`);
 };
 var resolveAppId = (appId, platform) => {
   if (typeof appId === "string")
     return appId;
   const id = appId[platform] ?? appId.default;
   if (!id)
-    throw new Error(`mobile.appId names no id for ${platform}; give it ${platform} or default.`);
+    throw new Error(`native.appId names no id for ${platform}; give it ${platform} or default.`);
   return id;
 };
 var appIdsOf = (appId) => typeof appId === "string" ? [appId] : Object.values(appId).filter((id) => !!id);
@@ -378,7 +378,7 @@ class NativeConfig {
     const updates = NativeConfig.#updates(target, env);
     const folders = new Set(nativePlugins.map((plugin) => path3.resolve(plugin.dir)));
     const folderIds = new Set(nativePlugins.map((plugin) => plugin.id));
-    const listed = (target.native?.plugins ?? []).filter((spec) => NativeConfig.#isId(spec) ? !folderIds.has(spec) : !folders.has(path3.resolve(appPath, spec)));
+    const listed = (target.plugins ?? []).filter((spec) => NativeConfig.#isId(spec) ? !folderIds.has(spec) : !folders.has(path3.resolve(appPath, spec)));
     const plugins = [
       ...new Set([
         ...NativeConfig.basePlugins,
@@ -393,27 +393,30 @@ class NativeConfig {
     const pluginIds = plugins.map((spec) => nativePlugins.find((plugin) => plugin.dir === spec)?.id ?? NativeConfig.#pluginId(appPath, spec));
     const usageDescriptions = Object.fromEntries(Object.entries(toIosInfoPlistUsageDescriptions(Object.assign({}, ...applied.map((contribution) => contribution.usageDescriptions ?? {})))).map(([key, text]) => [key, text.replaceAll("$(PRODUCT_NAME)", target.appName)]));
     const ios = NativeConfig.#compact({
-      infoPlist: NativeConfig.#merged(applied.map((c) => c.infoPlist), target.native?.ios?.infoPlist),
-      entitlements: NativeConfig.#merged(applied.map((c) => c.entitlements), target.native?.ios?.entitlements)
+      infoPlist: NativeConfig.#merged(applied.map((c) => c.infoPlist), target.ios?.infoPlist),
+      entitlements: NativeConfig.#merged(applied.map((c) => c.entitlements), target.ios?.entitlements)
     });
     const manifest = [
       ...[...new Set(applied.flatMap((c) => c.androidPermissions ?? []))].map((name) => `<uses-permission android:name="android.permission.${name}" />`),
       ...[...new Set(applied.flatMap((c) => c.androidFeatures ?? []))].map((name) => `<uses-feature android:name="${name}" android:required="false" />`),
-      ...target.native?.android?.manifest ?? []
+      ...target.android?.manifest ?? []
     ];
     const android = NativeConfig.#compact({
       manifest,
-      application: target.native?.android?.application ?? [],
-      activity: target.native?.android?.activity ?? []
+      application: target.android?.application ?? [],
+      activity: target.android?.activity ?? []
     });
-    const resources = Object.entries(target.files ?? {}).map(([to, from]) => ({ from: abs(from), to }));
+    const resources = [
+      ...Object.entries(target.ios?.files ?? {}).map(([to, from]) => ({ from: abs(from), to: `ios/${to}` })),
+      ...Object.entries(target.android?.files ?? {}).map(([to, from]) => ({ from: abs(from), to: `android/${to}` }))
+    ];
     const native = NativeConfig.#compact({ ios, android, resources });
-    const googleServices = target.native?.android?.googleServices;
-    const pushAndroid = target.native?.push?.android;
+    const googleServices = target.android?.googleServices;
+    const pushAndroid = target.android?.push;
     const desktop = NativeConfig.#compact({
-      recovery: target.native?.desktop?.recovery,
-      screenCapture: target.native?.desktop?.screenCapture,
-      window: NativeConfig.#compact({ ...target.native?.desktop?.window }),
+      recovery: target.desktop?.recovery,
+      screenCapture: target.desktop?.screenCapture,
+      window: NativeConfig.#compact({ ...target.desktop?.window }),
       server: desktopServer,
       bin: desktopBin
     });
@@ -443,16 +446,16 @@ class NativeConfig {
           android: { ...pushAndroid, ...pushAndroid.smallIcon ? { smallIcon: abs(pushAndroid.smallIcon) } : {} }
         }
       } : {},
-      ...target.native?.privacy ? { privacy: target.native.privacy } : {},
+      ...target.ios?.privacy ? { privacy: target.ios.privacy } : {},
       android: {
         debugAppIdSuffix: ".debug",
         ...googleServices ? { googleServices: abs(googleServices) } : {},
-        ...target.native?.android?.autoplay ? { autoplay: true } : {}
+        ...target.android?.autoplay ? { autoplay: true } : {}
       },
       keyboard: { resize: "none" },
       ...desktop ? { desktop } : {},
-      ...target.assets?.icon ? { icon: NativeConfig.#icon(target.assets.icon, abs) } : {},
-      ...target.assets?.splash ? { splash: NativeConfig.#splash(target.assets.splash, abs) } : {}
+      ...target.icon ? { icon: NativeConfig.#icon(target.icon, abs) } : {},
+      ...target.splash ? { splash: NativeConfig.#splash(target.splash, abs) } : {}
     };
     return { config, warnings };
   }
@@ -578,7 +581,7 @@ ${script}${html.slice(at)}`;
   }
   async assemble(target, { html, publicDir, fontsDir }) {
     if (!await Bun.file(html).exists())
-      throw new Error(`CSR html for mobile target '${target.name}' not found: ${html}`);
+      throw new Error(`CSR html for native target '${target.name}' not found: ${html}`);
     await this.clear();
     if (publicDir && await NativeWebDir.#isDir(publicDir))
       await cp(publicDir, this.dir, { recursive: true });
@@ -611,11 +614,11 @@ class NativeApp {
     this.app = app;
     this.target = target;
     this.env = env;
-    this.targetRoot = path6.join(app.cwdPath, ".akan", "mobile", target.name);
+    this.targetRoot = path6.join(app.cwdPath, ".akan", "native", target.name);
     this.web = new NativeWebDir(path6.join(this.targetRoot, "web"));
   }
   outDir(platform) {
-    return path6.join(this.targetRoot, "native", platform);
+    return path6.join(this.targetRoot, "build", platform);
   }
   devOutDir(platform) {
     return path6.join(this.targetRoot, "dev", platform);
@@ -669,7 +672,7 @@ class NativeApp {
   #assertValid(api, config) {
     const problems = api.validateConfig(config, { appDir: this.app.cwdPath });
     if (problems.length)
-      throw new Error(`Mobile target '${this.target.name}' makes an invalid native config:
+      throw new Error(`Native target '${this.target.name}' makes an invalid native config:
 - ${problems.join(`
 - `)}`);
   }
@@ -807,14 +810,14 @@ class NativeApp {
         ...channel ? { channel } : {}
       });
     } catch (error) {
-      throw new Error(`Mobile target '${this.target.name}': ${error instanceof Error ? error.message : String(error)}`, {
+      throw new Error(`Native target '${this.target.name}': ${error instanceof Error ? error.message : String(error)}`, {
         cause: error
       });
     }
   }
   #assertUpdates() {
     if (!this.target.config.updates)
-      throw new Error(`Mobile target '${this.target.name}' has no updates: { url, publicKey } in akan.config.ts; \`akan update-keygen ${this.app.name}\` prints the key.`);
+      throw new Error(`Native target '${this.target.name}' has no updates: add native.updates: { url, publicKey } to akan.config.ts; \`akan update-keygen ${this.app.name}\` prints the key.`);
   }
   async updateKeygen(platform) {
     const [api, { config }] = await Promise.all([
@@ -833,7 +836,7 @@ class NativeApp {
     await this.assembleWeb();
     const { api, config } = await this.prepare(platform);
     if (!config.updates)
-      throw new Error(`Mobile target '${this.target.name}' takes no updates: add mobile.updates: { url, publicKey } to akan.config.ts first.`);
+      throw new Error(`Native target '${this.target.name}' takes no updates: add native.updates: { url, publicKey } to akan.config.ts first.`);
     const packed = await api.packUpdate({
       ...this.#task(platform, config),
       platform,
@@ -929,7 +932,7 @@ class DesktopServerStage {
   }
   static assertCarriable(config) {
     if (!config.database.modes.includes("single"))
-      throw new Error(`native.desktop.server puts the server in the app, where only database mode single runs (no Redis or Postgres); apps/${config.app.name}/akan.config.ts declares ${config.database.modes.join(", ")}.`);
+      throw new Error(`desktop.server in native puts the server in the app, where only database mode single runs (no Redis or Postgres); apps/${config.app.name}/akan.config.ts declares ${config.database.modes.join(", ")}.`);
   }
   static env(config, environment) {
     const { PORT: _port, AKAN_LOG_TO_FILE: _fileLog, ...image } = config.getProductionEnv(environment);

package/{index-krwz9ek9.js → index-mk3b9rk1.js}

@@ -4,7 +4,7 @@ import {
   akanCodePaths2,
   McpServerConfig,
   McpSignIn
-} from "./index-8ej6r02m.js";
+} from "./index-8tv7356t.js";
 import {
   stripAnsi
 } from "./index-7md2g9vw.js";
@@ -511,7 +511,7 @@ class AkanToolPack2 {
     return { name: "akan-tools", factory: async (pi) => await this.#register(pi) };
   }
   async names() {
-    const { ContextRunner } = await import("./context.runner-70r2fmty.js");
+    const { ContextRunner } = await import("./context.runner-90hsmacr.js");
     return [
       ...new ContextRunner().listMcpTools(this.#options.mode).map((tool) => tool.name),
       AkanToolPack2.verifyToolName
@@ -519,7 +519,7 @@ class AkanToolPack2 {
   }
   static verifyToolName = "akan_verify";
   async#register(pi) {
-    const { ContextRunner } = await import("./context.runner-70r2fmty.js");
+    const { ContextRunner } = await import("./context.runner-90hsmacr.js");
     const runner = new ContextRunner;
     const guidelineNames = await AkanToolPack2.#guidelineNames();
     for (const tool of runner.listMcpTools(this.#options.mode, { guidelineNames })) {

package/{index-r8gp8zk3.js → index-n3jk2501.js}

@@ -799,20 +799,11 @@ var normalizeDeepLinkDomain = (domain) => {
   }
 };
 var normalizeDeepLinks = (deepLinks) => {
-  if (!deepLinks)
+  const schemes = normalizeStringList(deepLinks?.schemes);
+  const domains = normalizeStringList(deepLinks?.domains?.map(normalizeDeepLinkDomain));
+  if (!schemes && !domains)
     return;
-  const schemes = normalizeStringList(deepLinks.schemes);
-  const domains = normalizeStringList(deepLinks.domains?.map(normalizeDeepLinkDomain));
-  const teamId = deepLinks.ios?.teamId?.trim();
-  const sha256CertFingerprints = normalizeStringList(deepLinks.android?.sha256CertFingerprints);
-  if (!schemes && !domains && !teamId && !sha256CertFingerprints)
-    return;
-  return {
-    ...schemes ? { schemes } : {},
-    ...domains ? { domains } : {},
-    ...teamId ? { ios: { teamId } } : {},
-    ...sha256CertFingerprints ? { android: { sha256CertFingerprints } } : {}
-  };
+  return { ...schemes ? { schemes } : {}, ...domains ? { domains } : {} };
 };
 var emptyLibContributions = () => ({
   externalLibs: [],
@@ -855,8 +846,8 @@ class AkanAppConfig {
   i18n;
   api;
   publicEnv;
-  mobile;
-  hasMobileConfig;
+  native;
+  hasNativeConfig;
   secrets;
   assets;
   syncPageLibs;
@@ -912,155 +903,167 @@ class AkanAppConfig {
       ]
     };
     this.syncPageLibs = config?.syncPageLibs ?? false;
-    this.hasMobileConfig = Boolean(config.mobile);
-    this.mobile = this.#resolveMobileConfig(config.mobile);
+    if (config.mobile !== undefined)
+      throw new Error(`apps/${this.app.name}/akan.config.ts declares \`mobile\`, which is now \`native\`: the platform settings sit in native.ios, native.android and native.desktop, and a target overrides them under native.targets.<name>.`);
+    this.hasNativeConfig = Boolean(config.native);
+    this.native = this.#resolveNativeConfig(config.native);
     this.web = this.#resolveWebConfig(config.web);
     this.docker = AkanAppConfig.#resolveDocker(config.docker, libContributions.docker);
     this.dockerfile = this.#makeDockerfile();
   }
   #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 mobile apps ship that bundle. Drop the mobile section or leave CSR on.`);
+    if (!resolved.csr && this.hasNativeConfig)
+      throw new Error(`apps/${this.app.name}/akan.config.ts turns the CSR bundle off but declares a native section; the native apps ship that bundle. Drop the native section or leave CSR on.`);
     return resolved;
   }
-  #resolveMobileConfig(mobile) {
-    const {
-      targets: rawTargets,
-      indexPath: _indexPath,
-      ...rawMobile
-    } = mobile ?? {};
+  #resolveNativeConfig(native) {
     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 updates = rawMobile.updates;
-    const defaultTargetName = this.#defaultMobileTargetName(rawTargets);
-    const targetEntries = Object.entries(rawTargets ?? {
-      [defaultTargetName]: {}
-    });
-    const targets = Object.fromEntries(targetEntries.map(([name, 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 ${configPath}`);
-      }
-      const targetFiles = AkanAppConfig.#resolveMobileFiles(target.files, where, configPath);
-      const fileName = target.fileName ?? rawMobile.fileName;
-      const targetUpdates = updates || target.updates ? { ...updates, ...target.updates } : undefined;
-      if (targetUpdates && (!targetUpdates.url || !targetUpdates.publicKey))
-        throw new Error(`${where}.updates in ${configPath} has no url or publicKey; give them in mobile.updates or the target's own.`);
-      const resolved = {
+    const { targets: rawTargets, ...root } = native ?? {};
+    AkanAppConfig.#assertNativeKeys(root, "native", configPath);
+    AkanAppConfig.#assertFiles(root, "native", configPath);
+    const appName = root.appName ?? this.app.name;
+    const appId = root.appId ?? deriveDefaultAppId(this.baseDevEnv.repoName, this.app.name);
+    const version = root.version ?? "0.0.1";
+    const buildNum = root.buildNum ?? 1;
+    const named = rawTargets !== undefined && Object.keys(rawTargets).length > 0;
+    const entries = named ? Object.entries(rawTargets) : [[this.basePaths.has(this.app.name) ? this.app.name : "default", {}]];
+    const targets = Object.fromEntries(entries.map(([name, own]) => {
+      const where = named ? `native.targets.${name}` : "native";
+      AkanAppConfig.#assertNativeKeys(own ?? {}, where, configPath);
+      const merged = AkanAppConfig.#overlay(root, own ?? {});
+      const fallbackBasePath = !named && this.basePaths.has(name) ? name : undefined;
+      const basePath = (merged.basePath ?? fallbackBasePath)?.replace(/^\/+|\/+$/g, "") || undefined;
+      if (basePath && !this.basePaths.has(basePath))
+        throw new Error(`Native target '${name}' uses unknown basePath '${basePath}' in ${configPath}`);
+      const { updates } = merged;
+      if (updates && (!updates.url || !updates.publicKey))
+        throw new Error(`${where}.updates in ${configPath} has no url or publicKey${named ? "; give them in native.updates or the target's own" : ""}.`);
+      AkanAppConfig.#assertFiles(own ?? {}, where, configPath);
+      const {
+        basePath: _basePath,
+        indexPath: rawIndexPath,
+        deepLinks: rawDeepLinks,
+        updates: _updates,
+        ...rest
+      } = merged;
+      const indexPath = normalizeIndexPath(rawIndexPath);
+      const deepLinks = normalizeDeepLinks(rawDeepLinks);
+      const { teamId: rawTeamId, ...iosRest } = merged.ios ?? {};
+      const teamId = rawTeamId?.trim();
+      const { sha256CertFingerprints: rawFingerprints, ...androidRest } = merged.android ?? {};
+      const fingerprints = normalizeStringList(rawFingerprints);
+      const target = {
+        ...rest,
         name,
-        basePath,
-        indexPath,
-        deepLinks,
-        appName: target.appName ?? appName,
-        appId: target.appId ?? appId,
-        ...fileName ? { fileName } : {},
-        version: target.version ?? version,
-        buildNum: target.buildNum ?? buildNum,
-        ...target.assets ? { assets: target.assets } : {},
-        ...target.permissions ? { permissions: target.permissions } : {},
-        ...files || targetFiles ? { files: { ...files, ...targetFiles } } : {},
-        ...native || target.native ? { native: AkanAppConfig.#mergeNative(native, target.native) } : {},
-        ...targetUpdates ? { updates: targetUpdates } : {}
+        ...basePath ? { basePath } : {},
+        ...indexPath ? { indexPath } : {},
+        ...deepLinks ? { deepLinks } : {},
+        ...merged.ios ? { ios: { ...iosRest, ...teamId ? { teamId } : {} } } : {},
+        ...merged.android ? { android: { ...androidRest, ...fingerprints ? { sha256CertFingerprints: fingerprints } : {} } } : {},
+        appName: merged.appName ?? this.app.name,
+        appId: merged.appId ?? appId,
+        version: merged.version ?? version,
+        buildNum: merged.buildNum ?? buildNum,
+        ...updates ? { updates } : {}
       };
-      return [name, resolved];
+      return [name, target];
     }));
-    return {
-      appName,
-      appId,
-      ...rawMobile.fileName ? { fileName: rawMobile.fileName } : {},
-      version,
-      buildNum,
-      ...files ? { files } : {},
-      ...native ? { native } : {},
-      ...updates ? { updates } : {},
-      targets
-    };
-  }
-  static #mobileKeys = ["appName", "appId", "fileName", "version", "buildNum", "files", "native", "updates"];
-  static #targetKeys = [
-    "basePath",
-    "indexPath",
-    "appName",
-    "appId",
-    "fileName",
-    "version",
-    "buildNum",
-    "assets",
-    "permissions",
-    "deepLinks",
-    "files",
-    "native",
-    "updates"
-  ];
-  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
+    return { appName, appId, ...root.fileName ? { fileName: root.fileName } : {}, version, buildNum, targets };
+  }
+  static #overlay(base, own) {
+    const merge = (kept, value, top, key) => {
+      if (!AkanAppConfig.#isPlainObject(kept) || !AkanAppConfig.#isPlainObject(value))
+        return value;
+      if (top && (key === "icon" || key === "splash"))
+        return value;
+      const out = { ...kept };
+      for (const [inner, next] of Object.entries(value))
+        if (next !== undefined)
+          out[inner] = merge(out[inner], next, false, inner);
+      return out;
     };
-    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];
-    }
-    const pushAndroid = { ...base?.push?.android, ...override?.push?.android };
-    const privacy = { ...base?.privacy, ...override?.privacy };
-    const window = { ...base?.desktop?.window, ...override?.desktop?.window };
-    const desktop = {
-      ...base?.desktop,
-      ...override?.desktop,
-      ...Object.keys(window).length ? { window } : {}
+    const out = { ...base };
+    for (const [key, value] of Object.entries(own))
+      if (value !== undefined)
+        out[key] = merge(out[key], value, true, key);
+    return out;
+  }
+  static #isPlainObject(value) {
+    return typeof value === "object" && value !== null && !Array.isArray(value);
+  }
+  static #nativeKeys = {
+    native: [
+      "basePath",
+      "indexPath",
+      "appName",
+      "appId",
+      "fileName",
+      "version",
+      "buildNum",
+      "icon",
+      "splash",
+      "permissions",
+      "plugins",
+      "deepLinks",
+      "updates",
+      "ios",
+      "android",
+      "desktop"
+    ],
+    ios: ["teamId", "infoPlist", "entitlements", "privacy", "files"],
+    android: [
+      "sha256CertFingerprints",
+      "googleServices",
+      "push",
+      "autoplay",
+      "manifest",
+      "application",
+      "activity",
+      "files"
+    ],
+    desktop: ["server", "recovery", "window", "screenCapture"],
+    deepLinks: ["schemes", "domains"]
+  };
+  static #movedKeys = {
+    native: "the platform sections and plugins sit directly in the native section: ios, android, desktop, plugins",
+    assets: "icon and splash sit directly in the native section",
+    files: "ios.files (keyed by the path in the app bundle) or android.files (keyed res/<type>/<file> or assets/<path>)",
+    push: "android.push",
+    privacy: "ios.privacy",
+    "deepLinks.ios": "ios.teamId",
+    "deepLinks.android": "android.sha256CertFingerprints"
+  };
+  static #assertNativeKeys(section, where, configPath) {
+    const check = (value, known, at, kind) => {
+      if (!AkanAppConfig.#isPlainObject(value))
+        return;
+      for (const key of Object.keys(value)) {
+        if (known.includes(key))
+          continue;
+        const moved = AkanAppConfig.#movedKeys[kind === "native" ? key : `${kind}.${key}`];
+        throw new Error(moved ? `${at}.${key} in ${configPath} has moved: ${moved}.` : `${at}.${key} in ${configPath} is not a native setting. Known: ${known.join(", ")}.`);
+      }
     };
-    return {
-      ...plugins.length ? { plugins } : {},
-      ...Object.keys(ios).length ? { ios } : {},
-      ...Object.keys(android).length ? { android } : {},
-      ...Object.keys(pushAndroid).length ? { push: { android: pushAndroid } } : {},
-      ...Object.keys(privacy).length ? { privacy } : {},
-      ...Object.keys(desktop).length ? { desktop } : {}
+    check(section, AkanAppConfig.#nativeKeys.native, where, "native");
+    const settings = section;
+    check(settings.ios, AkanAppConfig.#nativeKeys.ios, `${where}.ios`, "ios");
+    check(settings.android, AkanAppConfig.#nativeKeys.android, `${where}.android`, "android");
+    check(settings.desktop, AkanAppConfig.#nativeKeys.desktop, `${where}.desktop`, "desktop");
+    check(settings.deepLinks, AkanAppConfig.#nativeKeys.deepLinks, `${where}.deepLinks`, "deepLinks");
+  }
+  static #androidFilePattern = /^(?:res\/[^/]+\/[^/]+|assets\/.+)$/;
+  static #assertFiles(settings, where, configPath) {
+    const check = (files, at, valid, shape) => {
+      for (const [to, from] of Object.entries(files ?? {})) {
+        if (typeof from !== "string")
+          throw new Error(`${at}["${to}"] in ${configPath} must name its source file, relative to the app folder, e.g. { "${shape}": "assets/chime.mp3" }.`);
+        if (!valid(to))
+          throw new Error(`${at}["${to}"] in ${configPath} must land at ${shape}.`);
+      }
     };
-  }
-  #defaultMobileTargetName(rawTargets) {
-    if (rawTargets && Object.keys(rawTargets).length > 0)
-      return Object.keys(rawTargets)[0];
-    return this.basePaths.has(this.app.name) ? this.app.name : "default";
+    check(settings.ios?.files, `${where}.ios.files`, (to) => to.length > 0 && !to.startsWith("/") && !to.split("/").includes(".."), "<path in the app bundle>");
+    check(settings.android?.files, `${where}.android.files`, (to) => AkanAppConfig.#androidFilePattern.test(to), "res/<type>/<file> or assets/<path>");
   }
   #applyRoutes(routes = []) {
     for (const route of routes) {
@@ -1318,7 +1321,7 @@ class AkanLibConfig {
 }
 //! need to refactor
 var shiftBuildNum = async (app, delta) => {
-  const { buildNum } = (await AkanAppConfig.from(app)).mobile;
+  const { buildNum } = (await AkanAppConfig.from(app)).native;
   const akanConfigPath = path5.join(app.cwdPath, "akan.config.ts");
   const akanConfig = fs2.readFileSync(akanConfigPath, "utf8");
   fs2.writeFileSync(akanConfigPath, akanConfig.replace(`buildNum: ${buildNum}`, `buildNum: ${buildNum + delta}`));
@@ -1759,7 +1762,7 @@ var retiredAppRootEntries = new Set([
   "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 rootEntryHintOf = (type, name) => type === "app" && retiredAppRootEntries.has(name) ? "a Capacitor-era entry; the native runtime generates its projects under .akan/native/<target>, so delete it" : null;
 var isScannedRootEntry = (type, name) => !name.startsWith(".") || rootAllowedDirs[type].has(name);
 
 // pkgs/@akanjs/devkit/scanInfo.ts
@@ -3027,7 +3030,7 @@ class AppExecutor extends SysExecutor {
   static from(executor, name) {
     return new AppExecutor({ workspace: executor instanceof WorkspaceExecutor ? executor : executor.workspace, name });
   }
-  static #keptOnStart = [path9.join(".akan", "mobile"), path9.join(".akan", "cache", "bin")];
+  static #keptOnStart = [path9.join(".akan", "native"), path9.join(".akan", "cache", "bin")];
   async#removeDevOutput(dir = ".akan") {
     const entries = await readDirEntries(this.getPath(dir)).catch(() => []);
     await Promise.all(entries.map(async (name) => {

package/{index-g44da4r2.js → index-qcejqgts.js}

@@ -5,19 +5,19 @@ import {
 } from "./index-94s080qm.js";
 import {
   script
-} from "./index-b68zfsvz.js";
+} from "./index-xb7qhxa8.js";
 import {
   PkgExecutor
-} from "./index-r8gp8zk3.js";
+} from "./index-n3jk2501.js";
 import {
   ApplicationScript
-} from "./index-n9gxx7bp.js";
+} from "./index-3rh7thcx.js";
 import {
   PackageScript
-} from "./index-k7809wmg.js";
+} from "./index-a4s954kq.js";
 import {
   CloudRunner
-} from "./index-rrt9pnb4.js";
+} from "./index-5rp0h6na.js";
 
 // pkgs/@akanjs/cli/cloud/cloud.script.ts
 import { Logger } from "akanjs/common";