From 16da64da3bb31a437c26e1c5286725067a655bab Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Fri, 3 Jul 2026 01:40:46 -0700
Subject: [PATCH 001/143] QR Code Scan Failure

Nucleic-Session: 80E30D7B-70A8-479A-A9A8-7E267486EAE1
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Info.plist | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/NucleicRemote/NucleicRemote/Info.plist b/NucleicRemote/NucleicRemote/Info.plist
index 6b1a38f..15712f4 100644
--- a/NucleicRemote/NucleicRemote/Info.plist
+++ b/NucleicRemote/NucleicRemote/Info.plist
@@ -6,6 +6,13 @@
 	<array>
 		<string>_nucleic._tcp</string>
 	</array>
+	<!-- iOS 14+ gates ALL local-network access — both Bonjour discovery (_nucleic._tcp above)
+	     and a direct NWConnection to the Mac's LAN IP from the pairing QR — behind the
+	     local-network permission, which only prompts if this usage string is present. Without
+	     it the grant never happens and every LAN connection fails silently, so pairing and
+	     reconnect appear to "do nothing." -->
+	<key>NSLocalNetworkUsageDescription</key>
+	<string>Nucleic connects to your Mac on the local network to pair and to sync your sessions and approvals.</string>
 	<key>NucleicChannel</key>
 	<string>$(NUCLEIC_CHANNEL)</string>
 	<!-- The short git commit this build came from, shown in the non-release banner to match

From 701bd6e6ab809b314eb15ada3e027f36160c7ebd Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Fri, 3 Jul 2026 01:40:53 -0700
Subject: [PATCH 002/143] QR Code Scan Failure

Nucleic-Session: 80E30D7B-70A8-479A-A9A8-7E267486EAE1
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Views/SettingsView.swift | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/NucleicRemote/NucleicRemote/Views/SettingsView.swift b/NucleicRemote/NucleicRemote/Views/SettingsView.swift
index 25c2ddd..9bb8920 100644
--- a/NucleicRemote/NucleicRemote/Views/SettingsView.swift
+++ b/NucleicRemote/NucleicRemote/Views/SettingsView.swift
@@ -126,6 +126,10 @@ struct PairingIntroView: View {
             }
             .buttonStyle(.borderedProminent)
 
+            // Feedback after a scan: the whole UI is still the intro until pairing completes, so
+            // without this a failed or in-flight pair looks like "nothing happened."
+            pairingStatus
+
             VStack(spacing: 6) {
                 Button { store.enterDemo() } label: {
                     Label("Explore a demo — no Mac needed", systemImage: "play.circle")

From 308fc28448f75a90bae6a1a657a919c3a991ef85 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Fri, 3 Jul 2026 01:41:04 -0700
Subject: [PATCH 003/143] QR Code Scan Failure

Nucleic-Session: 80E30D7B-70A8-479A-A9A8-7E267486EAE1
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 .../NucleicRemote/Views/SettingsView.swift    | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/NucleicRemote/NucleicRemote/Views/SettingsView.swift b/NucleicRemote/NucleicRemote/Views/SettingsView.swift
index 9bb8920..e5bf4a2 100644
--- a/NucleicRemote/NucleicRemote/Views/SettingsView.swift
+++ b/NucleicRemote/NucleicRemote/Views/SettingsView.swift
@@ -155,4 +155,26 @@ struct PairingIntroView: View {
             }
         }
     }
+
+    /// A status line reflecting an in-flight or failed pairing attempt. Silent in the resting
+    /// `.unpaired` state (the intro copy already covers that).
+    @ViewBuilder
+    private var pairingStatus: some View {
+        switch store.connectivity {
+        case .connecting, .reconnecting:
+            Label("Connecting to your Mac…", systemImage: "arrow.triangle.2.circlepath")
+                .font(.footnote).foregroundStyle(.secondary)
+        case .hostOffline:
+            Label("Can't reach your Mac. Make sure it's on the same Wi‑Fi and remote access is on.",
+                  systemImage: "wifi.exclamationmark")
+                .font(.footnote).foregroundStyle(.orange)
+                .multilineTextAlignment(.center).padding(.horizontal, 32)
+        case .failed(let message):
+            Label(message, systemImage: "exclamationmark.triangle.fill")
+                .font(.footnote).foregroundStyle(.red)
+                .multilineTextAlignment(.center).padding(.horizontal, 32)
+        case .connected, .unpaired:
+            EmptyView()
+        }
+    }
 }

From 2c634e7db692c323a76f74662286751054b94d3d Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Fri, 3 Jul 2026 01:41:42 -0700
Subject: [PATCH 004/143] QR Code Scan Failure

Nucleic-Session: 80E30D7B-70A8-479A-A9A8-7E267486EAE1
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 .../NucleicRemote/Models/RemoteStore.swift    | 30 ++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/NucleicRemote/NucleicRemote/Models/RemoteStore.swift b/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
index 329099f..0c2a579 100644
--- a/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
+++ b/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
@@ -695,7 +695,35 @@ final class RemoteStore: ObservableObject {
     }
 
     private func makeChannel(_ endpoint: NWEndpoint) -> NWFrameChannel {
-        NWFrameChannel(endpoint: endpoint)
+        let channel = NWFrameChannel(endpoint: endpoint)
+        // Surface a transport-level failure with an actionable message. Without this, a refused
+        // connection or a denied local-network permission finished the frame stream and only
+        // showed up as a generic "handshake closed" — hiding the real (usually fixable) cause.
+        channel.onFailed = { [weak self] error in
+            Task { @MainActor in self?.handleTransportFailure(error) }
+        }
+        return channel
+    }
+
+    /// Map an `NWConnection` failure to a connectivity state the pairing/onboarding UI can act on.
+    /// Only meaningful while we're still establishing the link; once `.connected`, a drop is the
+    /// normal `.closed` → reconnect path's job.
+    private func handleTransportFailure(_ error: String) {
+        guard connectivity != .connected else { return }
+        connectivity = .failed(Self.friendlyTransportError(error))
+    }
+
+    /// Turn a raw `NWError` string into a short, fixable hint. The common onboarding failures are
+    /// a denied Local Network permission (EPERM / -65555) and the Mac not listening (refused).
+    private static func friendlyTransportError(_ error: String) -> String {
+        let lower = error.lowercased()
+        if lower.contains("denied") || lower.contains("not permitted") || lower.contains("65555") {
+            return "Can't reach the local network. In Settings ▸ Nucleic, allow Local Network access, then try again."
+        }
+        if lower.contains("refused") {
+            return "Your Mac refused the connection. Check that remote access is still on in Nucleic ▸ Settings."
+        }
+        return "Couldn't connect to your Mac — make sure it's on the same Wi‑Fi and remote access is on."
     }
 
     private func resolveEndpoint(fingerprint: String?, lanHost: String?, lanPort: UInt16?) -> NWEndpoint? {

From 23baade658b8802be230ae855b24338b7ecca0f5 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Fri, 3 Jul 2026 16:32:01 -0700
Subject: [PATCH 005/143] Resolve Trunk Promotion Conflict

Nucleic-Session: 20A52F7E-A10D-4B59-B650-D3FD6BC3B46B
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Models/RemoteStore.swift | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/NucleicRemote/NucleicRemote/Models/RemoteStore.swift b/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
index 0c2a579..20ab612 100644
--- a/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
+++ b/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
@@ -706,10 +706,12 @@ final class RemoteStore: ObservableObject {
     }
 
     /// Map an `NWConnection` failure to a connectivity state the pairing/onboarding UI can act on.
-    /// Only meaningful while we're still establishing the link; once `.connected`, a drop is the
-    /// normal `.closed` → reconnect path's job.
+    /// Only meaningful while we're still establishing the link; once connected, a drop is the
+    /// normal `.closed` → reconnect path's job. And only when the connect chain has nothing
+    /// left to try — a failed LAN probe about to fall back to the tailnet is routine, not news.
     private func handleTransportFailure(_ error: String) {
-        guard connectivity != .connected else { return }
+        guard !connectivity.isLive else { return }
+        guard connectPlan?.remaining.isEmpty != false else { return }
         connectivity = .failed(Self.friendlyTransportError(error))
     }
 

From f39fd16800ed75717be91277b83bd6eb21d19a71 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Fri, 3 Jul 2026 16:32:14 -0700
Subject: [PATCH 006/143] Resolve Trunk Promotion Conflict

Nucleic-Session: 20A52F7E-A10D-4B59-B650-D3FD6BC3B46B
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 .../NucleicRemote/Views/SettingsView.swift     | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/NucleicRemote/NucleicRemote/Views/SettingsView.swift b/NucleicRemote/NucleicRemote/Views/SettingsView.swift
index e5bf4a2..22d4e7a 100644
--- a/NucleicRemote/NucleicRemote/Views/SettingsView.swift
+++ b/NucleicRemote/NucleicRemote/Views/SettingsView.swift
@@ -162,8 +162,22 @@ struct PairingIntroView: View {
     private var pairingStatus: some View {
         switch store.connectivity {
         case .connecting, .reconnecting:
-            Label("Connecting to your Mac…", systemImage: "arrow.triangle.2.circlepath")
-                .font(.footnote).foregroundStyle(.secondary)
+            // A first tailnet pairing with no auth key detours through a browser login
+            // that can take minutes — and this intro is the ONLY screen an unpaired phone
+            // has (no Settings tab yet), so the way back to the login page must live here.
+            if let loginURL = store.tailnetLoginURL {
+                VStack(spacing: 6) {
+                    Label("Approve this iPhone in your browser to join your tailnet.",
+                          systemImage: "person.crop.circle.badge.checkmark")
+                        .font(.footnote).foregroundStyle(.secondary)
+                        .multilineTextAlignment(.center).padding(.horizontal, 32)
+                    Link("Open the Tailscale login page", destination: loginURL)
+                        .font(.footnote.weight(.medium))
+                }
+            } else {
+                Label("Connecting to your Mac…", systemImage: "arrow.triangle.2.circlepath")
+                    .font(.footnote).foregroundStyle(.secondary)
+            }
         case .hostOffline:
             Label("Can't reach your Mac. Make sure it's on the same Wi‑Fi and remote access is on.",
                   systemImage: "wifi.exclamationmark")

From f84ccd47de1e2a6e870b9de90316ad80a48fd54f Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Fri, 3 Jul 2026 17:38:37 -0700
Subject: [PATCH 007/143] Review New Feature Proposal

Nucleic-Session: 8EFC43BE-BAE9-4E54-9D6D-2484C5F71F16
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Views/SettingsView.swift | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/NucleicRemote/NucleicRemote/Views/SettingsView.swift b/NucleicRemote/NucleicRemote/Views/SettingsView.swift
index f19e205..8c563ad 100644
--- a/NucleicRemote/NucleicRemote/Views/SettingsView.swift
+++ b/NucleicRemote/NucleicRemote/Views/SettingsView.swift
@@ -109,6 +109,16 @@ struct SettingsView: View {
                     Text("Raw events are unrecognized backend output, shown for debugging.")
                 }
 
+                Section {
+                    Link(destination: URL(string: "https://nucleic.blakeslee.xyz/trusted-tester.html")!) {
+                        Label("Apply to be a trusted tester", systemImage: "person.badge.shield.checkmark")
+                    }
+                } header: {
+                    Text("Trusted tester")
+                } footer: {
+                    Text("This app ships through TestFlight. Apply for trusted-tester access to get earlier builds and shape where the app goes — we review your background and, if approved, add you to internal TestFlight.")
+                }
+
                 Section {
                     Toggle("Share anonymous usage", isOn: $shareAnonymousUsage)
                 } header: {

From 33f404555a1b91d2afa9ade60425cc9833e7bc92 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Fri, 3 Jul 2026 18:54:41 -0700
Subject: [PATCH 008/143] Remove Permission Button

Nucleic-Session: E0927223-36BE-4F01-9E69-575442FC3E5A
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Views/ApprovalCardView.swift | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/NucleicRemote/NucleicRemote/Views/ApprovalCardView.swift b/NucleicRemote/NucleicRemote/Views/ApprovalCardView.swift
index 9d73d91..76edfbf 100644
--- a/NucleicRemote/NucleicRemote/Views/ApprovalCardView.swift
+++ b/NucleicRemote/NucleicRemote/Views/ApprovalCardView.swift
@@ -76,7 +76,10 @@ struct ApprovalCardView: View {
                 .disabled(!allowEnabled)
             }
 
-            if !store.capabilities.allowAlwaysScopes.isEmpty {
+            // A destructive action (rm, force-push, reset --hard, …) offers no remembered
+            // allow: every one must be a deliberate, one-off approval, never granted in a
+            // way that lets the next one through unseen. Mirrors the Mac.
+            if approval.risk != .destructive, !store.capabilities.allowAlwaysScopes.isEmpty {
                 Menu("Allow always…") {
                     ForEach(store.capabilities.allowAlwaysScopes, id: \.self) { scope in
                         Button(alwaysLabel(scope)) {

From f98c78ec2e9ee9f45205a36942024eb30c581b03 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sat, 4 Jul 2026 18:35:32 -0700
Subject: [PATCH 009/143] Tailscale Auth Key Logic

Nucleic-Session: 5360EC95-9A29-4CB4-8061-E869AC2BC518
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Models/RemoteStore.swift | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/NucleicRemote/NucleicRemote/Models/RemoteStore.swift b/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
index 64b4baf..9eaa6ce 100644
--- a/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
+++ b/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
@@ -641,8 +641,7 @@ final class RemoteStore: ObservableObject {
             .appendingPathComponent("tailnet", isDirectory: true)
         return TailnetConfig(
             hostName: TailnetConfig.nodeName(for: UIDevice.current.name),
-            stateDirectory: base,
-            authKey: TailnetAuthStore.loadAuthKey())
+            stateDirectory: base)
     }
 
     func unpair() {

From 60c59bc8baece4b6a60f93d56de6d514df037ee5 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sat, 4 Jul 2026 18:35:49 -0700
Subject: [PATCH 010/143] Tailscale Auth Key Logic

Nucleic-Session: 5360EC95-9A29-4CB4-8061-E869AC2BC518
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Views/SettingsView.swift | 2 --
 1 file changed, 2 deletions(-)

diff --git a/NucleicRemote/NucleicRemote/Views/SettingsView.swift b/NucleicRemote/NucleicRemote/Views/SettingsView.swift
index 6c4224d..b58ea39 100644
--- a/NucleicRemote/NucleicRemote/Views/SettingsView.swift
+++ b/NucleicRemote/NucleicRemote/Views/SettingsView.swift
@@ -9,8 +9,6 @@ struct SettingsView: View {
     @State private var showManualPair = false
     /// Bumped after removing a paired Mac so the "Paired Macs" list re-reads the registry (mesh P3).
     @State private var pairedHostsToken = UUID()
-    @State private var tailscaleAuthKey: String = TailnetAuthStore.loadAuthKey() ?? ""
-    @FocusState private var tailscaleKeyFocused: Bool
     @AppStorage("nucleic.showRawEvents") private var showRaw = false
     @AppStorage("nucleic.showLockEvents") private var showLockEvents = true
     @AppStorage(HeartbeatSettings.shareAnonymousUsageKey) private var shareAnonymousUsage = true

From e463489b623035939321d53ab93b756ad3a79052 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sat, 4 Jul 2026 18:36:00 -0700
Subject: [PATCH 011/143] Tailscale Auth Key Logic

Nucleic-Session: 5360EC95-9A29-4CB4-8061-E869AC2BC518
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 .../NucleicRemote/Views/SettingsView.swift        | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/NucleicRemote/NucleicRemote/Views/SettingsView.swift b/NucleicRemote/NucleicRemote/Views/SettingsView.swift
index b58ea39..baf9980 100644
--- a/NucleicRemote/NucleicRemote/Views/SettingsView.swift
+++ b/NucleicRemote/NucleicRemote/Views/SettingsView.swift
@@ -104,16 +104,6 @@ struct SettingsView: View {
 
                 Section {
                     if TailnetSupport.isBuiltIn {
-                        // Commit on editing end, not per keystroke — a per-change save would
-                        // clear the valid Keychain key on the first backspace of an edit.
-                        SecureField("Auth key (tskey-auth-…)", text: $tailscaleAuthKey)
-                            .autocorrectionDisabled()
-                            .textInputAutocapitalization(.never)
-                            .focused($tailscaleKeyFocused)
-                            .onSubmit { TailnetAuthStore.saveAuthKey(tailscaleAuthKey) }
-                            .onChange(of: tailscaleKeyFocused) {
-                                if !tailscaleKeyFocused { TailnetAuthStore.saveAuthKey(tailscaleAuthKey) }
-                            }
                         if let status = store.tailnetStatus {
                             LabeledContent("Node", value: status)
                         }
@@ -121,6 +111,9 @@ struct SettingsView: View {
                             Link(destination: loginURL) {
                                 Label("Open Tailscale login", systemImage: "arrow.up.forward.app")
                             }
+                        } else {
+                            Text("No setup needed — when your Mac shares over Tailscale, this iPhone joins your tailnet on first connect and opens a browser login to approve itself.")
+                                .font(.caption).foregroundStyle(.secondary)
                         }
                     } else {
                         Text("This build doesn't include Tailscale support.")
@@ -129,7 +122,7 @@ struct SettingsView: View {
                 } header: {
                     Text("Tailscale")
                 } footer: {
-                    Text("Needed only when your Mac shares over Tailscale (Mac ▸ Settings ▸ Remote ▸ Connect via). Leave the key empty to approve this iPhone in your browser on first connect, or create an auth key in the Tailscale admin console (kept in the Keychain, used once to join your tailnet).")
+                    Text("Needed only when your Mac shares over Tailscale (Mac ▸ Settings ▸ Remote ▸ Connection methods). This iPhone joins your tailnet in the browser on first connect.")
                 }
 
                 Section("This device") {

From 0dda4871678c12432c07e6526f96db2bc7348c28 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sat, 4 Jul 2026 23:29:52 -0700
Subject: [PATCH 012/143] Live Activity Content Density

Nucleic-Session: B3643133-163C-4C5D-BE20-1A6B7FB83DA9
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 .../Shared/SessionActivityAttributes.swift    | 69 +++++++++++++++++--
 1 file changed, 62 insertions(+), 7 deletions(-)

diff --git a/NucleicRemote/Shared/SessionActivityAttributes.swift b/NucleicRemote/Shared/SessionActivityAttributes.swift
index 467eed3..0d29361 100644
--- a/NucleicRemote/Shared/SessionActivityAttributes.swift
+++ b/NucleicRemote/Shared/SessionActivityAttributes.swift
@@ -2,19 +2,74 @@ import ActivityKit
 import Foundation
 
 /// The one aggregate Live Activity (UX_IOS §5.3, aggregate per §11.4 — a single Activity
-/// respects iOS's budget better than one per session): "N running, M waiting" plus the most
-/// urgent session's title. Shared between the app (which starts/updates it) and the widget
-/// extension (which renders it).
+/// respects iOS's budget better than one per session). It answers "what is Nucleic doing right
+/// now?" at a glance: the headline counts (running / waiting / approvals), the total churn in
+/// flight, and a few of the most urgent sessions with their state and diff. Shared between the
+/// app (which starts/updates it) and the widget extension (which renders it).
+///
+/// Deliberately free of `NucleicProtocol` types — the widget extension links only this file, so
+/// the state carries plain value types and its own small `Backend`/`Kind` enums rather than the
+/// wire `BackendID`/`SessionStatus`.
 struct NucleicSessionAttributes: ActivityAttributes {
+    /// The agent behind a session — drives a row's provider tag/tint.
+    enum Backend: String, Codable, Hashable {
+        case claude, codex, grok, other
+
+        var label: String {
+            switch self {
+            case .claude: "Claude"
+            case .codex: "Codex"
+            case .grok: "Grok"
+            case .other: "Agent"
+            }
+        }
+    }
+
+    /// A session's live state, collapsed to what the glance needs — drives each row's glyph/tint.
+    enum Kind: String, Codable, Hashable {
+        case running        // agent actively working a turn
+        case provisioning   // worktree/setup spinning up
+        case approval       // blocked on a human approval decision (loudest)
+        case needsInput     // turn ended asking the user something
+        case done           // turn finished its work; nothing required
+        case error          // errored / interrupted
+        case idle           // created, not yet working
+    }
+
+    /// One agent session surfaced in the activity's detail rows.
+    struct SessionLine: Codable, Hashable, Identifiable {
+        var id: String
+        /// The session's title (falls back to the project name upstream).
+        var title: String
+        /// Project the session belongs to.
+        var project: String
+        var backend: Backend
+        var kind: Kind
+        /// A compact right-aligned status: its diff ("3 files +42 −7"), "2 to approve",
+        /// "Waiting on you", "Working…", etc.
+        var detail: String
+    }
+
     struct ContentState: Codable, Hashable {
         /// Sessions actively working a turn.
         var runningCount: Int
         /// Sessions blocked on the user (approval or next prompt) — the loud number.
         var needsYouCount: Int
-        /// The most urgent session's title: the top waiting one, else the busiest running.
-        var topTitle: String?
-        /// Whether `topTitle` is waiting on the user (amber) vs just running (blue).
-        var topNeedsYou: Bool
+        /// Total individual approval decisions waiting across all sessions — the "act now" count.
+        var approvalCount: Int
+        /// Aggregate worktree churn across the active sessions.
+        var filesChanged: Int
+        var linesAdded: Int
+        var linesRemoved: Int
+        /// The most urgent sessions, attention-first (capped, typically ≤3): the detail rows.
+        var lines: [SessionLine]
+
+        /// The single most urgent session (drives the compact/minimal regions).
+        var top: SessionLine? { lines.first }
+        /// Whether anything needs the user (waiting session or a pending approval).
+        var needsAttention: Bool { needsYouCount > 0 || approvalCount > 0 }
+        /// Whether any worktree has uncommitted changes to summarize.
+        var hasChurn: Bool { filesChanged > 0 }
     }
 
     /// The paired Mac's name (static for the Activity's lifetime).

From a45795184ea7ec812dc0258a2ad3def142008f05 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sat, 4 Jul 2026 23:30:15 -0700
Subject: [PATCH 013/143] Live Activity Content Density

Nucleic-Session: B3643133-163C-4C5D-BE20-1A6B7FB83DA9
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 .../NucleicRemote/LiveActivityManager.swift   | 87 +++++++++++++++++--
 1 file changed, 82 insertions(+), 5 deletions(-)

diff --git a/NucleicRemote/NucleicRemote/LiveActivityManager.swift b/NucleicRemote/NucleicRemote/LiveActivityManager.swift
index 55d18b7..98f60a5 100644
--- a/NucleicRemote/NucleicRemote/LiveActivityManager.swift
+++ b/NucleicRemote/NucleicRemote/LiveActivityManager.swift
@@ -11,6 +11,10 @@ final class LiveActivityManager {
     static let shared = LiveActivityManager()
     private init() {}
 
+    /// How many sessions the detail rows show. The glance stays a glance — the counts and churn
+    /// still summarize everything, this just bounds the per-session list.
+    private static let maxLines = 3
+
     private var activity: Activity<NucleicSessionAttributes>?
 
     /// Reconcile the Activity with the current session set.
@@ -25,14 +29,33 @@ final class LiveActivityManager {
             return
         }
 
-        // The most urgent session headlines: the top waiter, else the freshest runner.
-        let top = needsYou.max { $0.updatedAt < $1.updatedAt }
-            ?? running.max { $0.updatedAt < $1.updatedAt }
+        // Everything in flight or waiting on the user, attention-first (approvals, then waiting
+        // input, then running), freshest within a rank. This is both the detail-row source and
+        // the set the aggregate churn/approval totals sum over.
+        let active = live
+            .filter {
+                $0.status == .running || $0.status == .provisioning
+                    || $0.status.needsYou($0.disposition)
+            }
+            .sorted { lhs, rhs in
+                let l = StatusStyle.sortRank(lhs), r = StatusStyle.sortRank(rhs)
+                return l == r ? lhs.updatedAt > rhs.updatedAt : l < r
+            }
+
+        let approvals = active.reduce(0) { $0 + $1.pendingApprovalCount }
+        let files = active.reduce(0) { $0 + ($1.diffStat?.filesChanged ?? 0) }
+        let added = active.reduce(0) { $0 + ($1.diffStat?.added ?? 0) }
+        let removed = active.reduce(0) { $0 + ($1.diffStat?.removed ?? 0) }
+        let lines = active.prefix(Self.maxLines).map(Self.line(for:))
+
         let state = NucleicSessionAttributes.ContentState(
             runningCount: running.count,
             needsYouCount: needsYou.count,
-            topTitle: top?.title,
-            topNeedsYou: top.map { $0.status.needsYou($0.disposition) } ?? false)
+            approvalCount: approvals,
+            filesChanged: files,
+            linesAdded: added,
+            linesRemoved: removed,
+            lines: Array(lines))
 
         if let activity {
             Task { await activity.update(ActivityContent(state: state, staleDate: nil)) }
@@ -59,4 +82,58 @@ final class LiveActivityManager {
                 dismissalPolicy: .immediate)
         }
     }
+
+    // MARK: - Projection
+
+    /// Project a wire summary into the widget's self-contained row model.
+    private static func line(for s: WireSessionSummary) -> NucleicSessionAttributes.SessionLine {
+        NucleicSessionAttributes.SessionLine(
+            id: s.sessionID.rawValue,
+            title: s.title.isEmpty ? s.projectName : s.title,
+            project: s.projectName,
+            backend: backend(s.backend),
+            kind: kind(for: s),
+            detail: detail(for: s))
+    }
+
+    private static func kind(for s: WireSessionSummary) -> NucleicSessionAttributes.Kind {
+        switch s.status {
+        case .awaitingApproval: .approval
+        case .running: .running
+        case .provisioning: .provisioning
+        case .awaitingInput: s.disposition == .completed ? .done : .needsInput
+        case .idle: .idle
+        case .finished: .done
+        case .interrupted, .error: .error
+        }
+    }
+
+    private static func backend(_ id: BackendID) -> NucleicSessionAttributes.Backend {
+        switch id {
+        case .claudeCode: .claude
+        case .codex, .codexExec: .codex
+        case .grok: .grok
+        }
+    }
+
+    /// The compact right-aligned status for a row: the actionable ask wins (approvals, then
+    /// "waiting on you"), else the worktree churn, else what the agent is up to.
+    private static func detail(for s: WireSessionSummary) -> String {
+        if s.status == .awaitingApproval || s.pendingApprovalCount > 0 {
+            let n = max(s.pendingApprovalCount, 1)
+            return "\(n) to approve"
+        }
+        if s.status == .awaitingInput, s.disposition != .completed {
+            return "Waiting on you"
+        }
+        if let d = s.diffStat, d.filesChanged > 0 {
+            return "\(d.filesChanged) file\(d.filesChanged == 1 ? "" : "s")  +\(d.added) −\(d.removed)"
+        }
+        switch s.status {
+        case .provisioning: return "Starting…"
+        case .running: return "Working…"
+        case .awaitingInput: return "Done"
+        default: return StatusStyle.label(s.status, disposition: s.disposition)
+        }
+    }
 }

From 693ca29691d5f449d558d22c4cdf52fc4c1cf435 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sat, 4 Jul 2026 23:30:53 -0700
Subject: [PATCH 014/143] Live Activity Content Density

Nucleic-Session: B3643133-163C-4C5D-BE20-1A6B7FB83DA9
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 .../SessionLiveActivity.swift                 | 283 +++++++++++++-----
 1 file changed, 203 insertions(+), 80 deletions(-)

diff --git a/NucleicRemote/NucleicRemoteWidgets/SessionLiveActivity.swift b/NucleicRemote/NucleicRemoteWidgets/SessionLiveActivity.swift
index 1abe857..5303e72 100644
--- a/NucleicRemote/NucleicRemoteWidgets/SessionLiveActivity.swift
+++ b/NucleicRemote/NucleicRemoteWidgets/SessionLiveActivity.swift
@@ -2,125 +2,248 @@ import ActivityKit
 import SwiftUI
 import WidgetKit
 
-/// Lock-screen / Dynamic Island rendering of the aggregate session Activity (UX_IOS §5.3):
-/// glance = running count + needs-you count + the most urgent session; tap opens the app
-/// (straight to the approval, via the notification-style route). Self-contained colors — the
-/// extension doesn't link the app's Theme, so the two palette constants it needs live here
-/// (the same teal/amber/blue as `Palette`).
+/// Lock-screen / Dynamic Island rendering of the aggregate session Activity (UX_IOS §5.3).
+/// The glance answers "what is Nucleic doing right now?": headline counts (running / waiting /
+/// approvals), the total churn in flight, and the most urgent sessions with their state and diff.
+/// Tapping opens the app (straight to the approval, via the notification-style route).
+///
+/// Self-contained colors/glyphs — the extension doesn't link the app's `Theme`, so the small
+/// palette + glyph maps it needs live here (the same teal/amber/blue/green as `Palette`).
 struct SessionLiveActivity: Widget {
     var body: some WidgetConfiguration {
         ActivityConfiguration(for: NucleicSessionAttributes.self) { context in
-            // Lock screen banner.
             LockScreenView(state: context.state, hostName: context.attributes.hostName)
                 .activityBackgroundTint(Color.black.opacity(0.55))
                 .activitySystemActionForegroundColor(.white)
         } dynamicIsland: { context in
-            DynamicIsland {
+            let state = context.state
+            return DynamicIsland {
                 DynamicIslandExpandedRegion(.leading) {
-                    Label("\(context.state.runningCount)", systemImage: "circle.lefthalf.filled")
-                        .font(.headline)
-                        .foregroundStyle(ActivityPalette.active)
+                    CountBadge(
+                        systemImage: "circle.lefthalf.filled",
+                        count: state.runningCount, tint: ActivityPalette.active)
                 }
                 DynamicIslandExpandedRegion(.trailing) {
-                    if context.state.needsYouCount > 0 {
-                        Label("\(context.state.needsYouCount)", systemImage: "exclamationmark.triangle.fill")
-                            .font(.headline)
-                            .foregroundStyle(ActivityPalette.attention)
+                    if state.approvalCount > 0 {
+                        CountBadge(
+                            systemImage: "exclamationmark.shield.fill",
+                            count: state.approvalCount, tint: ActivityPalette.attention)
+                    } else if state.needsYouCount > 0 {
+                        CountBadge(
+                            systemImage: "bubble.left.fill",
+                            count: state.needsYouCount, tint: ActivityPalette.accent)
                     } else {
                         Label("0", systemImage: "checkmark.circle")
-                            .font(.headline)
-                            .foregroundStyle(.secondary)
+                            .font(.headline).foregroundStyle(.secondary)
                     }
                 }
                 DynamicIslandExpandedRegion(.bottom) {
-                    if let title = context.state.topTitle {
-                        HStack(spacing: 6) {
-                            Image(systemName: context.state.topNeedsYou
-                                ? "exclamationmark.triangle.fill" : "circle.lefthalf.filled")
-                                .foregroundStyle(context.state.topNeedsYou
-                                    ? ActivityPalette.attention : ActivityPalette.active)
-                            Text(title).font(.subheadline.weight(.medium)).lineLimit(1)
-                            Spacer()
-                            Text(statusLine(context.state))
-                                .font(.caption).foregroundStyle(.secondary)
+                    VStack(alignment: .leading, spacing: 5) {
+                        ForEach(state.lines.prefix(2)) { line in
+                            SessionRow(line: line)
+                        }
+                        if state.hasChurn {
+                            ChurnLine(state: state).padding(.top, 1)
                         }
-                    } else {
-                        Text(statusLine(context.state))
-                            .font(.caption).foregroundStyle(.secondary)
                     }
                 }
             } compactLeading: {
-                Image(systemName: "circle.lefthalf.filled")
-                    .foregroundStyle(ActivityPalette.active)
+                Image(systemName: state.needsAttention
+                    ? ActivityPalette.glyph(.approval) : ActivityPalette.glyph(.running))
+                    .foregroundStyle(state.needsAttention
+                        ? ActivityPalette.attention : ActivityPalette.active)
             } compactTrailing: {
-                if context.state.needsYouCount > 0 {
-                    Text("\(context.state.needsYouCount)")
-                        .font(.caption2.bold())
-                        .foregroundStyle(ActivityPalette.attention)
-                } else {
-                    Text("\(context.state.runningCount)")
-                        .font(.caption2.bold())
-                        .foregroundStyle(ActivityPalette.active)
-                }
+                Text("\(state.needsAttention ? max(state.approvalCount, state.needsYouCount) : state.runningCount)")
+                    .font(.caption2.bold())
+                    .foregroundStyle(state.needsAttention ? ActivityPalette.attention : ActivityPalette.active)
             } minimal: {
-                Image(systemName: context.state.needsYouCount > 0
-                    ? "exclamationmark.triangle.fill" : "circle.lefthalf.filled")
-                    .foregroundStyle(context.state.needsYouCount > 0
+                Image(systemName: state.needsAttention
+                    ? ActivityPalette.glyph(.approval) : ActivityPalette.glyph(.running))
+                    .foregroundStyle(state.needsAttention
                         ? ActivityPalette.attention : ActivityPalette.active)
             }
         }
     }
-
-    private func statusLine(_ state: NucleicSessionAttributes.ContentState) -> String {
-        var parts: [String] = []
-        if state.runningCount > 0 { parts.append("\(state.runningCount) running") }
-        if state.needsYouCount > 0 { parts.append("\(state.needsYouCount) need you") }
-        return parts.isEmpty ? "Idle" : parts.joined(separator: " · ")
-    }
 }
 
+// MARK: - Lock screen
+
 private struct LockScreenView: View {
     let state: NucleicSessionAttributes.ContentState
     let hostName: String
 
     var body: some View {
-        HStack(spacing: 12) {
-            Image(systemName: state.needsYouCount > 0
-                ? "exclamationmark.triangle.fill" : "circle.lefthalf.filled")
-                .font(.title2)
-                .foregroundStyle(state.needsYouCount > 0
-                    ? ActivityPalette.attention : ActivityPalette.active)
-            VStack(alignment: .leading, spacing: 2) {
-                if let title = state.topTitle {
-                    Text(title).font(.headline).lineLimit(1)
-                }
-                HStack(spacing: 4) {
-                    if state.runningCount > 0 {
-                        Text("\(state.runningCount) running").foregroundStyle(ActivityPalette.active)
-                    }
-                    if state.runningCount > 0 && state.needsYouCount > 0 { Text("·") }
-                    if state.needsYouCount > 0 {
-                        Text("\(state.needsYouCount) waiting for you")
-                            .foregroundStyle(ActivityPalette.attention)
-                    }
-                    if state.runningCount == 0 && state.needsYouCount == 0 {
-                        Text("Idle").foregroundStyle(.secondary)
-                    }
-                }
-                .font(.subheadline)
+        VStack(alignment: .leading, spacing: 8) {
+            // Header: brand + host, and the headline counts.
+            HStack(spacing: 8) {
+                Image(systemName: "hexagon.fill")
+                    .font(.footnote)
+                    .foregroundStyle(ActivityPalette.active)
+                Text(hostName)
+                    .font(.caption.weight(.semibold))
+                    .lineLimit(1)
+                Spacer(minLength: 8)
+                CountChips(state: state)
+            }
+
+            // The most urgent sessions — what's actually happening.
+            ForEach(state.lines.prefix(3)) { line in
+                SessionRow(line: line)
+            }
+
+            // Aggregate churn footer — how much work is in flight right now.
+            if state.hasChurn {
+                Divider().overlay(Color.white.opacity(0.12))
+                ChurnLine(state: state)
             }
-            Spacer()
-            Text(hostName)
-                .font(.caption2).foregroundStyle(.secondary)
-                .lineLimit(1)
         }
         .padding(14)
         .foregroundStyle(.white)
     }
 }
 
-/// The two categorical colors the Activity needs — same constants as the app's `Palette`.
+// MARK: - Shared pieces
+
+/// One session: state glyph + title + "project · Backend" + a right-aligned status/diff.
+private struct SessionRow: View {
+    let line: NucleicSessionAttributes.SessionLine
+
+    var body: some View {
+        HStack(spacing: 8) {
+            Image(systemName: ActivityPalette.glyph(line.kind))
+                .font(.footnote)
+                .foregroundStyle(ActivityPalette.color(line.kind))
+                .frame(width: 16)
+            VStack(alignment: .leading, spacing: 1) {
+                Text(line.title)
+                    .font(.subheadline.weight(.medium))
+                    .lineLimit(1)
+                HStack(spacing: 4) {
+                    Text(line.project)
+                    Text("·").foregroundStyle(.secondary)
+                    Text(line.backend.label)
+                        .foregroundStyle(ActivityPalette.backendColor(line.backend))
+                }
+                .font(.caption2)
+                .foregroundStyle(.secondary)
+                .lineLimit(1)
+            }
+            Spacer(minLength: 6)
+            Text(line.detail)
+                .font(.caption2.weight(.medium))
+                .monospacedDigit()
+                .foregroundStyle(ActivityPalette.color(line.kind))
+                .lineLimit(1)
+        }
+    }
+}
+
+/// Headline count chips: running (blue), waiting (teal), approvals (amber). Only nonzero show.
+private struct CountChips: View {
+    let state: NucleicSessionAttributes.ContentState
+
+    var body: some View {
+        HStack(spacing: 10) {
+            if state.runningCount > 0 {
+                chip("circle.lefthalf.filled", state.runningCount, ActivityPalette.active)
+            }
+            if state.needsYouCount > 0 {
+                chip("bubble.left.fill", state.needsYouCount, ActivityPalette.accent)
+            }
+            if state.approvalCount > 0 {
+                chip("exclamationmark.shield.fill", state.approvalCount, ActivityPalette.attention)
+            }
+        }
+    }
+
+    private func chip(_ systemImage: String, _ count: Int, _ tint: Color) -> some View {
+        HStack(spacing: 3) {
+            Image(systemName: systemImage).font(.caption2)
+            Text("\(count)").font(.caption.weight(.semibold)).monospacedDigit()
+        }
+        .foregroundStyle(tint)
+    }
+}
+
+/// Aggregate worktree churn: "N files  +A  −R".
+private struct ChurnLine: View {
+    let state: NucleicSessionAttributes.ContentState
+
+    var body: some View {
+        HStack(spacing: 6) {
+            Image(systemName: "chevron.left.forwardslash.chevron.right")
+                .font(.caption2)
+                .foregroundStyle(.secondary)
+            Text("\(state.filesChanged) file\(state.filesChanged == 1 ? "" : "s") changed")
+                .foregroundStyle(.secondary)
+            Text("+\(state.linesAdded)")
+                .foregroundStyle(ActivityPalette.added)
+            Text("−\(state.linesRemoved)")
+                .foregroundStyle(ActivityPalette.removed)
+        }
+        .font(.caption2.weight(.medium))
+        .monospacedDigit()
+        .lineLimit(1)
+    }
+}
+
+/// Dynamic Island expanded leading/trailing count badge.
+private struct CountBadge: View {
+    let systemImage: String
+    let count: Int
+    let tint: Color
+
+    var body: some View {
+        Label("\(count)", systemImage: systemImage)
+            .font(.headline)
+            .monospacedDigit()
+            .foregroundStyle(tint)
+    }
+}
+
+/// The categorical colors + glyphs the Activity needs — the same semantics as the app's
+/// `Palette.status` / `StatusStyle.symbol`, re-declared because the widget extension can't link
+/// the app's `Theme`.
 private enum ActivityPalette {
     static let active = Color(red: 0.20, green: 0.55, blue: 0.95)     // running blue
-    static let attention = Color(red: 1.00, green: 0.65, blue: 0.15)  // needs-you amber
+    static let attention = Color(red: 1.00, green: 0.65, blue: 0.15)  // approval amber
+    static let accent = Color(red: 0.16, green: 0.72, blue: 0.68)     // needs-input teal
+    static let success = Color(red: 0.30, green: 0.78, blue: 0.45)    // done green
+    static let danger = Color(red: 0.92, green: 0.34, blue: 0.34)     // error red
+    static let neutral = Color.secondary
+    static let added = Color(red: 0.30, green: 0.78, blue: 0.45)
+    static let removed = Color(red: 0.92, green: 0.34, blue: 0.34)
+
+    static func glyph(_ kind: NucleicSessionAttributes.Kind) -> String {
+        switch kind {
+        case .running: "circle.lefthalf.filled"
+        case .provisioning: "circle.dotted"
+        case .approval: "exclamationmark.triangle.fill"
+        case .needsInput: "bubble.left.fill"
+        case .done: "checkmark.circle.fill"
+        case .error: "xmark.octagon.fill"
+        case .idle: "circle"
+        }
+    }
+
+    static func color(_ kind: NucleicSessionAttributes.Kind) -> Color {
+        switch kind {
+        case .running: active
+        case .provisioning: neutral
+        case .approval: attention
+        case .needsInput: accent
+        case .done: success
+        case .error: danger
+        case .idle: neutral
+        }
+    }
+
+    static func backendColor(_ backend: NucleicSessionAttributes.Backend) -> Color {
+        switch backend {
+        case .claude: Color(red: 0.85, green: 0.52, blue: 0.30)   // Anthropic clay
+        case .codex: Color(red: 0.45, green: 0.72, blue: 0.55)    // OpenAI green
+        case .grok: Color(red: 0.55, green: 0.58, blue: 0.66)     // xAI graphite
+        case .other: Color.secondary
+        }
+    }
 }

From 92e7c59dd6a2725525044c9855f6ba8f54e27e5c Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sat, 4 Jul 2026 23:31:10 -0700
Subject: [PATCH 015/143] Remove Face ID Permission Text

Nucleic-Session: 3EF7F067-2199-41C2-997C-5546C1A8A5C4
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 .../NucleicRemote/Views/ApprovalCardView.swift     | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/NucleicRemote/NucleicRemote/Views/ApprovalCardView.swift b/NucleicRemote/NucleicRemote/Views/ApprovalCardView.swift
index 0926b72..8ef3b8f 100644
--- a/NucleicRemote/NucleicRemote/Views/ApprovalCardView.swift
+++ b/NucleicRemote/NucleicRemote/Views/ApprovalCardView.swift
@@ -1,23 +1,17 @@
 import SwiftUI
-import LocalAuthentication
 import NucleicProtocol
 
 /// The defining interaction (UX_IOS §5): answer an approval. High-risk (destructive/network)
-/// requires Face ID/Touch ID before Allow is enabled — deliberate friction mirroring the Mac.
-/// First-responder-wins: if the Mac (or another phone) answers first, the host's
-/// `approvalResolved` removes this card.
+/// still routes through the app (never the notification banner) so approval is a deliberate,
+/// in-context tap. First-responder-wins: if the Mac (or another phone) answers first, the
+/// host's `approvalResolved` removes this card.
 struct ApprovalCardView: View {
     @EnvironmentObject var store: RemoteStore
     let approval: ApprovalRequest
 
-    @State private var biometricPassed = false
-    @State private var authError: String?
     @State private var showAlwaysMenu = false
 
-    private var requiresBiometric: Bool { approval.risk.isHigh }
-    private var allowEnabled: Bool {
-        store.connectivity.isLive && (!requiresBiometric || biometricPassed)
-    }
+    private var allowEnabled: Bool { store.connectivity.isLive }
 
     var body: some View {
         VStack(alignment: .leading, spacing: 10) {

From 8bedbc8d98ab4cce35e85a6c5dd24104794a24ea Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sat, 4 Jul 2026 23:31:14 -0700
Subject: [PATCH 016/143] Remove Face ID Permission Text

Nucleic-Session: 3EF7F067-2199-41C2-997C-5546C1A8A5C4
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 .../NucleicRemote/Views/ApprovalCardView.swift       | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/NucleicRemote/NucleicRemote/Views/ApprovalCardView.swift b/NucleicRemote/NucleicRemote/Views/ApprovalCardView.swift
index 8ef3b8f..77f5f42 100644
--- a/NucleicRemote/NucleicRemote/Views/ApprovalCardView.swift
+++ b/NucleicRemote/NucleicRemote/Views/ApprovalCardView.swift
@@ -45,18 +45,6 @@ struct ApprovalCardView: View {
                 ApprovalDetailBox(text: approval.input.approvalDetail)
             }
 
-            if requiresBiometric && !biometricPassed {
-                Button {
-                    authenticate()
-                } label: {
-                    Label("Face ID required to allow", systemImage: "faceid").font(.caption)
-                }
-                .buttonStyle(.bordered)
-            }
-            if let authError {
-                Text(authError).font(.caption2).foregroundStyle(.red)
-            }
-
             HStack(spacing: 10) {
                 Button(role: .destructive) {
                     store.respond(approval, .deny(reason: nil))

From d0b63121d34f312548fab97edac1e632fe3a69ff Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sat, 4 Jul 2026 23:31:18 -0700
Subject: [PATCH 017/143] Remove Face ID Permission Text

Nucleic-Session: 3EF7F067-2199-41C2-997C-5546C1A8A5C4
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Views/ApprovalCardView.swift | 1 -
 1 file changed, 1 deletion(-)

diff --git a/NucleicRemote/NucleicRemote/Views/ApprovalCardView.swift b/NucleicRemote/NucleicRemote/Views/ApprovalCardView.swift
index 77f5f42..1bb53c8 100644
--- a/NucleicRemote/NucleicRemote/Views/ApprovalCardView.swift
+++ b/NucleicRemote/NucleicRemote/Views/ApprovalCardView.swift
@@ -83,7 +83,6 @@ struct ApprovalCardView: View {
         }
         .padding()
         .background(.thinMaterial, in: RoundedRectangle(cornerRadius: 14))
-        .onChange(of: approval.id) { _, _ in biometricPassed = false; authError = nil }
     }
 
     private func alwaysLabel(_ scope: AlwaysScope) -> String {

From 32ef11b00025510721171c5bf43c45c4db56a1f2 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sat, 4 Jul 2026 23:31:24 -0700
Subject: [PATCH 018/143] Remove Face ID Permission Text

Nucleic-Session: 3EF7F067-2199-41C2-997C-5546C1A8A5C4
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 .../NucleicRemote/Views/ApprovalCardView.swift  | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/NucleicRemote/NucleicRemote/Views/ApprovalCardView.swift b/NucleicRemote/NucleicRemote/Views/ApprovalCardView.swift
index 1bb53c8..a9c7cbc 100644
--- a/NucleicRemote/NucleicRemote/Views/ApprovalCardView.swift
+++ b/NucleicRemote/NucleicRemote/Views/ApprovalCardView.swift
@@ -92,23 +92,6 @@ struct ApprovalCardView: View {
         case .toolNameWithPattern: "\(approval.toolName) matching this pattern"
         }
     }
-
-    private func authenticate() {
-        let context = LAContext()
-        var error: NSError?
-        guard context.canEvaluatePolicy(.deviceOwnerAuthenticationWithBiometrics, error: &error) else {
-            authError = "Biometrics unavailable"; return
-        }
-        context.evaluatePolicy(
-            .deviceOwnerAuthenticationWithBiometrics,
-            localizedReason: "Approve a \(approval.risk.label) action"
-        ) { success, evalError in
-            Task { @MainActor in
-                if success { biometricPassed = true; authError = nil }
-                else { authError = evalError?.localizedDescription ?? "Authentication failed" }
-            }
-        }
-    }
 }
 
 /// The full content of an approval, wrapped and selectable. The box sizes to its

From fdb346f41ae77130a38a9f53e778fd29083e5142 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sat, 4 Jul 2026 23:31:33 -0700
Subject: [PATCH 019/143] Remove Face ID Permission Text

Nucleic-Session: 3EF7F067-2199-41C2-997C-5546C1A8A5C4
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Notifications.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NucleicRemote/NucleicRemote/Notifications.swift b/NucleicRemote/NucleicRemote/Notifications.swift
index f79d70f..fa8ef92 100644
--- a/NucleicRemote/NucleicRemote/Notifications.swift
+++ b/NucleicRemote/NucleicRemote/Notifications.swift
@@ -36,7 +36,7 @@ final class NotificationRouter: NSObject {
 
         // Low/medium-risk approvals resolve straight from the banner (UX_IOS §5.1);
         // Allow requires device auth so a pocket-tap can't grant. High-risk approvals use
-        // the action-less category — they must open the app (Face ID gate on the card).
+        // the action-less category — they must open the app and be answered on the card.
         let allow = UNNotificationAction(
             identifier: Self.allowAction, title: "Allow",
             options: [.authenticationRequired])

From 6ff0a3fb919abc3b2fb24929b51c113c08739150 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sat, 4 Jul 2026 23:31:40 -0700
Subject: [PATCH 020/143] Remove Face ID Permission Text

Nucleic-Session: 3EF7F067-2199-41C2-997C-5546C1A8A5C4
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/NucleicRemote/README.md b/NucleicRemote/README.md
index c0f9968..9c4657b 100644
--- a/NucleicRemote/README.md
+++ b/NucleicRemote/README.md
@@ -16,8 +16,8 @@ All wire/crypto logic is shared with the Mac via the **`NucleicProtocol`** Swift
 - **State** — `RemoteStore` (`ObservableObject`) is the single on-device UI state, a pure
   projection of the host. Identity + pinned host live in `IdentityStore` (Keychain + UserDefaults).
 - **UI** — SwiftUI: `SessionsView` (attention-first list), `SessionDetailView`
-  (transcript/diff + status-driven action area), `ApprovalCardView` (Face ID gate on
-  high-risk), `PairingScannerView` (QR), `SettingsView`.
+  (transcript/diff + status-driven action area), `ApprovalCardView` (approve/deny,
+  high-risk answered in-app), `PairingScannerView` (QR), `SettingsView`.
 
 ## Build & run
 

From 63a1c9dd9eef13291b30d8de0bbc5af03a5c7deb Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sat, 4 Jul 2026 23:38:55 -0700
Subject: [PATCH 021/143] Network Type Transition Optimization

Nucleic-Session: 40F8C53A-F001-423A-8607-EAE181DBE14B
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 .../Net/NetworkPathMonitor.swift              | 51 +++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 NucleicRemote/NucleicRemote/Net/NetworkPathMonitor.swift

diff --git a/NucleicRemote/NucleicRemote/Net/NetworkPathMonitor.swift b/NucleicRemote/NucleicRemote/Net/NetworkPathMonitor.swift
new file mode 100644
index 0000000..fef5172
--- /dev/null
+++ b/NucleicRemote/NucleicRemote/Net/NetworkPathMonitor.swift
@@ -0,0 +1,51 @@
+import Foundation
+import Network
+
+/// Watches the device's network path (Wi‑Fi ⇄ cellular ⇄ offline) so the app can switch transports
+/// the instant the link changes, instead of waiting for a dead LAN socket to time out. This is the
+/// missing proactive signal behind the "iOS sticks on LAN after leaving Wi‑Fi" stall: the phone's
+/// pinned `lanHost:lanPort` is only reachable over Wi‑Fi/wired, so on cellular the LAN candidate is a
+/// guaranteed stall. `HostConnection` skips LAN when `canUseLAN` is false and re‑plans on `onChange`.
+@MainActor
+final class NetworkPathMonitor: ObservableObject {
+    /// True when a LAN‑capable path (Wi‑Fi or wired Ethernet) is available — the only paths on which
+    /// the pinned `lanHost:lanPort` could resolve. Cellular‑only ⇒ false, so the LAN candidate is
+    /// dropped and we dial tailnet/relay straight away. Defaults optimistic so a not‑yet‑started
+    /// monitor never spuriously suppresses LAN.
+    @Published private(set) var canUseLAN = true
+    /// True when any network path is available at all (used to decide whether an immediate reconnect
+    /// is even worth attempting).
+    @Published private(set) var isSatisfied = true
+
+    /// Fired on the main actor whenever a *relevant* aspect of the path changed — LAN availability or
+    /// overall reachability. The cue for connections to re‑plan their transport immediately rather
+    /// than waiting out a reconnect backoff.
+    var onChange: (() -> Void)?
+
+    private let monitor = NWPathMonitor()
+    private let queue = DispatchQueue(label: "nucleic.remote.path")
+    private var started = false
+
+    func start() {
+        guard !started else { return }
+        started = true
+        monitor.pathUpdateHandler = { [weak self] path in
+            Task { @MainActor in self?.apply(path) }
+        }
+        monitor.start(queue: queue)
+    }
+
+    /// Re‑read the current path synchronously — used on foreground, where an update that landed while
+    /// the app was suspended may not have been redelivered yet.
+    func refresh() { apply(monitor.currentPath) }
+
+    private func apply(_ path: NWPath) {
+        let lan = path.status == .satisfied
+            && (path.usesInterfaceType(.wifi) || path.usesInterfaceType(.wiredEthernet))
+        let satisfied = path.status == .satisfied
+        let changed = lan != canUseLAN || satisfied != isSatisfied
+        canUseLAN = lan
+        isSatisfied = satisfied
+        if changed { onChange?() }
+    }
+}

From 030d814ffeb6a9c41a48bf2489af936b823ca6c9 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sat, 4 Jul 2026 23:39:08 -0700
Subject: [PATCH 022/143] Network Type Transition Optimization

Nucleic-Session: 40F8C53A-F001-423A-8607-EAE181DBE14B
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 .../NucleicRemote/Net/NWFrameChannel.swift      | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/NucleicRemote/NucleicRemote/Net/NWFrameChannel.swift b/NucleicRemote/NucleicRemote/Net/NWFrameChannel.swift
index ce62ed0..3130d05 100644
--- a/NucleicRemote/NucleicRemote/Net/NWFrameChannel.swift
+++ b/NucleicRemote/NucleicRemote/Net/NWFrameChannel.swift
@@ -28,7 +28,15 @@ final class NWFrameChannel: FrameChannel, @unchecked Sendable {
     }
 
     init(endpoint: NWEndpoint) {
-        let params = NWParameters.tcp
+        // Short TCP keepalive so a silently-dead LAN link (Wi-Fi dropped, Mac left the subnet) is
+        // detected in ~15s instead of the OS default of minutes — the belt to the path-monitor's
+        // braces for the case where a path still exists but the route to the Mac is gone.
+        let tcp = NWProtocolTCP.Options()
+        tcp.enableKeepalive = true
+        tcp.keepaliveIdle = 5
+        tcp.keepaliveInterval = 5
+        tcp.keepaliveCount = 2
+        let params = NWParameters(tls: nil, tcp: tcp)
         params.includePeerToPeer = true
         connection = NWConnection(to: endpoint, using: params)
         peerDescription = "\(endpoint)"
@@ -39,6 +47,13 @@ final class NWFrameChannel: FrameChannel, @unchecked Sendable {
         connection.stateUpdateHandler = { [weak self] state in
             switch state {
             case .ready: self?.markReady(); self?.onReady?()
+            case .waiting(let error):
+                // No usable path right now (Wi-Fi dropped, host unreachable). NWConnection would sit
+                // in `.waiting` indefinitely, holding the transport hostage — the core of the "still
+                // on LAN after leaving Wi-Fi" stall. Fail fast so the store falls straight through to
+                // tailnet/relay. (Healthy connections go setup→preparing→ready and never hit this;
+                // the connect-timeout guard covers a wrong-network socket that stays `.preparing`.)
+                self?.onFailed?("waiting: \(error)"); self?.continuation.finish()
             case .failed(let error): self?.onFailed?("\(error)"); self?.continuation.finish()
             case .cancelled: self?.continuation.finish()
             default: break

From 36e146f2585119d58edc8bb5e8d4772178ff86b9 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sat, 4 Jul 2026 23:39:14 -0700
Subject: [PATCH 023/143] Network Type Transition Optimization

Nucleic-Session: 40F8C53A-F001-423A-8607-EAE181DBE14B
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Models/HostConnection.swift | 1 +
 1 file changed, 1 insertion(+)

diff --git a/NucleicRemote/NucleicRemote/Models/HostConnection.swift b/NucleicRemote/NucleicRemote/Models/HostConnection.swift
index 967cbbf..e479d68 100644
--- a/NucleicRemote/NucleicRemote/Models/HostConnection.swift
+++ b/NucleicRemote/NucleicRemote/Models/HostConnection.swift
@@ -69,6 +69,7 @@ final class HostConnection {
 
     private let identity: DeviceIdentity
     private let discovery: LANDiscovery
+    private let pathMonitor: NetworkPathMonitor
 
     // MARK: Connection machine (moved from RemoteStore, one per host)
 

From f988f660fe2548f5338eb88314b5259cb2134843 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sat, 4 Jul 2026 23:39:19 -0700
Subject: [PATCH 024/143] Network Type Transition Optimization

Nucleic-Session: 40F8C53A-F001-423A-8607-EAE181DBE14B
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Models/HostConnection.swift | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/NucleicRemote/NucleicRemote/Models/HostConnection.swift b/NucleicRemote/NucleicRemote/Models/HostConnection.swift
index e479d68..a5f83cd 100644
--- a/NucleicRemote/NucleicRemote/Models/HostConnection.swift
+++ b/NucleicRemote/NucleicRemote/Models/HostConnection.swift
@@ -100,12 +100,14 @@ final class HostConnection {
 
     init(
         hostID: String, hostName: String,
-        identity: DeviceIdentity, discovery: LANDiscovery, callbacks: Callbacks
+        identity: DeviceIdentity, discovery: LANDiscovery, pathMonitor: NetworkPathMonitor,
+        callbacks: Callbacks
     ) {
         self.hostID = hostID
         self.hostName = hostName
         self.identity = identity
         self.discovery = discovery
+        self.pathMonitor = pathMonitor
         self.callbacks = callbacks
     }
 

From ce4028ffc85ad897c44b21c095b0d3b9d33f04f4 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sat, 4 Jul 2026 23:39:26 -0700
Subject: [PATCH 025/143] Network Type Transition Optimization

Nucleic-Session: 40F8C53A-F001-423A-8607-EAE181DBE14B
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Models/HostConnection.swift | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/NucleicRemote/NucleicRemote/Models/HostConnection.swift b/NucleicRemote/NucleicRemote/Models/HostConnection.swift
index a5f83cd..893e7d0 100644
--- a/NucleicRemote/NucleicRemote/Models/HostConnection.swift
+++ b/NucleicRemote/NucleicRemote/Models/HostConnection.swift
@@ -180,7 +180,11 @@ final class HostConnection {
         relay: (membershipToken: String?, url: String?)? = nil
     ) -> [TransportAttempt] {
         var candidates: [TransportAttempt] = []
-        if let endpoint = discovery.endpoint(forFingerprint: fingerprint, lanHost: lanHost, lanPort: lanPort) {
+        // Only offer LAN when the device actually has a LAN-capable path (Wi-Fi/wired). On cellular
+        // the pinned `lanHost:lanPort` is unreachable, so including it here would just burn the
+        // connect timeout before falling through — skip it and dial tailnet/relay immediately.
+        if pathMonitor.canUseLAN,
+           let endpoint = discovery.endpoint(forFingerprint: fingerprint, lanHost: lanHost, lanPort: lanPort) {
             candidates.append(.lan(endpoint))
         }
         if let tailnet, let host = tailnet.host, let port = tailnet.port, TailnetSupport.isBuiltIn {

From b0b041f26888a74a0217aa008bc5c95a90d4e2a6 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sat, 4 Jul 2026 23:39:36 -0700
Subject: [PATCH 026/143] Network Type Transition Optimization

Nucleic-Session: 40F8C53A-F001-423A-8607-EAE181DBE14B
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 .../NucleicRemote/Models/HostConnection.swift | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/NucleicRemote/NucleicRemote/Models/HostConnection.swift b/NucleicRemote/NucleicRemote/Models/HostConnection.swift
index 893e7d0..d72948e 100644
--- a/NucleicRemote/NucleicRemote/Models/HostConnection.swift
+++ b/NucleicRemote/NucleicRemote/Models/HostConnection.swift
@@ -483,6 +483,27 @@ final class HostConnection {
         Task { await client.send(msg) }
     }
 
+    /// The device's network path changed (Wi-Fi ⇄ cellular, joined/left a network). React now rather
+    /// than waiting for a zombie LAN socket to time out or the reconnect backoff to elapse — this is
+    /// what makes the transport switch feel immediate. Only reconnect-managed hosts (a pinned host)
+    /// re-plan here; a host mid-pairing runs its own one-shot candidate chain.
+    func networkPathChanged() {
+        guard let host = pinnedHost else { return }
+        // Using (or dialing) LAN but LAN is no longer reachable → the socket is dead in all but name.
+        // Drop it and re-plan now; `buildCandidates` skips LAN and dials tailnet/relay.
+        if activeTransport == .lan, !pathMonitor.canUseLAN {
+            reconnectAttempts = 0
+            reconnect(to: host)
+            return
+        }
+        // Offline/reconnecting and the network just came back or changed → retry immediately instead
+        // of sitting out the remaining backoff.
+        if !connectivity.isLive, pathMonitor.isSatisfied {
+            reconnectAttempts = 0
+            reconnect(to: host)
+        }
+    }
+
     private func scheduleRetry(host: PairedHost?) {
         guard let host else { return }
         reconnectAttempts += 1

From e15c1d9b89623835fb80f1b92c1b6016c1327c7b Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sat, 4 Jul 2026 23:39:41 -0700
Subject: [PATCH 027/143] Network Type Transition Optimization

Nucleic-Session: 40F8C53A-F001-423A-8607-EAE181DBE14B
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Models/RemoteStore.swift | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/NucleicRemote/NucleicRemote/Models/RemoteStore.swift b/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
index cd398ce..3590c45 100644
--- a/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
+++ b/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
@@ -159,6 +159,9 @@ final class RemoteStore: ObservableObject {
 
     private let identity = IdentityStore.loadOrCreateIdentity()
     let discovery = LANDiscovery()
+    /// Proactive network-path awareness (shared across every host connection): flips transports the
+    /// instant Wi-Fi drops or returns, instead of waiting for a dead LAN socket to time out.
+    let pathMonitor = NetworkPathMonitor()
     /// One live connection per paired Mac (mesh P3 multiplexer). All connected at once; the flat
     /// `sessions`/`connectivity`/`capabilities`/… above mirror the *active* one (`activeHostID`), so
     /// switching hosts is instant (no reconnect). Empty in demo mode (demo seeds state directly).

From d80e94fc24f010b2f26228aa4f2b260a3662710d Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sat, 4 Jul 2026 23:39:46 -0700
Subject: [PATCH 028/143] Network Type Transition Optimization

Nucleic-Session: 40F8C53A-F001-423A-8607-EAE181DBE14B
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Models/RemoteStore.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NucleicRemote/NucleicRemote/Models/RemoteStore.swift b/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
index 3590c45..225c8e2 100644
--- a/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
+++ b/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
@@ -439,7 +439,7 @@ final class RemoteStore: ObservableObject {
     private func makeConnection(hostID: String, hostName: String) -> HostConnection {
         HostConnection(
             hostID: hostID, hostName: hostName, identity: identity, discovery: discovery,
-            callbacks: callbacks(for: hostID))
+            pathMonitor: pathMonitor, callbacks: callbacks(for: hostID))
     }
 
     /// The callbacks one `HostConnection` uses to drive shared/aggregate state. `hostID` is captured

From 087f49d592a7d4e8e5106fec6ea22f7919862248 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sat, 4 Jul 2026 23:39:54 -0700
Subject: [PATCH 029/143] Network Type Transition Optimization

Nucleic-Session: 40F8C53A-F001-423A-8607-EAE181DBE14B
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 .../NucleicRemote/Models/RemoteStore.swift    | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/NucleicRemote/NucleicRemote/Models/RemoteStore.swift b/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
index 225c8e2..76be4d0 100644
--- a/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
+++ b/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
@@ -265,10 +265,29 @@ final class RemoteStore: ObservableObject {
 
     func onAppear() {
         if demoMode { seedDemo(); return }
+        // Re-plan every connection the moment the network path changes (left Wi-Fi, joined a
+        // network, cellular⇄Wi-Fi) — the proactive half of "immediate switchover".
+        pathMonitor.onChange = { [weak self] in self?.handlePathChange() }
+        pathMonitor.start()
         discovery.start()
         if isPaired { reconnect() }
     }
 
+    /// A network-path change: tell each host connection to re-plan its transport now.
+    private func handlePathChange() {
+        guard !demoMode else { return }
+        for conn in connections.values { conn.networkPathChanged() }
+    }
+
+    /// Returning to the foreground: the network may have changed while the app was suspended (and
+    /// path/keepalive callbacks were frozen). Re-read the path and re-dial anything not live so the
+    /// transport is correct by the time the UI is on screen, rather than after a backoff.
+    func onForeground() {
+        guard !demoMode, isPaired else { return }
+        pathMonitor.refresh()
+        reconnect()
+    }
+
     private func seedDemo() {
         connectivity = .connected(.lan)
         hostName = "Andrew's Mac"

From efc7e4c7fbeb2b311c17bdcba5540a4f96b20330 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sat, 4 Jul 2026 23:40:00 -0700
Subject: [PATCH 030/143] Network Type Transition Optimization

Nucleic-Session: 40F8C53A-F001-423A-8607-EAE181DBE14B
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/NucleicRemoteApp.swift | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/NucleicRemote/NucleicRemote/NucleicRemoteApp.swift b/NucleicRemote/NucleicRemote/NucleicRemoteApp.swift
index 267c7c1..c8132f1 100644
--- a/NucleicRemote/NucleicRemote/NucleicRemoteApp.swift
+++ b/NucleicRemote/NucleicRemote/NucleicRemoteApp.swift
@@ -28,7 +28,12 @@ struct NucleicRemoteApp: App {
                 // activity flag current so it only notifies for background transitions.
                 .onChange(of: scenePhase) { _, phase in
                     store.setScenePhaseActive(phase == .active)
-                    if phase == .active { Task { await HeartbeatReporter.reportIfDue() } }
+                    if phase == .active {
+                        // Re-plan transports immediately on foreground — the network may have
+                        // changed while suspended, so don't wait for a dead socket to notice.
+                        store.onForeground()
+                        Task { await HeartbeatReporter.reportIfDue() }
+                    }
                 }
         }
     }

From 96b7d7cc79014aae30294e642a5f4870a3495cea Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sat, 4 Jul 2026 23:40:29 -0700
Subject: [PATCH 031/143] Live Activity Content Density

Nucleic-Session: B3643133-163C-4C5D-BE20-1A6B7FB83DA9
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 .../Shared/SessionActivityAttributes.swift    | 50 +++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/NucleicRemote/Shared/SessionActivityAttributes.swift b/NucleicRemote/Shared/SessionActivityAttributes.swift
index 0d29361..281d720 100644
--- a/NucleicRemote/Shared/SessionActivityAttributes.swift
+++ b/NucleicRemote/Shared/SessionActivityAttributes.swift
@@ -75,3 +75,53 @@ struct NucleicSessionAttributes: ActivityAttributes {
     /// The paired Mac's name (static for the Activity's lifetime).
     var hostName: String
 }
+
+extension NucleicSessionAttributes.ContentState {
+    /// Where a tap on the whole activity should go (UX_IOS §5.3): a session waiting on the user
+    /// opens straight into that session; otherwise (work running, nothing waiting) the sessions
+    /// list. `lines` is attention-first, so any waiting session is `lines.first` — and always in
+    /// the capped list, since waiting outranks running in the sort.
+    var tapURL: URL? {
+        if let waiting = lines.first(where: { $0.kind == .approval || $0.kind == .needsInput }) {
+            return NucleicDeepLink.session(waiting.id)
+        }
+        return NucleicDeepLink.sessionsList
+    }
+}
+
+/// The `nucleic://` deep links the Live Activity emits and the app consumes. Kept in the shared
+/// file so the widget that *builds* a URL and the app that *parses* one can't drift.
+enum NucleicDeepLink {
+    static let scheme = "nucleic"
+
+    /// Open a specific session's detail: `nucleic://session/<id>`.
+    static func session(_ id: String) -> URL? {
+        var c = URLComponents()
+        c.scheme = scheme
+        c.host = "session"
+        c.path = "/\(id)"
+        return c.url
+    }
+
+    /// Surface the sessions list, no specific session: `nucleic://sessions`.
+    static var sessionsList: URL? { URL(string: "\(scheme)://sessions") }
+
+    /// What an incoming link asks the app to do.
+    enum Route: Equatable {
+        case session(String)
+        case sessionsList
+    }
+
+    static func route(for url: URL) -> Route? {
+        guard url.scheme == scheme else { return nil }
+        switch url.host {
+        case "session":
+            let id = url.path.trimmingCharacters(in: CharacterSet(charactersIn: "/"))
+            return id.isEmpty ? nil : .session(id)
+        case "sessions":
+            return .sessionsList
+        default:
+            return nil
+        }
+    }
+}

From 8ae92b796107f0ebb21215ce11f54fa77043e0f6 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sat, 4 Jul 2026 23:40:35 -0700
Subject: [PATCH 032/143] Live Activity Content Density

Nucleic-Session: B3643133-163C-4C5D-BE20-1A6B7FB83DA9
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemoteWidgets/SessionLiveActivity.swift | 1 +
 1 file changed, 1 insertion(+)

diff --git a/NucleicRemote/NucleicRemoteWidgets/SessionLiveActivity.swift b/NucleicRemote/NucleicRemoteWidgets/SessionLiveActivity.swift
index 5303e72..019a48a 100644
--- a/NucleicRemote/NucleicRemoteWidgets/SessionLiveActivity.swift
+++ b/NucleicRemote/NucleicRemoteWidgets/SessionLiveActivity.swift
@@ -13,6 +13,7 @@ struct SessionLiveActivity: Widget {
     var body: some WidgetConfiguration {
         ActivityConfiguration(for: NucleicSessionAttributes.self) { context in
             LockScreenView(state: context.state, hostName: context.attributes.hostName)
+                .widgetURL(context.state.tapURL)
                 .activityBackgroundTint(Color.black.opacity(0.55))
                 .activitySystemActionForegroundColor(.white)
         } dynamicIsland: { context in

From 80659ec103e9f70870121401389d4638da8684bc Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sat, 4 Jul 2026 23:40:54 -0700
Subject: [PATCH 033/143] Live Activity Content Density

Nucleic-Session: B3643133-163C-4C5D-BE20-1A6B7FB83DA9
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemoteWidgets/SessionLiveActivity.swift | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/NucleicRemote/NucleicRemoteWidgets/SessionLiveActivity.swift b/NucleicRemote/NucleicRemoteWidgets/SessionLiveActivity.swift
index 019a48a..1d74750 100644
--- a/NucleicRemote/NucleicRemoteWidgets/SessionLiveActivity.swift
+++ b/NucleicRemote/NucleicRemoteWidgets/SessionLiveActivity.swift
@@ -63,6 +63,9 @@ struct SessionLiveActivity: Widget {
                     .foregroundStyle(state.needsAttention
                         ? ActivityPalette.attention : ActivityPalette.active)
             }
+            // The compact/minimal presentations tap through to the same target as the lock
+            // screen: a waiting session opens itself; otherwise the sessions list.
+            .widgetURL(state.tapURL)
         }
     }
 }

From 79163a4b6626af18e6480947ef0111d4817754f0 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sat, 4 Jul 2026 23:41:15 -0700
Subject: [PATCH 034/143] Live Activity Content Density

Nucleic-Session: B3643133-163C-4C5D-BE20-1A6B7FB83DA9
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 .../NucleicRemote/Models/RemoteStore.swift     | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/NucleicRemote/NucleicRemote/Models/RemoteStore.swift b/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
index 76be4d0..381932f 100644
--- a/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
+++ b/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
@@ -86,6 +86,11 @@ final class RemoteStore: ObservableObject {
     /// `RootView` switches to the Sessions tab; `SessionsView` pushes it and clears.
     @Published var pendingRoute: SessionID?
 
+    /// A request to surface the sessions list itself, no specific session — the Live Activity's
+    /// "work running, nothing waiting" tap. Compact jumps to the Sessions tab; the iPad split
+    /// reveals its sidebar (which always lists sessions). One-shot: the shell clears it.
+    @Published var pendingSessionsList = false
+
     /// Whether the app is foreground-active (scene phase), mirrored here so the store can
     /// decide which transitions deserve a notification.
     private(set) var isActive = true
@@ -95,6 +100,19 @@ final class RemoteStore: ObservableObject {
     /// Route to a session from a notification tap (deep link).
     func route(to sessionID: SessionID) { pendingRoute = sessionID }
 
+    /// Ask the shell to show the sessions list (no specific session opened).
+    func showSessionsList() { pendingSessionsList = true }
+
+    /// Follow a `nucleic://` deep link — the Live Activity tap. A session waiting on the user
+    /// opens straight into that session; the plain sessions link just surfaces the list.
+    func handleDeepLink(_ url: URL) {
+        switch NucleicDeepLink.route(for: url) {
+        case .session(let id): route(to: SessionID(rawValue: id))
+        case .sessionsList: showSessionsList()
+        case .none: break
+        }
+    }
+
     /// An Allow/Deny straight from a notification action (UX_IOS §5.1). Requires a live
     /// channel; if the socket dropped while backgrounded, reconnect and send once ready —
     /// but only briefly (a stale queued approval must never fire minutes later; see

From 3871572bc4ccb6ced90ae20c74ad62a7d53eafd4 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sat, 4 Jul 2026 23:41:21 -0700
Subject: [PATCH 035/143] Live Activity Content Density

Nucleic-Session: B3643133-163C-4C5D-BE20-1A6B7FB83DA9
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Views/AdaptiveRootView.swift | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/NucleicRemote/NucleicRemote/Views/AdaptiveRootView.swift b/NucleicRemote/NucleicRemote/Views/AdaptiveRootView.swift
index 0e64aba..7d9344b 100644
--- a/NucleicRemote/NucleicRemote/Views/AdaptiveRootView.swift
+++ b/NucleicRemote/NucleicRemote/Views/AdaptiveRootView.swift
@@ -49,6 +49,10 @@ struct CompactRootView: View {
         .onChange(of: store.pendingRoute) { _, route in
             if route != nil { tab = 1 }
         }
+        // A Live Activity tap with work running but nothing waiting: show the Sessions list.
+        .onChange(of: store.pendingSessionsList) { _, show in
+            if show { tab = 1; store.pendingSessionsList = false }
+        }
     }
 }
 

From d404442c681fe4962cba82f0f8125d5d68e3bcb0 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sat, 4 Jul 2026 23:41:26 -0700
Subject: [PATCH 036/143] Live Activity Content Density

Nucleic-Session: B3643133-163C-4C5D-BE20-1A6B7FB83DA9
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Views/AdaptiveRootView.swift | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/NucleicRemote/NucleicRemote/Views/AdaptiveRootView.swift b/NucleicRemote/NucleicRemote/Views/AdaptiveRootView.swift
index 7d9344b..8c32dd6 100644
--- a/NucleicRemote/NucleicRemote/Views/AdaptiveRootView.swift
+++ b/NucleicRemote/NucleicRemote/Views/AdaptiveRootView.swift
@@ -96,6 +96,13 @@ struct SplitRootView: View {
             selection = .session(route)
             store.pendingRoute = nil
         }
+        // A Live Activity tap with work running but nothing waiting: reveal the sidebar, which
+        // always lists the live sessions (the regular-width analogue of the Sessions tab).
+        .onChange(of: store.pendingSessionsList) { _, show in
+            guard show else { return }
+            columnVisibility = .all
+            store.pendingSessionsList = false
+        }
         .onAppear {
             // Offline UI previews (NUCLEIC_DEMO): open straight into one session.
             if let raw = ProcessInfo.processInfo.environment["NUCLEIC_DEMO_SESSION"], !raw.isEmpty {

From fbbff8e26cb7483f92b9fbcdb017e0205bb4d851 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sat, 4 Jul 2026 23:41:40 -0700
Subject: [PATCH 037/143] Live Activity Content Density

Nucleic-Session: B3643133-163C-4C5D-BE20-1A6B7FB83DA9
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/NucleicRemoteApp.swift | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/NucleicRemote/NucleicRemote/NucleicRemoteApp.swift b/NucleicRemote/NucleicRemote/NucleicRemoteApp.swift
index c8132f1..3546d9a 100644
--- a/NucleicRemote/NucleicRemote/NucleicRemoteApp.swift
+++ b/NucleicRemote/NucleicRemote/NucleicRemoteApp.swift
@@ -10,6 +10,9 @@ struct NucleicRemoteApp: App {
         WindowGroup {
             RootView()
                 .environmentObject(store)
+                // A Live Activity tap arrives as a `nucleic://` deep link: open the waiting
+                // session, or surface the sessions list when work is only running.
+                .onOpenURL { store.handleDeepLink($0) }
                 .onAppear {
                     store.onAppear()
                     // Notification categories + delegate must be in place before any

From 09f66f211f0ff65dc3616672f516005c215e7563 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sat, 4 Jul 2026 23:41:47 -0700
Subject: [PATCH 038/143] Live Activity Content Density

Nucleic-Session: B3643133-163C-4C5D-BE20-1A6B7FB83DA9
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Info.plist | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/NucleicRemote/NucleicRemote/Info.plist b/NucleicRemote/NucleicRemote/Info.plist
index 15712f4..66f21c2 100644
--- a/NucleicRemote/NucleicRemote/Info.plist
+++ b/NucleicRemote/NucleicRemote/Info.plist
@@ -22,6 +22,22 @@
 	<string></string>
 	<key>NSSupportsLiveActivities</key>
 	<true/>
+	<!-- The `nucleic://` deep-link scheme the Live Activity taps through on: `nucleic://session/<id>`
+	     opens a waiting session; `nucleic://sessions` surfaces the sessions list. Handled by
+	     `.onOpenURL` → `RemoteStore.handleDeepLink`. -->
+	<key>CFBundleURLTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>CFBundleURLName</key>
+			<string>com.nucleic.remote</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>nucleic</string>
+			</array>
+		</dict>
+	</array>
 	<!-- Export compliance: the app ships a Noise-Protocol secure channel (X25519 /
 	     ChaCha20-Poly1305 / SHA-256 via CryptoKit). App Store Connect's export-compliance
 	     questionnaire classified this as EXEMPT (standard algorithms / mass-market, no

From d8561b325d06799fb2e17036a3c70bdd31692c0a Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sat, 4 Jul 2026 23:45:47 -0700
Subject: [PATCH 039/143] Live Activity Content Density

Nucleic-Session: B3643133-163C-4C5D-BE20-1A6B7FB83DA9
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/LiveActivityManager.swift | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/NucleicRemote/NucleicRemote/LiveActivityManager.swift b/NucleicRemote/NucleicRemote/LiveActivityManager.swift
index 98f60a5..4052afa 100644
--- a/NucleicRemote/NucleicRemote/LiveActivityManager.swift
+++ b/NucleicRemote/NucleicRemote/LiveActivityManager.swift
@@ -17,6 +17,17 @@ final class LiveActivityManager {
 
     private var activity: Activity<NucleicSessionAttributes>?
 
+    /// The last content we pushed. Updates that don't change it are skipped so we don't spend
+    /// ActivityKit's update budget on no-ops — `sync` fires on every host message (dashboard,
+    /// connectivity, pong, diff ticks…), most of which leave the aggregate identical. Burning the
+    /// budget on those is exactly what makes a *real* change land late and the glance read stale.
+    private var lastState: NucleicSessionAttributes.ContentState?
+    /// The newest state waiting to be applied, and the single task draining it. Coalescing to the
+    /// latest through one serial task means the newest data always wins — firing an unstructured
+    /// `Task` per `sync` let a later update lose a race to an earlier one and freeze the glance.
+    private var pendingState: NucleicSessionAttributes.ContentState?
+    private var updateTask: Task<Void, Never>?
+
     /// Reconcile the Activity with the current session set.
     func sync(hostName: String, sessions: [WireSessionSummary]) {
         guard ActivityAuthorizationInfo().areActivitiesEnabled else { return }

From ff605a3997d07aa4b1b362ef3c19d021314437dc Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sat, 4 Jul 2026 23:46:00 -0700
Subject: [PATCH 040/143] Live Activity Content Density

Nucleic-Session: B3643133-163C-4C5D-BE20-1A6B7FB83DA9
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 .../NucleicRemote/LiveActivityManager.swift   | 47 +++++++++++++++----
 1 file changed, 38 insertions(+), 9 deletions(-)

diff --git a/NucleicRemote/NucleicRemote/LiveActivityManager.swift b/NucleicRemote/NucleicRemote/LiveActivityManager.swift
index 4052afa..00592cc 100644
--- a/NucleicRemote/NucleicRemote/LiveActivityManager.swift
+++ b/NucleicRemote/NucleicRemote/LiveActivityManager.swift
@@ -68,23 +68,52 @@ final class LiveActivityManager {
             linesRemoved: removed,
             lines: Array(lines))
 
-        if let activity {
-            Task { await activity.update(ActivityContent(state: state, staleDate: nil)) }
-        } else {
-            // Recover an Activity that survived an app relaunch before starting a new one.
+        push(state, hostName: hostName)
+    }
+
+    /// Apply `state` to the Activity — deduped against the last push and coalesced through one
+    /// serial task so the newest state always wins.
+    private func push(_ state: NucleicSessionAttributes.ContentState, hostName: String) {
+        guard state != lastState else { return }
+        lastState = state
+
+        guard let activity else {
+            // Recover an Activity that survived an app relaunch before starting a new one; the
+            // recovered one still needs the fresh state, so fall through to the update pipeline.
             if let existing = Activity<NucleicSessionAttributes>.activities.first {
                 activity = existing
-                Task { await existing.update(ActivityContent(state: state, staleDate: nil)) }
-                return
+                enqueue(state)
+            } else {
+                activity = try? Activity.request(
+                    attributes: NucleicSessionAttributes(hostName: hostName),
+                    content: ActivityContent(state: state, staleDate: nil))
             }
-            activity = try? Activity.request(
-                attributes: NucleicSessionAttributes(hostName: hostName),
-                content: ActivityContent(state: state, staleDate: nil))
+            return
+        }
+        _ = activity
+        enqueue(state)
+    }
+
+    /// Hand the newest state to the serial drainer (starting it if idle).
+    private func enqueue(_ state: NucleicSessionAttributes.ContentState) {
+        pendingState = state
+        guard updateTask == nil else { return }  // the running drainer will pick this up
+        updateTask = Task { @MainActor [weak self] in
+            guard let self else { return }
+            while let next = self.pendingState {
+                self.pendingState = nil
+                await self.activity?.update(ActivityContent(state: next, staleDate: nil))
+            }
+            self.updateTask = nil
         }
     }
 
     /// End the Activity (all idle, or unpaired).
     func end() {
+        updateTask?.cancel()
+        updateTask = nil
+        pendingState = nil
+        lastState = nil
         guard let activity else { return }
         self.activity = nil
         Task {

From 331aac15f1cc5b71b4747f26317369193a1d77a7 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sat, 4 Jul 2026 23:46:05 -0700
Subject: [PATCH 041/143] Live Activity Content Density

Nucleic-Session: B3643133-163C-4C5D-BE20-1A6B7FB83DA9
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/LiveActivityManager.swift | 1 -
 1 file changed, 1 deletion(-)

diff --git a/NucleicRemote/NucleicRemote/LiveActivityManager.swift b/NucleicRemote/NucleicRemote/LiveActivityManager.swift
index 00592cc..55838f1 100644
--- a/NucleicRemote/NucleicRemote/LiveActivityManager.swift
+++ b/NucleicRemote/NucleicRemote/LiveActivityManager.swift
@@ -90,7 +90,6 @@ final class LiveActivityManager {
             }
             return
         }
-        _ = activity
         enqueue(state)
     }
 

From afa7410dae69d3a0cd2d7ac556c19fcb1d91a728 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sat, 4 Jul 2026 23:50:20 -0700
Subject: [PATCH 042/143] Feature Enhancement Planning

Nucleic-Session: 3CD3A375-8BC1-407E-951F-8EF136B08390
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Models/HostConnection.swift | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/NucleicRemote/NucleicRemote/Models/HostConnection.swift b/NucleicRemote/NucleicRemote/Models/HostConnection.swift
index d72948e..8c482e3 100644
--- a/NucleicRemote/NucleicRemote/Models/HostConnection.swift
+++ b/NucleicRemote/NucleicRemote/Models/HostConnection.swift
@@ -287,7 +287,10 @@ final class HostConnection {
             channel: channel, identity: identity, hostStaticKey: hostStaticKey,
             mode: mode, deviceID: deviceID,
             deviceLabel: UIDevice.current.name, pushToken: PushRegistrar.shared.tokenHex,
-            releaseChannel: BuildInfo.current.channel.releaseChannel)
+            releaseChannel: BuildInfo.current.channel.releaseChannel,
+            // Mesh "join": advertise roster gossip so a host pushes its group view — the phone
+            // then auto-learns and connects to every Mac in the mesh, not just the one it scanned.
+            clientCaps: WireClientCapabilities(mesh: 1, canSyncRoster: true))
         self.client = client
         consume(client, pairingPayload: pairingPayload)
     }

From 434664f37137528b2e01e78d21b05c3a9d378aca Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sat, 4 Jul 2026 23:50:30 -0700
Subject: [PATCH 043/143] Feature Enhancement Planning

Nucleic-Session: 3CD3A375-8BC1-407E-951F-8EF136B08390
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Models/HostConnection.swift | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/NucleicRemote/NucleicRemote/Models/HostConnection.swift b/NucleicRemote/NucleicRemote/Models/HostConnection.swift
index 8c482e3..cfe8b0b 100644
--- a/NucleicRemote/NucleicRemote/Models/HostConnection.swift
+++ b/NucleicRemote/NucleicRemote/Models/HostConnection.swift
@@ -60,6 +60,9 @@ final class HostConnection {
         var wireError: (WireError) -> Void = { _ in }
         /// A pairing handshake succeeded — persist the pinned host record.
         var didPair: (PairedHost) -> Void = { _ in }
+        /// The mesh roster changed (mesh "join"): a Mac was learned or revoked via gossip — the
+        /// registry was updated, so (re)connect to every paired Mac and drop any that left.
+        var meshRosterChanged: () -> Void = {}
         /// The embedded Tailscale node's status changed (for Settings).
         var tailnetStatus: (String?, URL?) -> Void = { _, _ in }
     }

From ae951e45e746304878b4fb83aa78b9ce0eb982a4 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sat, 4 Jul 2026 23:50:40 -0700
Subject: [PATCH 044/143] Feature Enhancement Planning

Nucleic-Session: 3CD3A375-8BC1-407E-951F-8EF136B08390
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 .../NucleicRemote/Models/HostConnection.swift | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/NucleicRemote/NucleicRemote/Models/HostConnection.swift b/NucleicRemote/NucleicRemote/Models/HostConnection.swift
index cfe8b0b..b1d5247 100644
--- a/NucleicRemote/NucleicRemote/Models/HostConnection.swift
+++ b/NucleicRemote/NucleicRemote/Models/HostConnection.swift
@@ -434,6 +434,29 @@ final class HostConnection {
         case .peerList(let peers):
             meshPeers = peers
             callbacks.didUpdate()
+        case .meshRoster(let push):
+            // Mesh "join": the host gossiped its group view. Auto-learn every Mac member into the
+            // paired-hosts registry (so the multiplexer connects to all of them), and drop any the
+            // group revoked. Phone members are ignored — a phone doesn't dial other phones.
+            var changed = false
+            for member in push.members where member.kind == .mac || member.capabilities.canHost {
+                // A mac deviceID is `sha256(staticPublicKey)`; reject a forged (id, key) pair.
+                guard DeviceIdentity.hostID(ofStaticKey: member.staticPublicKey) == member.deviceID
+                else { continue }
+                let fingerprint = member.staticPublicKey.fingerprintHex
+                guard fingerprint != self.hostID else { continue }  // that's the Mac we're on
+                if IdentityStore.pairedHost(id: fingerprint) == nil { changed = true }
+                IdentityStore.mergePairedHost(Self.pairedHost(from: member))
+            }
+            for tombstone in push.tombstones {
+                // fingerprint = first 16 hex of the hostID (sha256 prefix), the registry key.
+                let fingerprint = String(tombstone.deviceID.prefix(16))
+                if IdentityStore.pairedHost(id: fingerprint) != nil {
+                    IdentityStore.removePairedHost(id: fingerprint)
+                    changed = true
+                }
+            }
+            if changed { callbacks.meshRosterChanged() }
         case .transferAccept, .transferReject, .transferReady, .transferCommitted, .transferChunkAck:
             // Session-transfer replies (mesh P5) only reach a *source* Mac; a phone is never one.
             break

From 8701b2516eb56365833b1e98bb132f55bc80339d Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sat, 4 Jul 2026 23:50:53 -0700
Subject: [PATCH 045/143] Feature Enhancement Planning

Nucleic-Session: 3CD3A375-8BC1-407E-951F-8EF136B08390
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 .../NucleicRemote/Models/HostConnection.swift | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/NucleicRemote/NucleicRemote/Models/HostConnection.swift b/NucleicRemote/NucleicRemote/Models/HostConnection.swift
index b1d5247..c8a4e6a 100644
--- a/NucleicRemote/NucleicRemote/Models/HostConnection.swift
+++ b/NucleicRemote/NucleicRemote/Models/HostConnection.swift
@@ -177,6 +177,39 @@ final class HostConnection {
         callbacks.didUpdate()
     }
 
+    /// Translate a gossiped mesh member (mesh "join") into a pinnable/dialable `PairedHost`. The
+    /// member carries the host static key + last-known addresses — everything IK reconnect needs.
+    /// No relay token yet (the phone never directly paired this Mac); it's adopted from the host's
+    /// `relayMembership` push after the first LAN/tailnet contact, so first contact needs one of
+    /// those paths.
+    static func pairedHost(from member: MeshMember) -> PairedHost {
+        let (lanHost, lanPort) = splitHostPort(member.addresses?.lanHint)
+        let tailnetHost = member.addresses?.tailnet
+        let hasTailnet = !(tailnetHost?.isEmpty ?? true)
+        return PairedHost(
+            deviceID: IdentityStore.deviceID(),
+            hostName: member.label,
+            hostStaticKey: member.staticPublicKey,
+            fingerprint: member.staticPublicKey.fingerprintHex,
+            lanHost: lanHost, lanPort: lanPort,
+            transport: (hasTailnet ? SyncTransportHint.tailnet : .lan).rawValue,
+            tailnetHost: hasTailnet ? tailnetHost : nil,
+            // The sync port on a tailnet is fixed protocol-wide (SyncTransportSetting.tailnetPort);
+            // a gossiped address carries only the IP.
+            tailnetPort: hasTailnet ? 43_753 : nil,
+            relayRoomID: member.addresses?.relayRoomID,
+            relayMembershipToken: nil, relayURL: nil)
+    }
+
+    /// Split a "host:port" hint (last-colon split so a bracketed IPv6 host survives).
+    private static func splitHostPort(_ hint: String?) -> (String?, UInt16?) {
+        guard let hint, let colon = hint.lastIndex(of: ":"),
+              let port = UInt16(hint[hint.index(after: colon)...]) else { return (nil, nil) }
+        var host = String(hint[..<colon])
+        if host.hasPrefix("["), host.hasSuffix("]") { host = String(host.dropFirst().dropLast()) }
+        return (host.isEmpty ? nil : host, port)
+    }
+
     private func buildCandidates(
         fingerprint: String?, lanHost: String?, lanPort: UInt16?,
         tailnet: (host: String?, port: UInt16?)?,

From 9c07c163dcfa927c40224a109b29dd03dc9050c1 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sat, 4 Jul 2026 23:51:03 -0700
Subject: [PATCH 046/143] Feature Enhancement Planning

Nucleic-Session: 3CD3A375-8BC1-407E-951F-8EF136B08390
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 .../NucleicRemote/Models/IdentityStore.swift  | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/NucleicRemote/NucleicRemote/Models/IdentityStore.swift b/NucleicRemote/NucleicRemote/Models/IdentityStore.swift
index ecfbe49..fa26ed4 100644
--- a/NucleicRemote/NucleicRemote/Models/IdentityStore.swift
+++ b/NucleicRemote/NucleicRemote/Models/IdentityStore.swift
@@ -112,6 +112,26 @@ enum IdentityStore {
         savePairedHosts(pairedHosts().filter { $0.fingerprint != hostID })
     }
 
+    /// Merge a Mac learned via mesh roster gossip (mesh "join"): append it if new, else refresh its
+    /// hints **in place** — unlike `upsertPairedHost`, this must NOT reorder (which would hijack the
+    /// active host) and must not clobber a relay token or our established device id with the
+    /// gossiped nils.
+    static func mergePairedHost(_ host: PairedHost) {
+        var hosts = pairedHosts()
+        if let index = hosts.firstIndex(where: { $0.fingerprint == host.fingerprint }) {
+            var merged = host
+            let existing = hosts[index]
+            merged.deviceID = existing.deviceID  // keep our established id for this host
+            merged.relayMembershipToken = host.relayMembershipToken ?? existing.relayMembershipToken
+            merged.relayRoomID = host.relayRoomID ?? existing.relayRoomID
+            merged.relayURL = host.relayURL ?? existing.relayURL
+            hosts[index] = merged
+        } else {
+            hosts.append(host)
+        }
+        savePairedHosts(hosts)
+    }
+
     /// Mutate one host's record **in place**, preserving registry order — unlike
     /// `upsertPairedHost`, this must not make the host active (it backs background
     /// refreshes like the relay-membership push, which can arrive from a non-active Mac).

From ac44a73e8deb98f540e5c86e2f61f91686d66fb7 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sat, 4 Jul 2026 23:51:16 -0700
Subject: [PATCH 047/143] Network Type Transition Optimization

Nucleic-Session: 40F8C53A-F001-423A-8607-EAE181DBE14B
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Models/RemoteStore.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NucleicRemote/NucleicRemote/Models/RemoteStore.swift b/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
index 381932f..1c32681 100644
--- a/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
+++ b/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
@@ -882,7 +882,7 @@ final class RemoteStore: ObservableObject {
         case .setSessionShipBranch(let id, let branch):
             demoUpdateSession(id) { $0.demoCopy(shipBranch: .some(branch)) }
         case .hello, .listSessions, .listDashboard, .subscribe, .unsubscribe,
-             .ping, .cancelQueuedMessage, .fetchDiff, .listPeers, .addressUpdate,
+             .ping, .cancelQueuedMessage, .fetchDiff, .listPeers, .addressUpdate, .meshRoster,
              // Session transfer (mesh P5) is a Mac↔Mac flow — the phone never originates these,
              // and demo has no peer Macs, so they're inert here.
              .transferOffer, .transferChunk, .transferCommit, .transferCancel:

From ab7700a8ebd336aa0e403339bc365b2f0f22597f Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sat, 4 Jul 2026 23:51:34 -0700
Subject: [PATCH 048/143] Feature Enhancement Planning

Nucleic-Session: 3CD3A375-8BC1-407E-951F-8EF136B08390
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Models/RemoteStore.swift | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/NucleicRemote/NucleicRemote/Models/RemoteStore.swift b/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
index 1c32681..6c4f67b 100644
--- a/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
+++ b/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
@@ -530,6 +530,11 @@ final class RemoteStore: ObservableObject {
             IdentityStore.savePairedHost(host)
             self.activeHostID = host.fingerprint
         }
+        cb.meshRosterChanged = { [weak self] in
+            // Mesh "join": a Mac was learned or revoked via gossip. Reconnect to every paired Mac
+            // (connecting the newcomer) and drop any that left — without switching the active host.
+            self?.reconnect()
+        }
         cb.tailnetStatus = { [weak self] status, loginURL in
             self?.tailnetStatus = status
             self?.tailnetLoginURL = loginURL

From 77a8fe99ad9c24710db26824e3d50192f4eeed03 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sat, 4 Jul 2026 23:52:10 -0700
Subject: [PATCH 049/143] Feature Enhancement Planning

Nucleic-Session: 3CD3A375-8BC1-407E-951F-8EF136B08390
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Views/SettingsView.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NucleicRemote/NucleicRemote/Views/SettingsView.swift b/NucleicRemote/NucleicRemote/Views/SettingsView.swift
index 8840575..61d3f9f 100644
--- a/NucleicRemote/NucleicRemote/Views/SettingsView.swift
+++ b/NucleicRemote/NucleicRemote/Views/SettingsView.swift
@@ -71,7 +71,7 @@ struct SettingsView: View {
                 // the active Mac unpairs the live connection; removing another just forgets it.
                 let pairedHosts = IdentityStore.pairedHosts()
                 if !pairedHosts.isEmpty {
-                    Section("Paired Macs") {
+                    Section("Mesh") {
                         ForEach(pairedHosts, id: \.fingerprint) { host in
                             let isActive = host.fingerprint == pairedHosts.last?.fingerprint
                             HStack(spacing: 10) {

From 15772e12aa14524d9f85bfeb3e0efb68840cd1f2 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sat, 4 Jul 2026 23:52:21 -0700
Subject: [PATCH 050/143] Feature Enhancement Planning

Nucleic-Session: 3CD3A375-8BC1-407E-951F-8EF136B08390
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Views/SettingsView.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NucleicRemote/NucleicRemote/Views/SettingsView.swift b/NucleicRemote/NucleicRemote/Views/SettingsView.swift
index 61d3f9f..341ffa4 100644
--- a/NucleicRemote/NucleicRemote/Views/SettingsView.swift
+++ b/NucleicRemote/NucleicRemote/Views/SettingsView.swift
@@ -162,7 +162,7 @@ struct SettingsView: View {
                     Button {
                         showScanner = true
                     } label: {
-                        Label("Pair with a Mac", systemImage: "qrcode.viewfinder")
+                        Label("Join a Mac's group", systemImage: "qrcode.viewfinder")
                     }
                     Button {
                         showManualPair = true

From 104acd9c9f7508683e22f7582ee9d27cf379b678 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sat, 4 Jul 2026 23:52:29 -0700
Subject: [PATCH 051/143] Feature Enhancement Planning

Nucleic-Session: 3CD3A375-8BC1-407E-951F-8EF136B08390
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Views/SettingsView.swift | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/NucleicRemote/NucleicRemote/Views/SettingsView.swift b/NucleicRemote/NucleicRemote/Views/SettingsView.swift
index 341ffa4..fa01577 100644
--- a/NucleicRemote/NucleicRemote/Views/SettingsView.swift
+++ b/NucleicRemote/NucleicRemote/Views/SettingsView.swift
@@ -213,8 +213,8 @@ struct PairingIntroView: View {
     var body: some View {
         VStack(spacing: 24) {
             Image(systemName: "qrcode.viewfinder").font(.system(size: 72)).foregroundStyle(.tint)
-            Text("Pair with your Mac").font(.title2.weight(.semibold))
-            Text("On your Mac, open Nucleic ▸ Settings ▸ Add device to show a QR code, then scan it here — or enter the pairing code beneath it manually.")
+            Text("Join your Mac's group").font(.title2.weight(.semibold))
+            Text("On your Mac, open Nucleic ▸ Settings ▸ Add device to show a QR code, then scan it here — or enter the join code beneath it manually. Scanning any Mac in the group connects you to all of them.")
                 .multilineTextAlignment(.center)
                 .foregroundStyle(.secondary)
                 .padding(.horizontal, 32)

From 71235ed6159989a72560d7867de89badeef55fce Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sat, 4 Jul 2026 23:52:43 -0700
Subject: [PATCH 052/143] Feature Enhancement Planning

Nucleic-Session: 3CD3A375-8BC1-407E-951F-8EF136B08390
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Views/SettingsView.swift | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/NucleicRemote/NucleicRemote/Views/SettingsView.swift b/NucleicRemote/NucleicRemote/Views/SettingsView.swift
index fa01577..2fcf815 100644
--- a/NucleicRemote/NucleicRemote/Views/SettingsView.swift
+++ b/NucleicRemote/NucleicRemote/Views/SettingsView.swift
@@ -331,9 +331,9 @@ struct ManualPairingView: View {
                         .focused($fieldFocused)
                         .onChange(of: code) { error = nil }
                 } header: {
-                    Text("Pairing code")
+                    Text("Join code")
                 } footer: {
-                    Text("On your Mac, open Nucleic ▸ Settings ▸ Add device and copy the pairing link shown beneath the QR code, then paste it here.")
+                    Text("On your Mac, open Nucleic ▸ Settings ▸ Add device and copy the join link shown beneath the QR code, then paste it here.")
                 }
                 if let error {
                     Label(error, systemImage: "exclamationmark.triangle.fill")

From fa6cb9dd8111b2c174f25ec491bcc9b6e4ac6015 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sat, 4 Jul 2026 23:52:51 -0700
Subject: [PATCH 053/143] Feature Enhancement Planning

Nucleic-Session: 3CD3A375-8BC1-407E-951F-8EF136B08390
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Views/SettingsView.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NucleicRemote/NucleicRemote/Views/SettingsView.swift b/NucleicRemote/NucleicRemote/Views/SettingsView.swift
index 2fcf815..920cd8f 100644
--- a/NucleicRemote/NucleicRemote/Views/SettingsView.swift
+++ b/NucleicRemote/NucleicRemote/Views/SettingsView.swift
@@ -342,7 +342,7 @@ struct ManualPairingView: View {
                 Button {
                     submit()
                 } label: {
-                    Label("Pair", systemImage: "link").frame(maxWidth: .infinity)
+                    Label("Join", systemImage: "link").frame(maxWidth: .infinity)
                 }
                 .buttonStyle(.borderedProminent)
                 .disabled(code.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty)

From c0d7640b5b8a548aa81295342e4d2058b419c5de Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 00:03:21 -0700
Subject: [PATCH 054/143] Session Transcript Sync

Nucleic-Session: 50161730-2DDF-4324-B8ED-C77EBB1CD469
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Models/HostConnection.swift | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/NucleicRemote/NucleicRemote/Models/HostConnection.swift b/NucleicRemote/NucleicRemote/Models/HostConnection.swift
index c8a4e6a..1523236 100644
--- a/NucleicRemote/NucleicRemote/Models/HostConnection.swift
+++ b/NucleicRemote/NucleicRemote/Models/HostConnection.swift
@@ -493,6 +493,11 @@ final class HostConnection {
         case .transferAccept, .transferReject, .transferReady, .transferCommitted, .transferChunkAck:
             // Session-transfer replies (mesh P5) only reach a *source* Mac; a phone is never one.
             break
+        case .transcriptChunk, .transcriptFetchComplete, .transcriptUnavailable:
+            // Full-transcript fetch replies (mesh sync) only arrive in response to a
+            // `fetchTranscript` this device sent. A phone pulls full history on demand via a
+            // dedicated fetch path (not this subscribe stream), so nothing to do here yet.
+            break
         case .relayMembership(let membership):
             // The host issued/refreshed this device's relay credential (mesh P2). Persist it
             // in place (no reordering — this can arrive from a non-active Mac) so the relay

From 1bb98c405efd3bc615ea2841f3971dc4c6c64811 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 00:49:25 -0700
Subject: [PATCH 055/143] Live Activity Content Density

Nucleic-Session: B3643133-163C-4C5D-BE20-1A6B7FB83DA9
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/LiveActivityManager.swift | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/NucleicRemote/NucleicRemote/LiveActivityManager.swift b/NucleicRemote/NucleicRemote/LiveActivityManager.swift
index 55838f1..dbe03f6 100644
--- a/NucleicRemote/NucleicRemote/LiveActivityManager.swift
+++ b/NucleicRemote/NucleicRemote/LiveActivityManager.swift
@@ -28,6 +28,14 @@ final class LiveActivityManager {
     private var pendingState: NucleicSessionAttributes.ContentState?
     private var updateTask: Task<Void, Never>?
 
+    /// Set by `RemoteStore` to ship the activity's APNS push token to the paired Macs (and to tell
+    /// them it ended). The Macs use the token to keep this glance fresh over APNs while the phone
+    /// is backgrounded and its sync socket is suspended (UX_IOS §5.3).
+    var onPushToken: ((_ token: String, _ activityID: String) -> Void)?
+    var onActivityEnded: ((_ activityID: String) -> Void)?
+    /// Streams the activity's per-activity APNS update token (it can rotate); cancelled on end.
+    private var tokenObservation: Task<Void, Never>?
+
     /// Reconcile the Activity with the current session set.
     func sync(hostName: String, sessions: [WireSessionSummary]) {
         guard ActivityAuthorizationInfo().areActivitiesEnabled else { return }

From f65fcd2684068ce51e8b46f69fd4a2f0ec5c76ab Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 00:49:35 -0700
Subject: [PATCH 056/143] Live Activity Content Density

Nucleic-Session: B3643133-163C-4C5D-BE20-1A6B7FB83DA9
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 .../NucleicRemote/LiveActivityManager.swift   | 21 +++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/NucleicRemote/NucleicRemote/LiveActivityManager.swift b/NucleicRemote/NucleicRemote/LiveActivityManager.swift
index dbe03f6..0f12bf4 100644
--- a/NucleicRemote/NucleicRemote/LiveActivityManager.swift
+++ b/NucleicRemote/NucleicRemote/LiveActivityManager.swift
@@ -90,17 +90,34 @@ final class LiveActivityManager {
             // recovered one still needs the fresh state, so fall through to the update pipeline.
             if let existing = Activity<NucleicSessionAttributes>.activities.first {
                 activity = existing
+                observePushToken(existing)
                 enqueue(state)
             } else {
-                activity = try? Activity.request(
+                // `pushType: .token` opts the activity into APNs updates — the Macs push new
+                // content-state to the token so the glance stays fresh while the phone is locked.
+                let started = try? Activity.request(
                     attributes: NucleicSessionAttributes(hostName: hostName),
-                    content: ActivityContent(state: state, staleDate: nil))
+                    content: ActivityContent(state: state, staleDate: nil),
+                    pushType: .token)
+                activity = started
+                if let started { observePushToken(started) }
             }
             return
         }
         enqueue(state)
     }
 
+    /// Forward the activity's APNS update token (and its rotations) to `RemoteStore`.
+    private func observePushToken(_ activity: Activity<NucleicSessionAttributes>) {
+        tokenObservation?.cancel()
+        tokenObservation = Task { [weak self] in
+            for await tokenData in activity.pushTokenUpdates {
+                let hex = tokenData.map { String(format: "%02x", $0) }.joined()
+                self?.onPushToken?(hex, activity.id)
+            }
+        }
+    }
+
     /// Hand the newest state to the serial drainer (starting it if idle).
     private func enqueue(_ state: NucleicSessionAttributes.ContentState) {
         pendingState = state

From 278e8228b6c00d9736034762db3aa28770309f44 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 00:49:42 -0700
Subject: [PATCH 057/143] Live Activity Content Density

Nucleic-Session: B3643133-163C-4C5D-BE20-1A6B7FB83DA9
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/LiveActivityManager.swift | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/NucleicRemote/NucleicRemote/LiveActivityManager.swift b/NucleicRemote/NucleicRemote/LiveActivityManager.swift
index 0f12bf4..04f5cb6 100644
--- a/NucleicRemote/NucleicRemote/LiveActivityManager.swift
+++ b/NucleicRemote/NucleicRemote/LiveActivityManager.swift
@@ -136,10 +136,13 @@ final class LiveActivityManager {
     func end() {
         updateTask?.cancel()
         updateTask = nil
+        tokenObservation?.cancel()
+        tokenObservation = nil
         pendingState = nil
         lastState = nil
         guard let activity else { return }
         self.activity = nil
+        onActivityEnded?(activity.id)  // let the Macs stop pushing to this token
         Task {
             await activity.end(
                 ActivityContent(state: activity.content.state, staleDate: nil),

From 4dbc432d0c4a1de7a15761a2491d9434e25036c6 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 00:50:30 -0700
Subject: [PATCH 058/143] Live Activity Content Density

Nucleic-Session: B3643133-163C-4C5D-BE20-1A6B7FB83DA9
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Models/RemoteStore.swift | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/NucleicRemote/NucleicRemote/Models/RemoteStore.swift b/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
index 6c4f67b..7d43df5 100644
--- a/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
+++ b/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
@@ -887,7 +887,11 @@ final class RemoteStore: ObservableObject {
         case .setSessionShipBranch(let id, let branch):
             demoUpdateSession(id) { $0.demoCopy(shipBranch: .some(branch)) }
         case .hello, .listSessions, .listDashboard, .subscribe, .unsubscribe,
-             .ping, .cancelQueuedMessage, .fetchDiff, .listPeers, .addressUpdate, .meshRoster,
+             .ping, .cancelQueuedMessage, .fetchDiff, .fetchTranscript, .listPeers,
+             .addressUpdate, .meshRoster,
+             // Live Activity push registration is a real-connection concern (there's no host to
+             // push in demo), so it's inert here.
+             .registerLiveActivity, .endLiveActivity,
              // Session transfer (mesh P5) is a Mac↔Mac flow — the phone never originates these,
              // and demo has no peer Macs, so they're inert here.
              .transferOffer, .transferChunk, .transferCommit, .transferCancel:

From 7c542c236a958c514c5f44ad1b8cbe44c1f58d64 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 00:51:24 -0700
Subject: [PATCH 059/143] Live Activity Content Density

Nucleic-Session: B3643133-163C-4C5D-BE20-1A6B7FB83DA9
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 .../NucleicRemote/Models/RemoteStore.swift    | 43 +++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/NucleicRemote/NucleicRemote/Models/RemoteStore.swift b/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
index 7d43df5..ba673f6 100644
--- a/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
+++ b/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
@@ -834,6 +834,49 @@ final class RemoteStore: ObservableObject {
         activeConnection?.send(msg)
     }
 
+    // MARK: - Live Activity push registration (UX_IOS §5.3)
+
+    /// The current Live Activity's APNS update token + id, shipped to every capable Mac so it can
+    /// refresh the lock-screen glance over APNs while the phone is backgrounded and its socket is
+    /// suspended. Sent to *all* connected hosts (not just the active one) — while the phone is
+    /// away, whichever Mac has work to report should be able to push.
+    private var liveActivityReg: (token: String, activityID: String)?
+    /// Host ids that already have the current token (re-sent to a host that (re)connects, and
+    /// re-sent to everyone when the token rotates).
+    private var liveActivitySentTo: Set<String> = []
+
+    private func setupLiveActivityBridge() {
+        LiveActivityManager.shared.onPushToken = { [weak self] token, activityID in
+            guard let self, self.liveActivityReg?.token != token else { return }
+            self.liveActivityReg = (token, activityID)
+            self.liveActivitySentTo.removeAll()  // a fresh token must reach every host again
+            self.syncLiveActivityRegistration()
+        }
+        LiveActivityManager.shared.onActivityEnded = { [weak self] activityID in
+            guard let self else { return }
+            self.liveActivityReg = nil
+            self.liveActivitySentTo.removeAll()
+            for conn in self.connections.values where conn.capabilities.canPushLiveActivity {
+                conn.send(.endLiveActivity(activityID))
+            }
+        }
+    }
+
+    /// Send the current Live Activity token to every live, capable host that hasn't got it yet.
+    /// Called when the token changes and on every connection update, so a host that just connected
+    /// — or reconnected while the phone was away — learns the token it needs to push.
+    private func syncLiveActivityRegistration() {
+        guard let reg = liveActivityReg else { return }
+        // A host that dropped should re-register when it returns.
+        liveActivitySentTo = liveActivitySentTo.filter { connections[$0]?.connectivity.isLive == true }
+        for (id, conn) in connections {
+            guard conn.connectivity.isLive, conn.capabilities.canPushLiveActivity,
+                  !liveActivitySentTo.contains(id) else { continue }
+            conn.send(.registerLiveActivity(reg.token, reg.activityID))
+            liveActivitySentTo.insert(id)
+        }
+    }
+
     // MARK: - Demo simulator (offline, interactive)
     //
     // In demo mode there's no host, so writes can't go over the wire. Instead they mutate the

From f7519aa0f69f87fec7a0ab2249d3318ba8377e9d Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 00:51:32 -0700
Subject: [PATCH 060/143] Live Activity Content Density

Nucleic-Session: B3643133-163C-4C5D-BE20-1A6B7FB83DA9
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Models/RemoteStore.swift | 1 +
 1 file changed, 1 insertion(+)

diff --git a/NucleicRemote/NucleicRemote/Models/RemoteStore.swift b/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
index ba673f6..068d3a9 100644
--- a/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
+++ b/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
@@ -282,6 +282,7 @@ final class RemoteStore: ObservableObject {
     // MARK: - Lifecycle
 
     func onAppear() {
+        setupLiveActivityBridge()
         if demoMode { seedDemo(); return }
         // Re-plan every connection the moment the network path changes (left Wi-Fi, joined a
         // network, cellular⇄Wi-Fi) — the proactive half of "immediate switchover".

From 3a5c6f8acf3c4ac3e8b98ca489d1c584f72fe9b1 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 00:51:43 -0700
Subject: [PATCH 061/143] Live Activity Content Density

Nucleic-Session: B3643133-163C-4C5D-BE20-1A6B7FB83DA9
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Models/RemoteStore.swift | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/NucleicRemote/NucleicRemote/Models/RemoteStore.swift b/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
index 068d3a9..df9c481 100644
--- a/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
+++ b/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
@@ -490,6 +490,9 @@ final class RemoteStore: ObservableObject {
             if hostID == self.activeHostID { self.mirrorActive() }
             self.refreshAggregate()
             self.flushPendingNotificationDecision()
+            // A host that just connected (or reconnected) needs the current Live Activity token
+            // so it can push while the phone is away.
+            self.syncLiveActivityRegistration()
         }
         cb.openSnapshot = { [weak self] snap in
             guard let self, hostID == self.activeHostID, snap.summary.sessionID == self.openSessionID else { return }

From 383e737959d2d3fa8ba1f4521708dd8eaa64d4b2 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 00:52:43 -0700
Subject: [PATCH 062/143] Chat View Refinement

Nucleic-Session: 4E56990A-96AE-4597-9140-753CB82E769D
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Views/Theme.swift | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/NucleicRemote/NucleicRemote/Views/Theme.swift b/NucleicRemote/NucleicRemote/Views/Theme.swift
index e50b5fd..89799be 100644
--- a/NucleicRemote/NucleicRemote/Views/Theme.swift
+++ b/NucleicRemote/NucleicRemote/Views/Theme.swift
@@ -313,6 +313,25 @@ struct KeyboardDismissable: ViewModifier {
     }
 }
 
+/// A floating Liquid Glass surface for bars that hover over scrolling content (the session
+/// chat bar, approval card). Real `glassEffect` on iOS 26; an ultra-thin material with a
+/// hairline edge on earlier systems so the bar still reads as a translucent layer.
+struct GlassSurface: ViewModifier {
+    var cornerRadius: CGFloat = 24
+    func body(content: Content) -> some View {
+        if #available(iOS 26.0, *) {
+            content.glassEffect(.regular, in: .rect(cornerRadius: cornerRadius, style: .continuous))
+        } else {
+            content
+                .background(.ultraThinMaterial,
+                            in: RoundedRectangle(cornerRadius: cornerRadius, style: .continuous))
+                .overlay(
+                    RoundedRectangle(cornerRadius: cornerRadius, style: .continuous)
+                        .strokeBorder(Color.primary.opacity(0.08), lineWidth: 1))
+        }
+    }
+}
+
 /// A lifted card surface with a hairline border — the mobile echo of `AppTheme.surface`.
 struct CardBackground: ViewModifier {
     var padding: CGFloat = 14

From 3fbd6ca1e81c0c6393fa094d76586f6f57b468b1 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 00:52:49 -0700
Subject: [PATCH 063/143] Chat View Refinement

Nucleic-Session: 4E56990A-96AE-4597-9140-753CB82E769D
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Views/Theme.swift | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/NucleicRemote/NucleicRemote/Views/Theme.swift b/NucleicRemote/NucleicRemote/Views/Theme.swift
index 89799be..5c2a21f 100644
--- a/NucleicRemote/NucleicRemote/Views/Theme.swift
+++ b/NucleicRemote/NucleicRemote/Views/Theme.swift
@@ -347,6 +347,10 @@ struct CardBackground: ViewModifier {
 
 extension View {
     func card(padding: CGFloat = 14) -> some View { modifier(CardBackground(padding: padding)) }
+    /// Float content on Liquid Glass (material fallback pre-iOS 26). See `GlassSurface`.
+    func glassSurface(cornerRadius: CGFloat = 24) -> some View {
+        modifier(GlassSurface(cornerRadius: cornerRadius))
+    }
     /// Apply the teal accent app-wide.
     func nucleicTint() -> some View { tint(Palette.accent) }
     /// Give a text field a way to release the keyboard. Without this, iOS leaves a focused

From fba19f83301db95a683470d19b3a032caf41c3f7 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 00:53:04 -0700
Subject: [PATCH 064/143] Chat View Refinement

Nucleic-Session: 4E56990A-96AE-4597-9140-753CB82E769D
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 .../Views/SessionDetailView.swift             | 31 ++++++++++---------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/NucleicRemote/NucleicRemote/Views/SessionDetailView.swift b/NucleicRemote/NucleicRemote/Views/SessionDetailView.swift
index 0fcbf47..c0aba44 100644
--- a/NucleicRemote/NucleicRemote/Views/SessionDetailView.swift
+++ b/NucleicRemote/NucleicRemote/Views/SessionDetailView.swift
@@ -20,19 +20,7 @@ struct SessionDetailView: View {
     }
 
     var body: some View {
-        VStack(spacing: 0) {
-            Picker("", selection: $tab) {
-                Text("Transcript").tag(0)
-                Text("Diff").tag(1)
-            }
-            .pickerStyle(.segmented)
-            .padding(.horizontal)
-            .padding(.bottom, 8)
-
-            if store.canControl, let summary { controlBar(summary) }
-
-            Divider()
-
+        Group {
             if tab == 0 {
                 TranscriptList(events: store.openEvents)
             } else if store.capabilities.canFetchDiff || store.openDiff != nil {
@@ -42,12 +30,25 @@ struct SessionDetailView: View {
                 // Older host with no on-demand diff — the stat summary is all it projects.
                 DiffSummaryView(diffStat: summary?.diffStat)
             }
-
-            actionArea
         }
+        // The chat bar floats over the scrolling content on Liquid Glass instead of sitting in
+        // a boxed strip below it, so the transcript runs the full height of the screen.
+        .safeAreaInset(edge: .bottom) { actionArea }
         .navigationTitle(summary?.title ?? "Session")
         .navigationBarTitleDisplayMode(.inline)
         .toolbar {
+            // Transcript/Diff lives in the navigation bar (icon segments) rather than a
+            // dedicated row — it's a mode flip, not content, and shouldn't cost chat height.
+            ToolbarItem(placement: .topBarTrailing) {
+                Picker("View", selection: $tab) {
+                    Image(systemName: "text.bubble").tag(0)
+                        .accessibilityLabel("Transcript")
+                    Image(systemName: "plus.forwardslash.minus").tag(1)
+                        .accessibilityLabel("Diff")
+                }
+                .pickerStyle(.segmented)
+                .fixedSize()
+            }
             if let summary, store.canControl {
                 ToolbarItem(placement: .topBarTrailing) { sessionMenu(summary) }
             }

From 5f61c2afd811baea093b19c91c8d04256f4e05a2 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 00:53:23 -0700
Subject: [PATCH 065/143] Chat View Refinement

Nucleic-Session: 4E56990A-96AE-4597-9140-753CB82E769D
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Views/SessionDetailView.swift | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/NucleicRemote/NucleicRemote/Views/SessionDetailView.swift b/NucleicRemote/NucleicRemote/Views/SessionDetailView.swift
index c0aba44..4e78fac 100644
--- a/NucleicRemote/NucleicRemote/Views/SessionDetailView.swift
+++ b/NucleicRemote/NucleicRemote/Views/SessionDetailView.swift
@@ -125,9 +125,10 @@ struct SessionDetailView: View {
     }
 
     /// The model / effort / auto controls for the open session — the mobile echo of the Mac's
-    /// session header. Reads current state from the summary; each change is a control intent.
+    /// session header, folded into the glass chat bar so they don't cost a strip of transcript
+    /// height. Reads current state from the summary; each change is a control intent.
     @ViewBuilder
-    private func controlBar(_ summary: WireSessionSummary) -> some View {
+    private func controlRow(_ summary: WireSessionSummary) -> some View {
         HStack(spacing: 10) {
             // A session's backend is fixed at creation, so only same-backend models are offered.
             ModelMenu(model: modelBinding, catalog: store.modelCatalog, backend: summary.backend)

From 374f9855e5ce2c54746293d0663064a279d5d978 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 00:53:28 -0700
Subject: [PATCH 066/143] Chat View Refinement

Nucleic-Session: 4E56990A-96AE-4597-9140-753CB82E769D
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Views/SessionDetailView.swift | 2 --
 1 file changed, 2 deletions(-)

diff --git a/NucleicRemote/NucleicRemote/Views/SessionDetailView.swift b/NucleicRemote/NucleicRemote/Views/SessionDetailView.swift
index 4e78fac..09f7aa9 100644
--- a/NucleicRemote/NucleicRemote/Views/SessionDetailView.swift
+++ b/NucleicRemote/NucleicRemote/Views/SessionDetailView.swift
@@ -151,8 +151,6 @@ struct SessionDetailView: View {
             }
             .toggleStyle(.button).tint(Palette.accent).font(.caption2)
         }
-        .padding(.horizontal)
-        .padding(.bottom, 6)
     }
 
     @ViewBuilder

From c9cd2b1c3e958d073f9d952442644a2d45171b5b Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 00:53:47 -0700
Subject: [PATCH 067/143] Chat View Refinement

Nucleic-Session: 4E56990A-96AE-4597-9140-753CB82E769D
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 .../Views/SessionDetailView.swift             | 102 ++++++++++--------
 1 file changed, 57 insertions(+), 45 deletions(-)

diff --git a/NucleicRemote/NucleicRemote/Views/SessionDetailView.swift b/NucleicRemote/NucleicRemote/Views/SessionDetailView.swift
index 09f7aa9..57c5b5e 100644
--- a/NucleicRemote/NucleicRemote/Views/SessionDetailView.swift
+++ b/NucleicRemote/NucleicRemote/Views/SessionDetailView.swift
@@ -192,58 +192,70 @@ struct SessionDetailView: View {
         }
     }
 
+    /// The floating action layer: one Liquid Glass bar carrying the queued pills, the working
+    /// indicator, the session controls, and the composer — or the approval card when a gate is
+    /// pending. Content scrolls beneath it; nothing renders when there's nothing to act on.
     @ViewBuilder
     private var actionArea: some View {
-        Divider()
-        if let approval = store.openApprovals.first {
-            ApprovalCardView(approval: approval)
-                .padding()
-        } else if let status = summary?.status {
-            let running = status == .running
-            let canCompose = running || status == .awaitingInput || status.isTerminal
-            VStack(spacing: 8) {
-                // Follow-ups submitted mid-turn, held by the host to send when the current turn
-                // finishes. Each is shown as its own pill (with its attachments) and — at control
-                // scope — can be cancelled individually, matching the Mac composer. (They still
-                // send as one combined turn.)
-                if let queued = summary?.queuedMessages, !queued.isEmpty {
-                    VStack(spacing: 6) {
-                        ForEach(queued) { message in
-                            queuedMessageRow(message)
+        Group {
+            if let approval = store.openApprovals.first {
+                ApprovalCardView(approval: approval)
+            } else if let status = summary?.status {
+                let running = status == .running
+                let canCompose = running || status == .awaitingInput || status.isTerminal
+                let queued = summary?.queuedMessages ?? []
+                if canCompose || store.canControl || !queued.isEmpty {
+                    VStack(spacing: 10) {
+                        // Follow-ups submitted mid-turn, held by the host to send when the current
+                        // turn finishes. Each is shown as its own pill (with its attachments) and —
+                        // at control scope — can be cancelled individually, matching the Mac
+                        // composer. (They still send as one combined turn.)
+                        if !queued.isEmpty {
+                            VStack(spacing: 6) {
+                                ForEach(queued) { message in
+                                    queuedMessageRow(message)
+                                }
+                            }
+                        }
+                        if running {
+                            HStack(spacing: 8) {
+                                ProgressView().controlSize(.small)
+                                Text("Agent is working…").font(.footnote).foregroundStyle(.secondary)
+                                Spacer()
+                            }
+                            .frame(maxWidth: .infinity, alignment: .leading)
+                        }
+                        if store.canControl, let summary { controlRow(summary) }
+                        if canCompose {
+                            HStack(alignment: .bottom, spacing: 8) {
+                                TextField(running ? "Queue a follow-up…" : "Send a follow-up…",
+                                          text: $draft, axis: .vertical)
+                                    .textFieldStyle(.plain)
+                                    .lineLimit(1...4)
+                                    .keyboardDismissable()
+                                    .padding(.vertical, 3)
+                                Button {
+                                    store.sendInput(draft, to: sessionID)
+                                    draft = ""
+                                } label: {
+                                    Image(systemName: running ? "clock.arrow.circlepath" : "arrow.up.circle.fill")
+                                        .font(.title2)
+                                }
+                                .disabled(draft.trimmingCharacters(in: .whitespaces).isEmpty || !store.connectivity.isLive)
+                                // Hardware-keyboard send (Magic Keyboard on iPad), mirroring the
+                                // Mac — plain Return stays newline in the multiline field.
+                                .keyboardShortcut(.return, modifiers: .command)
+                            }
                         }
                     }
-                }
-                if running {
-                    HStack(spacing: 8) {
-                        ProgressView().controlSize(.small)
-                        Text("Agent is working…").font(.footnote).foregroundStyle(.secondary)
-                        Spacer()
-                    }
-                    .frame(maxWidth: .infinity, alignment: .leading)
-                }
-                if canCompose {
-                    HStack(spacing: 8) {
-                        TextField(running ? "Queue a follow-up…" : "Send a follow-up…",
-                                  text: $draft, axis: .vertical)
-                            .textFieldStyle(.roundedBorder)
-                            .lineLimit(1...4)
-                            .keyboardDismissable()
-                        Button {
-                            store.sendInput(draft, to: sessionID)
-                            draft = ""
-                        } label: {
-                            Image(systemName: running ? "clock.arrow.circlepath" : "arrow.up.circle.fill")
-                                .font(.title2)
-                        }
-                        .disabled(draft.trimmingCharacters(in: .whitespaces).isEmpty || !store.connectivity.isLive)
-                        // Hardware-keyboard send (Magic Keyboard on iPad), mirroring the Mac —
-                        // plain Return stays newline in the multiline field.
-                        .keyboardShortcut(.return, modifiers: .command)
-                    }
+                    .padding(.horizontal, 14)
+                    .padding(.vertical, 12)
+                    .glassSurface(cornerRadius: 26)
                 }
             }
-            .padding()
         }
+        .padding(.horizontal, 12)
+        .padding(.bottom, 8)
     }
 
     /// A queued follow-up shown above the composer: its text (or attachment names) with the

From c539fb697b085dee56cf4346178778bb96bfb4ad Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 00:53:56 -0700
Subject: [PATCH 068/143] Chat View Refinement

Nucleic-Session: 4E56990A-96AE-4597-9140-753CB82E769D
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Views/ApprovalCardView.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NucleicRemote/NucleicRemote/Views/ApprovalCardView.swift b/NucleicRemote/NucleicRemote/Views/ApprovalCardView.swift
index a9c7cbc..c833396 100644
--- a/NucleicRemote/NucleicRemote/Views/ApprovalCardView.swift
+++ b/NucleicRemote/NucleicRemote/Views/ApprovalCardView.swift
@@ -82,7 +82,7 @@ struct ApprovalCardView: View {
             }
         }
         .padding()
-        .background(.thinMaterial, in: RoundedRectangle(cornerRadius: 14))
+        .glassSurface(cornerRadius: 20)
     }
 
     private func alwaysLabel(_ scope: AlwaysScope) -> String {

From 944e6ce644caaba0ec08f291f862bc488f65dc63 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 00:54:08 -0700
Subject: [PATCH 069/143] Chat View Refinement

Nucleic-Session: 4E56990A-96AE-4597-9140-753CB82E769D
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 .../NucleicRemote/Views/TranscriptRow.swift   | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/NucleicRemote/NucleicRemote/Views/TranscriptRow.swift b/NucleicRemote/NucleicRemote/Views/TranscriptRow.swift
index b73264b..5781050 100644
--- a/NucleicRemote/NucleicRemote/Views/TranscriptRow.swift
+++ b/NucleicRemote/NucleicRemote/Views/TranscriptRow.swift
@@ -63,20 +63,27 @@ struct TranscriptRow: View {
 /// Render an assistant/user message with the full Markdown renderer the Mac transcript uses
 /// (fenced code blocks, headings, lists, tables, and inline emphasis/links/`code`), preserving
 /// the line breaks of multi-paragraph replies. Falls back to plain text if parsing fails.
+/// The user's messages sit right-aligned in a soft accent bubble; the assistant's prose runs
+/// open on the background — no box — so the transcript reads as a page, not a stack of cards.
 struct MessageBubble: View {
     let role: TranscriptItem.Role
     let text: String
 
     var body: some View {
-        HStack {
-            if role == .user { Spacer(minLength: 40) }
+        if role == .user {
+            HStack {
+                Spacer(minLength: 48)
+                MarkdownText(markdown: text)
+                    .textSelection(.enabled)
+                    .padding(.horizontal, 14)
+                    .padding(.vertical, 9)
+                    .background(Palette.accent.opacity(0.15),
+                                in: RoundedRectangle(cornerRadius: 18, style: .continuous))
+            }
+        } else {
             MarkdownText(markdown: text)
                 .textSelection(.enabled)
-                .padding(10)
-                .background(role == .user ? Palette.accent.opacity(0.15) : Color(.secondarySystemBackground),
-                            in: RoundedRectangle(cornerRadius: 12))
-                .frame(maxWidth: .infinity, alignment: role == .user ? .trailing : .leading)
-            if role == .assistant { Spacer(minLength: 40) }
+                .frame(maxWidth: .infinity, alignment: .leading)
         }
     }
 

From 2da27a5b044421169665f2a8efcca7b3f47839d5 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 00:54:14 -0700
Subject: [PATCH 070/143] Chat View Refinement

Nucleic-Session: 4E56990A-96AE-4597-9140-753CB82E769D
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Views/SessionDetailView.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NucleicRemote/NucleicRemote/Views/SessionDetailView.swift b/NucleicRemote/NucleicRemote/Views/SessionDetailView.swift
index 57c5b5e..817923d 100644
--- a/NucleicRemote/NucleicRemote/Views/SessionDetailView.swift
+++ b/NucleicRemote/NucleicRemote/Views/SessionDetailView.swift
@@ -321,7 +321,7 @@ struct TranscriptList: View {
     var body: some View {
         ScrollViewReader { proxy in
             ScrollView {
-                LazyVStack(alignment: .leading, spacing: 10) {
+                LazyVStack(alignment: .leading, spacing: 14) {
                     ForEach(items) { item in
                         TranscriptRow(item: item).id(item.id)
                     }

From 24cdfc668a00baa990f466ddcc7b4f0d9f9df028 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 00:54:23 -0700
Subject: [PATCH 071/143] Chat View Refinement

Nucleic-Session: 4E56990A-96AE-4597-9140-753CB82E769D
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Views/SessionDetailView.swift | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/NucleicRemote/NucleicRemote/Views/SessionDetailView.swift b/NucleicRemote/NucleicRemote/Views/SessionDetailView.swift
index 817923d..8068246 100644
--- a/NucleicRemote/NucleicRemote/Views/SessionDetailView.swift
+++ b/NucleicRemote/NucleicRemote/Views/SessionDetailView.swift
@@ -1,8 +1,9 @@
 import SwiftUI
 import NucleicProtocol
 
-/// One session: a segmented Transcript/Diff read view over a status-driven action area
-/// (UX_IOS §4). Subscribes on appear, unsubscribes on disappear.
+/// One session: a full-height Transcript/Diff read view (mode flip in the navigation bar) with
+/// a status-driven action bar floating over it on Liquid Glass (UX_IOS §4). Subscribes on
+/// appear, unsubscribes on disappear.
 struct SessionDetailView: View {
     @EnvironmentObject var store: RemoteStore
     let sessionID: SessionID

From ab011b21ff0e4604b8a2a196c1f5efc2233f247b Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 00:59:13 -0700
Subject: [PATCH 072/143] Live Activity Content Density

Nucleic-Session: B3643133-163C-4C5D-BE20-1A6B7FB83DA9
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Info.plist | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/NucleicRemote/NucleicRemote/Info.plist b/NucleicRemote/NucleicRemote/Info.plist
index 66f21c2..dccb57d 100644
--- a/NucleicRemote/NucleicRemote/Info.plist
+++ b/NucleicRemote/NucleicRemote/Info.plist
@@ -22,6 +22,11 @@
 	<string></string>
 	<key>NSSupportsLiveActivities</key>
 	<true/>
+	<!-- Let the Macs' APNs pushes refresh the glance promptly while the phone is locked — without
+	     this, iOS budget-throttles frequent Live Activity updates and the lock screen lags
+	     (UX_IOS §5.3). -->
+	<key>NSSupportsLiveActivitiesFrequentUpdates</key>
+	<true/>
 	<!-- The `nucleic://` deep-link scheme the Live Activity taps through on: `nucleic://session/<id>`
 	     opens a waiting session; `nucleic://sessions` surfaces the sessions list. Handled by
 	     `.onOpenURL` → `RemoteStore.handleDeepLink`. -->

From 6f492de70f64d657370e0838bf61c8e0fae7acf1 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 01:12:45 -0700
Subject: [PATCH 073/143] Chat View Refinement

Nucleic-Session: 4E56990A-96AE-4597-9140-753CB82E769D
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 .../NucleicRemote/Views/SessionDetailView.swift        | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/NucleicRemote/NucleicRemote/Views/SessionDetailView.swift b/NucleicRemote/NucleicRemote/Views/SessionDetailView.swift
index 8068246..04d557e 100644
--- a/NucleicRemote/NucleicRemote/Views/SessionDetailView.swift
+++ b/NucleicRemote/NucleicRemote/Views/SessionDetailView.swift
@@ -1,15 +1,15 @@
 import SwiftUI
 import NucleicProtocol
 
-/// One session: a full-height Transcript/Diff read view (mode flip in the navigation bar) with
-/// a status-driven action bar floating over it on Liquid Glass (UX_IOS §4). Subscribes on
+/// One session: a full-height transcript with a status-driven action bar floating over it on
+/// Liquid Glass; the diff viewer sits behind the ⋯ menu as a sheet (UX_IOS §4). Subscribes on
 /// appear, unsubscribes on disappear.
 struct SessionDetailView: View {
     @EnvironmentObject var store: RemoteStore
     let sessionID: SessionID
-    // Initial tab (0 = Transcript, 1 = Diff); overridable via NUCLEIC_DETAIL_TAB for
-    // offline UI previews, matching NUCLEIC_TAB / NUCLEIC_DEMO_SESSION.
-    @State private var tab = Int(ProcessInfo.processInfo.environment["NUCLEIC_DETAIL_TAB"] ?? "") ?? 0
+    // Diff sheet visibility; NUCLEIC_DETAIL_TAB=1 opens it for offline UI previews,
+    // matching NUCLEIC_TAB / NUCLEIC_DEMO_SESSION.
+    @State private var showDiff = ProcessInfo.processInfo.environment["NUCLEIC_DETAIL_TAB"] == "1"
     @State private var draft = ""
     @State private var showRename = false
     @State private var renameDraft = ""

From 3c26b295056e4de155989b7c4ad530634dd2bd6e Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 01:12:57 -0700
Subject: [PATCH 074/143] Chat View Refinement

Nucleic-Session: 4E56990A-96AE-4597-9140-753CB82E769D
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 .../Views/SessionDetailView.swift             | 41 ++++---------------
 1 file changed, 9 insertions(+), 32 deletions(-)

diff --git a/NucleicRemote/NucleicRemote/Views/SessionDetailView.swift b/NucleicRemote/NucleicRemote/Views/SessionDetailView.swift
index 04d557e..836b7ff 100644
--- a/NucleicRemote/NucleicRemote/Views/SessionDetailView.swift
+++ b/NucleicRemote/NucleicRemote/Views/SessionDetailView.swift
@@ -21,39 +21,16 @@ struct SessionDetailView: View {
     }
 
     var body: some View {
-        Group {
-            if tab == 0 {
-                TranscriptList(events: store.openEvents)
-            } else if store.capabilities.canFetchDiff || store.openDiff != nil {
-                SessionDiffView(diff: store.openDiff, loading: store.diffLoading)
-                    .onAppear { store.fetchDiff(sessionID) }
-            } else {
-                // Older host with no on-demand diff — the stat summary is all it projects.
-                DiffSummaryView(diffStat: summary?.diffStat)
+        TranscriptList(events: store.openEvents)
+            // The chat bar floats over the scrolling content on Liquid Glass instead of sitting
+            // in a boxed strip below it, so the transcript runs the full height of the screen.
+            .safeAreaInset(edge: .bottom) { actionArea }
+            .navigationTitle(summary?.title ?? "Session")
+            .navigationBarTitleDisplayMode(.inline)
+            .toolbar {
+                ToolbarItem(placement: .topBarTrailing) { sessionMenu }
             }
-        }
-        // The chat bar floats over the scrolling content on Liquid Glass instead of sitting in
-        // a boxed strip below it, so the transcript runs the full height of the screen.
-        .safeAreaInset(edge: .bottom) { actionArea }
-        .navigationTitle(summary?.title ?? "Session")
-        .navigationBarTitleDisplayMode(.inline)
-        .toolbar {
-            // Transcript/Diff lives in the navigation bar (icon segments) rather than a
-            // dedicated row — it's a mode flip, not content, and shouldn't cost chat height.
-            ToolbarItem(placement: .topBarTrailing) {
-                Picker("View", selection: $tab) {
-                    Image(systemName: "text.bubble").tag(0)
-                        .accessibilityLabel("Transcript")
-                    Image(systemName: "plus.forwardslash.minus").tag(1)
-                        .accessibilityLabel("Diff")
-                }
-                .pickerStyle(.segmented)
-                .fixedSize()
-            }
-            if let summary, store.canControl {
-                ToolbarItem(placement: .topBarTrailing) { sessionMenu(summary) }
-            }
-        }
+            .sheet(isPresented: $showDiff) { diffSheet }
         .alert("Rename chat", isPresented: $showRename) {
             TextField("Title", text: $renameDraft)
             Button("Cancel", role: .cancel) {}

From 48283674faa454f885c42a95b163153d3a820618 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 01:13:16 -0700
Subject: [PATCH 075/143] Chat View Refinement

Nucleic-Session: 4E56990A-96AE-4597-9140-753CB82E769D
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 .../Views/SessionDetailView.swift             | 47 ++++++++++++++++++-
 1 file changed, 46 insertions(+), 1 deletion(-)

diff --git a/NucleicRemote/NucleicRemote/Views/SessionDetailView.swift b/NucleicRemote/NucleicRemote/Views/SessionDetailView.swift
index 836b7ff..cdc8759 100644
--- a/NucleicRemote/NucleicRemote/Views/SessionDetailView.swift
+++ b/NucleicRemote/NucleicRemote/Views/SessionDetailView.swift
@@ -131,9 +131,54 @@ struct SessionDetailView: View {
         }
     }
 
+    /// The ⋯ menu: the diff viewer for everyone, then the control-scope session actions.
     @ViewBuilder
-    private func sessionMenu(_ summary: WireSessionSummary) -> some View {
+    private var sessionMenu: some View {
         Menu {
+            Button { showDiff = true } label: {
+                Label(diffLabel, systemImage: "plus.forwardslash.minus")
+            }
+            if let summary, store.canControl {
+                Divider()
+                sessionActions(summary)
+            }
+        } label: {
+            Image(systemName: "ellipsis.circle")
+        }
+    }
+
+    /// "View changes" with the live +/− counts when the host projects them, so the menu hints
+    /// whether there's anything to look at before opening the sheet.
+    private var diffLabel: String {
+        guard let stat = summary?.diffStat, stat.filesChanged > 0 else { return "View changes" }
+        return "View changes · +\(stat.added) −\(stat.removed)"
+    }
+
+    /// The diff, presented as a sheet from the ⋯ menu — a viewer you visit, not a mode the
+    /// chat lives in.
+    private var diffSheet: some View {
+        NavigationStack {
+            Group {
+                if store.capabilities.canFetchDiff || store.openDiff != nil {
+                    SessionDiffView(diff: store.openDiff, loading: store.diffLoading)
+                        .onAppear { store.fetchDiff(sessionID) }
+                } else {
+                    // Older host with no on-demand diff — the stat summary is all it projects.
+                    DiffSummaryView(diffStat: summary?.diffStat)
+                }
+            }
+            .navigationTitle("Changes")
+            .navigationBarTitleDisplayMode(.inline)
+            .toolbar {
+                ToolbarItem(placement: .topBarTrailing) {
+                    Button("Done") { showDiff = false }
+                }
+            }
+        }
+    }
+
+    @ViewBuilder
+    private func sessionActions(_ summary: WireSessionSummary) -> some View {
             Button { renameDraft = summary.title; showRename = true } label: {
                 Label("Rename", systemImage: "pencil")
             }

From 81c2461419b8b3503872b7df36a355c99a7a8c3c Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 01:13:49 -0700
Subject: [PATCH 076/143] Chat View Refinement

Nucleic-Session: 4E56990A-96AE-4597-9140-753CB82E769D
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 .../Views/SessionDetailView.swift             | 57 +++++++++----------
 1 file changed, 27 insertions(+), 30 deletions(-)

diff --git a/NucleicRemote/NucleicRemote/Views/SessionDetailView.swift b/NucleicRemote/NucleicRemote/Views/SessionDetailView.swift
index cdc8759..c7854bc 100644
--- a/NucleicRemote/NucleicRemote/Views/SessionDetailView.swift
+++ b/NucleicRemote/NucleicRemote/Views/SessionDetailView.swift
@@ -179,39 +179,36 @@ struct SessionDetailView: View {
 
     @ViewBuilder
     private func sessionActions(_ summary: WireSessionSummary) -> some View {
-            Button { renameDraft = summary.title; showRename = true } label: {
-                Label("Rename", systemImage: "pencil")
+        Button { renameDraft = summary.title; showRename = true } label: {
+            Label("Rename", systemImage: "pencil")
+        }
+        Button { store.setFavorite(sessionID, !summary.favorite) } label: {
+            Label(summary.favorite ? "Unfavorite" : "Favorite",
+                  systemImage: summary.favorite ? "star.slash" : "star")
+        }
+        // Autoship is a Nucleic Control capability — offered only for Control projects, and
+        // the host couples it with auto-approval (enabling it turns Auto on).
+        if controlled {
+            Button { store.setSessionAutoShip(sessionID, !summary.autoShip) } label: {
+                Label(summary.autoShip ? "Turn off Autoship" : "Turn on Autoship",
+                      systemImage: summary.autoShip ? "shippingbox.fill" : "shippingbox")
             }
-            Button { store.setFavorite(sessionID, !summary.favorite) } label: {
-                Label(summary.favorite ? "Unfavorite" : "Favorite",
-                      systemImage: summary.favorite ? "star.slash" : "star")
+        }
+        if summary.status == .running {
+            Button { store.interrupt(sessionID) } label: { Label("Interrupt", systemImage: "stop.circle") }
+        }
+        Section {
+            Button { showIntegrate = true } label: { Label("Integrate…", systemImage: "arrow.triangle.merge") }
+            Button(role: .destructive) { showDiscard = true } label: {
+                Label("Discard…", systemImage: "xmark.bin")
             }
-            // Autoship is a Nucleic Control capability — offered only for Control projects, and
-            // the host couples it with auto-approval (enabling it turns Auto on).
-            if controlled {
-                Button { store.setSessionAutoShip(sessionID, !summary.autoShip) } label: {
-                    Label(summary.autoShip ? "Turn off Autoship" : "Turn on Autoship",
-                          systemImage: summary.autoShip ? "shippingbox.fill" : "shippingbox")
-                }
+            Button { store.setArchived(sessionID, !summary.archived) } label: {
+                Label(summary.archived ? "Unarchive" : "Archive",
+                      systemImage: summary.archived ? "tray.and.arrow.up" : "archivebox")
             }
-            if summary.status == .running {
-                Button { store.interrupt(sessionID) } label: { Label("Interrupt", systemImage: "stop.circle") }
-            }
-            Section {
-                Button { showIntegrate = true } label: { Label("Integrate…", systemImage: "arrow.triangle.merge") }
-                Button(role: .destructive) { showDiscard = true } label: {
-                    Label("Discard…", systemImage: "xmark.bin")
-                }
-                Button { store.setArchived(sessionID, !summary.archived) } label: {
-                    Label(summary.archived ? "Unarchive" : "Archive",
-                          systemImage: summary.archived ? "tray.and.arrow.up" : "archivebox")
-                }
-            }
-            Button(role: .destructive) { store.deleteSession(sessionID) } label: {
-                Label("Delete", systemImage: "trash")
-            }
-        } label: {
-            Image(systemName: "ellipsis.circle")
+        }
+        Button(role: .destructive) { store.deleteSession(sessionID) } label: {
+            Label("Delete", systemImage: "trash")
         }
     }
 

From 2978908ec6d026f934591d1b08b6896fc5e8ed69 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 01:13:59 -0700
Subject: [PATCH 077/143] Chat View Refinement

Nucleic-Session: 4E56990A-96AE-4597-9140-753CB82E769D
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Views/SessionDetailView.swift | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/NucleicRemote/NucleicRemote/Views/SessionDetailView.swift b/NucleicRemote/NucleicRemote/Views/SessionDetailView.swift
index c7854bc..e41034a 100644
--- a/NucleicRemote/NucleicRemote/Views/SessionDetailView.swift
+++ b/NucleicRemote/NucleicRemote/Views/SessionDetailView.swift
@@ -248,11 +248,13 @@ struct SessionDetailView: View {
                         if store.canControl, let summary { controlRow(summary) }
                         if canCompose {
                             HStack(alignment: .bottom, spacing: 8) {
+                                // No keyboard-accessory Done button here (it floats awkwardly
+                                // over the glass bar on iOS 26) — a drag on the transcript
+                                // dismisses the keyboard instead (`scrollDismissesKeyboard`).
                                 TextField(running ? "Queue a follow-up…" : "Send a follow-up…",
                                           text: $draft, axis: .vertical)
                                     .textFieldStyle(.plain)
                                     .lineLimit(1...4)
-                                    .keyboardDismissable()
                                     .padding(.vertical, 3)
                                 Button {
                                     store.sendInput(draft, to: sessionID)

From ded013af485ae0b2c91f2cb7e2a177dabad10f3b Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 01:14:09 -0700
Subject: [PATCH 078/143] Chat View Refinement

Nucleic-Session: 4E56990A-96AE-4597-9140-753CB82E769D
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Views/SessionDetailView.swift | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/NucleicRemote/NucleicRemote/Views/SessionDetailView.swift b/NucleicRemote/NucleicRemote/Views/SessionDetailView.swift
index e41034a..6bb1d85 100644
--- a/NucleicRemote/NucleicRemote/Views/SessionDetailView.swift
+++ b/NucleicRemote/NucleicRemote/Views/SessionDetailView.swift
@@ -120,14 +120,16 @@ struct SessionDetailView: View {
                        lockWhenOrchestra: true)
             Spacer(minLength: 4)
             if let percent = contextPercent {
+                // Weight and primary ink (not `.secondary`) so the metric stays legible over
+                // whatever the Liquid Glass bar is blurring through.
                 Label("\(percent)%", systemImage: "gauge.with.dots.needle.33percent")
-                    .font(.caption2).foregroundStyle(.secondary)
+                    .font(.caption2.weight(.semibold)).foregroundStyle(.primary)
                     .help("Context window used")
             }
             Toggle(isOn: Binding(get: { summary.auto }, set: { store.setSessionAuto(sessionID, $0) })) {
                 Label("Auto", systemImage: summary.auto ? "bolt.fill" : "bolt.slash")
             }
-            .toggleStyle(.button).tint(Palette.accent).font(.caption2)
+            .toggleStyle(.button).tint(Palette.accent).font(.caption2.weight(.semibold))
         }
     }
 

From 544a92bbd99c552a14b6fcbe3b76f68af02990fc Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 01:14:19 -0700
Subject: [PATCH 079/143] Chat View Refinement

Nucleic-Session: 4E56990A-96AE-4597-9140-753CB82E769D
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Views/Theme.swift | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/NucleicRemote/NucleicRemote/Views/Theme.swift b/NucleicRemote/NucleicRemote/Views/Theme.swift
index 5c2a21f..a603a4d 100644
--- a/NucleicRemote/NucleicRemote/Views/Theme.swift
+++ b/NucleicRemote/NucleicRemote/Views/Theme.swift
@@ -423,15 +423,17 @@ struct ModelMenu: View {
                 }
             }
         } label: {
+            // Accent icon, primary-ink text: an all-accent caption washes out on the Liquid
+            // Glass chat bar, so only the glyph carries the tint.
             HStack(spacing: 4) {
-                Image(systemName: "cpu")
+                Image(systemName: "cpu").foregroundStyle(Palette.accent)
                 Text(label)
                 if let badge = model.flatMap({ catalog.contextBadge($0) }) {
                     Text(badge).foregroundStyle(.secondary)
                 }
             }
-            .font(.caption)
-            .foregroundStyle(Palette.accent)
+            .font(.caption.weight(.semibold))
+            .foregroundStyle(.primary)
         }
         .disabled(groups.isEmpty)
     }

From ab07a6fc99e9b44963a7dda9e01c4c3992e029dd Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 01:14:29 -0700
Subject: [PATCH 080/143] Chat View Refinement

Nucleic-Session: 4E56990A-96AE-4597-9140-753CB82E769D
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Views/Theme.swift | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/NucleicRemote/NucleicRemote/Views/Theme.swift b/NucleicRemote/NucleicRemote/Views/Theme.swift
index a603a4d..8406b5f 100644
--- a/NucleicRemote/NucleicRemote/Views/Theme.swift
+++ b/NucleicRemote/NucleicRemote/Views/Theme.swift
@@ -497,12 +497,15 @@ struct EffortMenu: View {
             }
             .disabled(!controlled)
         } label: {
+            // Same treatment as `ModelMenu`: tinted glyph, primary-ink text for glass-bar
+            // legibility. Orchestra keeps its full-gold signature — that state should glow.
             HStack(spacing: 4) {
                 Image(systemName: orchestraActive ? "sparkles" : "slider.horizontal.3")
+                    .foregroundStyle(orchestraActive ? Palette.orchestra : Palette.accent)
                 Text(display(triggerEffort))
             }
-            .font(.caption)
-            .foregroundStyle(orchestraActive ? Palette.orchestra : Palette.accent)
+            .font(.caption.weight(.semibold))
+            .foregroundStyle(orchestraActive ? AnyShapeStyle(Palette.orchestra) : AnyShapeStyle(.primary))
         }
     }
 }

From 1a14d5259410bd8cc9c23ec015034f67ff3d2255 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 01:14:38 -0700
Subject: [PATCH 081/143] Chat View Refinement

Nucleic-Session: 4E56990A-96AE-4597-9140-753CB82E769D
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Views/SessionDetailView.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NucleicRemote/NucleicRemote/Views/SessionDetailView.swift b/NucleicRemote/NucleicRemote/Views/SessionDetailView.swift
index 6bb1d85..b024334 100644
--- a/NucleicRemote/NucleicRemote/Views/SessionDetailView.swift
+++ b/NucleicRemote/NucleicRemote/Views/SessionDetailView.swift
@@ -242,7 +242,7 @@ struct SessionDetailView: View {
                         if running {
                             HStack(spacing: 8) {
                                 ProgressView().controlSize(.small)
-                                Text("Agent is working…").font(.footnote).foregroundStyle(.secondary)
+                                Text("Agent is working…").font(.footnote).foregroundStyle(.primary)
                                 Spacer()
                             }
                             .frame(maxWidth: .infinity, alignment: .leading)

From 3939bf4c60c10a5a2f25f04d7ffd02e404dbfca0 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 01:14:51 -0700
Subject: [PATCH 082/143] Chat View Refinement

Nucleic-Session: 4E56990A-96AE-4597-9140-753CB82E769D
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Views/SessionDetailView.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NucleicRemote/NucleicRemote/Views/SessionDetailView.swift b/NucleicRemote/NucleicRemote/Views/SessionDetailView.swift
index b024334..f4f7752 100644
--- a/NucleicRemote/NucleicRemote/Views/SessionDetailView.swift
+++ b/NucleicRemote/NucleicRemote/Views/SessionDetailView.swift
@@ -367,7 +367,7 @@ struct TranscriptList: View {
     }
 }
 
-/// The Diff tab, read-only over the on-demand `WireSessionDiff`. On a phone it's a per-file
+/// The diff sheet's content, read-only over the on-demand `WireSessionDiff`. On a phone it's a per-file
 /// summary over one scrolling unified patch; on a regular-width iPad it becomes the Mac's
 /// two-pane diff — a selectable file list beside the selected file's patch — exploiting the
 /// wide detail column. Same wire, no new protocol.

From 0544fd93efb95971d4087392404b5d8a5bb92686 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 01:51:28 -0700
Subject: [PATCH 083/143] Sessions Integration Feature

Nucleic-Session: FC94353F-9F0D-4BCC-AD7C-0FB14E38C2E5
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Models/RemoteStore.swift | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/NucleicRemote/NucleicRemote/Models/RemoteStore.swift b/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
index df9c481..b4d4f09 100644
--- a/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
+++ b/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
@@ -38,11 +38,11 @@ final class RemoteStore: ObservableObject {
     }
 
     @Published private(set) var connectivity: Connectivity = .unpaired
+    /// A representative host name for the aggregate — the open session's Mac when a transcript is
+    /// open, otherwise a live host. Sessions/projects from *every* connected Mac are merged into the
+    /// flat state above (mesh P3), so no single "active host" is chosen; per-row provenance comes
+    /// from `hostName(forSession:)` instead.
     @Published private(set) var hostName: String = ""
-    /// The paired Mac this connection currently reflects (mesh P3), by its `HostID` (fingerprint).
-    /// `hostName`/`sessions`/etc. above are that host's projection; switching hosts re-points them
-    /// (live: reconnect to a different paired Mac; demo: swap the mock host). `nil` until connected.
-    @Published private(set) var activeHostID: String?
     @Published private(set) var sessions: [WireSessionSummary] = []
     @Published private(set) var capabilities = WireCapabilities(canModifyToolInput: false, allowAlwaysScopes: [])
     @Published private(set) var grantedScope: DeviceScope = .approve

From 87674f3d4257207f1e67ded794bcf9b3d88e0bed Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 01:51:32 -0700
Subject: [PATCH 084/143] Sessions Integration Feature

Nucleic-Session: FC94353F-9F0D-4BCC-AD7C-0FB14E38C2E5
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Models/RemoteStore.swift | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/NucleicRemote/NucleicRemote/Models/RemoteStore.swift b/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
index b4d4f09..72acc23 100644
--- a/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
+++ b/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
@@ -60,6 +60,10 @@ final class RemoteStore: ObservableObject {
 
     // Open session projection.
     @Published private(set) var openSessionID: SessionID?
+    /// The paired Mac that owns the open session (mesh P3). The open transcript's intents route to
+    /// it, and the host-specific projected values (capabilities/scope/catalog/connectivity) follow
+    /// it while a session is open. `nil` when nothing is open.
+    private var openSessionHostID: String?
     @Published private(set) var openEvents: [AgentEvent] = []
     @Published private(set) var openApprovals: [ApprovalRequest] = []
     /// The open session's full diff (the Mac Diff tab's patch), fetched on demand when the

From 90104be78871b4abb1c98959f37b9998fb71a76f Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 01:51:49 -0700
Subject: [PATCH 085/143] Sessions Integration Feature

Nucleic-Session: FC94353F-9F0D-4BCC-AD7C-0FB14E38C2E5
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 .../NucleicRemote/Models/RemoteStore.swift    | 56 +++++++++++++++++--
 1 file changed, 50 insertions(+), 6 deletions(-)

diff --git a/NucleicRemote/NucleicRemote/Models/RemoteStore.swift b/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
index 72acc23..c9c63d0 100644
--- a/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
+++ b/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
@@ -184,13 +184,57 @@ final class RemoteStore: ObservableObject {
     /// Proactive network-path awareness (shared across every host connection): flips transports the
     /// instant Wi-Fi drops or returns, instead of waiting for a dead LAN socket to time out.
     let pathMonitor = NetworkPathMonitor()
-    /// One live connection per paired Mac (mesh P3 multiplexer). All connected at once; the flat
-    /// `sessions`/`connectivity`/`capabilities`/… above mirror the *active* one (`activeHostID`), so
-    /// switching hosts is instant (no reconnect). Empty in demo mode (demo seeds state directly).
+    /// One live connection per paired Mac (mesh P3 multiplexer). All connected at once, and the flat
+    /// `sessions`/`dashboard` above are the *merged* projection across every one of them — the phone
+    /// shows all your Macs together, with no active-host selector. Intents route to the Mac that owns
+    /// the target session/project (see `send`). Empty in demo mode (demo seeds state directly).
     private var connections: [String: HostConnection] = [:]
-    /// The active connection — the Mac whose projection the flat state reflects + whose transcript
-    /// is open.
-    private var activeConnection: HostConnection? { activeHostID.flatMap { connections[$0] } }
+
+    /// The connection whose projection drives the host-specific flat values (capabilities, scope,
+    /// catalog, connectivity, host name): the open session's Mac while a transcript is open, else a
+    /// representative live host (one with a populated catalog, falling back to any live/any host).
+    private var contextConnection: HostConnection? {
+        if let id = openSessionHostID, let conn = connections[id] { return conn }
+        return connections.values.first { $0.connectivity.isLive && !$0.modelCatalog.groups.isEmpty }
+            ?? connections.values.first { $0.connectivity.isLive }
+            ?? connections.values.first
+    }
+
+    /// A live connection to fall back on for host-agnostic intents (e.g. a project-less to-do
+    /// capture, which has no owning Mac).
+    private var firstLiveConnection: HostConnection? {
+        connections.values.first { $0.connectivity.isLive } ?? connections.values.first
+    }
+
+    // MARK: Intent routing (mesh P3) — resolve the Mac that owns a session / project / to-do.
+
+    private func connection(owningSession id: SessionID) -> HostConnection? {
+        connections.values.first { $0.sessions.contains { $0.sessionID == id } }
+    }
+    private func connection(owningProject id: ProjectID) -> HostConnection? {
+        connections.values.first { $0.dashboard.projects.contains { $0.id == id } }
+    }
+    private func connection(owningTodo id: TodoID) -> HostConnection? {
+        connections.values.first { $0.dashboard.todos.contains { $0.id == id } }
+    }
+    /// Send to every live connection — for host-agnostic pulls (list sessions/dashboard) and as the
+    /// safety fallback for an approval whose owning Mac isn't known (a notification-driven decision).
+    private func broadcastLive(_ msg: ClientMsg) {
+        for conn in connections.values where conn.connectivity.isLive { conn.send(msg) }
+    }
+
+    /// How many Macs are currently connected — the Sessions list shows a per-row host tag only when
+    /// more than one, so a single-Mac view stays clean.
+    var connectedHostCount: Int {
+        if demoMode { return 1 }
+        return connections.values.filter { $0.connectivity.isLive }.count
+    }
+
+    /// The name of the Mac that owns a session, for the per-row host tag. `nil` in demo (no
+    /// connections) or when the session isn't found on any connected Mac.
+    func hostName(forSession id: SessionID) -> String? {
+        connection(owningSession: id)?.hostName
+    }
     /// The phone's embedded Tailscale node state, for Settings (nil = not running). Shared across all
     /// connections (one embedded node, many dials).
     @Published private(set) var tailnetStatus: String?

From af8deb63f7e04072029ae57e0ddd848d4186ee8a Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 01:52:20 -0700
Subject: [PATCH 086/143] Sessions Integration Feature

Nucleic-Session: FC94353F-9F0D-4BCC-AD7C-0FB14E38C2E5
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 .../NucleicRemote/Models/RemoteStore.swift    | 69 -------------------
 1 file changed, 69 deletions(-)

diff --git a/NucleicRemote/NucleicRemote/Models/RemoteStore.swift b/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
index c9c63d0..097d046 100644
--- a/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
+++ b/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
@@ -255,75 +255,6 @@ final class RemoteStore: ObservableObject {
     /// In-flight simulated-run tasks (canned streaming), cancelled on `exitDemo()`.
     private var demoTasks: [Task<Void, Never>] = []
 
-    // MARK: - Multi-host switching (mesh P3)
-
-    /// One selectable Mac for the host switcher — the paired Macs (live) or the mock hosts (demo).
-    struct HostChoice: Identifiable, Equatable {
-        let id: String       // HostID (fingerprint), or a demo id
-        let name: String
-        let isActive: Bool
-    }
-
-    /// The Macs this phone can switch between. Live: the paired-host registry. Demo: the mock hosts.
-    /// One entry ⇒ the switcher hides itself and the app reads single-host. Today the phone holds one
-    /// *live* connection at a time (switching reconnects); simultaneous connections are the deferred
-    /// multiplexer step.
-    var hostChoices: [HostChoice] {
-        if demoMode {
-            return demoHosts.map { HostChoice(id: $0.id, name: $0.name, isActive: $0.id == activeHostID) }
-        }
-        return IdentityStore.pairedHosts().map {
-            HostChoice(id: $0.fingerprint, name: $0.hostName, isActive: $0.fingerprint == activeHostID)
-        }
-    }
-
-    /// Switch which paired Mac is active. Live: every Mac is already connected, so this is instant —
-    /// close the current transcript, re-point at the target connection, and mirror its state. Demo:
-    /// swap the mock host's projection, preserving in-demo edits.
-    func switchHost(to id: String) {
-        guard id != activeHostID else { return }
-        if demoMode {
-            if let i = demoHosts.firstIndex(where: { $0.id == activeHostID }) {
-                demoHosts[i].sessions = sessions   // keep any in-demo mutations
-                demoHosts[i].dashboard = dashboard
-            }
-            guard let next = demoHosts.first(where: { $0.id == id }) else { return }
-            applyDemoHost(next)
-        } else {
-            // Close the transcript open on the old host.
-            activeConnection?.openSessionID = nil
-            openSessionID = nil; openEvents = []; openApprovals = []; openDiff = nil; diffLoading = false
-            activeHostID = id
-            // The target should already be connected; (re)dial only if it isn't.
-            if let host = IdentityStore.pairedHost(id: id) {
-                let conn = connection(for: host)
-                if !conn.connectivity.isLive { conn.reconnect(to: host) }
-            }
-            mirrorActive()
-        }
-    }
-
-    /// Mock hosts for the multi-host demo. Each carries its own name + sessions + dashboard;
-    /// switching swaps the flat active-host projection. Empty outside demo.
-    private struct DemoHost {
-        let id: String
-        let name: String
-        var sessions: [WireSessionSummary]
-        var dashboard: DashboardSnapshot
-    }
-    private var demoHosts: [DemoHost] = []
-
-    /// Project a mock host onto the flat active-host state (demo host switch).
-    private func applyDemoHost(_ host: DemoHost) {
-        activeHostID = host.id
-        hostName = host.name
-        sessions = host.sessions
-        dashboard = host.dashboard
-        openSessionID = nil; openEvents = []; openApprovals = []; openDiff = nil
-        LiveActivityManager.shared.sync(hostName: hostName, sessions: sessions)
-        NotificationRouter.shared.updateBadge(needsYouCount)
-    }
-
     var isPaired: Bool { demoMode || IdentityStore.loadPairedHost() != nil }
     var deviceFingerprint: String { identity.fingerprint }
 

From 12931e52afd67f5f387d7c71f8b7ae648fa928cf Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 01:52:33 -0700
Subject: [PATCH 087/143] Sessions Integration Feature

Nucleic-Session: FC94353F-9F0D-4BCC-AD7C-0FB14E38C2E5
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Models/RemoteStore.swift | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/NucleicRemote/NucleicRemote/Models/RemoteStore.swift b/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
index 097d046..fcb7a50 100644
--- a/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
+++ b/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
@@ -390,11 +390,13 @@ final class RemoteStore: ObservableObject {
                 fiveHour: WireUsageWindow(utilization: 18, resetsAt: Date().addingTimeInterval(2 * 3600)),
                 sevenDay: WireUsageWindow(utilization: 40, resetsAt: nil)),
             statusFeeds: [])
-        demoHosts = [
-            DemoHost(id: "demo-1", name: "Andrew's Mac", sessions: host1Sessions, dashboard: host1Dashboard),
-            DemoHost(id: "demo-2", name: "Studio Mac", sessions: host2Sessions, dashboard: host2Dashboard),
-        ]
-        applyDemoHost(demoHosts[0])
+        // Mesh P3: seed BOTH demo Macs' worlds merged into the flat aggregate, exactly as the app
+        // presents real paired Macs — every host's sessions/projects/to-dos shown together, no
+        // switcher. `demoHandle` then mutates this aggregate directly for the interactive demo.
+        sessions = host1Sessions + host2Sessions
+        dashboard = DashboardSnapshot.merged([host1Dashboard, host2Dashboard])
+        LiveActivityManager.shared.sync(hostName: hostName, sessions: liveSessions)
+        NotificationRouter.shared.updateBadge(needsYouCount)
     }
 
     /// Offline diff fixture (NUCLEIC_DEMO) so the full-patch Diff tab renders without a host.

From 7f158904162b669e4a67d3d37998d827f9d1ffac Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 01:52:41 -0700
Subject: [PATCH 088/143] Sessions Integration Feature

Nucleic-Session: FC94353F-9F0D-4BCC-AD7C-0FB14E38C2E5
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Models/RemoteStore.swift | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/NucleicRemote/NucleicRemote/Models/RemoteStore.swift b/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
index fcb7a50..e957e25 100644
--- a/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
+++ b/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
@@ -442,8 +442,7 @@ final class RemoteStore: ObservableObject {
         connections[id]?.teardown()
         let conn = makeConnection(hostID: id, hostName: payload.hostName)
         connections[id] = conn
-        activeHostID = id
-        mirrorActive()
+        rebuildAggregate()
         conn.pair(with: payload)
     }
 

From 5852ce04e7500e7683df28fc165bb74641906e26 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 01:52:57 -0700
Subject: [PATCH 089/143] Sessions Integration Feature

Nucleic-Session: FC94353F-9F0D-4BCC-AD7C-0FB14E38C2E5
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 .../NucleicRemote/Models/RemoteStore.swift        | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/NucleicRemote/NucleicRemote/Models/RemoteStore.swift b/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
index e957e25..710cd6c 100644
--- a/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
+++ b/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
@@ -461,13 +461,14 @@ final class RemoteStore: ObservableObject {
     }
 
     /// The callbacks one `HostConnection` uses to drive shared/aggregate state. `hostID` is captured
-    /// so a change updates the flat projection only for the active host, while badges, notifications,
-    /// and the single open transcript are handled globally across hosts.
+    /// so the open-transcript forwarding fires only for the Mac that owns the open session, while the
+    /// merged list/dashboard, badges, and notifications are rebuilt across every host on any change.
     private func callbacks(for hostID: String) -> HostConnection.Callbacks {
         var cb = HostConnection.Callbacks()
         cb.didUpdate = { [weak self] in
             guard let self else { return }
-            if hostID == self.activeHostID { self.mirrorActive() }
+            // Any host's change re-merges the aggregate the flat state binds to (mesh P3).
+            self.rebuildAggregate()
             self.refreshAggregate()
             self.flushPendingNotificationDecision()
             // A host that just connected (or reconnected) needs the current Live Activity token
@@ -475,22 +476,22 @@ final class RemoteStore: ObservableObject {
             self.syncLiveActivityRegistration()
         }
         cb.openSnapshot = { [weak self] snap in
-            guard let self, hostID == self.activeHostID, snap.summary.sessionID == self.openSessionID else { return }
+            guard let self, hostID == self.openSessionHostID, snap.summary.sessionID == self.openSessionID else { return }
             self.openEvents = snap.recentEvents
             self.openApprovals = snap.pendingApprovals
         }
         cb.openEvents = { [weak self] batch in
-            guard let self, hostID == self.activeHostID, batch.sessionID == self.openSessionID else { return }
+            guard let self, hostID == self.openSessionHostID, batch.sessionID == self.openSessionID else { return }
             self.openEvents.append(contentsOf: batch.events)
         }
         cb.openDiff = { [weak self] diff in
-            guard let self, hostID == self.activeHostID, diff.sessionID == self.openSessionID else { return }
+            guard let self, hostID == self.openSessionHostID, diff.sessionID == self.openSessionID else { return }
             self.openDiff = diff
             self.diffLoading = false
         }
         cb.approvalRequested = { [weak self] req, title in
             guard let self else { return }
-            if hostID == self.activeHostID, req.sessionID == self.openSessionID,
+            if hostID == self.openSessionHostID, req.sessionID == self.openSessionID,
                !self.openApprovals.contains(where: { $0.id == req.id }) {
                 self.openApprovals.append(req)
             }

From 6316e7d6b55b7f727615eb4a4fdf94eac2cc0160 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 01:53:01 -0700
Subject: [PATCH 090/143] Sessions Integration Feature

Nucleic-Session: FC94353F-9F0D-4BCC-AD7C-0FB14E38C2E5
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Models/RemoteStore.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NucleicRemote/NucleicRemote/Models/RemoteStore.swift b/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
index 710cd6c..bfaa22c 100644
--- a/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
+++ b/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
@@ -513,7 +513,7 @@ final class RemoteStore: ObservableObject {
         cb.didPair = { [weak self] host in
             guard let self else { return }
             IdentityStore.savePairedHost(host)
-            self.activeHostID = host.fingerprint
+            self.rebuildAggregate()
         }
         cb.meshRosterChanged = { [weak self] in
             // Mesh "join": a Mac was learned or revoked via gossip. Reconnect to every paired Mac

From a0dd6f6a7b774ee84749bd9e0e4c48eb8c56fec1 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 01:53:43 -0700
Subject: [PATCH 091/143] Sessions Integration Feature

Nucleic-Session: FC94353F-9F0D-4BCC-AD7C-0FB14E38C2E5
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 .../NucleicRemote/Models/RemoteStore.swift    | 74 ++++++++++++++-----
 1 file changed, 54 insertions(+), 20 deletions(-)

diff --git a/NucleicRemote/NucleicRemote/Models/RemoteStore.swift b/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
index bfaa22c..31c7870 100644
--- a/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
+++ b/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
@@ -527,32 +527,66 @@ final class RemoteStore: ObservableObject {
         return cb
     }
 
-    /// Mirror the active connection's projection onto the flat @Published state the UI binds to.
-    private func mirrorActive() {
-        guard let c = activeConnection else { return }
-        connectivity = c.connectivity
-        hostName = c.hostName
-        sessions = c.sessions
-        capabilities = c.capabilities
-        grantedScope = c.grantedScope
-        modelCatalog = c.modelCatalog
-        dashboard = c.dashboard
-        meshPeers = c.meshPeers
+    /// Re-merge every connected Mac's projection into the flat @Published state the UI binds to
+    /// (mesh P3): all hosts' sessions and dashboards shown together, with the host-specific values
+    /// (host name, capabilities, catalog, connectivity, scope) following the open session's Mac —
+    /// or a representative one. No-op in demo, which seeds the aggregate directly.
+    private func rebuildAggregate() {
+        guard !demoMode else { return }
+        sessions = aggregatedSessions()
+        dashboard = DashboardSnapshot.merged(connections.values.map(\.dashboard))
+        meshPeers = connections.values.flatMap(\.meshPeers)
+
+        let ctx = contextConnection
+        hostName = ctx?.hostName ?? ""
+        capabilities = ctx?.capabilities
+            ?? WireCapabilities(canModifyToolInput: false, allowAlwaysScopes: [])
+        modelCatalog = ctx?.modelCatalog ?? .empty
+
+        if let id = openSessionHostID, let conn = connections[id] {
+            // While a transcript is open, the composer/controls act on *that* Mac — its connectivity
+            // gates send and its scope drives the control affordances.
+            connectivity = conn.connectivity
+            grantedScope = conn.grantedScope
+        } else {
+            connectivity = aggregateConnectivity()
+            // Optimistic new-chat gating: enabled if *any* Mac grants control (the owning Mac still
+            // enforces scope when the intent lands there).
+            grantedScope = connections.values
+                .filter { $0.connectivity.isLive }.map(\.grantedScope).max() ?? .approve
+        }
     }
 
-    /// Every connected Mac's live (non-archived) sessions — the aggregate the app-icon badge and
-    /// Live Activity summarize across hosts.
-    private var allLiveSessions: [WireSessionSummary] {
-        if demoMode { return demoHosts.flatMap(\.sessions).filter { !$0.archived } }
-        return connections.values.flatMap(\.sessions).filter { !$0.archived }
+    /// The flat sessions list: every connected Mac's sessions, deduped by id (ids are globally
+    /// unique). Views handle sorting/grouping.
+    private func aggregatedSessions() -> [WireSessionSummary] {
+        var seen = Set<SessionID>()
+        var result: [WireSessionSummary] = []
+        for conn in connections.values {
+            for summary in conn.sessions where seen.insert(summary.sessionID).inserted {
+                result.append(summary)
+            }
+        }
+        return result
+    }
+
+    /// One connectivity value for the whole app when no transcript is open (the chip + global
+    /// gating): connected if any Mac is live, else the most-informative in-progress/offline state.
+    private func aggregateConnectivity() -> Connectivity {
+        let all = connections.values.map(\.connectivity)
+        guard !all.isEmpty else { return .unpaired }
+        if let live = all.first(where: { $0.isLive }) { return live }
+        if all.contains(where: { if case .connecting = $0 { return true } else { return false } }) { return .connecting }
+        if all.contains(where: { if case .reconnecting = $0 { return true } else { return false } }) { return .reconnecting }
+        if all.contains(.hostOffline) { return .hostOffline }
+        return all.first ?? .unpaired
     }
 
     /// Refresh cross-host aggregates: the app-icon badge (needs-you across *all* Macs) + the Live
-    /// Activity summary.
+    /// Activity summary. `sessions`/`liveSessions` are already the merged aggregate.
     private func refreshAggregate() {
-        let needs = allLiveSessions.filter { $0.status.needsYou($0.disposition) }.count
-        NotificationRouter.shared.updateBadge(needs)
-        LiveActivityManager.shared.sync(hostName: hostName, sessions: allLiveSessions)
+        NotificationRouter.shared.updateBadge(needsYouCount)
+        LiveActivityManager.shared.sync(hostName: hostName, sessions: liveSessions)
     }
 
     /// Tear down every live connection (leaving the paired registry intact) — for entering demo.

From bf0d0a587eba0e7f1d91e661f9bea87a22ab8525 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 01:54:01 -0700
Subject: [PATCH 092/143] Sessions Integration Feature

Nucleic-Session: FC94353F-9F0D-4BCC-AD7C-0FB14E38C2E5
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Models/RemoteStore.swift | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/NucleicRemote/NucleicRemote/Models/RemoteStore.swift b/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
index 31c7870..5ab7880 100644
--- a/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
+++ b/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
@@ -609,10 +609,7 @@ final class RemoteStore: ObservableObject {
             let conn = connection(for: host)
             if !conn.connectivity.isLive { conn.reconnect(to: host) }
         }
-        if activeHostID == nil || connections[activeHostID!] == nil {
-            activeHostID = hosts.last?.fingerprint
-        }
-        mirrorActive()
+        rebuildAggregate()
         refreshAggregate()
     }
 

From e255ad18ba99cbc454e9b48604b80f4962b09d89 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 01:54:13 -0700
Subject: [PATCH 093/143] Sessions Integration Feature

Nucleic-Session: FC94353F-9F0D-4BCC-AD7C-0FB14E38C2E5
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 .../NucleicRemote/Models/RemoteStore.swift    | 41 ++++++++++++-------
 1 file changed, 27 insertions(+), 14 deletions(-)

diff --git a/NucleicRemote/NucleicRemote/Models/RemoteStore.swift b/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
index 5ab7880..ed11a52 100644
--- a/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
+++ b/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
@@ -614,25 +614,38 @@ final class RemoteStore: ObservableObject {
     }
 
 
+    /// Unpair this device entirely — drop every paired Mac and its connection (the "Unpair this
+    /// device" button). Nothing left to show, so the app returns to the pairing intro.
     func unpair() {
-        // Forget + drop the active Mac's connection specifically (the switcher may have made it not
-        // the last). Other Macs' connections keep running.
-        if let id = activeHostID {
-            connections[id]?.teardown()
-            connections[id] = nil
-            IdentityStore.removePairedHost(id: id)
+        for (id, conn) in connections { conn.teardown(); connections[id] = nil }
+        for host in IdentityStore.pairedHosts() { IdentityStore.removePairedHost(id: host.fingerprint) }
+        IdentityStore.clearPairedHost()
+        finishUnpairIfEmpty()
+    }
+
+    /// Forget one paired Mac (the Settings ▸ Mesh per-row remove): drop just its connection +
+    /// registry record. Other Macs keep running and stay in the merged view.
+    func unpair(_ hostID: String) {
+        connections[hostID]?.teardown()
+        connections[hostID] = nil
+        IdentityStore.removePairedHost(id: hostID)
+        if IdentityStore.pairedHosts().isEmpty {
+            finishUnpairIfEmpty()
         } else {
-            IdentityStore.clearPairedHost()
-        }
-        activeHostID = nil
-        // Mesh P3: if other Macs remain paired, switch to one (already connected) rather than unpairing.
-        if let next = IdentityStore.pairedHosts().last {
-            activeHostID = next.fingerprint
-            reconnect()
-            return
+            rebuildAggregate()
+            refreshAggregate()
         }
+    }
+
+    /// Wind the app back to the unpaired state once no Macs remain: clear the open transcript + flat
+    /// aggregate and spin the embedded Tailscale node down.
+    private func finishUnpairIfEmpty() {
+        openSessionID = nil
+        openSessionHostID = nil
+        openEvents = []; openApprovals = []; openDiff = nil; diffLoading = false
         connectivity = .unpaired
         sessions = []
+        dashboard = .empty
         // Nothing left to dial — spin the embedded Tailscale node down if it was running.
         Task { await TailnetNode.shared.stop() }
         tailnetStatus = nil

From 62d5cfb3b1ad10e09f99638b29c72a162817efc3 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 01:54:22 -0700
Subject: [PATCH 094/143] Sessions Integration Feature

Nucleic-Session: FC94353F-9F0D-4BCC-AD7C-0FB14E38C2E5
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Models/RemoteStore.swift | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/NucleicRemote/NucleicRemote/Models/RemoteStore.swift b/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
index ed11a52..5d89059 100644
--- a/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
+++ b/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
@@ -670,9 +670,8 @@ final class RemoteStore: ObservableObject {
         UserDefaults.standard.set(false, forKey: Self.demoModeKey)
         demoTasks.forEach { $0.cancel() }
         demoTasks.removeAll()
-        demoHosts = []
-        activeHostID = nil
         openSessionID = nil
+        openSessionHostID = nil
         openEvents = []
         openApprovals = []
         openDiff = nil

From 36e6725434d54628693a1765ce880d8194008b34 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 01:54:40 -0700
Subject: [PATCH 095/143] Sessions Integration Feature

Nucleic-Session: FC94353F-9F0D-4BCC-AD7C-0FB14E38C2E5
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Models/RemoteStore.swift | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/NucleicRemote/NucleicRemote/Models/RemoteStore.swift b/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
index 5d89059..ab110a0 100644
--- a/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
+++ b/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
@@ -691,15 +691,19 @@ final class RemoteStore: ObservableObject {
 
     func open(_ sessionID: SessionID) {
         openSessionID = sessionID
+        // Record which Mac owns this session (mesh P3) so its connection forwards the transcript and
+        // the host-specific projected values follow it.
+        openSessionHostID = connection(owningSession: sessionID)?.hostID
         openEvents = []
         openApprovals = []
         openDiff = nil
         diffLoading = false
         markOpened(sessionID)
         if demoMode { seedDemoTranscript(sessionID); return }
-        // The open transcript belongs to the active host; tell its connection so it forwards the
-        // snapshot/events (and dedupes them), then subscribe.
-        activeConnection?.openSessionID = sessionID
+        // Tell the owning connection so it forwards the snapshot/events (and dedupes them), re-derive
+        // the context host (capabilities/scope/catalog/connectivity now follow it), then subscribe.
+        connection(owningSession: sessionID)?.openSessionID = sessionID
+        rebuildAggregate()
         send(.subscribe(Subscribe(sessionID: sessionID, sinceSeq: nil, verbosity: .full)))
     }
 

From e156ea2e59662a0b7bedfad74fe9b45dbef2cb81 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 01:55:02 -0700
Subject: [PATCH 096/143] Sessions Integration Feature

Nucleic-Session: FC94353F-9F0D-4BCC-AD7C-0FB14E38C2E5
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 .../NucleicRemote/Models/RemoteStore.swift          | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/NucleicRemote/NucleicRemote/Models/RemoteStore.swift b/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
index ab110a0..ce8e335 100644
--- a/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
+++ b/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
@@ -787,16 +787,25 @@ final class RemoteStore: ObservableObject {
         send(.unsubscribe(target))
         markOpened(target)  // everything up to now has been seen
         guard openSessionID == target else { return }
-        activeConnection?.openSessionID = nil
+        connection(owningSession: target)?.openSessionID = nil
         openSessionID = nil
+        openSessionHostID = nil
         openEvents = []
         openApprovals = []
         openDiff = nil
         diffLoading = false
+        // Context reverts to the aggregate now that no transcript is open.
+        if !demoMode { rebuildAggregate() }
     }
 
     func respond(_ approval: ApprovalRequest, _ decision: Decision) {
-        send(.approvalRespond(approval.id, decision))
+        // Route to the Mac that owns the approval's session (the approval message carries no
+        // sessionID of its own). Demo resolves locally.
+        if demoMode {
+            demoHandle(.approvalRespond(approval.id, decision))
+        } else {
+            connection(owningSession: approval.sessionID)?.send(.approvalRespond(approval.id, decision))
+        }
         openApprovals.removeAll { $0.id == approval.id }  // optimistic dismiss; host confirms
     }
 

From 4e8f5db2bb4f7fb986c1914e409ce5bd0eaa00a0 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 01:55:25 -0700
Subject: [PATCH 097/143] Sessions Integration Feature

Nucleic-Session: FC94353F-9F0D-4BCC-AD7C-0FB14E38C2E5
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 .../NucleicRemote/Models/RemoteStore.swift    | 50 +++++++++++++++++--
 1 file changed, 46 insertions(+), 4 deletions(-)

diff --git a/NucleicRemote/NucleicRemote/Models/RemoteStore.swift b/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
index ce8e335..10cf465 100644
--- a/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
+++ b/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
@@ -867,12 +867,54 @@ final class RemoteStore: ObservableObject {
 
     // MARK: - Plumbing
 
-    /// Route an intent to the active host's connection (mesh P3). Every current intent — subscribe,
-    /// send-input, approvals, favorite/archive/delete, start-chat — targets a session or project on
-    /// the Mac whose list is on screen, i.e. the active one.
+    /// Route an intent to the Mac that owns its target (mesh P3). Sessions/projects/to-dos are shown
+    /// merged across every connected Mac, so an intent goes to the connection that owns the session,
+    /// project, or to-do it names — not to a single "active" host. Host-agnostic pulls (list
+    /// sessions/dashboard) broadcast to every live Mac; a project-less to-do capture (no owner) goes
+    /// to the first live Mac. Demo has no connections and mutates the seeded aggregate directly.
     private func send(_ msg: ClientMsg) {
         if demoMode { demoHandle(msg); return }
-        activeConnection?.send(msg)
+        switch msg {
+        // Session-owning intents → the Mac that has this session.
+        case .subscribe(let s):
+            connection(owningSession: s.sessionID)?.send(msg)
+        case .unsubscribe(let id), .interrupt(let id), .deleteSession(let id), .discard(let id),
+             .integrate(let id, _), .renameSession(let id, _), .setFavorite(let id, _),
+             .setArchived(let id, _), .setSessionModel(let id, _), .setSessionEffort(let id, _),
+             .setSessionAuto(let id, _), .setSessionAutoShip(let id, _), .setSessionShipBranch(let id, _),
+             .sendInput(let id, _), .cancelQueuedMessage(let id, _), .fetchDiff(let id):
+            connection(owningSession: id)?.send(msg)
+
+        // Project-owning intents → the Mac that has this project.
+        case .startChat(let req):
+            connection(owningProject: req.projectID)?.send(msg)
+        case .dispatchTodo(_, let projectID):
+            connection(owningProject: projectID)?.send(msg)
+
+        // To-do-owning intents → the Mac that has this to-do.
+        case .setTodoStatus(let id, _), .deleteTodo(let id):
+            connection(owningTodo: id)?.send(msg)
+
+        // A capture with a project goes to that Mac; a project-less one has no owner → first live.
+        case .captureTodo(let req):
+            if let pid = req.projectID, let conn = connection(owningProject: pid) { conn.send(msg) }
+            else { firstLiveConnection?.send(msg) }
+
+        // Approvals carry no sessionID — `respond(_:_:)` routes by the approval's session directly;
+        // a stray one here (or a notification-driven decision) broadcasts and the owner resolves it.
+        case .approvalRespond:
+            broadcastLive(msg)
+
+        // Host-agnostic pulls → every live Mac.
+        case .listSessions, .listDashboard:
+            broadcastLive(msg)
+
+        // Never originated from here (connection-internal, or handled by dedicated loops).
+        case .hello, .ping, .listPeers, .addressUpdate, .meshRoster,
+             .registerLiveActivity, .endLiveActivity,
+             .transferOffer, .transferChunk, .transferCommit, .transferCancel, .fetchTranscript:
+            break
+        }
     }
 
     // MARK: - Live Activity push registration (UX_IOS §5.3)

From e60da7ccb1962424f7fdcdc922536beaf041de22 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 01:55:48 -0700
Subject: [PATCH 098/143] Sessions Integration Feature

Nucleic-Session: FC94353F-9F0D-4BCC-AD7C-0FB14E38C2E5
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 .../NucleicRemote/Models/RemoteStore.swift    | 54 +++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/NucleicRemote/NucleicRemote/Models/RemoteStore.swift b/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
index 10cf465..9aa8d83 100644
--- a/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
+++ b/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
@@ -1188,6 +1188,60 @@ extension Data {
     }
 }
 
+extension DashboardSnapshot {
+    /// Merge every connected Mac's dashboard into one aggregate projection (mesh P3), so Home,
+    /// Projects, and To-Dos show all your Macs together: projects and to-dos concatenated, activity
+    /// summed per day, counts summed (active-days recomputed from the merged activity), subscription
+    /// usage taken from the first Mac that reports it (a user's Macs share one account, so their
+    /// windows match — summing would double-count), and provider status feeds unioned by provider
+    /// (provider status is global, not per-Mac).
+    static func merged(_ snapshots: some Collection<DashboardSnapshot>) -> DashboardSnapshot {
+        let snaps = Array(snapshots)
+        guard snaps.count != 1 else { return snaps[0] }
+        guard !snaps.isEmpty else { return .empty }
+
+        let projects = snaps.flatMap(\.projects)
+        let todos = snaps.flatMap(\.todos)
+
+        // Activity summed per start-of-day.
+        var byDay: [Date: (count: Int, tokens: Int)] = [:]
+        for snap in snaps {
+            for day in snap.activity {
+                let key = Calendar.current.startOfDay(for: day.day)
+                var entry = byDay[key] ?? (0, 0)
+                entry.count += day.count
+                entry.tokens += day.tokens
+                byDay[key] = entry
+            }
+        }
+        let activity = byDay
+            .map { ActivityDay(day: $0.key, count: $0.value.count, tokens: $0.value.tokens) }
+            .sorted { $0.day < $1.day }
+
+        let counts = DashboardCounts(
+            projects: projects.count,
+            chats: snaps.reduce(0) { $0 + $1.counts.chats },
+            activeChats: snaps.reduce(0) { $0 + $1.counts.activeChats },
+            messages: snaps.reduce(0) { $0 + $1.counts.messages },
+            activeDays: activity.filter { $0.count > 0 || $0.tokens > 0 }.count,
+            tokens: snaps.reduce(0) { $0 + $1.counts.tokens })
+
+        let usage = snaps.compactMap(\.usage).first
+
+        var seenProviders = Set<String>()
+        var statusFeeds: [WireStatusFeed] = []
+        for snap in snaps {
+            for feed in snap.statusFeeds where seenProviders.insert(feed.provider).inserted {
+                statusFeeds.append(feed)
+            }
+        }
+
+        return DashboardSnapshot(
+            counts: counts, activity: activity, projects: projects,
+            todos: todos, usage: usage, statusFeeds: statusFeeds)
+    }
+}
+
 extension WireSessionSummary {
     /// A copy with selected fields overridden — the demo simulator's only way to "mutate" a
     /// summary, whose stored properties are all `let`. Nullable fields use a double optional so a

From 9a59f0cdffd7902740267c9ad8d202b0238e186f Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 01:55:56 -0700
Subject: [PATCH 099/143] Sessions Integration Feature

Nucleic-Session: FC94353F-9F0D-4BCC-AD7C-0FB14E38C2E5
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Models/RemoteStore.swift | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/NucleicRemote/NucleicRemote/Models/RemoteStore.swift b/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
index 9aa8d83..e05c020 100644
--- a/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
+++ b/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
@@ -1195,8 +1195,7 @@ extension DashboardSnapshot {
     /// usage taken from the first Mac that reports it (a user's Macs share one account, so their
     /// windows match — summing would double-count), and provider status feeds unioned by provider
     /// (provider status is global, not per-Mac).
-    static func merged(_ snapshots: some Collection<DashboardSnapshot>) -> DashboardSnapshot {
-        let snaps = Array(snapshots)
+    static func merged(_ snaps: [DashboardSnapshot]) -> DashboardSnapshot {
         guard snaps.count != 1 else { return snaps[0] }
         guard !snaps.isEmpty else { return .empty }
 

From ee47a61f49a91d58d9f57e4352d7848e18681dcd Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 01:56:29 -0700
Subject: [PATCH 100/143] Sessions Integration Feature

Nucleic-Session: FC94353F-9F0D-4BCC-AD7C-0FB14E38C2E5
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 .../NucleicRemote/Views/SessionsView.swift    | 21 -------------------
 1 file changed, 21 deletions(-)

diff --git a/NucleicRemote/NucleicRemote/Views/SessionsView.swift b/NucleicRemote/NucleicRemote/Views/SessionsView.swift
index 38be72b..e9c9d37 100644
--- a/NucleicRemote/NucleicRemote/Views/SessionsView.swift
+++ b/NucleicRemote/NucleicRemote/Views/SessionsView.swift
@@ -79,27 +79,6 @@ struct SessionsView: View {
             // A notification tap while this tab is already up.
             .onChange(of: store.pendingRoute) { consumeRoute() }
             .toolbar {
-                // Host switcher (mesh P3): pick which paired Mac to view. Hidden with a single Mac.
-                ToolbarItem(placement: .topBarLeading) {
-                    if store.hostChoices.count > 1 {
-                        Menu {
-                            ForEach(store.hostChoices) { choice in
-                                Button {
-                                    store.switchHost(to: choice.id)
-                                } label: {
-                                    Label(choice.name,
-                                          systemImage: choice.isActive ? "checkmark" : "desktopcomputer")
-                                }
-                            }
-                        } label: {
-                            HStack(spacing: 4) {
-                                Image(systemName: "desktopcomputer")
-                                Text(store.hostName).lineLimit(1)
-                                Image(systemName: "chevron.down").font(.caption2)
-                            }
-                        }
-                    }
-                }
                 ToolbarItem(placement: .topBarTrailing) {
                     Button {
                         showArchived.toggle()

From 440a6f1cdf12f2d4c2be1a1e39eb590ebba69ff7 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 01:56:45 -0700
Subject: [PATCH 101/143] Sessions Integration Feature

Nucleic-Session: FC94353F-9F0D-4BCC-AD7C-0FB14E38C2E5
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Views/SessionsView.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NucleicRemote/NucleicRemote/Views/SessionsView.swift b/NucleicRemote/NucleicRemote/Views/SessionsView.swift
index e9c9d37..37c3616 100644
--- a/NucleicRemote/NucleicRemote/Views/SessionsView.swift
+++ b/NucleicRemote/NucleicRemote/Views/SessionsView.swift
@@ -28,7 +28,7 @@ struct SessionsView: View {
                         "No sessions", systemImage: "square.stack.3d.up",
                         description: Text(store.connectivity.isLive
                             ? "Start a session from Home or the Mac to see it here."
-                            : "Waiting to connect to \(store.hostName)…"))
+                            : "Waiting to connect to your Mac…"))
                 } else {
                     List {
                         ForEach(grouped, id: \.title) { group in

From 698717beae74596c917ebb482966055f3bbf2bea Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 01:56:51 -0700
Subject: [PATCH 102/143] Sessions Integration Feature

Nucleic-Session: FC94353F-9F0D-4BCC-AD7C-0FB14E38C2E5
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Views/SessionsView.swift | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/NucleicRemote/NucleicRemote/Views/SessionsView.swift b/NucleicRemote/NucleicRemote/Views/SessionsView.swift
index 37c3616..e42285a 100644
--- a/NucleicRemote/NucleicRemote/Views/SessionsView.swift
+++ b/NucleicRemote/NucleicRemote/Views/SessionsView.swift
@@ -151,7 +151,13 @@ struct SessionRow: View {
                           systemImage: "arrow.down.forward")
                         .font(.caption).foregroundStyle(.secondary).lineLimit(1)
                 } else if showProjectName {
-                    Text(summary.projectName).font(.caption).foregroundStyle(.secondary)
+                    // With more than one Mac connected, tag the owning Mac so the merged list stays
+                    // distinguishable (mesh P3); a single-Mac view just shows the project.
+                    if store.connectedHostCount > 1, let host = store.hostName(forSession: summary.sessionID) {
+                        Text("\(summary.projectName) · \(host)").font(.caption).foregroundStyle(.secondary)
+                    } else {
+                        Text(summary.projectName).font(.caption).foregroundStyle(.secondary)
+                    }
                 }
             }
             Spacer()

From 674f7ffcdb4ba088413e6c4126cc07e64a4a6c7e Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 01:57:07 -0700
Subject: [PATCH 103/143] Sessions Integration Feature

Nucleic-Session: FC94353F-9F0D-4BCC-AD7C-0FB14E38C2E5
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 .../NucleicRemote/Views/SettingsView.swift    | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/NucleicRemote/NucleicRemote/Views/SettingsView.swift b/NucleicRemote/NucleicRemote/Views/SettingsView.swift
index 920cd8f..8953b07 100644
--- a/NucleicRemote/NucleicRemote/Views/SettingsView.swift
+++ b/NucleicRemote/NucleicRemote/Views/SettingsView.swift
@@ -55,9 +55,6 @@ struct SettingsView: View {
 
                 Section("Connection") {
                     LabeledContent("Status", value: store.connectivity.label)
-                    if !store.hostName.isEmpty {
-                        LabeledContent("Mac", value: store.hostName)
-                    }
                     // What this pairing can dial — the live transport is in Status above.
                     if let host = IdentityStore.loadPairedHost() {
                         LabeledContent("Transports", value: Self.transportsLabel(host))
@@ -66,14 +63,13 @@ struct SettingsView: View {
                         .disabled(!store.isPaired)
                 }
 
-                // Mesh P3: every Mac this phone is paired with. Today the connection uses the
-                // "Active" one (most-recently paired); the multiplexer will connect to all. Removing
-                // the active Mac unpairs the live connection; removing another just forgets it.
+                // Mesh P3: every Mac this phone is paired with — all connected at once and shown
+                // together in the app (no active-host selector). Removing one forgets just that Mac
+                // and drops its connection; the others keep running.
                 let pairedHosts = IdentityStore.pairedHosts()
                 if !pairedHosts.isEmpty {
                     Section("Mesh") {
                         ForEach(pairedHosts, id: \.fingerprint) { host in
-                            let isActive = host.fingerprint == pairedHosts.last?.fingerprint
                             HStack(spacing: 10) {
                                 Image(systemName: "desktopcomputer").foregroundStyle(.secondary)
                                 VStack(alignment: .leading, spacing: 2) {
@@ -82,15 +78,8 @@ struct SettingsView: View {
                                         .font(.footnote.monospaced()).foregroundStyle(.secondary)
                                 }
                                 Spacer()
-                                if isActive {
-                                    Text("Active").font(.caption).foregroundStyle(.secondary)
-                                }
                                 Button(role: .destructive) {
-                                    if isActive {
-                                        store.unpair()
-                                    } else {
-                                        IdentityStore.removePairedHost(id: host.fingerprint)
-                                    }
+                                    store.unpair(host.fingerprint)
                                     pairedHostsToken = UUID()
                                 } label: {
                                     Image(systemName: "minus.circle")

From 4be9e987fdb752c5951ccd2652bd1bcb36431c3f Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 01:57:15 -0700
Subject: [PATCH 104/143] Sessions Integration Feature

Nucleic-Session: FC94353F-9F0D-4BCC-AD7C-0FB14E38C2E5
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Views/AdaptiveRootView.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NucleicRemote/NucleicRemote/Views/AdaptiveRootView.swift b/NucleicRemote/NucleicRemote/Views/AdaptiveRootView.swift
index 8c32dd6..8ece63e 100644
--- a/NucleicRemote/NucleicRemote/Views/AdaptiveRootView.swift
+++ b/NucleicRemote/NucleicRemote/Views/AdaptiveRootView.swift
@@ -169,7 +169,7 @@ private struct SplitSidebar: View {
                 Section("Sessions") {
                     Text(store.connectivity.isLive
                         ? "Start a session from Home or the Mac to see it here."
-                        : "Waiting to connect to \(store.hostName)…")
+                        : "Waiting to connect to your Mac…")
                         .font(.callout).foregroundStyle(.secondary)
                 }
             } else {

From bd7defa705e1eafae3f05c4ef8c83998f250a012 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 01:57:25 -0700
Subject: [PATCH 105/143] Sessions Integration Feature

Nucleic-Session: FC94353F-9F0D-4BCC-AD7C-0FB14E38C2E5
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Views/AdaptiveRootView.swift | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/NucleicRemote/NucleicRemote/Views/AdaptiveRootView.swift b/NucleicRemote/NucleicRemote/Views/AdaptiveRootView.swift
index 8ece63e..574c482 100644
--- a/NucleicRemote/NucleicRemote/Views/AdaptiveRootView.swift
+++ b/NucleicRemote/NucleicRemote/Views/AdaptiveRootView.swift
@@ -203,7 +203,9 @@ private struct SplitSidebar: View {
             }
         }
         .listStyle(.sidebar)
-        .navigationTitle(store.hostName.isEmpty ? "Nucleic" : store.hostName)
+        // Every Mac's sessions are merged into this sidebar (mesh P3), so a single host name would
+        // misrepresent it — title it for the app.
+        .navigationTitle("Nucleic")
         .toolbar {
             ToolbarItem(placement: .primaryAction) {
                 Button {

From 23208eeee057bf7d74ecfa46856ba1be91e9f540 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 02:10:57 -0700
Subject: [PATCH 106/143] Chat View Refinement

Nucleic-Session: 4E56990A-96AE-4597-9140-753CB82E769D
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Views/Theme.swift | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/NucleicRemote/NucleicRemote/Views/Theme.swift b/NucleicRemote/NucleicRemote/Views/Theme.swift
index 8406b5f..fa9ff7a 100644
--- a/NucleicRemote/NucleicRemote/Views/Theme.swift
+++ b/NucleicRemote/NucleicRemote/Views/Theme.swift
@@ -142,7 +142,10 @@ struct ResolvedPalette {
 
     static func make(_ mode: ColorVisionMode) -> ResolvedPalette {
         var p = base(mode)
-        p.accent = Palette.nightSoft(p.accent)
+        // The accent is the interactive tint (buttons, menus, toggles, links), not a calm
+        // status hue — night-softening the already-deep teal made it vanish on dark
+        // backgrounds, so dark mode brightens it instead.
+        p.accent = Palette.nightBright(p.accent)
         p.active = Palette.nightSoft(p.active)
         p.attention = Palette.nightSoft(p.attention)
         p.success = Palette.nightSoft(p.success)

From 78ca912e39895252a317ef33eaf22bd41e8f3b4b Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 02:11:09 -0700
Subject: [PATCH 107/143] Chat View Refinement

Nucleic-Session: 4E56990A-96AE-4597-9140-753CB82E769D
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Views/Theme.swift | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/NucleicRemote/NucleicRemote/Views/Theme.swift b/NucleicRemote/NucleicRemote/Views/Theme.swift
index fa9ff7a..9da8d5b 100644
--- a/NucleicRemote/NucleicRemote/Views/Theme.swift
+++ b/NucleicRemote/NucleicRemote/Views/Theme.swift
@@ -197,6 +197,17 @@ enum Palette {
         Color(UIColor { traits in traits.userInterfaceStyle == .dark ? dark : light })
     }
 
+    /// The inverse of `nightSoft`, for the interactive accent: light mode keeps `base`; dark
+    /// mode gets a brighter, lightly desaturated variant so the tint stays legible against
+    /// deep backgrounds and glass instead of sinking into them.
+    static func nightBright(_ base: Color) -> Color {
+        let ui = UIColor(base)
+        var h: CGFloat = 0, s: CGFloat = 0, b: CGFloat = 0, a: CGFloat = 0
+        guard ui.getHue(&h, saturation: &s, brightness: &b, alpha: &a) else { return base }
+        let dark = UIColor(hue: h, saturation: s * 0.72, brightness: max(b, 0.85), alpha: a)
+        return dynamic(light: ui, dark: dark)
+    }
+
     /// Light mode keeps `base`; dark mode gets a desaturated, dimmed variant — the same
     /// night-softening curve as the Mac's `AppPalette.nightSoft`.
     static func nightSoft(_ base: Color) -> Color {

From ec5225fdda27c179ed012e71f89de79a23d63219 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 02:11:43 -0700
Subject: [PATCH 108/143] Chat View Refinement

Nucleic-Session: 4E56990A-96AE-4597-9140-753CB82E769D
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 .../Assets.xcassets/AccentColor.colorset/Contents.json       | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/NucleicRemote/NucleicRemote/Assets.xcassets/AccentColor.colorset/Contents.json b/NucleicRemote/NucleicRemote/Assets.xcassets/AccentColor.colorset/Contents.json
index 8e37716..948deb1 100644
--- a/NucleicRemote/NucleicRemote/Assets.xcassets/AccentColor.colorset/Contents.json
+++ b/NucleicRemote/NucleicRemote/Assets.xcassets/AccentColor.colorset/Contents.json
@@ -1,4 +1,7 @@
 {
-  "colors" : [ { "color" : { "color-space" : "srgb", "components" : { "red" : "0.118", "green" : "0.565", "blue" : "0.553", "alpha" : "1.000" } }, "idiom" : "universal" } ],
+  "colors" : [
+    { "color" : { "color-space" : "srgb", "components" : { "red" : "0.118", "green" : "0.565", "blue" : "0.553", "alpha" : "1.000" } }, "idiom" : "universal" },
+    { "appearances" : [ { "appearance" : "luminosity", "value" : "dark" } ], "color" : { "color-space" : "srgb", "components" : { "red" : "0.366", "green" : "0.850", "blue" : "0.834", "alpha" : "1.000" } }, "idiom" : "universal" }
+  ],
   "info" : { "author" : "xcode", "version" : 1 }
 }

From 59a8c1ea32a4ebbabe65bc4816b97391ca791855 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 02:35:51 -0700
Subject: [PATCH 109/143] Fix AskUserQuestion Rendering

Nucleic-Session: A563CF12-F6B3-498A-8640-97DFC24F59EF
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 .../Views/AskUserQuestionCardView.swift       | 216 ++++++++++++++++++
 1 file changed, 216 insertions(+)
 create mode 100644 NucleicRemote/NucleicRemote/Views/AskUserQuestionCardView.swift

diff --git a/NucleicRemote/NucleicRemote/Views/AskUserQuestionCardView.swift b/NucleicRemote/NucleicRemote/Views/AskUserQuestionCardView.swift
new file mode 100644
index 0000000..18e55c5
--- /dev/null
+++ b/NucleicRemote/NucleicRemote/Views/AskUserQuestionCardView.swift
@@ -0,0 +1,216 @@
+import SwiftUI
+import NucleicProtocol
+
+/// Answer UI for Claude Code's built-in `AskUserQuestion` tool — the mobile mirror of
+/// the Mac's `AskUserQuestionBar`. Unlike a permission gate, this *collects* the user's
+/// choice per question and folds the selections into the approval reply's `updatedInput`
+/// (see `AskUserQuestion`); replying with a plain allow makes the CLI report "the user
+/// did not answer the questions", which is exactly the bug the generic `ApprovalCardView`
+/// produced here before.
+///
+/// Questions are shown one at a time as a wizard — Back/Next between them, Submit on the
+/// last — so a multi-question ask reads as a focused sequence rather than one long form.
+struct AskUserQuestionCardView: View {
+    @EnvironmentObject var store: RemoteStore
+    let approval: ApprovalRequest
+    let questions: [AskUserQuestion.Question]
+
+    /// Selected option labels per question text.
+    @State private var selected: [String: Set<String>] = [:]
+    /// Whether the free-text "Other" answer is active per question text.
+    @State private var otherActive: [String: Bool] = [:]
+    /// The free-text "Other" answer per question text.
+    @State private var otherText: [String: String] = [:]
+    /// Index of the question currently shown (the wizard step).
+    @State private var step = 0
+
+    private var submitEnabled: Bool { store.connectivity.isLive }
+
+    var body: some View {
+        VStack(alignment: .leading, spacing: 14) {
+            HStack(spacing: 6) {
+                Image(systemName: "questionmark.bubble.fill").foregroundStyle(Palette.attention)
+                Text(questions.count > 1 ? "Questions" : "Question")
+                    .font(.subheadline.weight(.semibold))
+            }
+
+            if let question = currentQuestion {
+                VStack(alignment: .leading, spacing: 8) {
+                    if questions.count > 1 {
+                        Text("Question \(step + 1) of \(questions.count)")
+                            .font(.caption).foregroundStyle(.secondary)
+                    }
+                    if let header = question.header, !header.isEmpty {
+                        Text(header.uppercased())
+                            .font(.caption).bold().foregroundStyle(.secondary)
+                    }
+                    Text(question.question).font(.headline)
+                    ForEach(question.options) { option in
+                        optionRow(question, label: option.label, description: option.description)
+                    }
+                    otherRow(question)
+                }
+            }
+
+            HStack(spacing: 10) {
+                Button(role: .destructive) {
+                    respond(.deny(reason: nil))
+                } label: {
+                    Text("Deny").frame(maxWidth: .infinity)
+                }
+                .buttonStyle(.bordered)
+                .keyboardShortcut(.cancelAction)
+
+                if step > 0 {
+                    Button("Back") { step -= 1 }
+                        .buttonStyle(.bordered)
+                }
+
+                if isLastStep {
+                    Button {
+                        submit()
+                    } label: {
+                        Text("Submit").frame(maxWidth: .infinity)
+                    }
+                    .buttonStyle(.borderedProminent)
+                    .disabled(!allAnswered || !submitEnabled)
+                    .keyboardShortcut(.defaultAction)
+                } else {
+                    Button {
+                        step += 1
+                    } label: {
+                        Text("Next").frame(maxWidth: .infinity)
+                    }
+                    .buttonStyle(.borderedProminent)
+                    .disabled(!currentAnswered)
+                    .keyboardShortcut(.defaultAction)
+                }
+            }
+        }
+        .padding()
+        .glassSurface(cornerRadius: 20)
+    }
+
+    // MARK: - Wizard state
+
+    /// The question for the active step, or `nil` if the index is somehow out of range.
+    private var currentQuestion: AskUserQuestion.Question? {
+        questions.indices.contains(step) ? questions[step] : nil
+    }
+
+    private var isLastStep: Bool { step >= questions.count - 1 }
+
+    /// Whether the question on the current step has at least one answer — gates `Next`.
+    private var currentAnswered: Bool {
+        guard let currentQuestion else { return false }
+        return !answers(for: currentQuestion).isEmpty
+    }
+
+    private var allAnswered: Bool {
+        questions.allSatisfy { !answers(for: $0).isEmpty }
+    }
+
+    // MARK: - Rows
+
+    @ViewBuilder
+    private func optionRow(_ question: AskUserQuestion.Question, label: String, description: String?)
+        -> some View
+    {
+        let isOn = selected[question.question]?.contains(label) ?? false
+        Button { toggle(question, label) } label: {
+            HStack(alignment: .top, spacing: 8) {
+                Image(systemName: symbol(multiSelect: question.multiSelect, on: isOn))
+                    .foregroundStyle(isOn ? Palette.attention : .secondary)
+                VStack(alignment: .leading, spacing: 2) {
+                    Text(label).font(.body)
+                        .fixedSize(horizontal: false, vertical: true)
+                    if let description, !description.isEmpty {
+                        // Let the subtext wrap freely — inside a Button label with a trailing
+                        // Spacer, an unconstrained Text truncates to one line and hides the rest.
+                        Text(description).font(.subheadline).foregroundStyle(.secondary)
+                            .fixedSize(horizontal: false, vertical: true)
+                    }
+                }
+                Spacer(minLength: 0)
+            }
+            .contentShape(Rectangle())
+        }
+        .buttonStyle(.plain)
+    }
+
+    @ViewBuilder
+    private func otherRow(_ question: AskUserQuestion.Question) -> some View {
+        let isOn = otherActive[question.question] ?? false
+        HStack(alignment: .center, spacing: 8) {
+            Button { toggleOther(question) } label: {
+                Image(systemName: symbol(multiSelect: question.multiSelect, on: isOn))
+                    .foregroundStyle(isOn ? Palette.attention : .secondary)
+            }
+            .buttonStyle(.plain)
+            TextField(
+                "Other…",
+                text: Binding(
+                    get: { otherText[question.question] ?? "" },
+                    set: { newValue in
+                        otherText[question.question] = newValue
+                        if !newValue.isEmpty { activateOther(question) }
+                    })
+            )
+            .textFieldStyle(.roundedBorder)
+        }
+    }
+
+    private func symbol(multiSelect: Bool, on: Bool) -> String {
+        if multiSelect { return on ? "checkmark.square.fill" : "square" }
+        return on ? "largecircle.fill.circle" : "circle"
+    }
+
+    // MARK: - Selection
+
+    private func toggle(_ question: AskUserQuestion.Question, _ label: String) {
+        var set = selected[question.question] ?? []
+        if question.multiSelect {
+            if set.contains(label) { set.remove(label) } else { set.insert(label) }
+        } else {
+            set = set.contains(label) ? [] : [label]
+            otherActive[question.question] = false
+        }
+        selected[question.question] = set
+    }
+
+    private func toggleOther(_ question: AskUserQuestion.Question) {
+        let next = !(otherActive[question.question] ?? false)
+        otherActive[question.question] = next
+        if next, !question.multiSelect { selected[question.question] = [] }
+    }
+
+    private func activateOther(_ question: AskUserQuestion.Question) {
+        otherActive[question.question] = true
+        if !question.multiSelect { selected[question.question] = [] }
+    }
+
+    /// Chosen labels for a question: picked options plus any non-empty "Other".
+    private func answers(for question: AskUserQuestion.Question) -> [String] {
+        var labels = Array(selected[question.question] ?? [])
+        if otherActive[question.question] ?? false {
+            let custom = (otherText[question.question] ?? "")
+                .trimmingCharacters(in: .whitespacesAndNewlines)
+            if !custom.isEmpty { labels.append(custom) }
+        }
+        return labels
+    }
+
+    // MARK: - Submit
+
+    private func submit() {
+        var selections: [String: [String]] = [:]
+        for question in questions { selections[question.question] = answers(for: question) }
+        let updatedInput = AskUserQuestion.updatedInput(
+            original: approval.input, selections: selections)
+        respond(.allow(updatedInput: updatedInput))
+    }
+
+    private func respond(_ decision: Decision) {
+        store.respond(approval, decision)
+    }
+}

From 27a69cfd4fd9c83044c7e3a3d10079dd1b218de9 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 02:35:57 -0700
Subject: [PATCH 110/143] Fix AskUserQuestion Rendering

Nucleic-Session: A563CF12-F6B3-498A-8640-97DFC24F59EF
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 .../NucleicRemote/Views/SessionDetailView.swift      | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/NucleicRemote/NucleicRemote/Views/SessionDetailView.swift b/NucleicRemote/NucleicRemote/Views/SessionDetailView.swift
index f4f7752..80f3c37 100644
--- a/NucleicRemote/NucleicRemote/Views/SessionDetailView.swift
+++ b/NucleicRemote/NucleicRemote/Views/SessionDetailView.swift
@@ -221,7 +221,17 @@ struct SessionDetailView: View {
     private var actionArea: some View {
         Group {
             if let approval = store.openApprovals.first {
-                ApprovalCardView(approval: approval)
+                // AskUserQuestion isn't a permission gate — it collects the user's answers and
+                // needs them folded back into `updatedInput`. Render the picker (matching the
+                // Mac's `AskUserQuestionBar`) instead of a plain allow/deny card, which would
+                // reply with no selection and make the CLI report the question went unanswered.
+                if approval.toolName == AskUserQuestion.toolName,
+                    let questions = AskUserQuestion.questions(from: approval.input)
+                {
+                    AskUserQuestionCardView(approval: approval, questions: questions)
+                } else {
+                    ApprovalCardView(approval: approval)
+                }
             } else if let status = summary?.status {
                 let running = status == .running
                 let canCompose = running || status == .awaitingInput || status.isTerminal

From 35dcce14ae6f48fff7bca58ba4f8c0d966593701 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 02:36:28 -0700
Subject: [PATCH 111/143] Fix AskUserQuestion Rendering

Nucleic-Session: A563CF12-F6B3-498A-8640-97DFC24F59EF
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Notifications.swift | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/NucleicRemote/NucleicRemote/Notifications.swift b/NucleicRemote/NucleicRemote/Notifications.swift
index fa8ef92..c12a4b5 100644
--- a/NucleicRemote/NucleicRemote/Notifications.swift
+++ b/NucleicRemote/NucleicRemote/Notifications.swift
@@ -62,7 +62,11 @@ final class NotificationRouter: NSObject {
         content.title = sessionTitle
         content.body = "\(approval.toolName) wants: \(approval.title)"
         content.sound = .default
-        content.categoryIdentifier = approval.risk.isHigh
+        // AskUserQuestion collects answers, it doesn't gate — a banner Allow would reply with no
+        // selection (updatedInput: nil) and the CLI reports the question went unanswered. So, like
+        // a high-risk approval, it uses the action-less category: it must open the app and be
+        // answered on the picker card.
+        content.categoryIdentifier = approval.risk.isHigh || approval.toolName == AskUserQuestion.toolName
             ? Self.approvalCategory : Self.approvalActionableCategory
         content.userInfo = [
             "sessionID": approval.sessionID.rawValue,

From 8219f19d4e1e1e58272d1d1bc8e8a342d200b441 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 02:38:01 -0700
Subject: [PATCH 112/143] Handle Session Interaction

Nucleic-Session: B08BD1C3-178D-44BD-827A-331F72A95821
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 .../NucleicRemoteWidgets/SessionLiveActivity.swift  | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/NucleicRemote/NucleicRemoteWidgets/SessionLiveActivity.swift b/NucleicRemote/NucleicRemoteWidgets/SessionLiveActivity.swift
index 1d74750..deee70b 100644
--- a/NucleicRemote/NucleicRemoteWidgets/SessionLiveActivity.swift
+++ b/NucleicRemote/NucleicRemoteWidgets/SessionLiveActivity.swift
@@ -109,10 +109,23 @@ private struct LockScreenView: View {
 // MARK: - Shared pieces
 
 /// One session: state glyph + title + "project · Backend" + a right-aligned status/diff.
+///
+/// Each row is its own tap target: wrapped in a `Link` to `nucleic://session/<id>`, so tapping a
+/// specific session on the lock screen or expanded Dynamic Island opens *that* session — overriding
+/// the activity-wide `widgetURL` (which still governs the header, churn footer, and empty space, and
+/// remains the only tap target the compact/minimal presentations can offer).
 private struct SessionRow: View {
     let line: NucleicSessionAttributes.SessionLine
 
     var body: some View {
+        if let url = NucleicDeepLink.session(line.id) {
+            Link(destination: url) { rowContent }
+        } else {
+            rowContent
+        }
+    }
+
+    private var rowContent: some View {
         HStack(spacing: 8) {
             Image(systemName: ActivityPalette.glyph(line.kind))
                 .font(.footnote)

From cb7cdbd6285576335df71a1ad85914c87b55c6a0 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 04:12:27 -0700
Subject: [PATCH 113/143] Fix Tool Call Card Mesh

Nucleic-Session: 217E0ED8-7E6C-4CC0-899E-A2B6C425F292
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Models/HostConnection.swift | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/NucleicRemote/NucleicRemote/Models/HostConnection.swift b/NucleicRemote/NucleicRemote/Models/HostConnection.swift
index 1523236..a6c9358 100644
--- a/NucleicRemote/NucleicRemote/Models/HostConnection.swift
+++ b/NucleicRemote/NucleicRemote/Models/HostConnection.swift
@@ -498,6 +498,10 @@ final class HostConnection {
             // `fetchTranscript` this device sent. A phone pulls full history on demand via a
             // dedicated fetch path (not this subscribe stream), so nothing to do here yet.
             break
+        case .toolSummaries:
+            // Collapsed Bash summary lines the owner pushes to peer *Macs* (mesh session sync).
+            // The phone renders its own deterministic command summaries, so it ignores these.
+            break
         case .relayMembership(let membership):
             // The host issued/refreshed this device's relay credential (mesh P2). Persist it
             // in place (no reordering — this can arrive from a non-active Mac) so the relay

From 2f18f5968ba0700327f882535e2795aa01f239a9 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 04:13:23 -0700
Subject: [PATCH 114/143] Session Order Adjustment

Nucleic-Session: 19C20841-87D4-45F9-A5AD-EBB92B735F82
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Models/RemoteStore.swift | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/NucleicRemote/NucleicRemote/Models/RemoteStore.swift b/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
index e05c020..cfe8834 100644
--- a/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
+++ b/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
@@ -1242,6 +1242,13 @@ extension DashboardSnapshot {
 }
 
 extension WireSessionSummary {
+    /// Recency key for ordering session lists: the last *user* message, falling back to `updatedAt`
+    /// for sessions with no user message yet (or summaries from a host that predates the field).
+    /// Ordering on this keeps a chat's position steady until the user speaks again, rather than
+    /// reshuffling the list on every bit of agent activity (which bumps `updatedAt` every few
+    /// seconds). Mirrors the Mac sidebar's last-turn ordering.
+    var lastTurnAt: Date { lastUserMessageAt ?? updatedAt }
+
     /// A copy with selected fields overridden — the demo simulator's only way to "mutate" a
     /// summary, whose stored properties are all `let`. Nullable fields use a double optional so a
     /// caller can distinguish "keep" (omit) from "set to nil" (`.some(nil)`). `updatedAt` bumps

From 359f4ab45260fe2fec7fe025c65c506dec66c35f Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 04:13:33 -0700
Subject: [PATCH 115/143] Session Order Adjustment

Nucleic-Session: 19C20841-87D4-45F9-A5AD-EBB92B735F82
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Views/Theme.swift | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/NucleicRemote/NucleicRemote/Views/Theme.swift b/NucleicRemote/NucleicRemote/Views/Theme.swift
index 9da8d5b..1417988 100644
--- a/NucleicRemote/NucleicRemote/Views/Theme.swift
+++ b/NucleicRemote/NucleicRemote/Views/Theme.swift
@@ -281,6 +281,14 @@ enum StatusStyle {
         case .finished, .interrupted, .error: return 5
         }
     }
+
+    /// The shared session-list sort: attention-first by `sortRank`, then, within a rank, by
+    /// last-turn recency (`lastTurnAt`) rather than raw activity — so rows hold their place
+    /// instead of reshuffling every few seconds as the agent works. Mirrors the Mac sidebar.
+    static func attentionThenRecency(_ lhs: WireSessionSummary, _ rhs: WireSessionSummary) -> Bool {
+        let l = sortRank(lhs), r = sortRank(rhs)
+        return l == r ? lhs.lastTurnAt > rhs.lastTurnAt : l < r
+    }
 }
 
 extension SessionStatus {

From 86f6b308c6b355826ca470727ceec3f118f781d9 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 04:13:38 -0700
Subject: [PATCH 116/143] Session Order Adjustment

Nucleic-Session: 19C20841-87D4-45F9-A5AD-EBB92B735F82
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Views/SessionsView.swift | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/NucleicRemote/NucleicRemote/Views/SessionsView.swift b/NucleicRemote/NucleicRemote/Views/SessionsView.swift
index e42285a..22fb067 100644
--- a/NucleicRemote/NucleicRemote/Views/SessionsView.swift
+++ b/NucleicRemote/NucleicRemote/Views/SessionsView.swift
@@ -10,10 +10,7 @@ struct SessionsView: View {
 
     private var grouped: [(title: String, rows: [WireSessionSummary])] {
         let pool = (showArchived ? store.sessions : store.liveSessions)
-            .sorted {
-                let a = StatusStyle.sortRank($0), b = StatusStyle.sortRank($1)
-                return a == b ? $0.updatedAt > $1.updatedAt : a < b
-            }
+            .sorted(by: StatusStyle.attentionThenRecency)
         let needs = pool.filter { $0.status.needsYou($0.disposition) }
         let running = pool.filter { $0.status == .running || $0.status == .provisioning || $0.status == .idle }
         let done = pool.filter { !needs.contains($0) && !running.contains($0) }

From 46587255d25664cd7e65c96fb79d57cdfd6eda73 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 04:13:42 -0700
Subject: [PATCH 117/143] Session Order Adjustment

Nucleic-Session: 19C20841-87D4-45F9-A5AD-EBB92B735F82
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Views/AdaptiveRootView.swift | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/NucleicRemote/NucleicRemote/Views/AdaptiveRootView.swift b/NucleicRemote/NucleicRemote/Views/AdaptiveRootView.swift
index 574c482..9c4a02b 100644
--- a/NucleicRemote/NucleicRemote/Views/AdaptiveRootView.swift
+++ b/NucleicRemote/NucleicRemote/Views/AdaptiveRootView.swift
@@ -140,10 +140,7 @@ private struct SplitSidebar: View {
     /// Live sessions grouped under their project (dashboard order), with anything whose project
     /// isn't in the dashboard collected into a trailing "Other" group. Attention-first sort.
     private var projectGroups: [(name: String, rows: [WireSessionSummary])] {
-        let live = store.liveSessions.sorted {
-            let a = StatusStyle.sortRank($0), b = StatusStyle.sortRank($1)
-            return a == b ? $0.updatedAt > $1.updatedAt : a < b
-        }
+        let live = store.liveSessions.sorted(by: StatusStyle.attentionThenRecency)
         var groups: [(name: String, rows: [WireSessionSummary])] = []
         var placed = Set<SessionID>()
         for project in store.dashboard.projects {

From 44420ae35e8d7f45508f89fc745f71fc9ac29046 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 04:13:49 -0700
Subject: [PATCH 118/143] Session Order Adjustment

Nucleic-Session: 19C20841-87D4-45F9-A5AD-EBB92B735F82
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Views/ProjectsView.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NucleicRemote/NucleicRemote/Views/ProjectsView.swift b/NucleicRemote/NucleicRemote/Views/ProjectsView.swift
index 32290c1..0ad0cfc 100644
--- a/NucleicRemote/NucleicRemote/Views/ProjectsView.swift
+++ b/NucleicRemote/NucleicRemote/Views/ProjectsView.swift
@@ -53,7 +53,7 @@ struct ProjectDetailView: View {
     private var sessions: [WireSessionSummary] {
         store.liveSessions
             .filter { $0.projectID == project.id.rawValue }
-            .sorted { StatusStyle.sortRank($0) < StatusStyle.sortRank($1) }
+            .sorted(by: StatusStyle.attentionThenRecency)
     }
 
     var body: some View {

From 37aa1ac643a04ad6318d2757e63ea33081e9dde4 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 04:13:53 -0700
Subject: [PATCH 119/143] Session Order Adjustment

Nucleic-Session: 19C20841-87D4-45F9-A5AD-EBB92B735F82
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/LiveActivityManager.swift | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/NucleicRemote/NucleicRemote/LiveActivityManager.swift b/NucleicRemote/NucleicRemote/LiveActivityManager.swift
index 04f5cb6..0ed2631 100644
--- a/NucleicRemote/NucleicRemote/LiveActivityManager.swift
+++ b/NucleicRemote/NucleicRemote/LiveActivityManager.swift
@@ -56,10 +56,7 @@ final class LiveActivityManager {
                 $0.status == .running || $0.status == .provisioning
                     || $0.status.needsYou($0.disposition)
             }
-            .sorted { lhs, rhs in
-                let l = StatusStyle.sortRank(lhs), r = StatusStyle.sortRank(rhs)
-                return l == r ? lhs.updatedAt > rhs.updatedAt : l < r
-            }
+            .sorted(by: StatusStyle.attentionThenRecency)
 
         let approvals = active.reduce(0) { $0 + $1.pendingApprovalCount }
         let files = active.reduce(0) { $0 + ($1.diffStat?.filesChanged ?? 0) }

From 3bed72f8a5fed8cdfd322190988705ce409cea86 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 04:14:00 -0700
Subject: [PATCH 120/143] Session Order Adjustment

Nucleic-Session: 19C20841-87D4-45F9-A5AD-EBB92B735F82
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Views/HomeView.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NucleicRemote/NucleicRemote/Views/HomeView.swift b/NucleicRemote/NucleicRemote/Views/HomeView.swift
index 8c169f4..234c6a7 100644
--- a/NucleicRemote/NucleicRemote/Views/HomeView.swift
+++ b/NucleicRemote/NucleicRemote/Views/HomeView.swift
@@ -16,7 +16,7 @@ struct HomeView: View {
     private var needsAttention: [WireSessionSummary] {
         store.liveSessions
             .filter { $0.status.needsYou($0.disposition) }
-            .sorted { $0.updatedAt > $1.updatedAt }
+            .sorted { $0.lastTurnAt > $1.lastTurnAt }
     }
     /// Sessions actively working a turn — drives both the "In progress" stat card and the
     /// live list pinned above the to-dos.

From 6bb4162a270ee43dc911502c744a694f5b064681 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 04:14:05 -0700
Subject: [PATCH 121/143] Session Order Adjustment

Nucleic-Session: 19C20841-87D4-45F9-A5AD-EBB92B735F82
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Views/HomeView.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NucleicRemote/NucleicRemote/Views/HomeView.swift b/NucleicRemote/NucleicRemote/Views/HomeView.swift
index 234c6a7..dfab55d 100644
--- a/NucleicRemote/NucleicRemote/Views/HomeView.swift
+++ b/NucleicRemote/NucleicRemote/Views/HomeView.swift
@@ -21,7 +21,7 @@ struct HomeView: View {
     /// Sessions actively working a turn — drives both the "In progress" stat card and the
     /// live list pinned above the to-dos.
     private var running: [WireSessionSummary] {
-        store.liveSessions.filter { $0.status == .running }.sorted { $0.updatedAt > $1.updatedAt }
+        store.liveSessions.filter { $0.status == .running }.sorted { $0.lastTurnAt > $1.lastTurnAt }
     }
     /// Outstanding to-dos — everything not yet done (open + dispatched), matching the count the
     /// To-dos tab lists. The Mac surfaces this elsewhere on its home; the phone gets a stat card.

From 3504c14faa3d1c091dab2bdc70fe8f1a819fb0bc Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 04:16:00 -0700
Subject: [PATCH 122/143] Live Activity Height Adjustment

Nucleic-Session: 89404784-EBA1-4E59-BE81-0698CA20F06A
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 .../NucleicRemoteWidgets/SessionLiveActivity.swift          | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/NucleicRemote/NucleicRemoteWidgets/SessionLiveActivity.swift b/NucleicRemote/NucleicRemoteWidgets/SessionLiveActivity.swift
index deee70b..0721977 100644
--- a/NucleicRemote/NucleicRemoteWidgets/SessionLiveActivity.swift
+++ b/NucleicRemote/NucleicRemoteWidgets/SessionLiveActivity.swift
@@ -94,12 +94,6 @@ private struct LockScreenView: View {
             ForEach(state.lines.prefix(3)) { line in
                 SessionRow(line: line)
             }
-
-            // Aggregate churn footer — how much work is in flight right now.
-            if state.hasChurn {
-                Divider().overlay(Color.white.opacity(0.12))
-                ChurnLine(state: state)
-            }
         }
         .padding(14)
         .foregroundStyle(.white)

From 9c07a975d5b76affb2d7479ccc4d92673d147b14 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 04:16:05 -0700
Subject: [PATCH 123/143] Live Activity Height Adjustment

Nucleic-Session: 89404784-EBA1-4E59-BE81-0698CA20F06A
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemoteWidgets/SessionLiveActivity.swift | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/NucleicRemote/NucleicRemoteWidgets/SessionLiveActivity.swift b/NucleicRemote/NucleicRemoteWidgets/SessionLiveActivity.swift
index 0721977..ab603b7 100644
--- a/NucleicRemote/NucleicRemoteWidgets/SessionLiveActivity.swift
+++ b/NucleicRemote/NucleicRemoteWidgets/SessionLiveActivity.swift
@@ -43,9 +43,6 @@ struct SessionLiveActivity: Widget {
                         ForEach(state.lines.prefix(2)) { line in
                             SessionRow(line: line)
                         }
-                        if state.hasChurn {
-                            ChurnLine(state: state).padding(.top, 1)
-                        }
                     }
                 }
             } compactLeading: {

From 7d71601b40ed48ef7f4d79758d141e5f451fc0e0 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 04:16:11 -0700
Subject: [PATCH 124/143] Live Activity Height Adjustment

Nucleic-Session: 89404784-EBA1-4E59-BE81-0698CA20F06A
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 .../SessionLiveActivity.swift                 | 22 -------------------
 1 file changed, 22 deletions(-)

diff --git a/NucleicRemote/NucleicRemoteWidgets/SessionLiveActivity.swift b/NucleicRemote/NucleicRemoteWidgets/SessionLiveActivity.swift
index ab603b7..a58e4e3 100644
--- a/NucleicRemote/NucleicRemoteWidgets/SessionLiveActivity.swift
+++ b/NucleicRemote/NucleicRemoteWidgets/SessionLiveActivity.swift
@@ -173,28 +173,6 @@ private struct CountChips: View {
     }
 }
 
-/// Aggregate worktree churn: "N files  +A  −R".
-private struct ChurnLine: View {
-    let state: NucleicSessionAttributes.ContentState
-
-    var body: some View {
-        HStack(spacing: 6) {
-            Image(systemName: "chevron.left.forwardslash.chevron.right")
-                .font(.caption2)
-                .foregroundStyle(.secondary)
-            Text("\(state.filesChanged) file\(state.filesChanged == 1 ? "" : "s") changed")
-                .foregroundStyle(.secondary)
-            Text("+\(state.linesAdded)")
-                .foregroundStyle(ActivityPalette.added)
-            Text("−\(state.linesRemoved)")
-                .foregroundStyle(ActivityPalette.removed)
-        }
-        .font(.caption2.weight(.medium))
-        .monospacedDigit()
-        .lineLimit(1)
-    }
-}
-
 /// Dynamic Island expanded leading/trailing count badge.
 private struct CountBadge: View {
     let systemImage: String

From a0db606f97caba778267b99ffef1aaa870c9711a Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 04:17:24 -0700
Subject: [PATCH 125/143] Reconnect Icon Update

Nucleic-Session: 183CCBC5-8629-4480-A7A9-C981D551DCFD
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 .../NucleicRemote/Models/HostConnection.swift      | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/NucleicRemote/NucleicRemote/Models/HostConnection.swift b/NucleicRemote/NucleicRemote/Models/HostConnection.swift
index a6c9358..654ab5f 100644
--- a/NucleicRemote/NucleicRemote/Models/HostConnection.swift
+++ b/NucleicRemote/NucleicRemote/Models/HostConnection.swift
@@ -478,8 +478,18 @@ final class HostConnection {
                 else { continue }
                 let fingerprint = member.staticPublicKey.fingerprintHex
                 guard fingerprint != self.hostID else { continue }  // that's the Mac we're on
-                if IdentityStore.pairedHost(id: fingerprint) == nil { changed = true }
-                IdentityStore.mergePairedHost(Self.pairedHost(from: member))
+                let incoming = Self.pairedHost(from: member)
+                let existing = IdentityStore.pairedHost(id: fingerprint)
+                // Re-dial not only when a Mac is brand-new, but also when a known Mac's dialable
+                // address changed — a Mac's LAN port is OS-assigned (`.any`), so it lands on a
+                // fresh one every relaunch and re-gossips it. `mergePairedHost` updates the
+                // registry in place, but a connection already retrying the dead old address won't
+                // pick that up on its own (its retry loop reuses the address it was last handed),
+                // so without forcing a fresh reconnect here the phone never reconnects to it.
+                if existing == nil || Self.dialableAddressChanged(from: existing!, to: incoming) {
+                    changed = true
+                }
+                IdentityStore.mergePairedHost(incoming)
             }
             for tombstone in push.tombstones {
                 // fingerprint = first 16 hex of the hostID (sha256 prefix), the registry key.

From 9243763e05e04cff69fd54c42af9bc2d5165ca17 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 04:17:39 -0700
Subject: [PATCH 126/143] Reconnect Icon Update

Nucleic-Session: 183CCBC5-8629-4480-A7A9-C981D551DCFD
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 .../NucleicRemote/Models/HostConnection.swift        | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/NucleicRemote/NucleicRemote/Models/HostConnection.swift b/NucleicRemote/NucleicRemote/Models/HostConnection.swift
index 654ab5f..8436ad5 100644
--- a/NucleicRemote/NucleicRemote/Models/HostConnection.swift
+++ b/NucleicRemote/NucleicRemote/Models/HostConnection.swift
@@ -201,6 +201,18 @@ final class HostConnection {
             relayMembershipToken: nil, relayURL: nil)
     }
 
+    /// Whether the dialable endpoints of a gossiped record differ from the one on file — the
+    /// signal that a known Mac must be re-dialed (its LAN port, tailnet IP, or relay room moved).
+    /// Ignores relay *credentials* (token/URL), which `mergePairedHost` preserves and which don't
+    /// change where the Mac is reached.
+    private static func dialableAddressChanged(from existing: PairedHost, to incoming: PairedHost) -> Bool {
+        existing.lanHost != incoming.lanHost
+            || existing.lanPort != incoming.lanPort
+            || existing.tailnetHost != incoming.tailnetHost
+            || existing.tailnetPort != incoming.tailnetPort
+            || existing.relayRoomID != incoming.relayRoomID
+    }
+
     /// Split a "host:port" hint (last-colon split so a bracketed IPv6 host survives).
     private static func splitHostPort(_ hint: String?) -> (String?, UInt16?) {
         guard let hint, let colon = hint.lastIndex(of: ":"),

From 7ba9b896a3bdf0a2ccaed17b028720c37acc98c0 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 04:20:40 -0700
Subject: [PATCH 127/143] Activity Theme Adjustment

Nucleic-Session: 5F808220-F280-49B7-8876-41EE93E714FA
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 .../NucleicRemoteWidgets/SessionLiveActivity.swift          | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/NucleicRemote/NucleicRemoteWidgets/SessionLiveActivity.swift b/NucleicRemote/NucleicRemoteWidgets/SessionLiveActivity.swift
index a58e4e3..d1d5dd5 100644
--- a/NucleicRemote/NucleicRemoteWidgets/SessionLiveActivity.swift
+++ b/NucleicRemote/NucleicRemoteWidgets/SessionLiveActivity.swift
@@ -14,7 +14,11 @@ struct SessionLiveActivity: Widget {
         ActivityConfiguration(for: NucleicSessionAttributes.self) { context in
             LockScreenView(state: context.state, hostName: context.attributes.hostName)
                 .widgetURL(context.state.tapURL)
-                .activityBackgroundTint(Color.black.opacity(0.55))
+                // When something needs the user, wash the whole card in the attention tint;
+                // otherwise the calm dark background (see the border/header cues in LockScreenView).
+                .activityBackgroundTint(context.state.needsAttention
+                    ? ActivityPalette.attentionTint(context.state).opacity(0.28)
+                    : Color.black.opacity(0.55))
                 .activitySystemActionForegroundColor(.white)
         } dynamicIsland: { context in
             let state = context.state

From baa59f4c22ad851963ab4a2d64a9bb2c7af1903b Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 04:20:56 -0700
Subject: [PATCH 128/143] Activity Theme Adjustment

Nucleic-Session: 5F808220-F280-49B7-8876-41EE93E714FA
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 .../SessionLiveActivity.swift                 | 27 ++++++++++++++++---
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/NucleicRemote/NucleicRemoteWidgets/SessionLiveActivity.swift b/NucleicRemote/NucleicRemoteWidgets/SessionLiveActivity.swift
index d1d5dd5..ac4ad4f 100644
--- a/NucleicRemote/NucleicRemoteWidgets/SessionLiveActivity.swift
+++ b/NucleicRemote/NucleicRemoteWidgets/SessionLiveActivity.swift
@@ -78,12 +78,17 @@ private struct LockScreenView: View {
     let hostName: String
 
     var body: some View {
-        VStack(alignment: .leading, spacing: 8) {
-            // Header: brand + host, and the headline counts.
+        let attention = state.needsAttention
+        let tint = ActivityPalette.attentionTint(state)
+        return VStack(alignment: .leading, spacing: 8) {
+            // Header: brand + host, and the headline counts. When the user is needed the brand
+            // mark becomes the attention glyph in its tint, so the header itself reads "act now".
             HStack(spacing: 8) {
-                Image(systemName: "hexagon.fill")
+                Image(systemName: attention
+                    ? ActivityPalette.glyph(state.approvalCount > 0 ? .approval : .needsInput)
+                    : "hexagon.fill")
                     .font(.footnote)
-                    .foregroundStyle(ActivityPalette.active)
+                    .foregroundStyle(attention ? tint : ActivityPalette.active)
                 Text(hostName)
                     .font(.caption.weight(.semibold))
                     .lineLimit(1)
@@ -98,6 +103,20 @@ private struct LockScreenView: View {
         }
         .padding(14)
         .foregroundStyle(.white)
+        // Attention theme: a soft tinted wash + a colored border around the whole glance, so a
+        // session waiting on the user is unmistakable at a glance even before reading the rows.
+        .background {
+            if attention {
+                RoundedRectangle(cornerRadius: 22, style: .continuous)
+                    .fill(tint.opacity(0.12))
+            }
+        }
+        .overlay {
+            if attention {
+                RoundedRectangle(cornerRadius: 22, style: .continuous)
+                    .strokeBorder(tint.opacity(0.9), lineWidth: 2)
+            }
+        }
     }
 }
 

From d66b8daf8f57507e357f7fe3da8c1b96eb77fe66 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 04:21:04 -0700
Subject: [PATCH 129/143] Activity Theme Adjustment

Nucleic-Session: 5F808220-F280-49B7-8876-41EE93E714FA
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 .../NucleicRemoteWidgets/SessionLiveActivity.swift          | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/NucleicRemote/NucleicRemoteWidgets/SessionLiveActivity.swift b/NucleicRemote/NucleicRemoteWidgets/SessionLiveActivity.swift
index ac4ad4f..5e2f336 100644
--- a/NucleicRemote/NucleicRemoteWidgets/SessionLiveActivity.swift
+++ b/NucleicRemote/NucleicRemoteWidgets/SessionLiveActivity.swift
@@ -223,6 +223,12 @@ private enum ActivityPalette {
     static let added = Color(red: 0.30, green: 0.78, blue: 0.45)
     static let removed = Color(red: 0.92, green: 0.34, blue: 0.34)
 
+    /// The color the "attention needed" theme paints with: approval amber is loudest, else the
+    /// needs-input teal. Only meaningful when `state.needsAttention` — callers gate on that.
+    static func attentionTint(_ state: NucleicSessionAttributes.ContentState) -> Color {
+        state.approvalCount > 0 ? attention : accent
+    }
+
     static func glyph(_ kind: NucleicSessionAttributes.Kind) -> String {
         switch kind {
         case .running: "circle.lefthalf.filled"

From 628f26bdfb7c1b86ef17754b86b9f351b6b2ba77 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 04:29:53 -0700
Subject: [PATCH 130/143] Session Sync Repair

Nucleic-Session: 0C7BC346-0002-4533-ADDD-3B4C92E58527
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 .../NucleicRemote/Models/HostConnection.swift     | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/NucleicRemote/NucleicRemote/Models/HostConnection.swift b/NucleicRemote/NucleicRemote/Models/HostConnection.swift
index 8436ad5..e1f1335 100644
--- a/NucleicRemote/NucleicRemote/Models/HostConnection.swift
+++ b/NucleicRemote/NucleicRemote/Models/HostConnection.swift
@@ -35,7 +35,20 @@ final class HostConnection {
 
     /// The session RemoteStore currently has open on this host, if any — so snapshot/events are only
     /// forwarded (and deduped) for the transcript on screen. Set by RemoteStore on open/close.
-    var openSessionID: SessionID?
+    /// Changing which session is open resets the per-session cursor + dedup set (they only make
+    /// sense within one transcript).
+    var openSessionID: SessionID? {
+        didSet {
+            guard openSessionID != oldValue else { return }
+            openMaxSeq = nil
+            seenSeq = []
+        }
+    }
+
+    /// The highest event `seq` delivered for the open session — the warm-resubscribe cursor. On a
+    /// reconnect we re-subscribe `sinceSeq: openMaxSeq` so the host replays only what we missed
+    /// instead of cold-resetting to the 200-event tail (which would truncate a long transcript).
+    private var openMaxSeq: UInt64?
 
     // MARK: Callbacks up to RemoteStore (aggregate concerns)
 

From e650bdff4caaab6f808d18f31578692b698dc700 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 04:30:00 -0700
Subject: [PATCH 131/143] Session Sync Repair

Nucleic-Session: 0C7BC346-0002-4533-ADDD-3B4C92E58527
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Models/HostConnection.swift | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/NucleicRemote/NucleicRemote/Models/HostConnection.swift b/NucleicRemote/NucleicRemote/Models/HostConnection.swift
index e1f1335..2d20037 100644
--- a/NucleicRemote/NucleicRemote/Models/HostConnection.swift
+++ b/NucleicRemote/NucleicRemote/Models/HostConnection.swift
@@ -453,7 +453,9 @@ final class HostConnection {
             callbacks.didUpdate()
             send(.listSessions)
             send(.listDashboard)
-            if let id = openSessionID { send(.subscribe(Subscribe(sessionID: id, sinceSeq: nil, verbosity: .full))) }
+            // Warm-resubscribe from what we already have, so a reconnect on a long transcript replays
+            // only the gap rather than snapping back to the host's 200-event tail.
+            if let id = openSessionID { send(.subscribe(Subscribe(sessionID: id, sinceSeq: openMaxSeq, verbosity: .full))) }
         case .sessionList(let list):
             sessions = list
             callbacks.didUpdate()

From c5b7846d7c8a8a681ee844d7f35d6623ecc3ddef Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 04:30:11 -0700
Subject: [PATCH 132/143] Session Sync Repair

Nucleic-Session: 0C7BC346-0002-4533-ADDD-3B4C92E58527
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Models/HostConnection.swift | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/NucleicRemote/NucleicRemote/Models/HostConnection.swift b/NucleicRemote/NucleicRemote/Models/HostConnection.swift
index 2d20037..0dba1bd 100644
--- a/NucleicRemote/NucleicRemote/Models/HostConnection.swift
+++ b/NucleicRemote/NucleicRemote/Models/HostConnection.swift
@@ -476,12 +476,17 @@ final class HostConnection {
             callbacks.didUpdate()
         case .snapshot(let snapshot):
             guard snapshot.summary.sessionID == openSessionID else { break }
-            seenSeq = Set(snapshot.recentEvents.map(\.seq))
+            // A snapshot may be a fresh open (tail window) or a warm-resubscribe delta; either way
+            // union its seqs into the dedup set and advance the cursor. RemoteStore merges the events
+            // into the transcript rather than replacing, so an existing transcript isn't truncated.
+            seenSeq.formUnion(snapshot.recentEvents.map(\.seq))
+            if let maxSeq = snapshot.recentEvents.map(\.seq).max() { openMaxSeq = max(openMaxSeq ?? 0, maxSeq) }
             callbacks.openSnapshot(snapshot)
         case .events(let batch):
             guard batch.sessionID == openSessionID else { break }
             let fresh = batch.events.filter { !seenSeq.contains($0.seq) }
             for e in fresh { seenSeq.insert(e.seq) }
+            if let maxSeq = batch.events.map(\.seq).max() { openMaxSeq = max(openMaxSeq ?? 0, maxSeq) }
             if !fresh.isEmpty { callbacks.openEvents(EventBatch(sessionID: batch.sessionID, events: fresh)) }
         case .approvalRequested(let req):
             let title = sessions.first { $0.sessionID == req.sessionID }?.title ?? "Approval"

From bbba9a666b7d31fb27cdb095cf94ed8c823e77f6 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 04:30:42 -0700
Subject: [PATCH 133/143] Session Sync Repair

Nucleic-Session: 0C7BC346-0002-4533-ADDD-3B4C92E58527
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Models/RemoteStore.swift | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/NucleicRemote/NucleicRemote/Models/RemoteStore.swift b/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
index cfe8834..97e1d0e 100644
--- a/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
+++ b/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
@@ -477,7 +477,10 @@ final class RemoteStore: ObservableObject {
         }
         cb.openSnapshot = { [weak self] snap in
             guard let self, hostID == self.openSessionHostID, snap.summary.sessionID == self.openSessionID else { return }
-            self.openEvents = snap.recentEvents
+            // Merge, don't replace: a fresh open merges into an empty transcript (the tail window),
+            // while a reconnect's warm-resubscribe delta appends to the history already on screen
+            // instead of truncating it to the host's 200-event tail.
+            self.openEvents = Self.mergedEvents(self.openEvents, snap.recentEvents)
             self.openApprovals = snap.pendingApprovals
         }
         cb.openEvents = { [weak self] batch in

From dbfd6213366d9a7366556f8be41d03f41040993e Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 04:30:57 -0700
Subject: [PATCH 134/143] Session Sync Repair

Nucleic-Session: 0C7BC346-0002-4533-ADDD-3B4C92E58527
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 .../NucleicRemote/Models/RemoteStore.swift         | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/NucleicRemote/NucleicRemote/Models/RemoteStore.swift b/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
index 97e1d0e..f5016b2 100644
--- a/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
+++ b/NucleicRemote/NucleicRemote/Models/RemoteStore.swift
@@ -560,6 +560,20 @@ final class RemoteStore: ObservableObject {
         }
     }
 
+    /// Merge transcript events by `seq` (monotonic, globally unique within a session), keeping the
+    /// union sorted. Lets a reconnect's snapshot fold its events into the transcript already on
+    /// screen without duplicating what's shown or dropping history outside the host's tail window.
+    /// A fresh open merges into `[]`, so it's just the tail — the same result as a plain replace.
+    private static func mergedEvents(_ existing: [AgentEvent], _ incoming: [AgentEvent]) -> [AgentEvent] {
+        guard !existing.isEmpty else { return incoming }
+        guard !incoming.isEmpty else { return existing }
+        var bySeq: [UInt64: AgentEvent] = [:]
+        bySeq.reserveCapacity(existing.count + incoming.count)
+        for e in existing { bySeq[e.seq] = e }
+        for e in incoming { bySeq[e.seq] = e }
+        return bySeq.values.sorted { $0.seq < $1.seq }
+    }
+
     /// The flat sessions list: every connected Mac's sessions, deduped by id (ids are globally
     /// unique). Views handle sorting/grouping.
     private func aggregatedSessions() -> [WireSessionSummary] {

From 7e059459ad35b5544d89d3df9a4470558e6ffec6 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 04:55:06 -0700
Subject: [PATCH 135/143] Add New Chat Button

Nucleic-Session: BB7AA593-185A-4A8F-A3DA-598EE63874E2
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Views/Composer.swift | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/NucleicRemote/NucleicRemote/Views/Composer.swift b/NucleicRemote/NucleicRemote/Views/Composer.swift
index 44fef85..4da79f5 100644
--- a/NucleicRemote/NucleicRemote/Views/Composer.swift
+++ b/NucleicRemote/NucleicRemote/Views/Composer.swift
@@ -9,6 +9,9 @@ struct StartChatComposer: View {
     /// start typing a new chat immediately. Consumed (reset to false) once handled, so it never
     /// steals focus on a later Home appearance. `.constant(false)` for the iPhone/compact path.
     var focusNewChat: Binding<Bool> = .constant(false)
+    /// Called after a chat is kicked off, so a host that presents the composer modally (e.g. the
+    /// Sessions tab's floating New-chat button) can dismiss itself. Home leaves it nil and stays put.
+    var onStart: (() -> Void)? = nil
     @State private var projectID: ProjectID?
     @State private var draft = ""
     @State private var auto = false

From 8726a66ab725a6a67e7a1c623c740ce06bfd39f5 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 04:55:09 -0700
Subject: [PATCH 136/143] Add New Chat Button

Nucleic-Session: BB7AA593-185A-4A8F-A3DA-598EE63874E2
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Views/Composer.swift | 1 +
 1 file changed, 1 insertion(+)

diff --git a/NucleicRemote/NucleicRemote/Views/Composer.swift b/NucleicRemote/NucleicRemote/Views/Composer.swift
index 4da79f5..24fa52f 100644
--- a/NucleicRemote/NucleicRemote/Views/Composer.swift
+++ b/NucleicRemote/NucleicRemote/Views/Composer.swift
@@ -96,6 +96,7 @@ struct StartChatComposer: View {
                             baseBranch: branch.isEmpty ? nil : branch,
                             useWorktree: useWorktree, auto: auto)
                         draft = ""
+                        onStart?()
                     }
                 } label: {
                     Image(systemName: "arrow.up.circle.fill").font(.title)

From 3f9d4a9fa69df69f927fa7cf10bffbeabea07684 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 04:55:14 -0700
Subject: [PATCH 137/143] Add New Chat Button

Nucleic-Session: BB7AA593-185A-4A8F-A3DA-598EE63874E2
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Views/SessionsView.swift | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/NucleicRemote/NucleicRemote/Views/SessionsView.swift b/NucleicRemote/NucleicRemote/Views/SessionsView.swift
index 22fb067..9f515fd 100644
--- a/NucleicRemote/NucleicRemote/Views/SessionsView.swift
+++ b/NucleicRemote/NucleicRemote/Views/SessionsView.swift
@@ -6,8 +6,13 @@ import NucleicProtocol
 struct SessionsView: View {
     @EnvironmentObject var store: RemoteStore
     @State private var showArchived = false
+    @State private var showNewChat = false
     @State private var path = NavigationPath()
 
+    /// The floating New-chat button only makes sense when this device can control a Mac and there's
+    /// at least one project to start a chat in; otherwise the composer it opens would be inert.
+    private var canStartChat: Bool { store.canControl && !store.dashboard.projects.isEmpty }
+
     private var grouped: [(title: String, rows: [WireSessionSummary])] {
         let pool = (showArchived ? store.sessions : store.liveSessions)
             .sorted(by: StatusStyle.attentionThenRecency)

From f01b7437e122a5d2aae6ed33ac12514fdee46824 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 04:55:27 -0700
Subject: [PATCH 138/143] Add New Chat Button

Nucleic-Session: BB7AA593-185A-4A8F-A3DA-598EE63874E2
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 .../NucleicRemote/Views/SessionsView.swift    | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/NucleicRemote/NucleicRemote/Views/SessionsView.swift b/NucleicRemote/NucleicRemote/Views/SessionsView.swift
index 9f515fd..81ad3bb 100644
--- a/NucleicRemote/NucleicRemote/Views/SessionsView.swift
+++ b/NucleicRemote/NucleicRemote/Views/SessionsView.swift
@@ -89,10 +89,50 @@ struct SessionsView: View {
                     }
                 }
             }
+            // A floating "new chat" affordance in the lower-right, mirroring the Mac's per-project
+            // "New chat" button. Picks a project + prompt in a sheet, then kicks off the chat.
+            .overlay(alignment: .bottomTrailing) {
+                if canStartChat { newChatButton }
+            }
+            .sheet(isPresented: $showNewChat) {
+                NavigationStack {
+                    ScrollView {
+                        StartChatComposer(onStart: { showNewChat = false })
+                            .padding()
+                    }
+                    .navigationTitle("New chat")
+                    .navigationBarTitleDisplayMode(.inline)
+                    .toolbar {
+                        ToolbarItem(placement: .topBarLeading) {
+                            Button("Cancel") { showNewChat = false }
+                        }
+                    }
+                }
+                .presentationDetents([.medium, .large])
+            }
             .safeAreaInset(edge: .bottom) { ConnectionChip().padding(.bottom, 8) }
         }
     }
 
+    /// The circular plus button, styled to match the transcript's jump-to-bottom FAB: an accent
+    /// disc with a soft shadow, floated clear of the connection chip.
+    private var newChatButton: some View {
+        Button {
+            showNewChat = true
+        } label: {
+            Image(systemName: "plus")
+                .font(.system(size: 22, weight: .semibold))
+                .foregroundStyle(.white)
+                .frame(width: 56, height: 56)
+                .background(Palette.accent, in: .circle)
+                .shadow(color: .black.opacity(0.25), radius: 6, y: 2)
+        }
+        .buttonStyle(.plain)
+        .padding(.trailing, 20)
+        .padding(.bottom, 20)
+        .accessibilityLabel("New chat")
+    }
+
     /// Push the session a notification tap asked for, then clear the request.
     private func consumeRoute() {
         guard let route = store.pendingRoute else { return }

From 20584bded9d59f6257cdd17b425fed0c031791b1 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 16:23:32 -0700
Subject: [PATCH 139/143] Bottom Tab Bar Visibility Adjustment

Nucleic-Session: 747527BF-AEE9-4939-BE70-A14F1F3BBBA8
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Views/SessionDetailView.swift | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/NucleicRemote/NucleicRemote/Views/SessionDetailView.swift b/NucleicRemote/NucleicRemote/Views/SessionDetailView.swift
index 80f3c37..10f7ad2 100644
--- a/NucleicRemote/NucleicRemote/Views/SessionDetailView.swift
+++ b/NucleicRemote/NucleicRemote/Views/SessionDetailView.swift
@@ -27,6 +27,10 @@ struct SessionDetailView: View {
             .safeAreaInset(edge: .bottom) { actionArea }
             .navigationTitle(summary?.title ?? "Session")
             .navigationBarTitleDisplayMode(.inline)
+            // With a session open the floating chat bar owns the bottom edge; the tab bar below it
+            // would be a redundant second bar (and clip the glass action area), so hide it while
+            // this detail is pushed. A no-op in the iPad split, which has no tab bar.
+            .toolbar(.hidden, for: .tabBar)
             .toolbar {
                 ToolbarItem(placement: .topBarTrailing) { sessionMenu }
             }

From fb1eb21a1fc6d344f9546e886b75caa5a0cebd74 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 16:23:45 -0700
Subject: [PATCH 140/143] Bottom Tab Bar Visibility Adjustment

Nucleic-Session: 747527BF-AEE9-4939-BE70-A14F1F3BBBA8
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Views/SessionsView.swift | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/NucleicRemote/NucleicRemote/Views/SessionsView.swift b/NucleicRemote/NucleicRemote/Views/SessionsView.swift
index 81ad3bb..529aa2a 100644
--- a/NucleicRemote/NucleicRemote/Views/SessionsView.swift
+++ b/NucleicRemote/NucleicRemote/Views/SessionsView.swift
@@ -114,22 +114,22 @@ struct SessionsView: View {
         }
     }
 
-    /// The circular plus button, styled to match the transcript's jump-to-bottom FAB: an accent
-    /// disc with a soft shadow, floated clear of the connection chip.
+    /// The circular plus button, on Liquid Glass rather than a solid teal disc — an accent-tinted
+    /// glyph over a translucent glass circle so it reads as a floating control, not a stamped
+    /// button. Sits low over the list, clear of the connection chip.
     private var newChatButton: some View {
         Button {
             showNewChat = true
         } label: {
             Image(systemName: "plus")
                 .font(.system(size: 22, weight: .semibold))
-                .foregroundStyle(.white)
+                .foregroundStyle(Palette.accent)
                 .frame(width: 56, height: 56)
-                .background(Palette.accent, in: .circle)
-                .shadow(color: .black.opacity(0.25), radius: 6, y: 2)
+                .glassCircle()
         }
         .buttonStyle(.plain)
         .padding(.trailing, 20)
-        .padding(.bottom, 20)
+        .padding(.bottom, 6)
         .accessibilityLabel("New chat")
     }
 

From 24211f60d324acd076190039987473809585a88e Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 16:23:50 -0700
Subject: [PATCH 141/143] Bottom Tab Bar Visibility Adjustment

Nucleic-Session: 747527BF-AEE9-4939-BE70-A14F1F3BBBA8
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Views/SessionsView.swift | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/NucleicRemote/NucleicRemote/Views/SessionsView.swift b/NucleicRemote/NucleicRemote/Views/SessionsView.swift
index 529aa2a..5597625 100644
--- a/NucleicRemote/NucleicRemote/Views/SessionsView.swift
+++ b/NucleicRemote/NucleicRemote/Views/SessionsView.swift
@@ -108,7 +108,10 @@ struct SessionsView: View {
                         }
                     }
                 }
-                .presentationDetents([.medium, .large])
+                // The composer needs only a fraction of the screen — a compact height by default,
+                // still expandable if the advanced options are opened.
+                .presentationDetents([.height(360), .large])
+                .presentationDragIndicator(.visible)
             }
             .safeAreaInset(edge: .bottom) { ConnectionChip().padding(.bottom, 8) }
         }

From b1ebd202e52c261991ac030d1e70aee5b41bcd86 Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 16:24:03 -0700
Subject: [PATCH 142/143] Bottom Tab Bar Visibility Adjustment

Nucleic-Session: 747527BF-AEE9-4939-BE70-A14F1F3BBBA8
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Views/Theme.swift | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/NucleicRemote/NucleicRemote/Views/Theme.swift b/NucleicRemote/NucleicRemote/Views/Theme.swift
index 1417988..c6bcce3 100644
--- a/NucleicRemote/NucleicRemote/Views/Theme.swift
+++ b/NucleicRemote/NucleicRemote/Views/Theme.swift
@@ -373,6 +373,9 @@ extension View {
     func glassSurface(cornerRadius: CGFloat = 24) -> some View {
         modifier(GlassSurface(cornerRadius: cornerRadius))
     }
+    /// Back a circular control (the floating New-chat FAB) with interactive Liquid Glass — the
+    /// round analogue of `glassSurface`, falling back to an ultra-thin material disc pre-iOS 26.
+    func glassCircle() -> some View { modifier(GlassCircle()) }
     /// Apply the teal accent app-wide.
     func nucleicTint() -> some View { tint(Palette.accent) }
     /// Give a text field a way to release the keyboard. Without this, iOS leaves a focused

From 98d302c41d809746d1112ca85b343c09e0a5eacd Mon Sep 17 00:00:00 2001
From: Andrew Blakeslee Moore <andrew@blakeslee.me>
Date: Sun, 5 Jul 2026 16:24:10 -0700
Subject: [PATCH 143/143] Bottom Tab Bar Visibility Adjustment

Nucleic-Session: 747527BF-AEE9-4939-BE70-A14F1F3BBBA8
Co-authored-by: Nucleic <nucleic@blakeslee.xyz>
---
 NucleicRemote/NucleicRemote/Views/Theme.swift | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/NucleicRemote/NucleicRemote/Views/Theme.swift b/NucleicRemote/NucleicRemote/Views/Theme.swift
index c6bcce3..d6a3285 100644
--- a/NucleicRemote/NucleicRemote/Views/Theme.swift
+++ b/NucleicRemote/NucleicRemote/Views/Theme.swift
@@ -354,6 +354,22 @@ struct GlassSurface: ViewModifier {
     }
 }
 
+/// A circular Liquid Glass backing for a floating round control (the New-chat FAB). Real
+/// interactive `glassEffect` on iOS 26; an ultra-thin material disc with a hairline edge and a
+/// soft shadow on earlier systems so it still lifts off the list.
+struct GlassCircle: ViewModifier {
+    func body(content: Content) -> some View {
+        if #available(iOS 26.0, *) {
+            content.glassEffect(.regular.interactive(), in: .circle)
+        } else {
+            content
+                .background(.ultraThinMaterial, in: .circle)
+                .overlay(Circle().strokeBorder(Color.primary.opacity(0.08), lineWidth: 1))
+                .shadow(color: .black.opacity(0.2), radius: 6, y: 2)
+        }
+    }
+}
+
 /// A lifted card surface with a hairline border — the mobile echo of `AppTheme.surface`.
 struct CardBackground: ViewModifier {
     var padding: CGFloat = 14