iOS: prevent toolbar flash when switching primary tabs

CLI/cmux.swift

@@ -40689,6 +40689,13 @@ export default {
         appendIfExisting(Bundle.main.url(forResource: "opencode-plugin", withExtension: "js"))
         appendIfExisting(Bundle.main.resourceURL?.appendingPathComponent("opencode-plugin.js", isDirectory: false))
 
+        if let runtimeRoot = ProcessInfo.processInfo.environment["CMUX_CI_RUNTIME_SOURCE_ROOT"],
+           !runtimeRoot.isEmpty {
+            appendIfExisting(
+                URL(fileURLWithPath: runtimeRoot, isDirectory: true)
+                    .appendingPathComponent("src/Resources/opencode-plugin.js")
+            )
+        }
         if let executableURL = resolvedExecutableURL() {
             let execDir = executableURL.deletingLastPathComponent().standardizedFileURL
             for relativePath in ["opencode-plugin.js", "../opencode-plugin.js", "../../Resources/opencode-plugin.js", "../../../Contents/Resources/opencode-plugin.js"] {

Packages/iOS/CmuxMobileShell/Sources/CmuxMobileShell/MobileShellComposite+AgentFeed.swift

@@ -15,6 +15,7 @@ nonisolated private let mobileShellAgentFeedPrimaryTextByteLimit = 8_192
 nonisolated private let mobileShellAgentFeedSecondaryTextByteLimit = 2_048
 nonisolated private let mobileShellAgentFeedMetadataByteLimit = 512
 nonisolated private let mobileShellAgentFeedMaxItemCount = 400
+nonisolated private let mobileShellAgentFeedRequestTimeoutNanoseconds: UInt64 = 15_000_000_000
 
 private struct AgentFeedTextPage: Decodable {
     let text: String
@@ -311,7 +312,11 @@ extension MobileShellComposite {
                 method: "feed.list",
                 params: [:]
             )
-            let data = try await client.sendRequest(request)
+            let data = try await client.sendRequest(
+                request,
+                timeoutNanoseconds: runtime?.rpcRequestTimeoutNanoseconds
+                    ?? mobileShellAgentFeedRequestTimeoutNanoseconds
+            )
             let response = try MobileAgentFeedListResponse.decode(data)
             guard !Task.isCancelled,
                   agentFeedClient(for: macDeviceID) === client else { return }

Packages/iOS/CmuxMobileShell/Sources/CmuxMobileShell/MobileShellComposite+NotificationFeed.swift

@@ -16,6 +16,7 @@ nonisolated private let mobileShellNotificationFeedSubtitleByteLimit = 512
 nonisolated private let mobileShellNotificationFeedBodyByteLimit = 2_048
 nonisolated private let mobileShellNotificationFeedMetadataByteLimit = 512
 nonisolated private let mobileShellNotificationFeedMaximumImmediateRefreshAttempts = 2
+nonisolated private let mobileShellNotificationFeedRequestTimeoutNanoseconds: UInt64 = 15_000_000_000
 
 @MainActor
 extension MobileShellComposite {
@@ -939,7 +940,10 @@ extension MobileShellComposite {
                 method: "notification.feed.list",
                 params: [:]
             )
-            let data = try await client.sendRequest(request)
+            let data = try await client.sendRequest(
+                request,
+                timeoutNanoseconds: mobileShellNotificationFeedRequestTimeoutNanoseconds
+            )
             let stringLimits = mobileShellNotificationFeedListStringLimits()
             let maxNotifications = MobileNotificationFeedAggregation.maxItemCount
             let decoderTask = Task.detached(priority: .userInitiated) {

Packages/iOS/CmuxMobileShellUI/Sources/CmuxMobileShellUI/AgentFeedStoreView.swift

@@ -12,8 +12,10 @@ struct AgentFeedStoreView: View {
     let status: MobileNotificationFeedStatus
     let pendingReplyRequestIDs: Set<String>
     let pendingTerminalReplyItemIDs: Set<MobileAgentFeedItemID>
+    var isActive = true
 
     @State private var showsNavigationFailure = false
+    @State private var isFeedVisible = false
     @Bindable var searchCoordinator: MobilePrimarySearchCoordinator
 
     var body: some View {
@@ -24,14 +26,18 @@ struct AgentFeedStoreView: View {
             pendingTerminalReplyItemIDs: pendingTerminalReplyItemIDs,
             failedTerminalReplies: store.agentFeedFailedTerminalReplies,
             refreshesOnAppear: true,
+            isActive: isActive,
             actions: actions,
             searchText: searchCoordinator.searchDestinationText(for: .feed)
         )
         .onAppear {
-            store.recordAppEvent(.agentFeedOpened, count: items.count)
+            updateFeedVisibility(isActive)
+        }
+        .onChange(of: isActive) { _, active in
+            updateFeedVisibility(active)
         }
         .onDisappear {
-            store.recordAppEvent(.agentFeedClosed)
+            updateFeedVisibility(false)
         }
         .alert(String(localized: "mobile.agentFeed.openFailed.title", defaultValue: "Couldn’t open event", bundle: .module),
                isPresented: $showsNavigationFailure) {
@@ -95,5 +101,17 @@ struct AgentFeedStoreView: View {
             }
         )
     }
+
+    private func updateFeedVisibility(_ active: Bool) {
+        if active {
+            guard !isFeedVisible else { return }
+            isFeedVisible = true
+            store.recordAppEvent(.agentFeedOpened, count: items.count)
+        } else {
+            guard isFeedVisible else { return }
+            isFeedVisible = false
+            store.recordAppEvent(.agentFeedClosed)
+        }
+    }
 }
 #endif

Packages/iOS/CmuxMobileShellUI/Sources/CmuxMobileShellUI/AgentFeedView.swift

@@ -18,6 +18,7 @@ struct AgentFeedView: View {
     let pendingTerminalReplyItemIDs: Set<MobileAgentFeedItemID>
     var failedTerminalReplies: [MobileAgentFeedItemID: MobileAgentFeedFailedReply] = [:]
     let refreshesOnAppear: Bool
+    var isActive = true
     let actions: AgentFeedActions
     var searchText: String = ""
     @Environment(MobileDisplaySettings.self) private var displaySettings
@@ -34,6 +35,7 @@ struct AgentFeedView: View {
         pendingTerminalReplyItemIDs: Set<MobileAgentFeedItemID>,
         failedTerminalReplies: [MobileAgentFeedItemID: MobileAgentFeedFailedReply] = [:],
         refreshesOnAppear: Bool,
+        isActive: Bool = true,
         actions: AgentFeedActions,
         searchText: String = ""
     ) {
@@ -43,6 +45,7 @@ struct AgentFeedView: View {
         self.pendingTerminalReplyItemIDs = pendingTerminalReplyItemIDs
         self.failedTerminalReplies = failedTerminalReplies
         self.refreshesOnAppear = refreshesOnAppear
+        self.isActive = isActive
         self.actions = actions
         self.searchText = searchText
         _preparedRows = State(initialValue: items.map(AgentFeedRowModel.init))
@@ -129,8 +132,14 @@ struct AgentFeedView: View {
         }
         .onAppear {
             now = Date()
-            guard refreshesOnAppear else { return }
-            Task { await actions.refresh() }
+        }
+        .task(id: isActive) {
+            guard isActive, refreshesOnAppear else { return }
+            // Relative timestamps are anchored to the last visible visit, so
+            // switching away and back cannot leave the feed comparing rows to
+            // the date from its first appearance.
+            now = Date()
+            await actions.refresh()
         }
         .onChange(of: items) { _, newItems in
             preparedRows = newItems.map(AgentFeedRowModel.init)

Packages/iOS/CmuxMobileShellUI/Sources/CmuxMobileShellUI/MobilePrimarySearchNavigationStack.swift

@@ -10,23 +10,34 @@ struct MobilePrimarySearchNavigationStack<Root: View, Destination: View>: View {
     @Binding var path: [MobileWorkspacePreview.ID]
     @Binding var selection: MobilePrimaryTab
     @Bindable var searchCoordinator: MobilePrimarySearchCoordinator
+    var isActive = true
+    var hidesRootNavigationBar = false
+    var managesTabBarVisibility = true
     @ViewBuilder let root: () -> Root
     @ViewBuilder let destination: (MobileWorkspacePreview.ID) -> Destination
 
     var body: some View {
         NavigationStack(path: $path) {
             root()
+                .mobileToolbarVisibility(rootNavigationBarVisibility, for: .navigationBar)
                 .modifier(MobilePrimarySearchLifecycleModifier(
                     scope: searchCoordinator.scope,
-                    update: searchCoordinator.updateLifecycle
+                    update: { scope, isSearching in
+                        guard isActive || !isSearching else { return }
+                        searchCoordinator.updateLifecycle(scope: scope, isSearching: isSearching)
+                    }
                 ))
                 .navigationDestination(for: MobileWorkspacePreview.ID.self, destination: destination)
         }
         .searchable(text: searchText, isPresented: searchPresentation, prompt: prompt)
         .onSubmit(of: .search) {
+            guard isActive else { return }
             selection = searchCoordinator.commitSubmit()
         }
-        .mobileToolbarVisibility(path.isEmpty ? .automatic : .hidden, for: .tabBar)
+        .modifier(MobilePrimarySearchTabBarVisibilityModifier(
+            isEnabled: managesTabBarVisibility,
+            visibility: path.isEmpty ? .automatic : .hidden
+        ))
     }
 
     private var searchPresentation: Binding<Bool> {
@@ -38,6 +49,13 @@ struct MobilePrimarySearchNavigationStack<Root: View, Destination: View>: View {
         )
     }
 
+    private var rootNavigationBarVisibility: Visibility {
+        if #available(iOS 26.0, *), hidesRootNavigationBar {
+            return .hidden
+        }
+        return .automatic
+    }
+
     private var searchText: Binding<String> {
         let scope = searchCoordinator.scope
         let generation = searchCoordinator.activationGeneration

Packages/iOS/CmuxMobileShellUI/Sources/CmuxMobileShellUI/MobilePrimarySearchTabBarVisibilityModifier.swift

@@ -0,0 +1,17 @@
+#if os(iOS)
+import SwiftUI
+
+struct MobilePrimarySearchTabBarVisibilityModifier: ViewModifier {
+    let isEnabled: Bool
+    let visibility: Visibility
+
+    @ViewBuilder
+    func body(content: Content) -> some View {
+        if isEnabled {
+            content.mobileToolbarVisibility(visibility, for: .tabBar)
+        } else {
+            content
+        }
+    }
+}
+#endif

Packages/iOS/CmuxMobileShellUI/Sources/CmuxMobileShellUI/MobilePrimaryTabNavigationHost.swift

@@ -0,0 +1,37 @@
+#if os(iOS)
+import CmuxMobileSupport
+import SwiftUI
+
+/// Keeps the compact tab bar and its root navigation chrome in one hierarchy.
+/// The tab contents still keep their own navigation paths, but they no longer
+/// compete to install the root toolbar as selection changes.
+struct MobilePrimaryTabNavigationHost<Content: View, Toolbar: ToolbarContent>: View {
+    let content: Content
+    let toolbar: Toolbar
+    let toolbarVisibility: Visibility
+    let tabBarVisibility: Visibility
+
+    init(
+        toolbarVisibility: Visibility,
+        tabBarVisibility: Visibility = .automatic,
+        @ToolbarContentBuilder toolbar: () -> Toolbar,
+        @ViewBuilder content: () -> Content
+    ) {
+        self.content = content()
+        self.toolbar = toolbar()
+        self.toolbarVisibility = toolbarVisibility
+        self.tabBarVisibility = tabBarVisibility
+    }
+
+    var body: some View {
+        NavigationStack {
+            content
+                .toolbar {
+                    toolbar
+                }
+                .mobileToolbarVisibility(toolbarVisibility, for: .navigationBar)
+                .mobileToolbarVisibility(tabBarVisibility, for: .tabBar)
+        }
+    }
+}
+#endif

Packages/iOS/CmuxMobileShellUI/Sources/CmuxMobileShellUI/MobilePrimaryTabScaffold.swift

@@ -66,28 +66,20 @@ struct MobilePrimaryTabScaffold<
                     }
                 }
                 .tabViewSearchActivation(.searchTabSelection)
+                .tabViewStyle(.tabBarOnly)
                 .accessibilityIdentifier("MobilePrimaryTabs")
+                .animation(nil, value: selection)
                 .onChange(of: selection, initial: true) { _, selection in
                     searchCoordinator.synchronizeSelection(selection)
                 }
 
-                if selection == .workspaces, let taskComposerAction {
-                    TaskComposerButton(
-                        action: taskComposerAction,
-                        diameter: iOS26BottomControlDiameter
-                    )
-                    .padding(.trailing, iOS26BottomControlInset)
-                    .padding(.bottom, iOS26TaskComposerBottomPadding)
-                    // Compose anchors to the screen, not the keyboard. The
-                    // only keyboard that can appear while it is visible
-                    // belongs to an overlaying sheet (the composer's
-                    // auto-focused prompt), whose inset dragged the button
-                    // toward mid-screen and stranded it there whenever the
-                    // hide update was missed.
-                    .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .bottomTrailing)
-                    .ignoresSafeArea(.keyboard, edges: .bottom)
+                if selection == .workspaces {
+                    iOS26TaskComposerButton
                 }
             }
+            // The composer padding is calibrated from the screen edge. Keep
+            // the scaffold's layout space through the bottom container inset
+            // so the button does not float above its intended position.
             .ignoresSafeArea(.container, edges: .bottom)
         } else if #available(iOS 18.0, *) {
             TabView(selection: $selection) {
@@ -127,6 +119,26 @@ struct MobilePrimaryTabScaffold<
         iOS26BottomControlInset + iOS26BottomControlDiameter + iOS26BottomControlSpacing
     }
 
+    @ViewBuilder
+    private var iOS26TaskComposerButton: some View {
+        if let taskComposerAction {
+            TaskComposerButton(
+                action: taskComposerAction,
+                diameter: iOS26BottomControlDiameter
+            )
+            .padding(.trailing, iOS26BottomControlInset)
+            .padding(.bottom, iOS26TaskComposerBottomPadding)
+            // Compose anchors to the screen, not the keyboard. The
+            // only keyboard that can appear while it is visible
+            // belongs to an overlaying sheet (the composer's
+            // auto-focused prompt), whose inset dragged the button
+            // toward mid-screen and stranded it there whenever the
+            // hide update was missed.
+            .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .bottomTrailing)
+            .ignoresSafeArea(.keyboard, edges: .bottom)
+        }
+    }
+
     private var tabSelection: Binding<MobilePrimaryTab> {
         Binding(
             get: { selection },
@@ -141,7 +153,19 @@ struct MobilePrimaryTabScaffold<
                         searchCoordinator.deactivateCurrentSearch()
                     }
                 }
-                selection = newValue
+                // Each primary tab owns a NavigationStack. Letting the
+                // selection write inherit SwiftUI's default animation makes
+                // UIKit animate the outgoing stack's toolbar away before the
+                // incoming stack has installed its own toolbar items. The
+                // resulting empty frame is the brief flash seen at the top
+                // while switching between Workspaces and Notifications.
+                // Keep the tab contents and their navigation state intact,
+                // but commit the stack swap as one layout transaction.
+                var transaction = Transaction()
+                transaction.disablesAnimations = true
+                withTransaction(transaction) {
+                    selection = newValue
+                }
             }
         )
     }

Packages/iOS/CmuxMobileShellUI/Sources/CmuxMobileShellUI/NotificationFeedFilterMenu.swift

@@ -0,0 +1,35 @@
+#if os(iOS)
+import CmuxMobileShellModel
+import CmuxMobileSupport
+import SwiftUI
+
+/// The feed twin of `WorkspaceListFilterMenu`: read state lives in a toolbar
+/// menu instead of a segmented bar above the list, and the icon fills while a
+/// narrowing filter is active, mirroring Mail.
+struct NotificationFeedFilterMenu: View {
+    @Binding var selection: MobileNotificationFeedFilter
+
+    var body: some View {
+        Menu {
+            Picker(
+                L10n.string("mobile.notificationFeed.filter.label", defaultValue: "Notification filter"),
+                selection: $selection
+            ) {
+                Text(L10n.string(
+                    "mobile.notificationFeed.filter.allNotifications",
+                    defaultValue: "All Notifications"
+                ))
+                .tag(MobileNotificationFeedFilter.all)
+                Text(L10n.string("mobile.notificationFeed.filter.unread", defaultValue: "Unread"))
+                    .tag(MobileNotificationFeedFilter.unread)
+            }
+        } label: {
+            Image(systemName: selection == .unread
+                ? "line.3.horizontal.decrease.circle.fill"
+                : "line.3.horizontal.decrease.circle")
+        }
+        .accessibilityLabel(L10n.string("mobile.notificationFeed.filter", defaultValue: "Filter"))
+        .accessibilityIdentifier("MobileNotificationFeedFilterMenu")
+    }
+}
+#endif