craft-native 0.0.471 → 0.0.476

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

@@ -844,6 +844,9 @@ internal class CraftNativeChrome(
     private val tabBar = LinearLayout(context)
     private val tabRow = LinearLayout(context)
     private val accessory = FrameLayout(context)
+    private val companionRow = LinearLayout(context)
+    private val companionViews = mutableListOf<Pair<FrameLayout, JSONObject>>()
+    private var renderedCompanionSpecs = ""
     private val accessoryIcon = ImageView(context)
     private val accessoryBadge = TextView(context)
     private var accessorySpec: JSONObject? = null
@@ -864,11 +867,16 @@ internal class CraftNativeChrome(
     private var renderedButtonSpecs: Pair<String, String>? = null
     private val density = resources.displayMetrics.density
     private var screenBackgroundColor: Int? = null
+    private var navigationTitleColor: Int? = null
     private var selectedTab = 0
     private var tabBarHiddenByScreen = false
     private var visiblePath: String? = null
     private val accessorySelected: Boolean
-        get() = accessorySpec?.optString("path")?.let { path -> visiblePath == path || visiblePath?.startsWith(path + "/") == true } == true
+        get() = accessorySpec?.let { isAccessorySelected(it) } == true || companionViews.any { isAccessorySelected(it.second) }
+    private fun isAccessorySelected(item: JSONObject): Boolean {
+        val path = item.optString("path")
+        return visiblePath == path || visiblePath?.startsWith(path + "/") == true
+    }
     private var swipeTracking = false
     private var swipeIntercepted = false
     private var horizontalScrollDeferred = false
@@ -965,6 +973,9 @@ internal class CraftNativeChrome(
         tabRow.gravity = Gravity.CENTER_VERTICAL
         tabRow.setPadding(dp(12), dp(4), dp(12), dp(4))
         tabRow.addView(tabBar, LayoutParams(0, dp(64), 1f))
+        companionRow.orientation = HORIZONTAL
+        companionRow.gravity = Gravity.CENTER_VERTICAL
+        tabRow.addView(companionRow, LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, dp(64)))
         accessory.addView(accessoryIcon, FrameLayout.LayoutParams(dp(26), dp(26), Gravity.CENTER))
         accessoryBadge.textSize = 10f
         accessoryBadge.gravity = Gravity.CENTER
@@ -1039,6 +1050,10 @@ internal class CraftNativeChrome(
             ?.takeUnless { it == JSONObject.NULL }
             ?.let { craftNativeOptionalString(it) }
             ?.let { runCatching { craftNativeColor(it) }.getOrNull() }
+        navigationTitleColor = options.opt("titleColor")
+            ?.takeUnless { it == JSONObject.NULL }
+            ?.let { craftNativeOptionalString(it) }
+            ?.let { runCatching { craftNativeColor(it) }.getOrNull() }
         options.optJSONObject("tabItem")?.let(::updateTab)
         val hidden = options.optBoolean("hidden", false)
         val large = options.optBoolean("largeTitle", false) && depth == 0
@@ -1087,6 +1102,24 @@ internal class CraftNativeChrome(
             path.startsWith("/") && !path.startsWith("//") && it.has("title")
         }
         accessory.visibility = if (accessorySpec == null) View.GONE else View.VISIBLE
+        val companions = accessorySpec?.optJSONArray("companions")
+        val companionSpecs = companions?.toString().orEmpty()
+        if (companionSpecs != renderedCompanionSpecs) {
+            renderedCompanionSpecs = companionSpecs
+            companionRow.removeAllViews()
+            companionViews.clear()
+            for (index in 0 until minOf(companions?.length() ?: 0, 2)) {
+                val item = companions?.optJSONObject(index) ?: continue
+                val path = item.optString("path")
+                if (!path.startsWith("/") || path.startsWith("//") || path == accessorySpec?.optString("path") || !item.has("title")) continue
+                val action = FrameLayout(context)
+                action.contentDescription = item.optString("accessibilityLabel").ifBlank { item.optString("title") }
+                action.addView(ImageView(context), FrameLayout.LayoutParams(dp(26), dp(26), Gravity.CENTER))
+                action.setOnClickListener { onAccessory?.invoke(path) }
+                companionRow.addView(action, LayoutParams(dp(48), dp(48)).apply { marginStart = dp(8) })
+                companionViews.add(action to item)
+            }
+        }
         accessorySpec?.let {
             accessory.contentDescription = it.optString("accessibilityLabel").ifBlank { it.optString("title") } + it.optString("badge").takeIf { badge -> badge.isNotBlank() && badge != "null" }?.let { badge -> ", $badge" }.orEmpty()
             accessoryBadge.text = it.optString("badge").takeUnless { badge -> badge == "null" }.orEmpty().take(8)
@@ -1186,14 +1219,21 @@ internal class CraftNativeChrome(
         setBackgroundColor(background)
         bar.setBackgroundColor(background)
         largeTitleView.setBackgroundColor(background)
-        titleView.setTextColor(text)
-        largeTitleView.setTextColor(text)
+        titleView.setTextColor(navigationTitleColor ?: text)
+        largeTitleView.setTextColor(navigationTitleColor ?: text)
         backButton.imageTintList = ColorStateList.valueOf(accent)
         val surface = if (dark) Color.parseColor("#1C1C1E") else Color.parseColor("#F9F9F9")
         tabBar.background = GradientDrawable().apply { setColor(surface); cornerRadius = dp(32).toFloat() }
-        accessory.isSelected = accessorySelected
-        accessory.background = GradientDrawable().apply { setColor(if (accessorySelected) Color.argb(36, Color.red(accent), Color.green(accent), Color.blue(accent)) else surface); cornerRadius = dp(32).toFloat() }
-        accessorySpec?.let { accessoryIcon.setImageDrawable(CraftNativeIcons.drawable(context, null, it.optString("symbol"), if (accessorySelected) accent else text)) }
+        val primarySelected = accessorySpec?.let { isAccessorySelected(it) } == true
+        accessory.isSelected = primarySelected
+        companionViews.forEach { (action, item) ->
+            val selected = isAccessorySelected(item)
+            action.isSelected = selected
+            action.background = GradientDrawable().apply { setColor(if (selected) Color.argb(36, Color.red(accent), Color.green(accent), Color.blue(accent)) else surface); cornerRadius = dp(32).toFloat() }
+            (action.getChildAt(0) as ImageView).setImageDrawable(CraftNativeIcons.drawable(context, null, item.optString("symbol"), if (selected) accent else text))
+        }
+        accessory.background = GradientDrawable().apply { setColor(if (primarySelected) Color.argb(36, Color.red(accent), Color.green(accent), Color.blue(accent)) else surface); cornerRadius = dp(32).toFloat() }
+        accessorySpec?.let { accessoryIcon.setImageDrawable(CraftNativeIcons.drawable(context, null, it.optString("symbol"), if (primarySelected) accent else text)) }
         tabViews.forEachIndexed { index, (icon, label) ->
             tabBar.getChildAt(index).isSelected = index == selectedTab && !accessorySelected
             tabBar.getChildAt(index).background = tabCellBackground(index, dark)

package/dist/cli.js

@@ -1012,13 +1012,16 @@ async function detachDiskImage(mount, options = {}) {
   const wait = options.wait ?? ((ms) => new Promise((resolve) => {
     setTimeout(resolve, ms);
   }));
+  const attempts = [];
   for (let attempt = 1;; attempt++) {
     const forced = attempt >= HDIUTIL_MAX_ATTEMPTS;
-    const result = await run(forced ? ["detach", mount, "-force"] : ["detach", mount]);
+    const args = forced ? ["detach", mount, "-force"] : ["detach", mount];
+    const result = await run(args);
     if (result.success)
       return { success: true };
+    attempts.push({ args, error: result.error });
     if (!shouldRetryHdiutil(result.error, attempt))
-      return { success: false, error: result.error };
+      return { success: false, error: result.error, attempts };
     await wait(attempt * 2000);
   }
 }
@@ -1030,6 +1033,9 @@ async function createDiskImage(opts) {
   const mount = join3(scratch, "mount");
   const writable = join3(scratch, "installer.dmg");
   let mounted = false;
+  let phase = "stage";
+  let attachment = "";
+  let detachAttempts = [];
   const run = async (tool, args) => {
     const result = await runTool(tool, args);
     if (!result.success)
@@ -1046,6 +1052,7 @@ async function createDiskImage(opts) {
     writeFileSync4(join3(payload, ".background", "installer.png"), installerBackground);
     const args = dmgCreateArguments({ ...opts, appBundlePath: payload, outputPath: writable }, pathContentBytes(payload));
     args[args.indexOf("ULMO")] = "UDRW";
+    phase = "create";
     for (let attempt = 1;; attempt++) {
       const result = await runHdiutil(args);
       if (result.success)
@@ -1055,17 +1062,25 @@ async function createDiskImage(opts) {
       rmSync2(writable, { force: true });
       await new Promise((resolve) => setTimeout(resolve, attempt * 2000));
     }
-    await run("hdiutil", ["attach", writable, "-nobrowse", "-mountpoint", mount]);
+    phase = "attach";
+    attachment = (await run("hdiutil", ["attach", writable, "-nobrowse", "-mountpoint", mount])).stdout;
     mounted = true;
+    phase = "layout";
     writeInstallerLayout(mount, opts.volumeName, bundleName);
+    phase = "detach";
     const detached = await detachDiskImage(mount);
-    if (!detached.success)
+    if (!detached.success) {
+      detachAttempts = detached.attempts;
       throw new Error(detached.error);
+    }
     mounted = false;
+    phase = "convert";
     await run("hdiutil", ["convert", writable, "-format", "ULMO", "-ov", "-o", opts.outputPath]);
     return { success: true, outputPath: opts.outputPath };
   } catch (error) {
-    return { success: false, error: error instanceof Error ? error.message : String(error) };
+    const message = error instanceof Error ? error.message : String(error);
+    return { success: false, error: `${message}
+Disk image lifecycle: ${JSON.stringify({ phase, image: writable, mount, attachment, detachAttempts })}` };
   } finally {
     if (mounted)
       await runTool("hdiutil", ["detach", mount, "-force"]);
@@ -3228,7 +3243,7 @@ function pinCraftNativeDependency(packagePath, craftVersion) {
 `);
 }
 // package.json
-var version = "0.0.471";
+var version = "0.0.476";
 
 // bin/cli.ts
 var spawnedFrom = process6.env[CRAFT_CLI_SPAWN_MARKER];

package/dist/index.cjs

@@ -376,7 +376,7 @@ function craftBinaryNotFoundMessage(triedPath) {
 `);
 }
 // package.json
-var version = "0.0.471";
+var version = "0.0.476";
 
 // src/sdk-version.ts
 var SDK_VERSION = version;
@@ -1380,13 +1380,16 @@ async function detachDiskImage(mount, options = {}) {
   const wait = options.wait ?? ((ms) => new Promise((resolve) => {
     setTimeout(resolve, ms);
   }));
+  const attempts = [];
   for (let attempt = 1;; attempt++) {
     const forced = attempt >= HDIUTIL_MAX_ATTEMPTS;
-    const result = await run(forced ? ["detach", mount, "-force"] : ["detach", mount]);
+    const args = forced ? ["detach", mount, "-force"] : ["detach", mount];
+    const result = await run(args);
     if (result.success)
       return { success: true };
+    attempts.push({ args, error: result.error });
     if (!shouldRetryHdiutil(result.error, attempt))
-      return { success: false, error: result.error };
+      return { success: false, error: result.error, attempts };
     await wait(attempt * 2000);
   }
 }
@@ -1398,6 +1401,9 @@ async function createDiskImage(opts) {
   const mount = import_path.join(scratch, "mount");
   const writable = import_path.join(scratch, "installer.dmg");
   let mounted = false;
+  let phase = "stage";
+  let attachment = "";
+  let detachAttempts = [];
   const run = async (tool, args) => {
     const result = await runTool(tool, args);
     if (!result.success)
@@ -1414,6 +1420,7 @@ async function createDiskImage(opts) {
     import_fs.writeFileSync(import_path.join(payload, ".background", "installer.png"), installerBackground);
     const args = dmgCreateArguments({ ...opts, appBundlePath: payload, outputPath: writable }, pathContentBytes(payload));
     args[args.indexOf("ULMO")] = "UDRW";
+    phase = "create";
     for (let attempt = 1;; attempt++) {
       const result = await runHdiutil(args);
       if (result.success)
@@ -1423,17 +1430,25 @@ async function createDiskImage(opts) {
       import_fs.rmSync(writable, { force: true });
       await new Promise((resolve) => setTimeout(resolve, attempt * 2000));
     }
-    await run("hdiutil", ["attach", writable, "-nobrowse", "-mountpoint", mount]);
+    phase = "attach";
+    attachment = (await run("hdiutil", ["attach", writable, "-nobrowse", "-mountpoint", mount])).stdout;
     mounted = true;
+    phase = "layout";
     writeInstallerLayout(mount, opts.volumeName, bundleName);
+    phase = "detach";
     const detached = await detachDiskImage(mount);
-    if (!detached.success)
+    if (!detached.success) {
+      detachAttempts = detached.attempts;
       throw new Error(detached.error);
+    }
     mounted = false;
+    phase = "convert";
     await run("hdiutil", ["convert", writable, "-format", "ULMO", "-ov", "-o", opts.outputPath]);
     return { success: true, outputPath: opts.outputPath };
   } catch (error) {
-    return { success: false, error: error instanceof Error ? error.message : String(error) };
+    const message = error instanceof Error ? error.message : String(error);
+    return { success: false, error: `${message}
+Disk image lifecycle: ${JSON.stringify({ phase, image: writable, mount, attachment, detachAttempts })}` };
   } finally {
     if (mounted)
       await runTool("hdiutil", ["detach", mount, "-force"]);

package/dist/index.js

@@ -117,7 +117,7 @@ function craftBinaryNotFoundMessage(triedPath) {
 `);
 }
 // package.json
-var version = "0.0.471";
+var version = "0.0.476";
 
 // src/sdk-version.ts
 var SDK_VERSION = version;
@@ -1136,13 +1136,16 @@ async function detachDiskImage(mount, options = {}) {
   const wait = options.wait ?? ((ms) => new Promise((resolve) => {
     setTimeout(resolve, ms);
   }));
+  const attempts = [];
   for (let attempt = 1;; attempt++) {
     const forced = attempt >= HDIUTIL_MAX_ATTEMPTS;
-    const result = await run(forced ? ["detach", mount, "-force"] : ["detach", mount]);
+    const args = forced ? ["detach", mount, "-force"] : ["detach", mount];
+    const result = await run(args);
     if (result.success)
       return { success: true };
+    attempts.push({ args, error: result.error });
     if (!shouldRetryHdiutil(result.error, attempt))
-      return { success: false, error: result.error };
+      return { success: false, error: result.error, attempts };
     await wait(attempt * 2000);
   }
 }
@@ -1154,6 +1157,9 @@ async function createDiskImage(opts) {
   const mount = join3(scratch, "mount");
   const writable = join3(scratch, "installer.dmg");
   let mounted = false;
+  let phase = "stage";
+  let attachment = "";
+  let detachAttempts = [];
   const run = async (tool, args) => {
     const result = await runTool(tool, args);
     if (!result.success)
@@ -1170,6 +1176,7 @@ async function createDiskImage(opts) {
     writeFileSync3(join3(payload, ".background", "installer.png"), installerBackground);
     const args = dmgCreateArguments({ ...opts, appBundlePath: payload, outputPath: writable }, pathContentBytes(payload));
     args[args.indexOf("ULMO")] = "UDRW";
+    phase = "create";
     for (let attempt = 1;; attempt++) {
       const result = await runHdiutil(args);
       if (result.success)
@@ -1179,17 +1186,25 @@ async function createDiskImage(opts) {
       rmSync2(writable, { force: true });
       await new Promise((resolve) => setTimeout(resolve, attempt * 2000));
     }
-    await run("hdiutil", ["attach", writable, "-nobrowse", "-mountpoint", mount]);
+    phase = "attach";
+    attachment = (await run("hdiutil", ["attach", writable, "-nobrowse", "-mountpoint", mount])).stdout;
     mounted = true;
+    phase = "layout";
     writeInstallerLayout(mount, opts.volumeName, bundleName);
+    phase = "detach";
     const detached = await detachDiskImage(mount);
-    if (!detached.success)
+    if (!detached.success) {
+      detachAttempts = detached.attempts;
       throw new Error(detached.error);
+    }
     mounted = false;
+    phase = "convert";
     await run("hdiutil", ["convert", writable, "-format", "ULMO", "-ov", "-o", opts.outputPath]);
     return { success: true, outputPath: opts.outputPath };
   } catch (error) {
-    return { success: false, error: error instanceof Error ? error.message : String(error) };
+    const message = error instanceof Error ? error.message : String(error);
+    return { success: false, error: `${message}
+Disk image lifecycle: ${JSON.stringify({ phase, image: writable, mount, attachment, detachAttempts })}` };
   } finally {
     if (mounted)
       await runTool("hdiutil", ["detach", mount, "-force"]);

package/dist/ios/templates/CraftApp.swift

@@ -819,6 +819,7 @@ final class CraftChrome: ObservableObject {
         var image: String? = nil
         /// A compact floating icon, instead of the system full-width accessory shelf.
         var iconOnly = false
+        var companions: [Tab] = []
     }
 
     @Published var tabs: [Tab] = []
@@ -828,8 +829,12 @@ final class CraftChrome: ObservableObject {
     /// The visible destination may be the accessory, independently of its owning stack.
     @Published var visiblePath: String?
     var accessorySelected: Bool {
-        guard let path = visiblePath, let accessory = tabAccessory?.id else { return false }
-        return path == accessory || path.hasPrefix(accessory + "/")
+        guard let accessory = tabAccessory else { return false }
+        return ([accessory] + accessory.companions).contains { accessorySelected($0) }
+    }
+    func accessorySelected(_ accessory: Tab) -> Bool {
+        guard let path = visiblePath else { return false }
+        return path == accessory.id || path.hasPrefix(accessory.id + "/")
     }
     var highlightedTab: String? { accessorySelected ? nil : selected }
     let tabSwipeProgress = CraftTabSwipeProgress()
@@ -954,7 +959,14 @@ final class CraftChrome: ObservableObject {
             next = Tab(id: path, title: title, symbol: item["symbol"] as? String ?? "message",
                 badge: (item["badge"] as? String).flatMap { $0.isEmpty ? nil : String($0.prefix(8)) },
                 accessibilityLabel: item["accessibilityLabel"] as? String,
-                iconOnly: item["iconOnly"] as? Bool ?? false)
+                iconOnly: item["iconOnly"] as? Bool ?? false,
+                companions: ((item["companions"] as? [[String: Any]]) ?? []).prefix(2).compactMap { action in
+                    guard let companionPath = action["path"] as? String,
+                          companionPath.hasPrefix("/"), !companionPath.hasPrefix("//"), companionPath != path,
+                          let companionTitle = action["title"] as? String else { return nil }
+                    return Tab(id: companionPath, title: companionTitle, symbol: action["symbol"] as? String ?? "circle",
+                        accessibilityLabel: action["accessibilityLabel"] as? String, iconOnly: true)
+                })
         } else {
             next = nil
         }
@@ -1265,43 +1277,45 @@ private struct CraftTabBarContent: View {
         if !chrome.tabs.isEmpty {
             HStack(spacing: 8) {
                 bar
-                if let accessory = chrome.tabAccessory {
-                    Button { CraftHybrid.shared.open(accessory.id) } label: {
-                        surface {
-                            Image(systemName: accessory.symbol)
-                                .font(.system(size: iconSize))
-                                .foregroundStyle(chrome.accessorySelected ? selectedColor : Color.primary)
-                                .frame(width: 62, height: 62)
-                                .background {
-                                    if chrome.accessorySelected {
-                                        Circle().fill(selectedColor.opacity(0.14)).padding(4)
+                if let primary = chrome.tabAccessory {
+                    ForEach(primary.companions + [primary]) { accessory in
+                        Button { CraftHybrid.shared.open(accessory.id) } label: {
+                            surface {
+                                Image(systemName: accessory.symbol)
+                                    .font(.system(size: iconSize))
+                                    .foregroundStyle(chrome.accessorySelected(accessory) ? selectedColor : Color.primary)
+                                    .frame(width: 62, height: 62)
+                                    .background {
+                                        if chrome.accessorySelected(accessory) {
+                                            Circle().fill(selectedColor.opacity(0.14)).padding(4)
+                                        }
+                                    }
+                            }
+                                .contentShape(Rectangle())
+                                .overlay(alignment: .topTrailing) {
+                                    if let badge = accessory.badge {
+                                        Text(badge)
+                                            .font(.system(size: badgeSize, weight: .bold))
+                                            .foregroundStyle(.white)
+                                            .padding(.horizontal, 4)
+                                            .frame(minWidth: 18, minHeight: 18)
+                                            .background(Capsule().fill(Color.red))
                                     }
                                 }
                         }
-                            .contentShape(Rectangle())
-                            .overlay(alignment: .topTrailing) {
-                                if let badge = accessory.badge {
-                                    Text(badge)
-                                        .font(.system(size: badgeSize, weight: .bold))
-                                        .foregroundStyle(.white)
-                                        .padding(.horizontal, 4)
-                                        .frame(minWidth: 18, minHeight: 18)
-                                        .background(Capsule().fill(Color.red))
-                                }
-                            }
-                    }
-                    .buttonStyle(.plain)
-                    .accessibilityShowsLargeContentViewer {
-                        Image(systemName: accessory.symbol)
-                        Text(accessory.accessibilityLabel ?? accessory.title)
+                        .buttonStyle(.plain)
+                        .accessibilityShowsLargeContentViewer {
+                            Image(systemName: accessory.symbol)
+                            Text(accessory.accessibilityLabel ?? accessory.title)
+                        }
+                        // Keep accessibility intent for the viewer; displayed
+                        // sizes come from the bounded metrics owned above.
+                        .environment(\.dynamicTypeSize, viewerTextSize)
+                        .accessibilityLabel(accessory.accessibilityLabel ?? accessory.title)
+                        .accessibilityValue(accessory.badge ?? "")
+                        .accessibilityIdentifier("craft-tab-accessory")
+                        .accessibilityAddTraits(chrome.accessorySelected(accessory) ? .isSelected : [])
                     }
-                    // Keep accessibility intent for the viewer; displayed
-                    // sizes come from the bounded metrics owned above.
-                    .environment(\.dynamicTypeSize, viewerTextSize)
-                    .accessibilityLabel(accessory.accessibilityLabel ?? accessory.title)
-                    .accessibilityValue(accessory.badge ?? "")
-                    .accessibilityIdentifier("craft-tab-accessory")
-                    .accessibilityAddTraits(chrome.accessorySelected ? .isSelected : [])
                 }
             }
                 .padding(.horizontal, 16)

package/dist/ios/templates/CraftHybrid.swift

@@ -1192,6 +1192,9 @@ final class CraftHybridController: UITabBarController, UITabBarControllerDelegat
     private var synchronizingTabs = false
     private var accessoryModel: CraftChrome.Tab?
     private let accessoryButton = UIButton(type: .system)
+    private var companionButtons: [UIButton] = []
+    private var companionModels: [CraftChrome.Tab] = []
+    private var companionGlasses: [UIVisualEffectView] = []
     private let accessoryBadge = UILabel()
     private let accessoryGlass = UIVisualEffectView(effect: UIBlurEffect(style: .systemMaterial))
     private static let tabPictures = NSCache<NSURL, UIImage>()
@@ -1410,6 +1413,40 @@ final class CraftHybridController: UITabBarController, UITabBarControllerDelegat
     private func updateSystemAccessory(hidden: Bool) {
         let chrome = CraftChrome.shared
         let model = hidden ? nil : chrome.tabAccessory
+        // Keep controls when only the selected destination or unread badge changes.
+        let companions = model?.iconOnly == true ? model?.companions ?? [] : []
+        if companionModels != companions {
+            companionModels = companions
+            for button in companionButtons { button.removeFromSuperview() }
+            for glass in companionGlasses { glass.removeFromSuperview() }
+            companionButtons.removeAll()
+            companionGlasses.removeAll()
+            for action in companions {
+                let button = UIButton(type: .system)
+                var configuration = UIButton.Configuration.plain()
+                configuration.image = UIImage(systemName: action.symbol)
+                button.configuration = configuration
+                button.accessibilityIdentifier = "craft-tab-companion:" + action.id
+                button.accessibilityLabel = action.accessibilityLabel ?? action.title
+                button.accessibilityValue = action.badge
+                button.accessibilityTraits = chrome.accessorySelected(action) ? [.button, .selected] : [.button]
+                button.addAction(UIAction { [weak self] _ in self?.hybrid.open(action.id) }, for: .touchUpInside)
+                let glass = UIVisualEffectView(effect: UIBlurEffect(style: .systemMaterial))
+#if compiler(>=6.2)
+                if #available(iOS 26.0, *) { glass.effect = UIGlassEffect() }
+#endif
+                glass.layer.cornerRadius = 24
+                glass.clipsToBounds = true
+                glass.isUserInteractionEnabled = false
+                view.addSubview(glass)
+                view.addSubview(button)
+                companionGlasses.append(glass)
+                companionButtons.append(button)
+            }
+        }
+        for (index, action) in companionModels.enumerated() {
+            companionButtons[index].accessibilityTraits = chrome.accessorySelected(action) ? [.button, .selected] : [.button]
+        }
         if let model {
             var configuration = UIButton.Configuration.plain()
             configuration.image = UIImage(systemName: model.symbol)
@@ -1419,7 +1456,7 @@ final class CraftHybridController: UITabBarController, UITabBarControllerDelegat
             accessoryButton.configuration = configuration
             accessoryButton.accessibilityLabel = model.accessibilityLabel ?? model.displayTitle
             accessoryButton.accessibilityValue = model.badge
-            accessoryButton.accessibilityTraits = chrome.accessorySelected ? [.button, .selected] : [.button]
+            accessoryButton.accessibilityTraits = chrome.accessorySelected(model) ? [.button, .selected] : [.button]
         }
 #if compiler(>=6.2)
         if #available(iOS 26.0, *), model?.iconOnly != true {
@@ -1493,6 +1530,11 @@ final class CraftHybridController: UITabBarController, UITabBarControllerDelegat
         let x = iconOnly ? view.bounds.maxX - view.safeAreaInsets.right - width - 20 : 16
         accessoryButton.frame = CGRect(x: x, y: tabBar.frame.minY - height - (iconOnly ? 8 : 0), width: width, height: height)
         accessoryGlass.frame = accessoryButton.frame
+        for (index, button) in companionButtons.enumerated() {
+            // Array order reads left to right, ending at the primary action.
+            button.frame = accessoryButton.frame.offsetBy(dx: -CGFloat(companionButtons.count - index) * (width + 12), dy: 0)
+            companionGlasses[index].frame = button.frame
+        }
         let badgeWidth = max(18, accessoryBadge.intrinsicContentSize.width + 8)
         accessoryBadge.frame = CGRect(x: accessoryButton.frame.maxX - badgeWidth + 4, y: accessoryButton.frame.minY - 3, width: badgeWidth, height: 18)
         // A compact action floats over the page, not across its whole width.

package/dist/ios/templates/CraftNativeScreen.swift

@@ -7856,6 +7856,8 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
     /// the home indicator too, where its content never reaches: a black
     /// full-screen timer is black edge to edge. nil is the app's.
     private var screenBackgroundColor: UIColor?
+    /// Title contrast belongs to this screen, independently of the bar material.
+    private var navigationTitleColor: UIColor?
 
     override var preferredStatusBarStyle: UIStatusBarStyle {
         statusBarStyleOverride ?? .default
@@ -7926,6 +7928,9 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         if let solid = options["navigationBarSolid"] as? Bool {
             navigationBarSolid = solid
         }
+        if options.keys.contains("titleColor") {
+            navigationTitleColor = color(options["titleColor"])
+        }
         if let hidden = options["hidden"] as? Bool {
             navigationBarHidden = hidden
             if navigationController?.topViewController === self {
@@ -7941,7 +7946,7 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
             let buttons = (options["rightButtons"] as? [[String: Any]]) ?? []
             navigationItem.rightBarButtonItems = buttons.compactMap(navigationButton).reversed()
         }
-        if options.keys.contains("backgroundColor") || options.keys.contains("navigationBarSolid") {
+        if options.keys.contains("backgroundColor") || options.keys.contains("navigationBarSolid") || options.keys.contains("titleColor") {
             applyNavigationBarAppearance()
             trackContentScrollView()
         }
@@ -7952,25 +7957,44 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         }
     }
 
-    /// Applies the screen's optional opaque bar without changing the default
-    /// UIKit material when the screen did not opt in.
+    /// Per-item appearances preserve each UIKit bar state and never recolour a
+    /// sibling controller's title or opt a material bar into an opaque fill.
     private func applyNavigationBarAppearance() {
-        guard navigationBarSolid else {
+        guard navigationBarSolid || navigationTitleColor != nil else {
             navigationItem.standardAppearance = nil
             navigationItem.scrollEdgeAppearance = nil
             navigationItem.compactAppearance = nil
             navigationItem.compactScrollEdgeAppearance = nil
             return
         }
-        let appearance = UINavigationBarAppearance()
-        appearance.configureWithOpaqueBackground()
-        appearance.backgroundColor = screenBackgroundColor ?? config.resolvedBackgroundColor
-        appearance.shadowColor = .clear
-        CraftChromeFonts.apply(to: appearance)
-        navigationItem.standardAppearance = appearance
-        navigationItem.scrollEdgeAppearance = appearance
-        navigationItem.compactAppearance = appearance
-        navigationItem.compactScrollEdgeAppearance = appearance
+        let bar = navigationController?.navigationBar
+        let standard = bar?.standardAppearance ?? UINavigationBarAppearance()
+        // UIKit's unspecified scroll-edge appearance uses a transparent
+        // background. Copy its standard text/button attributes before applying
+        // that background so adding title contrast preserves the same states.
+        let scrollEdge = bar?.scrollEdgeAppearance ?? {
+            let appearance = UINavigationBarAppearance(barAppearance: standard)
+            appearance.configureWithTransparentBackground()
+            return appearance
+        }()
+        func styled(_ base: UINavigationBarAppearance) -> UINavigationBarAppearance {
+            let appearance = UINavigationBarAppearance(barAppearance: base)
+            if navigationBarSolid {
+                appearance.configureWithOpaqueBackground()
+                appearance.backgroundColor = screenBackgroundColor ?? config.resolvedBackgroundColor
+                appearance.shadowColor = .clear
+            }
+            CraftChromeFonts.apply(to: appearance)
+            if let navigationTitleColor {
+                appearance.titleTextAttributes[.foregroundColor] = navigationTitleColor
+                appearance.largeTitleTextAttributes[.foregroundColor] = navigationTitleColor
+            }
+            return appearance
+        }
+        navigationItem.standardAppearance = styled(standard)
+        navigationItem.scrollEdgeAppearance = styled(scrollEdge)
+        navigationItem.compactAppearance = styled(bar?.compactAppearance ?? standard)
+        navigationItem.compactScrollEdgeAppearance = styled(bar?.compactScrollEdgeAppearance ?? scrollEdge)
     }
 
     private func applyStatusBar(_ props: [String: Any]) {
@@ -11444,6 +11468,17 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         // UISwitch also owns its native identity and enabled/on state.
         // Assigning .button changes its legacy AX type into a button while
         // modern XCTest still identifies its UIKit class as a switch.
+        // The solid variant publishes "1"/"0" as a string from
+        // refreshAccessibility(). A UISwitch left to UIKit does not: the value
+        // it hands XCTest arrives as a number, so every `value as? String`
+        // read finds nothing. The driver's flip check is one of those reads,
+        // which is why a switch that did flip was reported as never flipping,
+        // and only sometimes - it depends which representation the accessibility
+        // snapshot was built from. Publishing the string makes both variants
+        // answer the same way. An authored accessibilityValue still wins.
+        if let toggle = view as? UISwitch, !authoredAccessibilityValues.contains(id) {
+            view.accessibilityValue = toggle.isOn ? "1" : "0"
+        }
         if view is UITextView || view is UISwitch { return }
         if let toggle = view as? CraftNativeSolidSwitch { toggle.refreshAccessibility(); return }
         view.accessibilityTraits = traits

package/dist/ios/templates/CraftNativeUI.swift

@@ -30,14 +30,22 @@ enum CraftPresenter {
     }
 
     /// Present over whatever is on screen. A controller that shows as a
-    /// popover on iPad (an action sheet, a share sheet) points at `anchor` in
-    /// `view`, or sits in the middle of it with no arrow; iPadOS raises an
-    /// exception for a popover with neither. False when nothing can present,
-    /// so the caller answers rather than waiting.
+    /// popover (an action sheet, a share sheet, on a regular-width screen)
+    /// points at `anchor` in `view`, or sits in the middle of it with no
+    /// arrow; iPadOS raises an exception for a popover with neither. False
+    /// when nothing can present, so the caller answers rather than waiting.
+    ///
+    /// Only where the presentation really is a popover. A `.actionSheet`
+    /// always carries a `popoverPresentationController`, phone included, and
+    /// from iOS 26 configuring it is enough to make the phone present the
+    /// sheet as a centred popover -- which silently drops its cancel action,
+    /// as UIKit never draws one in a popover. A compact screen is left alone
+    /// and gets the standard sheet, with its Cancel.
     @discardableResult
     static func present(_ controller: UIViewController, from view: UIView?, anchor: CGRect? = nil) -> Bool {
         guard let top = topViewController() else { return false }
-        if let popover = controller.popoverPresentationController {
+        let asPopover = (view ?? top.view)?.traitCollection.horizontalSizeClass == .regular
+        if asPopover, let popover = controller.popoverPresentationController {
             let source = view ?? top.view!
             popover.sourceView = source
             if let anchor {

package/dist/package.d.ts

@@ -273,6 +273,10 @@ export type PackagingToolResult = {
     success: false;
     error: string;
 };
+interface DiskImageDetachAttempt {
+    args: string[];
+    error: string;
+}
 /**
  * Eject a mounted image, retrying the contention hdiutil reports as
  * "couldn't eject ... - Resource busy".
@@ -292,6 +296,7 @@ export declare function detachDiskImage(mount: string, options?: {
 } | {
     success: false;
     error: string;
+    attempts: DiskImageDetachAttempt[];
 }>;
 /**
  * Helper: Create DMG from app bundle

package/package.json

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