Release 1.10.0

Mirror "Maybe" (tentative RSVP) events instead of dropping them.

Previously, with "Mirror accepted events only" on, events you'd replied
tentative to were skipped entirely. They're now mirrored with a "Maybe: "
marker in the title (after the normal prefix) and written with tentative
availability so Calendar shows them hatched. The marker is applied for any
tentative RSVP regardless of the accepted-only setting; an accepted<->
tentative flip re-syncs the title. Not carried on the merge path
(mergeGapMin > 0), which already discards per-event titles.

Block gains a `tentative` flag (in ==/hash); accepted-only gate lets
.tentative through alongside .accepted.

All unit tests pass.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

AGENTS.md

@@ -4,9 +4,9 @@
 
 ## Project Overview
 
-**BusyMirror** is a macOS menu-bar utility that mirrors calendar events from a source calendar into one or more target calendars, creating busy-placeholder events so availability stays consistent across accounts and devices.
+**BusyMirror** is a macOS utility (standard app + menu bar extra) that mirrors calendar events from a source calendar into one or more target calendars, creating busy-placeholder events so availability stays consistent across accounts and devices.
 
-It is a single-platform macOS app written in **Swift 5** and **SwiftUI**, using **EventKit** to read and write calendar data. The app runs as a menu-bar-only app (`LSUIElement`) with no Dock icon.
+It is a single-platform macOS app written in **Swift 5** and **SwiftUI**, using **EventKit** to read and write calendar data. The app runs as a standard app (Dock icon, ⌘Q) and also has a `MenuBarExtra` for quick sync/status.
 
 Key capabilities:
 - Manual or route-driven multi-source mirroring
@@ -44,7 +44,7 @@ BusyMirror/
 ├── EventFilters.swift           # Work-hours, title, and organizer filters
 ├── MenuBarSupport.swift         # `BusyMirrorAppController` (state coordinator) + menu bar view
 ├── AppLogStore.swift            # File-backed log store with rotation (AppLogStore enum)
-├── Info.plist                   # LSUIElement, calendar usage descriptions
+├── Info.plist                   # calendar/reminders usage descriptions
 ├── BusyMirror.entitlements      # App sandbox + calendar access entitlement
 └── Assets.xcassets/             # AppIcon set and accent color
 
@@ -146,7 +146,7 @@ Scheduled runs are implemented by generating a `launchd` plist in `~/Library/Lau
 | `BusyMirror/BusyMirrorApp.swift` | App struct, window scene, menu-bar extra |
 | `BusyMirror/MenuBarSupport.swift` | `@MainActor` app controller + menu bar SwiftUI view |
 | `BusyMirror/AppLogStore.swift` | File-backed log with rotation (`~/Library/Logs/BusyMirror/`) |
-| `BusyMirror/Info.plist` | `LSUIElement`, calendar usage descriptions |
+| `BusyMirror/Info.plist` | calendar/reminders usage descriptions |
 | `BusyMirror/BusyMirror.entitlements` | Sandbox + calendar entitlement |
 | `Makefile` | Reproducible build, sign, and package targets |
 | `CHANGELOG.md` | Release notes (human-readable) |

BusyMirror.xcodeproj/project.pbxproj

@@ -410,7 +410,7 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 23;
+				CURRENT_PROJECT_VERSION = 31;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = BusyMirror/Info.plist;
@@ -421,7 +421,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-                MARKETING_VERSION = 1.7.0;
+                MARKETING_VERSION = 1.10.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.cqrenet.BusyMirror;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				REGISTER_APP_GROUPS = YES;
@@ -440,7 +440,7 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 23;
+				CURRENT_PROJECT_VERSION = 31;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = BusyMirror/Info.plist;
@@ -451,7 +451,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-                MARKETING_VERSION = 1.7.0;
+                MARKETING_VERSION = 1.10.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.cqrenet.BusyMirror;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				REGISTER_APP_GROUPS = YES;

BusyMirror/BlockMath.swift

@@ -8,6 +8,8 @@ struct Block: Hashable {
     let notes: String?        // source notes (for optional copy)
     let occurrence: Date?     // occurrenceDate for recurring instances
     let alarmOffsets: [TimeInterval]?  // relative alarm offsets copied from source event
+    var tentative: Bool = false        // source "Maybe" RSVP; mirrored with a marker
+    // ponytail: lost on the merge path (mergeGapMin > 0) along with the title; only tracked in per-event mode
 
     /// Convenience factory for time-only blocks (used internally for occupancy tracking).
     static func span(start: Date, end: Date) -> Block {
@@ -22,7 +24,8 @@ struct Block: Hashable {
         lhs.srcStableID == rhs.srcStableID &&
         lhs.label == rhs.label &&
         lhs.notes == rhs.notes &&
-        lhs.occurrence == rhs.occurrence
+        lhs.occurrence == rhs.occurrence &&
+        lhs.tentative == rhs.tentative
     }
 
     func hash(into hasher: inout Hasher) {
@@ -32,6 +35,7 @@ struct Block: Hashable {
         hasher.combine(label)
         hasher.combine(notes)
         hasher.combine(occurrence)
+        hasher.combine(tentative)
     }
 }
 

BusyMirror/BusyMirrorApp.swift

@@ -4,6 +4,12 @@ import SwiftUI
 struct BusyMirrorApp: App {
     @StateObject private var appController = BusyMirrorAppController()
 
+    private var menuBarIcon: String {
+        if appController.isSyncing { return "arrow.triangle.2.circlepath.circle.fill" }
+        if appController.lastRunFailed { return "exclamationmark.triangle.fill" }
+        return "calendar.badge.clock"
+    }
+
     var body: some Scene {
         Window("BusyMirror", id: BusyMirrorSceneID.mainWindow) {
             ContentView()
@@ -12,9 +18,19 @@ struct BusyMirrorApp: App {
         }
         .defaultSize(width: 1120, height: 760)
 
-        MenuBarExtra("BusyMirror", systemImage: appController.isSyncing ? "arrow.triangle.2.circlepath.circle.fill" : "calendar.badge.clock") {
+        MenuBarExtra("BusyMirror", systemImage: menuBarIcon) {
             BusyMirrorMenuBarView()
                 .environmentObject(appController)
         }
+
+        // A real Settings scene: now that the app is standard (not
+        // LSUIElement), this gets the conventional Cmd+, and a "Preferences…"
+        // item in the app's own menu for free — the location people actually
+        // look, unlike a plain Window which only opens from wherever we
+        // explicitly put a button for it.
+        Settings {
+            PreferencesView()
+                .environmentObject(appController)
+        }
     }
 }

BusyMirror/CalendarDisplay.swift

@@ -0,0 +1,21 @@
+import SwiftUI
+import EventKit
+
+// Small calendar display helpers shared by ContentView, RoutesSectionView,
+// and CalendarsSectionView.
+
+func calColor(_ cal: EKCalendar) -> Color {
+    #if os(macOS)
+    return Color(cal.cgColor ?? NSColor.systemGray.cgColor)
+    #else
+    return Color(cgColor: cal.cgColor ?? UIColor.systemGray.cgColor)
+    #endif
+}
+
+@ViewBuilder
+func calChip(_ cal: EKCalendar) -> some View {
+    HStack(spacing: 6) {
+        Circle().fill(calColor(cal)).frame(width: 10, height: 10)
+        Text(calLabel(cal))
+    }
+}

BusyMirror/CalendarsSectionView.swift

@@ -0,0 +1,84 @@
+import SwiftUI
+import EventKit
+
+/// The manual source/target calendar picker — extracted from ContentView.
+/// Bindings mutate ContentView's own @State directly.
+struct CalendarsSectionView: View {
+    let calendars: [EKCalendar]
+    @Binding var sourceIndex: Int
+    @Binding var targetSelections: Set<Int>
+    @Binding var targetIDs: Set<String>
+    let isRunning: Bool
+
+    var body: some View {
+        VStack(alignment: .leading, spacing: 12) {
+            Text("Source calendar")
+                .font(.subheadline.weight(.semibold))
+            Picker("Source", selection: $sourceIndex) {
+                ForEach(Array(calendars.indices), id: \.self) { i in
+                    Text("\(i + 1): \(calLabel(calendars[i]))").tag(i)
+                }
+            }
+            .pickerStyle(.menu)
+            .labelsHidden()
+            .frame(maxWidth: .infinity, alignment: .leading)
+            .disabled(isRunning || calendars.isEmpty)
+
+            Divider()
+
+            HStack {
+                Text("Target calendars")
+                    .font(.subheadline.weight(.semibold))
+                Spacer()
+                Text("\(targetIDs.count) selected")
+                    .font(.caption)
+                    .foregroundStyle(.secondary)
+            }
+
+            ScrollView {
+                LazyVStack(alignment: .leading, spacing: 8) {
+                    ForEach(Array(calendars.indices), id: \.self) { i in
+                        let isSource = (i == sourceIndex)
+                        let binding = Binding<Bool>(
+                            get: { !isSource && targetSelections.contains(i) },
+                            set: { newValue in
+                                // Never allow selecting the source as a target
+                                if isSource { return }
+                                if newValue {
+                                    targetSelections.insert(i)
+                                    targetIDs.insert(calendars[i].calendarIdentifier)
+                                } else {
+                                    targetSelections.remove(i)
+                                    targetIDs.remove(calendars[i].calendarIdentifier)
+                                }
+                            }
+                        )
+                        Toggle(isOn: binding) {
+                            HStack(spacing: 8) {
+                                Text("\(i + 1).")
+                                    .font(.caption.monospacedDigit())
+                                    .foregroundStyle(.secondary)
+                                calChip(calendars[i])
+                            }
+                            .padding(.vertical, 3)
+                        }
+                        .toggleStyle(.switch)
+                        .padding(.horizontal, 10)
+                        .padding(.vertical, 6)
+                        .background(
+                            RoundedRectangle(cornerRadius: 8, style: .continuous)
+                                .fill(Color(nsColor: .controlBackgroundColor))
+                        )
+                        .overlay(
+                            RoundedRectangle(cornerRadius: 8, style: .continuous)
+                                .stroke(Color.primary.opacity(0.18), lineWidth: 1)
+                        )
+                        .disabled(isRunning || isSource)
+                        .opacity(isSource ? 0.5 : 1)
+                    }
+                }
+            }
+            .frame(minHeight: 170, maxHeight: 260)
+        }
+    }
+}

BusyMirror/Info.plist

@@ -2,8 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>LSUIElement</key>
-	<true/>
 	<key>LSMinimumSystemVersion</key>
 	<string>15.5</string>
 	<key>NSCalendarsFullAccessUsageDescription</key>

BusyMirror/LogSectionView.swift

@@ -0,0 +1,107 @@
+import SwiftUI
+
+/// Activity log viewer — extracted from ContentView. Renders `logText`
+/// (plain newline-separated lines, no timestamps — those only exist in the
+/// persistent file log written by AppLogStore) as readable rows with a
+/// status icon per line instead of a raw monospaced dump, plus a search
+/// filter. "Clear" only empties this in-memory view; the file log on disk
+/// (Reveal Log File, in the toolbar's overflow menu) is untouched.
+struct LogSectionView: View {
+    @Binding var logText: String
+    @State private var searchText = ""
+
+    private enum LineKind {
+        case ok, error, warning, info
+
+        var symbol: String {
+            switch self {
+            case .ok: return "checkmark.circle.fill"
+            case .error: return "xmark.circle.fill"
+            case .warning: return "exclamationmark.triangle.fill"
+            case .info: return "circle.fill"
+            }
+        }
+        var color: Color {
+            switch self {
+            case .ok: return .green
+            case .error: return .red
+            case .warning: return .orange
+            case .info: return .secondary
+            }
+        }
+    }
+
+    private struct Line: Identifiable {
+        let id: Int
+        let text: String
+        let kind: LineKind
+    }
+
+    private var lines: [Line] {
+        logText.split(separator: "\n", omittingEmptySubsequences: false)
+            .enumerated()
+            .map { idx, raw in
+                let text = String(raw)
+                let kind: LineKind
+                if text.hasPrefix("✓") { kind = .ok }
+                else if text.hasPrefix("✗") { kind = .error }
+                else if text.contains("SKIP") || text.contains("WARN") { kind = .warning }
+                else { kind = .info }
+                return Line(id: idx, text: text, kind: kind)
+            }
+            .filter { !$0.text.isEmpty }
+            .filter { searchText.isEmpty || $0.text.localizedCaseInsensitiveContains(searchText) }
+    }
+
+    var body: some View {
+        VStack(alignment: .leading, spacing: 10) {
+            HStack(spacing: 10) {
+                Text("Activity Log")
+                    .font(.title2.weight(.bold))
+                Spacer()
+                HStack(spacing: 6) {
+                    Image(systemName: "magnifyingglass")
+                        .foregroundStyle(.secondary)
+                    TextField("Search log", text: $searchText)
+                        .textFieldStyle(.plain)
+                }
+                .font(.caption)
+                .padding(.horizontal, 8)
+                .padding(.vertical, 5)
+                .frame(width: 180)
+                .background(
+                    RoundedRectangle(cornerRadius: 7, style: .continuous)
+                        .fill(Color.primary.opacity(0.06))
+                )
+                Button("Clear") { logText = "" }
+                    .buttonStyle(.bordered)
+                    .disabled(logText.isEmpty)
+            }
+
+            ScrollView {
+                LazyVStack(alignment: .leading, spacing: 0) {
+                    ForEach(lines) { line in
+                        HStack(alignment: .top, spacing: 10) {
+                            Image(systemName: line.kind.symbol)
+                                .font(.system(size: 10))
+                                .foregroundStyle(line.kind.color)
+                                .padding(.top, 3)
+                            Text(line.text)
+                                .font(.system(.body, design: .monospaced))
+                                .textSelection(.enabled)
+                            Spacer(minLength: 0)
+                        }
+                        .padding(.vertical, 5)
+                        Divider().opacity(0.4)
+                    }
+                }
+            }
+            .frame(maxHeight: .infinity)
+            .overlay(
+                RoundedRectangle(cornerRadius: 10, style: .continuous)
+                    .stroke(Color.secondary.opacity(0.22))
+            )
+        }
+        .padding(20)
+    }
+}

BusyMirror/MenuBarSupport.swift

@@ -13,6 +13,36 @@ final class BusyMirrorAppController: ObservableObject {
     @Published private(set) var hasPendingSyncRequest = false
     @Published private(set) var syncRequestToken = UUID()
     @Published private(set) var isMainWindowVisible = false
+    @Published private(set) var lastRunFailed = false
+    @Published private(set) var autoSyncArmed = false
+
+    init() {
+        refreshLastRunStatus()
+    }
+
+    /// Re-reads the shared lastRun* UserDefaults keys. Call after any run —
+    /// interactive, CLI, or auto-sync — writes them, so the menu bar icon and
+    /// dropdown reflect the outcome regardless of which path produced it.
+    func refreshLastRunStatus() {
+        guard let atISO = UserDefaults.standard.string(forKey: "lastRunAtISO"), !atISO.isEmpty else {
+            lastRunFailed = false
+            return
+        }
+        lastRunFailed = (UserDefaults.standard.object(forKey: "lastRunOK") as? Bool) == false
+    }
+
+    /// Human-readable "last sync" line for the menu bar dropdown. Computed on
+    /// demand (not published) since the dropdown's content is rebuilt each
+    /// time it's opened.
+    var lastRunStatusText: String {
+        guard let atISO = UserDefaults.standard.string(forKey: "lastRunAtISO"), !atISO.isEmpty,
+              let date = ISO8601DateFormatter().date(from: atISO) else {
+            return "No sync yet."
+        }
+        let relative = RelativeDateTimeFormatter().localizedString(for: date, relativeTo: Date())
+        let ok = (UserDefaults.standard.object(forKey: "lastRunOK") as? Bool) != false
+        return ok ? "Last sync: \(relative)" : "Last sync failed: \(relative)"
+    }
 
     func requestSync() {
         hasPendingSyncRequest = true
@@ -51,7 +81,6 @@ final class BusyMirrorAppController: ObservableObject {
     private var wakeObserver: NSObjectProtocol?
     private var debounceTask: Task<Void, Never>?
     private var fallbackTask: Task<Void, Never>?
-    private var hasArmedAutoSync = false
 
     private let settingsDefaultsKey = "settings.v2"
     private let legacyRoutesDefaultsKey = "routes.v1"
@@ -83,9 +112,9 @@ final class BusyMirrorAppController: ObservableObject {
     /// (e.g. from ContentView whenever the saved routes list changes) — it
     /// only does anything the first time routes go from empty to non-empty.
     func armAutoSyncIfPossible() {
-        guard !hasArmedAutoSync else { return }
+        guard !autoSyncArmed else { return }
         guard !loadRoutesFromDefaults().isEmpty else { return }
-        hasArmedAutoSync = true
+        autoSyncArmed = true
 
         if SMAppService.mainApp.status != .enabled {
             try? SMAppService.mainApp.register()
@@ -214,12 +243,14 @@ final class BusyMirrorAppController: ObservableObject {
         UserDefaults.standard.set(ISO8601DateFormatter().string(from: Date()), forKey: "lastRunAtISO")
         UserDefaults.standard.set(errorCount == 0, forKey: "lastRunOK")
         UserDefaults.standard.set(summary, forKey: "lastRunSummary")
+        refreshLastRunStatus()
         setSyncing(false)
     }
 }
 
 struct BusyMirrorMenuBarView: View {
     @Environment(\.openWindow) private var openWindow
+    @Environment(\.openSettings) private var openSettings
     @EnvironmentObject private var appController: BusyMirrorAppController
 
     var body: some View {
@@ -227,30 +258,54 @@ struct BusyMirrorMenuBarView: View {
             Text("BusyMirror")
                 .font(.headline)
 
-            Text(appController.isSyncing ? "Sync in progress." : "Use your saved routes or current selection.")
-                .font(.subheadline)
+            HStack(spacing: 6) {
+                Circle()
+                    .fill(appController.isSyncing ? Color.orange : (appController.lastRunFailed ? Color.red : Color.green))
+                    .frame(width: 7, height: 7)
+                Text(appController.isSyncing ? "Sync in progress." : appController.lastRunStatusText)
+                    .font(.subheadline)
+                    .foregroundStyle(appController.lastRunFailed ? .red : .secondary)
+            }
+
+            Text(appController.autoSyncArmed ? "Auto-sync: watching for calendar changes." : "Auto-sync: not active (add a saved route to enable).")
+                .font(.caption)
                 .foregroundStyle(.secondary)
 
             Divider()
 
-            Button(appController.isSyncing ? "Syncing…" : "Sync Now") {
+            Button {
                 let shouldOpenWindow = !appController.isMainWindowVisible
                 appController.requestSync()
                 if shouldOpenWindow {
                     appController.openMainWindow(using: openWindow)
                 }
+            } label: {
+                Label(appController.isSyncing ? "Syncing…" : "Sync Now", systemImage: "arrow.triangle.2.circlepath")
             }
             .disabled(appController.isSyncing)
 
-            Button("Open BusyMirror") {
+            Button {
                 appController.openMainWindow(using: openWindow)
+            } label: {
+                Label("Open BusyMirror", systemImage: "macwindow")
             }
 
+            Button {
+                NSApp.activate(ignoringOtherApps: true)
+                openSettings()
+            } label: {
+                Label("Preferences…", systemImage: "gearshape")
+            }
+            .keyboardShortcut(",", modifiers: .command)
+
             Divider()
 
-            Button("Quit BusyMirror") {
+            Button {
                 NSApp.terminate(nil)
+            } label: {
+                Label("Quit BusyMirror", systemImage: "power")
             }
+            .keyboardShortcut("q", modifiers: .command)
         }
         .padding(12)
         .frame(width: 240, alignment: .leading)

BusyMirror/MirrorEngine.swift

@@ -145,10 +145,12 @@ final class MirrorEngine {
         var skippedStatus = 0
         for ev in srcEvents {
             if Task.isCancelled { break }
+            let myStatus = ev.attendees?.first(where: { $0.isCurrentUser })?.participantStatus
+            let isTentative = (myStatus == .tentative)
             if config.mirrorAcceptedOnly, ev.hasAttendees {
-                let attendees = ev.attendees ?? []
-                if let me = attendees.first(where: { $0.isCurrentUser }) {
-                    if me.participantStatus != .accepted {
+                if let me = ev.attendees?.first(where: { $0.isCurrentUser }) {
+                    // "Maybe" replies still get mirrored, just marked (see displayTitle below)
+                    if me.participantStatus != .accepted && me.participantStatus != .tentative {
                         skippedStatus += 1
                         continue
                     }
@@ -178,7 +180,7 @@ final class MirrorEngine {
             guard let s = ev.startDate, let e = ev.endDate, e > s else { continue }
             guard ev.calendar.calendarIdentifier == srcCal.calendarIdentifier else { continue }
             let srcID = stableSourceIdentifier(for: ev)
-            srcBlocks.append(Block(start: s, end: e, srcStableID: srcID, label: ev.title, notes: ev.notes, occurrence: ev.occurrenceDate, alarmOffsets: alarmOffsets(for: ev)))
+            srcBlocks.append(Block(start: s, end: e, srcStableID: srcID, label: ev.title, notes: ev.notes, occurrence: ev.occurrenceDate, alarmOffsets: alarmOffsets(for: ev), tentative: isTentative))
         }
         if skippedMirrors > 0 {
             log("- SKIP mirrored-on-source: \(skippedMirrors) instance(s)")
@@ -379,7 +381,8 @@ final class MirrorEngine {
                 let baseSourceTitle = stripPrefix(blk.label, prefix: config.titlePrefix)
                 let effectiveTitle = config.hideDetails ? config.placeholderTitle : (baseSourceTitle.isEmpty ? config.placeholderTitle : baseSourceTitle)
                 let titleSuffix = config.hideDetails ? "" : (baseSourceTitle.isEmpty ? "" : " — \(baseSourceTitle)")
-                let displayTitle = (config.titlePrefix.isEmpty ? "" : config.titlePrefix) + effectiveTitle
+                let maybeMark = blk.tentative ? "Maybe: " : ""
+                let displayTitle = (config.titlePrefix.isEmpty ? "" : config.titlePrefix) + maybeMark + effectiveTitle
                 let notes = desiredNotes(for: blk)
                 let desiredURL = buildMirrorURL(
                     targetCalID: tgt.calendarIdentifier,
@@ -409,6 +412,7 @@ final class MirrorEngine {
                         return
                     }
                     existing.title = displayTitle
+                    existing.availability = blk.tentative ? .tentative : .busy
                     existing.startDate = blk.start
                     existing.endDate = blk.end
                     existing.isAllDay = false
@@ -467,7 +471,7 @@ final class MirrorEngine {
                 newEv.notes = notes
                 newEv.url = desiredURL
                 newEv.alarms = desiredAlarms(for: blk)
-                newEv.availability = .busy
+                newEv.availability = blk.tentative ? .tentative : .busy
                 do {
                     try store.save(newEv, span: .thisEvent, commit: true)
                     created += 1

BusyMirror/PreferencesView.swift

@@ -0,0 +1,165 @@
+import SwiftUI
+
+/// Real macOS Settings (⌘,) window. Holds only the pure, globally-persisted
+/// defaults (all @AppStorage, shared automatically with ContentView's copies
+/// of the same keys) — anything tied to live session state (routes, the
+/// dry-run toggle, calendar access) stays in the main window since it has no
+/// meaning outside that window's lifecycle.
+struct PreferencesView: View {
+    @EnvironmentObject private var appController: BusyMirrorAppController
+
+    @AppStorage("daysForward") private var daysForward: Int = 7
+    @AppStorage("daysBack") private var daysBack: Int = 1
+    @AppStorage("mergeGapHours") private var mergeGapHours: Int = 0
+
+    @AppStorage("hideDetails") private var hideDetails: Bool = true
+    @AppStorage("copyDescription") private var copyDescription: Bool = false
+    @AppStorage("syncReminders") private var syncReminders: Bool = false
+    @AppStorage("mirrorAllDay") private var mirrorAllDay: Bool = false
+    @AppStorage("overlapMode") private var overlapModeRaw: String = OverlapMode.allow.rawValue
+    @AppStorage("filterByWorkHours") private var filterByWorkHours: Bool = false
+    @AppStorage("workHoursStart") private var workHoursStart: Int = 9
+    @AppStorage("workHoursEnd") private var workHoursEnd: Int = 17
+    @AppStorage("mirrorAcceptedOnly") private var mirrorAcceptedOnly: Bool = false
+    @AppStorage("excludedTitleFilters") private var excludedTitleFiltersRaw: String = ""
+    @AppStorage("excludedOrganizerFilters") private var excludedOrganizerFiltersRaw: String = ""
+    @AppStorage("titlePrefix") private var titlePrefix: String = "🪞 "
+    @AppStorage("placeholderTitle") private var placeholderTitle: String = "Busy"
+    @AppStorage("autoDeleteMissing") private var autoDeleteMissing: Bool = true
+
+    private static let intFormatter: NumberFormatter = {
+        let f = NumberFormatter()
+        f.minimum = 0
+        f.maximumFractionDigits = 0
+        return f
+    }()
+
+    private static let hourFormatter: NumberFormatter = {
+        let f = NumberFormatter()
+        f.minimum = 0
+        f.maximum = 24
+        f.maximumFractionDigits = 0
+        return f
+    }()
+
+    private var disabled: Bool { appController.isSyncing }
+
+    private func clampWorkHours() {
+        let clampedStart = min(max(workHoursStart, 0), 23)
+        if clampedStart != workHoursStart { workHoursStart = clampedStart }
+        let clampedEnd = min(max(workHoursEnd, 1), 24)
+        if clampedEnd != workHoursEnd { workHoursEnd = clampedEnd }
+        if workHoursEnd <= workHoursStart {
+            let adjustedEnd = min(workHoursStart + 1, 24)
+            if workHoursEnd != adjustedEnd { workHoursEnd = adjustedEnd }
+        }
+    }
+
+    var body: some View {
+        Form {
+            Section("Default time window") {
+                HStack {
+                    Text("Days back")
+                    TextField("1", value: $daysBack, formatter: Self.intFormatter)
+                        .frame(width: 64)
+                }
+                .disabled(disabled)
+                HStack {
+                    Text("Days forward")
+                    TextField("7", value: $daysForward, formatter: Self.intFormatter)
+                        .frame(width: 64)
+                }
+                .disabled(disabled)
+                HStack {
+                    Text("Default merge gap (hours)")
+                    TextField("0", value: $mergeGapHours, formatter: Self.intFormatter)
+                        .frame(width: 64)
+                }
+                .disabled(disabled)
+            }
+            .onChange(of: daysBack) { v in daysBack = max(0, v) }
+            .onChange(of: daysForward) { v in daysForward = max(0, v) }
+            .onChange(of: mergeGapHours) { v in mergeGapHours = max(0, v) }
+
+            Section("Mirroring defaults") {
+                Toggle("Hide details (use \"Busy\" title)", isOn: $hideDetails)
+                Toggle("Copy description when mirroring", isOn: $copyDescription)
+                    .disabled(hideDetails)
+                Toggle("Sync reminders when mirroring", isOn: $syncReminders)
+                Toggle("Mirror all-day events", isOn: $mirrorAllDay)
+                Toggle("Mirror accepted events only", isOn: $mirrorAcceptedOnly)
+                Toggle("Auto-delete mirrors if source is removed", isOn: $autoDeleteMissing)
+
+                Picker("Overlap mode", selection: $overlapModeRaw) {
+                    ForEach(OverlapMode.allCases) { mode in
+                        Text(mode.rawValue).tag(mode.rawValue)
+                    }
+                }
+            }
+            .disabled(disabled)
+
+            Section("Placeholder title") {
+                HStack {
+                    Text("Title prefix")
+                    TextField("🪞 ", text: $titlePrefix)
+                        .frame(width: 90)
+                }
+                HStack {
+                    Text("Placeholder title")
+                    TextField("Busy", text: $placeholderTitle)
+                        .frame(width: 170)
+                }
+            }
+            .disabled(disabled)
+
+            Section("Work hours") {
+                Toggle("Limit mirroring to work hours", isOn: $filterByWorkHours)
+                if filterByWorkHours {
+                    HStack {
+                        Text("Start hour")
+                        TextField("9", value: $workHoursStart, formatter: Self.hourFormatter)
+                            .frame(width: 56)
+                        Text("End hour")
+                        TextField("17", value: $workHoursEnd, formatter: Self.hourFormatter)
+                            .frame(width: 56)
+                        Text("(local time, end exclusive)").foregroundStyle(.secondary)
+                    }
+                    .onChange(of: workHoursStart) { _ in clampWorkHours() }
+                    .onChange(of: workHoursEnd) { _ in clampWorkHours() }
+                }
+            }
+            .disabled(disabled)
+
+            Section("Skip filters") {
+                VStack(alignment: .leading, spacing: 6) {
+                    Text("Skip source titles (one per line)")
+                        .font(.subheadline.weight(.semibold))
+                    TextEditor(text: $excludedTitleFiltersRaw)
+                        .font(.body)
+                        .frame(minHeight: 70)
+                        .overlay(
+                            RoundedRectangle(cornerRadius: 8, style: .continuous)
+                                .stroke(Color.secondary.opacity(0.22))
+                        )
+                }
+                VStack(alignment: .leading, spacing: 6) {
+                    Text("Skip organizers (name or email, one per line)")
+                        .font(.subheadline.weight(.semibold))
+                    TextEditor(text: $excludedOrganizerFiltersRaw)
+                        .font(.body)
+                        .frame(minHeight: 70)
+                        .overlay(
+                            RoundedRectangle(cornerRadius: 8, style: .continuous)
+                                .stroke(Color.secondary.opacity(0.22))
+                        )
+                }
+                Text("Matches are case-insensitive and apply before mirroring.")
+                    .foregroundStyle(.secondary)
+                    .font(.footnote)
+            }
+            .disabled(disabled)
+        }
+        .formStyle(.grouped)
+        .frame(width: 480, height: 560)
+    }
+}

BusyMirror/RoutesSectionView.swift

@@ -0,0 +1,200 @@
+import SwiftUI
+import EventKit
+
+/// The "Routes (multi-source)" panel — extracted from ContentView so the
+/// route list/editor is its own small, native-feeling view instead of one
+/// piece of a 2000-line file. Owns no persisted state itself: `routes` is a
+/// binding into ContentView's own @State (which still owns saving it to
+/// UserDefaults), and everything else here is read-only context passed down.
+struct RoutesSectionView: View {
+    @Binding var routes: [Route]
+    let calendars: [EKCalendar]
+    let isRunning: Bool
+    let titlePrefix: String
+    let placeholderTitle: String
+    let canAddRoute: Bool
+    let onAddRoute: () -> Void
+
+    @State private var expandedRouteID: UUID?
+
+    private static let intFormatter: NumberFormatter = {
+        let f = NumberFormatter()
+        f.minimum = 0
+        f.maximumFractionDigits = 0
+        return f
+    }()
+
+    private func labelForCalendar(id: String) -> String {
+        calendars.first(where: { $0.calendarIdentifier == id }).map(calLabel) ?? id
+    }
+
+    var body: some View {
+        VStack(alignment: .leading, spacing: 12) {
+            HStack {
+                Text("Routes (multi-source)")
+                    .font(.headline)
+                Spacer()
+                Button("Add from current selection", action: onAddRoute)
+                    .disabled(isRunning || !canAddRoute)
+                    .buttonStyle(.borderedProminent)
+                Button("Clear") { routes.removeAll() }
+                    .disabled(isRunning || routes.isEmpty)
+                    .buttonStyle(.bordered)
+            }
+            if routes.isEmpty {
+                Text("No routes yet. Pick a Source and Targets above, then click ‘Add from current selection’.")
+                    .foregroundStyle(.secondary)
+                    .padding(.vertical, 8)
+            } else {
+                LazyVStack(spacing: 10) {
+                    ForEach($routes, id: \.id) { routeBinding in
+                        routeCard(for: routeBinding)
+                    }
+                }
+            }
+        }
+    }
+
+    @ViewBuilder
+    private func routeCard(for routeBinding: Binding<Route>) -> some View {
+        let route = routeBinding.wrappedValue
+        let isExpanded = expandedRouteID == route.id
+        VStack(alignment: .leading, spacing: 10) {
+            Button {
+                expandedRouteID = isExpanded ? nil : route.id
+            } label: {
+                HStack(alignment: .top, spacing: 10) {
+                    Image(systemName: "chevron.right")
+                        .font(.caption.weight(.semibold))
+                        .foregroundStyle(.secondary)
+                        .rotationEffect(.degrees(isExpanded ? 90 : 0))
+                        .frame(width: 12)
+                        .padding(.top, 3)
+                    VStack(alignment: .leading, spacing: 8) {
+                        sourceSummaryView(for: route)
+                        targetSummaryView(for: route)
+                    }
+                    Spacer(minLength: 12)
+                }
+                .contentShape(Rectangle())
+            }
+            .buttonStyle(.plain)
+
+            if isExpanded {
+                Divider()
+
+                Toggle("Private", isOn: routeBinding.privacy)
+                    .help("If ON, mirror as ‘\(titlePrefix)\(placeholderTitle)’ with no notes. If OFF, mirror source title (and optionally notes).")
+                Toggle("Copy description", isOn: routeBinding.copyNotes)
+                    .disabled(isRunning || route.privacy)
+                    .help("If ON and Private is OFF, copy the source event’s notes/description into the placeholder.")
+                Toggle("Sync reminders", isOn: routeBinding.syncReminders)
+                    .disabled(isRunning)
+                    .help("If ON, copy the source event’s reminders/alarms into the placeholder.")
+                Toggle("Mirror all-day events for this route", isOn: routeBinding.allDay)
+                    .disabled(isRunning)
+                    .help("Mirror all-day events for this source.")
+
+                HStack(spacing: 16) {
+                    mergeGapField(for: routeBinding)
+                    overlapPicker(for: routeBinding)
+                    Spacer(minLength: 0)
+                    Button(role: .destructive) {
+                        routes.removeAll { $0.id == route.id }
+                    } label: { Text("Remove Route") }
+                }
+            }
+        }
+        .padding(12)
+        .background(
+            RoundedRectangle(cornerRadius: 12, style: .continuous)
+                .fill(Color(nsColor: .controlBackgroundColor))
+        )
+        .overlay(
+            RoundedRectangle(cornerRadius: 12, style: .continuous)
+                .stroke(Color.primary.opacity(0.25), lineWidth: 1.1)
+        )
+    }
+
+    @ViewBuilder
+    private func sourceSummaryView(for route: Route) -> some View {
+        VStack(alignment: .leading, spacing: 3) {
+            Text("Source")
+                .font(.caption)
+                .foregroundStyle(.secondary)
+            if let sCal = calendars.first(where: { $0.calendarIdentifier == route.sourceID }) {
+                HStack(spacing: 6) {
+                    Circle().fill(calColor(sCal)).frame(width: 10, height: 10)
+                    Text(calLabel(sCal))
+                        .fontWeight(.semibold)
+                }
+            } else {
+                Text(labelForCalendar(id: route.sourceID))
+                    .fontWeight(.semibold)
+            }
+        }
+    }
+
+    @ViewBuilder
+    private func targetSummaryView(for route: Route) -> some View {
+        VStack(alignment: .leading, spacing: 6) {
+            Text("Targets")
+                .font(.caption)
+                .foregroundStyle(.secondary)
+            ScrollView(.horizontal, showsIndicators: false) {
+                HStack(spacing: 8) {
+                    ForEach(route.targetIDs.sorted(by: <), id: \.self) { tid in
+                        if let tCal = calendars.first(where: { $0.calendarIdentifier == tid }) {
+                            HStack(spacing: 6) {
+                                Circle().fill(calColor(tCal)).frame(width: 9, height: 9)
+                                Text(calLabel(tCal))
+                            }
+                            .padding(.horizontal, 10)
+                            .padding(.vertical, 5)
+                            .background(
+                                RoundedRectangle(cornerRadius: 999, style: .continuous)
+                                    .fill(Color.primary.opacity(0.1))
+                            )
+                        } else {
+                            Text(labelForCalendar(id: tid))
+                                .padding(.horizontal, 10)
+                                .padding(.vertical, 5)
+                                .background(
+                                    RoundedRectangle(cornerRadius: 999, style: .continuous)
+                                        .fill(Color.primary.opacity(0.1))
+                                )
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    @ViewBuilder
+    private func mergeGapField(for routeBinding: Binding<Route>) -> some View {
+        HStack(spacing: 8) {
+            Text("Merge gap")
+            TextField("0", value: routeBinding.mergeGapHours, formatter: Self.intFormatter)
+                .frame(width: 56)
+                .disabled(isRunning)
+                .help("Merge adjacent source events separated by ≤ this many hours (e.g., flight legs). 0 = no merge.")
+            Text("h").foregroundStyle(.secondary)
+        }
+        .font(.subheadline)
+    }
+
+    @ViewBuilder
+    private func overlapPicker(for routeBinding: Binding<Route>) -> some View {
+        HStack(spacing: 8) {
+            Text("Overlap")
+            Picker("Overlap", selection: routeBinding.overlap) {
+                ForEach(OverlapMode.allCases) { mode in
+                    Text(mode.rawValue).tag(mode)
+                }
+            }
+            .frame(width: 170)
+            .help("allow = always place; skipCovered = skip if target already has a block covering the time; fillGaps = only fill uncovered gaps within the source block.")
+        }
+        .font(.subheadline)
+    }
+}

BusyMirror/ScheduleSectionView.swift

@@ -0,0 +1,102 @@
+import SwiftUI
+
+/// Manual/fixed-time `launchd` scheduling — extracted from ContentView. Since
+/// 1.7.0 this is a fallback/override; the primary reliability mechanism is
+/// the event-driven auto-sync in `BusyMirrorAppController`, which arms itself
+/// automatically once routes exist and needs no UI.
+struct ScheduleSectionView: View {
+    @Binding var scheduleMode: ScheduleMode
+    @Binding var scheduleIntervalHours: Int
+    @Binding var scheduleHour: Int
+    @Binding var scheduleMinute: Int
+    let isRunning: Bool
+    let routesEmpty: Bool
+    let hasInstalledSchedule: Bool
+    let scheduleSummary: String
+    let onInstall: () -> Void
+    let onRemove: () -> Void
+    let onRevealLaunchAgent: () -> Void
+    let onScheduleTimeChanged: () -> Void
+
+    private static let intFormatter: NumberFormatter = {
+        let f = NumberFormatter()
+        f.minimum = 0
+        f.maximumFractionDigits = 0
+        return f
+    }()
+
+    private static let hourFormatter: NumberFormatter = {
+        let f = NumberFormatter()
+        f.minimum = 0
+        f.maximum = 24
+        f.maximumFractionDigits = 0
+        return f
+    }()
+
+    private static let smallIntFormatter: NumberFormatter = {
+        let f = NumberFormatter()
+        f.minimum = 1
+        f.maximumFractionDigits = 0
+        return f
+    }()
+
+    var body: some View {
+        VStack(alignment: .leading, spacing: 8) {
+            Text("Scheduled runs (manual override)")
+                .font(.subheadline.weight(.semibold))
+            HStack(spacing: 8) {
+                Picker("Mode", selection: $scheduleMode) {
+                    ForEach(ScheduleMode.allCases) { mode in
+                        Text(mode.title).tag(mode)
+                    }
+                }
+                .pickerStyle(.segmented)
+                .disabled(isRunning)
+                Spacer(minLength: 0)
+            }
+            if scheduleMode == .hourly {
+                HStack(spacing: 8) {
+                    Text("Every")
+                    TextField("1", value: $scheduleIntervalHours, formatter: Self.smallIntFormatter)
+                        .textFieldStyle(.roundedBorder)
+                        .frame(width: 56)
+                        .disabled(isRunning)
+                    Text(scheduleIntervalHours == 1 ? "hour" : "hours")
+                    Spacer(minLength: 0)
+                }
+            } else {
+                HStack(spacing: 8) {
+                    Text("Time")
+                    TextField("8", value: $scheduleHour, formatter: Self.hourFormatter)
+                        .textFieldStyle(.roundedBorder)
+                        .frame(width: 56)
+                        .disabled(isRunning)
+                    Text(":")
+                    TextField("0", value: $scheduleMinute, formatter: Self.intFormatter)
+                        .textFieldStyle(.roundedBorder)
+                        .frame(width: 56)
+                        .disabled(isRunning)
+                    Spacer(minLength: 0)
+                }
+            }
+            Text("Creates a LaunchAgent that runs the installed app with saved routes in write mode.")
+                .foregroundStyle(.secondary)
+                .font(.footnote)
+            Text(hasInstalledSchedule ? "Installed: \(scheduleSummary)" : "Not installed")
+                .font(.footnote)
+                .foregroundStyle(.secondary)
+            HStack(spacing: 10) {
+                Button("Install Schedule", action: onInstall)
+                    .disabled(isRunning || routesEmpty)
+                Button("Remove Schedule", action: onRemove)
+                    .disabled(isRunning || !hasInstalledSchedule)
+                Button("Reveal LaunchAgent", action: onRevealLaunchAgent)
+                    .disabled(!hasInstalledSchedule)
+                Spacer(minLength: 0)
+            }
+        }
+        .onChange(of: scheduleHour) { _ in onScheduleTimeChanged() }
+        .onChange(of: scheduleMinute) { _ in onScheduleTimeChanged() }
+        .onChange(of: scheduleIntervalHours) { _ in onScheduleTimeChanged() }
+    }
+}

BusyMirrorTests/BlockMathTests.swift

@@ -165,6 +165,14 @@ final class BlockMathTests: XCTestCase {
         XCTAssertEqual(result.count, 2)
     }
 
+    func testTentativeAffectsEqualityAndHash() {
+        let base = Block(start: d, end: d.addingTimeInterval(600), srcStableID: "a", label: "x", notes: nil, occurrence: d, alarmOffsets: nil)
+        var maybe = base
+        maybe.tentative = true
+        XCTAssertNotEqual(base, maybe)
+        XCTAssertNotEqual(base.hashValue, maybe.hashValue)
+    }
+
     func testUniqueBlocksByIDDifferentOccurrence() {
         let b1 = Block(start: d, end: d.addingTimeInterval(600), srcStableID: "a", label: nil, notes: nil, occurrence: d, alarmOffsets: nil)
         let b2 = Block(start: d, end: d.addingTimeInterval(600), srcStableID: "a", label: nil, notes: nil, occurrence: d.addingTimeInterval(3600), alarmOffsets: nil)

CHANGELOG.md

@@ -2,6 +2,63 @@
 
 All notable changes to BusyMirror will be documented in this file.
 
+## [1.10.0] - 2026-08-31
+
+### Added
+- **"Maybe" events are now mirrored.** Previously, when "Mirror accepted events only" was on, events you'd RSVP'd tentative to were dropped entirely. They're now mirrored with a `Maybe: ` marker in the title (after the normal prefix, e.g. `🪞 Maybe: Standup`) and written with tentative availability so Calendar shows them hatched. Applies regardless of the accepted-only setting — any tentative RSVP gets the marker. A flip between accepted and tentative re-syncs the title. Not carried on the merge path (`mergeGapMin > 0`), which already discards per-event titles. ([MirrorEngine.swift](BusyMirror/MirrorEngine.swift), [BlockMath.swift](BusyMirror/BlockMath.swift))
+
+## [1.9.2] - 2026-08-27
+
+### Fixed
+- **"Sync Now" toolbar button showed only its icon**, no text — confirmed via screenshot: the Dry Run/Write toggle and toolbar layout were actually fine (1.9.1's fix worked, sidebar clicks too), but the circular-arrows icon next to it was unlabeled, easy to miss as "Sync Now" entirely. Forced `.labelStyle(.titleAndIcon)` so the text always shows regardless of toolbar width. ([ContentView.swift](BusyMirror/ContentView.swift))
+
+## [1.9.1] - 2026-08-27
+
+### Fixed
+- **Sidebar not clickable.** `sidebarView` used `List(SidebarSection.allCases, selection:)` (the data-driven initializer), which ties selection to `Identifiable`'s `id` — a `String` for `SidebarSection` — while the binding was typed `SidebarSection?`. Rebuilt with the standard `List(selection:) { ForEach(...) { ... .tag(section) } }` pattern, which binds selection directly to the (`Hashable`) section value with no ambiguity. Also added `.listStyle(.sidebar)`, the standard modifier for a `NavigationSplitView` sidebar (vibrancy, selection color) that was missing.
+- **"Write to calendars" hard to find.** It was still there as the Dry Run/Write segmented control in the toolbar, but likely lost to toolbar overflow alongside a status readout, Sync Now, and the overflow menu all crammed into one `ToolbarItemGroup`. Moved the calendar-count/status text out of the toolbar entirely into `.navigationSubtitle` (always visible, native, never subject to overflow), leaving the toolbar to just Dry Run/Write, Sync Now/Cancel, and the overflow menu.
+
+Not independently confirmed by clicking through the UI (no GUI automation available in this environment) — the `List(selection:)` fix follows SwiftUI's standard, unambiguous sidebar-selection pattern.
+
+## [1.9.0] - 2026-08-27
+
+### Added
+- **Sidebar navigation redesign.** Main window is now a `NavigationSplitView`: a sidebar (Routes / Schedule / Activity Log, with a route-count badge) replaces the old 2×2 grid of panel cards. Primary actions (Dry Run/Write, sync status, Sync Now) moved to the window toolbar; Export/Import/Reveal Log/Cleanup Placeholders/Refresh Calendars/Recheck Permission moved into a toolbar overflow menu.
+- **Routes** are now a real collapsed-by-default list — click a row to expand its editor (Private, Copy description, Sync reminders, Mirror all-day, merge gap, overlap, Remove) instead of every route always showing every field. The manual source/target picker lives in a collapsible "Manual Selection" section above the list.
+- **Schedule** view leads with live auto-sync status (armed/watching, last sync) instead of a bare `launchd` form; the manual fixed-time schedule is still there, demoted to an explicitly optional section underneath — matches what it actually became once 1.7.0 shipped event-driven sync.
+- **Activity Log** is now readable rows (status icon + text) instead of a monospaced text dump, with a search filter and a Clear button for the in-app view (the persistent file log on disk is untouched).
+- Menu bar dropdown got icons on every item and real ⌘,/⌘Q keyboard shortcuts on Preferences/Quit.
+- Design explored first as a mockup (light+dark) before any SwiftUI changes; direction confirmed before implementing.
+
+### Fixed
+- **Routes silently dropped on most launches, masked by a legacy fallback.** `reloadCalendars()` pruned routes referencing calendars not in the current EventKit fetch — but the fetch immediately following a permission grant (a freshly-created `EKEventStore`) can under-report calendars for a moment, especially remote accounts (Exchange/CalDAV), before they finish loading. Every affected launch wrongly deleted real routes, and only kept working because of a legacy `routes.v1` backup key kept rescuing them — a backup that itself was frozen at whatever it held the first time it was ever written, since nothing updated it afterward. Any real route edit made in a session that hit this bug would have been silently lost on the next launch. Fixed by skipping the prune specifically on the post-permission-grant reload (`reloadCalendars(pruneRoutes: false)`) — the EKEventStoreChanged-triggered reload and an explicit "Refresh Calendars" click, both against an already-warm store, still prune as before — and by keeping the `routes.v1` backup itself current on every save instead of frozen. Confirmed via `--status`/reading the UserDefaults plist directly on a real install: routes stopped disappearing across repeated launches. ([ContentView.swift](BusyMirror/ContentView.swift))
+
+## [1.8.3] - 2026-08-27
+
+### Fixed
+- **Preferences missing from the standard app menu.** 1.8.1's fix for Preferences (a plain `Window` opened via `openWindow`) worked around `LSUIElement` having no app menu, but 1.8.2 removed `LSUIElement` and the workaround was never swapped back — so there was still no "Preferences…" in the app's own menu or Cmd+, response, only a button buried in the main window and a menu-bar-dropdown item. Restored a real `Settings { }` scene now that the app menu exists to host it; both the menu bar dropdown and the main window's button now call the standard `openSettings()` action (via `SettingsLink` in the main window) instead of a custom `openWindow(id:)`. ([BusyMirrorApp.swift](BusyMirror/BusyMirrorApp.swift), [MenuBarSupport.swift](BusyMirror/MenuBarSupport.swift), [ContentView.swift](BusyMirror/ContentView.swift))
+
+## [1.8.2] - 2026-08-27
+
+### Changed
+- **Standard app instead of menu-bar-only.** Removed `LSUIElement` from `Info.plist`: BusyMirror now shows a Dock icon, appears in Cmd+Tab, and gets the standard app menu (Cmd+Q to quit, among others). The menu bar extra stays as a secondary quick-access point. This also fixes the practical problem it was causing: with no Dock icon and no accessible app menu, there was no reliable way to quit the app to let an update replace the bundle — you had to know the menu bar dropdown's "Quit BusyMirror" existed and use exactly that. Verified via `lsappinfo` (`type="Foreground"`, previously `UIElement`) since this app type change isn't something a screenshot would catch either.
+
+## [1.8.1] - 2026-08-26
+
+### Fixed
+- **Preferences window unreachable**: 1.8.0's Settings scene (⌘,) and its `SettingsLink` button didn't work because BusyMirror is an `LSUIElement` (accessory) app — those don't get the standard app menu, so there's no menu for the automatic "Settings…" command or Cmd+, to live in. Replaced the `Settings { }` scene with a plain `Window(id: "preferences-window")`, opened via `openWindow(id:)` — the same mechanism that already reliably opens the main window from the menu bar. Also added a "Preferences…" item to the menu bar dropdown itself, so there are two direct routes in instead of one that depended on OS menu plumbing this app type doesn't get. ([BusyMirrorApp.swift](BusyMirror/BusyMirrorApp.swift), [MenuBarSupport.swift](BusyMirror/MenuBarSupport.swift), [ContentView.swift](BusyMirror/ContentView.swift))
+
+## [1.8.0] - 2026-08-26
+
+### Added
+- **Real Settings (⌘,) window**: `PreferencesView` now hosts the pure-defaults controls (time window, privacy/mirroring defaults, title prefix/placeholder, work hours, skip filters) that used to live in the main window's "General Settings" panel. They're `@AppStorage`-backed so both windows always see the same live values. Main window keeps everything with session/live state: routes, calendar picker, dry-run toggle, Export/Import, manual scheduling, cleanup.
+- **Menu bar icon reflects state**: idle (`calendar.badge.clock`), syncing (`arrow.triangle.2.circlepath.circle.fill`), or last run failed (`exclamationmark.triangle.fill`).
+- **Menu bar dropdown diagnostics**: last-sync time and result, and whether auto-sync is currently armed — sourced from the same `lastRunAtISO`/`lastRunOK`/`lastRunSummary` keys `--status` reads, so CLI/interactive/auto-sync runs all feed the same indicator.
+- **`ContentView.swift` split** from ~2000 lines into `CalendarsSectionView`, `RoutesSectionView`, `ScheduleSectionView`, `LogSectionView` (plus a small shared `CalendarDisplay.swift`). View-layer extraction — state ownership and settings persistence were deliberately left untouched, since that's exactly the area the 1.6.0/1.6.1 release had to fix a real data-loss bug in.
+
+### Fixed
+- **Latent revert-on-relaunch bug**, caught while building the Settings window: moving the `@AppStorage`-backed preference controls out of `ContentView` meant changing them no longer re-triggered `saveSettingsToDefaults()`, so the `settings.v2` snapshot blob could go stale relative to the individual UserDefaults keys. Since `loadSettingsFromDefaults()` used the same full `applySnapshot` as Import, the next launch would silently revert a preference you'd just changed in Preferences back to whatever the stale blob had. Fixed by splitting launch-time restore into a narrow `restoreLaunchState` (routes + manual selection only — the only state that isn't already self-restoring via `@AppStorage`) separate from `applySnapshot` (unchanged, still used by Import where overwriting everything is the point). ([ContentView.swift](BusyMirror/ContentView.swift))
+
 ## [1.7.0] - 2026-08-26
 
 ### Added

README.md

@@ -2,7 +2,7 @@
 
 BusyMirror mirrors meetings between your calendars so your availability stays consistent across accounts/devices.
 
-On macOS, BusyMirror now runs as a menu bar app. Use the menu bar icon to sync manually or open the main window; it no longer appears in the Dock.
+On macOS, BusyMirror runs as a standard app (Dock icon, ⌘Q to quit) and also has a menu bar icon for quick sync/status without opening the main window.
 
 ## What it does (current)
 - Route-driven mirroring (multi-source): define Source → Targets routes and run them in one go.
@@ -13,7 +13,7 @@ On macOS, BusyMirror now runs as a menu bar app. Use the menu bar icon to sync m
 - DRY-RUN mode: see what would be created/updated/deleted without writing.
 - Activity Log in the app plus persistent file logging on disk.
 - In-app scheduling: install or remove a `launchd` LaunchAgent from the `Scheduled runs` section.
-- Menu bar controls: trigger `Sync Now`, open the main window, or quit without keeping a Dock icon around.
+- Menu bar controls: trigger `Sync Now`, open the main window, open Preferences, or quit.
 - Overlap modes: `allow`, `skipCovered`, `fillGaps`.
 - Merge adjacent events with a configurable gap.
 - Time window controls (days back/forward) and Work Hours filter.

ROADMAP.md

@@ -14,16 +14,15 @@
 - 1.4.0: unit-test suite (45 tests), Cancel button, progress indicator, sandbox LaunchAgent fix, mirror URL fix, engine refactor into `MirrorConfig`
 - CLI diagnostics: `--help`, `--list-calendars [--json]`, `--status [--json]`, real exit codes (2 = no access, 3 = no saved routes), last-run tracking (time/ok/summary)
 - 1.7.0: **Event-driven background sync**, replacing the hourly `launchd StartInterval` poll. Auto-sync logic lives in `BusyMirrorAppController` (an app-lifetime object, not tied to `ContentView`'s window lifecycle — closing the main window used to tear down the `EKEventStoreChanged` observer along with it, which would have made auto-sync a no-op whenever the window was closed). Once saved routes exist: registers as a login item (`SMAppService.mainApp`), removes any old `launchd` schedule, watches `EKEventStoreChanged` (debounced ~3s) and `NSWorkspace.didWakeNotification`, plus a 30-min fallback timer as a safety net. Auto-sync always writes (`writeEnabled: true`), independent of the interactive dry-run toggle.
+- 1.8.0: **V2 UI polish.** `ContentView.swift` split from ~2000 lines into focused view files — `CalendarsSectionView`, `RoutesSectionView`, `ScheduleSectionView`, `LogSectionView` (state stays owned by `ContentView`/`@AppStorage`; these are view-layer extractions, not a full MVVM rewrite — the settings-persistence model didn't need touching and touching it is exactly how the 1.6.0/1.6.1 data-loss bug happened). A preferences window hosting the pure `@AppStorage`-backed defaults (time window, privacy/mirroring defaults, work hours, skip filters) that used to live in the main window; this surfaced a latent bug — moving fields out of `ContentView` meant they stopped re-triggering `saveSettingsToDefaults()`, so on next launch `applySnapshot` would have silently reverted a preference changed in the new window using the stale blob. Fixed by splitting launch-time restore (`restoreLaunchState`, routes/selections only, since @AppStorage fields already self-restore) from Import's full restore (`applySnapshot`, unchanged). Menu bar icon now reflects idle/syncing/error state, and the dropdown shows last-sync time/result and whether auto-sync is armed.
+- 1.8.1: the preferences window (originally a `Settings{}` scene) didn't actually open — `LSUIElement` apps get no standard app menu, so Cmd+,/`SettingsLink` had no menu to hook into. Replaced with a plain `Window` opened via `openWindow(id:)`, plus a "Preferences…" menu bar item as a second entry point.
+- 1.8.2: **standard app, not menu-bar-only.** Removed `LSUIElement` — Dock icon, Cmd+Tab, standard app menu (Cmd+Q) are back. The accessory-app design (no Dock icon) turned out to make the app hard to quit reliably, which blocked replacing the bundle during updates. Menu bar extra stays as a secondary quick-access point.
+- 1.8.3: restored the real `Settings{}` scene for Preferences now that the app menu exists to host it (1.8.1's `Window`+`openWindow` workaround was never swapped back after 1.8.2 removed `LSUIElement`) — Cmd+, and the app's own "Preferences…" menu item work again, not just a button and a menu-bar-dropdown item.
+- 1.9.0: **sidebar-navigation redesign** (Routes / Schedule / Activity Log via `NavigationSplitView`, toolbar actions, collapsed-by-default route list, structured log view, refreshed menu bar) — explored as a mockup first, direction confirmed before implementing. Also fixed a real bug the redesign work surfaced: routes were being silently dropped on most launches (a freshly-created `EKEventStore` right after a permission grant can under-report calendars for a moment, especially remote accounts, so pruning against it wrongly deleted routes referencing calendars that were actually still there) — only ever recovered by a legacy backup key that was itself frozen at its first-ever value. Fixed the prune timing and made the backup stay current.
 
 ## Next
 1. **MCP server (thin external wrapper, not embedded in the app).** So agents driving BusyMirror don't have to shell out to the CLI and regex-parse log lines. A small standalone stdio-transport script (Node/Python) maps MCP tools 1:1 onto the CLI's `--json` output: `list_calendars`, `list_routes`, `run_route`, `run_saved_routes`, `get_status`. Deliberately kept out of the Swift app itself — no MCP SDK dependency in the signed binary (AGENTS.md's zero-external-packages rule stays intact), and MCP hosts spawn server processes on demand anyway, so there's no need for the app to run one persistently.
-
-## Then — V2 UI polish
-- Finish the `ContentView.swift` split into per-section view models (Routes, Schedule, Privacy, Log) — 1.7.0 already pulled the calendar-access/auto-sync state out into `BusyMirrorAppController`; the rest (UI/settings/CLI) is still one ~1900-line file.
-- Real `Settings { }` scene instead of the main window doubling as preferences.
-- Menu bar icon reflects state (idle / syncing / error) instead of a static icon.
-- Surface last-sync-time / last-error / next-check in the menu bar UI — the data now exists (`--status`'s `lastRunAtISO`/`lastRunOK`/`lastRunSummary`), this is just wiring it into the menu.
-- Better server-side privacy mapping (per-provider heuristics).
+2. **Better server-side privacy mapping (per-provider heuristics).**
 
 ## Later
 - Signed/notarized binaries and release pipeline.