@lattices/cli 0.4.7 → 0.4.9

package/app/Sources/AppShell/SettingsView.swift

@@ -6,6 +6,7 @@ import SwiftUI
 struct SettingsContentView: View {
     private enum SettingsSection: String, CaseIterable, Identifiable {
         case general
+        case companion
         case ai
         case search
         case shortcuts
@@ -15,6 +16,7 @@ struct SettingsContentView: View {
         var title: String {
             switch self {
             case .general: return "General"
+            case .companion: return "Companion"
             case .ai: return "AI"
             case .search: return "Search & OCR"
             case .shortcuts: return "Shortcuts"
@@ -24,6 +26,7 @@ struct SettingsContentView: View {
         var icon: String {
             switch self {
             case .general: return "slider.horizontal.3"
+            case .companion: return "ipad.and.iphone"
             case .ai: return "sparkles"
             case .search: return "text.viewfinder"
             case .shortcuts: return "command"
@@ -33,6 +36,7 @@ struct SettingsContentView: View {
         var eyebrow: String {
             switch self {
             case .general: return "Workspace"
+            case .companion: return "Local Bridge"
             case .ai: return "Agents"
             case .search: return "Indexing"
             case .shortcuts: return "Controls"
@@ -43,6 +47,8 @@ struct SettingsContentView: View {
             switch self {
             case .general:
                 return "Terminal defaults, scan roots, window snapping, and app updates."
+            case .companion:
+                return "Local-network pairing, trusted iPad devices, and bridge security."
             case .ai:
                 return "Claude CLI detection plus advisor model and spending controls."
             case .search:
@@ -60,6 +66,7 @@ struct SettingsContentView: View {
     @ObservedObject var workspaceManager: WorkspaceManager = .shared
     @ObservedObject var appUpdater: AppUpdater = .shared
     @ObservedObject var mouseShortcutStore: MouseShortcutStore = .shared
+    @ObservedObject var keyboardRemapStore: KeyboardRemapStore = .shared
     var onBack: (() -> Void)? = nil
 
     @State private var selectedTab: SettingsSection = .general
@@ -78,6 +85,11 @@ struct SettingsContentView: View {
         .frame(maxWidth: .infinity, maxHeight: .infinity)
         .clipped()
         .background(PanelBackground())
+        .onAppear {
+            if page == .companionSettings {
+                selectedTab = .companion
+            }
+        }
     }
 
     // MARK: - Back Bar
@@ -96,15 +108,17 @@ struct SettingsContentView: View {
     private var backBar: some View {
         VStack(spacing: 0) {
             HStack(spacing: 8) {
-                Button {
-                    onBack?()
-                } label: {
-                    Image(systemName: "chevron.left")
-                        .font(.system(size: 10, weight: .semibold))
-                        .foregroundColor(Palette.textMuted)
+                if let onBack {
+                    Button {
+                        onBack()
+                    } label: {
+                        Image(systemName: "chevron.left")
+                            .font(.system(size: 10, weight: .semibold))
+                            .foregroundColor(Palette.textMuted)
+                    }
+                    .buttonStyle(.plain)
+                    .onHover { h in if h { NSCursor.pointingHand.push() } else { NSCursor.pop() } }
                 }
-                .buttonStyle(.plain)
-                .onHover { h in if h { NSCursor.pointingHand.push() } else { NSCursor.pop() } }
 
                 Text(page == .docs ? "Docs" : currentTabLabel)
                     .font(Typo.heading(13))
@@ -240,6 +254,8 @@ struct SettingsContentView: View {
         switch selectedTab {
         case .general:
             generalContent
+        case .companion:
+            companionContent
         case .ai:
             aiContent
         case .search:
@@ -285,15 +301,53 @@ struct SettingsContentView: View {
                                 .font(Typo.mono(12))
                                 .foregroundColor(Palette.text)
                             Spacer()
-                            Text("v\(appUpdater.currentVersion)")
+                            Text("Current v\(appUpdater.currentVersion)")
                                 .font(Typo.caption(10))
                                 .foregroundColor(Palette.textMuted)
                         }
 
-                        Text("Install the latest published app build without leaving the menu bar. The app relaunches when the update finishes.")
+                        Text("Lattices can check for new signed releases and prepare the update here. You’ll confirm before the app quits and relaunches.")
                             .font(Typo.caption(10))
                             .foregroundColor(Palette.textMuted)
 
+                        if let update = appUpdater.availableUpdate {
+                            VStack(alignment: .leading, spacing: 6) {
+                                HStack(spacing: 6) {
+                                    Image(systemName: "gift.fill")
+                                        .font(.system(size: 10, weight: .semibold))
+                                        .foregroundColor(Palette.detach)
+                                    Text("New version v\(update.version) is ready")
+                                        .font(Typo.monoBold(10))
+                                        .foregroundColor(Palette.detach)
+                                }
+
+                                if !update.releaseNotes.isEmpty {
+                                    Text(String(update.releaseNotes.prefix(180)) + (update.releaseNotes.count > 180 ? "..." : ""))
+                                        .font(Typo.caption(9))
+                                        .foregroundColor(Palette.textMuted)
+                                        .lineLimit(3)
+                                }
+                            }
+                            .padding(8)
+                            .background(
+                                RoundedRectangle(cornerRadius: 5)
+                                    .fill(Palette.surfaceHov.opacity(0.65))
+                                    .overlay(RoundedRectangle(cornerRadius: 5).strokeBorder(Palette.detach.opacity(0.35), lineWidth: 0.5))
+                            )
+                        } else if appUpdater.isChecking {
+                            Text("Checking for updates...")
+                                .font(Typo.caption(9))
+                                .foregroundColor(Palette.textMuted)
+                        } else if let error = appUpdater.lastError {
+                            Text(error)
+                                .font(Typo.caption(9))
+                                .foregroundColor(Palette.detach.opacity(0.9))
+                        } else if let checked = appUpdater.lastChecked {
+                            Text("Last checked \(checked, style: .relative)")
+                                .font(Typo.caption(9))
+                                .foregroundColor(Palette.textMuted.opacity(0.8))
+                        }
+
                         if let status = appUpdater.statusMessage {
                             Text(status)
                                 .font(Typo.caption(9))
@@ -310,7 +364,7 @@ struct SettingsContentView: View {
                             Button {
                                 appUpdater.promptForUpdate()
                             } label: {
-                                Text(appUpdater.isUpdating ? "Updating…" : "Update Lattices")
+                                Text(appUpdater.isUpdating ? "Preparing…" : (appUpdater.availableUpdate == nil ? "Check for Updates" : "Update to v\(appUpdater.availableUpdate?.version ?? "")"))
                                     .font(Typo.monoBold(10))
                                     .foregroundColor(Palette.text)
                                     .padding(.horizontal, 12)
@@ -324,6 +378,43 @@ struct SettingsContentView: View {
                             .buttonStyle(.plain)
                             .disabled(appUpdater.isUpdating)
 
+                            Button {
+                                Task { await appUpdater.check() }
+                            } label: {
+                                Text(appUpdater.isChecking ? "Checking..." : "Check Now")
+                                    .font(Typo.caption(9))
+                                    .foregroundColor(Palette.textMuted.opacity(0.9))
+                            }
+                            .buttonStyle(.plain)
+                            .disabled(appUpdater.isChecking)
+
+                            Toggle("Auto", isOn: $appUpdater.autoCheckEnabled)
+                                .font(Typo.caption(9))
+                                .toggleStyle(.checkbox)
+                                .foregroundColor(Palette.textMuted.opacity(0.9))
+
+                            if appUpdater.availableUpdate != nil {
+                                Button {
+                                    appUpdater.viewCurrentRelease()
+                                } label: {
+                                    Text("Release Notes")
+                                        .font(Typo.caption(9))
+                                        .foregroundColor(Palette.textMuted.opacity(0.9))
+                                }
+                                .buttonStyle(.plain)
+
+                                Button {
+                                    appUpdater.skipCurrentUpdate()
+                                } label: {
+                                    Text("Skip")
+                                        .font(Typo.caption(9))
+                                        .foregroundColor(Palette.textMuted.opacity(0.75))
+                                }
+                                .buttonStyle(.plain)
+                            }
+
+                            Spacer()
+
                             Text("CLI: `lattices app update`")
                                 .font(Typo.caption(9))
                                 .foregroundColor(Palette.textMuted.opacity(0.8))
@@ -590,6 +681,83 @@ struct SettingsContentView: View {
                             .foregroundColor(Palette.textMuted.opacity(0.7))
                     }
                 }
+
+                settingsCard {
+                    VStack(alignment: .leading, spacing: 10) {
+                        Text("Keyboard remaps")
+                            .font(Typo.mono(11))
+                            .foregroundColor(Palette.text)
+
+                        HStack {
+                            Text("Caps Lock as Hyper")
+                                .font(Typo.mono(10))
+                                .foregroundColor(Palette.textDim)
+                            Spacer()
+                            Toggle("", isOn: $prefs.keyboardRemapsEnabled)
+                                .toggleStyle(.switch)
+                                .controlSize(.small)
+                                .labelsHidden()
+                        }
+
+                        Text("Rules live in ~/.lattices/keyboard-remaps.json. The default maps hold Caps Lock to Hyper and tap Caps Lock to Escape, so the existing Hyper shortcuts work on the laptop keyboard.")
+                            .font(Typo.caption(9))
+                            .foregroundColor(Palette.textMuted.opacity(0.7))
+
+                        cardDivider
+
+                        VStack(alignment: .leading, spacing: 6) {
+                            Text("Active remaps")
+                                .font(Typo.mono(10))
+                                .foregroundColor(Palette.textDim)
+
+                            ForEach(keyboardRemapStore.summaryLines.prefix(4), id: \.self) { line in
+                                Text(line)
+                                    .font(Typo.caption(9))
+                                    .foregroundColor(Palette.textMuted.opacity(0.78))
+                            }
+
+                            if keyboardRemapStore.summaryLines.isEmpty {
+                                Text("No active remaps")
+                                    .font(Typo.caption(9))
+                                    .foregroundColor(Palette.textMuted.opacity(0.6))
+                            }
+                        }
+
+                        HStack(spacing: 8) {
+                            Button {
+                                keyboardRemapStore.openConfiguration()
+                            } label: {
+                                Text("Configure...")
+                                    .font(Typo.monoBold(10))
+                                    .foregroundColor(Palette.text)
+                                    .padding(.horizontal, 12)
+                                    .padding(.vertical, 4)
+                                    .background(
+                                        RoundedRectangle(cornerRadius: 4)
+                                            .fill(Palette.surfaceHov)
+                                            .overlay(RoundedRectangle(cornerRadius: 4).strokeBorder(Palette.borderLit, lineWidth: 0.5))
+                                    )
+                            }
+                            .buttonStyle(.plain)
+
+                            Button {
+                                keyboardRemapStore.restoreDefaults()
+                            } label: {
+                                Text("Restore Defaults")
+                                    .font(Typo.monoBold(10))
+                                    .foregroundColor(Palette.text)
+                                    .padding(.horizontal, 12)
+                                    .padding(.vertical, 4)
+                                    .background(
+                                        RoundedRectangle(cornerRadius: 4)
+                                            .fill(Palette.surfaceHov)
+                                            .overlay(RoundedRectangle(cornerRadius: 4).strokeBorder(Palette.borderLit, lineWidth: 0.5))
+                                    )
+                            }
+                            .buttonStyle(.plain)
+                        }
+                    }
+                }
             }
             .padding(16)
             .frame(maxWidth: 760, alignment: .leading)
@@ -597,6 +765,371 @@ struct SettingsContentView: View {
         }
     }
 
+    // MARK: - Companion
+
+    private var companionContent: some View {
+        ScrollView {
+            VStack(alignment: .leading, spacing: 12) {
+                companionBridgeOverviewCard
+                companionTrustedDevicesCard
+
+                settingsCard {
+                    VStack(alignment: .leading, spacing: 10) {
+                        Text("Input")
+                            .font(Typo.mono(11))
+                            .foregroundColor(Palette.text)
+
+                        HStack(alignment: .top, spacing: 12) {
+                            VStack(alignment: .leading, spacing: 4) {
+                                Text("Trackpad proxy")
+                                    .font(Typo.mono(10))
+                                    .foregroundColor(Palette.textDim)
+                                Text("Allow paired companions with the input.trackpad grant to move the Mac pointer through the encrypted bridge.")
+                                    .font(Typo.caption(9.5))
+                                    .foregroundColor(Palette.textMuted.opacity(0.75))
+                                    .fixedSize(horizontal: false, vertical: true)
+                            }
+
+                            Spacer()
+
+                            Toggle("", isOn: $prefs.companionTrackpadEnabled)
+                                .toggleStyle(.switch)
+                                .controlSize(.small)
+                                .labelsHidden()
+                                .disabled(!prefs.companionBridgeEnabled)
+                                .opacity(prefs.companionBridgeEnabled ? 1 : 0.45)
+                        }
+                    }
+                }
+            }
+            .padding(16)
+            .frame(maxWidth: 760, alignment: .leading)
+            .frame(maxWidth: .infinity, alignment: .leading)
+        }
+    }
+
+    private var companionBridgeOverviewCard: some View {
+        settingsCard {
+            VStack(alignment: .leading, spacing: 12) {
+                HStack(alignment: .top, spacing: 10) {
+                    RoundedRectangle(cornerRadius: 6)
+                        .fill(Palette.running.opacity(0.14))
+                        .overlay(
+                            Image(systemName: "lock.shield")
+                                .font(.system(size: 13, weight: .semibold))
+                                .foregroundColor(Palette.running)
+                        )
+                        .frame(width: 30, height: 30)
+
+                    VStack(alignment: .leading, spacing: 3) {
+                        Text(prefs.companionBridgeEnabled ? "Secure local bridge" : "Local bridge off")
+                            .font(Typo.mono(12))
+                            .foregroundColor(Palette.text)
+                        Text(prefs.companionBridgeEnabled
+                            ? "Bonjour discovery with explicit Mac approval, signed requests, encrypted payloads, and capability grants."
+                            : "The companion bridge is not listening or advertising on the local network until you turn it on.")
+                            .font(Typo.caption(10))
+                            .foregroundColor(Palette.textMuted)
+                            .fixedSize(horizontal: false, vertical: true)
+                    }
+
+                    Spacer()
+
+                    Toggle("", isOn: $prefs.companionBridgeEnabled)
+                        .toggleStyle(.switch)
+                        .controlSize(.small)
+                        .labelsHidden()
+                }
+
+                cardDivider
+
+                LazyVGrid(
+                    columns: [
+                        GridItem(.flexible(minimum: 120), spacing: 10, alignment: .leading),
+                        GridItem(.flexible(minimum: 120), spacing: 10, alignment: .leading),
+                        GridItem(.flexible(minimum: 120), spacing: 10, alignment: .leading),
+                    ],
+                    alignment: .leading,
+                    spacing: 10
+                ) {
+                    companionBridgeFact(
+                        label: "Status",
+                        value: prefs.companionBridgeEnabled ? "enabled" : "off"
+                    )
+                    companionBridgeFact(
+                        label: "Port",
+                        value: String(LatticesCompanionBridgeServer.defaultPort)
+                    )
+                    companionBridgeFact(
+                        label: "Protocol",
+                        value: "v\(LatticesCompanionBridgeServer.protocolVersion)"
+                    )
+                }
+
+                VStack(alignment: .leading, spacing: 5) {
+                    Text("Enable deep link")
+                        .font(Typo.mono(10))
+                        .foregroundColor(Palette.textDim)
+                    Text("lattices://companion/enable")
+                        .font(Typo.monoBold(12))
+                        .foregroundColor(Palette.text)
+                        .textSelection(.enabled)
+                }
+                .padding(10)
+                .frame(maxWidth: .infinity, alignment: .leading)
+                .background(shortcutsInsetPanel)
+
+                VStack(alignment: .leading, spacing: 5) {
+                    Text("Mac bridge fingerprint")
+                        .font(Typo.mono(10))
+                        .foregroundColor(Palette.textDim)
+                    Text(LatticesCompanionSecurityCoordinator.shared.bridgeFingerprint)
+                        .font(Typo.monoBold(13))
+                        .foregroundColor(Palette.text)
+                        .textSelection(.enabled)
+                }
+                .padding(10)
+                .frame(maxWidth: .infinity, alignment: .leading)
+                .background(shortcutsInsetPanel)
+
+                HStack(spacing: 6) {
+                    ForEach(DeckBridgeCapability.defaultCompanionCapabilities, id: \.self) { capability in
+                        companionCapabilityBadge(capability)
+                    }
+                    Spacer(minLength: 0)
+                }
+            }
+        }
+    }
+
+    private var companionTrustedDevicesCard: some View {
+        let trustedDevices = companionTrustedDevices(revision: companionTrustRevision)
+
+        return settingsCard {
+            VStack(alignment: .leading, spacing: 12) {
+                HStack(alignment: .top, spacing: 12) {
+                    VStack(alignment: .leading, spacing: 4) {
+                        Text("Paired devices")
+                            .font(Typo.mono(12))
+                            .foregroundColor(Palette.text)
+                        Text("Only trusted devices can call protected deck and input routes. Pairing grants are listed per device.")
+                            .font(Typo.caption(10))
+                            .foregroundColor(Palette.textMuted)
+                            .fixedSize(horizontal: false, vertical: true)
+                    }
+
+                    Spacer()
+
+                    HStack(spacing: 8) {
+                        Button {
+                            companionTrustRevision += 1
+                        } label: {
+                            Image(systemName: "arrow.clockwise")
+                                .font(.system(size: 10, weight: .semibold))
+                                .foregroundColor(Palette.textDim)
+                                .frame(width: 24, height: 24)
+                                .background(
+                                    RoundedRectangle(cornerRadius: 5)
+                                        .fill(Palette.surfaceHov)
+                                        .overlay(RoundedRectangle(cornerRadius: 5).strokeBorder(Palette.borderLit, lineWidth: 0.5))
+                                )
+                        }
+                        .buttonStyle(.plain)
+
+                        if trustedDevices.isEmpty == false {
+                            Button {
+                                guard confirmForgetTrustedDevices() else { return }
+                                LatticesCompanionSecurityCoordinator.shared.clearTrustedDevices()
+                                companionTrustRevision += 1
+                            } label: {
+                                Text("Forget All")
+                                    .font(Typo.monoBold(10))
+                                    .foregroundColor(Palette.kill.opacity(0.9))
+                                    .padding(.horizontal, 10)
+                                    .padding(.vertical, 5)
+                                    .background(
+                                        RoundedRectangle(cornerRadius: 5)
+                                            .fill(Palette.kill.opacity(0.10))
+                                            .overlay(RoundedRectangle(cornerRadius: 5).strokeBorder(Palette.kill.opacity(0.22), lineWidth: 0.5))
+                                    )
+                            }
+                            .buttonStyle(.plain)
+                        }
+                    }
+                }
+
+                if trustedDevices.isEmpty {
+                    VStack(alignment: .leading, spacing: 6) {
+                        Image(systemName: "ipad.and.iphone")
+                            .font(.system(size: 18, weight: .semibold))
+                            .foregroundColor(Palette.textMuted)
+
+                        Text("No paired iPad or iPhone devices yet.")
+                            .font(Typo.caption(10.5))
+                            .foregroundColor(Palette.textMuted)
+
+                        Text("Open the Lattices companion app on your iPad and select this Mac. You’ll approve the pairing prompt here.")
+                            .font(Typo.caption(9.5))
+                            .foregroundColor(Palette.textMuted.opacity(0.72))
+                            .fixedSize(horizontal: false, vertical: true)
+                    }
+                    .padding(12)
+                    .frame(maxWidth: .infinity, alignment: .leading)
+                    .background(shortcutsInsetPanel)
+                } else {
+                    VStack(alignment: .leading, spacing: 8) {
+                        ForEach(trustedDevices) { device in
+                            companionDeviceRow(device)
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    private func companionBridgeFact(label: String, value: String) -> some View {
+        VStack(alignment: .leading, spacing: 5) {
+            Text(label.uppercased())
+                .font(Typo.pixel(11))
+                .foregroundColor(Palette.textDim)
+                .tracking(1)
+            Text(value)
+                .font(Typo.monoBold(11))
+                .foregroundColor(Palette.text)
+                .lineLimit(1)
+                .truncationMode(.middle)
+        }
+        .padding(10)
+        .frame(maxWidth: .infinity, alignment: .leading)
+        .background(shortcutsInsetPanel)
+    }
+
+    private func companionDeviceRow(_ device: DeckTrustedDeviceSummary) -> some View {
+        HStack(alignment: .top, spacing: 10) {
+            RoundedRectangle(cornerRadius: 6)
+                .fill(Palette.surfaceHov)
+                .overlay(
+                    Image(systemName: companionDeviceIcon(for: device.name))
+                        .font(.system(size: 13, weight: .semibold))
+                        .foregroundColor(Palette.textDim)
+                )
+                .frame(width: 30, height: 30)
+
+            VStack(alignment: .leading, spacing: 6) {
+                HStack(alignment: .firstTextBaseline, spacing: 8) {
+                    Text(device.name)
+                        .font(Typo.monoBold(11))
+                        .foregroundColor(Palette.text)
+                        .lineLimit(1)
+
+                    Text(device.fingerprint)
+                        .font(Typo.mono(10))
+                        .foregroundColor(Palette.textMuted)
+                        .lineLimit(1)
+
+                    Spacer(minLength: 0)
+                }
+
+                HStack(spacing: 10) {
+                    Text("Paired \(relativeTimestamp(device.pairedAt))")
+                    Text("Last seen \(relativeTimestamp(device.lastSeenAt))")
+                }
+                .font(Typo.caption(9.5))
+                .foregroundColor(Palette.textMuted.opacity(0.78))
+
+                HStack(spacing: 6) {
+                    ForEach(device.capabilities, id: \.self) { capability in
+                        companionCapabilityBadge(capability)
+                    }
+                }
+            }
+
+            Spacer(minLength: 0)
+
+            Button {
+                guard confirmRevokeTrustedDevice(device) else { return }
+                LatticesCompanionSecurityCoordinator.shared.revokeTrustedDevice(id: device.id)
+                companionTrustRevision += 1
+            } label: {
+                HStack(spacing: 5) {
+                    Image(systemName: "xmark.shield")
+                        .font(.system(size: 10, weight: .semibold))
+                    Text("Revoke")
+                        .font(Typo.monoBold(9.5))
+                }
+                .foregroundColor(Palette.kill.opacity(0.95))
+                .padding(.horizontal, 8)
+                .padding(.vertical, 5)
+                .background(
+                    RoundedRectangle(cornerRadius: 5)
+                        .fill(Palette.kill.opacity(0.10))
+                        .overlay(RoundedRectangle(cornerRadius: 5).strokeBorder(Palette.kill.opacity(0.22), lineWidth: 0.5))
+                )
+            }
+            .buttonStyle(.plain)
+            .help("Revoke this paired device")
+        }
+        .padding(12)
+        .frame(maxWidth: .infinity, alignment: .leading)
+        .background(shortcutsInsetPanel)
+    }
+
+    private func companionCapabilityBadge(_ capability: String) -> some View {
+        Text(companionCapabilityLabel(capability))
+            .font(Typo.monoBold(9))
+            .foregroundColor(Palette.running.opacity(0.92))
+            .padding(.horizontal, 7)
+            .padding(.vertical, 3)
+            .background(
+                Capsule()
+                    .fill(Palette.running.opacity(0.10))
+                    .overlay(Capsule().strokeBorder(Palette.running.opacity(0.18), lineWidth: 0.5))
+            )
+    }
+
+    private func companionCapabilityLabel(_ capability: String) -> String {
+        switch capability {
+        case DeckBridgeCapability.deckRead:
+            return "Deck Read"
+        case DeckBridgeCapability.deckPerform:
+            return "Deck Actions"
+        case DeckBridgeCapability.inputTrackpad:
+            return "Trackpad"
+        default:
+            return capability
+        }
+    }
+
+    private func companionDeviceIcon(for name: String) -> String {
+        name.localizedCaseInsensitiveContains("ipad") ? "ipad" : "iphone"
+    }
+
+    private func confirmForgetTrustedDevices() -> Bool {
+        let alert = NSAlert()
+        alert.alertStyle = .warning
+        alert.messageText = "Forget all paired companion devices?"
+        alert.informativeText = "Your iPad or iPhone will need to pair again before it can control Lattices."
+        alert.addButton(withTitle: "Forget Devices")
+        alert.addButton(withTitle: "Cancel")
+        return alert.runModal() == .alertFirstButtonReturn
+    }
+
+    private func confirmRevokeTrustedDevice(_ device: DeckTrustedDeviceSummary) -> Bool {
+        let alert = NSAlert()
+        alert.alertStyle = .warning
+        alert.messageText = "Revoke \(device.name)?"
+        alert.informativeText = """
+        This removes the paired-device trust record for \(device.name).
+
+        Fingerprint: \(device.fingerprint)
+
+        The device will need to pair again before it can control Lattices.
+        """
+        alert.addButton(withTitle: "Revoke Device")
+        alert.addButton(withTitle: "Cancel")
+        return alert.runModal() == .alertFirstButtonReturn
+    }
+
     // MARK: - AI
 
     private var aiContent: some View {
@@ -1249,7 +1782,7 @@ struct SettingsContentView: View {
         let layout = LatticesCompanionCockpitCatalog.normalized(prefs.companionCockpitLayout)
         let selectedPage = layout.pages.first(where: { $0.id == selectedCompanionCockpitPageID }) ?? layout.pages.first
         let categories = LatticesCompanionShortcutCategory.allCases
-        let trustedDevices = companionTrustedDevices(revision: companionTrustRevision)
+        let trustedDeviceCount = companionTrustedDevices(revision: companionTrustRevision).count
 
         return shortcutSectionCard(
             title: "Companion Cockpit",
@@ -1273,63 +1806,45 @@ struct SettingsContentView: View {
                     Toggle("", isOn: $prefs.companionTrackpadEnabled)
                         .toggleStyle(.switch)
                         .labelsHidden()
+                        .disabled(!prefs.companionBridgeEnabled)
+                        .opacity(prefs.companionBridgeEnabled ? 1 : 0.45)
                 }
 
-                VStack(alignment: .leading, spacing: 8) {
-                    HStack {
-                        VStack(alignment: .leading, spacing: 4) {
-                            Text("Trusted Devices")
-                                .font(Typo.monoBold(11))
-                                .foregroundColor(Palette.text)
-                            Text("New companions must be approved on the Mac before they can send encrypted bridge requests.")
-                                .font(Typo.caption(10.5))
-                                .foregroundColor(Palette.textMuted)
-                                .fixedSize(horizontal: false, vertical: true)
-                        }
-
-                        Spacer()
-
-                        if trustedDevices.isEmpty == false {
-                            Button("Forget All") {
-                                LatticesCompanionSecurityCoordinator.shared.clearTrustedDevices()
-                                companionTrustRevision += 1
-                            }
-                            .buttonStyle(.plain)
+                HStack(alignment: .center, spacing: 12) {
+                    VStack(alignment: .leading, spacing: 4) {
+                        Text("Pairing and trust")
+                            .font(Typo.monoBold(11))
+                            .foregroundColor(Palette.text)
+                        Text("\(trustedDeviceCount) paired \(trustedDeviceCount == 1 ? "device" : "devices"). Revoke devices and review bridge grants in Companion settings.")
                             .font(Typo.caption(10.5))
-                            .foregroundColor(Palette.textDim)
-                        }
+                            .foregroundColor(Palette.textMuted)
+                            .fixedSize(horizontal: false, vertical: true)
                     }
 
-                    VStack(alignment: .leading, spacing: 6) {
-                        if trustedDevices.isEmpty {
-                            Text("No paired iPad or iPhone devices yet.")
-                                .font(Typo.caption(10.5))
-                                .foregroundColor(Palette.textMuted)
-                        } else {
-                            ForEach(trustedDevices) { device in
-                                HStack(alignment: .top, spacing: 10) {
-                                    Image(systemName: "iphone.gen3")
-                                        .font(.system(size: 11, weight: .semibold))
-                                        .foregroundColor(Palette.textDim)
-                                        .frame(width: 14)
-
-                                    VStack(alignment: .leading, spacing: 2) {
-                                        Text(device.name)
-                                            .font(Typo.caption(11))
-                                            .foregroundColor(Palette.text)
-                                        Text("\(device.fingerprint) · Last seen \(relativeTimestamp(device.lastSeenAt))")
-                                            .font(Typo.caption(10))
-                                            .foregroundColor(Palette.textMuted)
-                                    }
-
-                                    Spacer(minLength: 0)
-                                }
-                            }
+                    Spacer()
+
+                    Button {
+                        selectedTab = .companion
+                    } label: {
+                        HStack(spacing: 5) {
+                            Image(systemName: "ipad.and.iphone")
+                                .font(.system(size: 10, weight: .semibold))
+                            Text("Manage")
+                                .font(Typo.monoBold(10))
                         }
+                        .foregroundColor(Palette.text)
+                        .padding(.horizontal, 10)
+                        .padding(.vertical, 5)
+                        .background(
+                            RoundedRectangle(cornerRadius: 5)
+                                .fill(Palette.surfaceHov)
+                                .overlay(RoundedRectangle(cornerRadius: 5).strokeBorder(Palette.borderLit, lineWidth: 0.5))
+                        )
                     }
-                    .padding(12)
-                    .background(shortcutsInsetPanel)
+                    .buttonStyle(.plain)
                 }
+                .padding(12)
+                .background(shortcutsInsetPanel)
 
                 if let selectedPage {
                     Picker("Companion page", selection: $selectedCompanionCockpitPageID) {