craft-native 0.0.91 → 0.0.94

package/dist/android/templates/CraftNative.kt.template

@@ -1,6 +1,7 @@
 package com.craft.runtime
 
 import android.app.Activity
+import android.content.IntentSender
 import com.google.android.gms.location.Priority
 import com.google.android.gms.location.LocationServices
 import com.google.android.gms.location.LocationResult
@@ -110,10 +111,24 @@ object CraftNative {
      */
     val isAvailable: Boolean = try {
         System.loadLibrary("craft")
+        // Said out loud, because the two outcomes below are otherwise
+        // indistinguishable from outside: a library that never shipped and a
+        // library that loaded and then failed to bind both end with the shim
+        // answering every call. Zig logs its own registration under the same
+        // tag, so the pair reads as a sequence.
+        android.util.Log.i("CraftNative", "craft: libcraft.so loaded")
         true
     } catch (e: UnsatisfiedLinkError) {
+        // The reason, not just the fact. This used to be a bare `false`, and
+        // the first time the runtime was genuinely shipped and genuinely
+        // failed to load, the only evidence anywhere was that nothing
+        // happened — no linker line, no exception, nothing in logcat at all.
+        // The message carries the dynamic linker's own complaint, which is the
+        // one thing that says *why*.
+        android.util.Log.w("CraftNative", "craft: libcraft.so did not load: ${e.message}")
         false
     } catch (e: SecurityException) {
+        android.util.Log.w("CraftNative", "craft: libcraft.so was refused: ${e.message}")
         false
     }
 
@@ -197,14 +212,20 @@ object CraftNative {
     /**
      * Run `script` in the page. Called from Zig, on any thread.
      *
-     * Silent when no deliverer is installed — which is every moment before the
-     * WebView exists, and after it is torn down. A throw here would cross back
-     * into Zig as a pending exception on a thread that has nowhere to report
-     * it, and the caller already counts what it could not deliver.
+     * Returns whether a deliverer took it. False is every moment before the
+     * WebView exists and after it is torn down, and it used to be
+     * indistinguishable from a delivery: the script was dropped, Zig's caller
+     * reported success, and the page waited on a promise nothing would settle
+     * (#231). Zig counts a false, and says so once.
+     *
+     * Still no throw. A throw here would cross back into Zig as a pending
+     * exception on a thread with nowhere to report it; false says the same
+     * thing and the caller can act on it.
      */
     @JvmStatic
-    fun deliver(script: String) {
-        runCatching { deliverer?.invoke(script) }
+    fun deliver(script: String): Boolean {
+        val target = deliverer ?: return false
+        return runCatching { target(script); true }.getOrDefault(false)
     }
 
     private external fun nativeGetDeviceInfo(activity: Activity): String?
@@ -213,7 +234,7 @@ object CraftNative {
     private external fun nativeClipboardRead(activity: Activity): String?
     private external fun nativeClipboardWrite(activity: Activity, text: String): Boolean
     private external fun nativeOpenUrl(activity: Activity, url: String): Boolean
-    private external fun nativeShare(activity: Activity, text: String, title: String): Boolean
+    private external fun nativeShare(activity: Activity, text: String, title: String, chosen: IntentSender, requestCode: Int): Boolean
     private external fun nativeOpenCamera(activity: Activity): Boolean
     private external fun nativePickImage(activity: Activity): Boolean
     private external fun nativePickFile(activity: Activity): Boolean
@@ -235,7 +256,7 @@ object CraftNative {
     private external fun nativeResetDeepLinks(): Boolean
     private external fun nativeSetInitialURL(url: String?): Boolean
     private external fun nativeGetInitialURL(): Boolean
-    private external fun nativeDispatchDeepLink(url: String): Boolean
+    private external fun nativeDispatchDeepLink(url: String, initial: Boolean): Boolean
     private external fun nativeScreenshotReady(bytes: ByteArray)
     private external fun nativeScreenshotError(message: String)
     private external fun nativeTakeScreenshot(activity: Activity, webView: WebView): Boolean
@@ -411,11 +432,15 @@ object CraftNative {
         }
     }
 
-    /** Returns whether Zig launched the share sheet; false falls through. */
-    fun share(activity: Activity, text: String, title: String): Boolean {
+    /**
+     * Returns whether Zig launched the share menu for a result; false falls
+     * through. `chosen` fires on a pick and `requestCode` routes the result
+     * back to CraftBridge, which settles the page's promise from the two.
+     */
+    fun share(activity: Activity, text: String, title: String, chosen: IntentSender, requestCode: Int): Boolean {
         if (!isAvailable) return false
         return try {
-            nativeShare(activity, text, title)
+            nativeShare(activity, text, title, chosen, requestCode)
         } catch (e: UnsatisfiedLinkError) {
             false
         }
@@ -697,9 +722,9 @@ object CraftNative {
         return try { nativeGetInitialURL() } catch (e: UnsatisfiedLinkError) { false }
     }
 
-    fun dispatchDeepLink(url: String): Boolean {
+    fun dispatchDeepLink(url: String, initial: Boolean): Boolean {
         if (!isAvailable) return false
-        return try { nativeDispatchDeepLink(url) } catch (e: UnsatisfiedLinkError) { false }
+        return try { nativeDispatchDeepLink(url, initial) } catch (e: UnsatisfiedLinkError) { false }
     }
 
     @JvmStatic

package/dist/android/templates/MainActivity.kt.template

@@ -1,10 +1,14 @@
 package {{PACKAGE_NAME}}
 
 import android.annotation.SuppressLint
+import android.content.Context
 import android.os.Bundle
 import android.content.Intent
 import android.graphics.Bitmap
+import android.net.ConnectivityManager
+import android.net.Network
 import android.net.Uri
+import android.util.Log
 import android.webkit.WebResourceRequest
 import android.webkit.WebResourceError
 import android.webkit.WebResourceResponse
@@ -19,6 +23,20 @@ import org.json.JSONObject
 import java.io.FileNotFoundException
 import java.net.URLConnection
 
+/** Main-frame failures for which the bundled app is an honest fallback (#254). */
+object CraftLoadFailure {
+    fun isUnreachable(errorCode: Int): Boolean = when (errorCode) {
+        WebViewClient.ERROR_HOST_LOOKUP,
+        WebViewClient.ERROR_CONNECT,
+        WebViewClient.ERROR_TIMEOUT,
+        // Android uses ERROR_IO for connection interruptions as well as local
+        // I/O failures. Keep it here deliberately: it is the closest Android
+        // equivalent to iOS's NSURLErrorNetworkConnectionLost.
+        WebViewClient.ERROR_IO -> true
+        else -> false
+    }
+}
+
 class MainActivity : AppCompatActivity() {
     private lateinit var webView: WebView
     private lateinit var craftBridge: CraftBridge
@@ -32,6 +50,28 @@ class MainActivity : AppCompatActivity() {
             .build()
     }
     private var loadedBundledFallback = false
+    private lateinit var connectivityManager: ConnectivityManager
+    @Volatile
+    private var isConnected = false
+    private var networkMonitoringRegistered = false
+    private val networkCallback = object : ConnectivityManager.NetworkCallback() {
+        override fun onAvailable(network: Network) {
+            val wasConnected = isConnected
+            isConnected = true
+            if (!wasConnected && isConnected) {
+                runOnUiThread {
+                    returnFromBundledFallback("the network came back")
+                }
+            }
+        }
+
+        override fun onLost(network: Network) {
+            // A second transport can already be the default by the time the
+            // old one reports its loss, so read current state instead of
+            // blindly turning the latch off.
+            isConnected = connectivityManager.activeNetwork != null
+        }
+    }
 
     @SuppressLint("SetJavaScriptEnabled")
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -44,11 +84,31 @@ class MainActivity : AppCompatActivity() {
 
         webView = findViewById(R.id.webview)
         craftBridge = CraftBridge(this, webView, CraftHealthConnect(this, webView))
-        handleIncomingDeepLink(intent, dispatch = false)
-        if (savedInstanceState == null) handleIncomingShortcut(intent)
+        // The link that launched the app (#215). Queued until the page's bridge
+        // is injected, then dispatched once with `initial: true`, so a page that
+        // subscribes rather than calling getInitialURL still hears it.
+        //
+        // A relaunch from Recents carries the intent the app was first opened
+        // with. The person picked the task out of a list, not the link or the
+        // shortcut inside it, and neither is news the second time — so both
+        // are skipped, not just the link (#229).
+        //
+        // A recreated activity restores what the bridge saved rather than
+        // reading its intent, which onNewIntent may have replaced with a
+        // later warm link.
+        val launchedFromHistory = intent.flags and Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY != 0
+        if (savedInstanceState == null) {
+            if (!launchedFromHistory) {
+                intent.data?.toString()?.let(craftBridge::receiveDeepLink)
+                handleIncomingShortcut(intent)
+            }
+        } else {
+            craftBridge.restoreDeepLinks(savedInstanceState)
+        }
 
         setupWebView()
         loadContent()
+        setupNetworkMonitoring()
     }
 
     @SuppressLint("SetJavaScriptEnabled")
@@ -94,7 +154,13 @@ class MainActivity : AppCompatActivity() {
 
             override fun onReceivedError(view: WebView?, request: WebResourceRequest?, error: WebResourceError?) {
                 super.onReceivedError(view, request, error)
-                if (request?.isForMainFrame == true && hasBundledFallback && !loadedBundledFallback) {
+                if (
+                    request?.isForMainFrame == true &&
+                    error != null &&
+                    CraftLoadFailure.isUnreachable(error.errorCode) &&
+                    hasBundledFallback &&
+                    !loadedBundledFallback
+                ) {
                     loadedBundledFallback = true
                     webView.loadUrl(BUNDLED_APP_URL)
                 }
@@ -107,6 +173,23 @@ class MainActivity : AppCompatActivity() {
         webView.addJavascriptInterface(craftBridge, "CraftAndroid")
     }
 
+    private fun setupNetworkMonitoring() {
+        if (!hasBundledFallback || devServerUrl == null) return
+        connectivityManager = getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+        isConnected = connectivityManager.activeNetwork != null
+        connectivityManager.registerDefaultNetworkCallback(networkCallback)
+        networkMonitoringRegistered = true
+    }
+
+    /** Leave the bundled copy for the configured remote origin again. */
+    private fun returnFromBundledFallback(reason: String) {
+        val remoteUrl = devServerUrl ?: return
+        if (!loadedBundledFallback) return
+        loadedBundledFallback = false
+        Log.i(TAG, "$reason; loading $remoteUrl again instead of the bundled copy")
+        webView.loadUrl(remoteUrl)
+    }
+
     private fun loadContent() {
         // Check for dev server URL in config
         val remoteUrl = devServerUrl
@@ -150,12 +233,6 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
-    private fun handleIncomingDeepLink(source: Intent?, dispatch: Boolean) {
-        val url = source?.data?.toString() ?: return
-        craftBridge.setInitialURL(url)
-        if (dispatch) craftBridge.dispatchDeepLink(url)
-    }
-
     private fun handleIncomingShortcut(source: Intent?) {
         source?.getStringExtra(SHORTCUT_TYPE_EXTRA)?.let(craftBridge::dispatchShortcut)
     }
@@ -198,10 +275,15 @@ class MainActivity : AppCompatActivity() {
         return (uri.scheme == "https" || localDevelopment) && origin in trustedOrigins
     }
 
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        craftBridge.saveDeepLinks(outState)
+    }
+
     override fun onNewIntent(intent: Intent) {
         super.onNewIntent(intent)
         setIntent(intent)
-        handleIncomingDeepLink(intent, dispatch = true)
+        intent.data?.toString()?.let(craftBridge::receiveDeepLink)
         handleIncomingShortcut(intent)
     }
 
@@ -216,6 +298,7 @@ class MainActivity : AppCompatActivity() {
     override fun onResume() {
         super.onResume()
         webView.onResume()
+        returnFromBundledFallback("the app returned to the foreground")
     }
 
     override fun onPause() {
@@ -224,6 +307,10 @@ class MainActivity : AppCompatActivity() {
     }
 
     override fun onDestroy() {
+        if (networkMonitoringRegistered) {
+            connectivityManager.unregisterNetworkCallback(networkCallback)
+            networkMonitoringRegistered = false
+        }
         craftBridge.close()
         webView.destroy()
         super.onDestroy()
@@ -245,6 +332,7 @@ class MainActivity : AppCompatActivity() {
     }
 
     companion object {
+        private const val TAG = "CraftMainActivity"
         private const val BUNDLED_APP_HOST = "appassets.androidplatform.net"
         private const val BUNDLED_APP_ORIGIN = "https://appassets.androidplatform.net"
         private const val BUNDLED_APP_URL = "$BUNDLED_APP_ORIGIN/"

package/dist/api/mobile.d.ts

@@ -550,9 +550,12 @@ export declare const share: {
     /**
      * Open native share dialog.
      *
+     * Resolves `true` when the person shared and `false` when they dismissed the
+     * dialog, on the native bridges and in the browser alike.
+     *
      * @param options - Share options
      */
-    share(options: ShareOptions): Promise<void>;
+    share(options: ShareOptions): Promise<boolean>;
     /**
      * Check if sharing is available.
      */
@@ -614,6 +617,22 @@ export interface NotificationOptions {
     /** Schedule for future (timestamp) */
     scheduleAt?: number;
 }
+/** A notification as the bridges read it: `delay` in place of `scheduleAt`. */
+export type BridgeNotification = Omit<NotificationOptions, 'scheduleAt'> & {
+    delay?: number;
+};
+/**
+ * The bridges' spelling of a notification: `scheduleAt` becomes `delay`.
+ *
+ * Both bridges schedule from `delay`, milliseconds from now, and iOS also from
+ * `timestamp`; neither reads `scheduleAt`, so a reminder meant for an hour
+ * from now fired at once (#261). `delay` rather than `timestamp` because
+ * Android reads only `delay`, and because an interval is what an instant
+ * means, where iOS's calendar trigger would move with the device's time zone.
+ * A moment already past sends no delay at all, which both bridges deliver
+ * now: a zero delay raises inside UserNotifications on the Swift side.
+ */
+export declare function bridgeNotification(options: NotificationOptions, now?: number): BridgeNotification;
 /**
  * Local notifications API.
  *
@@ -670,7 +689,14 @@ export declare const keepAwake: {
 };
 export declare const deepLinks: {
     getInitialURL(): Promise<string | null>;
-    onLink(callback: (url: string) => void): () => void;
+    /**
+     * The second argument says whether this is the link that launched the app.
+     * A page that also calls `getInitialURL()` after an await gets that link
+     * from both, and can skip it here when `initial` is true.
+     */
+    onLink(callback: (url: string, link: {
+        initial: boolean;
+    }) => void): () => void;
 };
 export declare function normalizeDeepLinkURL(value: unknown): string | null;
 export declare const network: {
@@ -683,7 +709,23 @@ export declare const appReview: {
 export declare const pushNotifications: {
     register(): Promise<string>;
     onToken(callback: (token: string) => void): () => void;
+    /**
+     * A tap on a notification, with the payload it was sent with.
+     *
+     * Goes through the bridge's replay where there is one, so a tap that
+     * launched the app still reaches a page that subscribes once it has
+     * hydrated — rather than only one listening before the bridge was ready.
+     */
     onNotification(callback: (data: Record<string, unknown>) => void): () => void;
+    /**
+     * A notification that arrived while the app was open, with the payload it
+     * was sent with — the same shape `onNotification` hands a tap.
+     *
+     * The banner still shows. This is for a page that wants to react while it
+     * is on screen, such as refreshing what the push was about. Live only: an
+     * arrival before the page subscribed is not held for it. iOS only for now.
+     */
+    onReceive(callback: (data: Record<string, unknown>) => void): () => void;
 };
 export type HealthDataType = 'steps' | 'heartRate' | 'activeEnergy' | 'distance' | 'workouts';
 export interface HealthDataOptions {

package/dist/binary-resolver.d.ts

@@ -46,6 +46,10 @@ export declare function resolveCraftBinary(explicit?: string): string;
  * path-matrix behaviour the pantry contract exists to remove. So instead the
  * spawn is marked, and a CLI that starts up already marked knows it *is* the
  * thing that was spawned, and says so.
+ *
+ * Both spawners set it: `runCraftBinary()` in the CLI, and `CraftApp.show()`
+ * in the SDK. The SDK one was missing until #236, so every SDK caller on such
+ * a machine still met the raw parser error this marker exists to replace.
  */
 export declare const CRAFT_CLI_SPAWN_MARKER = "CRAFT_CLI_SPAWNED_FROM";
 /**

package/dist/cli.js

@@ -1575,7 +1575,7 @@ async function open(options) {
   await $`open ${projectPath}`;
 }
 function orderSimulators(devices) {
-  return [...devices].sort((left, right) => {
+  return devices.filter((device) => device.runtime.startsWith("iOS")).sort((left, right) => {
     const booted = Number(right.state === "Booted") - Number(left.state === "Booted");
     if (booted !== 0)
       return booted;
@@ -1730,11 +1730,14 @@ var exports_src2 = {};
 __export(exports_src2, {
   syncAndroidWebAssets: () => syncAndroidWebAssets,
   run: () => run2,
+  resolveRuntimeDir: () => resolveRuntimeDir2,
   renderAndroidPermissions: () => renderAndroidPermissions,
   renderAndroidDeepLinks: () => renderAndroidDeepLinks,
   open: () => open2,
+  installRuntime: () => installRuntime2,
   init: () => init2,
-  build: () => build2
+  build: () => build2,
+  ANDROID_MIN_SDK: () => ANDROID_MIN_SDK
 });
 import { cpSync as cpSync3, existsSync as existsSync5, mkdirSync as mkdirSync3, readFileSync as readFileSync4, rmSync as rmSync3, statSync as statSync2, writeFileSync as writeFileSync4 } from "fs";
 import { dirname as dirname2, extname, isAbsolute, join as join3, relative, resolve as resolve2, sep } from "path";
@@ -1838,6 +1841,9 @@ function validateAndroidConfig(config) {
       throw new Error(`Android ${name} must be a positive integer`);
     }
   }
+  if (Number(config.minSdk) < ANDROID_MIN_SDK) {
+    throw new Error(`Android minSdk must be at least ${ANDROID_MIN_SDK} (Android 8.0) for the Craft runtime`);
+  }
   if (Number(config.minSdk) > Number(config.targetSdk)) {
     throw new Error("Android minSdk must not exceed targetSdk");
   }
@@ -1928,6 +1934,36 @@ function renderAndroidDeepLinks(config) {
             </intent-filter>`).join(`
 `);
 }
+function resolveRuntimeDir2(override) {
+  if (override === null)
+    return null;
+  const dir = override ?? process.env.CRAFT_ANDROID_RUNTIME;
+  if (!dir)
+    return null;
+  if (!existsSync5(dir)) {
+    const source = override === undefined ? "CRAFT_ANDROID_RUNTIME points at" : "runtimeDir is";
+    throw new Error(`${source} ${dir}, which does not exist.`);
+  }
+  return dir;
+}
+function installRuntime2(output, runtimeDir) {
+  const found = RUNTIME_ABIS.map((abi) => ({ abi, source: join3(runtimeDir, abi, "libcraft.so") })).filter((entry) => existsSync5(entry.source));
+  if (found.length === 0) {
+    throw new Error(`${runtimeDir} has no <abi>/libcraft.so for any of ${RUNTIME_ABIS.join(", ")}. ` + "Run `zig build build-android-all -Doptimize=ReleaseSafe` in packages/zig and point at its zig-out/android.");
+  }
+  if (found.length < RUNTIME_ABIS.length) {
+    const missing = RUNTIME_ABIS.filter((abi) => !found.some((entry) => entry.abi === abi));
+    console.warn(`   \u26A0 only ${found.map((entry) => entry.abi).join(", ")} was found; ${missing.join(", ")} is missing. ` + "The app will fall back to the Kotlin shim on those devices.");
+  }
+  const dest = join3(output, "app/src/main/jniLibs");
+  rmSync3(dest, { force: true, recursive: true });
+  for (const { abi, source } of found) {
+    const abiDir = join3(dest, abi);
+    mkdirSync3(abiDir, { recursive: true });
+    cpSync3(source, join3(abiDir, "libcraft.so"));
+  }
+  return true;
+}
 async function init2(options) {
   const { name, packageName, output } = options;
   console.log(`
@@ -1945,7 +1981,6 @@ async function init2(options) {
   if (config.enableBackgroundLocation)
     config.enableGeolocation = true;
   if (config.enableHealthConnect) {
-    config.minSdk = Math.max(config.minSdk ?? 26, 26);
     config.compileSdk = Math.max(config.compileSdk ?? 36, 36);
   }
   normalizeAndroidNetworkConfig(config);
@@ -2029,7 +2064,7 @@ async function init2(options) {
   const projectGradleTemplate = readFileSync4(join3(TEMPLATES_DIR2, "build.gradle.kts.project.template"), "utf-8");
   writeFileSync4(join3(output, "build.gradle.kts"), projectGradleTemplate.replace(/\{\{GOOGLE_SERVICES_PLUGIN\}\}/g, hasGoogleServices ? '    id("com.google.gms.google-services") version "4.4.2" apply false' : ""));
   const appGradleTemplate = readFileSync4(join3(TEMPLATES_DIR2, "build.gradle.kts.app.template"), "utf-8");
-  const appGradle = appGradleTemplate.replace(/\{\{PACKAGE_NAME\}\}/g, finalPackageName).replace(/\{\{VERSION_NAME\}\}/g, escapeKotlinString(config.version || "1.0.0")).replace(/\{\{VERSION_CODE\}\}/g, String(config.versionCode || 1)).replace(/\{\{MIN_SDK\}\}/g, String(config.minSdk || 24)).replace(/\{\{COMPILE_SDK\}\}/g, String(config.compileSdk || 36)).replace(/\{\{TARGET_SDK\}\}/g, String(config.targetSdk || 35)).replace(/\{\{GOOGLE_SERVICES_PLUGIN\}\}/g, hasGoogleServices ? '    id("com.google.gms.google-services")' : "").replace(/\{\{FIREBASE_MESSAGING_DEPENDENCY\}\}/g, config.enablePushNotifications ? '    implementation("com.google.firebase:firebase-messaging:24.1.0")' : "").replace(/\{\{HEALTH_CONNECT_DEPENDENCIES\}\}/g, config.enableHealthConnect ? `    implementation("androidx.health.connect:connect-client:1.1.0")
+  const appGradle = appGradleTemplate.replace(/\{\{PACKAGE_NAME\}\}/g, finalPackageName).replace(/\{\{VERSION_NAME\}\}/g, escapeKotlinString(config.version || "1.0.0")).replace(/\{\{VERSION_CODE\}\}/g, String(config.versionCode || 1)).replace(/\{\{MIN_SDK\}\}/g, String(config.minSdk ?? ANDROID_MIN_SDK)).replace(/\{\{COMPILE_SDK\}\}/g, String(config.compileSdk || 36)).replace(/\{\{TARGET_SDK\}\}/g, String(config.targetSdk || 35)).replace(/\{\{GOOGLE_SERVICES_PLUGIN\}\}/g, hasGoogleServices ? '    id("com.google.gms.google-services")' : "").replace(/\{\{FIREBASE_MESSAGING_DEPENDENCY\}\}/g, config.enablePushNotifications ? '    implementation("com.google.firebase:firebase-messaging:24.1.0")' : "").replace(/\{\{HEALTH_CONNECT_DEPENDENCIES\}\}/g, config.enableHealthConnect ? `    implementation("androidx.health.connect:connect-client:1.1.0")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1")` : "");
   writeFileSync4(join3(output, "app/build.gradle.kts"), appGradle);
   const proguardTemplate = readFileSync4(join3(TEMPLATES_DIR2, "proguard-rules.pro.template"), "utf-8");
@@ -2147,6 +2182,11 @@ zipStorePath=wrapper/dists
 </body>
 </html>`;
   writeFileSync4(join3(output, "app/src/main/assets/index.html"), placeholderHtml);
+  const runtimeDir = resolveRuntimeDir2(options.runtimeDir);
+  if (runtimeDir) {
+    installRuntime2(output, runtimeDir);
+    console.log("   Installed the Zig runtime from", runtimeDir);
+  }
   console.log("\u2705 Project initialized");
   console.log("");
   console.log("Next steps:");
@@ -2165,6 +2205,15 @@ async function build2(options) {
     throw new Error(`No craft.config.json found in ${output}. Run 'craft android init' first.`);
   }
   const config = JSON.parse(readFileSync4(configPath, "utf-8"));
+  if (existsSync5(join3(output, "app/src/main/jniLibs"))) {
+    const runtimeDir = resolveRuntimeDir2(options.runtimeDir);
+    if (runtimeDir) {
+      installRuntime2(output, runtimeDir);
+      console.log("   Refreshed the Zig runtime from", runtimeDir);
+    } else {
+      console.log("   Keeping the Zig runtime installed at init (no runtime directory configured)");
+    }
+  }
   if (devServer) {
     const url = androidWebUrl(devServer, "Android dev server URL");
     config.devServerURL = url.toString();
@@ -2313,7 +2362,7 @@ window.__craftRejectPendingPromises = function(message) {
         if (entry) entry.settle(false, new Error(message || 'Android bridge closed'));
     });
 };
-`, TEMPLATES_DIR2, LOCAL_DEVELOPMENT_HOSTS, KOTLIN_KEYWORDS, DEFAULT_CONFIG2;
+`, TEMPLATES_DIR2, LOCAL_DEVELOPMENT_HOSTS, KOTLIN_KEYWORDS, ANDROID_MIN_SDK = 26, DEFAULT_CONFIG2, RUNTIME_ABIS;
 var init_src2 = __esm(() => {
   ({ $: $2 } = globalThis.Bun);
   TEMPLATES_DIR2 = join3(dirname2(import.meta.dir), "templates");
@@ -2367,10 +2416,11 @@ var init_src2 = __esm(() => {
     enableDeepLinks: false,
     urlSchemes: [],
     trustedOrigins: [],
-    minSdk: 26,
+    minSdk: ANDROID_MIN_SDK,
     compileSdk: 36,
     targetSdk: 35
   };
+  RUNTIME_ABIS = ["arm64-v8a", "x86_64"];
 });
 
 // ../../node_modules/@stacksjs/clapp/dist/index.js
@@ -4483,7 +4533,7 @@ function craftBinaryIsCliShimMessage(spawnedFrom) {
   return [
     `"${spawnedFrom}" on PATH is the Craft CLI, not the native binary.`,
     "",
-    "The CLI spawned it expecting the native build, and re-entered itself \u2014",
+    "Craft spawned it expecting the native build and reached this CLI instead \u2014",
     "which is why an option you never typed (--url) came back as unknown.",
     "",
     "Fix it in one of two ways:",
@@ -4537,7 +4587,7 @@ function pinCraftNativeDependency(packagePath, craftVersion) {
 `);
 }
 // package.json
-var version = "0.0.91";
+var version = "0.0.94";
 
 // bin/cli.ts
 var spawnedFrom = process6.env[CRAFT_CLI_SPAWN_MARKER];
@@ -5025,10 +5075,16 @@ cli.command("publish", "Publish app to App Store or Play Store").option("--ios",
   }
 });
 cli.command("init <name>", "Initialize a new Craft project").option("--template <type>", "Project template (blank, tabs, drawer, dashboard, desktop, ios, android, all)", { default: "blank" }).option("--bundle-id <id>", "Bundle identifier for mobile").example("craft init MyApp").example("craft init MyApp --template tabs").example("craft init MyApp --template dashboard").example("craft init MyApp --template all").action(async (name, options) => {
+  const template = options?.template || "blank";
+  const templates = ["blank", "tabs", "drawer", "dashboard", "desktop", "ios", "android", "all"];
+  if (!templates.includes(template)) {
+    console.error(`Error: Unknown template "${template}"`);
+    console.error(`Available templates: ${templates.join(", ")}`);
+    process6.exit(1);
+  }
   console.log(`
 \u26A1 Creating new Craft project: ${name}
 `);
-  const template = options?.template || "blank";
   const bundleId = options?.bundleId || `com.example.${name.toLowerCase().replace(/[^a-z0-9]/g, "")}`;
   const appNameSlug = name.toLowerCase().replace(/[^a-z0-9]/g, "-");
   const { mkdirSync: mkdirSync4, writeFileSync: writeFileSync5, existsSync: existsSync7, readdirSync: readdirSync3, readFileSync: readFileSync5, cpSync: cpSync4 } = await import("fs");