@akanjs/cli 2.3.11-rc.6 → 2.3.11-rc.8

package/incrementalBuilder.proc.js

@@ -666,6 +666,7 @@ import {
 import { readFileSync as readFileSync3 } from "fs";
 import { copyFile, mkdir as mkdir2, readdir as readDirEntries, stat as stat2 } from "fs/promises";
 import path7 from "path";
+import { pathToFileURL } from "url";
 import {
   capitalize,
   isRouteSourceFile,
@@ -1107,6 +1108,63 @@ var decreaseBuildNum = async (app) => {
   const akanConfigContent = akanConfig.replace(`buildNum: ${appConfig.mobile.buildNum}`, `buildNum: ${appConfig.mobile.buildNum - 1}`);
   fs.writeFileSync(akanConfigPath, akanConfigContent);
 };
+// pkgs/@akanjs/devkit/firebaseMessagingSw.ts
+var FIREBASE_WEB_SDK_VERSION = "12.13.0";
+function normalizeFirebaseClientConfig(config) {
+  if (!config || typeof config !== "object")
+    return null;
+  const value = config;
+  if (typeof value.apiKey !== "string" || typeof value.projectId !== "string" || typeof value.messagingSenderId !== "string" || typeof value.appId !== "string") {
+    return null;
+  }
+  return {
+    apiKey: value.apiKey,
+    ...typeof value.authDomain === "string" ? { authDomain: value.authDomain } : {},
+    projectId: value.projectId,
+    ...typeof value.storageBucket === "string" ? { storageBucket: value.storageBucket } : {},
+    messagingSenderId: value.messagingSenderId,
+    appId: value.appId
+  };
+}
+function createFirebaseMessagingServiceWorker(config) {
+  const configJson = JSON.stringify(config);
+  return `/* Generated by Akan.js. Do not edit. */
+const firebaseConfig = ${configJson};
+
+if (firebaseConfig) {
+  importScripts("https://www.gstatic.com/firebasejs/${FIREBASE_WEB_SDK_VERSION}/firebase-app-compat.js");
+  importScripts("https://www.gstatic.com/firebasejs/${FIREBASE_WEB_SDK_VERSION}/firebase-messaging-compat.js");
+
+  firebase.initializeApp(firebaseConfig);
+  const messaging = firebase.messaging();
+
+  const notificationUrl = (payload) =>
+    payload?.data?.url || payload?.fcmOptions?.link || payload?.notification?.click_action;
+
+  messaging.onBackgroundMessage((payload) => {
+    const title = payload?.notification?.title || "";
+    const options = {
+      body: payload?.notification?.body,
+      icon: payload?.notification?.icon,
+      image: payload?.notification?.image,
+      data: {
+        url: notificationUrl(payload),
+        FCM_MSG: payload,
+      },
+    };
+    self.registration.showNotification(title, options);
+  });
+}
+
+self.addEventListener("notificationclick", (event) => {
+  const url = event.notification?.data?.url || event.notification?.data?.FCM_MSG?.data?.url;
+  event.notification?.close();
+  if (!url) return;
+  event.waitUntil(clients.openWindow(url));
+});
+`;
+}
+
 // pkgs/@akanjs/devkit/getDirname.ts
 import path2 from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
@@ -1392,6 +1450,7 @@ ${errorText}, ${warningText} found`];
 
 // pkgs/@akanjs/devkit/scanInfo.ts
 import path5 from "path";
+import { rm } from "fs/promises";
 
 // pkgs/@akanjs/devkit/dependencyScanner.ts
 import { builtinModules } from "module";
@@ -1713,6 +1772,7 @@ var appRootAllowedFiles = new Set([
   "tsconfig.json",
   "tsconfig.tsbuildinfo"
 ]);
+var generatedRootCapacitorConfigFiles = ["capacitor.config.js", "capacitor.config.json"];
 var appRootAllowedDirs = new Set([
   ".akan",
   "android",
@@ -1756,11 +1816,17 @@ var rootSignalTestFilePattern = /^[A-Za-z][A-Za-z0-9_-]*\.signal\.(test|spec)\.(
 var isAllowedTestFile = (filename) => testFilePattern.test(filename);
 var isAllowedLibRootFile = (filename) => libRootAllowedFiles.has(filename) || rootSignalTestFilePattern.test(filename);
 var getScanPath = (exec, relativePath) => path5.posix.join(`${exec.type}s`, exec.name, relativePath.split(path5.sep).join("/"));
+async function clearGeneratedRootCapacitorConfigs(exec) {
+  if (exec.type !== "app")
+    return;
+  await Promise.all(generatedRootCapacitorConfigFiles.map((filename) => rm(exec.getPath(filename), { force: true })));
+}
 var getModuleNameFromPath = (kind, modulePath) => {
   const dirname = path5.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}`);
@@ -3577,6 +3643,8 @@ class AppExecutor extends SysExecutor {
       ...routeEnv,
       ...devPort ? { PORT: devPort, AKAN_PUBLIC_CLIENT_PORT: devPort, AKAN_PUBLIC_SERVER_PORT: devPort } : {}
     });
+    if (type === "build")
+      Object.assign(process.env, env);
     return { env };
   }
   #publicEnv = null;
@@ -3687,8 +3755,30 @@ class AppExecutor extends SysExecutor {
     });
     if (write)
       await this.syncAssets(scanInfo.getScanResult().libDeps);
+    if (write)
+      await this.#syncFirebaseMessagingSw();
     return scanInfo;
   }
+  async#syncFirebaseMessagingSw() {
+    const swRelPath = "public/firebase-messaging-sw.js";
+    if (await FileSys.fileExists(this.getPath(swRelPath)))
+      return;
+    const envClientPath = path7.join(this.cwdPath, "env", "env.client.ts");
+    if (!await FileSys.fileExists(envClientPath))
+      return;
+    let firebaseConfig = null;
+    try {
+      const envUrl = pathToFileURL(envClientPath);
+      envUrl.searchParams.set("t", String(Date.now()));
+      const envModule = await import(envUrl.href);
+      firebaseConfig = normalizeFirebaseClientConfig(envModule.env?.firebase);
+    } catch {
+      return;
+    }
+    if (!firebaseConfig)
+      return;
+    await this.writeFile(swRelPath, createFirebaseMessagingServiceWorker(firebaseConfig), { overwrite: false });
+  }
   async increaseBuildNum() {
     await increaseBuildNum(this);
   }
@@ -4996,7 +5086,6 @@ var workflowSyncStatePath = (target) => `${workflowSyncDir}/${syncStateSlug(targ
 var generatedFilePathsForTarget = (targetRoot, reason = "Generated files were refreshed by sync.") => [
   { path: `${targetRoot}/lib/cnst.ts`, action: "sync", reason },
   { path: `${targetRoot}/lib/dict.ts`, action: "sync", reason },
-  { path: `${targetRoot}/lib/option.ts`, action: "sync", reason },
   { path: `${targetRoot}/lib/index.ts`, action: "sync", reason }
 ];
 var writeGeneratedSyncState = async (workspace, state) => {
@@ -7650,13 +7739,59 @@ var resourceList = [
   { uri: "akan://workspace/modules", name: "Workspace modules", mimeType: "application/json" }
 ];
 var cursorMcpConfigPath = ".cursor/mcp.json";
+var claudeMcpConfigPath = ".mcp.json";
+var codexMcpConfigPath = ".codex/config.toml";
+var akanMcpInstallTargets = ["cursor", "claude", "codex"];
+var akanMcpInstallConfigPaths = {
+  cursor: cursorMcpConfigPath,
+  claude: claudeMcpConfigPath,
+  codex: codexMcpConfigPath
+};
 var cursorWorkspaceFolder = "$" + "{workspaceFolder}";
+var claudeProjectDir = "$CLAUDE_PROJECT_DIR";
+var akanMcpCommand = (mode, { cd } = {}) => cd ? `cd "${cd}" && akan mcp --mode ${mode}` : `akan mcp --mode ${mode}`;
 var createAkanCursorMcpServer = (mode = "readonly") => ({
   type: "stdio",
   command: "bash",
-  args: ["-lc", `cd "${cursorWorkspaceFolder}" && akan mcp --mode ${mode}`]
+  args: ["-lc", akanMcpCommand(mode, { cd: cursorWorkspaceFolder })]
+});
+var createAkanClaudeMcpServer = (mode = "readonly") => ({
+  type: "stdio",
+  command: "bash",
+  args: ["-lc", akanMcpCommand(mode, { cd: claudeProjectDir })]
 });
+var createAkanMcpServer = (target, mode = "readonly") => target === "cursor" ? createAkanCursorMcpServer(mode) : createAkanClaudeMcpServer(mode);
 var akanCursorMcpServer = createAkanCursorMcpServer();
+var codexMcpServerTableHeader = "[mcp_servers.akan]";
+var createAkanCodexMcpServerBlock = (mode = "readonly") => `${codexMcpServerTableHeader}
+command = "bash"
+args = ["-lc", "${akanMcpCommand(mode)}"]
+`;
+var codexAkanTablePattern = /^\[mcp_servers\.akan\][^\n]*\n(?:(?!\[)[^\n]*(?:\n|$))*/m;
+var upsertCodexMcpServerBlock = (existing, block, { force = false } = {}) => {
+  const nextBlock = block.endsWith(`
+`) ? block : `${block}
+`;
+  const match = existing.match(codexAkanTablePattern);
+  if (!match) {
+    if (!existing.trim())
+      return nextBlock;
+    return `${existing.replace(/\s*$/, "")}
+
+${nextBlock}`;
+  }
+  if (match[0].trim() === nextBlock.trim())
+    return existing;
+  if (!force)
+    throw new Error(`${codexMcpConfigPath} already has an "akan" MCP server. Re-run with --force to overwrite it.`);
+  const start = match.index ?? 0;
+  const before = existing.slice(0, start);
+  const after = existing.slice(start + match[0].length);
+  const separator = after && !after.startsWith(`
+`) ? `
+` : "";
+  return `${before}${nextBlock}${separator}${after}`;
+};
 var renderDoctorText = (result) => {
   const lines = [`Akan doctor status: ${result.status}`];
   if (result.diagnostics.length === 0) {
@@ -7679,7 +7814,6 @@ var generatedFiles = [
   "*/lib/cnst.ts",
   "*/lib/db.ts",
   "*/lib/dict.ts",
-  "*/lib/option.ts",
   "*/lib/sig.ts",
   "*/lib/srv.ts",
   "*/lib/st.ts",
@@ -8673,7 +8807,7 @@ Caused by: ${ApplicationBuildReporter.formatError(error.cause)}` : "";
   }
 }
 // pkgs/@akanjs/devkit/applicationBuildRunner.ts
-import { mkdir as mkdir8, rm as rm3 } from "fs/promises";
+import { mkdir as mkdir8, rm as rm4 } from "fs/promises";
 import path37 from "path";
 
 // pkgs/@akanjs/devkit/frontendBuild/allRoutesBuilder.ts
@@ -10431,7 +10565,7 @@ class AllRoutesBuilder {
   }
 }
 // pkgs/@akanjs/devkit/frontendBuild/csrArtifactBuilder.ts
-import { mkdir as mkdir5, rm, unlink } from "fs/promises";
+import { mkdir as mkdir5, rm as rm2, unlink } from "fs/promises";
 import path24 from "path";
 
 // pkgs/@akanjs/devkit/frontendBuild/pagesEntrySourceGenerator.ts
@@ -10561,7 +10695,7 @@ class CsrArtifactBuilder {
     const artifact = await this.#loadCsrArtifact();
     const csrBasePaths = [...akanConfig2.basePaths];
     const htmlEntries = csrBasePaths.length > 0 ? csrBasePaths : ["index"];
-    await rm(this.#outputDir, { recursive: true, force: true });
+    await rm2(this.#outputDir, { recursive: true, force: true });
     await mkdir5(path24.join(this.#app.cwdPath, ".akan/generated/csr"), { recursive: true });
     const generatedHtmlFiles = Object.fromEntries(htmlEntries.map((basePath2) => this.#createHtmlFile(basePath2)));
     const result = await Bun.build({
@@ -11295,7 +11429,7 @@ class DevChangePlanner {
 }
 var uniqueResolved = (files) => [...new Set(files.map((file) => path27.resolve(file)))].sort();
 // pkgs/@akanjs/devkit/frontendBuild/devGeneratedIndexSync.ts
-import { mkdir as mkdir6, readdir as readdir2, readFile, rm as rm2, stat as stat3, writeFile } from "fs/promises";
+import { mkdir as mkdir6, readdir as readdir2, readFile, rm as rm3, stat as stat3, writeFile } from "fs/promises";
 import path28 from "path";
 var BARREL_FACETS2 = new Set(["common", "srvkit", "ui", "webkit"]);
 var FACET_SOURCE_FILE_RE = /\.(ts|tsx)$/;
@@ -11378,7 +11512,7 @@ class DevGeneratedIndexSync {
     if (content === null) {
       if (!await exists(indexPath))
         return false;
-      await rm2(indexPath, { force: true });
+      await rm3(indexPath, { force: true });
       return true;
     }
     const current = await readFile(indexPath, "utf8").catch(() => null);
@@ -12525,7 +12659,7 @@ class ApplicationBuildRunner {
     await this.#app.getPageKeys({ refresh: true });
     const { typecheckDir, tsconfigPath } = await this.#writeTypecheckTsconfig({ incremental });
     if (clean)
-      await rm3(path37.join(typecheckDir, "tsconfig.tsbuildinfo"), { force: true });
+      await rm4(path37.join(typecheckDir, "tsconfig.tsbuildinfo"), { force: true });
     await this.#checkProjectInChildProcess(tsconfigPath);
   }
   async#runPhase(id, label, task, summarize, options = {}) {
@@ -12725,7 +12859,7 @@ void run().catch((error) => {
   }
 }
 // pkgs/@akanjs/devkit/applicationReleasePackager.ts
-import { cp, mkdir as mkdir9, rm as rm4 } from "fs/promises";
+import { cp, mkdir as mkdir9, rm as rm5 } from "fs/promises";
 import path38 from "path";
 
 // pkgs/@akanjs/devkit/uploadRelease.ts
@@ -12832,7 +12966,7 @@ class ApplicationReleasePackager {
     const platformVersion = akanConfig2.mobile.version;
     const buildRoot = `${this.#app.workspace.workspaceRoot}/releases/builds/${this.#app.name}`;
     if (await FileSys.dirExists(buildRoot))
-      await rm4(buildRoot, { recursive: true, force: true });
+      await rm5(buildRoot, { recursive: true, force: true });
     await mkdir9(buildRoot, { recursive: true });
     if (rebuild || !await FileSys.dirExists(`${this.#app.dist.cwdPath}/backend`))
       await this.#build();
@@ -12841,7 +12975,7 @@ class ApplicationReleasePackager {
     await mkdir9(buildPath, { recursive: true });
     await cp(`${this.#app.dist.cwdPath}/backend`, `${buildPath}/backend`, { recursive: true });
     await cp(this.#app.dist.cwdPath, buildRoot, { recursive: true });
-    await rm4(`${buildRoot}/frontend/.next`, { recursive: true, force: true });
+    await rm5(`${buildRoot}/frontend/.next`, { recursive: true, force: true });
     const releaseRoot = this.#app.workspace.workspaceRoot;
     const releaseArchivePath = path38.relative(releaseRoot, `${releaseRoot}/releases/builds/${this.#app.name}-release.tar.gz`).split(path38.sep).join("/");
     await this.#app.workspace.spawn("tar", ["-zcf", releaseArchivePath, "-C", buildRoot, "./"], { cwd: releaseRoot });
@@ -12857,7 +12991,7 @@ class ApplicationReleasePackager {
       `${this.#app.workspace.workspaceRoot}/releases/builds/${this.#app.name}-appBuild.zip`,
       "./csr"
     ]);
-    await rm4("./csr", { recursive: true, force: true });
+    await rm5("./csr", { recursive: true, force: true });
   }
   async#writeSourceArchive({ readme }) {
     const sourceRoot = `${this.#app.workspace.workspaceRoot}/releases/sources/${this.#app.name}`;
@@ -12868,7 +13002,7 @@ class ApplicationReleasePackager {
     await Promise.all([".next", "ios", "android", "public/libs"].map(async (path39) => {
       const targetPath = `${sourceRoot}/apps/${this.#app.name}/${path39}`;
       if (await FileSys.dirExists(targetPath))
-        await rm4(targetPath, { recursive: true, force: true });
+        await rm5(targetPath, { recursive: true, force: true });
     }));
     const syncPaths = [".husky", ".gitignore", "package.json"];
     await Promise.all(syncPaths.map((path39) => cp(`${this.#app.workspace.cwdPath}/${path39}`, `${sourceRoot}/${path39}`, { recursive: true })));
@@ -12883,7 +13017,7 @@ class ApplicationReleasePackager {
       const maxRetry = 3;
       for (let i = 0;i < maxRetry; i++) {
         try {
-          await rm4(sourceRoot, { recursive: true, force: true });
+          await rm5(sourceRoot, { recursive: true, force: true });
         } catch {}
       }
     }
@@ -13116,7 +13250,7 @@ class Builder {
   }
 }
 // pkgs/@akanjs/devkit/capacitorApp.ts
-import { cp as cp2, mkdir as mkdir11, readFile as readFile2, rm as rm5, writeFile as writeFile2 } from "fs/promises";
+import { cp as cp2, mkdir as mkdir11, readFile as readFile2, rm as rm6, writeFile as writeFile2 } from "fs/promises";
 import os from "os";
 import path41 from "path";
 import { select as select2 } from "@inquirer/prompts";
@@ -13327,7 +13461,7 @@ var rootCapacitorConfigFilenames = [
 ];
 var rootCapacitorConfigPaths = (appRoot) => rootCapacitorConfigFilenames.map((file) => path41.join(appRoot, file));
 async function clearRootCapacitorConfigs(appRoot) {
-  await Promise.all(rootCapacitorConfigPaths(appRoot).map((file) => rm5(file, { force: true })));
+  await Promise.all(rootCapacitorConfigPaths(appRoot).map((file) => rm6(file, { force: true })));
 }
 async function writeRootCapacitorConfig(appRoot, content) {
   await clearRootCapacitorConfigs(appRoot);
@@ -13348,6 +13482,7 @@ var getLocalIP = () => {
 var isRecord2 = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
 var asString = (value) => typeof value === "string" ? value : undefined;
 var firstString = (...values) => values.find((value) => typeof value === "string");
+var resolveIosApnsEnvironment = ({ operation }) => operation === "release" ? "production" : "development";
 var scoreIosDeviceTarget = (target) => {
   const state = target.state?.toLowerCase() ?? "";
   return (state.includes("available") ? 4 : 0) + (state.includes("wired") ? 2 : 0) + (state.includes("paired") ? 1 : 0);
@@ -13653,6 +13788,8 @@ function materializeCapacitorConfig(target, { operation, localServerUrl, localIp
   const experimentalConfig = isRecord2(experimental) ? experimental : undefined;
   const pluginsConfig = isRecord2(plugins) ? plugins : {};
   const keyboardPluginConfig = isRecord2(pluginsConfig.Keyboard) ? pluginsConfig.Keyboard : {};
+  const pushNotificationsPluginConfig = isRecord2(pluginsConfig.PushNotifications) ? pluginsConfig.PushNotifications : {};
+  const usesPushNotifications = target.permissions?.includes("push") ?? false;
   const config = {
     ...capacitorConfig,
     appId,
@@ -13661,6 +13798,12 @@ function materializeCapacitorConfig(target, { operation, localServerUrl, localIp
     plugins: {
       CapacitorCookies: { enabled: true },
       ...pluginsConfig,
+      ...usesPushNotifications || isRecord2(pluginsConfig.PushNotifications) ? {
+        PushNotifications: {
+          ...usesPushNotifications ? { presentationOptions: ["badge", "sound", "alert"] } : {},
+          ...pushNotificationsPluginConfig
+        }
+      } : {},
       Keyboard: {
         resize: "none",
         ...keyboardPluginConfig
@@ -13732,9 +13875,9 @@ class CapacitorApp {
     await mkdir11(this.targetRoot, { recursive: true });
     if (regenerate) {
       if (!platform || platform === "ios")
-        await rm5(path41.join(this.app.cwdPath, this.iosRootPath), { recursive: true, force: true });
+        await rm6(path41.join(this.app.cwdPath, this.iosRootPath), { recursive: true, force: true });
       if (!platform || platform === "android")
-        await rm5(path41.join(this.app.cwdPath, this.androidRootPath), { recursive: true, force: true });
+        await rm6(path41.join(this.app.cwdPath, this.androidRootPath), { recursive: true, force: true });
     }
     const project = this.project;
     await this.project.load();
@@ -13756,7 +13899,7 @@ class CapacitorApp {
     await this.#prepareTargetAssets();
     await this.#prepareExternalFiles("ios");
     await this.#applyIosMetadata();
-    await this.#applyPermissions();
+    await this.#applyPermissions({ operation, env });
     await this.#applyDeepLinks("ios", { operation, env });
     await this.project.commit();
     await this.#generateAssets({ operation, env });
@@ -13899,7 +14042,7 @@ ${error.message}`;
     await this.#prepareTargetAssets();
     await this.#prepareExternalFiles("android");
     await this.#applyAndroidMetadata();
-    await this.#applyPermissions();
+    await this.#applyPermissions({ operation, env });
     await this.#applyDeepLinks("android", { operation, env });
     await this.project.commit();
     await this.#generateAssets({ operation, env });
@@ -14033,7 +14176,7 @@ ${error.message}`;
     const htmlSource = path41.join(this.app.dist.cwdPath, "csr", targetHtmlFilename(this.target));
     if (!await Bun.file(htmlSource).exists())
       throw new Error(`CSR html for mobile target '${this.target.name}' not found: ${htmlSource}`);
-    await rm5(this.targetWebRoot, { recursive: true, force: true });
+    await rm6(this.targetWebRoot, { recursive: true, force: true });
     await mkdir11(this.targetWebRoot, { recursive: true });
     await Bun.write(path41.join(this.targetWebRoot, "index.html"), this.#injectMobileTargetMeta(await Bun.file(htmlSource).text()));
   }
@@ -14114,7 +14257,7 @@ ${error.message}`;
     await this.project.android.setVersionCode(this.target.buildNum);
     await this.project.android.setAppName(this.target.appName);
   }
-  async#applyPermissions() {
+  async#applyPermissions({ operation, env }) {
     for (const permission of this.target.permissions ?? []) {
       if (permission === "camera")
         await this.addCamera();
@@ -14123,7 +14266,7 @@ ${error.message}`;
       else if (permission === "location")
         await this.addLocation();
       else if (permission === "push")
-        await this.addPush();
+        await this.addPush({ operation, env });
     }
   }
   async#applyDeepLinks(platform, { operation, env }) {
@@ -14142,7 +14285,7 @@ ${error.message}`;
         await this.#setUrlSchemesInIos(schemes);
       }
       if (domains.length > 0)
-        await this.#setAssociatedDomainsInIos(domains);
+        await this.#setAssociatedDomainsInIos(domains, { operation, env });
       return;
     }
     if (platform === "android") {
@@ -14236,12 +14379,64 @@ ${error.message}`;
     this.#setPermissionsInAndroid(["ACCESS_COARSE_LOCATION", "ACCESS_FINE_LOCATION"]);
     this.#setFeaturesInAndroid(["android.hardware.location.gps"]);
   }
-  async addPush() {
+  async addPush({ operation, env }) {
     await this.#setPermissionInIos({
       userNotificationsUsageDescription: "$(PRODUCT_NAME) uses notifications to keep you updated."
     });
+    await Promise.all([
+      this.project.ios.updateInfoPlist(this.iosTargetName, "Debug", { UIBackgroundModes: ["remote-notification"] }),
+      this.project.ios.updateInfoPlist(this.iosTargetName, "Release", { UIBackgroundModes: ["remote-notification"] }),
+      this.#writeEntitlementsInIos(this.target.deepLinks?.domains ?? [], { operation, env }),
+      this.#ensurePushAppDelegateInIos()
+    ]);
     this.#setPermissionsInAndroid(["POST_NOTIFICATIONS"]);
   }
+  async#ensurePushAppDelegateInIos() {
+    const appDelegatePath = path41.join(this.app.cwdPath, this.iosProjectPath, "App/AppDelegate.swift");
+    if (!await Bun.file(appDelegatePath).exists())
+      return;
+    const editor = await FileEditor.create(appDelegatePath);
+    let content = editor.getContent();
+    if (!content.includes("import FirebaseCore")) {
+      content = content.replace("import Capacitor", `import Capacitor
+import FirebaseCore`);
+    }
+    if (!content.includes("import FirebaseMessaging")) {
+      content = content.replace("import FirebaseCore", `import FirebaseCore
+import FirebaseMessaging`);
+    }
+    if (!content.includes("FirebaseApp.configure()")) {
+      content = content.replace(/\n(\s*)return true/, `
+$1FirebaseApp.configure()
+
+$1return true`);
+    }
+    if (!content.includes("didRegisterForRemoteNotificationsWithDeviceToken")) {
+      const delegateMethods = `
+    func application(_ application: UIApplication,
+                     didRegisterForRemoteNotificationsWithDeviceToken deviceToken: Data) {
+        Messaging.messaging().apnsToken = deviceToken
+        NotificationCenter.default.post(
+            name: .capacitorDidRegisterForRemoteNotifications,
+            object: deviceToken
+        )
+    }
+
+    func application(_ application: UIApplication,
+                     didFailToRegisterForRemoteNotificationsWithError error: Error) {
+        NotificationCenter.default.post(
+            name: .capacitorDidFailToRegisterForRemoteNotifications,
+            object: error
+        )
+    }
+`;
+      content = content.replace(`
+    func applicationWillResignActive`, `${delegateMethods}
+    func applicationWillResignActive`);
+    }
+    if (content !== editor.getContent())
+      await editor.setContent(content).save();
+  }
   async#setPermissionInIos(permissions) {
     const updateNs = Object.fromEntries(Object.entries(permissions).map(([key, value]) => [`NS${capitalize5(key)}`, value]));
     await Promise.all([
@@ -14259,25 +14454,35 @@ ${error.message}`;
       this.project.ios.updateInfoPlist(this.iosTargetName, "Release", { CFBundleURLTypes: urlTypes })
     ]);
   }
-  async#setAssociatedDomainsInIos(domains) {
+  async#setAssociatedDomainsInIos(domains, { operation, env }) {
+    await this.#writeEntitlementsInIos(domains, { operation, env });
+  }
+  async#writeEntitlementsInIos(domains, runConfig) {
     const entitlementsRelPath = "App/App.entitlements";
     const entitlementsPath = path41.join(this.app.cwdPath, this.iosProjectPath, entitlementsRelPath);
     const values = domains.map((domain) => `applinks:${domain}`);
+    const usesPush = this.target.permissions?.includes("push") ?? false;
+    const apsEnvironment = resolveIosApnsEnvironment(runConfig);
     const body = [
       '<?xml version="1.0" encoding="UTF-8"?>',
       '<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">',
       '<plist version="1.0">',
       "<dict>",
-      "  <key>com.apple.developer.associated-domains</key>",
-      "  <array>",
-      ...values.map((value) => `    <string>${value}</string>`),
-      "  </array>",
+      ...usesPush ? ["  <key>aps-environment</key>", `  <string>${apsEnvironment}</string>`] : [],
+      ...values.length > 0 ? [
+        "  <key>com.apple.developer.associated-domains</key>",
+        "  <array>",
+        ...values.map((value) => `    <string>${value}</string>`),
+        "  </array>"
+      ] : [],
       "</dict>",
       "</plist>",
       ""
     ].join(`
 `);
-    await writeFile2(entitlementsPath, body);
+    const currentBody = await Bun.file(entitlementsPath).exists() ? await Bun.file(entitlementsPath).text() : undefined;
+    if (currentBody !== body)
+      await writeFile2(entitlementsPath, body);
     await this.#setCodeSignEntitlementsInIos(entitlementsRelPath);
   }
   async#setCodeSignEntitlementsInIos(entitlementsRelPath) {
@@ -14381,7 +14586,7 @@ ${filter}$1`);
     for (const permission of permissions) {
       if (this.#hasPermissionInAndroid(permission)) {
         this.app.logger.info(`${permission} already exists in android`);
-        return this;
+        continue;
       }
       this.app.logger.info(`Adding ${permission} to android`);
       this.project.android.getAndroidManifest().injectFragment("manifest", `<uses-permission android:name="android.permission.${permission}" />`);
@@ -14397,7 +14602,7 @@ ${filter}$1`);
     return Array.from(usesPermission).map((permission) => permission.getAttribute("android:name"));
   }
   #hasPermissionInAndroid(permission) {
-    return this.#getPermissionsInAndroid().includes(permission);
+    return this.#getPermissionsInAndroid().includes(`android.permission.${permission}`);
   }
 }
 // pkgs/@akanjs/devkit/commandDecorators/targetMeta.ts