@lattices/cli 0.4.12 → 0.4.13

package/apps/mac/Lattices.app/Contents/Info.plist

@@ -26,17 +26,17 @@
         </dict>
     </array>
     <key>CFBundleVersion</key>
-    <string>0.4.12</string>
+    <string>0.4.13</string>
     <key>CFBundleShortVersionString</key>
-    <string>0.4.12</string>
+    <string>0.4.13</string>
     <key>LatticesBuildChannel</key>
     <string>dev</string>
     <key>LatticesBuildTrack</key>
     <string>latest</string>
     <key>LatticesBuildRevision</key>
-    <string>b84f24f</string>
+    <string>42928c7</string>
     <key>LatticesBuildTimestamp</key>
-    <string>2026-05-04T16:17:39Z</string>
+    <string>2026-05-04T17:39:23Z</string>
     <key>LSMinimumSystemVersion</key>
     <string>13.0</string>
     <key>LSUIElement</key>

package/apps/mac/Sources/Core/Input/KeyboardRemapController.swift

@@ -21,11 +21,12 @@ final class KeyboardRemapController: ObservableObject {
     private var capsLayerLastEventAt: CFAbsoluteTime?
     private var bypassUntil: CFAbsoluteTime = 0
     private var lastCapsLayerStaleLogAt: CFAbsoluteTime = 0
-    private var pressedKeyCodes = Set<Int64>()
+    private var pressedKeyCodes: [Int64: CFAbsoluteTime] = [:]
     private let breaker = EventTapBreaker(label: "KeyboardRemap")
     private let budgetMeter = TapBudgetMeter(label: "KeyboardRemap")
     private let maxCapsLayerIdleDuration: TimeInterval = 2.0
     private let maxCapsLayerHeldDuration: TimeInterval = 20.0
+    private let maxTrackedKeyDownDuration: TimeInterval = 120.0
     private let emergencyBypassDuration: TimeInterval = 3.0
 
     private init() {
@@ -182,7 +183,8 @@ final class KeyboardRemapController: ObservableObject {
             return Unmanaged.passUnretained(event)
         }
 
-        updatePressedKeys(type: type, keyCode: event.getIntegerValueField(.keyboardEventKeycode))
+        expireStalePressedKeys(now: started)
+        updatePressedKeys(type: type, keyCode: event.getIntegerValueField(.keyboardEventKeycode), now: started)
         if shouldTriggerEmergencyReset(type: type, event: event) {
             emergencyClear(now: started)
             InputCaptureResetCenter.reset(reason: "keyboard emergency chord")
@@ -295,23 +297,32 @@ final class KeyboardRemapController: ObservableObject {
         DiagnosticLog.shared.warn("KeyboardRemap: emergency bypass via Escape")
     }
 
-    private func updatePressedKeys(type: CGEventType, keyCode: Int64) {
+    private func updatePressedKeys(type: CGEventType, keyCode: Int64, now: CFAbsoluteTime) {
         switch type {
         case .keyDown:
-            pressedKeyCodes.insert(keyCode)
+            pressedKeyCodes[keyCode] = now
         case .keyUp:
-            pressedKeyCodes.remove(keyCode)
+            pressedKeyCodes.removeValue(forKey: keyCode)
         default:
             break
         }
     }
 
+    private func expireStalePressedKeys(now: CFAbsoluteTime) {
+        let staleKeys = pressedKeyCodes.filter { now - $0.value > maxTrackedKeyDownDuration }.map(\.key)
+        guard !staleKeys.isEmpty else { return }
+        for keyCode in staleKeys {
+            pressedKeyCodes.removeValue(forKey: keyCode)
+        }
+        DiagnosticLog.shared.warn("KeyboardRemap: cleared stale key-down state for \(staleKeys.count) key(s)")
+    }
+
     private func shouldTriggerEmergencyReset(type: CGEventType, event: CGEvent) -> Bool {
         guard type == .keyDown else { return false }
         let keyCode = event.getIntegerValueField(.keyboardEventKeycode)
         let flags = event.flags
         return keyCode == 40
-            && pressedKeyCodes.contains(53)
+            && pressedKeyCodes[53] != nil
             && flags.contains(.maskShift)
     }
 

package/apps/mac/Sources/Core/Overlays/ScreenOverlayCanvasController.swift

@@ -371,30 +371,19 @@ final class ScreenOverlayCanvasController {
         let hasAgentLayer = layersByID.values.contains { $0.owner == .agentApi }
         if hasAgentLayer, globalDismissMonitor == nil {
             let mask: NSEvent.EventTypeMask = [
-                .mouseMoved,
                 .leftMouseDown,
-                .leftMouseUp,
                 .rightMouseDown,
                 .otherMouseDown,
-                .leftMouseDragged,
-                .rightMouseDragged,
-                .otherMouseDragged,
             ]
             globalDismissMonitor = NSEvent.addGlobalMonitorForEvents(matching: mask) { [weak self] event in
                 DispatchQueue.main.async {
                     _ = self?.handlePointerEvent(event)
                 }
             }
-            localDismissMonitor = NSEvent.addLocalMonitorForEvents(matching: mask.union(.keyDown)) { [weak self] event in
-                if event.type == .keyDown {
-                    if event.keyCode == 53 {
-                        self?.dismissAgentOverlays()
-                        return nil
-                    }
-                } else {
-                    if self?.handlePointerEvent(event) == true {
-                        return nil
-                    }
+            localDismissMonitor = NSEvent.addLocalMonitorForEvents(matching: .keyDown) { [weak self] event in
+                if event.keyCode == 53 {
+                    self?.dismissAgentOverlays()
+                    return nil
                 }
                 return event
             }
@@ -416,35 +405,7 @@ final class ScreenOverlayCanvasController {
     @discardableResult
     private func handlePointerEvent(_ event: NSEvent) -> Bool {
         switch event.type {
-        case .mouseMoved:
-            updatePointerCapture(at: NSEvent.mouseLocation)
-            return false
-        case .leftMouseDown:
-            updatePointerCapture(at: NSEvent.mouseLocation)
-            if beginActorDrag(at: NSEvent.mouseLocation) {
-                return true
-            }
-            dismissAgentOverlays()
-            return false
-        case .leftMouseDragged:
-            if dragActor(to: NSEvent.mouseLocation) {
-                return true
-            }
-            dismissAgentOverlays()
-            return false
-        case .leftMouseUp:
-            let wasDragging = dragState != nil
-            endActorDrag()
-            updatePointerCapture(at: NSEvent.mouseLocation)
-            return wasDragging
-        case .rightMouseDown:
-            updatePointerCapture(at: NSEvent.mouseLocation)
-            if closeActor(at: NSEvent.mouseLocation) {
-                return true
-            }
-            dismissAgentOverlays()
-            return false
-        case .otherMouseDown, .rightMouseDragged, .otherMouseDragged:
+        case .leftMouseDown, .rightMouseDown, .otherMouseDown:
             dismissAgentOverlays()
             return false
         default:
@@ -453,16 +414,7 @@ final class ScreenOverlayCanvasController {
     }
 
     private func updatePointerCapture(at globalPoint: CGPoint) {
-        clearStaleActorDragIfNeeded()
-        let captureWindow: ScreenOverlayWindow?
-        if let dragState {
-            captureWindow = windowsByScreenID[dragState.screenID]
-        } else {
-            captureWindow = hitActor(at: globalPoint)?.window
-        }
-        for window in windowsByScreenID.values {
-            window.ignoresMouseEvents = window !== captureWindow
-        }
+        resetPointerCapture()
     }
 
     private func beginActorDrag(at globalPoint: CGPoint) -> Bool {
@@ -512,6 +464,7 @@ final class ScreenOverlayCanvasController {
               let layer = layersByID[dragState.id],
               case .pet(let payload) = layer.payload else {
             self.dragState = nil
+            cancelActorDragTimeout()
             resetPointerCapture()
             return
         }
@@ -520,7 +473,7 @@ final class ScreenOverlayCanvasController {
         cancelActorDragTimeout()
         render()
         updateLifecycleMonitors()
-        updatePointerCapture(at: NSEvent.mouseLocation)
+        resetPointerCapture()
     }
 
     private func clearStaleActorDragIfNeeded() {
@@ -562,7 +515,7 @@ final class ScreenOverlayCanvasController {
         }
         render()
         updateLifecycleMonitors()
-        updatePointerCapture(at: globalPoint)
+        resetPointerCapture()
         return true
     }
 

package/docs/reference/dewey.config.ts

@@ -4,7 +4,7 @@ export default {
     name: 'lattices',
     tagline: 'macOS developer workspace manager — tmux sessions with a native menu bar app for tiling, navigation, and project management',
     type: 'cli-tool',
-    version: '0.4.12',
+    version: '0.4.13',
   },
 
   agent: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lattices/cli",
-  "version": "0.4.12",
+  "version": "0.4.13",
   "description": "The agentic workspace manager for macOS — turn your desktop into a coherent API",
   "packageManager": "bun@1.3.11",
   "engines": {