craft-native 0.0.251 → 0.0.254

package/dist/android/src/index.js

@@ -194,6 +194,7 @@ async function createAndroidEmulator(options) {
   if (options.acceleration === "software" && process.arch !== "x64")
     throw new Error("Android software emulation requires an x86_64 host and system image");
   const bootTimeoutMs = options.bootTimeoutMs ?? 600000;
+  const requiresPlayStore = options.image.split(";")[2] === "google_apis_playstore";
   const maximumBootTimeoutMs = options.acceleration === "software" ? 1200000 : 600000;
   if (!Number.isSafeInteger(bootTimeoutMs) || bootTimeoutMs < 1000 || bootTimeoutMs > maximumBootTimeoutMs)
     throw new Error(`Android bootTimeoutMs must be an integer between 1000 and ${maximumBootTimeoutMs} milliseconds`);
@@ -332,11 +333,13 @@ async function createAndroidEmulator(options) {
         if (completion.code === 0 && completion.stdout.trim() === "1") {
           const settings = await run([adb, "-s", serial, "shell", "settings", "get", "global", "animator_duration_scale"], undefined, probeTimeout(), true);
           const packages = await run([adb, "-s", serial, "shell", "pm", "path", "android"], undefined, probeTimeout(), true);
+          const playStore = requiresPlayStore ? await run([adb, "-s", serial, "shell", "pm", "path", "com.android.vending"], undefined, probeTimeout(), true) : undefined;
           const systemUi = await run([adb, "-s", serial, "shell", "pidof", "com.android.systemui"], undefined, probeTimeout(), true);
           const events = await run([adb, "-s", serial, "logcat", "-b", "events", "-d", "-t", "1"], undefined, probeTimeout(), true);
           const home = await run([adb, "-s", serial, "shell", "cmd", "package", "resolve-activity", "--brief", "-a", "android.intent.action.MAIN", "-c", "android.intent.category.HOME"], undefined, probeTimeout(), true);
           const homeActivity = home.stdout.trim().split(/\r?\n/).at(-1) ?? "";
-          booted = settings.code === 0 && packages.code === 0 && systemUi.code === 0 && events.code === 0 && /^package:\/\S+/m.test(packages.stdout) && /^\d+(?:\s+\d+)*$/.test(systemUi.stdout.trim()) && home.code === 0 && /^[\w.]+\/[\w.$]+$/.test(homeActivity) && !homeActivity.startsWith("com.android.sdksetup/");
+          const temporaryHome = homeActivity.startsWith("com.android.sdksetup/") || /^com\.android\.settings\/(?:\.|com\.android\.settings\.)FallbackHome$/.test(homeActivity) || /^android\/.*(?:Resolver|Chooser)Activity$/.test(homeActivity);
+          booted = settings.code === 0 && packages.code === 0 && systemUi.code === 0 && events.code === 0 && /^package:\/\S+/m.test(packages.stdout) && /^\d+(?:\s+\d+)*$/.test(systemUi.stdout.trim()) && (!requiresPlayStore || playStore?.code === 0 && /^package:\/\S+/m.test(playStore.stdout)) && home.code === 0 && /^[\w.]+\/[\w.$]+$/.test(homeActivity) && !temporaryHome;
         }
       }
       const checkedAt = Date.now();

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

@@ -413,7 +413,6 @@ private class CraftNativeMapView(context: Context) : FrameLayout(context), OnMap
         markers.values.forEach { builder.include(it.position); count++ }
         polylines.values.flatMap { it.points }.forEach { builder.include(it); count++ }
         polygons.values.flatMap { it.points }.forEach { builder.include(it); count++ }
-        polygons.values.flatMap { it.points }.forEach { builder.include(it); count++ }
         if (count == 0) return false
         post {
             if (width > 0 && height > 0) {

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

@@ -21,6 +21,9 @@ import android.widget.FrameLayout
 import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.TextView
+import androidx.core.view.AccessibilityDelegateCompat
+import androidx.core.view.ViewCompat
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat
 import androidx.core.content.ContextCompat
 import androidx.security.crypto.EncryptedSharedPreferences
 import androidx.security.crypto.MasterKey
@@ -838,7 +841,17 @@ internal class CraftNativeChrome(context: Context, private val tabs: List<CraftN
             cell.background = rippleBackground()
             cell.contentDescription = tab.title
             cell.tag = "craft-tab-${tab.id}"
+            cell.importantForAccessibility = View.IMPORTANT_FOR_ACCESSIBILITY_YES
+            ViewCompat.setAccessibilityDelegate(cell, object : AccessibilityDelegateCompat() {
+                override fun onInitializeAccessibilityNodeInfo(host: View, info: AccessibilityNodeInfoCompat) {
+                    super.onInitializeAccessibilityNodeInfo(host, info)
+                    info.viewIdResourceName = "craft-tab-${tab.id}"
+                    info.className = android.widget.Button::class.java.name
+                    info.isSelected = host.isSelected
+                }
+            })
             val icon = TextView(context)
+            icon.importantForAccessibility = View.IMPORTANT_FOR_ACCESSIBILITY_NO
             icon.text = CraftNativeSymbols.glyph(tab.symbol)
             icon.textSize = 22f
             icon.minWidth = dp(26)
@@ -846,6 +859,7 @@ internal class CraftNativeChrome(context: Context, private val tabs: List<CraftN
             icon.gravity = Gravity.CENTER
             icon.includeFontPadding = false
             val label = TextView(context)
+            label.importantForAccessibility = View.IMPORTANT_FOR_ACCESSIBILITY_NO
             label.text = tab.title
             label.textSize = 12f
             label.fontFeatureSettings = "tnum"
@@ -1234,6 +1248,7 @@ internal object CraftNativeSymbols {
  * transfer finishes on its own; the next keep answers from the copy.
  */
 internal object CraftNativeMedia {
+    const val ATTEMPT_SETTLED = "craft.media.attemptSettled"
     private const val TAG = "craft-media"
     private const val PREFS = "craft.media"
     private val lock = Any()
@@ -1301,7 +1316,7 @@ internal object CraftNativeMedia {
             try {
                 if (generation(app) == started) {
                     val pending = work.getWorkInfosForUniqueWork(name).get().any {
-                        "$TAG:generation:$started" in it.tags &&
+                        "$TAG:generation:$started" in it.tags && !it.progress.getBoolean(ATTEMPT_SETTLED, false) &&
                             (it.state == androidx.work.WorkInfo.State.RUNNING ||
                                 (it.state == androidx.work.WorkInfo.State.ENQUEUED && it.runAttemptCount == 0))
                     }
@@ -1349,12 +1364,22 @@ internal object CraftNativeMedia {
      * file where it stopped, moves it into place whole, and answers whoever
      * waits. RETRY leaves the part file for the next attempt.
      */
-    fun transfer(context: Context, address: String, headers: JSONObject, started: Int, attempt: Int, stopped: () -> Boolean): Outcome {
+    fun transfer(context: Context, address: String, headers: JSONObject, started: Int, attempt: Int, beforeAnswer: () -> Unit = {}, stopped: () -> Boolean): Outcome {
+        fun answer(result: CraftNativeCapabilityResult) {
+            // The callback can immediately call keep again. Publish completion
+            // before that callback, while WorkManager may still say RUNNING.
+            synchronized(lock) {
+                // A keep registered after this marker belongs to the next
+                // attempt; it must not enter the old callback batch.
+                beforeAnswer()
+                deliver(context, address, started, result)
+            }
+        }
         // clear() already answered the old generation's waiters. Never answer
         // a new athlete's waiters from an obsolete worker for the same URL.
         if (generation(context) != started) return Outcome.DONE
         local(context, address)?.let {
-            deliver(context, address, started, CraftNativeCapabilityResult(data = describe(address, it)))
+            answer(CraftNativeCapabilityResult(data = describe(address, it)))
             return Outcome.DONE
         }
         val writer = writers.getOrPut(address) { Any() }
@@ -1364,7 +1389,7 @@ internal object CraftNativeMedia {
             if (generation(context) != started) return Outcome.DONE
             if (stopped()) return Outcome.RETRY
             local(context, address)?.let {
-                deliver(context, address, started, CraftNativeCapabilityResult(data = describe(address, it)))
+                answer(CraftNativeCapabilityResult(data = describe(address, it)))
                 return Outcome.DONE
             }
             val target = file(context, address)
@@ -1383,22 +1408,22 @@ internal object CraftNativeMedia {
                 }
                 if (full) {
                     staging.delete()
-                    deliver(context, address, started, CraftNativeCapabilityResult(code = "NO_SPACE", message = error.message ?: "The phone is out of space"))
+                    answer(CraftNativeCapabilityResult(code = "NO_SPACE", message = error.message ?: "The phone is out of space"))
                     return Outcome.DONE
                 }
                 if (stopped()) return Outcome.RETRY
                 // Lost the connection part way: the part waits for the next attempt.
-                deliver(context, address, started, if (!online(context)) queued(address, "offline") else CraftNativeCapabilityResult(code = if (error is java.net.SocketTimeoutException) "TIMEOUT" else "NETWORK_ERROR", message = error.message ?: "media.keep failed"))
+                answer(if (!online(context)) queued(address, "offline") else CraftNativeCapabilityResult(code = if (error is java.net.SocketTimeoutException) "TIMEOUT" else "NETWORK_ERROR", message = error.message ?: "media.keep failed"))
                 return if (attempt < 8) Outcome.RETRY else Outcome.DONE.also { staging.delete() }
             }
             when (fetched) {
                 is CraftResumableDownload.Fetched.Stopped, is CraftResumableDownload.Fetched.Restart -> return Outcome.RETRY
                 is CraftResumableDownload.Fetched.Refused -> {
-                    deliver(context, address, started, CraftNativeCapabilityResult(data = JSONObject().put("ok", false).put("url", address).put("status", fetched.status)))
+                    answer(CraftNativeCapabilityResult(data = JSONObject().put("ok", false).put("url", address).put("status", fetched.status)))
                     return Outcome.DONE
                 }
                 is CraftResumableDownload.Fetched.Incomplete -> {
-                    deliver(context, address, started, CraftNativeCapabilityResult(code = "NETWORK_ERROR", message = "media.keep received an incomplete file"))
+                    answer(CraftNativeCapabilityResult(code = "NETWORK_ERROR", message = "media.keep received an incomplete file"))
                     return if (attempt < 8) Outcome.RETRY else Outcome.DONE.also { staging.delete() }
                 }
                 is CraftResumableDownload.Fetched.Complete -> Unit
@@ -1410,11 +1435,11 @@ internal object CraftNativeMedia {
                 }
                 target.delete()
                 if (!staging.renameTo(target)) {
-                    deliver(context, address, started, CraftNativeCapabilityResult(code = "IO_ERROR", message = "media.keep could not store the file"))
+                    answer(CraftNativeCapabilityResult(code = "IO_ERROR", message = "media.keep could not store the file"))
                     return Outcome.DONE
                 }
             }
-            deliver(context, address, started, CraftNativeCapabilityResult(data = describe(address, target)))
+            answer(CraftNativeCapabilityResult(data = describe(address, target)))
             return Outcome.DONE
         }
     }
@@ -1432,13 +1457,13 @@ internal object CraftNativeMedia {
         capabilities?.hasCapability(android.net.NetworkCapabilities.NET_CAPABILITY_INTERNET) == true
     }.getOrDefault(true)
 
-    /** Removes every copy whose address is not in `keep`, and stops their transfers; answers how many files went. */
+    /** Removes idle copies outside `keep` and cancels their jobs; pending keeps retain ownership. */
     fun prune(context: Context, keep: List<String>): Int {
         val wanted = keep.map { digest(it) }.toSet()
         var removed = 0
-        // A keep still waiting owns its address's files and its transfer until it is answered.
-        val active = synchronized(lock) { waiting.keys.map { digest(it) }.toSet() }
         synchronized(lock) {
+            // A keep still waiting owns its files until it is answered.
+            val active = waiting.keys.map { digest(it) }.toSet()
             root(context).listFiles()?.forEach { file ->
                 val owner = file.name.substringBefore('.')
                 // Part files from before transfers resumed (`<sha>.<ext>.<id>.part`) are never picked up again.
@@ -1451,8 +1476,16 @@ internal object CraftNativeMedia {
             runCatching {
                 androidx.work.WorkManager.getInstance(app).getWorkInfosByTag(TAG).get()
                     .filter { !it.state.isFinished }
-                    .filter { info -> info.tags.none { it.startsWith("$TAG:") && it.removePrefix("$TAG:").let { owner -> owner in wanted || owner in active } } }
-                    .forEach { androidx.work.WorkManager.getInstance(app).cancelWorkById(it.id) }
+                    .forEach { info ->
+                        synchronized(lock) {
+                            // The query runs asynchronously: a new keep may now
+                            // own an address that was idle when prune was called.
+                            val active = waiting.keys.map { digest(it) }.toSet()
+                            if (info.tags.none { it.startsWith("$TAG:") && it.removePrefix("$TAG:") in wanted + active }) {
+                                androidx.work.WorkManager.getInstance(app).cancelWorkById(info.id)
+                            }
+                        }
+                    }
             }
         }
         return removed
@@ -1470,9 +1503,10 @@ internal object CraftNativeMedia {
             root(context).listFiles()?.forEach { file ->
                 if (file.delete()) removed++ else failure = java.io.IOException("The video cache could not be cleared")
             }
+            // Schedule cancellation before a new generation can enqueue its work.
+            androidx.work.WorkManager.getInstance(context.applicationContext).cancelAllWorkByTag(TAG)
             callbacks
         }
-        androidx.work.WorkManager.getInstance(context.applicationContext).cancelAllWorkByTag(TAG)
         main.post { answered.forEach { it.answer(CraftNativeCapabilityResult(code = "CANCELLED", message = "The video cache was cleared")) } }
         failure?.let { throw it }
         return removed
@@ -1511,12 +1545,10 @@ internal class CraftResumableDownload(
         if (have > 0) connection.setRequestProperty("Range", "bytes=$have-")
         try {
             val status = connection.responseCode
-            // Part of a file nobody asked a part of: not something to keep.
-            if (status == 206 && have == 0L) return Fetched.Refused(status)
             val resumed = status == 206 && have > 0 && rangeStart(connection.getHeaderField("Content-Range")) == have
             if (status == 416 || (status == 206 && !resumed)) {
                 part.delete()
-                return Fetched.Restart
+                return if (have > 0) Fetched.Restart else Fetched.Refused(status)
             }
             if (status != 200 && !resumed) {
                 part.delete()
@@ -1539,8 +1571,8 @@ internal class CraftResumableDownload(
             // HttpURLConnection inflates gzip itself; a Content-Length is then the compressed size.
             val encoded = connection.getHeaderField("Content-Encoding") != null
             if (size <= 0 || (!encoded && total >= 0 && size != total)) {
-                // Longer than the file says it is: nothing to resume from.
-                if (total in 0 until size) part.delete()
+                // Empty or longer than the file says: nothing useful to resume.
+                if (size <= 0 || total in 0 until size) part.delete()
                 return Fetched.Incomplete
             }
             return Fetched.Complete(size)
@@ -1563,8 +1595,21 @@ internal class CraftNativeMediaWorker(context: Context, parameters: androidx.wor
     override fun doWork(): Result {
         val address = inputData.getString("address") ?: return Result.failure()
         val headers = runCatching { JSONObject(inputData.getString("headers") ?: "{}") }.getOrDefault(JSONObject())
-        val outcome = CraftNativeMedia.transfer(applicationContext, address, headers, inputData.getInt("generation", 0), runAttemptCount) { isStopped }
-        return if (outcome == CraftNativeMedia.Outcome.RETRY) Result.retry() else Result.success()
+        val started = inputData.getInt("generation", 0)
+        return try {
+            setProgressAsync(androidx.work.workDataOf(CraftNativeMedia.ATTEMPT_SETTLED to false)).get()
+            val outcome = CraftNativeMedia.transfer(applicationContext, address, headers, started, runAttemptCount,
+                beforeAnswer = { setProgressAsync(androidx.work.workDataOf(CraftNativeMedia.ATTEMPT_SETTLED to true)).get() }
+            ) { isStopped }
+            if (outcome == CraftNativeMedia.Outcome.RETRY) Result.retry() else Result.success()
+        } catch (error: Exception) {
+            if (error is InterruptedException) Thread.currentThread().interrupt()
+            // A replacement owns the address's new waiters. A real progress
+            // storage failure still needs an answer instead of a lost callback.
+            if (!isStopped) CraftNativeMedia.deliver(applicationContext, address, started,
+                CraftNativeCapabilityResult(code = "IO_ERROR", message = error.message ?: "media.keep could not store worker progress"))
+            if (isStopped) Result.retry() else Result.failure()
+        }
     }
 }
 

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

@@ -1136,9 +1136,9 @@ internal class CraftNativeFlexLayout(context: Context) : LinearLayout(context) {
         val rowHeights = if (gridRows != null) {
             val count = max(gridRows ?: 0, naturalRowHeights.size)
             while (rows.size < count) rows.add(mutableListOf())
-            val available = max(0f, height - paddingTop - paddingBottom - max(0, count - 1) * rowGap)
+            val available = max(0f, (height - paddingTop - paddingBottom).toFloat() - max(0, count - 1) * rowGap)
             val equal = available / max(1, count).toFloat()
-            (naturalRowHeights + List(count - naturalRowHeights.size) { equal })
+            (naturalRowHeights + List(count - naturalRowHeights.size) { 0f })
                 .map { max(it, equal) }
         } else naturalRowHeights
         return GridLayout(rows, absolute, cellWidth, rowHeights)
@@ -1438,12 +1438,12 @@ internal class CraftNativeFlexLayout(context: Context) : LinearLayout(context) {
             put(base, 26, node.padding[3].toFloat())
             put(base, 27, node.padding[0].toFloat())
             putEnum(base, 28, if (node.grid) 1 else 0)
-            put(base, 29, node.gridColumns.toFloat())
+            putEnum(base, 29, node.gridColumns)
             put(base, 30, node.rowGap)
             put(base, 31, node.columnGap)
             if (fields >= 33) putEnum(base, 32, (if (node.reverse) 1 else 0) or (if (node.wrapReverse) 2 else 0))
             if (autoRowsAware) put(base, 33, sharedLength(node.gridAutoRows, contentHeight))
-            if (explicitRowsAware) put(base, 34, (node.gridRows ?: 0).toFloat())
+            if (explicitRowsAware) putEnum(base, 34, node.gridRows ?: 0)
             val firstChild = cursor
             node.children.forEach { child -> write(child, contentWidth, contentHeight, false, node.direction) }
             treeMeta[index * 2] = firstChild.toFloat()
@@ -1527,7 +1527,7 @@ internal class CraftNativeFlexLayout(context: Context) : LinearLayout(context) {
             put(base, 26, padding[3].toFloat())
             put(base, 27, padding[0].toFloat())
             putEnum(base, 28, 0)
-            put(base, 29, 1f)
+            putEnum(base, 29, 1)
             put(base, 30, if (root) rowGapValue else 0f)
             put(base, 31, if (root) columnGapValue else 0f)
         }

package/dist/cli.js

@@ -2842,7 +2842,7 @@ function pinCraftNativeDependency(packagePath, craftVersion) {
 `);
 }
 // package.json
-var version = "0.0.251";
+var version = "0.0.254";
 
 // bin/cli.ts
 var spawnedFrom = process6.env[CRAFT_CLI_SPAWN_MARKER];

package/dist/index.cjs

@@ -373,7 +373,7 @@ function craftBinaryNotFoundMessage(triedPath) {
 `);
 }
 // package.json
-var version = "0.0.251";
+var version = "0.0.254";
 
 // src/sdk-version.ts
 var SDK_VERSION = version;

package/dist/index.js

@@ -117,7 +117,7 @@ function craftBinaryNotFoundMessage(triedPath) {
 `);
 }
 // package.json
-var version = "0.0.251";
+var version = "0.0.254";
 
 // src/sdk-version.ts
 var SDK_VERSION = version;

package/dist/ios/templates/CraftHybrid.swift

@@ -2080,7 +2080,14 @@ final class CraftHybridController: UIViewController, UINavigationControllerDeleg
     /// The edge swipe goes ahead of the web view's own gestures, which
     /// otherwise hold every touch over the page until the page has answered it.
     func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer) -> Bool {
-        gestureRecognizer === visibleStack?.interactivePopGestureRecognizer
+        if gestureRecognizer === visibleStack?.interactivePopGestureRecognizer { return true }
+        guard tabSwipeRecognizers.contains(where: { $0 === gestureRecognizer }),
+              let scroll = otherGestureRecognizer.view as? UIScrollView,
+              otherGestureRecognizer === scroll.panGestureRecognizer,
+              scroll.isScrollEnabled else { return false }
+        // A vertical list must not suppress the shell's horizontal tab pan.
+        // Horizontal content keeps ownership of its own drag instead.
+        return !scroll.alwaysBounceHorizontal && scroll.contentSize.width <= scroll.bounds.width + 1
     }
 
     func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldBeRequiredToFailBy otherGestureRecognizer: UIGestureRecognizer) -> Bool {

package/dist/ios/templates/CraftNativeFlatList.swift

@@ -371,24 +371,9 @@ final class CraftNativeFlatList: UICollectionView, UICollectionViewDelegateFlowL
     @objc private func keyboardTap() {
         guard keyboardShouldPersistTaps != "always" else { return }
         let point = keyboardTapGesture.location(in: self)
-        var hit = hitTest(point, with: nil)
-        var onControl = false
-        var onButton = false
-        while let view = hit, view !== self {
-            if view is UIButton { onButton = true }
-            if view is UIControl || !(view.gestureRecognizers ?? []).isEmpty { onControl = true; break }
-            hit = view.superview
+        craftHandleKeyboardTap(in: self, hit: hitTest(point, with: nil), persistTaps: keyboardShouldPersistTaps) {
+            self.craftScreenController?.forgetFocusedInput()
         }
-        if keyboardShouldPersistTaps == "handled", onControl { return }
-        // A button keeps the keyboard: its press gives the focus straight
-        // back. Ending editing first only let the keyboard's inset go while
-        // the finger was down, the button moved out from under it, and the
-        // press was lost.
-        if onButton { return }
-        // Otherwise the keyboard goes; after a tap on nothing, for good (the
-        // next render must not bring the last input back).
-        if !onControl { craftScreenController?.forgetFocusedInput() }
-        window?.endEditing(true)
     }
 
     func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer) -> Bool {

package/dist/ios/templates/CraftNativeScreen.swift

@@ -3954,6 +3954,23 @@ func craftScrollGesture(_ gesture: UIGestureRecognizer, runsWith other: UIGestur
     return false
 }
 
+/// Scroll containers observe taps without cancelling native input focus or
+/// selection. Text views are not UIControls, and their selection subviews may
+/// have recognizers of their own, so inspect the whole ancestor chain.
+func craftHandleKeyboardTap(in container: UIView, hit: UIView?, persistTaps: String, forgetFocus: () -> Void) {
+    guard persistTaps != "always" else { return }
+    var candidate = hit
+    var onControl = false
+    while let view = candidate, view !== container {
+        if view is UITextField || view is UITextView || view is UIButton { return }
+        if view is UIControl || !(view.gestureRecognizers ?? []).isEmpty { onControl = true }
+        candidate = view.superview
+    }
+    if persistTaps == "handled", onControl { return }
+    if !onControl { forgetFocus() }
+    container.window?.endEditing(true)
+}
+
 private final class CraftNativeScrollView: UIScrollView, UIGestureRecognizerDelegate {
     let contentStack = CraftNativeFlowView()
     private let keyboardTapGesture = UITapGestureRecognizer()
@@ -4226,24 +4243,9 @@ private final class CraftNativeScrollView: UIScrollView, UIGestureRecognizerDele
     @objc private func keyboardTap() {
         guard keyboardShouldPersistTaps != "always" else { return }
         let point = keyboardTapGesture.location(in: self)
-        var hit = hitTest(point, with: nil)
-        var onControl = false
-        var onButton = false
-        while let view = hit, view !== self {
-            if view is UIButton { onButton = true }
-            if view is UIControl || !(view.gestureRecognizers ?? []).isEmpty { onControl = true; break }
-            hit = view.superview
-        }
-        if keyboardShouldPersistTaps == "handled", onControl { return }
-        // A button keeps the keyboard: its press gives the focus straight
-        // back. Ending editing first only let the keyboard's inset go while
-        // the finger was down, the button moved out from under it, and the
-        // press was lost.
-        if onButton { return }
-        // Otherwise the keyboard goes; after a tap on nothing, for good (the
-        // next render must not bring the last input back).
-        if !onControl { craftScreenController?.forgetFocusedInput() }
-        window?.endEditing(true)
+        craftHandleKeyboardTap(in: self, hit: hitTest(point, with: nil), persistTaps: keyboardShouldPersistTaps) {
+            self.craftScreenController?.forgetFocusedInput()
+        }
     }
 
     func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer) -> Bool {

package/dist/ios/templates/testing/DriverTests.swift.template

@@ -68,6 +68,26 @@ final class DriverTests: XCTestCase {
         return result
     }
 
+    /// The journey, from the runner's control server, asked for again
+    /// until a minute has passed.
+    ///
+    /// The server is up before the test starts, but a freshly created
+    /// simulator's first request can outlast one wait: the first journey of
+    /// a CI run spent 15s on it and failed before doing anything. XCTWaiter
+    /// reports a timeout instead of failing the test, so a slow first answer
+    /// is retried rather than fatal.
+    func remoteScript(seconds: Double = 60) -> Data? {
+        let end = Date().addingTimeInterval(seconds)
+        repeat {
+            var result: Data?
+            let done = XCTestExpectation(description: "/script")
+            URLSession.shared.dataTask(with: URL(string: control + "/script")!) { data, _, _ in result = data; done.fulfill() }.resume()
+            if XCTWaiter().wait(for: [done], timeout: 15) == .completed, let result, !result.isEmpty { return result }
+            Thread.sleep(forTimeInterval: 1)
+        } while Date() < end
+        return nil
+    }
+
     func post(_ path: String, _ body: Data) {
         if bundledJourney {
             guard path.hasPrefix("/save?"),
@@ -246,7 +266,7 @@ final class DriverTests: XCTestCase {
             bundledJourney = true
             data = try Data(contentsOf: resource)
         } else {
-            data = get("/script")
+            data = remoteScript()
         }
         guard let data, let script = String(data: data, encoding: .utf8) else {
             XCTFail("no script")

package/dist/mobile-media-testing.d.ts

@@ -11,6 +11,8 @@ export interface MobileMediaCacheTestOptions {
     online?: boolean;
     log?: (line: string) => void;
 }
+/** Keep the probe on the complete shipped downloader, including its durable worker. */
+export declare function androidMediaProbeSource(shell: string): string;
 /** Real ENOSPC, cache cleanup, retry, coalescing and offline video decode on an isolated native probe. */
 export declare function verifyMobileMediaCache(options: MobileMediaCacheTestOptions): Promise<{
     platform: string;

package/dist/mobile-testing.js

@@ -37,6 +37,16 @@ ${stderr}`.trim() };
 }
 
 // src/mobile-media-testing.ts
+function androidMediaProbeSource(shell) {
+  return ["internal object CraftNativeMedia", "internal class CraftResumableDownload", "internal class CraftNativeMediaWorker"].map((declaration) => {
+    const source = shell.match(new RegExp(`${declaration}\\b[\\s\\S]*?\\n\\}`))?.[0];
+    if (!source)
+      throw new Error(`Android media implementation missing: ${declaration}`);
+    return source;
+  }).join(`
+
+`);
+}
 async function verifyMobileMediaCache(options) {
   if (options.platform !== "ios" && options.platform !== "android")
     throw new Error("Choose ios or android");
@@ -129,7 +139,7 @@ Connection: close\r
         }
         const empty = path.endsWith("/empty.mp4");
         const partial = path.endsWith("/partial.mp4");
-        const cut = (path.endsWith("/broken.mp4") || path.endsWith("/restart.mp4")) && n === 1;
+        const cut = (path.endsWith("/broken.mp4") || path.endsWith("/retry.mp4") || path.endsWith("/restart.mp4")) && n === 1;
         const slow = path.endsWith("/slow.mp4") || path.endsWith("/restart.mp4") && n === 1;
         socket.write(`HTTP/1.1 ${partial ? "206 Partial Content" : "200 OK"}\r
 Content-Type: video/mp4\r
@@ -250,12 +260,7 @@ ${await Bun.file(join(fixtures, "media-cache.swift.fixture")).text()}`);
       if (!/^emulator-\d+$/.test(serial))
         throw new Error("Select a disposable Android emulator with ANDROID_SERIAL");
       const shell = await Bun.file(join(root, "android/templates/CraftNativeShell.kt.template")).text();
-      const pieces = ["internal object CraftNativeMedia {", "internal class CraftResumableDownload(", "internal class CraftNativeMediaWorker("].map((start) => shell.match(new RegExp(`${start.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}[\\s\\S]*?\\n\\}`))?.[0]);
-      if (pieces.some((piece) => !piece))
-        throw new Error("Android media implementation missing");
-      const media = pieces.join(`
-
-`);
+      const media = androidMediaProbeSource(shell);
       const android = join(scratch, "android");
       const app = join(android, "app");
       const sources = join(app, "src/main/java/dev/craft/mediaprobe");
@@ -267,9 +272,9 @@ include(":app")`);
       await Bun.write(join(android, "build.gradle.kts"), 'plugins { id("com.android.application") version "8.9.1" apply false; id("org.jetbrains.kotlin.android") version "2.0.21" apply false }');
       await Bun.write(join(android, "local.properties"), `sdk.dir=${sdk}
 `);
-      await Bun.write(join(android, "gradle.properties"), `org.gradle.jvmargs=-Xmx768m
+      await Bun.write(join(android, "gradle.properties"), `android.useAndroidX=true
+org.gradle.jvmargs=-Xmx768m
 org.gradle.workers.max=2
-android.useAndroidX=true
 `);
       await Bun.write(join(app, "build.gradle.kts"), `plugins { id("com.android.application");
   id("org.jetbrains.kotlin.android") }
@@ -291,8 +296,8 @@ import android.os.Handler
 import android.os.Looper
 import org.json.JSONObject
 import java.io.File
-import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.Executors
+import java.util.concurrent.ConcurrentHashMap
 internal data class CraftNativeCapabilityResult(val data: Any? = null, val code: String? = null, val message: String? = null)
 ${media}
 ${await Bun.file(join(fixtures, "media-cache.kt")).text()}`);
@@ -327,6 +332,10 @@ ${await Bun.file(join(fixtures, "media-cache.kt")).text()}`);
         if (counts.get("/android/restart.mp4") !== 1)
           throw new Error("Android process did not start interrupted download");
         await probe("recover");
+        if (counts.get("/android/retry.mp4") !== 2)
+          throw new Error("Android explicit retry did not fetch once more immediately");
+        if (counts.get("/android/settled.mp4") !== 1)
+          throw new Error("Android explicit keep did not replace the settled running attempt exactly once");
         if (!resumed.has("/android/restart.mp4"))
           throw new Error("Android did not resume the interrupted download from its part file");
         if (counts.get("/android/slow.mp4") !== 1)

package/dist/testing/media-cache/media-cache.kt

@@ -1,3 +1,14 @@
+/** Holds a completed attempt in RUNNING, before WorkManager commits its result. */
+class SettledMediaAttemptWorker(context: Context, parameters: androidx.work.WorkerParameters) : androidx.work.Worker(context, parameters) {
+    private val released = java.util.concurrent.CountDownLatch(1)
+    override fun doWork(): Result {
+        setProgressAsync(androidx.work.workDataOf("craft.media.attemptSettled" to true)).get()
+        released.await(30, java.util.concurrent.TimeUnit.SECONDS)
+        return Result.retry()
+    }
+    override fun onStopped() { released.countDown() }
+}
+
 class DownloadProbe : android.app.Instrumentation() {
     override fun onCreate(arguments: android.os.Bundle?) {
         super.onCreate(arguments)
@@ -23,6 +34,13 @@ class DownloadProbe : android.app.Instrumentation() {
         check(done.await(25, java.util.concurrent.TimeUnit.SECONDS), "operation settled")
         return ok
     }
+    private fun awaitCached(address: String) {
+        // The worker authors a 30-second first retry. Allow that backoff plus
+        // the existing 25-second transfer budget, without issuing another keep.
+        val until = System.currentTimeMillis() + 60000
+        while (CraftNativeMedia.local(targetContext, address) == null && System.currentTimeMillis() < until) Thread.sleep(25)
+        check(CraftNativeMedia.local(targetContext, address) != null, "the durable worker recovers the complete file without another keep")
+    }
     override fun onStart() {
         val result = android.os.Bundle()
         try {
@@ -80,10 +98,11 @@ class DownloadProbe : android.app.Instrumentation() {
                     val until = System.currentTimeMillis() + 25000
                     while (!partial() && System.currentTimeMillis() < until) Thread.sleep(25)
                     check(partial(), "download is in progress before process death")
+                    check(CraftNativeMedia.local(targetContext, restart) == null, "interrupted process never published a partial video")
                     android.os.Process.killProcess(android.os.Process.myPid())
                 }
                 "recover" -> {
-                    check(CraftNativeMedia.local(targetContext, restart) == null, "interrupted process never published a partial video")
+                    awaitCached(restart)
                     check(keep(restart), "retry after process death downloads a complete video")
                     val media = android.media.MediaMetadataRetriever()
                     try {
@@ -98,12 +117,34 @@ class DownloadProbe : android.app.Instrumentation() {
                     check(!keep(broken), "truncated transfer fails")
                     check(CraftNativeMedia.local(targetContext, broken) == null, "truncated transfer is not playable cache")
                     val root = CraftNativeMedia.file(targetContext, broken).parentFile!!
-                    val brokenTarget = CraftNativeMedia.file(targetContext, broken)
-                    check(root.listFiles()?.none { it.name.endsWith(".part") && it.name != "${brokenTarget.name}.part" } != false, "a failed transfer leaves only its own part, to resume")
-                    check(keep(broken), "same URL retries successfully, at once")
-                    check(root.listFiles()?.none { it.name.endsWith(".part") } != false, "a finished transfer leaves no staging files")
-                    val queued = "$base/queued.mp4"
+                    check(CraftNativeMedia.part(targetContext, broken).length() > 0, "a truncated transfer retains bytes for resumption")
+                    awaitCached(broken)
+                    check(keep(broken), "same URL retries successfully")
+                    val retry = "$base/retry.mp4"
+                    check(!keep(retry), "a separate interrupted transfer reports its failure")
+                    check(keep(retry), "an explicit retry runs immediately, without waiting for backoff")
+                    check(root.listFiles()?.none { it.name.endsWith(".part") } != false, "finished retries leave no staging files")
                     val work = androidx.work.WorkManager.getInstance(targetContext)
+                    val settled = "$base/settled.mp4"
+                    val settledName = "craft-media:${CraftNativeMedia.digest(settled)}:any"
+                    val settledRequest = androidx.work.OneTimeWorkRequestBuilder<SettledMediaAttemptWorker>()
+                        .addTag("craft-media").addTag("craft-media:${CraftNativeMedia.digest(settled)}")
+                        .addTag("craft-media:generation:${CraftNativeMedia.generation(targetContext)}").build()
+                    work.enqueueUniqueWork(settledName, androidx.work.ExistingWorkPolicy.KEEP, settledRequest).result.get()
+                    val settledDeadline = System.currentTimeMillis() + 10000
+                    var settledInfo = work.getWorkInfoById(settledRequest.id).get()!!
+                    while ((settledInfo.state != androidx.work.WorkInfo.State.RUNNING || !settledInfo.progress.getBoolean("craft.media.attemptSettled", false)) && System.currentTimeMillis() < settledDeadline) {
+                        Thread.sleep(25)
+                        settledInfo = work.getWorkInfoById(settledRequest.id).get()!!
+                    }
+                    check(settledInfo.state == androidx.work.WorkInfo.State.RUNNING && settledInfo.progress.getBoolean("craft.media.attemptSettled", false), "the settled attempt still has WorkManager's running identity")
+                    check(keep(settled), "an explicit keep replaces a settled running attempt immediately")
+                    // REPLACE can prune the old WorkSpec. Inspect the current
+                    // unique chain rather than requiring the removed row.
+                    val replacement = work.getWorkInfosForUniqueWork(settledName).get()
+                    check(replacement.size == 1 && replacement.single().id != settledRequest.id && replacement.single().state != androidx.work.WorkInfo.State.CANCELLED, "the settled work identity was replaced, not joined")
+
+                    val queued = "$base/queued.mp4"
                     val queuedName = "craft-media:${CraftNativeMedia.digest(queued)}:any"
                     val queuedRequest = androidx.work.OneTimeWorkRequestBuilder<CraftNativeMediaWorker>()
                         .setInitialDelay(10, java.util.concurrent.TimeUnit.SECONDS)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "craft-native",
-  "version": "0.0.251",
+  "version": "0.0.254",
   "type": "module",
   "description": "Build desktop apps with web languages - TypeScript SDK for Craft",
   "author": "Chris Breuer <chris@stacksjs.org>",