craft-native 0.0.262 → 0.0.276

package/README.md

@@ -646,3 +646,25 @@ An explicit discard may ACK the captured old ID only after a fresh committed
 native read proves that its previously registered intent was deleted or
 replaced. A cached missing draft or an unsuccessful initial registration is
 not evidence of deletion.
+
+### Browser lifecycle
+
+`createBrowserPlatform()` from `craft-native/browser` supplies
+`craft.lifecycle.getState()` and `onStateChange(callback)` (also `onChange`).
+States are `active` and `background`. The host emits the native-compatible
+`APP_STATE { state }` event on visibility changes and page cache navigation,
+coalesces duplicate transitions, and releases listeners in `dispose()`.
+This lets browser simulations checkpoint on backgrounding with the same contract
+as a native shell. Storage failures must still be handled by the caller.
+
+Await `platform.call('Storage', 'set', [key, value], signal)` before reporting
+a saved checkpoint. `craft.storage.setSync` updates the immediate UI cache and
+queues its write when Web Locks are available; it cannot acknowledge durability
+or propagate a later quota failure. Background events are an opportunity to
+checkpoint, but browsers can terminate a page before queued work finishes, so
+also save periodically during play.
+
+Browser audio assigns one owner per sound ID. A newer play or stop invalidates
+pending media resolution for that ID; stopping all sounds, changing accounts,
+aborting a call or disposing the host also releases active audio. Superseded
+play calls reject with `AbortError`.

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

@@ -16,6 +16,8 @@ internal class CraftNativeMapView(context: Context) : FrameLayout(context), OnMa
     private var pendingChildren = JSONArray()
     private var styleKey: String? = null
     private var styleVersion = 0
+    /** The prefix of a style key that is a vector style's URL, not raster style JSON. */
+    private val vectorStylePrefix = "uri:"
     private var readyStyle: Style? = null
     private var initialCameraKey: String? = null
     private var reportedRegion: LatLngBounds? = null
@@ -146,7 +148,10 @@ internal class CraftNativeMapView(context: Context) : FrameLayout(context), OnMa
             styleKey = nextStyle
             readyStyle = null
             val version = ++styleVersion
-            nativeMap.setStyle(Style.Builder().fromJson(nextStyle)) { loaded ->
+            // A vector style (the standard basemap) loads from its URL; the
+            // raster ones are composed here as style JSON.
+            val builder = if (nextStyle.startsWith(vectorStylePrefix)) Style.Builder().fromUri(nextStyle.removePrefix(vectorStylePrefix)) else Style.Builder().fromJson(nextStyle)
+            nativeMap.setStyle(builder) { loaded ->
                 if (!destroyed && version == styleVersion) {
                     readyStyle = loaded
                     installOverlays(loaded)
@@ -183,6 +188,20 @@ internal class CraftNativeMapView(context: Context) : FrameLayout(context), OnMa
     }
 
     private fun basemapStyle(): String {
+        // `basemap`: the named presets, drawn as well as each can be here.
+        // Standard is OpenFreeMap's vector style - sharp at any density, no
+        // key - where it was raster tiles from tile.openstreetmap.org, whose
+        // policy does not allow an app's traffic. Outdoors is topography with
+        // contours; satellite and hybrid are Esri imagery.
+        when (pendingProps.optString("basemap", "").lowercase()) {
+            "standard" -> {
+                attribution.text = "OpenFreeMap © OpenMapTiles · Data © OpenStreetMap contributors"
+                return vectorStylePrefix + "https://tiles.openfreemap.org/styles/liberty"
+            }
+            "outdoors" -> return rasterStyle("https://server.arcgisonline.com/ArcGIS/rest/services/World_Topo_Map/MapServer/tile/{z}/{y}/{x}", "Topography: Esri, USGS, NOAA, OpenStreetMap contributors", labels = false)
+            "satellite" -> return rasterStyle("https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}", "Imagery © Esri, Maxar, Earthstar Geographics, and the GIS User Community", labels = false)
+            "hybrid" -> return rasterStyle("https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}", "Imagery © Esri, Maxar, Earthstar Geographics, and the GIS User Community", labels = true)
+        }
         val custom = pendingProps.optJSONObject("tileOverlay")
         val template = custom?.optString("urlTemplate").orEmpty()
         val credit = custom?.optString("attribution").orEmpty()
@@ -212,6 +231,18 @@ internal class CraftNativeMapView(context: Context) : FrameLayout(context), OnMa
         return JSONObject().put("version", 8).put("sources", sources).put("layers", layers).toString()
     }
 
+    private fun rasterStyle(url: String, credit: String, labels: Boolean): String {
+        val sources = JSONObject().put("basemap", rasterSource(url, credit))
+        val layers = JSONArray().put(JSONObject().put("id", "basemap").put("type", "raster").put("source", "basemap"))
+        attribution.text = credit
+        if (labels) {
+            sources.put("labels", rasterSource("https://services.arcgisonline.com/ArcGIS/rest/services/Reference/World_Boundaries_and_Places/MapServer/tile/{z}/{y}/{x}", "Labels © Esri"))
+            layers.put(JSONObject().put("id", "labels").put("type", "raster").put("source", "labels"))
+            attribution.text = "$credit · Labels © Esri"
+        }
+        return JSONObject().put("version", 8).put("sources", sources).put("layers", layers).toString()
+    }
+
     private fun rasterSource(url: String, credit: String): JSONObject = JSONObject()
         .put("type", "raster").put("tiles", JSONArray().put(url)).put("tileSize", 256).put("maxzoom", 19).put("attribution", credit)
 

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

@@ -309,6 +309,8 @@ class CraftNativeMutationDocument {
             "View", "SafeAreaView", "ScrollView", "KeyboardAvoidingView", "Modal", "Pressable",
             "TouchableOpacity", "TouchableHighlight", "ImageBackground", "FlatList", "SectionList",
             "Fragment", "Svg", "G", "Map",
+            // A shape holds its `Animate`: SMIL keyframes.
+            "Path", "Line", "Rect", "Circle", "Ellipse", "Polyline", "Polygon",
         )
     }
 

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

@@ -351,10 +351,131 @@ private class CraftNativeSvgView(context: Context) : View(context) {
     var drawing: JSONObject = JSONObject()
         set(value) {
             field = value
+            animates = hasAnimation(value.optJSONArray("children"))
             invalidate()
             requestLayout()
+            updateFrames()
         }
 
+    /** Whether a shape carries keyframes (SMIL `<animate attributeName="d">`, stx's `Animate`). */
+    private var animates = false
+    /** When this drawing's repetition began (System.nanoTime), 0 while still. */
+    private var animationStart = 0L
+    private var frameScheduled = false
+    private val frameCallback = android.view.Choreographer.FrameCallback { nextFrame() }
+
+    /** Moving now: shown, and animations are on (off is Android's reduced motion). */
+    val isAnimating: Boolean
+        get() = animates && isAttachedToWindow && isShown && ValueAnimator.areAnimatorsEnabled()
+
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+        updateFrames()
+    }
+
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+        updateFrames()
+    }
+
+    override fun onVisibilityChanged(changedView: View, visibility: Int) {
+        super.onVisibilityChanged(changedView, visibility)
+        updateFrames()
+    }
+
+    /** One frame at a time from the display (Choreographer) while moving; none while still or away. */
+    private fun updateFrames() {
+        if (isAnimating) {
+            if (animationStart == 0L) animationStart = System.nanoTime()
+            if (!frameScheduled) {
+                frameScheduled = true
+                android.view.Choreographer.getInstance().postFrameCallback(frameCallback)
+            }
+        } else {
+            animationStart = 0L
+            if (frameScheduled) {
+                frameScheduled = false
+                android.view.Choreographer.getInstance().removeFrameCallback(frameCallback)
+            }
+        }
+    }
+
+    private fun nextFrame() {
+        frameScheduled = false
+        if (!isAnimating) return updateFrames()
+        // Drawn only while some of it is on screen; a row scrolled away keeps its time.
+        if (getLocalVisibleRect(android.graphics.Rect())) invalidate()
+        frameScheduled = true
+        android.view.Choreographer.getInstance().postFrameCallback(frameCallback)
+    }
+
+    private fun hasAnimation(children: JSONArray?): Boolean {
+        if (children == null) return false
+        return (0 until children.length()).any { index ->
+            val node = children.optJSONObject(index) ?: return@any false
+            if (node.optString("type") == "Animate") node.optJSONObject("props")?.has("frames") == true
+            else hasAnimation(node.optJSONArray("children"))
+        }
+    }
+
+    /** A shape's outline now: between its keyframes while moving, else its own. */
+    private fun outline(node: JSONObject): List<Float>? {
+        if (isAnimating && animationStart != 0L) {
+            val children = node.optJSONArray("children")
+            val animate = children?.let { list -> (0 until list.length()).mapNotNull { list.optJSONObject(it) }.firstOrNull { it.optString("type") == "Animate" } }
+            animate?.optJSONObject("props")?.let { keyframe(it, (System.nanoTime() - animationStart) / 1e9) }?.let { return it }
+        }
+        val geometry = node.optJSONObject("props")?.optJSONArray("geometry") ?: return null
+        return (0 until geometry.length()).map { craftNativeNumber(geometry.opt(it))?.toFloat() ?: Float.NaN }
+    }
+
+    companion object {
+        /**
+         * The outline `elapsed` seconds into an `Animate`'s repetitions, between
+         * the keyframes either side of now (SMIL's linear `calcMode`); null when
+         * it does not animate path data or its repetitions are over.
+         */
+        fun keyframe(props: JSONObject, elapsed: Double): List<Float>? {
+            if (props.optString("attributeName") != "d" || elapsed < 0) return null
+            val duration = craftNativeNumber(props.opt("duration"))?.takeIf { it.isFinite() && it > 0 } ?: return null
+            val raw = props.optJSONArray("frames") ?: return null
+            val frames = (0 until raw.length()).mapNotNull { index ->
+                raw.optJSONArray(index)?.let { frame -> (0 until frame.length()).map { craftNativeNumber(frame.opt(it))?.toFloat() ?: Float.NaN } }
+            }
+            if (frames.size < 2 || frames.size != raw.length()) return null
+            craftNativeNumber(props.opt("repeatCount"))?.let { if (it.isFinite() && elapsed >= it * duration) return null }
+            val given = props.optJSONArray("frameTimes")?.let { times -> (0 until times.length()).mapNotNull { craftNativeNumber(times.opt(it)) } }.orEmpty()
+            val times = if (given.size == frames.size) given else frames.indices.map { it.toDouble() / (frames.size - 1) }
+            val phase = (elapsed % duration) / duration
+            var index = 0
+            while (index < frames.size - 2 && times[index + 1] <= phase) index++
+            val span = times[index + 1] - times[index]
+            val share = if (span > 0) ((phase - times[index]) / span).coerceIn(0.0, 1.0).toFloat() else 0f
+            return interpolate(frames[index], frames[index + 1], share)
+        }
+
+        /** Two outlines with the same commands, a share of the way between; the first when they differ. */
+        fun interpolate(from: List<Float>, to: List<Float>, share: Float): List<Float> {
+            if (from.size != to.size || share <= 0f) return from
+            val out = from.toMutableList()
+            var index = 0
+            while (index < from.size) {
+                if (to[index] != from[index]) return from
+                val count = when (from[index].toInt()) {
+                    0, 1 -> 2
+                    2 -> 6
+                    3 -> 4
+                    4 -> 0
+                    else -> return from
+                }
+                if (index + count >= from.size) return from
+                for (offset in 1..count) out[index + offset] = from[index + offset] + (to[index + offset] - from[index + offset]) * share
+                index += count + 1
+            }
+            return out
+        }
+    }
+
     private data class SvgPaint(
         val fill: String? = "#000000",
         val stroke: String? = null,
@@ -489,25 +610,25 @@ private class CraftNativeSvgView(context: Context) : View(context) {
             when (node.optString("type")) {
                 "G" -> drawNodes(canvas, node.optJSONArray("children") ?: JSONArray(), paint)
                 "SvgText" -> drawText(canvas, node, paint)
+                "Animate" -> Unit
                 else -> drawPath(canvas, node, paint)
             }
         }
     }
 
     private fun drawPath(canvas: Canvas, node: JSONObject, style: SvgPaint) {
-        val props = node.optJSONObject("props") ?: JSONObject()
-        val geometry = props.optJSONArray("geometry") ?: return
-        if ((0 until geometry.length()).any { craftNativeNumber(geometry.opt(it))?.toFloat()?.isFinite() != true }) return
+        val geometry = outline(node) ?: return
+        if (geometry.any { !it.isFinite() }) return
         val path = Path()
         var index = 0
-        while (index < geometry.length()) {
-            val command = craftNativeNumber(geometry.opt(index))?.toInt() ?: break
-            fun number(offset: Int): Float = craftNativeNumber(geometry.opt(index + offset))?.toFloat() ?: Float.NaN
+        while (index < geometry.size) {
+            val command = geometry[index].toInt()
+            fun number(offset: Int): Float = geometry[index + offset]
             when (command) {
-                0 -> if (index + 2 < geometry.length()) { path.moveTo(number(1), number(2)); index += 3 } else break
-                1 -> if (index + 2 < geometry.length()) { path.lineTo(number(1), number(2)); index += 3 } else break
-                2 -> if (index + 6 < geometry.length()) { path.cubicTo(number(1), number(2), number(3), number(4), number(5), number(6)); index += 7 } else break
-                3 -> if (index + 4 < geometry.length()) { path.quadTo(number(1), number(2), number(3), number(4)); index += 5 } else break
+                0 -> if (index + 2 < geometry.size) { path.moveTo(number(1), number(2)); index += 3 } else break
+                1 -> if (index + 2 < geometry.size) { path.lineTo(number(1), number(2)); index += 3 } else break
+                2 -> if (index + 6 < geometry.size) { path.cubicTo(number(1), number(2), number(3), number(4), number(5), number(6)); index += 7 } else break
+                3 -> if (index + 4 < geometry.size) { path.quadTo(number(1), number(2), number(3), number(4)); index += 5 } else break
                 4 -> { path.close(); index += 1 }
                 else -> break
             }

package/dist/browser/lifecycle.d.ts

@@ -0,0 +1,7 @@
+export type BrowserAppState = 'active' | 'background';
+/** Browser lifecycle shares the native APP_STATE contract, including bfcache navigation. */
+export declare function createBrowserLifecycle(page: Pick<Document, 'hidden' | 'addEventListener' | 'removeEventListener'>, host: Pick<Window, 'addEventListener' | 'removeEventListener'>, changed: (state: BrowserAppState) => void): {
+    getState: () => BrowserAppState;
+    onStateChange(callback: (state: BrowserAppState) => void): () => void;
+    dispose(): void;
+};

package/dist/browser.js

@@ -1,3 +1,50 @@
+// src/browser/lifecycle.ts
+function createBrowserLifecycle(page, host, changed) {
+  let state = page.hidden ? "background" : "active";
+  const listeners = new Set;
+  let disposed = false;
+  const set = (next) => {
+    if (disposed || state === next)
+      return;
+    state = next;
+    changed(state);
+    for (const listener of [...listeners]) {
+      try {
+        listener(state);
+      } catch (error) {
+        console.error("craft.lifecycle listener failed", error);
+      }
+    }
+  };
+  const visibility = () => set(page.hidden ? "background" : "active");
+  const hide = () => set("background");
+  page.addEventListener("visibilitychange", visibility);
+  host.addEventListener("pagehide", hide);
+  host.addEventListener("pageshow", visibility);
+  return {
+    getState: () => state,
+    onStateChange(callback) {
+      if (typeof callback !== "function")
+        throw new TypeError("lifecycle.onStateChange needs a function");
+      if (disposed)
+        return () => {};
+      listeners.add(callback);
+      return () => {
+        listeners.delete(callback);
+      };
+    },
+    dispose() {
+      if (disposed)
+        return;
+      disposed = true;
+      page.removeEventListener("visibilitychange", visibility);
+      host.removeEventListener("pagehide", hide);
+      host.removeEventListener("pageshow", visibility);
+      listeners.clear();
+    }
+  };
+}
+
 // src/bridge/ids.ts
 function secureUUID() {
   const c = globalThis.crypto;
@@ -377,6 +424,8 @@ async function createBrowserPlatform(options = {}) {
   const files = new Map;
   const mediaURLs = new Map;
   const sounds = new Map;
+  const soundRequests = new Map;
+  const soundCleanup = new Map;
   const fades = new Map;
   const cancelFade = (sound) => {
     const fade = fades.get(sound);
@@ -414,11 +463,12 @@ async function createBrowserPlatform(options = {}) {
     if (!sound)
       return;
     await fade(sound, 0, sound.paused ? 0 : milliseconds);
-    if (sounds.get(id) !== sound)
-      return;
+    soundCleanup.get(sound)?.();
+    soundCleanup.delete(sound);
     sound.pause();
     sound.removeAttribute("src");
-    sounds.delete(id);
+    if (sounds.get(id) === sound)
+      sounds.delete(id);
   };
   const lifetime = new AbortController;
   let account = new AbortController;
@@ -454,6 +504,7 @@ async function createBrowserPlatform(options = {}) {
   const resetAccount = async () => {
     const previousCache = `${namespace}:media:${mediaScope}`;
     account.abort();
+    soundRequests.clear();
     account = new AbortController;
     for (const path of files.keys())
       URL.revokeObjectURL(path);
@@ -462,10 +513,12 @@ async function createBrowserPlatform(options = {}) {
     files.clear();
     mediaURLs.clear();
     for (const audio of sounds.values()) {
+      soundCleanup.get(audio)?.();
       cancelFade(audio);
       audio.pause();
       audio.src = "";
     }
+    soundCleanup.clear();
     sounds.clear();
     await persistence.accountChanged();
     mediaScope = persistence.scope();
@@ -480,7 +533,10 @@ async function createBrowserPlatform(options = {}) {
       });
   };
   window.addEventListener("storage", storageEvent);
-  const capabilityNames = ["storage", "secureStorage", "lifecycle", "dialog", "browser", "linking", "files", "share", "device"];
+  const lifecycle = typeof document !== "undefined" ? createBrowserLifecycle(document, window, (state) => emit("APP_STATE", { state })) : null;
+  const capabilityNames = ["storage", "secureStorage", "dialog", "browser", "linking", "files", "share", "device"];
+  if (lifecycle)
+    capabilityNames.push("lifecycle");
   if (persistence.atomicStorage)
     capabilityNames.push("storageCompareAndSet", "storageSetIfAbsent");
   if (typeof globalThis.crypto?.randomUUID === "function" || typeof globalThis.crypto?.getRandomValues === "function")
@@ -500,6 +556,7 @@ async function createBrowserPlatform(options = {}) {
   const platform = {
     craft: {
       ...persistence.craft,
+      ...lifecycle ? { lifecycle: { getState: lifecycle.getState, onStateChange: lifecycle.onStateChange, onChange: lifecycle.onStateChange } } : {},
       session: {
         key: sessionTokenKey,
         token: () => persistence.craft.secureStorage.getSync(sessionTokenKey),
@@ -755,29 +812,74 @@ async function createBrowserPlatform(options = {}) {
         const id = String(args[0]);
         const sound = sounds.get(id);
         if (method === "play") {
-          await stopSound(id);
-          const audio = new Audio(await platform.resolveMedia(String(args[1])));
-          const settings = object(args[2]);
-          audio.loop = Boolean(settings.loop);
-          const volume = Math.max(0, Math.min(1, Number(settings.volume ?? 1)));
-          audio.volume = Number(settings.fadeIn) > 0 ? 0 : volume;
-          audio.onended = () => {
-            sounds.delete(id);
-            emit("SOUND_EVENT", { id, event: "ended" });
+          const request = {};
+          soundRequests.set(id, request);
+          const current = () => {
+            signal.throwIfAborted();
+            if (soundRequests.get(id) !== request)
+              throw new DOMException("Playback replaced", "AbortError");
           };
-          audio.onerror = () => {
-            sounds.delete(id);
-            emit("SOUND_EVENT", { id, event: "error", message: audio.error?.message });
+          let audio;
+          const release = () => {
+            if (!audio)
+              return;
+            signal.removeEventListener("abort", release);
+            soundCleanup.delete(audio);
+            cancelFade(audio);
+            audio.pause();
+            audio.removeAttribute("src");
+            if (sounds.get(id) === audio)
+              sounds.delete(id);
           };
-          sounds.set(id, audio);
-          await audio.play();
-          fade(audio, volume, Number(settings.fadeIn ?? 0));
-          return true;
+          try {
+            await stopSound(id);
+            current();
+            const url = await platform.resolveMedia(String(args[1]));
+            current();
+            audio = new Audio(url);
+            const settings = object(args[2]);
+            audio.loop = Boolean(settings.loop);
+            const volume = Math.max(0, Math.min(1, Number(settings.volume ?? 1)));
+            audio.volume = Number(settings.fadeIn) > 0 ? 0 : volume;
+            audio.onended = () => {
+              release();
+              if (soundRequests.get(id) === request) {
+                soundRequests.delete(id);
+                emit("SOUND_EVENT", { id, event: "ended" });
+              }
+            };
+            audio.onerror = () => {
+              const message = audio?.error?.message;
+              release();
+              if (soundRequests.get(id) === request) {
+                soundRequests.delete(id);
+                emit("SOUND_EVENT", { id, event: "error", message });
+              }
+            };
+            sounds.set(id, audio);
+            soundCleanup.set(audio, release);
+            signal.addEventListener("abort", release, { once: true });
+            await audio.play();
+            current();
+            fade(audio, volume, Number(settings.fadeIn ?? 0));
+            return true;
+          } catch (error) {
+            release();
+            if (soundRequests.get(id) === request)
+              soundRequests.delete(id);
+            throw error;
+          }
         }
         if (method === "stopAll") {
+          soundRequests.clear();
           await Promise.all([...sounds.keys()].map((key) => stopSound(key, Number(first.fadeOut ?? 0))));
           return true;
         }
+        if (method === "stop") {
+          soundRequests.delete(id);
+          await stopSound(id, Number(object(args[1]).fadeOut ?? 0));
+          return Boolean(sound);
+        }
         if (!sound)
           return false;
         if (method === "pause") {
@@ -788,10 +890,6 @@ async function createBrowserPlatform(options = {}) {
           await sound.play();
           return true;
         }
-        if (method === "stop") {
-          await stopSound(id, Number(object(args[1]).fadeOut ?? 0));
-          return true;
-        }
         if (method === "setVolume") {
           await fade(sound, Number(args[1]), Number(object(args[2]).fade ?? 0));
           return true;
@@ -873,6 +971,8 @@ async function createBrowserPlatform(options = {}) {
       if (disposed)
         return;
       disposed = true;
+      soundRequests.clear();
+      lifecycle?.dispose();
       window.removeEventListener("storage", storageEvent);
       lifetime.abort();
       account.abort();
@@ -883,10 +983,12 @@ async function createBrowserPlatform(options = {}) {
       files.clear();
       mediaURLs.clear();
       for (const audio of sounds.values()) {
+        soundCleanup.get(audio)?.();
         cancelFade(audio);
         audio.pause();
         audio.src = "";
       }
+      soundCleanup.clear();
       sounds.clear();
       wakeLock?.release();
       listeners.clear();

package/dist/cli.js

@@ -2842,7 +2842,7 @@ function pinCraftNativeDependency(packagePath, craftVersion) {
 `);
 }
 // package.json
-var version = "0.0.262";
+var version = "0.0.276";
 
 // 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.262";
+var version = "0.0.276";
 
 // 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.262";
+var version = "0.0.276";
 
 // src/sdk-version.ts
 var SDK_VERSION = version;

package/dist/ios/templates/CraftApp.swift

@@ -797,10 +797,21 @@ final class CraftChrome: ObservableObject {
         tabAccessory = next
     }
 
-    /// A retained or prepared screen cannot clear another screen's chrome.
-    func clearTabAccessory(ownedBy owner: AnyObject) {
+    /// A screen going away gives its accessory up without taking it off the
+    /// bar (a retained or prepared screen cannot clear another's): the screen coming in shows it until it says what it wants. Taken
+    /// off at once, the pill stretched across the bar and back while the
+    /// next screen (Messages, opened from the accessory; a tab opened for the
+    /// first time) started up and set the same accessory again.
+    func releaseTabAccessory(ownedBy owner: AnyObject) {
         guard tabAccessoryOwner === owner else { return }
-        updateTabAccessory(nil)
+        tabAccessoryOwner = nil
+    }
+
+    /// Takes off an accessory nobody claims any more: the screen now showing
+    /// drew without asking for one, or is a page that never does.
+    func clearUnclaimedTabAccessory() {
+        guard tabAccessoryOwner == nil, tabAccessory != nil else { return }
+        tabAccessory = nil
     }
 
     func setHiddenByScreen(_ hidden: Bool) {
@@ -6347,6 +6358,7 @@ struct CraftWebView: UIViewRepresentable {
 
             SecItemDelete(query as CFDictionary)
             let status = SecItemAdd(query as CFDictionary, nil)
+            CraftKeychain.forget(account: key)
             return status == errSecSuccess
         }
 
@@ -6373,12 +6385,14 @@ struct CraftWebView: UIViewRepresentable {
                 kSecAttrAccount as String: key
             ]
             let status = SecItemDelete(query as CFDictionary)
+            CraftKeychain.forget(account: key)
             return status == errSecSuccess || status == errSecItemNotFound
         }
 
         private func secureClear() -> Bool {
             let query: [String: Any] = [kSecClass as String: kSecClassGenericPassword]
             let status = SecItemDelete(query as CFDictionary)
+            CraftKeychain.forget(account: nil)
             return status == errSecSuccess || status == errSecItemNotFound
         }
 
@@ -8259,6 +8273,7 @@ struct CraftWebView: UIViewRepresentable {
             SecItemDelete(query as CFDictionary)
 
             let status = SecItemAdd(query as CFDictionary, nil)
+            CraftKeychain.forget(account: key)
             if status == errSecSuccess {
                 resolveCallback(callbackId, result: ["success": true, "key": key])
             } else {
@@ -8301,6 +8316,7 @@ struct CraftWebView: UIViewRepresentable {
             }
 
             let status = SecItemDelete(query as CFDictionary)
+            CraftKeychain.forget(account: key)
             if status == errSecSuccess || status == errSecItemNotFound {
                 resolveCallback(callbackId, result: ["success": true, "key": key])
             } else {