Four parallel agents shipped Tier 1+2+3 of the punch list, coordinated through a fixed DetectionEventBus contract created upfront. ## Detection event bus (shared contract) - Sources/Process/DetectionEvents.swift — `DetectionEvent.Kind` enum covering objectAppeared/Refreshed/Disappeared, faceRecognized, faceSeenUnknown, textRecognized, gestureDetected, activityDetected, spatialRelation. - Sources/Process/DetectionEventBus.swift — thread-safe pub/sub, Token pattern with auto-unsubscribe on deinit, synchronous emit on caller's queue. Subscribers hop to their own queue as needed. ## ObjectDetector additions (Agent A) - Publishes events for every track-add, track-loss, face-match, unmatched-face, recognized-text — with per-event throttles (text 2s per string, face name 5s, etc.) so the bus doesn't drown in repeats. - New `DetectorStageTiming` struct + `lastStageTiming` accessor exposes the visionBundleMs / featurePrintMs / trackerMs / totalMs breakdown. Logged once a second at DEBUG level for visibility. - Track UUID persistence via Sources/Process/TrackStore.swift — label→UUID at ~/Library/Application Support/VisionPOC/tracks.json, MRU-pruned to 50 entries, debounced 500ms saves. Same object across launches gets the same trackId → consistent per-track color. - YOLO warmup at init (dispatched on detector queue): one dummy inference against a 416×416 mid-gray image so the first user-visible detection doesn't pay model-compile latency. ## Event consumers (Agent A) - Sources/Process/Greeter.swift — AVSpeechSynthesizer-driven "Hello, <name>" on faceRecognized events. Honors Theme.greeterMuted and the Privacy Mode toggle. Throttle: 30s per name on top of the bus-level 5s throttle. - Sources/Process/GestureRecognizer.swift — five gesture heuristics (thumbs_up, open_hand, fist, pointing, peace) over hand-pose PoseDetections. Throttled 2s per gesture name. - Sources/Process/ActivityRecognizer.swift — standing/sitting/ crouching/hand_raised over body-pose PoseDetections. Throttled 5s per activity. - Sources/Process/SpatialReasoner.swift — near/above/inside/holding relations between Detection pairs. Throttled 10s per triple. ## Video recording (Agent B) - Sources/Render/Recorder.swift — @MainActor AVAssetWriter pipeline writing H.264 / 12 Mbps / 60fps to ~/Desktop/VisionPOC-...mov. Captures the rendered MTKView output via a new frame-tap callback on Renderer. Synchronous blit→staging-texture→CVPixelBuffer→ AVAssetWriterInputPixelBufferAdaptor pattern; ~5-15ms per frame at 1080p, drops dynamically when active. Format-guarded for bgra8Unorm drawables and disabled when not recording (early return). - Renderer.swift gained `var frameTap` callback; invoked inside draw(in:) just before present, when set. ## History window (Agent C) - Sources/App/HistoryEntry.swift, HistoryStore.swift, HistoryView.swift, HistoryWindowController.swift — singleton ring buffer of 500 recent events translated into human-readable summaries with category tags (object/face-known/face-unknown/ocr/gesture/activity/spatial). - Open via ⌘H from the Faces menu. Polls the store at 1Hz. - Window position persists under VPOC.HistoryWindowFrame. ## Privacy mode (Agent C) - Theme.Performance.faceRecognitionDisabled — new live tunable. - Camera menu toggle (⇧⌘P) flips both faceRecognitionDisabled and greeterMuted. The History viewer also filters out face entries when the flag is set. - Documented limitation: bounding-box labels may still show enrolled names if the detector doesn't consult faceRecognitionDisabled (this round it doesn't; flag is for History + TTS only). ## Recording menu wiring (Agent C) - App menu gains "Start Recording" / "Stop Recording" (⇧⌘R). Title flips based on the Recorder's isRecording state. - Start: instantiates the recorder, calls startRecording at the current drawable size, hooks renderer.frameTap. - Stop: clears frameTap first (no more frames queue) then awaits the asset writer's finalize. On completion (MainActor hop), shows an NSAlert with the saved-path or failure. ## Settings panel additions (Agent C) - New "Faces" subsection: "Mute greeter (TTS)" toggle bound to TunableSettings.greeterMuted (writes through to Theme). - New "Diagnostics" section: per-stage detector timing readout polled at 2Hz. Decoupled from ObjectDetector via a closure-based timing provider so the App layer doesn't depend on the Process module's DetectorStageTiming type directly. ## Hygiene (Agent D) - Tests/IoUTests.swift, AspectFitTests.swift, LogStreamTests.swift, DetectionEventBusTests.swift, FaceRegistryDistanceTests.swift — 24 tests covering pure-logic algorithms. Private methods are mirrored verbatim into the test files with a "keep in sync" comment. - project.yml gains a `VisionPOCTests` target of type `bundle.unit-test`, depending on the VisionPOC application target. - .github/workflows/build.yml — macos-15 runner, brew install xcodegen, generate, build, test. LFS skipped to save bandwidth (the build tolerates a missing model since ObjectDetector falls back to Vision built-ins). - CLAUDE.md — onboarding doc covering project layout, theme tunables, pipelines, event vocabulary, observability, build idiosyncrasies, and "how to add a new detector / overlay" recipes. ## Integration fix - Recorder.swift's `stopRecording` completion path crossed actor isolation boundaries — captured a `(URL?) -> Void` closure and the AVAssetWriter instance into a @Sendable closure. Fixed by extracting `writer.status` / `writer.error?.localizedDescription` on the writer's queue before hopping, and wrapping the completion in a `nonisolated(unsafe)` shuttle (it's called from MainActor only, so the unsafe annotation is honest). ## Build status - `xcodebuild build` — clean - `xcodebuild test` — 24 / 24 passing Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
112 lines
4.0 KiB
Swift
112 lines
4.0 KiB
Swift
import Foundation
|
|
import CoreGraphics
|
|
|
|
/// Identifies meaningful pairwise spatial relationships between detections
|
|
/// (and hand-pose wrists vs. object centers) and emits `spatialRelation`
|
|
/// events on the shared DetectionEventBus.
|
|
///
|
|
/// Relations:
|
|
/// - `near` — bounding-box centers within 0.15 normalized distance
|
|
/// - `above` — B's bottom edge is above A's top edge; centers within 0.3 horizontal
|
|
/// - `inside` — A is fully contained within B (e.g. FACE inside PERSON)
|
|
/// - `holding` — a hand-pose wrist is within 0.05 of an object's center
|
|
///
|
|
/// Throttle: one emit per (subject, relation, object) triple per 10 seconds.
|
|
/// "Holding" pairs the hand with the closest object label by class name.
|
|
final class SpatialReasoner: @unchecked Sendable {
|
|
private let bus: DetectionEventBus
|
|
|
|
private var lock = os_unfair_lock_s()
|
|
private var lastEmittedAt: [String: Date] = [:]
|
|
private let throttleInterval: TimeInterval = 10.0
|
|
|
|
init(bus: DetectionEventBus = .shared) {
|
|
self.bus = bus
|
|
}
|
|
|
|
/// Called from ObjectDetector after each detect-and-bootstrap pass.
|
|
func process(detections: [Detection], handPoses: [PoseDetection]) {
|
|
// Pairwise relations among detections.
|
|
let n = detections.count
|
|
if n >= 2 {
|
|
for i in 0..<n {
|
|
for j in 0..<n where j != i {
|
|
let a = detections[i]
|
|
let b = detections[j]
|
|
evaluatePair(a: a, b: b)
|
|
}
|
|
}
|
|
}
|
|
|
|
// Holding: hand wrist near a detection center.
|
|
if !handPoses.isEmpty && !detections.isEmpty {
|
|
for pose in handPoses where pose.kind == .hand {
|
|
evaluateHolding(pose: pose, detections: detections)
|
|
}
|
|
}
|
|
}
|
|
|
|
// MARK: - Pair-relation rules
|
|
|
|
private func evaluatePair(a: Detection, b: Detection) {
|
|
let ac = center(of: a.rect)
|
|
let bc = center(of: b.rect)
|
|
let dx = ac.x - bc.x
|
|
let dy = ac.y - bc.y
|
|
let dist = sqrt(dx * dx + dy * dy)
|
|
|
|
// near
|
|
if dist < 0.15 {
|
|
emit(subject: a.label, relation: "near", object: b.label)
|
|
}
|
|
|
|
// above (B above A)
|
|
let bBottom = b.rect.minY
|
|
let aTop = a.rect.maxY
|
|
if bBottom > aTop && abs(dx) < 0.3 {
|
|
emit(subject: b.label, relation: "above", object: a.label)
|
|
}
|
|
|
|
// inside (A inside B)
|
|
if b.rect.contains(a.rect) && a.rect != b.rect {
|
|
emit(subject: a.label, relation: "inside", object: b.label)
|
|
}
|
|
}
|
|
|
|
private func evaluateHolding(pose: PoseDetection, detections: [Detection]) {
|
|
// The pose's "wrist" isn't named, but the lowest-y points cluster near
|
|
// the wrist when a hand is held out. Use each unique pose point as a
|
|
// candidate wrist location — the rule only fires if the closest one is
|
|
// within 0.05 of an object's center, which is a tight bar.
|
|
for p in pose.points {
|
|
for det in detections {
|
|
let c = center(of: det.rect)
|
|
let dx = c.x - p.x
|
|
let dy = c.y - p.y
|
|
let dist = sqrt(dx * dx + dy * dy)
|
|
if dist < 0.05 {
|
|
emit(subject: "HAND", relation: "holding", object: det.label)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
private func center(of r: CGRect) -> CGPoint {
|
|
return CGPoint(x: r.midX, y: r.midY)
|
|
}
|
|
|
|
private func emit(subject: String, relation: String, object: String) {
|
|
// Triple key for per-triple throttling.
|
|
let key = "\(subject)|\(relation)|\(object)"
|
|
let now = Date()
|
|
os_unfair_lock_lock(&lock)
|
|
if let prev = lastEmittedAt[key], now.timeIntervalSince(prev) < throttleInterval {
|
|
os_unfair_lock_unlock(&lock)
|
|
return
|
|
}
|
|
lastEmittedAt[key] = now
|
|
os_unfair_lock_unlock(&lock)
|
|
bus.emit(.spatialRelation(subject: subject, relation: relation, object: object))
|
|
}
|
|
}
|