Harden audio shutdown across app surfaces

Author: emezzzzz

README.md

@@ -61,6 +61,7 @@ x         clear selected layer (repeat to confirm)
 s         save session
 e         export mix
 l         generate listening report
+k         hard-silence audio (stop capture, mute layers, discard pending output)
 i         toggle prompt/audio input mode
 tab       cycle mode
 q         quit

apps/macos/Sources/ORAMApp/App/ORAMApp.swift

@@ -1,7 +1,27 @@
+import AppKit
 import SwiftUI
 
+@MainActor
+final class ORAMAppDelegate: NSObject, NSApplicationDelegate {
+    weak var store: AppStore?
+    private var isTerminating = false
+
+    func applicationShouldTerminate(_ sender: NSApplication) -> NSApplication.TerminateReply {
+        guard !isTerminating else {
+            return .terminateNow
+        }
+        isTerminating = true
+        Task {
+            await store?.shutdown()
+            sender.reply(toApplicationShouldTerminate: true)
+        }
+        return .terminateLater
+    }
+}
+
 @main
 struct ORAMApplication: App {
+    @NSApplicationDelegateAdaptor(ORAMAppDelegate.self) private var appDelegate
     @StateObject private var store = AppStore()
 
     var body: some Scene {
@@ -10,8 +30,14 @@ struct ORAMApplication: App {
                 .environmentObject(store)
                 .frame(minWidth: 1040, minHeight: 680)
                 .task {
+                    appDelegate.store = store
                     await store.bootstrap()
                 }
+                .onDisappear {
+                    Task {
+                        await store.shutdown()
+                    }
+                }
         }
         .commands {
             CommandGroup(after: .appInfo) {

apps/macos/Sources/ORAMApp/Stores/AppStore.swift

@@ -20,13 +20,18 @@ final class AppStore: ObservableObject {
     private var wsRetryTask: Task<Void, Never>?
     private var waveformCacheKeys: [Int: String] = [:]
     private var waveformFetches: Set<String> = []
+    private var isShuttingDown = false
 
     var selectedSound: SoundRecord? {
         sounds.first { $0.id == selectedSoundID }
     }
 
     func bootstrap() async {
+        isShuttingDown = false
         connectionStatus = await daemonManager.launchIfNeeded(client: client)
+        if connectionStatus == "connected", client.isConfigured {
+            try? await client.killAll()
+        }
         await refreshAll()
         connectWebSocket()
     }
@@ -162,6 +167,26 @@ final class AppStore: ObservableObject {
         }
     }
 
+    func shutdown() async {
+        guard !isShuttingDown else { return }
+        isShuttingDown = true
+        retryTask?.cancel()
+        retryTask = nil
+        wsRetryTask?.cancel()
+        wsRetryTask = nil
+        wsTask?.cancel(with: .goingAway, reason: nil)
+        wsTask = nil
+        do {
+            if client.isConfigured {
+                try await client.killAll()
+            }
+        } catch {
+            errorMessage = error.localizedDescription
+        }
+        daemonManager.stop()
+        connectionStatus = "stopped"
+    }
+
     func cycleInputMode() async {
         let current = modeKey
         let next = current == "prompt" ? "audio" : (current == "audio" ? "listen" : "prompt")

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

@@ -200,7 +200,7 @@ struct ContentView: View {
                 HeaderGlyph("⊘", role: .danger, theme: lightTheme) {
                     Task { await store.killAll() }
                 }
-                .onHoverHint("kill all sound — mute every layer and stop recording", $hint)
+                .onHoverHint("kill all sound — stop capture, mute layers, discard pending output", $hint)
 
                 HeaderSeparator()
 
@@ -1392,19 +1392,24 @@ private struct AboutOverlay: View {
                         .foregroundStyle(DashboardTheme.secondary(theme))
                 }
 
-                Text("recorder · looper · summoner · auto-generator · archive")
+                Text("recorder · looper · sampler · engine router · local archive")
                     .font(.system(size: 12, weight: .semibold, design: .monospaced))
                     .foregroundStyle(DashboardTheme.secondary(theme))
 
-                Text("Local-first BYOK sound material system. The app launches a localhost daemon, stores provider keys in macOS Keychain, keeps mock mode available, and writes generated sounds into the local ORAM Library.")
+                Text("Local-first BYOK sound workstation. The macOS app controls the Python engine through a localhost daemon, stores provider keys in macOS Keychain, keeps Local Mock available, and writes generated sounds into the local ORAM Library.")
                     .font(.system(size: 12, design: .monospaced))
                     .foregroundStyle(DashboardTheme.dim(theme))
                     .fixedSize(horizontal: false, vertical: true)
 
+                Text("macOS: quit sends kill-all audio first, then stops any daemon process launched by the app. The kill control stops recording and command capture, mutes every layer, and discards pending generation output.")
+                    .font(.system(size: 11, design: .monospaced))
+                    .foregroundStyle(DashboardTheme.dim(theme))
+                    .fixedSize(horizontal: false, vertical: true)
+
                 HStack(spacing: 8) {
                     MiniFact("open source", theme: theme)
                     MiniFact("no telemetry", theme: theme)
-                    MiniFact("no Momoto server", theme: theme)
+                    MiniFact("localhost daemon", theme: theme)
                     MiniFact("local archive", theme: theme)
                 }
 
@@ -1463,6 +1468,7 @@ private struct CommandPaletteOverlay: View {
     private let commands = [
         "record",
         "stop recording",
+        "kill audio",
         "overdub",
         "listen to the texture",
         "export mix",

apps/macos/script/build_and_run.sh

@@ -5,6 +5,8 @@ ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
 REPO_ROOT="$(cd "$ROOT_DIR/../.." && pwd)"
 APP_NAME="ORAM"
 BUNDLE_ID="wtf.momoto.oram"
+APP_VERSION="$(awk -F'"' '/^version = / {print $2; exit}' "$REPO_ROOT/pyproject.toml")"
+APP_VERSION="${APP_VERSION:-0.0.0}"
 BUILD_CONFIGURATION="${ORAM_BUILD_CONFIGURATION:-release}"
 DIST_DIR="$ROOT_DIR/dist"
 APP_DIR="$DIST_DIR/$APP_NAME.app"
@@ -84,7 +86,7 @@ cat > "$CONTENTS_DIR/Info.plist" <<PLIST
   <key>CFBundlePackageType</key>
   <string>APPL</string>
   <key>CFBundleShortVersionString</key>
-  <string>0.1.0</string>
+  <string>$APP_VERSION</string>
   <key>CFBundleVersion</key>
   <string>1</string>
   <key>LSMinimumSystemVersion</key>

commands.md

@@ -21,6 +21,7 @@ record eight seconds       -> record(duration=8.0)
 record 8 seconds           -> record(duration=8.0)
 record four bars           -> record(bars=4) (requires BPM)
 stop recording             -> stop_recording()
+kill audio                 -> kill_audio()
 loop this                  -> (set mode to loop)
 overdub                    -> overdub(target=selected)
 mute layer two             -> mute_layer(target=2)
@@ -95,10 +96,11 @@ analyze the loop           -> analyze_mix()
 
 ## action types
 
-all 17 MVP action types:
+core action types:
 
 - `record`
 - `stop_recording`
+- `kill_audio`
 - `overdub`
 - `select_layer`
 - `mute_layer`

docs/app/macos.md

@@ -28,6 +28,8 @@ The app:
   the repository DMG
 - stores provider keys directly in Keychain
 - calls the daemon over localhost
+- sends a hard-silence request before quitting, then stops any daemon process
+  launched by the app
 - never displays a stored provider key by default
 - bundles the ORAM logo as an app resource and dashboard header image
 

src/oram/__init__.py

@@ -1,3 +1,8 @@
 """oram — a speech-operated terminal looper for synthetic sound studies."""
 
-__version__ = "0.1.0"
+from importlib.metadata import PackageNotFoundError, version
+
+try:
+    __version__ = version("oram")
+except PackageNotFoundError:
+    __version__ = "2.0.0"

src/oram/agent/llm_adapter.py

@@ -42,6 +42,7 @@
 Allowed actions and their schemas:
 - {"action":"record","target":"selected","duration":8.0,"overdub":false}
 - {"action":"stop_recording"}
+- {"action":"kill_audio"}
 - {"action":"overdub","target":"selected","duration":null}
 - {"action":"select_layer","target":1}  (target: 1-4)
 - {"action":"mute_layer","target":1}

src/oram/app.py

@@ -12,6 +12,7 @@
 from rich.console import Console
 from rich.live import Live
 
+from oram import __version__
 from oram.agent.controller import AgentController
 from oram.agent.llm_adapter import LLMCliAdapter
 from oram.audio.engine import MockAudioEngine
@@ -211,7 +212,7 @@ def on_status(msg: str):
     engine.start()
 
     console.print("")
-    console.print("oram v2.0.0 — recursive listening instrument", style="oram.title")
+    console.print(f"oram {__version__} — local recursive audio workstation", style="oram.title")
     stt_label = "off" if config.no_stt else config.stt_backend
     gw_label = "elevenlabs" if gateway else "mock"
     console.print(
@@ -224,7 +225,7 @@ def on_status(msg: str):
         style="oram.status",
     )
     console.print(
-        "          l=listen  g=generate  f=fork  tab=mode  s=save  e=export  q=quit",
+        "          l=listen  g=generate  f=fork  k=kill  tab=mode  s=save  e=export  q=quit",
         style="oram.status",
     )
     console.print(
@@ -241,6 +242,7 @@ def on_status(msg: str):
     except KeyboardInterrupt:
         pass
     finally:
+        router.kill_all_audio()
         engine.stop()
         console.print("\noram stopped.", style="oram.title")