@akanjs/cli 3.0.0-alpha.5 → 3.0.0-alpha.50

package/{index-mterpj70.js → index-zgkey4d0.js}

@@ -5,7 +5,7 @@ import {
 } from "./index-76rn3g2c.js";
 import {
   CommandExecutionError
-} from "./index-47qxw1tz.js";
+} from "./index-90zyjrby.js";
 
 // pkgs/@akanjs/devkit/capacitorApp.ts
 import { cp, mkdir, readFile, rm, writeFile } from "fs/promises";
@@ -514,6 +514,10 @@ function getAdbDeviceStateIssues(output) {
     return [];
   });
 }
+function getAndroidLocalServerHost(adbDevicesOutput, fallbackHost) {
+  const onlineDeviceIds = adbDevicesOutput?.split(/\r?\n/).map((line) => line.trim().split(/\s+/)).filter(([id, state]) => id && state === "device").map(([id]) => id) ?? [];
+  return onlineDeviceIds.length === 1 && onlineDeviceIds[0]?.startsWith("emulator-") ? "10.0.2.2" : fallbackHost;
+}
 var ANDROID_MIN_SDK_VERSION = 26;
 function raiseGradleMinSdkVersion(content, floor = ANDROID_MIN_SDK_VERSION) {
   const match = content.match(/minSdkVersion\s*=\s*(\d+)/);
@@ -691,7 +695,7 @@ class CapacitorApp {
   async save() {
     await this.project.commit();
   }
-  async#prepareIos({ operation, env, regenerate = false }) {
+  async#prepareIos({ operation, env, regenerate = false, iosRunTargetKind }) {
     await this.init({ platform: "ios", operation, env, regenerate });
     await this.#prepareTargetAssets();
     await this.#prepareExternalFiles("ios");
@@ -700,9 +704,10 @@ class CapacitorApp {
     await this.#applyDeepLinks("ios", { operation, env });
     await this.#flushIosEntitlements();
     await this.project.commit();
+    await this.#setCodeSignEntitlementsInIosIfExists("App/App.entitlements");
     await this.#generateAssets({ operation, env });
     this.app.verbose(`syncing iOS`);
-    await this.#spawnMobile("npx", ["cap", "sync", "ios"], { operation, env });
+    await this.#spawnMobile("npx", ["cap", "sync", "ios"], { operation, env }, { iosRunTargetKind });
     this.app.verbose(`sync completed.`);
   }
   async buildIos({ env = "debug", regenerate = false } = {}) {
@@ -721,10 +726,10 @@ class CapacitorApp {
   async runIos({ operation, env, regenerate = false, noAllowProvisioningUpdates = false, iosDeviceId }) {
     if (operation === "release")
       await this.prepareWww();
-    await this.#prepareIos({ operation, env, regenerate });
     const runTarget = await this.#selectIosRunTarget(iosDeviceId);
+    await this.#prepareIos({ operation, env, regenerate, iosRunTargetKind: runTarget.kind });
     if (runTarget.kind === "simulator") {
-      await this.#spawnMobile("npx", ["cap", "run", "ios", "--target", runTarget.id], { operation, env }, { stdio: "inherit" });
+      await this.#spawnMobile("npx", ["cap", "run", "ios", "--target", runTarget.id, "--no-sync"], { operation, env }, { stdio: "inherit", platform: "ios", iosRunTargetKind: runTarget.kind });
       return;
     }
     await this.#runIosPhysicalDevice({ operation, env, runTarget, noAllowProvisioningUpdates });
@@ -800,7 +805,7 @@ ${textError instanceof Error ? textError.message : ""}`);
     noAllowProvisioningUpdates
   }) {
     const mobileEnv = sanitizeIosNativeRunEnv(await this.#commandEnv(operation, env));
-    const configContent = await this.#writeCapacitorConfig({ operation }, mobileEnv);
+    const configContent = await this.#writeCapacitorConfig({ operation, platform: "ios", iosRunTargetKind: runTarget.kind }, mobileEnv);
     await this.#writeRootCapacitorConfig(configContent);
     const scheme = this.#iosScheme();
     const command = buildIosNativeRunCommand({
@@ -857,6 +862,7 @@ ${error.message}`;
     await this.#applyAndroidMinSdkVersion();
     await this.#applyPermissions({ operation, env });
     await this.#applyDeepLinks("android", { operation, env });
+    await this.#disableNativeKeyboardResizeInAndroid();
     await this.project.commit();
     await this.#generateAssets({ operation, env });
     await this.#ensureAndroidAssetsDir();
@@ -916,6 +922,23 @@ ${error.message}`;
   async openAndroid() {
     await this.#spawnMobile("npx", ["cap", "open", "android"], { operation: "local", env: "local" });
   }
+  async#disableNativeKeyboardResizeInAndroid() {
+    const manifestPath = path.join(this.app.cwdPath, this.androidRootPath, "app/src/main/AndroidManifest.xml");
+    let manifest = await readFile(manifestPath, "utf8");
+    let changed = false;
+    manifest = manifest.replace(/<activity\b[^>]*android:name="\.MainActivity"[^>]*>/, (activityTag) => {
+      if (activityTag.includes("android:windowSoftInputMode=")) {
+        const nextTag = activityTag.replace(/android:windowSoftInputMode="[^"]*"/, 'android:windowSoftInputMode="adjustNothing"');
+        changed ||= nextTag !== activityTag;
+        return nextTag;
+      }
+      changed = true;
+      return activityTag.replace(/>$/, `
+            android:windowSoftInputMode="adjustNothing">`);
+    });
+    if (changed)
+      await writeFile(manifestPath, manifest);
+  }
   async#ensureAndroidAssetsDir() {
     await mkdir(path.join(this.app.cwdPath, this.androidAssetsPath), { recursive: true });
   }
@@ -1005,12 +1028,16 @@ ${error.message}`;
     return html.replace(/<\/head\s*>/i, `${script}
 </head>`);
   }
-  async#writeCapacitorConfig({ operation }, commandEnv) {
+  async#writeCapacitorConfig({
+    operation,
+    platform,
+    iosRunTargetKind
+  }, commandEnv) {
     await mkdir(this.targetRoot, { recursive: true });
     let localIp;
     if (operation === "local") {
       const override = commandEnv.AKAN_PUBLIC_CLIENT_HOST ?? process.env.AKAN_PUBLIC_CLIENT_HOST;
-      const resolution = selectLocalDevHost(os.networkInterfaces(), { override });
+      const resolution = await this.#resolveLocalDevHost({ override, platform, iosRunTargetKind });
       localIp = resolution.host;
       this.#logDevHostResolution(resolution, commandEnv);
     }
@@ -1024,9 +1051,29 @@ ${error.message}`;
     await Bun.write(path.join(this.targetRoot, "capacitor.config.json"), content);
     return content;
   }
+  async#resolveLocalDevHost({
+    override,
+    platform,
+    iosRunTargetKind
+  }) {
+    const resolution = selectLocalDevHost(os.networkInterfaces(), { override });
+    if (resolution.source === "override")
+      return resolution;
+    if (platform === "ios" && iosRunTargetKind === "simulator")
+      return { ...resolution, host: "localhost", source: "platform" };
+    if (platform === "android") {
+      try {
+        const host = getAndroidLocalServerHost(await this.#spawn("adb", ["devices"]), resolution.host);
+        return host === resolution.host ? resolution : { ...resolution, host, source: "platform" };
+      } catch {
+        return resolution;
+      }
+    }
+    return resolution;
+  }
   #logDevHostResolution(resolution, commandEnv) {
     this.app.log(`Mobile live-reload server: ${this.#localCsrUrl(resolution.host, commandEnv)}`);
-    if (resolution.source === "override")
+    if (resolution.source === "override" || resolution.source === "platform")
       return;
     const suspicious = resolution.host === "127.0.0.1" || resolution.host.startsWith("169.254.");
     const alternatives = resolution.candidates.filter((candidate) => candidate.address !== resolution.host);
@@ -1226,18 +1273,26 @@ ${error.message}`;
     return await this.app.spawn(command, args, { cwd: this.app.cwdPath, ...options });
   }
   async#spawnMobile(command, args = [], { operation, env }, options = {}) {
+    const { iosRunTargetKind, platform, ...spawnOptions } = options;
     const mobileEnv = { ...await this.#commandEnv(operation, env), ...options.env };
-    const configContent = await this.#writeCapacitorConfig({ operation }, mobileEnv);
+    const configContent = await this.#writeCapacitorConfig({ operation, platform: platform ?? this.#inferMobilePlatform(args), iosRunTargetKind }, mobileEnv);
     await this.#writeRootCapacitorConfig(configContent);
     try {
       return await this.#spawn(command, args, {
-        ...options,
+        ...spawnOptions,
         env: mobileEnv
       });
     } finally {
       await this.#clearRootCapacitorConfigs();
     }
   }
+  #inferMobilePlatform(args) {
+    if (args.includes("android"))
+      return "android";
+    if (args.includes("ios"))
+      return "ios";
+    return;
+  }
   async addCamera() {
     await this.#setPermissionInIos({
       cameraUsageDescription: "$(PRODUCT_NAME) requires access to the camera to take photos.",
@@ -1339,17 +1394,31 @@ ${error.message}`;
       while (end < lines.length && !/^\s*\};\s*$/.test(lines[end] ?? ""))
         end++;
       const settings = lines.slice(start, end + 1);
-      if (settings.some((setting) => setting.includes("CODE_SIGN_ENTITLEMENTS")))
-        continue;
+      const configName = lines.slice(end + 1, end + 8).find((setting) => setting.includes("name = ")) ?? "";
       const indent = line.match(/^\s*/)?.[0] ?? "";
-      lines.splice(index, 0, `${indent}CODE_SIGN_ENTITLEMENTS = ${entitlementsRelPath};`);
-      index++;
-      changed = true;
+      const insertSettings = [];
+      if (!settings.some((setting) => setting.includes("CODE_SIGN_ENTITLEMENTS"))) {
+        insertSettings.push(`${indent}CODE_SIGN_ENTITLEMENTS = ${entitlementsRelPath};`);
+      }
+      if (configName.includes("name = Debug;") && !settings.some((setting) => setting.includes("CODE_SIGN_ALLOW_ENTITLEMENTS_MODIFICATION"))) {
+        insertSettings.push(`${indent}CODE_SIGN_ALLOW_ENTITLEMENTS_MODIFICATION = YES;`);
+      }
+      if (insertSettings.length > 0) {
+        lines.splice(index, 0, ...insertSettings);
+        index += insertSettings.length;
+        changed = true;
+      }
     }
     if (changed)
       await writeFile(pbxprojPath, lines.join(`
 `));
   }
+  async#setCodeSignEntitlementsInIosIfExists(entitlementsRelPath) {
+    const entitlementsPath = path.join(this.app.cwdPath, this.iosProjectPath, entitlementsRelPath);
+    if (!await Bun.file(entitlementsPath).exists())
+      return;
+    await this.#setCodeSignEntitlementsInIos(entitlementsRelPath);
+  }
   async#setUrlSchemesInAndroid(schemes) {
     const manifestPath = path.join(this.app.cwdPath, this.androidRootPath, "app/src/main/AndroidManifest.xml");
     let manifest = await readFile(manifestPath, "utf8");
@@ -1444,4 +1513,4 @@ ${filter}$1`);
   }
 }
 
-export { SWIFTUICORE_MIN_IOS_MAJOR, rootCapacitorConfigFilenames, rootCapacitorConfigPaths, clearRootCapacitorConfigs, writeRootCapacitorConfig, selectLocalDevHost, parseIosRuntimeMajor, sortIosRunTargets, parseDevicectlDevices, parseSimctlDevices, buildIosNativeRunCommand, classifyIosRunFailure, formatIosRunFailureMessage, sanitizeIosNativeRunEnv, PLACEHOLDER_APP_IDS, isPlaceholderAppId, getMissingAndroidReleaseSigningKeys, formatAndroidReleaseSigningError, getAdbDeviceStateIssues, ANDROID_MIN_SDK_VERSION, raiseGradleMinSdkVersion, assertJsonSerializable, materializeCapacitorConfig, CapacitorApp };
+export { SWIFTUICORE_MIN_IOS_MAJOR, rootCapacitorConfigFilenames, rootCapacitorConfigPaths, clearRootCapacitorConfigs, writeRootCapacitorConfig, selectLocalDevHost, parseIosRuntimeMajor, sortIosRunTargets, parseDevicectlDevices, parseSimctlDevices, buildIosNativeRunCommand, classifyIosRunFailure, formatIosRunFailureMessage, sanitizeIosNativeRunEnv, PLACEHOLDER_APP_IDS, isPlaceholderAppId, getMissingAndroidReleaseSigningKeys, formatAndroidReleaseSigningError, getAdbDeviceStateIssues, getAndroidLocalServerHost, ANDROID_MIN_SDK_VERSION, raiseGradleMinSdkVersion, assertJsonSerializable, materializeCapacitorConfig, CapacitorApp };

package/index.js

@@ -4,35 +4,36 @@ import {
   getTargetCommandNames,
   getTargetMetas,
   runCommands
-} from "./index-jkynkyfk.js";
-import"./index-47qxw1tz.js";
+} from "./index-8rr621r2.js";
+import"./index-90zyjrby.js";
 import"./index-mxvakhsm.js";
+import"./index-1577bej2.js";
 import"./index-67546d0j.js";
 import {
   __require
-} from "./index-r24hmh0q.js";
+} from "./index-yb2wsc7f.js";
 
 // pkgs/@akanjs/cli/commandManifest.ts
 import path from "path";
 
 // pkgs/@akanjs/cli/commandModules.ts
 var commandModules = {
-  workspace: async () => (await import("./workspace.command-3q1d6kk4.js")).WorkspaceCommand,
-  agent: async () => (await import("./agent.command-b0fcx3r2.js")).AgentCommand,
-  application: async () => (await import("./application.command-cgmy00gd.js")).ApplicationCommand,
-  library: async () => (await import("./library.command-aa1g8nsa.js")).LibraryCommand,
-  localRegistry: async () => (await import("./localRegistry.command-kshva1ck.js")).LocalRegistryCommand,
-  package: async () => (await import("./package.command-9qv6vr9s.js")).PackageCommand,
-  module: async () => (await import("./module.command-b1zzgqde.js")).ModuleCommand,
-  page: async () => (await import("./page.command-k16pw244.js")).PageCommand,
-  context: async () => (await import("./context.command-b5heat2a.js")).ContextCommand,
-  cloud: async () => (await import("./cloud.command-1m7hfdpk.js")).CloudCommand,
-  guideline: async () => (await import("./guideline.command-9ew6aqhm.js")).GuidelineCommand,
-  scalar: async () => (await import("./scalar.command-hs3nwzv1.js")).ScalarCommand,
-  primitive: async () => (await import("./primitive.command-s60dn1ae.js")).PrimitiveCommand,
-  quality: async () => (await import("./quality.command-p3vaze52.js")).QualityCommand,
-  repair: async () => (await import("./repair.command-mfv749ha.js")).RepairCommand,
-  workflow: async () => (await import("./workflow.command-z0e0fk0z.js")).WorkflowCommand
+  workspace: async () => (await import("./workspace.command-5f2nmmd5.js")).WorkspaceCommand,
+  agent: async () => (await import("./agent.command-nqs3bw0g.js")).AgentCommand,
+  application: async () => (await import("./application.command-k2v46pxf.js")).ApplicationCommand,
+  library: async () => (await import("./library.command-7h3yezwc.js")).LibraryCommand,
+  localRegistry: async () => (await import("./localRegistry.command-vnkc41gj.js")).LocalRegistryCommand,
+  package: async () => (await import("./package.command-z7dd6vy2.js")).PackageCommand,
+  module: async () => (await import("./module.command-4g11k3xd.js")).ModuleCommand,
+  page: async () => (await import("./page.command-y996708m.js")).PageCommand,
+  context: async () => (await import("./context.command-6kn3tady.js")).ContextCommand,
+  cloud: async () => (await import("./cloud.command-7jwmxtez.js")).CloudCommand,
+  guideline: async () => (await import("./guideline.command-pjdrndqk.js")).GuidelineCommand,
+  scalar: async () => (await import("./scalar.command-3chgxybs.js")).ScalarCommand,
+  primitive: async () => (await import("./primitive.command-4fcn8k83.js")).PrimitiveCommand,
+  quality: async () => (await import("./quality.command-hx5af2yn.js")).QualityCommand,
+  repair: async () => (await import("./repair.command-ysxd8pef.js")).RepairCommand,
+  workflow: async () => (await import("./workflow.command-endxfzv5.js")).WorkflowCommand
 };
 var commandModuleIds = Object.keys(commandModules);
 

package/{library.command-aa1g8nsa.js → library.command-7h3yezwc.js}

@@ -1,16 +1,17 @@
 // @bun
 import {
   LibraryScript
-} from "./index-exhpp31y.js";
+} from "./index-6bs24rb4.js";
 import {
   Lib,
   Workspace,
   command
-} from "./index-jkynkyfk.js";
-import"./index-47qxw1tz.js";
+} from "./index-8rr621r2.js";
+import"./index-90zyjrby.js";
 import"./index-mxvakhsm.js";
+import"./index-1577bej2.js";
 import"./index-67546d0j.js";
-import"./index-r24hmh0q.js";
+import"./index-yb2wsc7f.js";
 
 // pkgs/@akanjs/cli/library/library.command.ts
 class LibraryCommand extends command("library", [LibraryScript], ({ public: target }) => ({

package/{localRegistry.command-kshva1ck.js → localRegistry.command-vnkc41gj.js}

@@ -2,31 +2,32 @@
 import {
   CloudRunner,
   getNpmRegistryUrl
-} from "./index-p6txr1ss.js";
+} from "./index-bwt525ne.js";
 import {
   PackageScript
-} from "./index-meh7mmz9.js";
-import"./index-0cj2zxbm.js";
+} from "./index-7zd96bng.js";
+import"./index-sh01r3pm.js";
 import {
   ApplicationScript
-} from "./index-nx1vbtsc.js";
+} from "./index-7etegaht.js";
+import"./index-6bs24rb4.js";
 import"./index-76rn3g2c.js";
-import"./index-exhpp31y.js";
 import {
   Workspace,
   command,
   runner,
   script
-} from "./index-jkynkyfk.js";
+} from "./index-8rr621r2.js";
 import"./index-fgc8r6dj.js";
-import"./index-bjpxzr6s.js";
+import"./index-5vy2jzar.js";
 import {
   PkgExecutor
-} from "./index-47qxw1tz.js";
+} from "./index-90zyjrby.js";
 import"./index-mxvakhsm.js";
+import"./index-1577bej2.js";
 import"./index-46tjzh6s.js";
 import"./index-67546d0j.js";
-import"./index-r24hmh0q.js";
+import"./index-yb2wsc7f.js";
 
 // pkgs/@akanjs/cli/localRegistry/localRegistry.runner.ts
 import { mkdir, rm } from "fs/promises";

package/{module.command-b1zzgqde.js → module.command-4g11k3xd.js}

@@ -1,23 +1,24 @@
 // @bun
 import {
   ModuleScript
-} from "./index-60a3jfcz.js";
-import"./index-hrwzz2wf.js";
+} from "./index-xrdrttjb.js";
 import"./index-ss469dec.js";
-import"./index-0cj2zxbm.js";
+import"./index-4z05haak.js";
+import"./index-sh01r3pm.js";
 import {
   renderPrimitiveReport
-} from "./index-m4kpmmtj.js";
-import"./index-qp089jp0.js";
+} from "./index-5em412h5.js";
+import"./index-j37qq1f2.js";
 import {
   Module,
   Sys,
   command
-} from "./index-jkynkyfk.js";
-import"./index-47qxw1tz.js";
+} from "./index-8rr621r2.js";
+import"./index-90zyjrby.js";
 import"./index-mxvakhsm.js";
+import"./index-1577bej2.js";
 import"./index-67546d0j.js";
-import"./index-r24hmh0q.js";
+import"./index-yb2wsc7f.js";
 
 // pkgs/@akanjs/cli/module/module.command.ts
 import { Logger, lowerlize } from "akanjs/common";

package/{package.command-9qv6vr9s.js → package.command-z7dd6vy2.js}

@@ -1,17 +1,18 @@
 // @bun
 import {
   PackageScript
-} from "./index-meh7mmz9.js";
+} from "./index-7zd96bng.js";
 import {
   Pkg,
   Workspace,
   command
-} from "./index-jkynkyfk.js";
-import"./index-47qxw1tz.js";
+} from "./index-8rr621r2.js";
+import"./index-90zyjrby.js";
 import"./index-mxvakhsm.js";
+import"./index-1577bej2.js";
 import"./index-46tjzh6s.js";
 import"./index-67546d0j.js";
-import"./index-r24hmh0q.js";
+import"./index-yb2wsc7f.js";
 
 // pkgs/@akanjs/cli/package/package.command.ts
 class PackageCommand extends command("package", [PackageScript], ({ public: target }) => ({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akanjs/cli",
-  "version": "3.0.0-alpha.5",
+  "version": "3.0.0-alpha.50",
   "sourceType": "module",
   "type": "module",
   "publishConfig": {
@@ -14,7 +14,7 @@
     "directory": "pkgs/@akanjs/cli"
   },
   "engines": {
-    "bun": ">=1.3.13"
+    "bun": ">=1.4.0"
   },
   "bin": {
     "akan": "./index.js",
@@ -34,7 +34,7 @@
     "@langchain/openai": "^1.4.6",
     "@tailwindcss/node": "^4.3.0",
     "@trapezedev/project": "^7.1.4",
-    "akanjs": "3.0.0-alpha.5",
+    "akanjs": "3.0.0-alpha.50",
     "chalk": "^5.6.2",
     "commander": "^14.0.3",
     "dayjs": "^1.11.20",
@@ -42,7 +42,6 @@
     "fonteditor-core": "^2.6.3",
     "ignore": "^7.0.5",
     "ink": "^6.8.0",
-    "js-yaml": "^4.1.1",
     "ora": "^9.4.0",
     "qrcode": "^1.5.4",
     "react": "19.2.7",

package/{page.command-k16pw244.js → page.command-y996708m.js}

@@ -1,16 +1,17 @@
 // @bun
 import {
   PageScript
-} from "./index-hrwzz2wf.js";
+} from "./index-4z05haak.js";
 import {
   App,
   Module,
   command
-} from "./index-jkynkyfk.js";
-import"./index-47qxw1tz.js";
+} from "./index-8rr621r2.js";
+import"./index-90zyjrby.js";
 import"./index-mxvakhsm.js";
+import"./index-1577bej2.js";
 import"./index-67546d0j.js";
-import"./index-r24hmh0q.js";
+import"./index-yb2wsc7f.js";
 
 // pkgs/@akanjs/cli/page/page.command.ts
 class PageCommand extends command("page", [PageScript], ({ public: target }) => ({

package/{primitive.command-s60dn1ae.js → primitive.command-4fcn8k83.js}

@@ -1,23 +1,24 @@
 // @bun
 import {
   PrimitiveScript
-} from "./index-pfrt7qwh.js";
-import"./index-60a3jfcz.js";
-import"./index-hrwzz2wf.js";
+} from "./index-97cw8sg1.js";
+import"./index-xrdrttjb.js";
 import"./index-ss469dec.js";
-import"./index-0cj2zxbm.js";
+import"./index-4z05haak.js";
+import"./index-sh01r3pm.js";
 import {
   renderPrimitiveReport
-} from "./index-m4kpmmtj.js";
-import"./index-qp089jp0.js";
+} from "./index-5em412h5.js";
+import"./index-j37qq1f2.js";
 import {
   Workspace,
   command
-} from "./index-jkynkyfk.js";
-import"./index-47qxw1tz.js";
+} from "./index-8rr621r2.js";
+import"./index-90zyjrby.js";
 import"./index-mxvakhsm.js";
+import"./index-1577bej2.js";
 import"./index-67546d0j.js";
-import"./index-r24hmh0q.js";
+import"./index-yb2wsc7f.js";
 
 // pkgs/@akanjs/cli/primitive/primitive.command.ts
 import { Logger } from "akanjs/common";