fixes for icloud and auto sleep control

Author: katipally

DoomCoder/AgentTracking/AgentTrackingManager.swift

@@ -148,6 +148,18 @@ final class AgentTrackingManager {
     private(set) var sessions: [String: Session] = [:]
     var liveSessions: [Session] { sessions.values.filter(\.isLive).sorted { $0.updatedAt > $1.updatedAt } }
 
+    /// Local wall-clock timestamp of the most recent hook per agent — the
+    /// auto-sleep truth source. Immune to remote clock skew.
+    private(set) var lastHookByAgent: [TrackedAgent: Date] = [:]
+    /// Most recent hook from ANY agent — single signal for the global 10-min timer.
+    private(set) var lastAnyHookAt: Date = .distantPast
+
+    /// Unique agent types with a hook received in the last 10 minutes.
+    var hookFreshAgents: [TrackedAgent] {
+        let cutoff = Date().addingTimeInterval(-600)
+        return lastHookByAgent.compactMap { agent, t in t > cutoff ? agent : nil }
+    }
+
     /// Single source of truth for an agent's effective display state, used by
     /// the panel UI (TrackAgentsView/TrackAccordion) AND the Mac→iOS publisher
     /// so both always agree.
@@ -209,8 +221,8 @@ final class AgentTrackingManager {
     private func sweepEvictedSessions() {
         var changed = false
         let now = Date()
-        // Matches SleepManager.autoIdleWindowSeconds — IDE hooks older than this
-        // are treated as idle. Keep in sync if that constant changes.
+        // Matches the 10-min hook window used by SleepManager — IDE hooks older
+        // than this are treated as idle.
         let ideIdleWindow: TimeInterval = 600
         // Grace before finalizing a live CLI session that never reported a pid:
         // gives a freshly-started session time to emit its first pid-bearing hook.
@@ -375,7 +387,10 @@ final class AgentTrackingManager {
         let hadPermission = s.awaitingPermission
         s.apply(normalized)
         // Receipt-time stamp: the real "a hook just fired" signal for Auto mode.
-        s.lastHookReceivedAt = Date()
+        let hookReceivedAt = Date()
+        s.lastHookReceivedAt = hookReceivedAt
+        lastHookByAgent[normalized.agent] = hookReceivedAt
+        lastAnyHookAt = hookReceivedAt
         // Track the latest reported pid (CLI agents only — used by Auto mode
         // liveness checks). Keep the last known pid if this event lacks one.
         if env.pid > 0 { s.pid = pid_t(env.pid) }

DoomCoder/AgentTracking/CloudKitPusher.swift

@@ -346,7 +346,7 @@ final class CloudKitPusher {
             lastAppliedAt: ud.object(forKey: Self.lastAppliedAtKey) as? Date,
             masterEnabled: ud.object(forKey: CloudKitPusherDelegate.masterEnabledKey) as? Bool ?? true,
             agentStatusJSON: agentJSON,
-            autoGraceEndsAt: sm.autoGraceEndsAt
+            autoGraceEndsAt: nil
         )
         engine.state.add(pendingRecordZoneChanges: [.saveRecord(rec.recordID)])
         pendingMacStatus = rec

DoomCoder/AgentTracking/TrackAgentsPopover.swift

@@ -72,7 +72,6 @@ struct TrackAgentsView: View {
 
     @ViewBuilder
     private func row(_ agent: TrackedAgent) -> some View {
-        let live = manager.liveSessions.first { $0.agent == agent }
         let isInstalled = installed[agent] ?? false
         let isOn = enabled[agent] ?? true
         let state = manager.effectiveState(for: agent)
@@ -98,7 +97,7 @@ struct TrackAgentsView: View {
                         .frame(width: 7, height: 7)
                         .symbolEffect(.pulse, isActive: state == .running)
                         .accessibilityHidden(true)
-                    Text(subtitle(agent: agent, live: live))
+                    Text(subtitle(agent: agent))
                         .font(.caption)
                         .foregroundStyle(.secondary)
                         .contentTransition(.interpolate)
@@ -144,17 +143,10 @@ struct TrackAgentsView: View {
 
     // MARK: - Helpers
 
-    private func subtitle(agent: TrackedAgent, live: AgentTrackingManager.Session?) -> String {
-        if let live {
-            let state = live.displayState
-            if state == .completed || state == .open {
-                let elapsed = Int(Date().timeIntervalSince(live.updatedAt))
-                let ago = elapsed < 60 ? "just now"
-                        : elapsed < 3600 ? "\(elapsed / 60)m ago"
-                        : "\(elapsed / 3600)h ago"
-                return state == .completed ? "Completed · \(ago)" : "Idle · \(ago)"
-            }
-            return live.status
+    private func subtitle(agent: TrackedAgent) -> String {
+        if let t = AgentTrackingManager.shared.lastHookByAgent[agent],
+           t.timeIntervalSinceNow > -600 {
+            return "running"
         }
         let monitor = AgentTrackingManager.shared.processMonitor
         if agent.isIDEAgent, monitor.isAppRunning[agent] == true {
@@ -232,7 +224,6 @@ struct TrackAccordion: View {
 
     @ViewBuilder
     private func compactRow(_ agent: TrackedAgent) -> some View {
-        let live = manager.liveSessions.first { $0.agent == agent }
         let state = manager.effectiveState(for: agent)
         HStack(alignment: .center, spacing: 10) {
             AgentIconView(agent: agent, size: 20)
@@ -243,7 +234,7 @@ struct TrackAccordion: View {
                     Circle().fill(stateColor(state)).frame(width: 6, height: 6)
                         .symbolEffect(.pulse, isActive: state == .running)
                         .accessibilityHidden(true)
-                    Text(subtitle(agent: agent, live: live))
+                    Text(subtitle(agent: agent))
                         .font(.caption2).foregroundStyle(.secondary)
                         .contentTransition(.interpolate)
                 }
@@ -278,17 +269,10 @@ struct TrackAccordion: View {
         .transition(.opacity.combined(with: .offset(y: -8)))
     }
 
-    private func subtitle(agent: TrackedAgent, live: AgentTrackingManager.Session?) -> String {
-        if let live {
-            let state = live.displayState
-            if state == .completed || state == .open {
-                let elapsed = Int(Date().timeIntervalSince(live.updatedAt))
-                let ago = elapsed < 60 ? "just now"
-                        : elapsed < 3600 ? "\(elapsed / 60)m ago"
-                        : "\(elapsed / 3600)h ago"
-                return state == .completed ? "Completed · \(ago)" : "Idle · \(ago)"
-            }
-            return live.status
+    private func subtitle(agent: TrackedAgent) -> String {
+        if let t = AgentTrackingManager.shared.lastHookByAgent[agent],
+           t.timeIntervalSinceNow > -600 {
+            return "running"
         }
         let monitor = AgentTrackingManager.shared.processMonitor
         if agent.isIDEAgent, monitor.isAppRunning[agent] == true {

DoomCoder/PanelRootView.swift

@@ -202,15 +202,12 @@ struct PanelRootView: View {
 
     private var masterSubtitle: String {
         if !masterEnabled { return "Suspended — nothing is active" }
-        if sleepManager.isActive, !tracking.liveSessions.isEmpty {
-            let n = tracking.liveSessions.count
-            return "Awake · \(n) agent\(n == 1 ? "" : "s") live"
+        let n = tracking.hookFreshAgents.count
+        if sleepManager.isActive, n > 0 {
+            return "Awake · \(n) agent\(n == 1 ? "" : "s") working"
         }
         if sleepManager.isActive { return "Active · Mac awake" }
-        if !tracking.liveSessions.isEmpty {
-            let n = tracking.liveSessions.count
-            return "\(n) agent\(n == 1 ? "" : "s") live"
-        }
+        if n > 0 { return "\(n) agent\(n == 1 ? "" : "s") working" }
         return "Ready"
     }
 
@@ -310,13 +307,9 @@ struct PanelRootView: View {
                     .disclosureGroupStyle(PillDisclosureStyle())
                 }
                 .transition(.opacity.combined(with: .scale(scale: 0.96)))
-            } else if let graceEnd = sleepManager.autoGraceEndsAt, graceEnd > Date() {
-                // Agents finished: the single visible countdown before sleeping.
-                gracePill(endsAt: graceEnd)
-                    .transition(.opacity.combined(with: .scale(scale: 0.96)))
             } else {
-                statusPill(icon: "powersleep",
-                           text: "Idle · sleeps when agents finish",
+                statusPill(icon: "moon",
+                           text: "Delegated · macOS controls sleep",
                            tint: .secondary)
                     .transition(.opacity.combined(with: .scale(scale: 0.96)))
             }
@@ -391,8 +384,7 @@ struct PanelRootView: View {
         case .auto:
             let n = sleepManager.activeAgentCount
             if n > 0 { return "Auto · \(n) agent\(n == 1 ? "" : "s") working" }
-            if sleepManager.autoGraceEndsAt != nil { return "Auto · releasing soon" }
-            return "Auto · sleeps when idle"
+            return "Auto · macOS controls sleep"
         }
     }
 
@@ -403,20 +395,20 @@ struct PanelRootView: View {
             VStack(spacing: 10) {
                 HStack(spacing: 10) {
                     iconChip(system: "antenna.radiowaves.left.and.right",
-                             active: !tracking.liveSessions.isEmpty,
+                             active: !tracking.hookFreshAgents.isEmpty,
                              activeTint: .green)
                     VStack(alignment: .leading, spacing: 1) {
                         Text("Agent Tracking")
                             .font(.system(size: 13, weight: .medium))
-                        Text(tracking.liveSessions.isEmpty
-                             ? "No sessions running"
-                             : "Listening for events")
+                        Text(tracking.hookFreshAgents.isEmpty
+                             ? "Ready to track"
+                             : "Listening for hooks")
                             .font(.caption2)
                             .foregroundStyle(.secondary)
                     }
                     Spacer()
-                    if !tracking.liveSessions.isEmpty {
-                        Text("\(tracking.liveSessions.count)")
+                    if !tracking.hookFreshAgents.isEmpty {
+                        Text("\(tracking.hookFreshAgents.count)")
                             .font(.caption2.weight(.semibold).monospacedDigit())
                             .padding(.horizontal, 7)
                             .padding(.vertical, 2)
@@ -542,25 +534,6 @@ struct PanelRootView: View {
         .background(tint.opacity(0.12), in: Capsule())
     }
 
-    /// Grace-period pill with a live SwiftUI countdown — updates every second
-    /// without a separate Timer because Text(timerInterval:) drives itself.
-    /// This is the ONE countdown the user ever sees in Auto mode.
-    private func gracePill(endsAt: Date) -> some View {
-        HStack(spacing: 6) {
-            Image(systemName: "powersleep").font(.caption2)
-                .accessibilityHidden(true)
-            Text("Mac sleeps in ")
-                .font(.caption2)
-            Text(timerInterval: Date.now...endsAt, countsDown: true)
-                .font(.caption2.monospacedDigit())
-        }
-        .foregroundStyle(Color.secondary)
-        .padding(.horizontal, 9)
-        .padding(.vertical, 5)
-        .frame(maxWidth: .infinity, alignment: .leading)
-        .background(Color.secondary.opacity(0.12), in: Capsule())
-    }
-
     @ViewBuilder
     private func compactAction(
         icon: String,