iOS: multiple configurable toolbar rows

.github/swift-file-length-budget.tsv

@@ -24,8 +24,8 @@
 4483	Sources/cmuxApp.swift
 4482	Sources/Panels/FilePreviewPanel.swift
 4367	cmuxTests/BrowserPanelTests.swift
-4283	Packages/iOS/CmuxMobileTerminal/Sources/CmuxMobileTerminal/GhosttySurfaceView.swift
 4121	Sources/BrowserWindowPortal.swift
+3976	Packages/iOS/CmuxMobileTerminal/Sources/CmuxMobileTerminal/GhosttySurfaceView.swift
 3934	Sources/Feed/FeedPanelView.swift
 3926	cmuxTests/TabManagerUnitTests.swift
 3896	cmuxTests/WindowAndDragTests.swift
@@ -58,7 +58,7 @@
 1656	Sources/FileExplorerView.swift
 1652	cmuxTests/CMUXCLIErrorOutputRegressionTests.swift
 1649	cmuxTests/TerminalControllerSocketSecurityTests.swift
-1604	Packages/iOS/CmuxMobileTerminal/Sources/CmuxMobileTerminal/TerminalInputTextView.swift
+1634	Packages/iOS/CmuxMobileTerminal/Sources/CmuxMobileTerminal/TerminalInputTextView.swift
 1560	cmuxTests/TextBoxMentionCompletionTests.swift
 1500	cmuxUITests/MultiWindowNotificationsUITests.swift
 1499	cmuxTests/OmnibarAndToolsTests.swift

Packages/iOS/CmuxMobileShellUI/Sources/CmuxMobileShellUI/TerminalShortcutRowSection.swift

@@ -0,0 +1,9 @@
+#if os(iOS)
+import CmuxMobileTerminal
+
+struct TerminalShortcutRowSection: Identifiable {
+    let id: String
+    let index: Int
+    let items: [ResolvedToolbarItem]
+}
+#endif

Packages/iOS/CmuxMobileShellUI/Sources/CmuxMobileShellUI/TerminalShortcutsSettingsView.swift

@@ -28,15 +28,56 @@ struct TerminalShortcutsSettingsView: View {
     var body: some View {
         NavigationStack {
             List {
-                Section {
-                    ForEach(displayedItems) { item in
-                        row(for: item)
+                if scope == .terminal {
+                    Section {
+                        Stepper(
+                            value: rowCountBinding,
+                            in: TerminalAccessoryConfiguration.minimumRowCount...TerminalAccessoryConfiguration.maximumRowCount
+                        ) {
+                            HStack {
+                                Text(L10n.string("mobile.shortcuts.rows.label", defaultValue: "Rows"))
+                                Spacer()
+                                Text("\(configuration.rowCount)")
+                                    .foregroundStyle(.secondary)
+                            }
+                        }
+                        .accessibilityIdentifier("TerminalShortcutsRowCountStepper")
+                    } header: {
+                        Text(L10n.string("mobile.shortcuts.rows.header", defaultValue: "Toolbar Rows"))
+                    } footer: {
+                        Text(L10n.string(
+                            "mobile.shortcuts.rows.footer",
+                            defaultValue: "Add rows to keep more buttons visible above the keyboard."
+                        ))
+                    }
+
+                    ForEach(displayedRowSections) { rowSection in
+                        Section {
+                            ForEach(rowSection.items) { item in
+                                row(for: item, rowIndex: rowSection.index)
+                            }
+                            .onMove { offsets, destination in
+                                moveDisplayedItems(from: offsets, to: destination, inRow: rowSection.index)
+                            }
+                        } header: {
+                            Text(rowTitle(rowSection.index))
+                        } footer: {
+                            if rowSection.index == displayedRowSections.count - 1 {
+                                Text(scope.footer)
+                            }
+                        }
+                    }
+                } else {
+                    Section {
+                        ForEach(displayedItems) { item in
+                            row(for: item, rowIndex: nil)
+                        }
+                        .onMove(perform: moveDisplayedItems)
+                    } header: {
+                        Text(L10n.string("mobile.shortcuts.header", defaultValue: "Shortcut Buttons"))
+                    } footer: {
+                        Text(scope.footer)
                     }
-                    .onMove(perform: moveDisplayedItems)
-                } header: {
-                    Text(L10n.string("mobile.shortcuts.header", defaultValue: "Shortcut Buttons"))
-                } footer: {
-                    Text(scope.footer)
                 }
 
                 Section {
@@ -84,12 +125,28 @@ struct TerminalShortcutsSettingsView: View {
     }
 
     @ViewBuilder
-    private func row(for item: ResolvedToolbarItem) -> some View {
-        Toggle(isOn: binding(for: item.id)) {
-            if item.isCustom {
-                Label(item.settingsDisplayName, systemImage: "character.cursor.ibeam")
-            } else {
-                Text(item.settingsDisplayName)
+    private func row(for item: ResolvedToolbarItem, rowIndex: Int?) -> some View {
+        HStack {
+            Toggle(isOn: binding(for: item.id)) {
+                if item.isCustom {
+                    Label(item.settingsDisplayName, systemImage: "character.cursor.ibeam")
+                } else {
+                    Text(item.settingsDisplayName)
+                }
+            }
+
+            if scope == .terminal, configuration.rowCount > 1 {
+                Picker(
+                    L10n.string("mobile.shortcuts.rows.movePicker", defaultValue: "Move to Row"),
+                    selection: rowBinding(for: item.id, fallback: rowIndex ?? 0)
+                ) {
+                    ForEach(0..<configuration.rowCount, id: \.self) { index in
+                        Text(rowTitle(index)).tag(index)
+                    }
+                }
+                .labelsHidden()
+                .pickerStyle(.menu)
+                .accessibilityIdentifier("TerminalShortcutRowPicker.\(item.id.storageKey)")
             }
         }
         .accessibilityIdentifier("TerminalShortcutToggle.\(item.id.storageKey)")
@@ -120,26 +177,80 @@ struct TerminalShortcutsSettingsView: View {
         )
     }
 
+    private var rowCountBinding: Binding<Int> {
+        Binding(
+            get: { configuration.rowCount },
+            set: { configuration.setRowCount($0) }
+        )
+    }
+
+    private func rowBinding(for id: ToolbarItemID, fallback: Int) -> Binding<Int> {
+        Binding(
+            get: { rowIndex(for: id) ?? fallback },
+            set: { configuration.moveItem(id, toRow: $0) }
+        )
+    }
+
     private var displayedItems: [ResolvedToolbarItem] {
         configuration.displayItems.filter(scope.includes)
     }
 
-    private func moveDisplayedItems(from offsets: IndexSet, to destination: Int) {
-        guard scope != .terminal else {
-            configuration.moveItems(from: offsets, to: destination)
-            return
+    private var displayedItemRows: [[ResolvedToolbarItem]] {
+        configuration.displayItemRows.map { row in row.filter(scope.includes) }
+    }
+
+    private var displayedRowSections: [TerminalShortcutRowSection] {
+        displayedItemRows.enumerated().map { index, items in
+            TerminalShortcutRowSection(
+                id: "terminal-shortcuts-row-\(index)",
+                index: index,
+                items: items
+            )
         }
+    }
 
+    private func rowIndex(for id: ToolbarItemID) -> Int? {
+        configuration.displayRows.firstIndex { row in row.contains(id) }
+    }
+
+    private func rowTitle(_ rowIndex: Int) -> String {
+        String(
+            format: L10n.string("mobile.shortcuts.rows.rowTitleFormat", defaultValue: "Row %d"),
+            rowIndex + 1
+        )
+    }
+
+    private func moveDisplayedItems(from offsets: IndexSet, to destination: Int) {
         let visibleIDs = displayedItems.map(\.id)
         let visibleSet = Set(visibleIDs)
         var reorderedVisibleIDs = visibleIDs
         reorderedVisibleIDs.move(fromOffsets: offsets, toOffset: destination)
-        var visibleIterator = reorderedVisibleIDs.makeIterator()
-        let reorderedFullIDs = configuration.displayOrder.map { id in
-            guard visibleSet.contains(id) else { return id }
-            return visibleIterator.next() ?? id
+        configuration.reorderItemsAcrossRows(reorderedVisibleIDs, limitedTo: visibleSet)
+    }
+
+    private func moveDisplayedItems(from offsets: IndexSet, to destination: Int, inRow rowIndex: Int) {
+        guard displayedItemRows.indices.contains(rowIndex) else { return }
+        let displayedRowIDs = displayedItemRows[rowIndex].map(\.id)
+        guard !displayedRowIDs.isEmpty else { return }
+
+        if scope == .terminal {
+            // SwiftUI supplies offsets in displayed-row coordinates, while the
+            // configuration mutates raw row coordinates. The terminal scope is
+            // expected to be unfiltered; if that ever changes, this path must
+            // translate indices.
+            guard configuration.displayRows.indices.contains(rowIndex),
+                  displayedRowIDs == configuration.displayRows[rowIndex]
+            else {
+                assertionFailure("Terminal row reordering requires unfiltered row indices")
+                return
+            }
+            configuration.moveItems(from: offsets, to: destination, inRow: rowIndex)
+            return
         }
-        configuration.reorderItems(reorderedFullIDs)
+
+        var reorderedIDs = displayedRowIDs
+        reorderedIDs.move(fromOffsets: offsets, toOffset: destination)
+        configuration.reorderItems(reorderedIDs, limitedTo: Set(displayedRowIDs))
     }
 }
 #endif

Packages/iOS/CmuxMobileTerminal/Sources/CmuxMobileTerminal/GhosttySurfaceView.swift

@@ -624,6 +624,12 @@ public final class GhosttySurfaceView: UIView, TerminalSurfaceHosting {
             name: UIResponder.keyboardWillChangeFrameNotification,
             object: nil
         )
+        NotificationCenter.default.addObserver(
+            self,
+            selector: #selector(handleAccessoryConfigurationChanged),
+            name: TerminalAccessoryConfiguration.didChangeNotification,
+            object: nil
+        )
     }
 
     @objc private func handleAppWillResignActive() {
@@ -697,14 +703,11 @@ public final class GhosttySurfaceView: UIView, TerminalSurfaceHosting {
     /// still lands even if the toolbar UI is absent.
     private var reservedToolbarHeight: CGFloat = 0
     /// Height of the docked accessory bar reserved in the grid geometry so the
-    /// bottom TUI rows stay visible above it. Locked to the bar's actual button-row
-    /// height (`TerminalInputTextView.dockedButtonRowHeight`) so the grid reserves
-    /// EXACTLY the strip the buttons occupy — no taller. Round 3 reserved 44 while
-    /// the strip was only 34, so the extra 10pt rendered as bar background below
-    /// the buttons (the "gap below" Lawrence kept seeing). Matching them keeps the
-    /// toolbar's live top edge equal to the viewport edge; any whole-cell render
-    /// remainder stays inside the terminal viewport instead of becoming toolbar fill.
-    private static let persistentToolbarHeight: CGFloat = TerminalInputTextView.dockedButtonRowHeight
+    /// bottom TUI rows stay visible above it. Locked to the bar's actual configured
+    /// row-stack height so the grid reserves exactly the strip the buttons occupy.
+    private var persistentToolbarHeight: CGFloat {
+        TerminalAccessoryDockMetrics(rowCount: TerminalAccessoryConfiguration.shared.rowCount).buttonRowHeight
+    }
     /// The docked accessory bar. Positioned by ``bottomDockFrames()`` with the
     /// SAME bottom-occupancy math as the grid reservation, so its top is always
     /// flush with the grid bottom (no gap) and its bottom rests on the keyboard
@@ -985,7 +988,7 @@ public final class GhosttySurfaceView: UIView, TerminalSurfaceHosting {
             keyboardHeight: keyboardHeight,
             composerBandHeight: composerBandHeight,
             reservedToolbarHeight: reservedToolbarHeight,
-            toolbarFrameHeight: Self.persistentToolbarHeight,
+            toolbarFrameHeight: persistentToolbarHeight,
             bottomSafeAreaInset: safeAreaInsetsBottom,
             chromeHidden: chromeHidden,
             chromeVisible: dockedToolbarShouldBeVisible && dockedToolbar?.isHidden == false,
@@ -1042,10 +1045,11 @@ public final class GhosttySurfaceView: UIView, TerminalSurfaceHosting {
     /// the current keyboard + composer state. Hiding the bar releases its reserved
     /// height so the terminal grid reclaims that space; showing it reserves the
     /// height again. Idempotent: a no-op when already in the target state.
-    private func updateDockedToolbarVisibility() {
+    @discardableResult
+    private func updateDockedToolbarVisibility() -> Bool {
         let shouldShow = dockedToolbarShouldBeVisible
-        let reserved: CGFloat = shouldShow ? Self.persistentToolbarHeight : 0
-        guard dockedToolbar?.isHidden != !shouldShow || reservedToolbarHeight != reserved else { return }
+        let reserved: CGFloat = shouldShow ? persistentToolbarHeight : 0
+        guard dockedToolbar?.isHidden != !shouldShow || reservedToolbarHeight != reserved else { return false }
         dockedToolbar?.isHidden = !shouldShow
         // The composer band rides with the toolbar: hide it when the chrome is
         // suppressed, show it again when the chrome returns and a field is mounted.
@@ -1056,6 +1060,13 @@ public final class GhosttySurfaceView: UIView, TerminalSurfaceHosting {
         layoutRenderedTerminalForCurrentViewport()
         setNeedsGeometrySync()
         setNeedsLayout()
+        return true
+    }
+
+    @objc private func handleAccessoryConfigurationChanged() {
+        guard updateDockedToolbarVisibility() else { return }
+        layoutBottomDock()
+        layoutZoomOverlay()
     }
 
     /// Temporarily hide (or re-show) the bottom chrome — the always-visible toolbar
@@ -1731,6 +1742,7 @@ public final class GhosttySurfaceView: UIView, TerminalSurfaceHosting {
     }
 
     deinit {
+        NotificationCenter.default.removeObserver(self)
         stopKeyboardHeightAnimation()
         disposeSurface()
     }