@craft-native/ios 0.0.293 → 0.0.296

package/README.md

@@ -391,6 +391,29 @@ Appearance and navigation:
 - `swipeNavigation`: an edge swipe goes back and forward through the page's
   history, pushState entries included.
 
+Native tab-bar selection styling is opt-in and lives in the generated config,
+so the generated Swift never needs to be patched:
+
+```json
+{
+  "tabBar": {
+    "selection": { "cornerRadius": 8, "color": "#123456" }
+  },
+  "postGenerate": {
+    "command": "bun",
+    "args": ["run", "scripts/customize-native.ts"]
+  }
+}
+```
+
+`cornerRadius` is measured in points and `color` is `#RRGGBB`; omit either to
+keep its host default. `postGenerate` runs after `craft ios build` has written
+the Xcode project, with the generated project as its working directory. Craft
+does not invoke a shell: `command` and `args` are passed directly. The hook
+receives `CRAFT_PROJECT_ROOT`, `CRAFT_PLATFORM=ios`, and
+`CRAFT_GENERATE_PHASE=build`. A missing executable, non-zero exit, or invalid
+configuration fails the build with the hook's stderr in the diagnostic.
+
 Debug builds let Safari's Develop menu inspect the webview, and relay the
 page's console, uncaught errors, rejected promises and failed script loads to
 the device log as `[craft page] …`, so a page that only breaks inside the app

package/dist/cli.js

@@ -325,6 +325,30 @@ function installNativeBundle(source, output) {
 function hasInstalledNativeBundle(output) {
   return existsSync(join3(output, "dist", "native-screen.js")) || existsSync(join3(output, "dist", "native-screens"));
 }
+function runPostGenerateHook(hook, output, phase = "build") {
+  if (!hook)
+    return;
+  if (typeof hook.command !== "string" || !hook.command.trim())
+    throw new Error("iOS postGenerate.command must be a non-empty executable");
+  if (hook.args !== undefined && (!Array.isArray(hook.args) || hook.args.some((argument) => typeof argument !== "string")))
+    throw new Error("iOS postGenerate.args must be an array of strings");
+  const command = [hook.command, ...hook.args ?? []];
+  let result;
+  try {
+    result = Bun.spawnSync(command, {
+      cwd: output,
+      env: { ...process.env, CRAFT_PROJECT_ROOT: output, CRAFT_PLATFORM: "ios", CRAFT_GENERATE_PHASE: phase },
+      stdout: "inherit",
+      stderr: "pipe"
+    });
+  } catch (error) {
+    throw new Error(`iOS postGenerate hook could not start in ${output}: ${hook.command}`, { cause: error });
+  }
+  if (result.exitCode !== 0) {
+    const stderr = result.stderr?.toString().trim();
+    throw new Error(`iOS postGenerate hook failed in ${output} with exit code ${result.exitCode}${stderr ? `: ${stderr}` : ""}`);
+  }
+}
 var DEFAULT_CONFIG = {
   renderer: "web",
   version: "1.0.0",
@@ -1030,6 +1054,11 @@ async function init(options) {
   if (config.renderer !== "web" && config.renderer !== "native") {
     throw new Error(`Unknown iOS renderer: ${config.renderer}. Expected web or native.`);
   }
+  const selection = config.tabBar?.selection;
+  if (selection?.cornerRadius !== undefined && (!Number.isFinite(selection.cornerRadius) || selection.cornerRadius < 0))
+    throw new Error("iOS tabBar.selection.cornerRadius must be a finite non-negative number");
+  if (selection?.color !== undefined && !/^#[0-9a-f]{6}$/i.test(selection.color))
+    throw new Error("iOS tabBar.selection.color must be a #RRGGBB color");
   if (config.enableBackgroundLocation)
     config.enableGeolocation = true;
   const problems = hybridConfigProblems(config);
@@ -1225,6 +1254,7 @@ async function build(options) {
       cause: error
     });
   }
+  runPostGenerateHook(config.postGenerate, output);
   console.log("");
 }
 async function open(options) {

package/dist/index.d.ts

@@ -9,6 +9,19 @@ export declare function syncNativeFonts(fonts: CraftConfig['nativeFonts'], outpu
 /** This package's version, which the app names in its user agent (`Craft/<version>`). */
 export declare function resolveCraftVersion(startDir?: string): string;
 export type CraftAppearance = 'light' | 'dark' | 'system';
+/** A declared command Craft runs after the native project has been generated. */
+export interface CraftPostGenerateHook {
+    command: string;
+    args?: string[];
+}
+export interface CraftTabBarConfig {
+    selection?: {
+        /** The selected tab indicator's corner radius in points; omitted keeps a capsule. */
+        cornerRadius?: number;
+        /** The selected tab indicator fill as #RRGGBB. */
+        color?: string;
+    };
+}
 export interface CraftConfig {
     appShortcuts?: CraftAppShortcut[];
     /** Bundled font files keyed by their PostScript font name, used as native fontFamily. */
@@ -29,6 +42,10 @@ export interface CraftConfig {
      * and `dark` pin one. Unset keeps the older `darkMode` switch.
      */
     appearance?: CraftAppearance;
+    /** Static native tab-bar styling applied before the page's own tabBar.set call. */
+    tabBar?: CraftTabBarConfig;
+    /** Runs from the generated project root after `craft ios build` writes it. */
+    postGenerate?: CraftPostGenerateHook;
     backgroundColor?: string;
     /** The launch and webview background while the phone is in Dark Mode. */
     backgroundColorDark?: string;
@@ -409,6 +426,13 @@ export interface BuildOptions {
      */
     runtimeDir?: string | null;
 }
+/**
+ * Run the app's declared generator hook without invoking a shell.
+ *
+ * A hook gets the generated project as its cwd and explicit metadata so a
+ * patch can target the right platform and phase without guessing from paths.
+ */
+export declare function runPostGenerateHook(hook: CraftPostGenerateHook | undefined, output: string, phase?: 'build'): void;
 export interface OpenOptions {
     output: string;
 }

package/dist/index.js

@@ -512,6 +512,30 @@ function installNativeBundle(source, output) {
 function hasInstalledNativeBundle(output) {
   return existsSync(join3(output, "dist", "native-screen.js")) || existsSync(join3(output, "dist", "native-screens"));
 }
+function runPostGenerateHook(hook, output, phase = "build") {
+  if (!hook)
+    return;
+  if (typeof hook.command !== "string" || !hook.command.trim())
+    throw new Error("iOS postGenerate.command must be a non-empty executable");
+  if (hook.args !== undefined && (!Array.isArray(hook.args) || hook.args.some((argument) => typeof argument !== "string")))
+    throw new Error("iOS postGenerate.args must be an array of strings");
+  const command = [hook.command, ...hook.args ?? []];
+  let result;
+  try {
+    result = Bun.spawnSync(command, {
+      cwd: output,
+      env: { ...process.env, CRAFT_PROJECT_ROOT: output, CRAFT_PLATFORM: "ios", CRAFT_GENERATE_PHASE: phase },
+      stdout: "inherit",
+      stderr: "pipe"
+    });
+  } catch (error) {
+    throw new Error(`iOS postGenerate hook could not start in ${output}: ${hook.command}`, { cause: error });
+  }
+  if (result.exitCode !== 0) {
+    const stderr = result.stderr?.toString().trim();
+    throw new Error(`iOS postGenerate hook failed in ${output} with exit code ${result.exitCode}${stderr ? `: ${stderr}` : ""}`);
+  }
+}
 var DEFAULT_CONFIG = {
   renderer: "web",
   version: "1.0.0",
@@ -1230,6 +1254,11 @@ async function init(options) {
   if (config.renderer !== "web" && config.renderer !== "native") {
     throw new Error(`Unknown iOS renderer: ${config.renderer}. Expected web or native.`);
   }
+  const selection = config.tabBar?.selection;
+  if (selection?.cornerRadius !== undefined && (!Number.isFinite(selection.cornerRadius) || selection.cornerRadius < 0))
+    throw new Error("iOS tabBar.selection.cornerRadius must be a finite non-negative number");
+  if (selection?.color !== undefined && !/^#[0-9a-f]{6}$/i.test(selection.color))
+    throw new Error("iOS tabBar.selection.color must be a #RRGGBB color");
   if (config.enableBackgroundLocation)
     config.enableGeolocation = true;
   const problems = hybridConfigProblems(config);
@@ -1425,6 +1454,7 @@ async function build(options) {
       cause: error
     });
   }
+  runPostGenerateHook(config.postGenerate, output);
   console.log("");
 }
 async function open(options) {
@@ -1590,6 +1620,7 @@ export {
   resolveRuntimeDir,
   restoreShell,
   run,
+  runPostGenerateHook,
   serializeSimulatorSteps,
   showSimulator,
   syncNativeFonts,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@craft-native/ios",
-  "version": "0.0.293",
+  "version": "0.0.296",
   "homepage": "https://github.com/craft-native/craft/tree/main/packages/ios#readme",
   "repository": {
     "type": "git",

package/templates/CraftApp.swift

@@ -102,6 +102,96 @@ enum CraftPageAppearance {
     }
 }
 
+/// The app-wide UIKit appearance override. SwiftUI's `preferredColorScheme`
+/// only controls the SwiftUI environment; native screen controllers need the
+/// UIKit override as well so their trait collection, controls and navigation
+/// chrome resolve the same way. A runtime choice is kept here so screens
+/// created after the choice inherit it instead of reverting to the bundle
+/// config.
+enum CraftInterfaceStyleController {
+    /// The app's bundled choice is the default for newly-created screens.
+    /// A runtime choice is separate: it is the only value that should
+    /// override a screen's own generated config.
+    private static var configured: UIUserInterfaceStyle = .unspecified
+    private static var runtimeSelection: UIUserInterfaceStyle?
+
+    static func configuredStyle(for config: CraftConfig) -> UIUserInterfaceStyle {
+        switch config.appearance {
+        case "system": return .unspecified
+        case "light": return .light
+        case "dark": return .dark
+        default: return config.darkMode ? .dark : .light
+        }
+    }
+
+    static func configure(_ config: CraftConfig) {
+        configured = configuredStyle(for: config)
+        runtimeSelection = nil
+        applyToWindows()
+    }
+
+    static func style(for config: CraftConfig) -> UIUserInterfaceStyle {
+        runtimeSelection ?? configuredStyle(for: config)
+    }
+
+    static func colorScheme(for config: CraftConfig) -> ColorScheme? {
+        switch style(for: config) {
+        case .light: return .light
+        case .dark: return .dark
+        default: return nil
+        }
+    }
+
+    /// Returns false rather than silently accepting a typo from JavaScript.
+    @discardableResult
+    static func set(_ value: String) -> Bool {
+        let style: UIUserInterfaceStyle
+        switch value {
+        case "system": style = .unspecified
+        case "light": style = .light
+        case "dark": style = .dark
+        default: return false
+        }
+        runtimeSelection = style
+        applyToWindows()
+        NotificationCenter.default.post(name: .craftColorSchemeChanged, object: nil)
+        return true
+    }
+
+    static func currentName() -> String {
+        let requested = runtimeSelection ?? UIApplication.shared.connectedScenes
+            .compactMap { ($0 as? UIWindowScene)?.windows.first(where: { $0.isKeyWindow })?.traitCollection.userInterfaceStyle }
+            .first ?? .unspecified
+        let style = requested == .unspecified
+            ? (UIApplication.shared.connectedScenes
+                .compactMap { ($0 as? UIWindowScene)?.windows.first(where: { $0.isKeyWindow })?.traitCollection.userInterfaceStyle }
+                .first { $0 != .unspecified } ?? UITraitCollection.current.userInterfaceStyle)
+            : requested
+        return style == .dark ? "dark" : "light"
+    }
+
+    static func apply(to controller: UIViewController, config: CraftConfig) {
+        controller.overrideUserInterfaceStyle = style(for: config)
+    }
+
+    private static func applyToWindows() {
+        let style = runtimeSelection ?? configured
+        for scene in UIApplication.shared.connectedScenes.compactMap({ $0 as? UIWindowScene }) {
+            for window in scene.windows {
+                window.overrideUserInterfaceStyle = style
+                apply(style, to: window.rootViewController)
+            }
+        }
+    }
+
+    private static func apply(_ style: UIUserInterfaceStyle, to controller: UIViewController?) {
+        guard let controller else { return }
+        controller.overrideUserInterfaceStyle = style
+        controller.children.forEach { apply(style, to: $0) }
+        if let presented = controller.presentedViewController { apply(style, to: presented) }
+    }
+}
+
 /// Tells the shell when SwiftUI's colour scheme changes: the one appearance
 /// setting with no notification of its own.
 struct CraftColorSchemeObserver: View {
@@ -195,6 +285,7 @@ struct CraftRecoveryBudget {
 final class CraftAppDelegate: NSObject, UIApplicationDelegate, UNUserNotificationCenterDelegate {
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil) -> Bool {
         let config = CraftConfig.bundled()
+        CraftInterfaceStyleController.configure(config)
         // First, so a crash anywhere in the rest of launch is reported too.
         CraftCrashReporter.shared.start(config)
         UNUserNotificationCenter.current().delegate = self
@@ -606,7 +697,7 @@ struct CraftApp: App {
                     .ignoresSafeArea(.keyboard, edges: .bottom)
                 }
             }
-                .preferredColorScheme(appState.config.colorScheme)
+                .preferredColorScheme(appState.appearanceScheme)
                 .environmentObject(appState)
                 .onOpenURL { url in
                     // Handle deep links and universal links
@@ -689,6 +780,10 @@ final class CraftChrome: ObservableObject {
     /// The selected tab highlight's corner radius. Nil preserves the default
     /// capsule, while a finite non-negative value opts into a rounded rect.
     private(set) var tabSelectionCornerRadius: CGFloat?
+    /// The configured static shape, retained when the page updates only its
+    /// tabs or selected item at runtime.
+    private var configuredTabSelectionCornerRadius: CGFloat?
+    private(set) var tabSelectionColor: UIColor?
 
     weak var webView: WKWebView?
     /// What the tab bar covers at the bottom of the screen, in points.
@@ -723,9 +818,13 @@ final class CraftChrome: ObservableObject {
     /// The tab bar from `tabs` in craft.config.json, there before the page
     /// loads; the page's own `tabBar` message replaces it later. `splash`
     /// false when the first screen is native and draws itself.
-    func configure(tabs configured: [CraftConfig.Tab], selected: String?, splash: Bool) {
+    func configure(tabs configured: [CraftConfig.Tab], selected: String?, splash: Bool, appearance: CraftConfig.TabBar? = nil) {
         splashVisible = splash
         tabSwipeEnabled = true
+        configuredTabSelectionCornerRadius = appearance?.selection?.cornerRadius
+            .flatMap { $0.isFinite && $0 >= 0 ? CGFloat($0) : nil }
+        tabSelectionCornerRadius = configuredTabSelectionCornerRadius
+        tabSelectionColor = appearance?.selection?.color.flatMap { UIColor(hex: $0) }
         guard !configured.isEmpty else { return }
         tabs = configured.map { Tab(id: $0.id, title: $0.title, symbol: $0.symbol ?? "circle", badge: nil, selectedSymbol: Tab.normalizedSelectedSymbol($0.selectedSymbol), selectedIconTint: $0.selectedIconTint, selectedIconPulse: $0.selectedIconPulse) }
         self.selected = selected ?? configured.first?.id
@@ -856,6 +955,7 @@ final class CraftChrome: ObservableObject {
                 tint = light.map { light in dark.map { dark in UIColor { $0.userInterfaceStyle == .dark ? dark : light } } ?? light }
             }
             if let swipeEnabled = body["swipeEnabled"] as? Bool { tabSwipeEnabled = swipeEnabled }
+            if !body.keys.contains("selection") { tabSelectionCornerRadius = configuredTabSelectionCornerRadius }
             withAnimation(Self.motion(.easeOut(duration: 0.2))) { tabBarVisible = !tabs.isEmpty && !hiddenByScreen }
             publishLayout()
         case "selectTab":
@@ -1312,6 +1412,7 @@ private struct CraftTabSelectionShape: Shape {
 }
 
 private struct CraftTabSelectionIndicator: View {
+    @ObservedObject private var chrome = CraftChrome.shared
     @ObservedObject private var progress = CraftChrome.shared.tabSwipeProgress
     let selected: Int?
     let count: Int
@@ -1323,7 +1424,7 @@ private struct CraftTabSelectionIndicator: View {
                 let width = geometry.size.width / CGFloat(max(1, count))
                 CraftTabSelectionShape(cornerRadius: cornerRadius)
                     .frame(width: width, height: geometry.size.height)
-                    .foregroundStyle(Color.primary.opacity(0.09))
+                    .foregroundStyle(chrome.tabSelectionColor.map { Color($0) } ?? Color.primary.opacity(0.09))
                     .offset(x: position * width)
             }
         }
@@ -1557,6 +1658,8 @@ class DeepLinkManager {
 // MARK: - App State
 class AppState: ObservableObject {
     @Published var config: CraftConfig
+    @Published private(set) var appearanceScheme: ColorScheme?
+    private var appearanceObserver: NSObjectProtocol?
 
     init() {
         if let configURL = Bundle.main.url(forResource: "craft.config", withExtension: "json"),
@@ -1565,11 +1668,26 @@ class AppState: ObservableObject {
         } else {
             self.config = CraftConfig()
         }
+        self.appearanceScheme = CraftInterfaceStyleController.colorScheme(for: config)
+        appearanceObserver = NotificationCenter.default.addObserver(
+            forName: .craftColorSchemeChanged,
+            object: nil,
+            queue: .main,
+        ) { [weak self] _ in
+            guard let self else { return }
+            self.appearanceScheme = CraftInterfaceStyleController.colorScheme(for: self.config)
+        }
         // Before the first frame: the hybrid start screen, and the tab bar
         // from the config, are decided here, if the app delegate has not
         // already (it does at launch; the first call decides).
         CraftHybrid.shared.configure(config)
     }
+
+    deinit {
+        if let appearanceObserver {
+            NotificationCenter.default.removeObserver(appearanceObserver)
+        }
+    }
 }
 
 extension CraftConfig {
@@ -1706,6 +1824,9 @@ struct CraftConfig: Codable {
     var nativeScreens: [String: String]? = nil
     /// The tab bar to show before the page describes its own.
     var tabs: [Tab]? = nil
+    /// Static styling for the selected tab indicator; the page may still
+    /// override its shape through `tabBar.set({ selection })`.
+    var tabBar: TabBar? = nil
     /// Hybrid: web-storage keys the page's own code writes, mirrored into the
     /// Keychain under another name for native screens (`{"auth_token": "auth.token"}`).
     var shareStorage: [String: String]? = nil
@@ -1733,6 +1854,15 @@ struct CraftConfig: Codable {
         var selectedIconPulse: Bool? = nil
     }
 
+    struct TabBar: Codable {
+        var selection: TabSelection? = nil
+    }
+
+    struct TabSelection: Codable {
+        var cornerRadius: Double? = nil
+        var color: String? = nil
+    }
+
     struct BackgroundRefresh: Codable {
         var enabled: Bool = false
         /// The BGTaskScheduler identifier; `<bundleId>.refresh` if unset.
@@ -2535,6 +2665,18 @@ struct CraftWebView: UIViewRepresentable {
                 resolveCallback(callbackId, result: CraftSymbols.image(named: body["name"] as? String ?? "", options: body) ?? NSNull())
             case "statusBarSetStyle":
                 resolveCallback(callbackId, result: CraftStatusBar.setStyle(body["style"] as? String ?? "default"))
+            case "setAppearance":
+                guard let appearance = body["appearance"] as? String else {
+                    rejectCallback(callbackId, error: "setAppearance needs light, dark or system", code: "INVALID_ARGUMENT")
+                    return
+                }
+                guard CraftInterfaceStyleController.set(appearance) else {
+                    rejectCallback(callbackId, error: "setAppearance needs light, dark or system", code: "INVALID_ARGUMENT")
+                    return
+                }
+                resolveCallback(callbackId, result: true)
+            case "getAppearance":
+                resolveCallback(callbackId, result: CraftInterfaceStyleController.currentName())
             case "chromeSetUnderPageColor":
                 // What shows past the page's edges when it rubber-bands.
                 if #available(iOS 15.0, *), let webView, let css = body["color"] as? String, let color = UIColor(css: css) {
@@ -5596,6 +5738,14 @@ struct CraftWebView: UIViewRepresentable {
                     getInfo: function() { return craft.getDeviceInfo(); },
                     getCapabilities: function() { return Promise.resolve(Object.assign({}, craft.capabilities)); }
                 };
+                craft.app = Object.assign(craft.app || {}, {
+                    setAppearance: function(appearance) {
+                        return craft._invoke('setAppearance', {appearance: appearance});
+                    },
+                    getAppearance: function() {
+                        return craft._invoke('getAppearance', {});
+                    }
+                });
                 // Feedback, as on Android and the web, where there is no
                 // motor to fire: an app that left enableHaptics off gets
                 // nothing played and a settled promise, so `await

package/templates/CraftHybrid.swift

@@ -380,7 +380,7 @@ final class CraftHybrid: NSObject {
         }
         startsNative = isEnabled && routes.match(startPath) != nil
         // The splash waits for a page; an all-native app's first screen draws itself.
-        CraftChrome.shared.configure(tabs: config.tabs ?? [], selected: tabIds(from: config.tabs ?? []).isEmpty ? nil : CraftHybridRoutes.tab(owning: startPath, among: tabIds(from: config.tabs ?? [])), splash: hasWeb && !startsNative)
+        CraftChrome.shared.configure(tabs: config.tabs ?? [], selected: tabIds(from: config.tabs ?? []).isEmpty ? nil : CraftHybridRoutes.tab(owning: startPath, among: tabIds(from: config.tabs ?? [])), splash: hasWeb && !startsNative, appearance: config.tabBar)
 
         let script = config.nativeApp.flatMap { $0.isEmpty ? nil : $0 }
         appScriptRoute = script != nil && Self.hasBundle && (isEnabled || !hasWeb) ? script : nil

package/templates/CraftNativeScreen.swift

@@ -2983,7 +2983,10 @@ private class CraftNativeFlowView: UIStackView {
             // The screen reports onLayout from its own layout pass, which a
             // change deep in a scroll view's content never runs: a view that
             // went from 240 to 180 wide kept saying 240.
-            if moved { craftScreenController?.scheduleLayoutEvents() }
+            if moved {
+                craftScreenController?.scheduleLayoutEvents()
+                craftScreenController?.scheduleKeyboardInsets()
+            }
         }
         for (child, frame) in result.frames {
             var viewportFrame = frame
@@ -5112,6 +5115,11 @@ private final class CraftNativeTextView: UITextView {
             isScrollEnabled = overflows
             if overflows, isFirstResponder { scrollRangeToVisible(selectedRange) }
         }
+        // Showing all its text, it has nothing to scroll. An offset left from
+        // UIKit keeping the caret in view while the view was a layout short
+        // of its text moved every line down inside it, and the caret of a
+        // growing comment sat below the part of the screen it was kept in.
+        if !isScrollEnabled, contentOffset != .zero { contentOffset = .zero }
         let inset = textContainerInset
         let padding = textContainer.lineFragmentPadding
         placeholderLabel.frame = CGRect(
@@ -5492,6 +5500,7 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
     private var keyboardSafeAreaInset: CGFloat = 0
     /// Where the keyboard is on the screen while it is up, in screen coordinates.
     private var keyboardScreenFrame: CGRect?
+    private var keyboardInsetsScheduled = false
     /// The hybrid shell (CraftHybrid.swift), when this screen is one of a web
     /// app's native screens: told of the first frame, of a first frame that
     /// could not be drawn, and of `craft.navigation.open(path)`.
@@ -5536,6 +5545,7 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
 
     override func viewDidLoad() {
         super.viewDidLoad()
+        CraftInterfaceStyleController.apply(to: self, config: config)
         navigationItem.title = routeName ?? config.appName
         view.backgroundColor = config.resolvedBackgroundColor
         rootStack.axis = .vertical
@@ -5802,6 +5812,7 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         positionModals()
         emitLayoutEvents()
         sendViewportIfChanged()
+        scheduleKeyboardInsets()
     }
 
     /// The width the bundle last heard, so a layout pass at the same size says nothing.
@@ -6240,6 +6251,18 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         let secureGet: @convention(block) (String) -> String? = { key in
             config.enableSecureStorage ? CraftNativeActions.webSecureValue(forKey: key) : nil
         }
+        let setAppearance: @convention(block) (String) -> Bool = { value in
+            if Thread.isMainThread { return CraftInterfaceStyleController.set(value) }
+            var accepted = false
+            DispatchQueue.main.sync { accepted = CraftInterfaceStyleController.set(value) }
+            return accepted
+        }
+        let getAppearance: @convention(block) () -> String = {
+            if Thread.isMainThread { return CraftInterfaceStyleController.currentName() }
+            var value = "light"
+            DispatchQueue.main.sync { value = CraftInterfaceStyleController.currentName() }
+            return value
+        }
         let setOptions: @convention(block) (String) -> Void = { [weak self] json in
             guard let data = json.data(using: .utf8),
                   let options = try? JSONSerialization.jsonObject(with: data) as? [String: Any] else { return }
@@ -6252,6 +6275,8 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         jsContext.setObject(snapshotSet, forKeyedSubscript: "craftNativeSnapshotSet" as NSString)
         jsContext.setObject(snapshotClear, forKeyedSubscript: "craftNativeSnapshotClear" as NSString)
         jsContext.setObject(secureGet, forKeyedSubscript: "craftNativeSecureGet" as NSString)
+        jsContext.setObject(setAppearance, forKeyedSubscript: "craftNativeSetAppearance" as NSString)
+        jsContext.setObject(getAppearance, forKeyedSubscript: "craftNativeGetAppearance" as NSString)
         jsContext.setObject(setOptions, forKeyedSubscript: "craftNativeSetOptions" as NSString)
         // Older native bundles call the page-shaped `craft.dialog` API
         // directly. Keep that API backed by the same capability protocol as
@@ -6494,6 +6519,19 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
                         return value === undefined ? null : value;
                     }
                 });
+                keep('app', {
+                    setAppearance: function(value) {
+                        value = String(value);
+                        if (value !== 'light' && value !== 'dark' && value !== 'system') {
+                            return Promise.reject(new TypeError('craft.app.setAppearance needs light, dark or system'));
+                        }
+                        if (!craftNativeSetAppearance(value)) {
+                            return Promise.reject(new Error('craft.app.setAppearance was rejected'));
+                        }
+                        return Promise.resolve();
+                    },
+                    getAppearance: function() { return Promise.resolve(craftNativeGetAppearance()); }
+                });
                 // The signed-in account (CraftSession): the token under
                 // `sessionTokenKey`, and each change of it, which the host
                 // reports through `__craftSessionChanged` after the Keychain
@@ -7148,6 +7186,22 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         }
     }
 
+    /// A layout moved a view while the keyboard is up: once that pass is
+    /// over, each scroll view's keyboard inset is measured again where the
+    /// scroll view now ends. Measured only when the keyboard moved, a form
+    /// that grew down under the keyboard (a footer below it shrank, a
+    /// banner above it went away) kept the inset of where it used to end,
+    /// and its last lines stayed under the keyboard.
+    fileprivate func scheduleKeyboardInsets() {
+        guard keyboardScreenFrame != nil, !keyboardInsetsScheduled else { return }
+        keyboardInsetsScheduled = true
+        DispatchQueue.main.async { [weak self] in
+            guard let self else { return }
+            self.keyboardInsetsScheduled = false
+            if self.keyboardScreenFrame != nil { self.insetScrollViewsForKeyboard() }
+        }
+    }
+
     /// The focused field, scrolled into the part of its scroll view the
     /// keyboard leaves, with a little room around it.
     func scrollFocusedInputIntoView(animated: Bool) {
@@ -7159,6 +7213,8 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
     /// Internal for XCTest.
     func scrollIntoView(_ input: UIView, animated: Bool) {
         guard let scroll = enclosingVerticalScroll(of: input) else { return }
+        // Measured against the keyboard where the scroll view is now.
+        if keyboardScreenFrame != nil { insetScrollViewsForKeyboard() }
         var rect = input.convert(input.bounds, to: scroll).insetBy(dx: 0, dy: -16)
         // A field taller than the part the keyboard leaves (a long comment
         // with no max height) shows its caret rather than its top: scrolled
@@ -9951,6 +10007,9 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
             textView.invalidateIntrinsicContentSize()
             CraftNativeFlexLayout.invalidateAncestors(of: textView)
             self.view.layoutIfNeeded()
+            // That layout can move the scroll view: its keyboard inset is
+            // measured where it now ends before the caret is.
+            if self.keyboardScreenFrame != nil { self.insetScrollViewsForKeyboard() }
             guard let scroll = self.enclosingVerticalScroll(of: textView),
                   let rect = self.caretRect(of: textView, in: scroll) else { return }
             let visible = scroll.bounds.inset(by: scroll.adjustedContentInset)

package/templates/CraftWatchApp.swift.template

@@ -117,6 +117,10 @@ final class CraftWatchSession: NSObject, ObservableObject {
     }
 
     private func apply(_ payload: [String: Any]) {
+        if let incomingVersion = payload["stateVersion"] as? Int {
+            guard incomingVersion >= stateVersion else { return }
+            stateVersion = incomingVersion
+        }
         if let plan = payload["plan"] as? [String: Any], payload["type"] as? String == "planned-session" {
             plannedSession = plan
             status = "Plan ready"