Able to detectgit add .

DynamicIsland/components/Notch/NotchTimerView.swift

@@ -96,21 +96,20 @@ struct NotchTimerView: View {
     }
     
     private var controlsSection: some View {
-        VStack(spacing: 20) {
-            if timerManager.isTimerActive {
-                // Active timer controls
-                activeTimerControls
-            } else {
-                // Quick timer setup
+        VStack(alignment: .leading, spacing: 20) {
+            if timerManager.allowsManualInteraction {
+                manualControlButtons
                 quickTimerControls
+            } else {
+                externalTimerNotice
             }
         }
+        .frame(maxWidth: .infinity, alignment: .leading)
     }
-    
-    private var activeTimerControls: some View {
-        VStack(spacing: 16) {
+
+    private var manualControlButtons: some View {
+        VStack(alignment: .leading, spacing: 16) {
             if timerManager.isOvertime {
-                // Overtime controls - only show stop button
                 Button(action: {
                     timerManager.forceStopTimer()
                 }) {
@@ -128,17 +127,9 @@ struct NotchTimerView: View {
                     .clipShape(RoundedRectangle(cornerRadius: 12))
                 }
                 .buttonStyle(PlainButtonStyle())
-                .onHover { isHovering in
-                    if isHovering {
-                        NSCursor.pointingHand.push()
-                    } else {
-                        NSCursor.pop()
-                    }
-                }
+                .onHover(perform: cursorHover)
             } else {
-                // Normal timer controls
                 HStack(spacing: 16) {
-                    // Pause/Resume button
                     Button(action: {
                         if timerManager.isPaused {
                             timerManager.resumeTimer()
@@ -159,15 +150,8 @@ struct NotchTimerView: View {
                         .clipShape(RoundedRectangle(cornerRadius: 12))
                     }
                     .buttonStyle(PlainButtonStyle())
-                    .onHover { isHovering in
-                        if isHovering {
-                            NSCursor.pointingHand.push()
-                        } else {
-                            NSCursor.pop()
-                        }
-                    }
-                    
-                    // Stop button
+                    .onHover(perform: cursorHover)
+
                     Button(action: {
                         timerManager.stopTimer()
                     }) {
@@ -180,34 +164,30 @@ struct NotchTimerView: View {
                         .foregroundStyle(.white)
                         .frame(height: 40)
                         .frame(minWidth: 100)
-                        .background(.white.opacity(0.15))
+                        .background(.white.opacity(0.1))
                         .clipShape(RoundedRectangle(cornerRadius: 12))
                     }
                     .buttonStyle(PlainButtonStyle())
-                    .onHover { isHovering in
-                        if isHovering {
-                            NSCursor.pointingHand.push()
-                        } else {
-                            NSCursor.pop()
-                        }
-                    }
+                    .onHover(perform: cursorHover)
                 }
             }
         }
     }
-    
+
     private var quickTimerControls: some View {
-        VStack(spacing: 16) {
-            // Quick timer grid
+        VStack(alignment: .leading, spacing: 16) {
+            Text("Quick Start")
+                .font(.system(size: 14, weight: .medium))
+                .foregroundStyle(.secondary)
+
             VStack(spacing: 12) {
                 HStack(spacing: 12) {
-                    quickTimerButton(minutes: 1, title: "1 min")
-                    quickTimerButton(minutes: 5, title: "5 min")
-                    quickTimerButton(minutes: 15, title: "15 min")
+                    quickTimerButton(minutes: 1)
+                    quickTimerButton(minutes: 5)
+                    quickTimerButton(minutes: 15)
                 }
-                
+
                 HStack(spacing: 12) {
-                    // Custom timer button
                     Button(action: {
                         timerManager.startTimer(duration: customTimerDuration, name: "Custom Timer")
                     }) {
@@ -229,17 +209,37 @@ struct NotchTimerView: View {
                         )
                     }
                     .buttonStyle(PlainButtonStyle())
-                    .onHover { isHovering in
-                        if isHovering {
-                            NSCursor.pointingHand.push()
-                        } else {
-                            NSCursor.pop()
-                        }
-                    }
+                    .onHover(perform: cursorHover)
                 }
             }
         }
+    }
+
+    private var externalTimerNotice: some View {
+        VStack(alignment: .leading, spacing: 12) {
+            Text("Manage the Clock timer from the Clock app.")
+                .font(.system(size: 14, weight: .medium))
+                .foregroundStyle(.secondary)
+
+            Button(action: {
+                timerManager.endExternalTimer(triggerSmoothClose: false)
+            }) {
+                HStack(spacing: 8) {
+                    Image(systemName: "eye.slash")
+                        .font(.system(size: 16, weight: .medium))
+                    Text("Hide from Notch")
+                        .font(.system(size: 16, weight: .medium))
+                }
+                .foregroundStyle(.white)
+                .frame(height: 40)
+                .frame(minWidth: 140)
+                .background(.white.opacity(0.12))
+                .clipShape(RoundedRectangle(cornerRadius: 12))
+            }
+            .buttonStyle(PlainButtonStyle())
+            .onHover(perform: cursorHover)
         }
+    }
     
     private var customTimerDisplayText: String {
         let totalMinutes = Int(customTimerDuration) / 60
@@ -256,7 +256,7 @@ struct NotchTimerView: View {
         }
     }
     
-    private func quickTimerButton(minutes: Int, title: String) -> some View {
+    private func quickTimerButton(minutes: Int) -> some View {
         Button(action: {
             timerManager.startTimer(duration: TimeInterval(minutes * 60), name: "\(minutes) Min Timer")
         }) {
@@ -277,13 +277,7 @@ struct NotchTimerView: View {
             )
         }
         .buttonStyle(PlainButtonStyle())
-        .onHover { isHovering in
-            if isHovering {
-                NSCursor.pointingHand.push()
-            } else {
-                NSCursor.pop()
-            }
-        }
+        .onHover(perform: cursorHover)
     }
 }
 
@@ -292,6 +286,14 @@ private extension NotchTimerView {
         guard timerManager.isTimerActive && timerManager.isRunning else { return .white.opacity(0.9) }
         return timerManager.currentColor
     }
+
+    private func cursorHover(_ isHovering: Bool) {
+        if isHovering {
+            NSCursor.pointingHand.push()
+        } else {
+            NSCursor.pop()
+        }
+    }
 }
 
 #Preview {

DynamicIsland/components/Settings/SettingsView.swift

@@ -1843,6 +1843,7 @@ struct TimerSettings: View {
     @Default(.timerShowsProgress) private var showsProgress
     @Default(.timerProgressStyle) private var progressStyle
     @Default(.timerControlWindowEnabled) private var controlWindowEnabled
+    @Default(.mirrorSystemTimer) private var mirrorSystemTimer
     @AppStorage("customTimerDuration") private var customTimerDuration: Double = 600
     @State private var customHours: Int = 0
     @State private var customMinutes: Int = 10
@@ -1857,11 +1858,13 @@ struct TimerSettings: View {
                 if enableTimerFeature {
                     Toggle("Enable timer live activity", isOn: $coordinator.timerLiveActivityEnabled)
                         .animation(.easeInOut, value: coordinator.timerLiveActivityEnabled)
+                    Defaults.Toggle("Mirror macOS Clock timers", key: .mirrorSystemTimer)
+                        .help("Shows the system Clock timer in the notch when available. Requires Accessibility permission to read the status item.")
                 }
             } header: {
                 Text("Timer Feature")
             } footer: {
-                Text("Control timer availability and whether progress appears as a live activity while the notch is closed.")
+                Text("Control timer availability, live activity behaviour, and whether the app mirrors timers started from the macOS Clock app.")
             }
             
             if enableTimerFeature {

DynamicIsland/components/Timer/TimerControlOverlay.swift

@@ -41,6 +41,7 @@ struct TimerControlOverlay: View {
             .buttonStyle(.plain)
             .contentShape(RoundedRectangle(cornerRadius: 10, style: .continuous))
             .help(helpText)
+            .disabled(!timerManager.allowsManualInteraction)
 
             Button(action: stopTimer) {
                 Image(systemName: "stop.fill")
@@ -51,6 +52,7 @@ struct TimerControlOverlay: View {
             .buttonStyle(.plain)
             .contentShape(RoundedRectangle(cornerRadius: 10, style: .continuous))
             .help("Stop")
+            .disabled(!timerManager.allowsManualInteraction)
         }
         .padding(.horizontal, 12)
         .frame(height: notchHeight)
@@ -66,6 +68,7 @@ struct TimerControlOverlay: View {
     }
 
     private func togglePause() {
+        guard timerManager.allowsManualInteraction else { return }
         if timerManager.isPaused {
             timerManager.resumeTimer()
         } else {
@@ -74,6 +77,10 @@ struct TimerControlOverlay: View {
     }
 
     private func stopTimer() {
+        guard timerManager.allowsManualInteraction else {
+            timerManager.endExternalTimer(triggerSmoothClose: false)
+            return
+        }
 #if os(macOS)
         TimerControlWindowManager.shared.hide(animated: true)
 #endif

DynamicIsland/components/Timer/TimerPopover.swift

@@ -158,6 +158,7 @@ private struct ActiveTimerSection: View {
                         .labelStyle(.titleAndIcon)
                 }
                 .buttonStyle(.bordered)
+                .disabled(!timerManager.allowsManualInteraction)
                 
                 Button(role: .destructive, action: stopTimer) {
                     Label("Stop", systemImage: "stop.fill")
@@ -165,6 +166,7 @@ private struct ActiveTimerSection: View {
                         .labelStyle(.titleAndIcon)
                 }
                 .buttonStyle(.borderedProminent)
+                .disabled(!timerManager.allowsManualInteraction)
             }
         }
         .frame(maxWidth: .infinity, alignment: .leading)
@@ -175,6 +177,7 @@ private struct ActiveTimerSection: View {
     }
     
     private func togglePause() {
+        guard timerManager.allowsManualInteraction else { return }
         withAnimation(.smooth) {
             if timerManager.isPaused {
                 timerManager.resumeTimer()
@@ -185,6 +188,10 @@ private struct ActiveTimerSection: View {
     }
     
     private func stopTimer() {
+        guard timerManager.allowsManualInteraction else {
+            timerManager.endExternalTimer(triggerSmoothClose: false)
+            return
+        }
         withAnimation(.smooth) {
             timerManager.stopTimer()
         }