Adopt AKOÚŌ v0.6 + Earworm v0.2; align preset vocabulary; July polish wave

Listening contract:
- AKOÚŌ contract bumped to v0.6 (0.6-oida.1): /remember command + remember
  preset, memory-lineage-listening in the harness mode set, /fiction grants
  declared speculation, /forensic keeps its suppression
- outputs carry akouo_version, apparatus (hybrid MOSS+DSP substrate,
  perception sources, known blind spots, model ids), and listener blocks;
  claims carry source (dsp/model/context) and time_range anchors on events
- new harness/akouo/manifest.py loads the upstream machine-readable contract
  (akouo.manifest.json + presets/presets.json); tests include a drift check so
  the harness fallback tables cannot silently diverge

Preset vocabulary aligned with upstream presets/presets.json:
- environment->field, speech->voice, memory->recall, with
  LEGACY_PRESET_ALIASES on the daemon, preset_aliases in the manifest, and the
  same mapping in the macOS shell so saved selections follow the rename;
  oída preset ids are now a tested strict subset of the upstream vocabulary

Earworm v0.2 (akousma spec v1.1) in the bridge:
- records carry a skimmable summary; listening entries wrapped in the v1.1
  envelope with akouo.* entries pinned to akouo/v0.6; registration auto-links
  recurrences (same_source_as on matching content hash)

Also includes the previously uncommitted July overhaul documented in
CHANGELOG 0.2.0 (floating-listener box redesign, dashboard restyle, engine and
capture polish) plus repo hygiene (.uv-tools ignored, caches cleaned).

130 tests + 5 subtests green; ruff clean; swift build clean.

Author: emeisazam

.gitignore

@@ -1,6 +1,7 @@
 .DS_Store
 .venv/
 .uv-cache/
+.uv-tools/
 __pycache__/
 *.py[cod]
 .pytest_cache/

CHANGELOG.md

@@ -2,6 +2,31 @@
 
 ## 0.2.0 - Unreleased
 
+- **Preset ids aligned with AKOÚŌ v0.6's portable vocabulary**:
+  `environment`→`field`, `speech`→`voice`, `memory`→`recall` (with a
+  `LEGACY_PRESET_ALIASES` map so saved configs, sessions, and older clients
+  keep resolving; the manifest exposes `preset_aliases`). oída's preset id set
+  is now a strict subset of the upstream `presets/presets.json` vocabulary,
+  enforced by a test.
+- **AKOÚŌ v0.6 contract adopted** (`akouo_contract_version: v0.6`): new
+  `/remember` command with a `remember` route preset (memory comparison plus
+  registration into the akousmata) alongside the read-only `memory` preset;
+  `memory-lineage-listening` added to the harness mode set; `/fiction` now
+  grants declared speculative permission and `/forensic` keeps its
+  interpreted/speculative suppression, both matching the published
+  `command_permission_overrides`. Listening outputs now carry `akouo_version`,
+  an `apparatus` declaration (hybrid MOSS+DSP substrate, perception sources,
+  known blind spots, model ids), and a `listener` block; claims carry `source`
+  (`dsp` / `model` / `context`) and, for events, `time_range` anchors. A new
+  `harness/akouo/manifest.py` loads the upstream machine-readable contract
+  (`akouo.manifest.json` + `presets/presets.json`) and the test suite includes
+  a drift check so the harness fallback tables cannot silently diverge.
+- **Earworm v0.2 / akousma spec v1.1 adopted in the bridge**: listen records
+  now carry a skimmable `summary`, listening entries are wrapped in the v1.1
+  envelope (`contract`/`created_at`/`summary`/`payload`, with `akouo.*` entries
+  pinned to `akouo/v0.6`), and registration links recurrences — when the same
+  audio content hash already exists in the store, the new record gets a
+  `same_source_as` relation to the most recent holder.
 - **Floating listener redesigned**: the macOS floating listener is no longer a
   window. It is a borderless, transparent, non-activating panel whose visible
   body is the listening-result box itself — the reading is always shown, with a

README.md

@@ -32,9 +32,13 @@ name **oída**.
   stereo correlation/width/balance. One inspection per file per listen (results
   are memoized on path+mtime).
 - **Route presets** scope the MOSS passes: Basic (one caption pass), Signal
-  (DSP-only, instant), Environment, Music, Speech, Memory, and Deep (the full
-  report). Presets come from the AKOÚŌ skill registry (`/akouo/skills`) and the
-  dashboard skill manager can deviate per listen.
+  (DSP-only, instant), Field, Music, Voice, Recall (read-only memory
+  comparison), Remember (memory comparison + registration into the shared
+  akousmata, AKOÚŌ `/remember`), and Deep (the full report). Preset ids follow
+  AKOÚŌ v0.6's portable preset vocabulary (pre-v0.6 ids `environment`/`speech`/
+  `memory` still resolve as aliases). Presets come from the AKOÚŌ skill
+  registry (`/akouo/skills`) and the dashboard skill manager can deviate per
+  listen.
 - **Akousmata memory** (private traces): remember/list/search/similar/export/
   forget over local JSON traces with deterministic DSP similarity. This is
   oída's private store — distinct from the shared akousmata below.

apps/macos/Sources/OidaMacOS/Models/DaemonModels.swift

@@ -85,10 +85,20 @@ struct AkouoSkillsResponse: Codable {
 struct ListenEventPayload: Codable {
     let path: String
     let routePreset: String
+    let sourceType: String?
+    let sourceLabel: String?
+    let deviceId: String?
+    let privacyMode: String?
+    let rawAudioPolicy: String?
 
     enum CodingKeys: String, CodingKey {
         case path
         case routePreset = "route_preset"
+        case sourceType = "source_type"
+        case sourceLabel = "source_label"
+        case deviceId = "device_id"
+        case privacyMode = "privacy_mode"
+        case rawAudioPolicy = "raw_audio_policy"
     }
 }
 
@@ -417,6 +427,7 @@ struct ConversationAskResponse: Codable {
     let conversationId: String?
     let eventId: String?
     let rawAudioPolicy: String?
+    let persistent: Bool?
     let forbiddenTopicsTriggered: [String]?
     let turn: ConversationTurn?
 
@@ -426,6 +437,7 @@ struct ConversationAskResponse: Codable {
         case conversationId = "conversation_id"
         case eventId = "event_id"
         case rawAudioPolicy = "raw_audio_policy"
+        case persistent
         case forbiddenTopicsTriggered = "forbidden_topics_triggered"
         case turn
     }
@@ -492,6 +504,7 @@ struct GenerationRecord: Codable, Identifiable {
     let id: String
     let createdAt: String?
     let updatedAt: String?
+    let persistent: Bool?
     let sourceEventId: String?
     let status: String?
     let adapter: String?
@@ -506,6 +519,7 @@ struct GenerationRecord: Codable, Identifiable {
         case id
         case createdAt = "created_at"
         case updatedAt = "updated_at"
+        case persistent
         case sourceEventId = "source_event_id"
         case status
         case adapter
@@ -1004,7 +1018,7 @@ struct NativeSystemAudioAnalyzePayload: Codable {
     }
 }
 
-struct NativeSystemAudioRoutePayload: Codable {
+struct NativeSystemAudioRoutePayload: Codable, Sendable {
     let routeId: String
     let captureScope: String
     let adapter: String

apps/macos/Sources/OidaMacOS/Services/DaemonClient.swift

@@ -154,8 +154,25 @@ struct DaemonClient {
         try await post("/background/capture-request/claim", payload: CaptureRequestClaimPayload(id: id))
     }
 
-    func listenEvent(path: String, routePreset: String) async throws -> ListenEventResponse {
-        try await post("/listen-event", payload: ListenEventPayload(path: path, routePreset: routePreset))
+    func listenEvent(
+        path: String,
+        routePreset: String,
+        sourceType: String? = nil,
+        sourceLabel: String? = nil,
+        deviceId: String? = nil,
+        privacyMode: String? = nil,
+        rawAudioPolicy: String? = nil
+    ) async throws -> ListenEventResponse {
+        let payload = ListenEventPayload(
+            path: path,
+            routePreset: routePreset,
+            sourceType: sourceType,
+            sourceLabel: sourceLabel,
+            deviceId: deviceId,
+            privacyMode: privacyMode,
+            rawAudioPolicy: rawAudioPolicy
+        )
+        return try await post("/listen-event", payload: payload)
     }
 
     func akouoSkills() async throws -> AkouoSkillsResponse {

apps/macos/Sources/OidaMacOS/Services/DaemonSupervisor.swift

@@ -17,6 +17,7 @@ enum DaemonSupervisorError: LocalizedError {
     }
 }
 
+@MainActor
 final class DaemonSupervisor {
     private var process: Process?
     private var outputPipe: Pipe?
@@ -58,14 +59,21 @@ final class DaemonSupervisor {
         proc.environment = mergedEnvironment()
 
         outputPipe.fileHandleForReading.readabilityHandler = { [weak self] handle in
-            self?.emitLines(from: handle.availableData)
+            let data = handle.availableData
+            Task { @MainActor [weak self] in
+                self?.emitLines(from: data)
+            }
         }
         errorPipe.fileHandleForReading.readabilityHandler = { [weak self] handle in
-            self?.emitLines(from: handle.availableData)
+            let data = handle.availableData
+            Task { @MainActor [weak self] in
+                self?.emitLines(from: data)
+            }
         }
         proc.terminationHandler = { [weak self] process in
-            DispatchQueue.main.async {
-                self?.onExit?(process.terminationStatus)
+            let status = process.terminationStatus
+            Task { @MainActor [weak self] in
+                self?.onExit?(status)
                 self?.cleanup()
             }
         }
@@ -105,10 +113,8 @@ final class DaemonSupervisor {
             .map(String.init)
             .filter { !$0.isEmpty }
         guard !lines.isEmpty else { return }
-        DispatchQueue.main.async { [weak self] in
-            for line in lines {
-                self?.onLogLine?(line)
-            }
+        for line in lines {
+            onLogLine?(line)
         }
     }
 

apps/macos/Sources/OidaMacOS/Services/MicTapManager.swift

@@ -19,8 +19,8 @@ enum MicTapError: LocalizedError {
 
 /// Ring-buffered microphone capture via AVAudioEngine, mirroring the system
 /// tap so the floating listener can listen to the default input natively.
-final class MicTapManager {
-    var onLevel: ((Double) -> Void)?
+final class MicTapManager: @unchecked Sendable {
+    var onLevel: (@Sendable (Double) -> Void)?
 
     private let engine = AVAudioEngine()
     private let queue = DispatchQueue(label: "org.sonicfield.oida.mic-tap")
@@ -42,7 +42,14 @@ final class MicTapManager {
             self?.ingest(buffer)
         }
         engine.prepare()
-        try engine.start()
+        do {
+            try engine.start()
+        } catch {
+            input.removeTap(onBus: 0)
+            engine.stop()
+            queue.sync { ringSamples.removeAll(keepingCapacity: true) }
+            throw error
+        }
         isCapturing = true
     }
 
@@ -104,9 +111,10 @@ final class MicTapManager {
         for value in mono { energy += Double(value * value) }
         let rms = (energy / Double(frames)).squareRoot()
         onLevel?(min(1.0, rms * 3.2))
+        let capturedMono = mono
         queue.async { [weak self] in
             guard let self else { return }
-            self.ringSamples.append(contentsOf: mono)
+            self.ringSamples.append(contentsOf: capturedMono)
             let maxFrames = max(1, Int(round(self.ringSampleRate * self.ringMaxSeconds)))
             if self.ringSamples.count > maxFrames {
                 self.ringSamples.removeFirst(self.ringSamples.count - maxFrames)

apps/macos/Sources/OidaMacOS/Services/ShellStore.swift

@@ -287,6 +287,12 @@ final class ShellStore: ObservableObject {
         let loaded = (manifest.routePresets ?? []).filter { $0.enabledByDefault != false }
         if !loaded.isEmpty {
             presets = loaded
+            // Pre-v0.6 preset ids saved in UserDefaults follow the rename instead of
+            // resetting to the first preset (mirrors the daemon's LEGACY_PRESET_ALIASES).
+            let legacyAliases = ["environment": "field", "speech": "voice", "memory": "recall"]
+            if let renamed = legacyAliases[selectedPreset], loaded.contains(where: { $0.id == renamed }) {
+                selectedPreset = renamed
+            }
             if !loaded.contains(where: { $0.id == selectedPreset }) {
                 selectedPreset = loaded.first?.id ?? "basic"
             }
@@ -346,7 +352,12 @@ final class ShellStore: ObservableObject {
             claimedCaptureRequestIds.removeAll()
             claimedCaptureRequestIds.insert(request.id)
         }
-        guard let claim = try? await client.claimCaptureRequest(id: request.id), claim.claimed else { return }
+        guard let claim = try? await client.claimCaptureRequest(id: request.id), claim.claimed else {
+            // A transient daemon/network error must not poison this request ID;
+            // the next poll should be allowed to retry the atomic claim.
+            claimedCaptureRequestIds.remove(request.id)
+            return
+        }
         let seconds = request.seconds
         let preset = request.routePreset
         Task { @MainActor [weak self] in
@@ -417,7 +428,14 @@ final class ShellStore: ObservableObject {
         guard !Task.isCancelled else { return }
         do {
             let output = try micTap.writeRecentAudio(seconds: captureSeconds)
-            let response = try await client.listenEvent(path: output.path, routePreset: preset ?? defaultRoutePreset)
+            let response = try await client.listenEvent(
+                path: output.path,
+                routePreset: preset ?? defaultRoutePreset,
+                sourceType: "live_input",
+                sourceLabel: "Native microphone",
+                privacyMode: "ephemeral",
+                rawAudioPolicy: "temp"
+            )
             latestRouteComparison = nil
             latestEvent = response.listeningEvent ?? latestEvent
             resetConversation()

apps/macos/Sources/OidaMacOS/Services/SystemAudioTapManager.swift

@@ -3,7 +3,7 @@ import CoreMedia
 import Foundation
 import ScreenCaptureKit
 
-struct NativeAudioTapSnapshot {
+struct NativeAudioTapSnapshot: Sendable {
     let bands: [Double]
     let rms: Double
     let peak: Double
@@ -12,7 +12,7 @@ struct NativeAudioTapSnapshot {
     let updatedAt: Date
 }
 
-struct NativeSystemAudioCapture {
+struct NativeSystemAudioCapture: Sendable {
     let path: URL
     let durationSeconds: Double
     let sampleRate: Double
@@ -66,10 +66,10 @@ enum SystemAudioTapState: Equatable {
     }
 }
 
-final class SystemAudioTapManager: NSObject {
-    var onSnapshot: ((NativeAudioTapSnapshot) -> Void)?
-    var onStateChange: ((SystemAudioTapState) -> Void)?
-    var onRouteChange: ((NativeSystemAudioRoutePayload?) -> Void)?
+final class SystemAudioTapManager: NSObject, @unchecked Sendable {
+    var onSnapshot: (@MainActor @Sendable (NativeAudioTapSnapshot) -> Void)?
+    var onStateChange: (@MainActor @Sendable (SystemAudioTapState) -> Void)?
+    var onRouteChange: (@MainActor @Sendable (NativeSystemAudioRoutePayload?) -> Void)?
 
     private var stream: SCStream?
     private let captureQueue = DispatchQueue(label: "org.sonicfield.oida.system-audio-tap")
@@ -123,6 +123,7 @@ final class SystemAudioTapManager: NSObject {
         onStateChange?(.stopped)
     }
 
+    @MainActor
     func writeRecentAudio(seconds: Double, audioDirectory: URL = oidaAudioDirectory()) throws -> NativeSystemAudioCapture {
         guard isCapturing else { throw SystemAudioTapCaptureError.notCapturing }
         let sourceRoute = currentSourceRoute ?? fallbackDisplayMixRoute()
@@ -154,6 +155,7 @@ final class SystemAudioTapManager: NSObject {
     }
 
     @available(macOS 13.0, *)
+    @MainActor
     private func startScreenCaptureKit() async throws {
         let content = try await SCShareableContent.excludingDesktopWindows(false, onScreenWindowsOnly: true)
         guard let display = content.displays.first else {
@@ -256,7 +258,7 @@ final class SystemAudioTapManager: NSObject {
             updatedAt: Date()
         )
 
-        DispatchQueue.main.async { [weak self] in
+        Task { @MainActor [weak self] in
             self?.onSnapshot?(snapshot)
         }
     }
@@ -409,7 +411,7 @@ extension SystemAudioTapManager: SCStreamOutput, SCStreamDelegate {
     }
 
     func stream(_ stream: SCStream, didStopWithError error: Error) {
-        DispatchQueue.main.async { [weak self] in
+        Task { @MainActor [weak self] in
             self?.isCapturing = false
             self?.stream = nil
             self?.onStateChange?(.failed(error.localizedDescription))

apps/macos/Sources/OidaMacOS/Views/ContentView.swift

@@ -140,9 +140,11 @@ struct DashboardWebView: NSViewRepresentable {
             requestMediaCapturePermissionFor origin: WKSecurityOrigin,
             initiatedByFrame frame: WKFrameInfo,
             type: WKMediaCaptureType,
-            decisionHandler: @escaping (WKPermissionDecision) -> Void
+            decisionHandler: @escaping @MainActor @Sendable (WKPermissionDecision) -> Void
         ) {
-            decisionHandler(type == .microphone ? .grant : .deny)
+            let localHosts = Set(["127.0.0.1", "localhost", "::1"])
+            let isLocalDashboard = localHosts.contains(origin.host.lowercased())
+            decisionHandler(type == .microphone && isLocalDashboard ? .grant : .deny)
         }
 
         // target=_blank links (API docs, health) open in the default browser